Merge pull request #31 from guyijie1211/theme

0.2.8
guyijie1211 · Aug 25, 2022 · efedcc9 · efedcc9
2 parents f7062fd + aec8c53
commit efedcc9
Show file tree

Hide file tree

Showing 20 changed files with 260 additions and 133 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -69,7 +69,6 @@
             android:windowSoftInputMode="adjustPan" />
         <activity
             android:name=".ui.setting.SettingActivity"
-            android:theme="@style/PreferenceScreen"
             android:label="设置" />
         <activity
             android:name=".ui.login.LoginActivity"

diff --git a/app/src/main/java/com/sunnyweather/android/MainActivity.kt b/app/src/main/java/com/sunnyweather/android/MainActivity.kt
@@ -54,6 +54,7 @@ class MainActivity : AppCompatActivity(), AreaSingleFragment.FragmentListener {
     private lateinit var mMenu: Menu
     private var themeActived = R.style.SunnyWeather
     private var autoDark = true
+    private var pureDark = false
     private var mShortcutManager:ShortcutManager? = null
     private var activityMain = this
 
@@ -62,6 +63,7 @@ class MainActivity : AppCompatActivity(), AreaSingleFragment.FragmentListener {
         //颜色主题
         val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
         autoDark = sharedPreferences.getBoolean("autoDark", true)
+        pureDark = sharedPreferences.getBoolean("pureDark", false)
         if (autoDark) {
             if(SunnyWeatherApplication.isNightMode(this)){
                 themeActived = R.style.nightTheme
@@ -73,7 +75,11 @@ class MainActivity : AppCompatActivity(), AreaSingleFragment.FragmentListener {
         } else {
             themeActived = sharedPreferences.getInt("theme", R.style.SunnyWeather)
         }
-        setTheme(themeActived)
+        if (pureDark && themeActived == R.style.nightTheme) {
+            setTheme(R.style.nightTheme_dark)
+        } else {
+            setTheme(themeActived)
+        }
         setContentView(R.layout.activity_main)
         drawer_dark_switch.isChecked = (themeActived == R.style.nightTheme)
         BarUtils.addMarginTopEqualStatusBarHeight(drawer_nick)
@@ -171,7 +177,7 @@ class MainActivity : AppCompatActivity(), AreaSingleFragment.FragmentListener {
                 var sharedPref = getSharedPreferences("JustLive", Context.MODE_PRIVATE)
                 val ignoreVersion = sharedPref.getInt("ignoreVersion",0)
                 val versionNum = SunnyWeatherApplication.getVersionCode(SunnyWeatherApplication.context)
-                if (versionNum == updateInfo.versionNum || ignoreVersion == updateInfo.versionNum) {
+                if (versionNum >= updateInfo.versionNum || ignoreVersion == updateInfo.versionNum) {
                     if (isVersionCheck) {
                         Toast.makeText(SunnyWeatherApplication.context, "当前已是最新版本^_^", Toast.LENGTH_SHORT).show()
                     }
@@ -263,8 +269,9 @@ class MainActivity : AppCompatActivity(), AreaSingleFragment.FragmentListener {
         super.onResume()
         val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
         val newTheme = sharedPreferences.getInt("theme", R.style.SunnyWeather)
+        val newPureDark = sharedPreferences.getBoolean("pureDark", false)
         drawer_dark_switch.isChecked = (themeActived == R.style.nightTheme)
-        if (newTheme != themeActived){
+        if (newTheme != themeActived || newPureDark != pureDark){
             recreate()
         }
     }

diff --git a/app/src/main/java/com/sunnyweather/android/ui/about/AboutActvity.kt b/app/src/main/java/com/sunnyweather/android/ui/about/AboutActvity.kt
@@ -22,6 +22,7 @@ class AboutActvity: AppCompatActivity(){
         val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
         var themeActived: Int
         val autoDark = sharedPreferences.getBoolean("autoDark", true)
+        val pureDark = sharedPreferences.getBoolean("pureDark", false)
         if (autoDark) {
             if(SunnyWeatherApplication.isNightMode(this)){
                 themeActived = R.style.nightTheme
@@ -33,19 +34,17 @@ class AboutActvity: AppCompatActivity(){
         } else {
             themeActived = sharedPreferences.getInt("theme", R.style.SunnyWeather)
         }
-        setTheme(themeActived)
-        setContentView(R.layout.activity_about)
-        BarUtils.transparentStatusBar(this)
-        BarUtils.addMarginTopEqualStatusBarHeight(about_container)
-        if (themeActived != R.style.nightTheme) {
-            BarUtils.setStatusBarLightMode(this, true)
-            BarUtils.setStatusBarColor(this, resources.getColor(R.color.colorPrimaryVariant))
+        if (pureDark && themeActived == R.style.nightTheme) {
+            setTheme(R.style.nightTheme_dark)
         } else {
-            BarUtils.setStatusBarLightMode(this, false)
-            BarUtils.setStatusBarColor(this, resources.getColor(R.color.colorPrimaryVariant_night))
+            setTheme(themeActived)
         }
+        setContentView(R.layout.activity_about)
+        BarUtils.transparentStatusBar(this)
+        BarUtils.addMarginTopEqualStatusBarHeight(about_back)
+        BarUtils.setStatusBarLightMode(this, themeActived != R.style.nightTheme)
 
-        about_version.text = AppUtils.getAppVersionName()
+        about_version.text = "版本号:" + AppUtils.getAppVersionName()
 
         about_pic.setImageDrawable(AppUtils.getAppIcon())
 
@@ -71,10 +70,6 @@ class AboutActvity: AppCompatActivity(){
             var intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://qm.qq.com/cgi-bin/qm/qr?k=_2KootdkU0ikLiFhBCQMJKW7PjHzySZ8&authKey=2dGp04G04G/+a1KHiIjqjpg1Se+/TgpQ5yzpEbMkzP9Y6lkrFdReKdtBtg6xC+Cs&noverify=0"))
             this.startActivity(intent)
         }
-        about_telegram.setOnClickListener {
-            var intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://t.me/+4r0VneskqvY1NWNl"))
-            this.startActivity(intent)
-        }
         about_github.setOnClickListener {
             var intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/guyijie1211"))
             this.startActivity(intent)
@@ -86,14 +81,21 @@ class AboutActvity: AppCompatActivity(){
         about_back.setOnClickListener {
             this.onBackPressed()
         }
-        about_email.setOnClickListener {
-            val email = Intent(Intent.ACTION_SEND)
-            email.type = "text/plain"
-            email.putExtra(Intent.EXTRA_EMAIL, arrayOf("1056025931@qq.com"))
-            startActivity(Intent.createChooser(email, "选择邮件APP"))
+        about_bug.setOnClickListener {
+            var intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://www.wolai.com/f/PjHjXcBVzyMs237mDLbrh"))
+            this.startActivity(intent)
+        }
+        about_new.setOnClickListener {
+            var intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://www.wolai.com/f/eR8bqaBKPQeCDzyJWhBTNC"))
+            this.startActivity(intent)
+        }
+        about_progress.setOnClickListener {
+            var intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://www.wolai.com/fpajKKnFwFiiai92UHd1Kk"))
+            this.startActivity(intent)
+        }
+        about_forum.setOnClickListener {
+            var intent = Intent(Intent.ACTION_VIEW, Uri.parse("https://www.9rai.com"))
+            this.startActivity(intent)
         }
-//        about_apple.setOnClickListener {
-//            ToastUtils.showShort("开发中")
-//        }
     }
 }
diff --git a/app/src/main/java/com/sunnyweather/android/ui/follows/OnLiveFragment.kt b/app/src/main/java/com/sunnyweather/android/ui/follows/OnLiveFragment.kt
@@ -53,7 +53,6 @@ class OnLiveFragment(private val isLive: Boolean) : Fragment() {
                 refresh_home.finishLoadMoreWithNoMoreData()
                 return@setOnRefreshListener
             }
-            viewModel.clearRoomList()
             viewModel.getRoomsOn(SunnyWeatherApplication.userInfo?.uid)
         }
 

diff --git a/app/src/main/java/com/sunnyweather/android/ui/liveRoom/LiveRoomActivity.kt b/app/src/main/java/com/sunnyweather/android/ui/liveRoom/LiveRoomActivity.kt
@@ -106,6 +106,7 @@ class LiveRoomActivity : AppCompatActivity(), Utils.OnAppStatusChangedListener,
         val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
         var theme: Int
         val autoDark = sharedPreferences.getBoolean("autoDark", true)
+        val pureDark = sharedPreferences.getBoolean("pureDark", false)
         if (autoDark) {
             if(SunnyWeatherApplication.isNightMode(this)){
                 theme = R.style.nightTheme
@@ -117,7 +118,11 @@ class LiveRoomActivity : AppCompatActivity(), Utils.OnAppStatusChangedListener,
         } else {
             theme = sharedPreferences.getInt("theme", R.style.SunnyWeather)
         }
-        setTheme(theme)
+        if (pureDark && theme == R.style.nightTheme) {
+            setTheme(R.style.nightTheme_dark)
+        } else {
+            setTheme(theme)
+        }
         setContentView(R.layout.activity_liveroom)
         val playBackGround = sharedPreferences.getBoolean("play_background", false)
         val backTiny = sharedPreferences.getBoolean("tiny_when_back", false)

diff --git a/app/src/main/java/com/sunnyweather/android/ui/login/LoginActivity.kt b/app/src/main/java/com/sunnyweather/android/ui/login/LoginActivity.kt
@@ -35,6 +35,7 @@ class LoginActivity: AppCompatActivity() {
         val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
         var theme: Int
         val autoDark = sharedPreferences.getBoolean("autoDark", true)
+        val pureDark = sharedPreferences.getBoolean("pureDark", false)
         if (autoDark) {
             if(SunnyWeatherApplication.isNightMode(this)){
                 theme = R.style.nightTheme
@@ -46,7 +47,11 @@ class LoginActivity: AppCompatActivity() {
         } else {
             theme = sharedPreferences.getInt("theme", R.style.SunnyWeather)
         }
-        setTheme(theme)
+        if (pureDark && theme == R.style.nightTheme) {
+            setTheme(R.style.nightTheme_dark)
+        } else {
+            setTheme(theme)
+        }
         setContentView(R.layout.activity_login)
         if (theme != R.style.nightTheme) {
             BarUtils.setStatusBarLightMode(this, true)

diff --git a/app/src/main/java/com/sunnyweather/android/ui/login/RegisterActivity.kt b/app/src/main/java/com/sunnyweather/android/ui/login/RegisterActivity.kt
@@ -30,6 +30,7 @@ class RegisterActivity: AppCompatActivity() {
         val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
         var theme: Int
         val autoDark = sharedPreferences.getBoolean("autoDark", true)
+        val pureDark = sharedPreferences.getBoolean("pureDark", false)
         if (autoDark) {
             if(SunnyWeatherApplication.isNightMode(this)){
                 theme = R.style.nightTheme
@@ -41,7 +42,11 @@ class RegisterActivity: AppCompatActivity() {
         } else {
             theme = sharedPreferences.getInt("theme", R.style.SunnyWeather)
         }
-        setTheme(theme)
+        if (pureDark && theme == R.style.nightTheme) {
+            setTheme(R.style.nightTheme_dark)
+        } else {
+            setTheme(theme)
+        }
         setContentView(R.layout.activity_register)
         if (theme != R.style.nightTheme) {
             BarUtils.setStatusBarLightMode(this, true)

diff --git a/app/src/main/java/com/sunnyweather/android/ui/search/SearchActivity.kt b/app/src/main/java/com/sunnyweather/android/ui/search/SearchActivity.kt
@@ -49,6 +49,7 @@ class SearchActivity : AppCompatActivity(), View.OnClickListener {
         val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
         var themeActived: Int
         val autoDark = sharedPreferences.getBoolean("autoDark", true)
+        val pureDark = sharedPreferences.getBoolean("pureDark", false)
         if (autoDark) {
             if(SunnyWeatherApplication.isNightMode(this)){
                 themeActived = R.style.nightTheme
@@ -60,7 +61,11 @@ class SearchActivity : AppCompatActivity(), View.OnClickListener {
         } else {
             themeActived = sharedPreferences.getInt("theme", R.style.SunnyWeather)
         }
-        setTheme(themeActived)
+        if (pureDark && themeActived == R.style.nightTheme) {
+            setTheme(R.style.nightTheme_dark)
+        } else {
+            setTheme(themeActived)
+        }
         setContentView(R.layout.activity_search)
         BarUtils.transparentStatusBar(this)
         if (themeActived != R.style.nightTheme) {

diff --git a/app/src/main/java/com/sunnyweather/android/ui/setting/SettingActivity.kt b/app/src/main/java/com/sunnyweather/android/ui/setting/SettingActivity.kt
@@ -17,6 +17,7 @@ class SettingActivity : AppCompatActivity() {
         val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
         var theme: Int
         val autoDark = sharedPreferences.getBoolean("autoDark", true)
+        val pureDark = sharedPreferences.getBoolean("pureDark", false)
         if (autoDark) {
             if(SunnyWeatherApplication.isNightMode(this)){
                 theme = R.style.nightTheme
@@ -28,11 +29,18 @@ class SettingActivity : AppCompatActivity() {
         } else {
             theme = sharedPreferences.getInt("theme", R.style.SunnyWeather)
         }
+        theme = if (theme == R.style.SunnyWeather) {
+            R.style.PreferenceScreen
+        } else if (pureDark) {
+            R.style.PreferenceScreen_dark
+        } else {
+            R.style.PreferenceScreen_night
+        }
         setTheme(theme)
         setContentView(R.layout.activity_setting)
         BarUtils.transparentStatusBar(this)
         BarUtils.addMarginTopEqualStatusBarHeight(setting_toolbar)
-        if (theme != R.style.nightTheme) {
+        if (theme != R.style.PreferenceScreen_night) {
             BarUtils.setStatusBarLightMode(this, true)
         } else {
             BarUtils.setStatusBarLightMode(this, false)

diff --git a/app/src/main/java/com/sunnyweather/android/ui/setting/SettingFragment.kt b/app/src/main/java/com/sunnyweather/android/ui/setting/SettingFragment.kt
@@ -38,6 +38,7 @@ class SettingFragment : PreferenceFragmentCompat() {
         val versionPreferences = findPreference<Preference>("version")
         val aboutPreferences = findPreference<Preference>("about_activity")
         val donatePreferences = findPreference<Preference>("donate")
+        val pureDarkPreference: SwitchPreferenceCompat? = findPreference("pureDark")
         signaturePreference?.isChecked =
             sharedPreferences.getInt("theme", R.style.SunnyWeather) != R.style.SunnyWeather
         signaturePreference?.setOnPreferenceChangeListener { _, newValue  ->
@@ -52,6 +53,10 @@ class SettingFragment : PreferenceFragmentCompat() {
             }
             true
         }
+        pureDarkPreference?.setOnPreferenceChangeListener { _, _ ->
+            activity?.recreate()
+            true
+        }
         autoDark?.setOnPreferenceChangeListener { _, newValue ->
             if (newValue as Boolean) {
                 if(SunnyWeatherApplication.isNightMode(requireActivity())){
@@ -135,7 +140,7 @@ class SettingFragment : PreferenceFragmentCompat() {
                 var sharedPref = getSharedPreferences(requireContext(), "JustLive")
                 val ignoreVersion = sharedPref.getInt("ignoreVersion",0)
                 val versionNum = SunnyWeatherApplication.getVersionCode(SunnyWeatherApplication.context)
-                if (versionNum == updateInfo.versionNum) {
+                if (versionNum >= updateInfo.versionNum) {
                     Toast.makeText(SunnyWeatherApplication.context, "当前已是最新版本^_^", Toast.LENGTH_SHORT).show()
                     return@observe
                 }

diff --git a/app/src/main/java/com/sunnyweather/android/util/dkplayer/YJControlWrapper.java b/app/src/main/java/com/sunnyweather/android/util/dkplayer/YJControlWrapper.java
@@ -17,7 +17,7 @@
  * 并对部分api做了封装，方便使用
  */
 public class YJControlWrapper extends ControlWrapper {
-    private Boolean isLandscape = false;
+    private Boolean isLandscape = ScreenUtils.isLandscape();
 
     public YJControlWrapper(@NonNull MediaPlayerControl playerControl, @NonNull IVideoController controller) {
         super(playerControl, controller);

diff --git a/app/src/main/res/drawable-v24/logo_wolai.png b/app/src/main/res/drawable-v24/logo_wolai.png
diff --git a/...es/drawable/ic_baseline_arrow_back_24.xml → ...n/res/drawable/ic_baseline_arrow_back.xml b/...es/drawable/ic_baseline_arrow_back_24.xml → ...n/res/drawable/ic_baseline_arrow_back.xml
@@ -3,8 +3,8 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
+    android:tint="?attr/colorOnPrimary">
   <path
-      android:fillColor="@android:color/white"
+      android:fillColor="?attr/colorOnPrimary"
       android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/logo_forums.png b/app/src/main/res/drawable/logo_forums.png