Clean code

4 years ago · cd13d26a45
parent 84576bb23f
commit cd13d26a45
10 changed files with 97 additions and 67 deletions
--- a/app/src/leanback/AndroidManifest.xml
+++ b/app/src/leanback/AndroidManifest.xml
@ -31,7 +31,8 @@
            android:name=".ui.activity.SplashActivity"
            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
            android:exported="true"
-            android:screenOrientation="sensorLandscape">
+            android:screenOrientation="sensorLandscape"
+            android:theme="@style/SplashTheme">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />

@ -41,16 +42,21 @@
        </activity>

        <activity
-            android:name=".ui.activity.DetailActivity"
+            android:name=".ui.activity.HomeActivity"
            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
-            android:launchMode="singleTop"
            android:screenOrientation="sensorLandscape" />

        <activity
-            android:name=".ui.activity.HomeActivity"
+            android:name=".ui.activity.VodActivity"
            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
            android:screenOrientation="sensorLandscape" />

+        <activity
+            android:name=".ui.activity.DetailActivity"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:launchMode="singleTop"
+            android:screenOrientation="sensorLandscape" />
+
        <activity
            android:name=".ui.activity.PushActivity"
            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
@ -68,10 +74,5 @@
            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
            android:screenOrientation="sensorLandscape" />

-        <activity
-            android:name=".ui.activity.VodActivity"
-            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
-            android:screenOrientation="sensorLandscape" />
-
    </application>
 </manifest>
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SplashActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SplashActivity.java
@ -3,8 +3,10 @@ package com.fongmi.android.tv.ui.activity;
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.annotation.SuppressLint;
+import android.os.Bundle;
 import android.view.View;

+import androidx.core.splashscreen.SplashScreen;
 import androidx.viewbinding.ViewBinding;

 import com.fongmi.android.tv.api.ApiConfig;
@ -22,6 +24,12 @@ public class SplashActivity extends BaseActivity {
        return mBinding = ActivitySplashBinding.inflate(getLayoutInflater());
    }

