From d3e34e698277b4df25d838d6f5a319021522a98d Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Tue, 8 Nov 2022 14:18:25 +0800
Subject: [PATCH] Remove splash

---
 app/src/leanback/AndroidManifest.xml          | 10 +--
 .../android/tv/ui/activity/HomeActivity.java  | 35 +++++++---
 .../tv/ui/activity/SplashActivity.java        | 67 -------------------
 app/src/leanback/res/values/styles.xml        |  8 +--
 .../com/fongmi/android/tv/api/ApiConfig.java  |  4 --
 5 files changed, 28 insertions(+), 96 deletions(-)
 delete mode 100644 app/src/leanback/java/com/fongmi/android/tv/ui/activity/SplashActivity.java

diff --git a/app/src/leanback/AndroidManifest.xml b/app/src/leanback/AndroidManifest.xml
index 4d7ee9f3b..87f7d90de 100644
--- a/app/src/leanback/AndroidManifest.xml
+++ b/app/src/leanback/AndroidManifest.xml
@@ -27,11 +27,10 @@
             android:value="540" />
 
         <activity
-            android:name=".ui.activity.SplashActivity"
+            android:name=".ui.activity.HomeActivity"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
             android:exported="true"
-            android:screenOrientation="sensorLandscape"
-            android:theme="@style/SplashTheme">
+            android:screenOrientation="sensorLandscape">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -40,11 +39,6 @@
             </intent-filter>
         </activity>
 
-        <activity
-            android:name=".ui.activity.HomeActivity"
-            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
-            android:screenOrientation="sensorLandscape" />
-
         <activity
             android:name=".ui.activity.VodActivity"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java
index 31b863f37..6c6755945 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/HomeActivity.java
@@ -1,7 +1,5 @@
 package com.fongmi.android.tv.ui.activity;
 
-import android.app.Activity;
-import android.content.Intent;
 import android.view.KeyEvent;
 import android.view.View;
 
@@ -18,6 +16,8 @@ import androidx.viewbinding.ViewBinding;
 import com.fongmi.android.tv.App;
 import com.fongmi.android.tv.R;
 import com.fongmi.android.tv.api.ApiConfig;
+import com.fongmi.android.tv.api.LiveConfig;
+import com.fongmi.android.tv.api.WallConfig;
 import com.fongmi.android.tv.bean.Func;
 import com.fongmi.android.tv.bean.History;
 import com.fongmi.android.tv.bean.Result;
@@ -27,6 +27,7 @@ import com.fongmi.android.tv.databinding.ActivityHomeBinding;
 import com.fongmi.android.tv.event.RefreshEvent;
 import com.fongmi.android.tv.event.ServerEvent;
 import com.fongmi.android.tv.model.SiteViewModel;
+import com.fongmi.android.tv.net.Callback;
 import com.fongmi.android.tv.server.Server;
 import com.fongmi.android.tv.ui.custom.CustomRowPresenter;
 import com.fongmi.android.tv.ui.custom.CustomSelector;
@@ -59,11 +60,6 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
     private SiteViewModel mViewModel;
     private boolean mConfirmExit;
 
-    public static void start(Activity activity) {
-        activity.startActivity(new Intent(activity, HomeActivity.class));
-        activity.finish();
-    }
-
     @Override
     protected ViewBinding getBinding() {
         return mBinding = ActivityHomeBinding.inflate(getLayoutInflater());
@@ -71,13 +67,15 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
 
     @Override
     protected void initView() {
+        WallConfig.get().init();
+        LiveConfig.get().init();
+        ApiConfig.get().init().load(getCallback());
         Updater.create(this).start();
         Server.get().start();
         setRecyclerView();
         setViewModel();
         setAdapter();
         getHistory();
-        getVideo();
         setFocus();
     }
 
@@ -123,12 +121,26 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
         App.post(() -> mBinding.title.setFocusable(true), 500);
     }
 
+    private Callback getCallback() {
+        return new Callback() {
+            @Override
+            public void success() {
+                getVideo();
+            }
+
+            @Override
+            public void error(int resId) {
+                Notify.show(resId);
+            }
+        };
+    }
+
     private void getVideo() {
         int index = getRecommendIndex();
         mViewModel.getResult().setValue(Result.empty());
+        String home = ApiConfig.get().getHome().getName();
+        mBinding.title.setText(home.isEmpty() ? ResUtil.getString(R.string.app_name) : home);
         if (mAdapter.size() > index) mAdapter.removeItems(index, mAdapter.size() - index);
-        if (ApiConfig.getHomeName().isEmpty()) mBinding.title.setText(R.string.app_name);
-        else mBinding.title.setText(ApiConfig.getHomeName());
         if (ApiConfig.get().getHome().getKey().isEmpty()) return;
         mViewModel.homeContent();
         mAdapter.add("progress");
@@ -316,6 +328,9 @@ public class HomeActivity extends BaseActivity implements CustomTitleView.Listen
     @Override
     protected void onDestroy() {
         super.onDestroy();
+        WallConfig.get().clear();
+        LiveConfig.get().clear();
+        ApiConfig.get().clear();
         Server.get().stop();
     }
 }
\ No newline at end of file
diff --git 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
deleted file mode 100644
index 0ddbe5256..000000000
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SplashActivity.java
+++ /dev/null
@@ -1,67 +0,0 @@
-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;
-import com.fongmi.android.tv.api.LiveConfig;
-import com.fongmi.android.tv.api.WallConfig;
-import com.fongmi.android.tv.databinding.ActivitySplashBinding;
-import com.fongmi.android.tv.net.Callback;
-import com.fongmi.android.tv.utils.Notify;
-
-@SuppressLint("CustomSplashScreen")
-public class SplashActivity extends BaseActivity {
-
-    private ActivitySplashBinding mBinding;
-
-    @Override
-    protected ViewBinding getBinding() {
-        return mBinding = ActivitySplashBinding.inflate(getLayoutInflater());
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        SplashScreen.installSplashScreen(this);
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    protected void initView() {
-        WallConfig.get().init();
-        LiveConfig.get().init();
-        ApiConfig.get().init().load(getCallback());
-        mBinding.title.animate().alpha(1).setDuration(1000).setListener(onAnimationEnd()).start();
-    }
-
-    private AnimatorListenerAdapter onAnimationEnd() {
-        return new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationEnd(Animator animation) {
-                mBinding.info.animate().alpha(1).setDuration(500).start();
-                mBinding.title.setVisibility(View.GONE);
-            }
-        };
-    }
-
-    private Callback getCallback() {
-        return new Callback() {
-            @Override
-            public void success() {
-                HomeActivity.start(getActivity());
-            }
-
-            @Override
-            public void error(int resId) {
-                HomeActivity.start(getActivity());
-                Notify.show(resId);
-            }
-        };
-    }
-}
diff --git a/app/src/leanback/res/values/styles.xml b/app/src/leanback/res/values/styles.xml
index ddbb5f5ae..11b83549a 100644
--- a/app/src/leanback/res/values/styles.xml
+++ b/app/src/leanback/res/values/styles.xml
@@ -7,18 +7,12 @@
         <item name="colorPrimaryDark">@color/primaryDark</item>
         <item name="colorAccent">@color/blue_500</item>
         <item name="android:windowAnimationStyle">@null</item>
-        <item name="android:windowBackground">@drawable/wallpaper_1</item>
+        <item name="android:windowBackground">@color/white</item>
         <item name="android:windowFullscreen">true</item>
         <item name="android:windowTranslucentStatus">true</item>
         <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>
-
     <style name="VodStyle">
         <item name="cornerSize">8dp</item>
         <item name="cornerFamily">rounded</item>
diff --git a/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java b/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java
index 6fd28e160..90bcb0026 100644
--- a/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java
+++ b/app/src/main/java/com/fongmi/android/tv/api/ApiConfig.java
@@ -60,10 +60,6 @@ public class ApiConfig {
         return get().getSites().indexOf(get().getHome());
     }
 
-    public static String getHomeName() {
-        return get().getHome().getName();
-    }
-
     public static String getSiteName(String key) {
         return get().getSite(key).getName();
     }