修复界面工具栏问题

2022-07-04 22:39:28 +08:00 · 2022-07-04 22:39:28 +08:00 · d6978460f0
commit d6978460f0
parent db57af9208
55 changed files with 780 additions and 646 deletions
--- a/.gradle/7.3.3/checksums/checksums.lock
+++ b/.gradle/7.3.3/checksums/checksums.lock
--- a/.gradle/7.3.3/checksums/sha1-checksums.bin
+++ b/.gradle/7.3.3/checksums/sha1-checksums.bin
--- a/.gradle/7.3.3/executionHistory/executionHistory.bin
+++ b/.gradle/7.3.3/executionHistory/executionHistory.bin
--- a/.gradle/7.3.3/executionHistory/executionHistory.lock
+++ b/.gradle/7.3.3/executionHistory/executionHistory.lock
--- a/.gradle/7.3.3/fileHashes/fileHashes.bin
+++ b/.gradle/7.3.3/fileHashes/fileHashes.bin
--- a/.gradle/7.3.3/fileHashes/fileHashes.lock
+++ b/.gradle/7.3.3/fileHashes/fileHashes.lock
--- a/.gradle/7.3.3/fileHashes/resourceHashesCache.bin
+++ b/.gradle/7.3.3/fileHashes/resourceHashesCache.bin
--- a/.gradle/buildOutputCleanup/buildOutputCleanup.lock
+++ b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
--- a/.gradle/buildOutputCleanup/outputFiles.bin
+++ b/.gradle/buildOutputCleanup/outputFiles.bin
--- a/.gradle/file-system.probe
+++ b/.gradle/file-system.probe
--- a/app/build.gradle
+++ b/app/build.gradle
@ -69,8 +69,6 @@ android {

 dependencies {

-    //视频播放器
-//    implementation 'com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v8.2.0-release-jitpack'
    //权限申请
    implementation 'com.guolindev.permissionx:permissionx:1.6.1'
    implementation "androidx.room:room-runtime:2.4.0"
@ -89,7 +87,7 @@ dependencies {
    implementation 'io.github.youth5201314:banner:2.2.2'
    implementation 'androidx.core:core-ktx:1.7.0'
    implementation 'com.github.deano2390:MaterialShowcaseView:1.3.4'
-    implementation 'com.google.code.gson:gson:2.8.8'
+    implementation 'com.google.code.gson:gson:2.8.9'
    implementation 'com.github.yalantis:ucrop:2.2.6-native'
    implementation 'com.kongzue.stacklabel:stacklabelview:1.1.9'
    implementation files('libs/editor_0.8.aar')
@ -112,7 +110,7 @@ dependencies {
    implementation 'androidx.preference:preference-ktx:1.1.1'

    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'

 }
--- a/app/src/androidTest/java/com/coldmint/rust/pro/ExampleInstrumentedTest.java
+++ b/app/src/androidTest/java/com/coldmint/rust/pro/ExampleInstrumentedTest.java
@ -11,7 +11,7 @@ import org.junit.runner.RunWith;
 import static org.junit.Assert.*;

 /**
- * Instrumented test, which will execute on an Android device.
+ * 仪器测试，将在Android设备上执行。
 *
 * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
 */
@ -19,7 +19,7 @@ import static org.junit.Assert.*;
 public class ExampleInstrumentedTest {
    @Test
    public void useAppContext() {
-        // Context of the app under test.
+        // 被测试应用程序的上下文。
        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
        assertEquals("com.coldmint.rust.pro", appContext.getPackageName());
    }
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@ -23,16 +23,17 @@
        android:supportsRtl="true"
        android:theme="@style/Theme.rust.Concept"
        android:usesCleartextTraffic="true">
-        <activity
-            android:name=".CreationWizardActivity"
-            android:exported="false" />
-        <activity
-            android:name=".TurretDesignActivity"
-            android:exported="false" />
-        <activity
-            android:name=".BrowserActivity"
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.fileProvider"
            android:exported="false"
-            android:label="@string/built_in_browser" /> <!-- 适配全面屏 -->
+            android:grantUriPermissions="true"
+            tools:ignore="WrongManifestParent">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/content_file_provider" />
+        </provider>
+
        <meta-data
            android:name="android.max_aspect"
            android:value="2.4" /> <!-- 适配华为（huawei）刘海屏 -->
@ -42,6 +43,19 @@
        <meta-data
            android:name="notch.config"
            android:value="portrait|landscape" /> <!-- Activity注册 -->
+        <activity
+            android:screenOrientation="portrait"
+            android:name=".CreationWizardActivity"
+            android:exported="false" />
+        <activity
+            android:name=".TurretDesignActivity"
+            android:screenOrientation="portrait"
+            android:exported="false" />
+        <activity
+            android:name=".BrowserActivity"
+            android:exported="false"
+            android:screenOrientation="portrait"
+            android:label="@string/built_in_browser" /> <!-- 适配全面屏 -->
        <activity
            android:name=".OrderListActivity"
            android:exported="false"
@ -88,6 +102,7 @@
            android:screenOrientation="portrait" />
        <activity
            android:name=".TagActivity"
+            android:exported="false"
            android:screenOrientation="portrait" />
        <activity
            android:name=".ReportActivity"
@ -106,19 +121,10 @@
            android:exported="false"
            android:screenOrientation="portrait" />

-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.fileProvider"
-            android:exported="false"
-            android:grantUriPermissions="true"
-            tools:ignore="WrongManifestParent">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/content_file_provider" />
-        </provider>

        <activity
            android:name=".ErrorActivity"
+            android:exported="false"
            android:screenOrientation="portrait" />
        <activity
            android:name="com.yalantis.ucrop.UCropActivity"
@ -300,33 +306,43 @@
            android:screenOrientation="portrait" />
        <activity
            android:name=".CodeTableActivity"
+            android:exported="false"
            android:screenOrientation="portrait" />
        <activity
            android:name=".LoginActivity"
+            android:exported="false"
            android:screenOrientation="portrait" />
        <activity
            android:name=".RegisterActivity"
+            android:exported="false"
            android:screenOrientation="portrait" />
        <activity
            android:name=".EditModInfoActivity"
+            android:exported="false"
            android:screenOrientation="portrait" />
        <activity
            android:name=".ApplicationListActivity"
+            android:exported="false"
            android:screenOrientation="portrait" />
        <activity
            android:name=".GameCheckActivity"
+            android:exported="false"
            android:screenOrientation="portrait" />
        <activity
            android:name=".RecyclingStationActivity"
+            android:exported="false"
            android:screenOrientation="portrait" />
        <activity
            android:name=".BookmarkManagerActivity"
+            android:exported="false"
            android:screenOrientation="portrait" />
        <activity
            android:name=".ReleaseModActivity"
+            android:exported="false"
            android:screenOrientation="portrait" />
        <activity
            android:name=".PackActivity"
+            android:exported="false"
            android:screenOrientation="portrait" />
    </application>

--- a/app/src/main/java/com/coldmint/rust/pro/EditActivity.kt
+++ b/app/src/main/java/com/coldmint/rust/pro/EditActivity.kt
@ -58,6 +58,8 @@ import com.coldmint.rust.pro.viewmodel.EditStartViewModel
 import com.coldmint.rust.pro.viewmodel.EditViewModel
 import com.flask.colorpicker.ColorPickerView
 import com.flask.colorpicker.builder.ColorPickerDialogBuilder
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.divider.MaterialDividerItemDecoration
 import com.google.android.material.snackbar.Snackbar
 import io.github.rosemoe.sora.data.CompletionItem
 import java.io.File
@ -109,29 +111,55 @@ class EditActivity : BaseActivity<ActivityEditBinding>() {
        EditEndBinding.bind(viewBinding.root)
    }

-    fun loadRenewalCard() {
-        val debugKey = "续费卡片"
+    fun showRenewalTip() {
+        val debugKey = "续费提示"
        val account = appSettings.getValue(AppSettings.Setting.Account, "")
        val time = appSettings.getValue(AppSettings.Setting.ExpirationTime, 0.toLong())
        if (time == 0.toLong() || account.isBlank()) {
-            DebugHelper.printLog(debugKey, "没有账号或续费信息，隐藏按钮，显示登录。")
-            viewBinding.editTip.text = getString(R.string.please_login_first)
-            viewBinding.renewalButton.isVisible = false
+            DebugHelper.printLog(debugKey, "没有账号或续费信息，关闭界面。")
+            Toast.makeText(this, "请先登录", Toast.LENGTH_SHORT).show()
+            finish()
        } else {
            val stringTime = ServerConfiguration.toStringTime(time)
            if (stringTime == ServerConfiguration.ForeverTime) {
-                DebugHelper.printLog(debugKey, "永久用户无需显示卡片。")
-                viewBinding.tipCardView.isVisible = false
+                DebugHelper.printLog(debugKey, "永久用户无需处理续费提示。")
            } else {
-                DebugHelper.printLog(debugKey, "普通用户，显示到期时间。")
-                val tip = String.format(
-                    getString(R.string.edit_tip), account,
-                    stringTime
-                )
-                viewBinding.editTip.text = tip
-                viewBinding.renewalButton.setOnClickListener {
+                val difference = time - System.currentTimeMillis()
+                if (difference < 0) {
+                    //已经过期
+                    DebugHelper.printLog(debugKey, "此用户的助手已经过期。")
+                    MaterialAlertDialogBuilder(this).setTitle(R.string.activation_app)
+                        .setMessage(
+                            R.string.activation_app_tip
+                        ).setPositiveButton(R.string.activate) { i, i2 ->
+                            finish()
                            val intent = Intent(this, ActivateActivity::class.java)
                            startActivity(intent)
+                        }.setNegativeButton(R.string.dialog_cancel) { i, i2 ->
+                            finish()
+                        }.setCancelable(false).show()
+                } else if (difference < 604800000) {
+                    //如果在7天内到期
+                    val day = difference / 86400000 + 1
+                    DebugHelper.printLog(
+                        debugKey,
+                        "显示续费提醒(" + difference + "/86400000)" + day + "天。"
+                    )
+                    MaterialAlertDialogBuilder(this).setTitle(R.string.renewal_tip_title)
+                        .setMessage(
+                            String.format(
+                                getString(R.string.renewal_tip_msg),
+                                account,
+                                day
+                            )
+                        ).setPositiveButton(R.string.renewal) { i, i2 ->
+                            val intent = Intent(this, ActivateActivity::class.java)
+                            startActivity(intent)
+                        }.setNegativeButton(R.string.dialog_cancel) { i, i2 ->
+                        }.setCancelable(false).show()
+                } else {
+                    DebugHelper.printLog(debugKey, "还剩余7天以上，无需提示。")
+
                }
            }
        }
@ -457,7 +485,7 @@ class EditActivity : BaseActivity<ActivityEditBinding>() {
            initCodeToolbar()
            initStartView()
            initEndView()
-            loadRenewalCard()
+            showRenewalTip()
        } else {
            val thisIntent = intent
            val bundle = thisIntent.getBundleExtra("data")
--- a/app/src/main/java/com/coldmint/rust/pro/LibraryActivity.kt
+++ b/app/src/main/java/com/coldmint/rust/pro/LibraryActivity.kt
@ -1,6 +1,7 @@
 package com.coldmint.rust.pro

 import android.os.Bundle
+import androidx.recyclerview.widget.DividerItemDecoration
 import com.coldmint.rust.pro.base.BaseActivity
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.coldmint.rust.pro.adapters.LibAdapter
@ -137,14 +138,14 @@ class LibraryActivity : BaseActivity<ActivityLibraryBinding>() {
                "Apache License 2.0"
            )
        )
-        libInfoArrayList.add(
-            LibInfo(
-                "material-dialogs",
-                "A beautiful, fluid, and extensible dialogs API for Kotlin & Android.",
-                "https://github.com/afollestad/material-dialogs",
-                "Apache License 2.0"
-            )
-        )
+//        libInfoArrayList.add(
+//            LibInfo(
+//                "material-dialogs",
+//                "A beautiful, fluid, and extensible dialogs API for Kotlin & Android.",
+//                "https://github.com/afollestad/material-dialogs",
+//                "Apache License 2.0"
+//            )
+//        )
        return libInfoArrayList
    }

@ -154,9 +155,14 @@ class LibraryActivity : BaseActivity<ActivityLibraryBinding>() {

    override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) {
        if (canUseView) {
-            viewBinding.toolbar.setTitle(R.string.libs)
-            //android:label="@string/mod_action1"
            setReturnButton()
+            title = getString(R.string.libs)
+            viewBinding.libsView.addItemDecoration(
+                DividerItemDecoration(
+                    this,
+                    DividerItemDecoration.VERTICAL
+                )
+            )
            viewBinding.libsView.layoutManager = LinearLayoutManager(this@LibraryActivity)
            val libAdapter = LibAdapter(this@LibraryActivity, getLibInfoList())
            viewBinding.libsView.adapter = libAdapter
--- a/app/src/main/java/com/coldmint/rust/pro/ThanksActivity.kt
+++ b/app/src/main/java/com/coldmint/rust/pro/ThanksActivity.kt
@ -1,6 +1,7 @@
 package com.coldmint.rust.pro

 import android.os.Bundle
+import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.coldmint.rust.pro.adapters.ThanksAdapter
 import com.coldmint.rust.pro.base.BaseActivity
@ -19,8 +20,14 @@ class ThanksActivity : BaseActivity<ActivityThanksBinding>() {

    override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) {
        if (canUseView) {
-            viewBinding.toolbar.setTitle(R.string.special_thanks_to)
+            title = getString(R.string.special_thanks_to)
            setReturnButton()
+            viewBinding.recyclerView.addItemDecoration(
+                DividerItemDecoration(
+                    this,
+                    DividerItemDecoration.VERTICAL
+                )
+            )
            viewBinding.recyclerView.layoutManager = LinearLayoutManager(this)
            val list = ArrayList<ThanksDataBean>()
            list.add(ThanksDataBean("空调大郎", "帮助翻译俄语版本。", 1491779490))
--- a/app/src/main/java/com/coldmint/rust/pro/adapters/LibAdapter.kt
+++ b/app/src/main/java/com/coldmint/rust/pro/adapters/LibAdapter.kt
@ -14,24 +14,25 @@ import android.widget.TextView
 import androidx.core.view.isVisible
 import com.coldmint.rust.pro.base.BaseAdapter
 import com.coldmint.rust.pro.databean.LibInfo
-import com.coldmint.rust.pro.databinding.LibItemBinding
+import com.coldmint.rust.pro.databinding.ItemLibBinding
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import java.util.ArrayList

 class LibAdapter(val context: Context, dataList: ArrayList<LibInfo>) :
-    BaseAdapter<LibItemBinding, LibInfo>(context, dataList) {
+    BaseAdapter<ItemLibBinding, LibInfo>(context, dataList) {

    override fun getViewBindingObject(
        layoutInflater: LayoutInflater,
        parent: ViewGroup,
        viewType: Int
-    ): LibItemBinding {
-        return LibItemBinding.inflate(layoutInflater, parent, false)
+    ): ItemLibBinding {
+        return ItemLibBinding.inflate(layoutInflater, parent, false)
    }

    override fun onBingView(
        data: LibInfo,
-        viewBinding: LibItemBinding,
-        viewHolder: BaseAdapter.ViewHolder<LibItemBinding>,
+        viewBinding: ItemLibBinding,
+        viewHolder: BaseAdapter.ViewHolder<ItemLibBinding>,
        position: Int
    ) {
        viewBinding.titleView.text = data.title
@ -53,9 +54,9 @@ class LibAdapter(val context: Context, dataList: ArrayList<LibInfo>) :
        if (tip != null) {
            viewBinding.tipView.isVisible = true
            viewBinding.tipView.setOnClickListener {
-                MaterialDialog(context).show {
-                    title(R.string.about).message(text = tip).negativeButton(R.string.close)
-                }
+                MaterialAlertDialogBuilder(context).setTitle(R.string.about).setMessage(tip)
+                    .setPositiveButton(R.string.close) { i, tab ->
+                    }.show()
            }
        }
    }
--- a/app/src/main/java/com/coldmint/rust/pro/fragments/MapFragment.kt
+++ b/app/src/main/java/com/coldmint/rust/pro/fragments/MapFragment.kt
@ -10,6 +10,7 @@ import android.view.LayoutInflater
 import android.view.View
 import androidx.core.content.FileProvider
 import androidx.core.view.isVisible
+import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.afollestad.materialdialogs.MaterialDialog
 import com.coldmint.rust.core.MapClass
@ -135,6 +136,12 @@ class MapFragment : BaseFragment<FragmentMapBinding>() {

    override fun whenViewCreated(inflater: LayoutInflater, savedInstanceState: Bundle?) {
        viewBinding.mapList.layoutManager = LinearLayoutManager(requireContext())
+        viewBinding.mapList.addItemDecoration(
+            DividerItemDecoration(
+                requireContext(),
+                DividerItemDecoration.VERTICAL
+            )
+        )
        val path = appSettings.getValue(AppSettings.Setting.MapFolder, "")
        if (path.isNotBlank()) {
            loadPath(File(path))
--- a/app/src/main/java/com/coldmint/rust/pro/fragments/ModFragment.kt
+++ b/app/src/main/java/com/coldmint/rust/pro/fragments/ModFragment.kt
@ -17,6 +17,7 @@ import android.os.Handler
 import android.view.View
 import android.widget.*
 import androidx.core.view.isVisible
+import androidx.recyclerview.widget.DividerItemDecoration
 import com.coldmint.rust.core.tool.FileOperator
 import com.coldmint.rust.pro.MainActivity
 import com.coldmint.rust.pro.adapters.ModActionAdapter
@ -107,6 +108,7 @@ class ModFragment : BaseFragment<ModFragmentBinding>() {
                        viewBinding.modError.isVisible = false
                        viewBinding.modErrorIcon.isVisible = false
                        viewBinding.progressBar.isVisible = false
+
                        viewBinding.modList.adapter = modAdapter
                    }, MainActivity.hideViewDelay)
                } else {
@ -351,5 +353,11 @@ class ModFragment : BaseFragment<ModFragmentBinding>() {

    override fun whenViewCreated(inflater: LayoutInflater, savedInstanceState: Bundle?) {
        viewBinding.modList.layoutManager = LinearLayoutManager(context)
+        viewBinding.modList.addItemDecoration(
+            DividerItemDecoration(
+                requireContext(),
+                DividerItemDecoration.VERTICAL
+            )
+        )
    }
 }
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@ -4,12 +4,15 @@
    xmlns:card_view="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
    android:orientation="vertical">

    <com.google.android.material.appbar.MaterialToolbar
        android:id="@+id/toolbar"
        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize" />
+        android:layout_height="?attr/actionBarSize"
+        android:fitsSystemWindows="true" />
+

    <RelativeLayout
        android:layout_width="match_parent"
@ -19,12 +22,11 @@
        android:paddingTop="8dp"
        android:paddingRight="16dp">

-        <androidx.cardview.widget.CardView
+        <com.google.android.material.card.MaterialCardView
            android:id="@+id/appInfoCardView"
+            style="@style/Widget.Material3.CardView.Filled"
            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:cardElevation="2dp"
-            card_view:cardCornerRadius="2dp">
+            android:layout_height="wrap_content">

            <LinearLayout
                android:layout_width="match_parent"
@ -61,16 +63,15 @@

            </LinearLayout>

-        </androidx.cardview.widget.CardView>
+        </com.google.android.material.card.MaterialCardView>

-        <androidx.cardview.widget.CardView
+        <com.google.android.material.card.MaterialCardView
+            style="@style/Widget.Material3.CardView.Filled"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_above="@id/copyRightView"
            android:layout_below="@id/appInfoCardView"
-            android:layout_marginTop="8dp"
-            app:cardElevation="2dp"
-            card_view:cardCornerRadius="2dp">
+            android:layout_marginTop="8dp">

            <RelativeLayout
                android:layout_width="match_parent"
@ -115,7 +116,7 @@

            </RelativeLayout>

-        </androidx.cardview.widget.CardView>
+        </com.google.android.material.card.MaterialCardView>

        <TextView
            android:id="@+id/copyRightView"
--- a/app/src/main/res/layout/activity_application_list.xml
+++ b/app/src/main/res/layout/activity_application_list.xml
@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:card_view="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".ActivateActivity">

    <com.google.android.material.appbar.AppBarLayout
        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?android:windowBackground"
+        android:layout_height="wrap_content"
        android:fitsSystemWindows="true">

-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
            android:id="@+id/toolbar"
            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:theme="?attr/actionBarStyle"
-            app:layout_collapseMode="pin"
-            app:layout_scrollFlags="scroll|enterAlways"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
+            android:layout_height="?attr/actionBarSize" />

    </com.google.android.material.appbar.AppBarLayout>

--- a/app/src/main/res/layout/activity_bookmark_manager.xml
+++ b/app/src/main/res/layout/activity_bookmark_manager.xml
@ -1,24 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:card_view="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".ActivateActivity">

    <com.google.android.material.appbar.AppBarLayout
        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?android:windowBackground"
+        android:layout_height="wrap_content"
        android:fitsSystemWindows="true">

-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
            android:id="@+id/toolbar"
            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:theme="?attr/actionBarStyle"
-            app:layout_collapseMode="pin"
-            app:layout_scrollFlags="scroll|enterAlways"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
+            android:layout_height="?attr/actionBarSize" />

    </com.google.android.material.appbar.AppBarLayout>

@ -61,7 +59,6 @@
        android:layout_height="wrap_content"
        android:layout_gravity="bottom|end"
        android:layout_margin="16dp"
-        android:src="@drawable/add"
-        app:tint="@color/white" />
+        android:src="@drawable/add"/>

 </androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/app/src/main/res/layout/activity_code_table.xml
+++ b/app/src/main/res/layout/activity_code_table.xml
@ -1,17 +1,40 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:card_view="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".ActivateActivity">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginLeft="16dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginRight="16dp"
+        android:animateLayoutChanges="true"
        android:gravity="center"
-    android:paddingLeft="16dp"
-    android:paddingTop="8dp"
-    android:paddingRight="16dp"
-    android:animateLayoutChanges="true">
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
+

        <ProgressBar
            android:id="@+id/progressBar"
            android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content" />

        <TextView
            android:id="@+id/displayView"
@ -21,11 +44,12 @@
            android:visibility="gone" />

        <ExpandableListView
-        android:visibility="gone"
            android:id="@+id/expandableListView"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-        android:layout_gravity="top" />
+            android:layout_gravity="top"
+            android:visibility="gone" />


-</LinearLayout>
+    </LinearLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/app/src/main/res/layout/activity_create_template.xml
+++ b/app/src/main/res/layout/activity_create_template.xml
@ -1,11 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:card_view="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".ActivateActivity">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.core.widget.NestedScrollView
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:paddingLeft="16dp"
        android:paddingTop="8dp"
-    android:paddingRight="16dp">
+        android:paddingRight="16dp"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">

        <LinearLayout
            android:layout_width="match_parent"
@ -133,4 +154,5 @@

        </LinearLayout>

-</ScrollView>
+    </androidx.core.widget.NestedScrollView>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/app/src/main/res/layout/activity_create_unit.xml
+++ b/app/src/main/res/layout/activity_create_unit.xml
@ -1,12 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:card_view="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".ActivateActivity">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginLeft="16dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginRight="16dp"
        android:orientation="vertical"
-    android:paddingLeft="16dp"
-    android:paddingTop="8dp"
-    android:paddingRight="16dp">
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">

        <RelativeLayout
            android:layout_width="match_parent"
@ -35,4 +56,5 @@
            android:layout_width="wrap_content"
            android:layout_height="wrap_content" />

-</LinearLayout>
+    </LinearLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/app/src/main/res/layout/activity_database_configuration.xml
+++ b/app/src/main/res/layout/activity_database_configuration.xml
@ -1,11 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:card_view="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:paddingLeft="16dp"
-    android:paddingTop="8dp"
-    android:paddingRight="16dp"
-    android:orientation="vertical">
+    android:fitsSystemWindows="true"
+    tools:context=".ActivateActivity">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginLeft="16dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginRight="16dp"
+        android:orientation="vertical"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">

        <RelativeLayout
            android:layout_width="wrap_content"
@ -27,4 +49,5 @@
                android:text="@string/update_off" />
        </RelativeLayout>

-</LinearLayout>
+    </LinearLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/app/src/main/res/layout/activity_edit.xml
+++ b/app/src/main/res/layout/activity_edit.xml
@ -23,7 +23,7 @@
                android:background="?android:windowBackground"
                android:fitsSystemWindows="true">

-                <androidx.appcompat.widget.Toolbar
+                <com.google.android.material.appbar.MaterialToolbar
                    android:id="@+id/toolbar"
                    android:layout_width="match_parent"
                    android:layout_height="?attr/actionBarSize"
@ -65,56 +65,6 @@

        </LinearLayout>

-        <androidx.cardview.widget.CardView
-            android:id="@+id/tipCardView"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_above="@id/recyclerview"
-            android:layout_margin="8dp">
-
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="8dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginRight="8dp"
-                    android:text="@string/renewal"
-                    android:textSize="24sp" />
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:padding="8dp">
-
-                    <TextView
-                        android:id="@+id/editTip"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentStart="true"
-                        android:layout_centerVertical="true"
-                        android:layout_toStartOf="@id/renewalButton"
-                        android:text="@string/edit_tip" />
-
-                    <Button
-                        android:id="@+id/renewalButton"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentEnd="true"
-                        android:layout_centerVertical="true"
-                        android:layout_marginStart="8dp"
-                        android:text="@string/renewal" />
-                </RelativeLayout>
-            </LinearLayout>
-
-
-        </androidx.cardview.widget.CardView>
-
        <androidx.recyclerview.widget.RecyclerView
            android:id="@+id/recyclerview"
            android:layout_width="match_parent"
--- a/app/src/main/res/layout/activity_edit_mod_info.xml
+++ b/app/src/main/res/layout/activity_edit_mod_info.xml
@ -8,20 +8,13 @@

    <com.google.android.material.appbar.AppBarLayout
        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?android:windowBackground"
+        android:layout_height="wrap_content"
        android:fitsSystemWindows="true">

-
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
            android:id="@+id/toolbar"
            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:theme="?attr/actionBarStyle"
-            app:layout_collapseMode="pin"
-            app:layout_scrollFlags="scroll|enterAlways"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
-
+            android:layout_height="?attr/actionBarSize" />

    </com.google.android.material.appbar.AppBarLayout>

--- a/app/src/main/res/layout/activity_edit_user_info.xml
+++ b/app/src/main/res/layout/activity_edit_user_info.xml
@ -8,23 +8,17 @@

    <com.google.android.material.appbar.AppBarLayout
        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?android:windowBackground"
+        android:layout_height="wrap_content"
        android:fitsSystemWindows="true">

-
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
            android:id="@+id/toolbar"
            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:theme="?attr/actionBarStyle"
-            app:layout_collapseMode="pin"
-            app:layout_scrollFlags="scroll|enterAlways"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
-
+            android:layout_height="?attr/actionBarSize" />

    </com.google.android.material.appbar.AppBarLayout>

+
    <LinearLayout
        android:id="@+id/loadLayout"
        android:layout_width="match_parent"
--- a/app/src/main/res/layout/activity_error.xml
+++ b/app/src/main/res/layout/activity_error.xml
@ -50,7 +50,9 @@
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_below="@id/subTitleView"
-            android:layout_marginTop="8dp">
+            android:layout_marginTop="8dp"
+            app:counterEnabled="true"
+            app:counterMaxLength="1500">

            <com.google.android.material.textfield.TextInputEditText
                android:id="@+id/inputEditView"
@ -59,18 +61,18 @@
                android:hint="@string/error_description"
                android:imeOptions="actionDone"
                android:inputType="textMultiLine"
+                android:maxLength="1500"
                android:maxLines="5" />

        </com.google.android.material.textfield.TextInputLayout>

-        <androidx.cardview.widget.CardView
+        <com.google.android.material.card.MaterialCardView
+            style="@style/Widget.Material3.CardView.Filled"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_above="@id/shareLogButton"
            android:layout_below="@id/inputLayout"
-            android:layout_marginTop="8dp"
-            app:cardElevation="2dp"
-            card_view:cardCornerRadius="2dp">
+            android:layout_marginTop="8dp">

            <LinearLayout
                android:layout_width="match_parent"
@ -91,10 +93,11 @@
                </ScrollView>
            </LinearLayout>

-        </androidx.cardview.widget.CardView>
+        </com.google.android.material.card.MaterialCardView>

        <Button
            android:id="@+id/shareLogButton"
+            style="@style/Widget.Material3.Button.OutlinedButton"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_above="@id/restartButton"
--- a/app/src/main/res/layout/activity_error_info.xml
+++ b/app/src/main/res/layout/activity_error_info.xml
@ -6,22 +6,16 @@
    android:layout_height="match_parent">


+
    <com.google.android.material.appbar.AppBarLayout
        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?android:windowBackground"
+        android:layout_height="wrap_content"
        android:fitsSystemWindows="true">

-
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
            android:id="@+id/toolbar"
            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:theme="?attr/actionBarStyle"
-            app:layout_collapseMode="pin"
-            app:layout_scrollFlags="scroll|enterAlways"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
-
+            android:layout_height="?attr/actionBarSize" />

    </com.google.android.material.appbar.AppBarLayout>

--- a/app/src/main/res/layout/activity_file.xml
+++ b/app/src/main/res/layout/activity_file.xml
@ -54,8 +54,6 @@
        android:layout_height="wrap_content"
        android:layout_gravity="bottom|end"
        android:layout_margin="16dp"
-        android:textColor="@color/white"
-        app:icon="@drawable/add"
-        app:iconTint="@color/white" />
+        app:icon="@drawable/add" />

 </androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/app/src/main/res/layout/activity_game_check.xml
+++ b/app/src/main/res/layout/activity_game_check.xml
@ -1,5 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:card_view="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".ActivateActivity">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.core.widget.NestedScrollView
        android:layout_width="match_parent"
        android:layout_height="match_parent">

@ -25,9 +46,10 @@

                <Button
                    android:id="@+id/startButton"
+                    style="@style/Widget.Material3.Button.OutlinedButton"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
-                android:layout_marginRight="2dp"
+                    android:layout_marginEnd="2dp"
                    android:layout_weight="1"
                    android:text="@string/start_game" />

@ -35,7 +57,7 @@
                    android:id="@+id/completionButton"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
-                android:layout_marginLeft="2dp"
+                    android:layout_marginStart="2dp"
                    android:layout_weight="1"
                    android:text="@string/complete_settings" />

@ -44,5 +66,6 @@


        </LinearLayout>
-</ScrollView>
+    </androidx.core.widget.NestedScrollView>

+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/app/src/main/res/layout/activity_global_operations.xml
+++ b/app/src/main/res/layout/activity_global_operations.xml
@ -1,31 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    xmlns:card_view="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".ActivateActivity">

    <com.google.android.material.appbar.AppBarLayout
        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?android:windowBackground"
+        android:layout_height="wrap_content"
        android:fitsSystemWindows="true">

-
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
            android:id="@+id/toolbar"
            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:theme="?attr/actionBarStyle"
-            app:layout_collapseMode="pin"
-            app:layout_scrollFlags="scroll|enterAlways"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
-
+            android:layout_height="?attr/actionBarSize" />

    </com.google.android.material.appbar.AppBarLayout>


+
    <androidx.core.widget.NestedScrollView
        android:layout_width="match_parent"
        android:layout_height="match_parent"
--- a/app/src/main/res/layout/activity_importer.xml
+++ b/app/src/main/res/layout/activity_importer.xml
@ -1,5 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:card_view="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".ActivateActivity">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.core.widget.NestedScrollView
        android:layout_width="match_parent"
        android:layout_height="match_parent">

@ -27,6 +48,7 @@
                android:visibility="gone" />

            <Button
+                style="@style/Widget.Material3.Button.OutlinedButton"
                android:id="@+id/cancelButton"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
@ -37,4 +59,5 @@

        </LinearLayout>

-</ScrollView>
+    </androidx.core.widget.NestedScrollView>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/app/src/main/res/layout/activity_library.xml
+++ b/app/src/main/res/layout/activity_library.xml
@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:card_view="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".ActivateActivity">

    <com.google.android.material.appbar.AppBarLayout
        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?android:windowBackground"
+        android:layout_height="wrap_content"
        android:fitsSystemWindows="true">

-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
            android:id="@+id/toolbar"
            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:theme="?attr/actionBarStyle"
-            app:layout_collapseMode="pin"
-            app:layout_scrollFlags="scroll|enterAlways"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
+            android:layout_height="?attr/actionBarSize" />

    </com.google.android.material.appbar.AppBarLayout>

@ -26,6 +25,9 @@
        android:id="@+id/libsView"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
+        android:layout_marginLeft="16dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginRight="16dp"
        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />

 </androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/app/src/main/res/layout/activity_optimize.xml
+++ b/app/src/main/res/layout/activity_optimize.xml
@ -1,12 +1,33 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:card_view="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".ActivateActivity">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <RelativeLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:animateLayoutChanges="true"
+        android:paddingLeft="16dp"
        android:paddingTop="8dp"
        android:paddingRight="16dp"
-    android:paddingLeft="16dp">
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">

        <LinearLayout
            android:layout_width="match_parent"
@ -46,4 +67,5 @@
            android:layout_alignParentBottom="true"
            android:text="@string/optimization" />

-</RelativeLayout>
+    </RelativeLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/app/src/main/res/layout/activity_pack.xml
+++ b/app/src/main/res/layout/activity_pack.xml
@ -1,28 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    xmlns:card_view="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".ActivateActivity">

    <com.google.android.material.appbar.AppBarLayout
        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?android:windowBackground"
+        android:layout_height="wrap_content"
        android:fitsSystemWindows="true">

-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
            android:id="@+id/toolbar"
            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:theme="?attr/actionBarStyle"
-            app:layout_collapseMode="pin"
-            app:layout_scrollFlags="scroll|enterAlways"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
+            android:layout_height="?attr/actionBarSize" />

    </com.google.android.material.appbar.AppBarLayout>


+
    <androidx.core.widget.NestedScrollView
        android:layout_width="match_parent"
        android:layout_height="match_parent"
--- a/app/src/main/res/layout/activity_release_mod.xml
+++ b/app/src/main/res/layout/activity_release_mod.xml
@ -1,28 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    xmlns:card_view="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true">

    <com.google.android.material.appbar.AppBarLayout
        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:fitsSystemWindows="true"
-        android:background="?android:windowBackground">
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true">

-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
            android:id="@+id/toolbar"
            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            app:layout_collapseMode="pin"
-            app:layout_scrollFlags="scroll|enterAlways"
-            android:theme="?attr/actionBarStyle"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
+            android:layout_height="?attr/actionBarSize" />

    </com.google.android.material.appbar.AppBarLayout>


+
    <androidx.core.widget.NestedScrollView
        android:layout_width="match_parent"
        android:layout_height="match_parent"
--- a/app/src/main/res/layout/activity_report.xml
+++ b/app/src/main/res/layout/activity_report.xml
@ -1,31 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    xmlns:card_view="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".ActivateActivity">

    <com.google.android.material.appbar.AppBarLayout
        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?android:windowBackground"
+        android:layout_height="wrap_content"
        android:fitsSystemWindows="true">

-
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
            android:id="@+id/toolbar"
            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:theme="?attr/actionBarStyle"
-            app:layout_collapseMode="pin"
-            app:layout_scrollFlags="scroll|enterAlways"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
-
+            android:layout_height="?attr/actionBarSize" />

    </com.google.android.material.appbar.AppBarLayout>


+
    <androidx.core.widget.NestedScrollView
        android:layout_width="match_parent"
        android:layout_height="match_parent"
@ -49,6 +45,7 @@
                    android:text="@string/why" />

                <Spinner
+
                    android:id="@+id/spinner"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content" />
--- a/app/src/main/res/layout/activity_report_list.xml
+++ b/app/src/main/res/layout/activity_report_list.xml
@ -1,31 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    xmlns:card_view="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".ActivateActivity">

    <com.google.android.material.appbar.AppBarLayout
        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?android:windowBackground"
+        android:layout_height="wrap_content"
        android:fitsSystemWindows="true">

-
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
            android:id="@+id/toolbar"
            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:theme="?attr/actionBarStyle"
-            app:layout_collapseMode="pin"
-            app:layout_scrollFlags="scroll|enterAlways"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
-
+            android:layout_height="?attr/actionBarSize" />

    </com.google.android.material.appbar.AppBarLayout>


+
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
--- a/app/src/main/res/layout/activity_review_mod.xml
+++ b/app/src/main/res/layout/activity_review_mod.xml
@ -1,31 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    xmlns:card_view="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".ActivateActivity">

    <com.google.android.material.appbar.AppBarLayout
        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?android:windowBackground"
+        android:layout_height="wrap_content"
        android:fitsSystemWindows="true">

-
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
            android:id="@+id/toolbar"
            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:theme="?attr/actionBarStyle"
-            app:layout_collapseMode="pin"
-            app:layout_scrollFlags="scroll|enterAlways"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
-
+            android:layout_height="?attr/actionBarSize" />

    </com.google.android.material.appbar.AppBarLayout>


+
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
--- a/app/src/main/res/layout/activity_tag.xml
+++ b/app/src/main/res/layout/activity_tag.xml
@ -1,27 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    xmlns:card_view="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".ActivateActivity">

    <com.google.android.material.appbar.AppBarLayout
        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?android:windowBackground"
+        android:layout_height="wrap_content"
        android:fitsSystemWindows="true">

-
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
            android:id="@+id/toolbar"
            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:theme="?attr/actionBarStyle"
-            app:layout_collapseMode="pin"
-            app:layout_scrollFlags="scroll|enterAlways"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
-
+            android:layout_height="?attr/actionBarSize" />

    </com.google.android.material.appbar.AppBarLayout>

--- a/app/src/main/res/layout/activity_template_maker.xml
+++ b/app/src/main/res/layout/activity_template_maker.xml
@ -1,21 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:card_view="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".ActivateActivity">

    <com.google.android.material.appbar.AppBarLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-        android:background="?android:windowBackground"
        android:fitsSystemWindows="true">

-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
            android:id="@+id/toolbar"
            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:theme="?attr/actionBarStyle"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
+            android:layout_height="?attr/actionBarSize" />
+

        <com.google.android.material.tabs.TabLayout
            android:id="@+id/tabLayout"
--- a/app/src/main/res/layout/activity_template_parser.xml
+++ b/app/src/main/res/layout/activity_template_parser.xml
@ -1,27 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    xmlns:card_view="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
-    android:animateLayoutChanges="true">
+    android:fitsSystemWindows="true"
+    tools:context=".ActivateActivity">

    <com.google.android.material.appbar.AppBarLayout
        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?android:windowBackground"
+        android:layout_height="wrap_content"
        android:fitsSystemWindows="true">

-
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
            android:id="@+id/toolbar"
            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:theme="?attr/actionBarStyle"
-            app:layout_collapseMode="pin"
-            app:layout_scrollFlags="scroll|enterAlways"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
-
+            android:layout_height="?attr/actionBarSize" />

    </com.google.android.material.appbar.AppBarLayout>

@ -95,11 +90,10 @@
        android:id="@+id/fab"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
        android:layout_alignParentBottom="true"
        android:layout_gravity="bottom|end"
        android:layout_margin="16dp"
-        android:src="@drawable/complete"
-        app:tint="@color/white" />
+        android:src="@drawable/complete" />

 </androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/app/src/main/res/layout/activity_thanks.xml
+++ b/app/src/main/res/layout/activity_thanks.xml
@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:card_view="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".ActivateActivity">

    <com.google.android.material.appbar.AppBarLayout
        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?android:windowBackground"
+        android:layout_height="wrap_content"
        android:fitsSystemWindows="true">

-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
            android:id="@+id/toolbar"
            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:theme="?attr/actionBarStyle"
-            app:layout_collapseMode="pin"
-            app:layout_scrollFlags="scroll|enterAlways"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
+            android:layout_height="?attr/actionBarSize" />

    </com.google.android.material.appbar.AppBarLayout>

--- a/app/src/main/res/layout/activity_user_home_page.xml
+++ b/app/src/main/res/layout/activity_user_home_page.xml
@ -227,7 +227,7 @@
            </RelativeLayout>


-            <androidx.appcompat.widget.Toolbar
+            <com.google.android.material.appbar.MaterialToolbar
                android:id="@+id/toolbar"
                android:layout_width="match_parent"
                android:layout_height="?attr/actionBarSize"
--- a/app/src/main/res/layout/activity_user_list.xml
+++ b/app/src/main/res/layout/activity_user_list.xml
@ -1,31 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    xmlns:card_view="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".ActivateActivity">

    <com.google.android.material.appbar.AppBarLayout
        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?android:windowBackground"
+        android:layout_height="wrap_content"
        android:fitsSystemWindows="true">

-
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
            android:id="@+id/toolbar"
            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:theme="?attr/actionBarStyle"
-            app:layout_collapseMode="pin"
-            app:layout_scrollFlags="scroll|enterAlways"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
-
+            android:layout_height="?attr/actionBarSize" />

    </com.google.android.material.appbar.AppBarLayout>


+
    <androidx.core.widget.NestedScrollView
        android:layout_width="match_parent"
        android:layout_height="match_parent"
--- a/app/src/main/res/layout/activity_value_type.xml
+++ b/app/src/main/res/layout/activity_value_type.xml
@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:card_view="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".ActivateActivity">

    <com.google.android.material.appbar.AppBarLayout
        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:fitsSystemWindows="true"
-        android:background="?android:windowBackground">
+        android:layout_height="wrap_content"
+        android:fitsSystemWindows="true">

-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
            android:id="@+id/toolbar"
            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            app:layout_collapseMode="pin"
-            app:layout_scrollFlags="scroll|enterAlways"
-            android:theme="?attr/actionBarStyle"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
+            android:layout_height="?attr/actionBarSize" />

    </com.google.android.material.appbar.AppBarLayout>

--- a/app/src/main/res/layout/activity_web_mod_info.xml
+++ b/app/src/main/res/layout/activity_web_mod_info.xml
@ -1,29 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    xmlns:card_view="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".ActivateActivity">

    <com.google.android.material.appbar.AppBarLayout
        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?android:windowBackground"
+        android:layout_height="wrap_content"
        android:fitsSystemWindows="true">

-
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
            android:id="@+id/toolbar"
            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            app:layout_collapseMode="pin"
-            app:layout_scrollFlags="scroll|enterAlways"
-            app:popupTheme="@style/ThemeOverlay.Material3.Light" />
-
+            android:layout_height="?attr/actionBarSize" />

    </com.google.android.material.appbar.AppBarLayout>

+
    <androidx.core.widget.NestedScrollView
        android:layout_width="match_parent"
        android:layout_height="match_parent"
--- a/app/src/main/res/layout/activity_workmangement.xml
+++ b/app/src/main/res/layout/activity_workmangement.xml
@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:card_view="http://schemas.android.com/tools"
+    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".ActivateActivity">

    <com.google.android.material.appbar.AppBarLayout
        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?android:windowBackground"
+        android:layout_height="wrap_content"
        android:fitsSystemWindows="true">

-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
            android:id="@+id/toolbar"
            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:theme="?attr/actionBarStyle"
-            app:layout_collapseMode="pin"
-            app:layout_scrollFlags="scroll|enterAlways"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
+            android:layout_height="?attr/actionBarSize" />

    </com.google.android.material.appbar.AppBarLayout>


+
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="match_parent"
--- a/app/src/main/res/layout/item_lib.xml
+++ b/app/src/main/res/layout/item_lib.xml
@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:layout_marginLeft="8dp"
-    android:layout_marginRight="8dp"
    android:orientation="vertical"
    android:padding="8dp">

@ -13,7 +12,7 @@
        android:layout_height="wrap_content"
        android:text="标题"
        android:textColor="?colorPrimary"
-        android:textSize="16dp" />
+        android:textSize="16sp" />


    <TextView
@ -32,14 +31,14 @@
        android:layout_below="@id/descriptionView"
        android:layout_marginTop="8dp"
        android:text="开源协议"
-        android:textSize="13dp" />
+        android:textSize="13sp" />

    <ImageView
        android:id="@+id/linkView"
        android:layout_width="20dp"
        android:layout_height="20dp"
        android:layout_alignBottom="@id/titleView"
-        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true"
        android:src="@drawable/link" />

    <ImageView
@ -47,11 +46,11 @@
        android:layout_width="20dp"
        android:layout_height="20dp"
        android:layout_alignBottom="@id/titleView"
-        android:layout_marginLeft="8dp"
-        android:layout_toRightOf="@id/titleView"
+        android:layout_marginStart="8dp"
+        android:layout_toEndOf="@id/titleView"
        android:src="@drawable/tip"
-        android:tint="?colorPrimary"
-        android:visibility="gone" />
+        android:visibility="gone"
+        app:tint="?colorPrimary" />


 </RelativeLayout>
--- a/app/src/main/res/layout/item_map.xml
+++ b/app/src/main/res/layout/item_map.xml
@ -11,11 +11,10 @@
        android:id="@+id/mapIcon"
        android:layout_width="60dp"
        android:layout_height="60dp"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
        android:src="@drawable/image" />

    <LinearLayout
+        android:layout_marginStart="8dp"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
        android:gravity="center_vertical"
@ -26,7 +25,7 @@
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="模组名称"
-            android:textSize="16dp" />
+            android:textSize="16sp" />

        <!--            <TextView-->
        <!--                android:visibility="gone"-->
@ -42,7 +41,7 @@
            android:layout_height="wrap_content"
            android:layout_marginTop="8dp"
            android:text="更新时间"
-            android:textSize="14dp" />
+            android:textSize="14sp" />


    </LinearLayout>
--- a/app/src/main/res/layout/mod_list_item.xml
+++ b/app/src/main/res/layout/mod_list_item.xml
@ -8,16 +8,25 @@
    android:gravity="center"
    android:padding="8dp">

+
+    <com.google.android.material.card.MaterialCardView
+        style="@style/Widget.Material3.CardView.Filled"
+        android:layout_width="60dp"
+        android:layout_height="60dp">
+
        <ImageView
            android:id="@+id/mod_icon"
            android:layout_width="60dp"
            android:layout_height="60dp"
-        android:layout_marginRight="8dp"
            android:src="@drawable/image" />

+    </com.google.android.material.card.MaterialCardView>
+
+
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
        android:gravity="center_vertical"
        android:orientation="vertical">

@ -26,7 +35,7 @@
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="模组名称"
-            android:textSize="16dp" />
+            android:textSize="16sp" />

        <TextView
            android:id="@+id/mod_introduction_view"
@ -34,7 +43,7 @@
            android:layout_height="wrap_content"
            android:layout_marginTop="8dp"
            android:text="介绍"
-            android:textSize="14dp" />
+            android:textSize="14sp" />

        <TextView
            android:id="@+id/mod_up_time"
@ -42,7 +51,7 @@
            android:layout_height="wrap_content"
            android:layout_marginTop="8dp"
            android:text="更新时间"
-            android:textSize="14dp" />
+            android:textSize="14sp" />

    </LinearLayout>

--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -24,6 +24,7 @@
    <string name="create_uniting">正在构建单位...</string>
    <string name="dialog_ok">确定</string>
    <string name="activation_app">激活铁锈助手</string>
+    <string name="activation_app_tip">您的激活时间已过，请激活铁锈助手。</string>
    <string name="choose_plan">套餐</string>
    <string name="all_function">全部功能</string>
    <string name="only_one">仅此一次</string>
@ -671,6 +672,8 @@
    <string name="use_the_community_as_the_launch_page">使用社区作为启动页面</string>
    <string name="use_the_community_as_the_launch_page_tip">默认启用</string>
    <string name="renewal">续费</string>
+    <string name="renewal_tip_title">续费提醒</string>
+    <string name="renewal_tip_msg">您的账号(%1$s)将于%2$d天后到期。</string>
    <string name="forever_time">永久激活</string>
    <string name="can_t_activate">您已永久激活。</string>
    <string name="report">举报</string>
@ -836,5 +839,4 @@
    <string name="confirm_password">确认密码</string>
    <string name="confirm_password_error">两次密码不一致。</string>
    <string name="display_source_code">显示源代码</string>
-    <string name="edit_tip">您的账号%1$s，将于%2$s到期。永久激活隐藏此卡片。</string>
 </resources>