Optimized immersive status bar.

zhujiang2 · zhujiang2 · commit 493896b447e5 · 2022-07-30T18:07:33.000+08:00
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/java/com/zj/play/main/login/LoginActivity.kt b/app/src/main/java/com/zj/play/main/login/LoginActivity.kt
@@ -35,7 +35,7 @@ class LoginActivity : BaseActivity(), View.OnClickListener {
     override fun initView() {
         binding.loginButton.setOnClickListener(this)
         binding.loginTvRegister.setOnClickListener(this)
-        viewModel.state.observe(this, {
+        viewModel.state.observe(this) {
             when (it) {
                 Logging -> {
                     toProgressVisible(true)
@@ -49,7 +49,7 @@ class LoginActivity : BaseActivity(), View.OnClickListener {
                     toProgressVisible(false)
                 }
             }
-        })
+        }
     }
 
     override fun onClick(v: View) {
diff --git a/app/src/main/java/com/zj/play/official/OfficialAccountsFragment.kt b/app/src/main/java/com/zj/play/official/OfficialAccountsFragment.kt
@@ -5,6 +5,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
+import com.blankj.utilcode.util.BarUtils
 import com.google.android.material.tabs.TabLayoutMediator
 import com.zj.core.view.custom.FragmentAdapter
 import com.zj.play.databinding.FragmentOfficialAccountsBinding
@@ -37,6 +38,7 @@ class OfficialAccountsFragment : BaseTabFragment() {
             TabLayoutMediator(officialTabLayout, officialViewPager2) { tab, position ->
                 tab.text = adapter.title(position)
             }.attach()
+            officialTabLayout.setPadding(0, BarUtils.getStatusBarHeight(), 0, 0)
         }
     }
 
diff --git a/app/src/main/java/com/zj/play/project/ProjectFragment.kt b/app/src/main/java/com/zj/play/project/ProjectFragment.kt
@@ -6,6 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
+import com.blankj.utilcode.util.BarUtils.getStatusBarHeight
 import com.google.android.material.tabs.TabLayoutMediator
 import com.zj.core.view.custom.FragmentAdapter
 import com.zj.play.databinding.FragmentProjectBinding
@@ -37,6 +38,7 @@ class ProjectFragment : BaseTabFragment() {
             TabLayoutMediator(projectTabLayout, projectViewPager2) { tab, position ->
                 tab.text = adapter.title(position)
             }.attach()
+            projectTabLayout.setPadding(0, getStatusBarHeight(), 0, 0)
         }
     }
 
diff --git a/app/src/main/res/layout-land/activity_login.xml b/app/src/main/res/layout-land/activity_login.xml
@@ -12,7 +12,8 @@
         android:layout_height="@dimen/dp_70"
         android:layout_gravity="center"
         android:layout_marginTop="@dimen/dp_30"
-        android:src="@drawable/logo_reverse" />
+        android:src="@drawable/logo_reverse"
+        tools:ignore="ContentDescription" />
 
     <FrameLayout
         android:id="@+id/loginLayoutBottom"
@@ -46,7 +47,7 @@
                 android:gravity="center_horizontal"
                 android:text="@string/app_name"
                 android:textColor="@color/white"
-                android:textSize="@dimen/dp_24" />
+                android:textSize="@dimen/sp_24" />
 
             <EditText
                 android:id="@+id/loginUserNumberEdit"
@@ -57,12 +58,14 @@
                 android:layout_marginTop="@dimen/dp_15"
                 android:background="@drawable/bg_edittext"
                 android:hint="@string/enter_name"
+                android:importantForAutofill="no"
                 android:lines="1"
                 android:paddingHorizontal="@dimen/dp_5"
                 android:singleLine="true"
                 android:textColor="@color/text_color_black"
                 android:textColorHint="@color/plain"
-                android:textSize="@dimen/dp_14" />
+                android:textSize="@dimen/sp_14"
+                tools:ignore="TextFields" />
 
             <EditText
                 android:id="@+id/loginPassNumberEdit"
@@ -73,22 +76,24 @@
                 android:layout_marginTop="@dimen/dp_10"
                 android:background="@drawable/bg_edittext"
                 android:hint="@string/enter_password"
+                android:importantForAutofill="no"
                 android:lines="1"
                 android:paddingHorizontal="@dimen/dp_5"
                 android:singleLine="true"
                 android:textColor="@color/text_color_black"
                 android:textColorHint="@color/plain"
-                android:textSize="@dimen/dp_14" />
+                android:textSize="@dimen/sp_14"
+                tools:ignore="TextFields" />
 
             <TextView
                 android:id="@+id/loginTvRegister"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="right"
+                android:layout_gravity="end"
                 android:layout_marginTop="@dimen/dp_5"
                 android:text="@string/register_account"
                 android:textColor="@color/text_click_color"
-                android:textSize="@dimen/dp_14" />
+                android:textSize="@dimen/sp_14" />
 
             <Button
                 android:id="@+id/loginButton"
@@ -101,7 +106,7 @@
                 android:background="@drawable/btn_login_bg"
                 android:text="@string/login"
                 android:textColor="@color/text_color"
-                android:textSize="@dimen/dp_14" />
+                android:textSize="@dimen/sp_14" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout-land/fragment_official_accounts.xml b/app/src/main/res/layout-land/fragment_official_accounts.xml
@@ -5,15 +5,10 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_10"
-        android:background="@color/colorPrimary" />
-
     <com.google.android.material.tabs.TabLayout
         android:id="@+id/officialTabLayout"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_45"
+        android:layout_height="@dimen/dp_60"
         android:background="@color/colorPrimary"
         app:tabGravity="fill"
         app:tabIndicatorColor="@color/white"
diff --git a/app/src/main/res/layout-land/fragment_project.xml b/app/src/main/res/layout-land/fragment_project.xml
@@ -5,15 +5,10 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_10"
-        android:background="@color/colorPrimary" />
-
     <com.google.android.material.tabs.TabLayout
         android:id="@+id/projectTabLayout"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_45"
+        android:layout_height="@dimen/dp_60"
         android:background="@color/colorPrimary"
         app:tabGravity="fill"
         app:tabIndicatorColor="@color/white"
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
@@ -11,8 +11,9 @@
         android:layout_width="@dimen/dp_70"
         android:layout_height="@dimen/dp_70"
         android:layout_gravity="center"
-        android:layout_marginTop="@dimen/dp_150"
-        android:src="@drawable/logo_reverse" />
+        android:layout_marginTop="@dimen/dp_120"
+        android:src="@drawable/logo_reverse"
+        tools:ignore="ContentDescription" />
 
     <FrameLayout
         android:id="@+id/loginLayoutBottom"
@@ -35,7 +36,7 @@
             android:id="@+id/loginInputElements"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
+            android:layout_gravity="center"
             android:orientation="vertical"
             tools:ignore="UselessParent">
 
@@ -45,7 +46,7 @@
                 android:gravity="center_horizontal"
                 android:text="@string/app_name"
                 android:textColor="@color/white"
-                android:textSize="@dimen/dp_24" />
+                android:textSize="@dimen/sp_24" />
 
             <EditText
                 android:id="@+id/loginUserNumberEdit"
@@ -55,12 +56,14 @@
                 android:layout_marginTop="@dimen/dp_25"
                 android:background="@drawable/bg_edittext"
                 android:hint="@string/enter_name"
+                android:importantForAutofill="no"
                 android:lines="1"
                 android:paddingHorizontal="@dimen/dp_5"
                 android:singleLine="true"
                 android:textColor="@color/text_color"
                 android:textColorHint="@color/plain"
-                android:textSize="@dimen/dp_14" />
+                android:textSize="@dimen/sp_14"
+                tools:ignore="TextFields" />
 
             <EditText
                 android:id="@+id/loginPassNumberEdit"
@@ -70,23 +73,25 @@
                 android:layout_marginTop="@dimen/dp_10"
                 android:background="@drawable/bg_edittext"
                 android:hint="@string/enter_password"
+                android:importantForAutofill="no"
                 android:lines="1"
                 android:paddingHorizontal="@dimen/dp_5"
                 android:singleLine="true"
                 android:textColor="@color/text_color"
                 android:textColorHint="@color/plain"
-                android:textSize="@dimen/dp_14" />
+                android:textSize="@dimen/sp_14"
+                tools:ignore="TextFields" />
 
             <TextView
                 android:id="@+id/loginTvRegister"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="right"
+                android:layout_gravity="end"
                 android:layout_marginHorizontal="@dimen/dp_35"
                 android:layout_marginTop="@dimen/dp_10"
                 android:text="@string/register_account"
                 android:textColor="@color/text_click_color"
-                android:textSize="@dimen/dp_14" />
+                android:textSize="@dimen/sp_14" />
 
             <Button
                 android:id="@+id/loginButton"
@@ -98,7 +103,7 @@
                 android:background="@drawable/btn_login_bg"
                 android:text="@string/login"
                 android:textColor="@color/text_color"
-                android:textSize="@dimen/dp_14" />
+                android:textSize="@dimen/sp_14" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml
@@ -8,7 +8,7 @@
 
     <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_70"
+        android:layout_height="@dimen/dp_75"
         android:background="@color/colorPrimary"
         android:fitsSystemWindows="true"
         android:orientation="vertical">
diff --git a/app/src/main/res/layout/fragment_official_accounts.xml b/app/src/main/res/layout/fragment_official_accounts.xml
@@ -5,15 +5,10 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_20"
-        android:background="@color/colorPrimary" />
-
     <com.google.android.material.tabs.TabLayout
         android:id="@+id/officialTabLayout"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_50"
+        android:layout_height="@dimen/dp_75"
         android:background="@color/colorPrimary"
         app:tabGravity="fill"
         app:tabIndicatorColor="@color/white"
diff --git a/app/src/main/res/layout/fragment_project.xml b/app/src/main/res/layout/fragment_project.xml
@@ -5,15 +5,10 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_20"
-        android:background="@color/colorPrimary" />
-
     <com.google.android.material.tabs.TabLayout
         android:id="@+id/projectTabLayout"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_50"
+        android:layout_height="@dimen/dp_75"
         android:background="@color/colorPrimary"
         app:tabGravity="fill"
         app:tabIndicatorColor="@color/white"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -11,6 +11,13 @@
     <style name="AppTheme.NoActionBar" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowActionBar">false</item>
+        <item name="android:windowTranslucentNavigation">true</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <!-- 设置statusBarColor 为透明-->
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowNoTitle">true</item>
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
@@ -37,7 +44,9 @@
         <item name="android:maxHeight">50dip</item>
         <item name="android:minHeight">10dip</item>
         <item name="android:indeterminateOnly">false</item>
-        <item name="android:indeterminateDrawable">@android:drawable/progress_indeterminate_horizontal</item>
+        <item name="android:indeterminateDrawable">
+            @android:drawable/progress_indeterminate_horizontal
+        </item>
         <item name="android:progressDrawable">@drawable/progressbar_main</item>
     </style>
 
diff --git a/core/src/main/res/layout/layout_title.xml b/core/src/main/res/layout/layout_title.xml
@@ -2,7 +2,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/dp_70"
+    android:layout_height="@dimen/dp_75"
     android:background="@color/colorPrimary"
     android:fitsSystemWindows="true"
     android:orientation="vertical">

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class LoginActivity : BaseActivity(), View.OnClickListener {`
`35`	`35`	`override fun initView() {`
`36`	`36`	`binding.loginButton.setOnClickListener(this)`
`37`	`37`	`binding.loginTvRegister.setOnClickListener(this)`
`38`		`- viewModel.state.observe(this, {`
	`38`	`+ viewModel.state.observe(this) {`
`39`	`39`	`when (it) {`
`40`	`40`	`Logging -> {`
`41`	`41`	`toProgressVisible(true)`
`@@ -49,7 +49,7 @@ class LoginActivity : BaseActivity(), View.OnClickListener {`
`49`	`49`	`toProgressVisible(false)`
`50`	`50`	`}`
`51`	`51`	`}`
`52`		`- })`
	`52`	`+ }`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`override fun onClick(v: View) {`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import android.view.View`
`5`	`5`	`import android.view.ViewGroup`
`6`	`6`	`import androidx.fragment.app.Fragment`
`7`	`7`	`import androidx.fragment.app.viewModels`
	`8`	`+import com.blankj.utilcode.util.BarUtils`
`8`	`9`	`import com.google.android.material.tabs.TabLayoutMediator`
`9`	`10`	`import com.zj.core.view.custom.FragmentAdapter`
`10`	`11`	`import com.zj.play.databinding.FragmentOfficialAccountsBinding`
`@@ -37,6 +38,7 @@ class OfficialAccountsFragment : BaseTabFragment() {`
`37`	`38`	`TabLayoutMediator(officialTabLayout, officialViewPager2) { tab, position ->`
`38`	`39`	`tab.text = adapter.title(position)`
`39`	`40`	`}.attach()`
	`41`	`+ officialTabLayout.setPadding(0, BarUtils.getStatusBarHeight(), 0, 0)`
`40`	`42`	`}`
`41`	`43`	`}`
`42`	`44`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ import android.view.View`
`6`	`6`	`import android.view.ViewGroup`
`7`	`7`	`import androidx.fragment.app.Fragment`
`8`	`8`	`import androidx.fragment.app.viewModels`
	`9`	`+import com.blankj.utilcode.util.BarUtils.getStatusBarHeight`
`9`	`10`	`import com.google.android.material.tabs.TabLayoutMediator`
`10`	`11`	`import com.zj.core.view.custom.FragmentAdapter`
`11`	`12`	`import com.zj.play.databinding.FragmentProjectBinding`
`@@ -37,6 +38,7 @@ class ProjectFragment : BaseTabFragment() {`
`37`	`38`	`TabLayoutMediator(projectTabLayout, projectViewPager2) { tab, position ->`
`38`	`39`	`tab.text = adapter.title(position)`
`39`	`40`	`}.attach()`
	`41`	`+ projectTabLayout.setPadding(0, getStatusBarHeight(), 0, 0)`
`40`	`42`	`}`
`41`	`43`	`}`
`42`	`44`