diff --git a/app/build.gradle b/app/build.gradle
index a27deae66..8cfe1a633 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,7 +4,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 30
-    buildToolsVersion "31.0.0-rc2"
+    buildToolsVersion "31.0.0-rc4"
     signingConfigs {
         def keystorePwd = null
         def alias = null
@@ -108,16 +108,16 @@ tasks.whenTaskAdded { task ->
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation "androidx.activity:activity:1.2.2"
+    implementation 'androidx.activity:activity:1.2.3'
     implementation 'androidx.biometric:biometric:1.1.0'
-    implementation "androidx.browser:browser:1.3.0"
+    implementation 'androidx.browser:browser:1.3.0'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.core:core:1.5.0-rc01'
+    implementation 'androidx.core:core:1.5.0'
     implementation 'androidx.dynamicanimation:dynamicanimation:1.1.0-alpha03'
-    implementation "androidx.fragment:fragment:1.3.3"
-    implementation "androidx.preference:preference:1.1.1"
+    implementation 'androidx.fragment:fragment:1.3.4'
+    implementation 'androidx.preference:preference:1.1.1'
     implementation 'androidx.recyclerview:recyclerview:1.2.0'
-    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01"
+    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01'
     implementation 'androidx.webkit:webkit:1.4.0'
     implementation 'com.drakeet.drawer:drawer:1.0.3'
     implementation 'com.google.android.material:material:1.3.0'
@@ -134,9 +134,9 @@ dependencies {
     implementation 'com.github.seven332:yorozuya-thread:0.1.1'
     implementation 'com.github.seven332:yorozuya-collect:0.1.4'
     implementation 'com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:1.0.0'
-    implementation "com.microsoft.appcenter:appcenter-analytics:4.1.1"
-    implementation "com.microsoft.appcenter:appcenter-crashes:4.1.1"
-    implementation "com.microsoft.appcenter:appcenter-distribute:4.1.1"
+    implementation 'com.microsoft.appcenter:appcenter-analytics:4.1.1'
+    implementation 'com.microsoft.appcenter:appcenter-crashes:4.1.1'
+    implementation 'com.microsoft.appcenter:appcenter-distribute:4.1.1'
     implementation 'com.squareup.okhttp3:okhttp:4.9.1'
     implementation 'com.squareup.okhttp3:okhttp-dnsoverhttps:4.9.1'
     implementation 'com.takisoft.preferencex:preferencex:1.1.0'
@@ -144,7 +144,8 @@ dependencies {
     implementation 'com.gitlab.NekoInverter:yorozuya:723dc867a9'
     implementation 'dev.rikka.rikkax.appcompat:appcompat:1.2.0-rc01'
     implementation 'dev.rikka.rikkax.core:core:1.3.2'
-    implementation 'dev.rikka.rikkax.material:material:1.6.4'
+    implementation 'dev.rikka.rikkax.insets:insets:1.1.0'
+    implementation 'dev.rikka.rikkax.material:material:1.6.5'
     implementation 'dev.rikka.rikkax.recyclerview:recyclerview-ktx:1.2.1'
     implementation 'dev.rikka.rikkax.widget:borderview:1.0.1'
     implementation 'dev.rikka.rikkax.preference:simplemenu-preference:1.0.2'
diff --git a/app/src/main/res/layout-land/activity_set_security.xml b/app/src/main/res/layout-land/activity_set_security.xml
index 176a3ac8c..7af72bd92 100755
--- a/app/src/main/res/layout-land/activity_set_security.xml
+++ b/app/src/main/res/layout-land/activity_set_security.xml
@@ -21,7 +21,7 @@
     android:orientation="horizontal"
     android:paddingHorizontal="@dimen/keyline_margin"
     android:baselineAligned="true"
-    app:fitSystemWindowsInsets="bottom">
+    app:fitsSystemWindowsInsets="bottom">
 
     <FrameLayout
         android:layout_width="0dp"
diff --git a/app/src/main/res/layout/activity_filter.xml b/app/src/main/res/layout/activity_filter.xml
index 6a18b625a..472640f96 100644
--- a/app/src/main/res/layout/activity_filter.xml
+++ b/app/src/main/res/layout/activity_filter.xml
@@ -23,7 +23,7 @@
         android:id="@+id/recycler_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:fitSystemWindowsInsets="bottom" />
+        app:fitsSystemWindowsInsets="bottom" />
 
     <TextView
         android:id="@+id/tip"
@@ -34,7 +34,7 @@
         android:drawablePadding="16dp"
         android:gravity="center_horizontal"
         android:text="@string/no_filter"
-        app:fitSystemWindowsInsets="bottom" />
+        app:fitsSystemWindowsInsets="bottom" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/fab"
@@ -45,6 +45,6 @@
         android:layout_marginBottom="@dimen/corner_fab_margin"
         android:layout_gravity="bottom|end"
         app:srcCompat="@drawable/v_plus_dark_x24"
-        app:layout_fitSystemWindowsInsets="bottom" />
+        app:layout_fitsSystemWindowsInsets="bottom" />
 
 </FrameLayout>
diff --git a/app/src/main/res/layout/activity_hosts.xml b/app/src/main/res/layout/activity_hosts.xml
index 24d1cece5..ff0a7d6f2 100644
--- a/app/src/main/res/layout/activity_hosts.xml
+++ b/app/src/main/res/layout/activity_hosts.xml
@@ -25,7 +25,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:clipToPadding="false"
-        app:fitSystemWindowsInsets="bottom" />
+        app:fitsSystemWindowsInsets="bottom" />
 
     <TextView
         android:id="@+id/tip"
@@ -35,7 +35,7 @@
         android:gravity="center"
         android:text="@string/hosts_tip"
         android:textSize="@dimen/text_super_large"
-        app:fitSystemWindowsInsets="bottom" />
+        app:fitsSystemWindowsInsets="bottom" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/fab"
@@ -46,6 +46,6 @@
         android:layout_marginBottom="@dimen/corner_fab_margin"
         android:layout_gravity="bottom|end"
         app:srcCompat="@drawable/v_plus_dark_x24"
-        app:layout_fitSystemWindowsInsets="bottom" />
+        app:layout_fitsSystemWindowsInsets="bottom" />
 
 </FrameLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 47e44c316..ecc3b98e7 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -21,7 +21,7 @@
     android:clipChildren="false"
     app:consumeSystemWindowsInsets="start|end"
     app:edgeToEdge="true"
-    app:fitSystemWindowsInsets="start|end">
+    app:fitsSystemWindowsInsets="start|end">
 
     <androidx.drawerlayout.widget.DrawerLayout
         android:id="@+id/draw_view"
diff --git a/app/src/main/res/layout/activity_preference.xml b/app/src/main/res/layout/activity_preference.xml
index 98544d9b2..ec8327b9d 100644
--- a/app/src/main/res/layout/activity_preference.xml
+++ b/app/src/main/res/layout/activity_preference.xml
@@ -5,7 +5,7 @@
     android:clipChildren="false"
     app:consumeSystemWindowsInsets="start|end"
     app:edgeToEdge="true"
-    app:fitSystemWindowsInsets="start|end"
+    app:fitsSystemWindowsInsets="start|end"
     android:orientation="vertical">
 
     <com.google.android.material.appbar.AppBarLayout
@@ -36,4 +36,4 @@
             android:clipChildren="false" />
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/activity_set_security.xml b/app/src/main/res/layout/activity_set_security.xml
index 7eb54b594..8cb7f7bba 100755
--- a/app/src/main/res/layout/activity_set_security.xml
+++ b/app/src/main/res/layout/activity_set_security.xml
@@ -20,7 +20,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:paddingHorizontal="@dimen/keyline_margin"
-    app:fitSystemWindowsInsets="bottom">
+    app:fitsSystemWindowsInsets="bottom">
 
     <TextView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_webview.xml b/app/src/main/res/layout/activity_webview.xml
index 48021f1bc..1ed354964 100644
--- a/app/src/main/res/layout/activity_webview.xml
+++ b/app/src/main/res/layout/activity_webview.xml
@@ -20,7 +20,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:animateLayoutChanges="true"
     android:orientation="vertical"
-    app:fitSystemWindowsInsets="bottom">
+    app:fitsSystemWindowsInsets="bottom">
 
     <WebView
         android:id="@+id/webview"
diff --git a/app/src/main/res/layout/gallery_detail_header.xml b/app/src/main/res/layout/gallery_detail_header.xml
index 853f08f9e..a454c9cac 100644
--- a/app/src/main/res/layout/gallery_detail_header.xml
+++ b/app/src/main/res/layout/gallery_detail_header.xml
@@ -32,7 +32,7 @@
             android:layout_weight="1"
             android:background="?attr/galleryDetailHeaderBackgroundColor"
             android:elevation="4dp"
-            app:fitSystemWindowsInsets="top" />
+            app:fitsSystemWindowsInsets="top" />
 
         <Space
             android:layout_width="match_parent"
@@ -50,7 +50,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@android:color/transparent"
-            app:fitSystemWindowsInsets="top">
+            app:fitsSystemWindowsInsets="top">
 
             <com.hippo.widget.LoadImageView
                 android:id="@+id/thumb"
diff --git a/app/src/main/res/layout/gallery_detail_previews.xml b/app/src/main/res/layout/gallery_detail_previews.xml
index dee3339d1..3fdfb638e 100644
--- a/app/src/main/res/layout/gallery_detail_previews.xml
+++ b/app/src/main/res/layout/gallery_detail_previews.xml
@@ -26,7 +26,7 @@
     android:orientation="vertical"
     android:padding="@dimen/keyline_margin"
     android:showDividers="middle"
-    app:fitSystemWindowsInsets="bottom">
+    app:fitsSystemWindowsInsets="bottom">
 
     <com.hippo.widget.SimpleGridAutoSpanLayout
         android:id="@+id/grid_layout"
diff --git a/app/src/main/res/layout/preference_recyclerview.xml b/app/src/main/res/layout/preference_recyclerview.xml
index b9180cd67..25d65ef9b 100644
--- a/app/src/main/res/layout/preference_recyclerview.xml
+++ b/app/src/main/res/layout/preference_recyclerview.xml
@@ -28,6 +28,6 @@
     android:fadeScrollbars="true"
     android:scrollbarStyle="outsideOverlay"
     android:scrollbars="vertical"
-    app:fitSystemWindowsInsets="bottom"
+    app:fitsSystemWindowsInsets="bottom"
     tools:ignore="UnusedResources"
-    tools:viewBindingIgnore="true" />
\ No newline at end of file
+    tools:viewBindingIgnore="true" />
diff --git a/app/src/main/res/layout/scene_analytics.xml b/app/src/main/res/layout/scene_analytics.xml
index 6b1f9c55d..c48056f63 100644
--- a/app/src/main/res/layout/scene_analytics.xml
+++ b/app/src/main/res/layout/scene_analytics.xml
@@ -21,7 +21,7 @@
     android:orientation="vertical"
     android:paddingHorizontal="@dimen/keyline_margin"
     android:paddingTop="@dimen/keyline_margin"
-    app:fitSystemWindowsInsets="top|bottom">
+    app:fitsSystemWindowsInsets="top|bottom">
 
     <ImageView
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/scene_cookie_sign_in.xml b/app/src/main/res/layout/scene_cookie_sign_in.xml
index aae36bb1b..87f5494a4 100644
--- a/app/src/main/res/layout/scene_cookie_sign_in.xml
+++ b/app/src/main/res/layout/scene_cookie_sign_in.xml
@@ -21,7 +21,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:padding="@dimen/keyline_margin"
-    app:fitSystemWindowsInsets="top|bottom">
+    app:fitsSystemWindowsInsets="top|bottom">
 
     <ImageView xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/scene_download.xml b/app/src/main/res/layout/scene_download.xml
index d07ca6f2a..797b648d5 100644
--- a/app/src/main/res/layout/scene_download.xml
+++ b/app/src/main/res/layout/scene_download.xml
@@ -28,7 +28,7 @@
             android:id="@+id/recycler_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            app:fitSystemWindowsInsets="bottom" />
+            app:fitsSystemWindowsInsets="bottom" />
 
         <com.hippo.easyrecyclerview.FastScroller
             android:id="@+id/fast_scroller"
@@ -39,7 +39,7 @@
             android:paddingTop="8dp"
             android:paddingRight="4dp"
             android:paddingBottom="8dp"
-            app:fitSystemWindowsInsets="bottom" />
+            app:fitsSystemWindowsInsets="bottom" />
 
     </FrameLayout>
 
@@ -59,7 +59,7 @@
         android:layout_height="match_parent"
         android:paddingRight="@dimen/corner_fab_margin"
         android:paddingBottom="@dimen/corner_fab_margin"
-        app:fitSystemWindowsInsets="bottom">
+        app:fitsSystemWindowsInsets="bottom">
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             style="@style/Widget.FloatingActionButton.Accent.Mini"
diff --git a/app/src/main/res/layout/scene_favorites.xml b/app/src/main/res/layout/scene_favorites.xml
index eced5dd4e..8ec461cae 100644
--- a/app/src/main/res/layout/scene_favorites.xml
+++ b/app/src/main/res/layout/scene_favorites.xml
@@ -24,7 +24,7 @@
         android:id="@+id/content_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:fitSystemWindowsInsets="top|bottom" />
+        app:fitsSystemWindowsInsets="top|bottom" />
 
     <com.hippo.ehviewer.widget.SearchBar
         android:id="@+id/search_bar"
@@ -33,7 +33,7 @@
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="@dimen/gallery_search_bar_margin_h"
         android:layout_marginVertical="@dimen/gallery_search_bar_margin_v"
-        app:layout_fitSystemWindowsInsets="top|bottom" />
+        app:layout_fitsSystemWindowsInsets="top|bottom" />
 
     <com.hippo.widget.FabLayout
         android:id="@+id/fab_layout"
@@ -41,7 +41,7 @@
         android:layout_height="match_parent"
         android:paddingRight="@dimen/corner_fab_margin"
         android:paddingBottom="@dimen/corner_fab_margin"
-        app:fitSystemWindowsInsets="top|bottom">
+        app:fitsSystemWindowsInsets="top|bottom">
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             style="@style/Widget.FloatingActionButton.Accent.Mini"
diff --git a/app/src/main/res/layout/scene_gallery_comments.xml b/app/src/main/res/layout/scene_gallery_comments.xml
index 22b0ce101..4524d99af 100644
--- a/app/src/main/res/layout/scene_gallery_comments.xml
+++ b/app/src/main/res/layout/scene_gallery_comments.xml
@@ -30,7 +30,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:clipToPadding="false"
-            app:fitSystemWindowsInsets="bottom" />
+            app:fitsSystemWindowsInsets="bottom" />
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
@@ -43,7 +43,7 @@
         android:drawablePadding="8dp"
         android:gravity="center_horizontal"
         android:text="@string/no_one_comments_gallery"
-        app:fitSystemWindowsInsets="bottom" />
+        app:fitsSystemWindowsInsets="bottom" />
 
     <LinearLayout
         android:id="@+id/edit_panel"
@@ -56,7 +56,7 @@
         android:visibility="invisible"
         android:outlineAmbientShadowColor="?attr/widgetColorThemePrimary"
         android:outlineSpotShadowColor="?attr/widgetColorThemePrimary"
-        app:fitSystemWindowsInsets="bottom">
+        app:fitsSystemWindowsInsets="bottom">
 
         <EditText
             android:id="@+id/edit_text"
@@ -91,7 +91,7 @@
         android:layout_height="match_parent"
         android:paddingRight="@dimen/corner_fab_margin"
         android:paddingBottom="@dimen/corner_fab_margin"
-        app:fitSystemWindowsInsets="bottom">
+        app:fitsSystemWindowsInsets="bottom">
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/fab"
diff --git a/app/src/main/res/layout/scene_gallery_detail.xml b/app/src/main/res/layout/scene_gallery_detail.xml
index b03ec3004..9206b33fd 100644
--- a/app/src/main/res/layout/scene_gallery_detail.xml
+++ b/app/src/main/res/layout/scene_gallery_detail.xml
@@ -37,7 +37,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        app:fitSystemWindowsInsets="top|bottom" />
+        app:fitsSystemWindowsInsets="top|bottom" />
 
     <TextView
         android:id="@+id/tip"
@@ -47,6 +47,6 @@
         android:layout_gravity="center"
         android:drawablePadding="8dp"
         android:gravity="center_horizontal"
-        app:fitSystemWindowsInsets="top|bottom" />
+        app:fitsSystemWindowsInsets="top|bottom" />
 
 </FrameLayout>
diff --git a/app/src/main/res/layout/scene_gallery_info.xml b/app/src/main/res/layout/scene_gallery_info.xml
index 952c605dc..5ea92d450 100644
--- a/app/src/main/res/layout/scene_gallery_info.xml
+++ b/app/src/main/res/layout/scene_gallery_info.xml
@@ -19,4 +19,4 @@
     android:id="@+id/recycler_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    app:fitSystemWindowsInsets="bottom" />
+    app:fitsSystemWindowsInsets="bottom" />
diff --git a/app/src/main/res/layout/scene_gallery_list.xml b/app/src/main/res/layout/scene_gallery_list.xml
index a09acc6f6..35fddacf5 100644
--- a/app/src/main/res/layout/scene_gallery_list.xml
+++ b/app/src/main/res/layout/scene_gallery_list.xml
@@ -25,13 +25,13 @@
         android:id="@+id/content_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:fitSystemWindowsInsets="top|bottom" />
+        app:fitsSystemWindowsInsets="top|bottom" />
 
     <com.hippo.ehviewer.widget.SearchLayout
         android:id="@+id/search_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layout_fitSystemWindowsInsets="top|bottom" />
+        app:layout_fitsSystemWindowsInsets="top|bottom" />
 
     <com.hippo.ehviewer.widget.SearchBar
         android:id="@+id/search_bar"
@@ -40,7 +40,7 @@
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="@dimen/gallery_search_bar_margin_h"
         android:layout_marginVertical="@dimen/gallery_search_bar_margin_v"
-        app:layout_fitSystemWindowsInsets="top|bottom" />
+        app:layout_fitsSystemWindowsInsets="top|bottom" />
 
     <com.hippo.widget.FabLayout
         android:id="@+id/fab_layout"
@@ -48,7 +48,7 @@
         android:layout_height="match_parent"
         android:paddingRight="@dimen/corner_fab_margin"
         android:paddingBottom="@dimen/corner_fab_margin"
-        app:fitSystemWindowsInsets="top|bottom">
+        app:fitsSystemWindowsInsets="top|bottom">
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             style="@style/Widget.FloatingActionButton.Accent.Mini"
@@ -80,7 +80,7 @@
         android:layout_height="match_parent"
         android:paddingRight="@dimen/corner_fab_margin"
         android:paddingBottom="@dimen/corner_fab_margin"
-        app:fitSystemWindowsInsets="top|bottom">
+        app:fitsSystemWindowsInsets="top|bottom">
 
         <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/search_fab"
diff --git a/app/src/main/res/layout/scene_gallery_previews.xml b/app/src/main/res/layout/scene_gallery_previews.xml
index aa985af14..4a7ccd052 100644
--- a/app/src/main/res/layout/scene_gallery_previews.xml
+++ b/app/src/main/res/layout/scene_gallery_previews.xml
@@ -21,4 +21,4 @@
     android:layout_height="match_parent"
     android:clipToPadding="false"
     android:clipChildren="false"
-    app:fitSystemWindowsInsets="bottom" />
+    app:fitsSystemWindowsInsets="bottom" />
diff --git a/app/src/main/res/layout/scene_history.xml b/app/src/main/res/layout/scene_history.xml
index 9a245aae0..3d3644aa9 100644
--- a/app/src/main/res/layout/scene_history.xml
+++ b/app/src/main/res/layout/scene_history.xml
@@ -28,7 +28,7 @@
             android:id="@+id/recycler_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            app:fitSystemWindowsInsets="bottom" />
+            app:fitsSystemWindowsInsets="bottom" />
 
         <com.hippo.easyrecyclerview.FastScroller
             android:id="@+id/fast_scroller"
@@ -39,7 +39,7 @@
             android:paddingTop="8dp"
             android:paddingRight="4dp"
             android:paddingBottom="8dp"
-            app:fitSystemWindowsInsets="bottom" />
+            app:fitsSystemWindowsInsets="bottom" />
 
     </FrameLayout>
 
@@ -52,6 +52,6 @@
         android:drawablePadding="16dp"
         android:gravity="center_horizontal"
         android:text="@string/no_history"
-        app:fitSystemWindowsInsets="bottom" />
+        app:fitsSystemWindowsInsets="bottom" />
 
 </FrameLayout>
diff --git a/app/src/main/res/layout/scene_login.xml b/app/src/main/res/layout/scene_login.xml
index db537f863..94779cfe4 100644
--- a/app/src/main/res/layout/scene_login.xml
+++ b/app/src/main/res/layout/scene_login.xml
@@ -19,7 +19,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    app:fitSystemWindowsInsets="top|bottom">
+    app:fitsSystemWindowsInsets="top|bottom">
 
     <ScrollView
         android:id="@+id/login_form"
diff --git a/app/src/main/res/layout/scene_progress.xml b/app/src/main/res/layout/scene_progress.xml
index d5ab9ab50..1a7abfe91 100644
--- a/app/src/main/res/layout/scene_progress.xml
+++ b/app/src/main/res/layout/scene_progress.xml
@@ -18,7 +18,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    app:fitSystemWindowsInsets="top|bottom">
+    app:fitsSystemWindowsInsets="top|bottom">
 
     <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/progress"
diff --git a/app/src/main/res/layout/scene_security.xml b/app/src/main/res/layout/scene_security.xml
index 6b9b29f3d..926070953 100755
--- a/app/src/main/res/layout/scene_security.xml
+++ b/app/src/main/res/layout/scene_security.xml
@@ -18,7 +18,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    app:fitSystemWindowsInsets="top|bottom">
+    app:fitsSystemWindowsInsets="top|bottom">
 
     <com.hippo.widget.MaxSizeContainer xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/scene_select_site.xml b/app/src/main/res/layout/scene_select_site.xml
index 7c5610def..ad8ce3f09 100644
--- a/app/src/main/res/layout/scene_select_site.xml
+++ b/app/src/main/res/layout/scene_select_site.xml
@@ -21,7 +21,7 @@
     android:orientation="vertical"
     android:paddingHorizontal="@dimen/keyline_margin"
     android:paddingTop="@dimen/keyline_margin"
-    app:fitSystemWindowsInsets="top|bottom">
+    app:fitsSystemWindowsInsets="top|bottom">
 
     <ScrollView
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/scene_warning.xml b/app/src/main/res/layout/scene_warning.xml
index 92240b2a2..6fe84592f 100644
--- a/app/src/main/res/layout/scene_warning.xml
+++ b/app/src/main/res/layout/scene_warning.xml
@@ -21,7 +21,7 @@
     android:orientation="vertical"
     android:paddingHorizontal="@dimen/keyline_margin"
     android:paddingTop="@dimen/keyline_margin"
-    app:fitSystemWindowsInsets="top|bottom">
+    app:fitsSystemWindowsInsets="top|bottom">
 
     <ImageView
         android:layout_width="wrap_content"
diff --git a/build.gradle b/build.gradle
index a4e85dbbb..b193cdb2a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools:r8:3.0.33-dev'
-        classpath 'com.android.tools.build:gradle:7.0.0-alpha14'
+        classpath 'com.android.tools.build:gradle:7.0.0-beta01'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6505bcfcb..1d69d7bbe 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Apr 10 09:41:24 CST 2021
+#Fri May 21 10:46:00 CST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME