diff --git a/.gradle/7.2/fileHashes/fileHashes.bin b/.gradle/7.2/fileHashes/fileHashes.bin index 0a4b70c..34021e4 100644 Binary files a/.gradle/7.2/fileHashes/fileHashes.bin and b/.gradle/7.2/fileHashes/fileHashes.bin differ diff --git a/.gradle/7.2/fileHashes/fileHashes.lock b/.gradle/7.2/fileHashes/fileHashes.lock index 29e4a45..0cb6028 100644 Binary files a/.gradle/7.2/fileHashes/fileHashes.lock and b/.gradle/7.2/fileHashes/fileHashes.lock differ diff --git a/.gradle/7.3.3/checksums/checksums.lock b/.gradle/7.3.3/checksums/checksums.lock new file mode 100644 index 0000000..b45521b Binary files /dev/null and b/.gradle/7.3.3/checksums/checksums.lock differ diff --git a/.gradle/7.3.3/checksums/md5-checksums.bin b/.gradle/7.3.3/checksums/md5-checksums.bin new file mode 100644 index 0000000..1fc0b17 Binary files /dev/null and b/.gradle/7.3.3/checksums/md5-checksums.bin differ diff --git a/.gradle/7.3.3/checksums/sha1-checksums.bin b/.gradle/7.3.3/checksums/sha1-checksums.bin new file mode 100644 index 0000000..e0e3b18 Binary files /dev/null and b/.gradle/7.3.3/checksums/sha1-checksums.bin differ diff --git a/.gradle/7.3.3/dependencies-accessors/dependencies-accessors.lock b/.gradle/7.3.3/dependencies-accessors/dependencies-accessors.lock new file mode 100644 index 0000000..9202812 Binary files /dev/null and b/.gradle/7.3.3/dependencies-accessors/dependencies-accessors.lock differ diff --git a/.gradle/7.3.3/dependencies-accessors/gc.properties b/.gradle/7.3.3/dependencies-accessors/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/.gradle/7.3.3/executionHistory/executionHistory.bin b/.gradle/7.3.3/executionHistory/executionHistory.bin new file mode 100644 index 0000000..18713ed Binary files /dev/null and b/.gradle/7.3.3/executionHistory/executionHistory.bin differ diff --git a/.gradle/7.3.3/executionHistory/executionHistory.lock b/.gradle/7.3.3/executionHistory/executionHistory.lock new file mode 100644 index 0000000..c4ce207 Binary files /dev/null and b/.gradle/7.3.3/executionHistory/executionHistory.lock differ diff --git a/.gradle/7.3.3/fileChanges/last-build.bin b/.gradle/7.3.3/fileChanges/last-build.bin new file mode 100644 index 0000000..f76dd23 Binary files /dev/null and b/.gradle/7.3.3/fileChanges/last-build.bin differ diff --git a/.gradle/7.3.3/fileHashes/fileHashes.bin b/.gradle/7.3.3/fileHashes/fileHashes.bin new file mode 100644 index 0000000..c3e8ed2 Binary files /dev/null and b/.gradle/7.3.3/fileHashes/fileHashes.bin differ diff --git a/.gradle/7.3.3/fileHashes/fileHashes.lock b/.gradle/7.3.3/fileHashes/fileHashes.lock new file mode 100644 index 0000000..26ac328 Binary files /dev/null and b/.gradle/7.3.3/fileHashes/fileHashes.lock differ diff --git a/.gradle/7.3.3/fileHashes/resourceHashesCache.bin b/.gradle/7.3.3/fileHashes/resourceHashesCache.bin new file mode 100644 index 0000000..b005fe6 Binary files /dev/null and b/.gradle/7.3.3/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/7.3.3/gc.properties b/.gradle/7.3.3/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 9bba18c..38d3a4b 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties index daa293e..c2e15ce 100644 --- a/.gradle/buildOutputCleanup/cache.properties +++ b/.gradle/buildOutputCleanup/cache.properties @@ -1,2 +1,2 @@ -#Mon Feb 07 09:07:18 CST 2022 -gradle.version=7.2 +#Fri May 13 19:30:42 CST 2022 +gradle.version=7.3.3 diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin index 82b5538..fd7a2cf 100644 Binary files a/.gradle/buildOutputCleanup/outputFiles.bin and b/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/.gradle/checksums/checksums.lock b/.gradle/checksums/checksums.lock index 73ba134..875c58a 100644 Binary files a/.gradle/checksums/checksums.lock and b/.gradle/checksums/checksums.lock differ diff --git a/.gradle/checksums/md5-checksums.bin b/.gradle/checksums/md5-checksums.bin index 23ad1ed..5bf31a4 100644 Binary files a/.gradle/checksums/md5-checksums.bin and b/.gradle/checksums/md5-checksums.bin differ diff --git a/.gradle/checksums/sha1-checksums.bin b/.gradle/checksums/sha1-checksums.bin index 800f039..a49754c 100644 Binary files a/.gradle/checksums/sha1-checksums.bin and b/.gradle/checksums/sha1-checksums.bin differ diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe new file mode 100644 index 0000000..1f92d6f Binary files /dev/null and b/.gradle/file-system.probe differ diff --git a/app/build.gradle b/app/build.gradle index 1da211e..78cc703 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -63,6 +63,7 @@ android { lint { baseline file('lint-baseline.xml') } + namespace 'com.coldmint.rust.pro' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4c28254..7a19002 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> + android:screenOrientation="portrait" /> + android:screenOrientation="portrait" /> + android:screenOrientation="portrait" /> + android:screenOrientation="portrait" /> + android:screenOrientation="portrait" /> + android:screenOrientation="portrait" /> + android:screenOrientation="portrait" /> + android:screenOrientation="portrait" /> + android:screenOrientation="portrait" /> + android:screenOrientation="portrait" /> + android:screenOrientation="portrait" /> + android:screenOrientation="portrait" /> + android:screenOrientation="portrait" /> + android:screenOrientation="portrait" /> + android:screenOrientation="portrait" /> + android:screenOrientation="portrait" /> + android:screenOrientation="portrait" /> @@ -268,59 +249,49 @@ + android:screenOrientation="portrait" /> + android:screenOrientation="portrait" /> + android:screenOrientation="portrait" /> + android:screenOrientation="portrait" /> + android:screenOrientation="portrait" /> + android:screenOrientation="portrait" /> + android:screenOrientation="portrait" /> + android:screenOrientation="portrait" /> + android:screenOrientation="portrait" /> + android:screenOrientation="portrait" /> @@ -329,39 +300,31 @@ android:screenOrientation="portrait" /> + android:screenOrientation="portrait" /> + android:screenOrientation="portrait" /> + android:screenOrientation="portrait" /> + android:screenOrientation="portrait" /> + android:screenOrientation="portrait" /> + android:screenOrientation="portrait" /> + android:screenOrientation="portrait" /> + android:screenOrientation="portrait" /> \ No newline at end of file diff --git a/app/src/main/java/com/coldmint/rust/pro/AboutActivity.kt b/app/src/main/java/com/coldmint/rust/pro/AboutActivity.kt index 0a2019d..9ea21f7 100644 --- a/app/src/main/java/com/coldmint/rust/pro/AboutActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/AboutActivity.kt @@ -97,7 +97,6 @@ class AboutActivity : BaseActivity() { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { if (canUseView) { - setSupportActionBar(viewBinding.toolbar) setReturnButton() setTitle(R.string.about) initView() diff --git a/app/src/main/java/com/coldmint/rust/pro/ActivateActivity.kt b/app/src/main/java/com/coldmint/rust/pro/ActivateActivity.kt index 17518a8..99f0d43 100644 --- a/app/src/main/java/com/coldmint/rust/pro/ActivateActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/ActivateActivity.kt @@ -234,7 +234,6 @@ class ActivateActivity : BaseActivity() { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { if (canUseView) { viewBinding.toolbar.title = getText(R.string.activation_app) - setSupportActionBar(viewBinding.toolbar) setReturnButton() val account = appSettings.getValue(AppSettings.Setting.Account, "") if (account.isBlank()) { diff --git a/app/src/main/java/com/coldmint/rust/pro/ApplicationListActivity.kt b/app/src/main/java/com/coldmint/rust/pro/ApplicationListActivity.kt index 41386d6..177a4c0 100644 --- a/app/src/main/java/com/coldmint/rust/pro/ApplicationListActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/ApplicationListActivity.kt @@ -147,7 +147,6 @@ class ApplicationListActivity : BaseActivity() { */ private fun setTitleAndActionBar() { viewBinding.toolbar.setTitle(R.string.select_game_pack) - setSupportActionBar(viewBinding.toolbar) setReturnButton() } diff --git a/app/src/main/java/com/coldmint/rust/pro/BookmarkManagerActivity.kt b/app/src/main/java/com/coldmint/rust/pro/BookmarkManagerActivity.kt index ab34b0b..fbf48a7 100644 --- a/app/src/main/java/com/coldmint/rust/pro/BookmarkManagerActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/BookmarkManagerActivity.kt @@ -222,7 +222,6 @@ class BookmarkManagerActivity : BaseActivity() { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { if (canUseView) { - setSupportActionBar(viewBinding.toolbar) setReturnButton() setTitle(R.string.bookmark_manager) bookmarkManager = BookmarkManager(this@BookmarkManagerActivity) diff --git a/app/src/main/java/com/coldmint/rust/pro/EditActivity.kt b/app/src/main/java/com/coldmint/rust/pro/EditActivity.kt index 5bf0015..5335972 100644 --- a/app/src/main/java/com/coldmint/rust/pro/EditActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/EditActivity.kt @@ -449,7 +449,6 @@ class EditActivity : BaseActivity() { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { if (canUseView) { - setSupportActionBar(viewBinding.toolbar) setReturnButton() loadStartObserve() loadEndObserve() diff --git a/app/src/main/java/com/coldmint/rust/pro/EditModInfoActivity.kt b/app/src/main/java/com/coldmint/rust/pro/EditModInfoActivity.kt index f1e9cf2..2b1a643 100644 --- a/app/src/main/java/com/coldmint/rust/pro/EditModInfoActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/EditModInfoActivity.kt @@ -76,7 +76,6 @@ class EditModInfoActivity : BaseActivity() { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { if (canUseView) { viewBinding.toolbar.title = getText(R.string.mod_action2) - setSupportActionBar(viewBinding.toolbar) setReturnButton() val intent = intent val bundle = intent.getBundleExtra("data") diff --git a/app/src/main/java/com/coldmint/rust/pro/EditUserInfoActivity.kt b/app/src/main/java/com/coldmint/rust/pro/EditUserInfoActivity.kt index 99c6270..90048f9 100644 --- a/app/src/main/java/com/coldmint/rust/pro/EditUserInfoActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/EditUserInfoActivity.kt @@ -53,7 +53,6 @@ class EditUserInfoActivity : BaseActivity() { private fun initView() { viewBinding.toolbar.title = getText(R.string.editData) - setSupportActionBar(viewBinding.toolbar) setReturnButton() val thisIntent = intent val temUserId = thisIntent.getStringExtra("userId") diff --git a/app/src/main/java/com/coldmint/rust/pro/ErrorInfoActivity.kt b/app/src/main/java/com/coldmint/rust/pro/ErrorInfoActivity.kt index 379a18c..16e5ad6 100644 --- a/app/src/main/java/com/coldmint/rust/pro/ErrorInfoActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/ErrorInfoActivity.kt @@ -28,7 +28,6 @@ class ErrorInfoActivity : BaseActivity() { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { if (canUseView) { viewBinding.toolbar.title = getText(R.string.see_error_info) - setSupportActionBar(viewBinding.toolbar) setReturnButton() viewBinding.recyclerView.layoutManager = LinearLayoutManager(this) val path = AppSettings.dataRootDirectory + "/carsh/" diff --git a/app/src/main/java/com/coldmint/rust/pro/FileManagerActivity.kt b/app/src/main/java/com/coldmint/rust/pro/FileManagerActivity.kt index d736922..0cf116a 100644 --- a/app/src/main/java/com/coldmint/rust/pro/FileManagerActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/FileManagerActivity.kt @@ -50,7 +50,6 @@ class FileManagerActivity : BaseActivity() { private var additionalData: String? = null private fun initView() { viewBinding.toolbar.setTitle(R.string.file_manager) - setSupportActionBar(viewBinding.toolbar) setReturnButton() viewBinding.fileList.layoutManager = LinearLayoutManager(this@FileManagerActivity) val intent = intent diff --git a/app/src/main/java/com/coldmint/rust/pro/GlobalOperationsActivity.kt b/app/src/main/java/com/coldmint/rust/pro/GlobalOperationsActivity.kt index 2ece2fa..6ba2fc4 100644 --- a/app/src/main/java/com/coldmint/rust/pro/GlobalOperationsActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/GlobalOperationsActivity.kt @@ -37,7 +37,6 @@ class GlobalOperationsActivity : BaseActivity() override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { if (canUseView) { - setSupportActionBar(viewBinding.toolbar) setReturnButton() val modPath = intent.getStringExtra("modPath") if (modPath == null) { diff --git a/app/src/main/java/com/coldmint/rust/pro/LibraryActivity.kt b/app/src/main/java/com/coldmint/rust/pro/LibraryActivity.kt index 7b7c389..f4a6b42 100644 --- a/app/src/main/java/com/coldmint/rust/pro/LibraryActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/LibraryActivity.kt @@ -155,7 +155,6 @@ class LibraryActivity : BaseActivity() { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { if (canUseView) { viewBinding.toolbar.setTitle(R.string.libs) - setSupportActionBar(viewBinding.toolbar) //android:label="@string/mod_action1" setReturnButton() viewBinding.libsView.layoutManager = LinearLayoutManager(this@LibraryActivity) diff --git a/app/src/main/java/com/coldmint/rust/pro/MainActivity.kt b/app/src/main/java/com/coldmint/rust/pro/MainActivity.kt index b6f0e01..d0f3ea0 100644 --- a/app/src/main/java/com/coldmint/rust/pro/MainActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/MainActivity.kt @@ -84,7 +84,6 @@ class MainActivity : BaseActivity() { */ fun useToolbarSetSupportActionBar() { tabLayout = viewBinding.tabLayout - setSupportActionBar(viewBinding.toolbar) } /** diff --git a/app/src/main/java/com/coldmint/rust/pro/OrderListActivity.kt b/app/src/main/java/com/coldmint/rust/pro/OrderListActivity.kt index bcd5020..5af951a 100644 --- a/app/src/main/java/com/coldmint/rust/pro/OrderListActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/OrderListActivity.kt @@ -39,7 +39,6 @@ class OrderListActivity : BaseActivity() { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { if (canUseView) { viewBinding.toolbar.title = getText(R.string.order_list) - setSupportActionBar(viewBinding.toolbar) setReturnButton() if (account.isBlank()) { showError(getString(R.string.please_login_first)) diff --git a/app/src/main/java/com/coldmint/rust/pro/PackActivity.kt b/app/src/main/java/com/coldmint/rust/pro/PackActivity.kt index 0bf6323..08184de 100644 --- a/app/src/main/java/com/coldmint/rust/pro/PackActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/PackActivity.kt @@ -53,7 +53,6 @@ class PackActivity : BaseActivity() { if (canUseView) { viewBinding.toolbar.title = getText(R.string.packmod) - setSupportActionBar(viewBinding.toolbar) setReturnButton() initData() initAction() diff --git a/app/src/main/java/com/coldmint/rust/pro/PayActivity.kt b/app/src/main/java/com/coldmint/rust/pro/PayActivity.kt index aabb00e..6a1568e 100644 --- a/app/src/main/java/com/coldmint/rust/pro/PayActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/PayActivity.kt @@ -55,7 +55,6 @@ class PayActivity : BaseActivity() { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { if (canUseView) { viewBinding.toolbar.title = getText(R.string.pay) - setSupportActionBar(viewBinding.toolbar) setReturnButton() val thisIntent = intent val uuid = thisIntent.getStringExtra("uuid") diff --git a/app/src/main/java/com/coldmint/rust/pro/RecyclingStationActivity.kt b/app/src/main/java/com/coldmint/rust/pro/RecyclingStationActivity.kt index 175d7d5..0714fec 100644 --- a/app/src/main/java/com/coldmint/rust/pro/RecyclingStationActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/RecyclingStationActivity.kt @@ -23,7 +23,6 @@ class RecyclingStationActivity : BaseActivity() override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { if (canUseView) { viewBinding.toolbar.setTitle(R.string.enable_the_recovery_station) - setSupportActionBar(viewBinding.toolbar) setReturnButton() viewBinding.backupList.layoutManager = LinearLayoutManager(this@RecyclingStationActivity) diff --git a/app/src/main/java/com/coldmint/rust/pro/RegisterActivity.kt b/app/src/main/java/com/coldmint/rust/pro/RegisterActivity.kt index ae02e2e..b0cdd90 100644 --- a/app/src/main/java/com/coldmint/rust/pro/RegisterActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/RegisterActivity.kt @@ -451,7 +451,6 @@ class RegisterActivity : BaseActivity() { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { if (canUseView) { viewBinding.toolbar.setTitle(R.string.register) - setSupportActionBar(viewBinding.toolbar) setReturnButton() initAction() } diff --git a/app/src/main/java/com/coldmint/rust/pro/ReleaseModActivity.kt b/app/src/main/java/com/coldmint/rust/pro/ReleaseModActivity.kt index dce3dd0..d298011 100644 --- a/app/src/main/java/com/coldmint/rust/pro/ReleaseModActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/ReleaseModActivity.kt @@ -79,7 +79,6 @@ class ReleaseModActivity : BaseActivity() { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { if (canUseView) { viewBinding.toolbar.title = getText(R.string.release) - setSupportActionBar(viewBinding.toolbar) setReturnButton() val layoutManager = LinearLayoutManager(this) layoutManager.orientation = RecyclerView.HORIZONTAL diff --git a/app/src/main/java/com/coldmint/rust/pro/ReportActivity.kt b/app/src/main/java/com/coldmint/rust/pro/ReportActivity.kt index 84cdbe4..cca176b 100644 --- a/app/src/main/java/com/coldmint/rust/pro/ReportActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/ReportActivity.kt @@ -31,7 +31,6 @@ class ReportActivity : BaseActivity() { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { if (canUseView) { viewBinding.toolbar.title = getText(R.string.report) - setSupportActionBar(viewBinding.toolbar) setReturnButton() val bundle = intent.getBundleExtra("data") if (bundle == null) { diff --git a/app/src/main/java/com/coldmint/rust/pro/ReportListActivity.kt b/app/src/main/java/com/coldmint/rust/pro/ReportListActivity.kt index deac9f8..1bc535b 100644 --- a/app/src/main/java/com/coldmint/rust/pro/ReportListActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/ReportListActivity.kt @@ -23,7 +23,6 @@ class ReportListActivity : BaseActivity() { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { if (canUseView) { viewBinding.toolbar.title = getText(R.string.report_to_deal) - setSupportActionBar(viewBinding.toolbar) setReturnButton() val account = appSettings.getValue(AppSettings.Setting.Account, "") if (account.isBlank()) { diff --git a/app/src/main/java/com/coldmint/rust/pro/ReviewModActivity.kt b/app/src/main/java/com/coldmint/rust/pro/ReviewModActivity.kt index 45310b5..11b8d78 100644 --- a/app/src/main/java/com/coldmint/rust/pro/ReviewModActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/ReviewModActivity.kt @@ -29,7 +29,6 @@ class ReviewModActivity : BaseActivity() { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { if (canUseView) { viewBinding.toolbar.title = getText(R.string.review_mod) - setSupportActionBar(viewBinding.toolbar) setReturnButton() if (account.isBlank()) { showInfoToView(resId = R.string.please_login_first) diff --git a/app/src/main/java/com/coldmint/rust/pro/SearchActivity.kt b/app/src/main/java/com/coldmint/rust/pro/SearchActivity.kt index ea73302..515d994 100644 --- a/app/src/main/java/com/coldmint/rust/pro/SearchActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/SearchActivity.kt @@ -18,7 +18,6 @@ class SearchActivity : BaseActivity() { lateinit var keyWord: String override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { if (canUseView) { - setSupportActionBar(viewBinding.toolbar) setReturnButton() loadData(keyWord) title = String.format(getString(R.string.search_mod_key), keyWord) diff --git a/app/src/main/java/com/coldmint/rust/pro/SettingsActivity.kt b/app/src/main/java/com/coldmint/rust/pro/SettingsActivity.kt index 119f1db..dc06e97 100644 --- a/app/src/main/java/com/coldmint/rust/pro/SettingsActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/SettingsActivity.kt @@ -207,7 +207,6 @@ class SettingsActivity : BaseActivity() { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { if (canUseView) { viewBinding.toolbar.setTitle(R.string.set_up) - setSupportActionBar(viewBinding.toolbar) setReturnButton() val settingsFragment = SettingsFragment() supportFragmentManager diff --git a/app/src/main/java/com/coldmint/rust/pro/TagActivity.kt b/app/src/main/java/com/coldmint/rust/pro/TagActivity.kt index 8637c72..b721da6 100644 --- a/app/src/main/java/com/coldmint/rust/pro/TagActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/TagActivity.kt @@ -118,7 +118,6 @@ class TagActivity : BaseActivity() { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { if (canUseView) { - setSupportActionBar(viewBinding.toolbar) setReturnButton() val thisIntent = intent val bundle = thisIntent.getBundleExtra("data") diff --git a/app/src/main/java/com/coldmint/rust/pro/TemplateMakerActivity.kt b/app/src/main/java/com/coldmint/rust/pro/TemplateMakerActivity.kt index 0e04060..dc52380 100644 --- a/app/src/main/java/com/coldmint/rust/pro/TemplateMakerActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/TemplateMakerActivity.kt @@ -329,7 +329,6 @@ class TemplateMakerActivity : BaseActivity() { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { if (canUseView) { - setSupportActionBar(viewBinding.toolbar) setReturnButton() viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager) makerView = RecyclerView(this@TemplateMakerActivity) diff --git a/app/src/main/java/com/coldmint/rust/pro/TemplateParserActivity.kt b/app/src/main/java/com/coldmint/rust/pro/TemplateParserActivity.kt index 05480ed..aca9b77 100644 --- a/app/src/main/java/com/coldmint/rust/pro/TemplateParserActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/TemplateParserActivity.kt @@ -421,7 +421,6 @@ class TemplateParserActivity() : BaseActivity() { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { if (canUseView) { - setSupportActionBar(viewBinding.toolbar) setReturnButton() viewBinding.fab.hide() val intent = intent diff --git a/app/src/main/java/com/coldmint/rust/pro/ThanksActivity.kt b/app/src/main/java/com/coldmint/rust/pro/ThanksActivity.kt index 0d4554b..ca1a605 100644 --- a/app/src/main/java/com/coldmint/rust/pro/ThanksActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/ThanksActivity.kt @@ -20,7 +20,6 @@ class ThanksActivity : BaseActivity() { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { if (canUseView) { viewBinding.toolbar.setTitle(R.string.special_thanks_to) - setSupportActionBar(viewBinding.toolbar) setReturnButton() viewBinding.recyclerView.layoutManager = LinearLayoutManager(this) val list = ArrayList() diff --git a/app/src/main/java/com/coldmint/rust/pro/TurretDesignActivity.kt b/app/src/main/java/com/coldmint/rust/pro/TurretDesignActivity.kt index f8418cd..42a5991 100644 --- a/app/src/main/java/com/coldmint/rust/pro/TurretDesignActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/TurretDesignActivity.kt @@ -27,7 +27,6 @@ class TurretDesignActivity : BaseActivity() { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { if (canUseView) { - setSupportActionBar(viewBinding.toolbar) setReturnButton() title = getString(R.string.turret_design) val modPath = intent.getStringExtra("modPath") diff --git a/app/src/main/java/com/coldmint/rust/pro/UnitsActivity.kt b/app/src/main/java/com/coldmint/rust/pro/UnitsActivity.kt index 97b00e8..5675a0f 100644 --- a/app/src/main/java/com/coldmint/rust/pro/UnitsActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/UnitsActivity.kt @@ -226,7 +226,6 @@ class UnitsActivity : BaseActivity() { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { if (canUseView) { viewBinding.toolbar.setTitle(R.string.mod_action1) - setSupportActionBar(viewBinding.toolbar) setReturnButton() val intent = intent val bundle = intent.getBundleExtra("data") diff --git a/app/src/main/java/com/coldmint/rust/pro/UserHomePageActivity.kt b/app/src/main/java/com/coldmint/rust/pro/UserHomePageActivity.kt index 91383f5..9d404e5 100644 --- a/app/src/main/java/com/coldmint/rust/pro/UserHomePageActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/UserHomePageActivity.kt @@ -82,7 +82,6 @@ class UserHomePageActivity : BaseActivity() { account = temAccount } viewBinding.toolbar.title = "" - setSupportActionBar(viewBinding.toolbar) setReturnButton() val params = viewBinding.toolbar.layoutParams as CollapsingToolbarLayout.LayoutParams params.setMargins(0, statusBarHeight(this), 0, 0) diff --git a/app/src/main/java/com/coldmint/rust/pro/UserListActivity.kt b/app/src/main/java/com/coldmint/rust/pro/UserListActivity.kt index eed3e95..74d62ce 100644 --- a/app/src/main/java/com/coldmint/rust/pro/UserListActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/UserListActivity.kt @@ -39,7 +39,6 @@ class UserListActivity : BaseActivity() { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { if (canUseView) { - setSupportActionBar(viewBinding.toolbar) setReturnButton() val thisIntent = intent val bundle = thisIntent.getBundleExtra("data") diff --git a/app/src/main/java/com/coldmint/rust/pro/ValueTypeActivity.kt b/app/src/main/java/com/coldmint/rust/pro/ValueTypeActivity.kt index 491f4b3..9406f9e 100644 --- a/app/src/main/java/com/coldmint/rust/pro/ValueTypeActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/ValueTypeActivity.kt @@ -291,7 +291,6 @@ class ValueTypeActivity : BaseActivity() { if (canUseView) { viewBinding.toolbar.title = getText(R.string.value_type_manager) viewBinding.valueList.layoutManager = LinearLayoutManager(this@ValueTypeActivity) - setSupportActionBar(viewBinding.toolbar) setReturnButton() loadList() viewBinding.fab.setOnClickListener { showEditDialog(null) } diff --git a/app/src/main/java/com/coldmint/rust/pro/WebModInfoActivity.kt b/app/src/main/java/com/coldmint/rust/pro/WebModInfoActivity.kt index ea81f01..f8e035c 100644 --- a/app/src/main/java/com/coldmint/rust/pro/WebModInfoActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/WebModInfoActivity.kt @@ -77,7 +77,6 @@ class WebModInfoActivity : BaseActivity() { private var isOpen = false private fun initView() { - setSupportActionBar(viewBinding.toolbar) setReturnButton() val activityIntent = intent val bundle = activityIntent.getBundleExtra("data") diff --git a/app/src/main/java/com/coldmint/rust/pro/WorkManagementActivity.kt b/app/src/main/java/com/coldmint/rust/pro/WorkManagementActivity.kt index e74157d..fd21b0a 100644 --- a/app/src/main/java/com/coldmint/rust/pro/WorkManagementActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/WorkManagementActivity.kt @@ -251,7 +251,6 @@ class WorkManagementActivity : BaseActivity() { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { if (canUseView) { viewBinding.toolbar.setTitle(R.string.work_management) - setSupportActionBar(viewBinding.toolbar) setReturnButton() viewBinding.recyclerView.layoutManager = LinearLayoutManager(this) } diff --git a/app/src/main/java/com/coldmint/rust/pro/base/BaseActivity.kt b/app/src/main/java/com/coldmint/rust/pro/base/BaseActivity.kt index a0e228a..b820d91 100644 --- a/app/src/main/java/com/coldmint/rust/pro/base/BaseActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/base/BaseActivity.kt @@ -10,6 +10,8 @@ import android.view.inputmethod.InputMethodManager import android.widget.EditText import android.widget.Toast import androidx.appcompat.app.AppCompatDelegate +import androidx.appcompat.widget.Toolbar +import androidx.core.view.WindowCompat import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider import androidx.viewbinding.ViewBinding @@ -41,15 +43,21 @@ abstract class BaseActivity : } override fun onCreate(savedInstanceState: Bundle?) { -// loadLanguage() +// WindowCompat.setDecorFitsSystemWindows(window, false) whenCreateActivity(savedInstanceState, false) super.onCreate(savedInstanceState) setContentView(viewBinding.root) + val toolBar = findViewById(R.id.toolbar) + if (toolBar == null) { + MaterialDialog(this).title(R.string.app_name).message(text = "启动失败，未找到标题栏") + .positiveButton(text = "确定").cancelable(false).show() + } else { + setSupportActionBar(toolBar) + } whenCreateActivity(savedInstanceState, true) } - /** * 展示Toast * @param str String diff --git a/app/src/main/res/layout/activity_create_mod.xml b/app/src/main/res/layout/activity_create_mod.xml index b46c1aa..cd272c1 100644 --- a/app/src/main/res/layout/activity_create_mod.xml +++ b/app/src/main/res/layout/activity_create_mod.xml @@ -1,63 +1,86 @@ - + android:fitsSystemWindows="true" + tools:context=".MainActivity"> - + android:layout_height="wrap_content" + android:fitsSystemWindows="true"> - + android:layout_height="?attr/actionBarSize" /> - + + + + + + + app:counterEnabled="true" + app:counterMaxLength="255"> - + - + - + android:layout_below="@id/modNameInputLayout" + android:paddingTop="8dp" + app:counterEnabled="true" + app:counterMaxLength="500"> - + -