Moved files

sharadb-amazon · Aug 20, 2024 · c6de23b · c6de23b
1 parent f485e4a
commit c6de23b
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 15 deletions.
diff --git a/examples/tv-casting-app/android/App/app/build.gradle b/examples/tv-casting-app/android/App/app/build.gradle
@@ -7,7 +7,7 @@ android {
 
     defaultConfig {
         applicationId "com.chip.casting"
-        minSdk 24
+        minSdk 26
         targetSdk 30
         versionCode 1
         versionName "1.0"

diff --git a/...in/jni/com/chip/casting/TvCastingApp.java → ...at/jni/com/chip/casting/TvCastingApp.java b/...in/jni/com/chip/casting/TvCastingApp.java → ...at/jni/com/chip/casting/TvCastingApp.java
diff --git a/examples/tv-casting-app/android/App/app/src/main/AndroidManifest.xml b/examples/tv-casting-app/android/App/app/src/main/AndroidManifest.xml
@@ -18,9 +18,9 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:name=".chip.casting.app.ChipTvCastingApplication"
+        android:name=".matter.casting.ChipTvCastingApplication"
         android:theme="@style/Theme.CHIPTVCastingApp">
-        <activity android:name=".chip.casting.app.MainActivity"
+        <activity android:name=".matter.casting.MainActivity"
             android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/...casting/app/ChipTvCastingApplication.java → ...ter/casting/ChipTvCastingApplication.java b/...casting/app/ChipTvCastingApplication.java → ...ter/casting/ChipTvCastingApplication.java
@@ -1,4 +1,4 @@
-package com.chip.casting.app;
+package com.matter.casting;
 
 import android.app.Application;
 

diff --git a/...va/com/chip/casting/app/MainActivity.java → ...java/com/matter/casting/MainActivity.java b/...va/com/chip/casting/app/MainActivity.java → ...java/com/matter/casting/MainActivity.java
@@ -1,4 +1,4 @@
-package com.chip.casting.app;
+package com.matter.casting;
 
 import android.os.Bundle;
 import android.util.Log;
@@ -9,15 +9,13 @@
 import com.chip.casting.AppParameters;
 import com.chip.casting.DiscoveredNodeData;
 import com.chip.casting.TvCastingApp;
+import com.chip.casting.app.CertTestFragment;
+import com.chip.casting.app.CommissionerDiscoveryFragment;
+import com.chip.casting.app.ConnectionFragment;
+import com.chip.casting.app.ContentLauncherFragment;
+import com.chip.casting.app.MediaPlaybackFragment;
+import com.chip.casting.app.SelectClusterFragment;
 import com.chip.casting.util.GlobalCastingConstants;
-import com.matter.casting.ActionSelectorFragment;
-import com.matter.casting.ApplicationBasicReadVendorIDExampleFragment;
-import com.matter.casting.ConnectionExampleFragment;
-import com.matter.casting.ContentLauncherLaunchURLExampleFragment;
-import com.matter.casting.DiscoveryExampleFragment;
-import com.matter.casting.InitializationExample;
-import com.matter.casting.MediaPlaybackSubscribeToCurrentStateExampleFragment;
-import com.matter.casting.PreferencesConfigurationManager;
 import com.matter.casting.core.CastingPlayer;
 import java.util.Random;
 

diff --git a/examples/tv-casting-app/android/App/app/src/main/res/layout/activity_main.xml b/examples/tv-casting-app/android/App/app/src/main/res/layout/activity_main.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".chip.casting.app.MainActivity">
+    tools:context=".matter.casting.MainActivity">
 
     <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/main_fragment_container"

diff --git a/examples/tv-casting-app/android/BUILD.gn b/examples/tv-casting-app/android/BUILD.gn
@@ -85,6 +85,7 @@ android_library("java") {
   ]
 
   sources = [
+    "App/app/src/compat/jni/com/chip/casting/TvCastingApp.java",
     "App/app/src/main/jni/com/chip/casting/AppParameters.java",
     "App/app/src/main/jni/com/chip/casting/CommissioningCallbacks.java",
     "App/app/src/main/jni/com/chip/casting/ContentApp.java",
@@ -100,7 +101,6 @@ android_library("java") {
     "App/app/src/main/jni/com/chip/casting/SubscriptionEstablishedCallback.java",
     "App/app/src/main/jni/com/chip/casting/SuccessCallback.java",
     "App/app/src/main/jni/com/chip/casting/TargetNavigatorTypes.java",
-    "App/app/src/main/jni/com/chip/casting/TvCastingApp.java",
     "App/app/src/main/jni/com/chip/casting/VideoPlayer.java",
   ]