Android Sender Kotlin app alongside Java app

Change-Id: Idc1aaa9ee2011fd83daa17522fdf2ecaf0579423
mudar · Sep 8, 2022 · 8bb8ce2 · 8bb8ce2
1 parent 95e9fa8
commit 8bb8ce2
Show file tree

Hide file tree

Showing 604 changed files with 3,382 additions and 93 deletions.
diff --git a/app-java/build.gradle b/app-java/build.gradle
@@ -0,0 +1,53 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 32
+
+    defaultConfig {
+        minSdkVersion 18
+        targetSdkVersion 32
+        versionCode 20
+        versionName "3.0"
+        applicationId="com.google.sample.cast.refplayer"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    lintOptions.abortOnError false
+
+    sourceSets {
+        main {
+            res.srcDirs = [projectDir.path+'/../resources']
+        }
+        androidTest {
+            java.srcDirs = ['androidTest']
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    namespace 'com.google.sample.cast.refplayer'
+}
+
+dependencies {
+    implementation 'androidx.appcompat:appcompat:1.5.0'
+    implementation 'androidx.mediarouter:mediarouter:1.3.1'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
+    implementation 'com.google.android.gms:play-services-cast-framework:21.1.0'
+    implementation 'com.android.volley:volley:1.2.1'
+
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.4.0'
+    androidTestImplementation 'androidx.test:runner:1.4.0'
+    androidTestImplementation 'androidx.test:rules:1.4.0'
+    androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
+    testImplementation 'junit:junit:4.12'
+}
diff --git a/AndroidManifest.xml → app-java/src/main/AndroidManifest.xml b/AndroidManifest.xml → app-java/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2019 Google LLC. All rights reserved.
+  Copyright 2022 Google LLC. All rights reserved.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -14,8 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
   -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.sample.cast.refplayer">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

diff --git a/...e/cast/refplayer/CastOptionsProvider.java → ...e/cast/refplayer/CastOptionsProvider.java b/...e/cast/refplayer/CastOptionsProvider.java → ...e/cast/refplayer/CastOptionsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC. All Rights Reserved.
+ * Copyright 2022 Google LLC. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/.../cast/refplayer/VideoBrowserActivity.java → .../cast/refplayer/VideoBrowserActivity.java b/.../cast/refplayer/VideoBrowserActivity.java → .../cast/refplayer/VideoBrowserActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC. All Rights Reserved.
+ * Copyright 2022 Google LLC. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,6 +39,9 @@
 import android.view.Menu;
 import android.view.MenuItem;
 
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+
 /**
  * The main activity that displays the list of videos.
  */
@@ -54,6 +57,7 @@ public class VideoBrowserActivity extends AppCompatActivity {
     private Toolbar mToolbar;
     private IntroductoryOverlay mIntroductoryOverlay;
     private CastStateListener mCastStateListener;
+    private Executor localExecutor = Executors.newSingleThreadExecutor();
 
     private class MySessionManagerListener implements SessionManagerListener<CastSession> {
 
@@ -121,7 +125,7 @@ public void onCastStateChanged(int newState) {
                 }
             }
         };
-        mCastContext = CastContext.getSharedInstance(this);
+        mCastContext = CastContext.getSharedInstance(this,localExecutor).getResult();
     }
 
     private void setupActionBar() {
@@ -184,7 +188,9 @@ protected void onResume() {
                 mSessionManagerListener, CastSession.class);
         intentToJoin();
         if (mCastSession == null) {
-            mCastSession = CastContext.getSharedInstance(this).getSessionManager()
+            mCastSession = CastContext.getSharedInstance(this,localExecutor)
+                    .getResult()
+                    .getSessionManager()
                     .getCurrentCastSession();
         }
         if (mQueueMenuItem != null) {

diff --git a/...fplayer/browser/VideoBrowserFragment.java → ...fplayer/browser/VideoBrowserFragment.java b/...fplayer/browser/VideoBrowserFragment.java → ...fplayer/browser/VideoBrowserFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC. All Rights Reserved.
+ * Copyright 2022 Google LLC. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,6 +41,8 @@
 import android.widget.ImageButton;
 
 import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
 
 /**
  * A fragment to host a list view of the video catalog.
@@ -57,7 +59,8 @@ public class VideoBrowserFragment extends Fragment implements VideoListAdapter.I
     private View mLoadingView;
     private final SessionManagerListener<CastSession> mSessionManagerListener =
             new MySessionManagerListener();
-
+    private Executor localExecutor = Executors.newSingleThreadExecutor();
+
     public VideoBrowserFragment() {
     }
 
@@ -78,7 +81,7 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         mRecyclerView.setLayoutManager(layoutManager);
         mAdapter = new VideoListAdapter(this, getContext());
         mRecyclerView.setAdapter(mAdapter);
-        getLoaderManager().initLoader(0, null, this);
+        LoaderManager.getInstance(this).initLoader(0, null, this);
     }
 
     @Override
@@ -88,7 +91,7 @@ public void itemClicked(View view, MediaInfo item, int position) {
         } else {
             String transitionName = getString(R.string.transition_image);
             VideoListAdapter.ViewHolder viewHolder =
-                    (VideoListAdapter.ViewHolder) mRecyclerView.findViewHolderForPosition(position);
+                    (VideoListAdapter.ViewHolder) mRecyclerView.findViewHolderForLayoutPosition(position);
             Pair<View, String> imagePair = Pair
                     .create((View) viewHolder.getImageView(), transitionName);
             ActivityOptionsCompat options = ActivityOptionsCompat
@@ -120,14 +123,18 @@ public void onLoaderReset(Loader<List<MediaInfo>> loader) {
 
     @Override
     public void onStart() {
-        CastContext.getSharedInstance(getContext()).getSessionManager()
+        CastContext.getSharedInstance(getContext(),localExecutor)
+                .getResult()
+                .getSessionManager()
                 .addSessionManagerListener(mSessionManagerListener, CastSession.class);
         super.onStart();
     }
 
     @Override
     public void onStop() {
-        CastContext.getSharedInstance(getContext()).getSessionManager()
+        CastContext.getSharedInstance(getContext(),localExecutor)
+                .getResult()
+                .getSessionManager()
                 .removeSessionManagerListener(mSessionManagerListener, CastSession.class);
         super.onStop();
     }

diff --git a/...st/refplayer/browser/VideoItemLoader.java → ...st/refplayer/browser/VideoItemLoader.java b/...st/refplayer/browser/VideoItemLoader.java → ...st/refplayer/browser/VideoItemLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC. All Rights Reserved.
+ * Copyright 2022 Google LLC. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...t/refplayer/browser/VideoListAdapter.java → ...t/refplayer/browser/VideoListAdapter.java b/...t/refplayer/browser/VideoListAdapter.java → ...t/refplayer/browser/VideoListAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC. All Rights Reserved.
+ * Copyright 2022 Google LLC. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,6 +35,8 @@
 import com.google.sample.cast.refplayer.R;
 
 import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
 
 /**
  * An {@link ArrayAdapter} to populate the list of videos.
@@ -45,6 +47,7 @@ public class VideoListAdapter extends RecyclerView.Adapter<VideoListAdapter.View
     private final ItemClickListener mClickListener;
     private final Context mAppContext;
     private List<MediaInfo> videos;
+    private Executor localExecutor = Executors.newSingleThreadExecutor();
 
     public VideoListAdapter(ItemClickListener clickListener, Context context) {
         mClickListener = clickListener;
@@ -85,7 +88,9 @@ public void onClick(View view) {
                 mClickListener.itemClicked(view, item, position);
             }
         });
-        CastSession castSession = CastContext.getSharedInstance(mAppContext).getSessionManager()
+        CastSession castSession = CastContext.getSharedInstance(mAppContext,localExecutor)
+                .getResult()
+                .getSessionManager()
                 .getCurrentCastSession();
         viewHolder.mMenu.setVisibility(
                 (castSession != null && castSession.isConnected()) ? View.VISIBLE : View.GONE);

diff --git a/...cast/refplayer/browser/VideoProvider.java → ...cast/refplayer/browser/VideoProvider.java b/...cast/refplayer/browser/VideoProvider.java → ...cast/refplayer/browser/VideoProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC. All Rights Reserved.
+ * Copyright 2022 Google LLC. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -99,6 +99,7 @@ protected JSONObject parseUrl(String urlString) {
                     is.close();
                 } catch (IOException e) {
                     // ignore
+                    Log.w(TAG,"Ignore",e);
                 }
             }
         }

diff --git a/...dedcontrols/ExpandedControlsActivity.java → ...dedcontrols/ExpandedControlsActivity.java b/...dedcontrols/ExpandedControlsActivity.java → ...dedcontrols/ExpandedControlsActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC. All Rights Reserved.
+ * Copyright 2022 Google LLC. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...ayer/mediaplayer/LocalPlayerActivity.java → ...ayer/mediaplayer/LocalPlayerActivity.java b/...ayer/mediaplayer/LocalPlayerActivity.java → ...ayer/mediaplayer/LocalPlayerActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC. All Rights Reserved.
+ * Copyright 2022 Google LLC. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -73,6 +73,8 @@
 
 import java.util.Timer;
 import java.util.TimerTask;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
 
 /**
  * Activity for the local media player.
@@ -107,6 +109,7 @@ public class LocalPlayerActivity extends AppCompatActivity {
     private SessionManagerListener<CastSession> mSessionManagerListener;
     private MenuItem mQueueMenuItem;
     private ImageLoader mImageLoader;
+    private Executor localExecutor = Executors.newSingleThreadExecutor();
 
     /**
      * indicates whether we are doing a local or a remote playback
@@ -130,7 +133,8 @@ protected void onCreate(Bundle savedInstanceState) {
         loadViews();
         setupControlsCallbacks();
         setupCastListener();
-        mCastContext = CastContext.getSharedInstance(this);
+        mCastContext = CastContext.getSharedInstance(this,localExecutor)
+                .getResult();
         mCastSession = mCastContext.getSessionManager().getCurrentCastSession();
         // see what we need to play and where
         Bundle bundle = getIntent().getExtras();
@@ -586,7 +590,7 @@ public void onStartTrackingTouch(SeekBar seekBar) {
 
             @Override
             public void onProgressChanged(SeekBar seekBar, int progress,
-                    boolean fromUser) {
+                                          boolean fromUser) {
                 mStartText.setText(Utils.formatMillis(progress));
             }
         });
@@ -674,12 +678,11 @@ public void onConfigurationChanged(Configuration newConfig) {
     }
 
     private void updateMetadata(boolean visible) {
-        Point displaySize;
+        Point displaySize = Utils.getDisplaySize(this);
         if (!visible) {
             mDescriptionView.setVisibility(View.GONE);
             mTitleView.setVisibility(View.GONE);
             mAuthorView.setVisibility(View.GONE);
-            displaySize = Utils.getDisplaySize(this);
             RelativeLayout.LayoutParams lp = new
                     RelativeLayout.LayoutParams(displaySize.x,
                     displaySize.y + getSupportActionBar().getHeight());
@@ -695,7 +698,6 @@ private void updateMetadata(boolean visible) {
             mDescriptionView.setVisibility(View.VISIBLE);
             mTitleView.setVisibility(View.VISIBLE);
             mAuthorView.setVisibility(View.VISIBLE);
-            displaySize = Utils.getDisplaySize(this);
             RelativeLayout.LayoutParams lp = new
                     RelativeLayout.LayoutParams(displaySize.x,
                     (int) (displaySize.x * mAspectRatio));

diff --git a/...st/refplayer/queue/QueueDataProvider.java → ...st/refplayer/queue/QueueDataProvider.java b/...st/refplayer/queue/QueueDataProvider.java → ...st/refplayer/queue/QueueDataProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC. All Rights Reserved.
+ * Copyright 2022 Google LLC. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,9 @@
 import com.google.android.gms.cast.framework.media.MediaQueue;
 import com.google.android.gms.cast.framework.media.RemoteMediaClient;
 
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+
 /**
  * A singleton to manage the queue. Upon instantiation, it syncs up its own copy of the queue with
  * the one that the VideoCastManager holds. After that point, it maintains an up-to-date version of
@@ -52,12 +55,15 @@ public class QueueDataProvider {
     private MediaQueueItem mUpcomingItem;
     private OnQueueDataChangedListener mListener;
     private boolean mDetachedQueue = true;
+    private Executor localExecutor = Executors.newSingleThreadExecutor();
 
     private QueueDataProvider(Context context) {
         mAppContext = context.getApplicationContext();
         mCurrentItem = null;
-        CastContext.getSharedInstance(mAppContext).getSessionManager().addSessionManagerListener(
-                mSessionManagerListener, CastSession.class);
+        CastContext.getSharedInstance(mAppContext,localExecutor)
+                .getResult()
+                .getSessionManager()
+                .addSessionManagerListener(mSessionManagerListener, CastSession.class);
         MediaQueue queue = getMediaQueue();
         if (queue != null) {
             queue.setCacheCapacity(30);
@@ -254,7 +260,9 @@ private void updateMediaQueue() {
     }
 
     private RemoteMediaClient getRemoteMediaClient() {
-        CastSession castSession = CastContext.getSharedInstance(mAppContext).getSessionManager()
+        CastSession castSession = CastContext.getSharedInstance(mAppContext,localExecutor)
+                .getResult()
+                .getSessionManager()
                 .getCurrentCastSession();
         if (castSession == null || !castSession.isConnected()) {
             Log.w(TAG, "Trying to get a RemoteMediaClient when no CastSession is started.");

diff --git a/...ueue/ui/QueueItemTouchHelperCallback.java → ...ueue/ui/QueueItemTouchHelperCallback.java b/...ueue/ui/QueueItemTouchHelperCallback.java → ...ueue/ui/QueueItemTouchHelperCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 Google LLC. All Rights Reserved.
+ * Copyright 2022 Google LLC. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -71,7 +71,7 @@ public void onChildDraw(Canvas c, RecyclerView recyclerView, RecyclerView.ViewHo
             if (viewHolder instanceof QueueListAdapter.QueueItemViewHolder) {
                 QueueListAdapter.QueueItemViewHolder queueHolder
                         = (QueueListAdapter.QueueItemViewHolder) viewHolder;
-                ViewCompat.setTranslationX(queueHolder.mContainer, dX);
+                queueHolder.mContainer.setTranslationX(dX);
             }
         } else {
             super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive);