diff --git a/app/build.gradle b/app/build.gradle index dae257dcb..da0cab1b7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -97,6 +97,7 @@ dependencies { implementation project(':chaquo') implementation project(':quickjs') implementation 'androidx.appcompat:appcompat:1.7.1' + implementation 'androidx.core:core-splashscreen:1.0.1' implementation 'androidx.media:media:1.7.1' implementation 'androidx.room:room-runtime:2.8.0' implementation 'cat.ereza:customactivityoncrash:2.4.0' diff --git a/app/src/leanback/AndroidManifest.xml b/app/src/leanback/AndroidManifest.xml index 1e30263fd..deda7a4c1 100644 --- a/app/src/leanback/AndroidManifest.xml +++ b/app/src/leanback/AndroidManifest.xml @@ -30,7 +30,8 @@ android:name=".ui.activity.HomeActivity" android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation" android:exported="true" - android:screenOrientation="sensorLandscape"> + android:screenOrientation="sensorLandscape" + android:theme="@style/Theme.Splash"> @@ -104,8 +105,7 @@ android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation" android:exported="true" android:launchMode="singleTop" - android:screenOrientation="sensorLandscape" - android:theme="@style/AppTheme.Live" /> + android:screenOrientation="sensorLandscape" /> - + \ No newline at end of file diff --git a/app/src/leanback/res/values-v27/styles.xml b/app/src/leanback/res/values-v27/styles.xml deleted file mode 100644 index 0fc60ad52..000000000 --- a/app/src/leanback/res/values-v27/styles.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/app/src/leanback/res/values/styles.xml b/app/src/leanback/res/values/styles.xml index 2eeefbe9f..47239b84b 100644 --- a/app/src/leanback/res/values/styles.xml +++ b/app/src/leanback/res/values/styles.xml @@ -1,24 +1,30 @@ - - - + + + + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 46b5396b2..44eb79523 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -41,7 +41,7 @@ android:requestLegacyExternalStorage="true" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/AppTheme" + android:theme="@style/Theme.App" android:usesCleartextTraffic="true" tools:replace="android:allowBackup"> diff --git a/app/src/main/res/drawable-nodpi/ic_splash.png b/app/src/main/res/drawable-nodpi/ic_splash.png new file mode 100644 index 000000000..1de13aa45 Binary files /dev/null and b/app/src/main/res/drawable-nodpi/ic_splash.png differ diff --git a/app/src/mobile/AndroidManifest.xml b/app/src/mobile/AndroidManifest.xml index 5cf9f767c..cef434e18 100644 --- a/app/src/mobile/AndroidManifest.xml +++ b/app/src/mobile/AndroidManifest.xml @@ -15,6 +15,7 @@ android:configChanges="screenSize|smallestScreenSize|screenLayout|uiMode|orientation" android:exported="true" android:screenOrientation="fullUser" + android:theme="@style/Theme.Splash" android:windowSoftInputMode="adjustPan"> @@ -98,8 +99,7 @@ android:launchMode="singleTop" android:resizeableActivity="true" android:screenOrientation="sensorLandscape" - android:supportsPictureInPicture="true" - android:theme="@style/AppTheme.Live" /> + android:supportsPictureInPicture="true" /> + android:theme="@style/Theme.Video" /> + + diff --git a/app/src/mobile/res/drawable/shape_vod_name.xml b/app/src/mobile/res/drawable/shape_vod_name.xml index f97e1d6bc..6d2217abc 100644 --- a/app/src/mobile/res/drawable/shape_vod_name.xml +++ b/app/src/mobile/res/drawable/shape_vod_name.xml @@ -6,7 +6,7 @@ android:bottomLeftRadius="8dp" android:bottomRightRadius="8dp" /> - + + + + + + + - diff --git a/app/src/mobile/res/values-v35/styles.xml b/app/src/mobile/res/values-v35/styles.xml index 5fc41e441..7c57b3fdb 100644 --- a/app/src/mobile/res/values-v35/styles.xml +++ b/app/src/mobile/res/values-v35/styles.xml @@ -1,6 +1,6 @@ - - - -