From c6de23bf6d33d64a8ea9ffa94d24a6e1ef7cd212 Mon Sep 17 00:00:00 2001
From: Sharad Binjola <sharadb@amazon.com>
Date: Tue, 20 Aug 2024 15:33:08 -0700
Subject: [PATCH] Moved files

---
 .../tv-casting-app/android/App/app/build.gradle  |  2 +-
 .../jni/com/chip/casting/TvCastingApp.java       |  0
 .../android/App/app/src/main/AndroidManifest.xml |  4 ++--
 .../casting}/ChipTvCastingApplication.java       |  2 +-
 .../app => matter/casting}/MainActivity.java     | 16 +++++++---------
 .../app/src/main/res/layout/activity_main.xml    |  2 +-
 examples/tv-casting-app/android/BUILD.gn         |  2 +-
 7 files changed, 13 insertions(+), 15 deletions(-)
 rename examples/tv-casting-app/android/App/app/src/{main => compat}/jni/com/chip/casting/TvCastingApp.java (100%)
 rename examples/tv-casting-app/android/App/app/src/main/java/com/{chip/casting/app => matter/casting}/ChipTvCastingApplication.java (84%)
 rename examples/tv-casting-app/android/App/app/src/main/java/com/{chip/casting/app => matter/casting}/MainActivity.java (92%)

diff --git a/examples/tv-casting-app/android/App/app/build.gradle b/examples/tv-casting-app/android/App/app/build.gradle
index 3dcdad715e6393..70e08d7961c702 100644
--- 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/examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/TvCastingApp.java b/examples/tv-casting-app/android/App/app/src/compat/jni/com/chip/casting/TvCastingApp.java
similarity index 100%
rename from examples/tv-casting-app/android/App/app/src/main/jni/com/chip/casting/TvCastingApp.java
rename to examples/tv-casting-app/android/App/app/src/compat/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
index e551de818eb5b0..b47ec80a86b0d9 100644
--- 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/examples/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/ChipTvCastingApplication.java b/examples/tv-casting-app/android/App/app/src/main/java/com/matter/casting/ChipTvCastingApplication.java
similarity index 84%
rename from examples/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/ChipTvCastingApplication.java
rename to examples/tv-casting-app/android/App/app/src/main/java/com/matter/casting/ChipTvCastingApplication.java
index 4986cc28e49c01..bea5b88a310158 100644
--- a/examples/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/ChipTvCastingApplication.java
+++ b/examples/tv-casting-app/android/App/app/src/main/java/com/matter/casting/ChipTvCastingApplication.java
@@ -1,4 +1,4 @@
-package com.chip.casting.app;
+package com.matter.casting;
 
 import android.app.Application;
 
diff --git a/examples/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/MainActivity.java b/examples/tv-casting-app/android/App/app/src/main/java/com/matter/casting/MainActivity.java
similarity index 92%
rename from examples/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/MainActivity.java
rename to examples/tv-casting-app/android/App/app/src/main/java/com/matter/casting/MainActivity.java
index 685dbf2fb6426e..53908322d10155 100644
--- a/examples/tv-casting-app/android/App/app/src/main/java/com/chip/casting/app/MainActivity.java
+++ b/examples/tv-casting-app/android/App/app/src/main/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
index ff56873cb23c22..8e3724ec39dd48 100644
--- 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
index c4c50bb85d8c9a..df4f526ad5f291 100644
--- 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",
   ]