+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        SplashScreen.installSplashScreen(this);
+        super.onCreate(savedInstanceState);
+    }
+
    @Override
    protected void initView() {
        mBinding.title.animate().alpha(1).setDuration(2000).setListener(onAnimationEnd()).start();
--- a/app/src/leanback/res/layout/dialog_config.xml
+++ b/app/src/leanback/res/layout/dialog_config.xml
@ -30,7 +30,7 @@
        android:layout_above="@+id/bottom"
        android:layout_alignStart="@+id/info"
        android:layout_marginBottom="16dp"
-        android:hint="@string/dialog_config_url_hint"
+        android:hint="@string/dialog_config_hint"
        android:imeOptions="actionDone"
        android:importantForAutofill="no"
        android:inputType="text"
--- a/app/src/leanback/res/values-zh-rCN/strings.xml
+++ b/app/src/leanback/res/values-zh-rCN/strings.xml
@ -0,0 +1,23 @@
+<resources xmlns:xliff="http://schemas.android.com/apk/res-auto">
+
+    <!-- Home -->
+    <string name="home_vod">点播</string>
+    <string name="home_live">直播</string>
+    <string name="home_search">搜索</string>
+    <string name="home_push">推送</string>
+    <string name="home_setting">设定</string>
+    <string name="home_history">最近观看</string>
+    <string name="home_recommend">更新推荐</string>
+
+    <!-- Search -->
+    <string name="search_hint">输入关键字…</string>
+    <string name="search_clear">清空</string>
+    <string name="search_remote">远程</string>
+
+    <!-- Push -->
+    <string name="push_info">手机或电脑连接同一个局域网，扫描 QR Code 或浏览器输入地址\n<xliff:g name="name">%s</xliff:g></string>
+
+    <!-- Dialog -->
+    <string name="dialog_config_info">手机或电脑连接同一个局域网\n扫描 QR Code 或浏览器输入地址\n<xliff:g name="name">%s</xliff:g></string>
+
+</resources>
--- a/app/src/leanback/res/values-zh-rTW/strings.xml
+++ b/app/src/leanback/res/values-zh-rTW/strings.xml
@ -0,0 +1,23 @@
+<resources xmlns:xliff="http://schemas.android.com/apk/res-auto">
+
+    <!-- Home -->
+    <string name="home_vod">點播</string>
+    <string name="home_live">直播</string>
+    <string name="home_search">搜尋</string>
+    <string name="home_push">推送</string>
+    <string name="home_setting">設定</string>
+    <string name="home_history">最近觀看</string>
+    <string name="home_recommend">更新推薦</string>
+
+    <!-- Search -->
+    <string name="search_hint">輸入關鍵字…</string>
+    <string name="search_clear">清除</string>
+    <string name="search_remote">遠端</string>
+
+    <!-- Push -->
+    <string name="push_info">手機或電腦連接同一個區域網路，掃描 QR Code 或瀏覽器輸入網址\n<xliff:g name="name">%s</xliff:g></string>
+
+    <!-- Dialog -->
+    <string name="dialog_config_info">手機或電腦連接同一個區域網路\n掃描 QR Code 或瀏覽器輸入網址\n<xliff:g name="name">%s</xliff:g></string>
+
+</resources>
--- a/app/src/leanback/res/values/strings.xml
+++ b/app/src/leanback/res/values/strings.xml
@ -0,0 +1,23 @@
+<resources xmlns:xliff="http://schemas.android.com/apk/res-auto">
+
+    <!-- Home -->
+    <string name="home_vod">Vod</string>
+    <string name="home_live">Live</string>
+    <string name="home_search">Search</string>
+    <string name="home_push">Push</string>
+    <string name="home_setting">Setting</string>
+    <string name="home_history">History</string>
+    <string name="home_recommend">Recommend</string>
+
+    <!-- Search -->
+    <string name="search_hint">Keywords…</string>
+    <string name="search_clear">Clear</string>
+    <string name="search_remote">Remote</string>
+
+    <!-- Push -->
+    <string name="push_info">Connect phone or pc to LAN and scan QR Code or enter the URL in browser\n<xliff:g name="name">%s</xliff:g></string>
+
+    <!-- Dialog -->
+    <string name="dialog_config_info">Connect phone or pc to LAN and Scan QR Code or enter the URL in browser\n<xliff:g name="name">%s</xliff:g></string>
+
+</resources>
--- a/app/src/leanback/res/values/styles.xml
+++ b/app/src/leanback/res/values/styles.xml
@ -13,4 +13,10 @@
        <item name="android:windowTranslucentNavigation">true</item>
    </style>

+    <style name="SplashTheme" parent="Theme.SplashScreen">
+        <item name="windowSplashScreenAnimatedIcon">@mipmap/ic_launcher_foreground</item>
+        <item name="windowSplashScreenBackground">@drawable/wallpaper_1</item>
+        <item name="postSplashScreenTheme">@style/AppTheme</item>
+    </style>
+
 </resources>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -7,26 +7,9 @@
    <!-- Splash -->
    <string name="splash_info">正在加载配置</string>

-    <!-- Home -->
-    <string name="home_vod">点播</string>
-    <string name="home_live">直播</string>
-    <string name="home_search">搜索</string>
-    <string name="home_push">推送</string>
-    <string name="home_setting">设定</string>
-    <string name="home_history">最近观看</string>
-    <string name="home_recommend">更新推荐</string>
-
    <!-- Vod -->
    <string name="vod_last">上次看到<xliff:g name="name">%s</xliff:g></string>

-    <!-- Search -->
-    <string name="search_hint">输入关键字…</string>
-    <string name="search_clear">清空</string>
-    <string name="search_remote">远程</string>
-
-    <!-- Push -->
-    <string name="push_info">手机或电脑连接同一个局域网，扫描 QR Code 或浏览器输入地址\n<xliff:g name="name">%s</xliff:g></string>
-
    <!-- Detail -->
    <string name="detail_site">站源：<xliff:g name="name">%s</xliff:g></string>
    <string name="detail_year">年份：<xliff:g name="name">%s</xliff:g></string>
@ -58,8 +41,7 @@
    <!-- Dialog -->
    <string name="dialog_positive">确定</string>
    <string name="dialog_negative">取消</string>
-    <string name="dialog_config_url_hint">请输入配置接口</string>
-    <string name="dialog_config_info">手机或电脑连接同一个局域网\n扫描 QR Code 或浏览器输入地址\n<xliff:g name="name">%s</xliff:g></string>
+    <string name="dialog_config_hint">请输入配置接口</string>

    <!-- Error -->
    <string name="error_config_get">配置取得失败</string>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -7,26 +7,9 @@
    <!-- Splash -->
    <string name="splash_info">正在載入配置</string>

-    <!-- Home -->
-    <string name="home_vod">點播</string>
-    <string name="home_live">直播</string>
-    <string name="home_search">搜尋</string>
-    <string name="home_push">推送</string>
-    <string name="home_setting">設定</string>
-    <string name="home_history">最近觀看</string>
-    <string name="home_recommend">更新推薦</string>
-
    <!-- Vod -->
    <string name="vod_last">上次看到<xliff:g name="name">%s</xliff:g></string>

-    <!-- Search -->
-    <string name="search_hint">輸入關鍵字…</string>
-    <string name="search_clear">清除</string>
-    <string name="search_remote">遠端</string>
-
-    <!-- Push -->
-    <string name="push_info">手機或電腦連接同一個區域網路，掃描 QR Code 或瀏覽器輸入網址\n<xliff:g name="name">%s</xliff:g></string>
-
    <!-- Detail -->
    <string name="detail_site">站源：<xliff:g name="name">%s</xliff:g></string>
    <string name="detail_year">年份：<xliff:g name="name">%s</xliff:g></string>
@ -58,8 +41,7 @@
    <!-- Dialog -->
    <string name="dialog_positive">確定</string>
    <string name="dialog_negative">取消</string>
-    <string name="dialog_config_url_hint">請輸入配置接口</string>
-    <string name="dialog_config_info">手機或電腦連接同一個區域網路\n掃描 QR Code 或瀏覽器輸入網址\n<xliff:g name="name">%s</xliff:g></string>
+    <string name="dialog_config_hint">請輸入配置接口</string>

    <!-- Error -->
    <string name="error_config_get">配置取得失敗</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -7,26 +7,9 @@
    <!-- Splash -->
    <string name="splash_info">Loading configuration</string>

-    <!-- Home -->
-    <string name="home_vod">Vod</string>
-    <string name="home_live">Live</string>
-    <string name="home_search">Search</string>
-    <string name="home_push">Push</string>
-    <string name="home_setting">Setting</string>
-    <string name="home_history">History</string>
-    <string name="home_recommend">Recommend</string>
-
    <!-- Vod -->
    <string name="vod_last">Last seen <xliff:g name="name">%s</xliff:g></string>

-    <!-- Search -->
-    <string name="search_hint">Keywords…</string>
-    <string name="search_clear">Clear</string>
-    <string name="search_remote">Remote</string>
-
-    <!-- Push -->
-    <string name="push_info">Connect phone or pc to LAN and scan QR Code or enter the URL in browser\n<xliff:g name="name">%s</xliff:g></string>
-
    <!-- Detail -->
    <string name="detail_site">Site: <xliff:g name="name">%s</xliff:g></string>
    <string name="detail_year">Year: <xliff:g name="name">%s</xliff:g></string>
@ -58,8 +41,7 @@
    <!-- Dialog -->
    <string name="dialog_positive">OK</string>
    <string name="dialog_negative">Cancel</string>
-    <string name="dialog_config_url_hint">Please enter the configuration url</string>
-    <string name="dialog_config_info">Connect phone or pc to LAN and Scan QR Code or enter the URL in browser\n<xliff:g name="name">%s</xliff:g></string>
+    <string name="dialog_config_hint">Please enter the configuration url</string>

    <!-- Error -->
    <string name="error_config_get">Configuration get failed</string>