主题优化

This commit is contained in:
coldmint 2022-05-14 08:19:30 +08:00
parent b67a20b550
commit 0eb306d499
70 changed files with 138 additions and 184 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

View File

@ -1,2 +1,2 @@
#Mon Feb 07 09:07:18 CST 2022 #Fri May 13 19:30:42 CST 2022
gradle.version=7.2 gradle.version=7.3.3

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
.gradle/file-system.probe Normal file

Binary file not shown.

View File

@ -63,6 +63,7 @@ android {
lint { lint {
baseline file('lint-baseline.xml') baseline file('lint-baseline.xml')
} }
namespace 'com.coldmint.rust.pro'
} }

View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools">
package="com.coldmint.rust.pro">
<uses-permission <uses-permission
android:name="android.permission.QUERY_ALL_PACKAGES" android:name="android.permission.QUERY_ALL_PACKAGES"
@ -26,7 +25,6 @@
android:usesCleartextTraffic="true"> android:usesCleartextTraffic="true">
<activity <activity
android:name=".TurretDesignActivity" android:name=".TurretDesignActivity"
android:theme="@style/Theme.rust.Concept.NoActionBar"
android:exported="false" /> android:exported="false" />
<activity <activity
android:name=".BrowserActivity" android:name=".BrowserActivity"
@ -44,82 +42,66 @@
<activity <activity
android:name=".OrderListActivity" android:name=".OrderListActivity"
android:exported="false" android:exported="false"
android:screenOrientation="portrait" android:screenOrientation="portrait" />
android:theme="@style/Theme.rust.Concept.NoActionBar" />
<activity <activity
android:name=".SearchActivity" android:name=".SearchActivity"
android:exported="false" android:exported="false"
android:screenOrientation="portrait" android:screenOrientation="portrait" />
android:theme="@style/Theme.rust.Concept.NoActionBar" />
<activity <activity
android:name=".PayActivity" android:name=".PayActivity"
android:exported="false" android:exported="false"
android:screenOrientation="portrait" android:screenOrientation="portrait" />
android:theme="@style/Theme.rust.Concept.NoActionBar" />
<activity <activity
android:name=".ReviewModActivity" android:name=".ReviewModActivity"
android:exported="false" android:exported="false"
android:screenOrientation="portrait" android:screenOrientation="portrait" />
android:theme="@style/Theme.rust.Concept.NoActionBar" />
<activity <activity
android:name=".ReportListActivity" android:name=".ReportListActivity"
android:exported="false" android:exported="false"
android:screenOrientation="portrait" android:screenOrientation="portrait" />
android:theme="@style/Theme.rust.Concept.NoActionBar" />
<activity <activity
android:name=".ErrorInfoActivity" android:name=".ErrorInfoActivity"
android:exported="false" android:exported="false"
android:screenOrientation="portrait" android:screenOrientation="portrait" />
android:theme="@style/Theme.rust.Concept.NoActionBar" />
<activity <activity
android:name=".UserListActivity" android:name=".UserListActivity"
android:exported="false" android:exported="false"
android:screenOrientation="portrait" android:screenOrientation="portrait" />
android:theme="@style/Theme.rust.Concept.NoActionBar" />
<activity <activity
android:name=".ActivateActivity" android:name=".ActivateActivity"
android:exported="false" android:exported="false"
android:screenOrientation="portrait" android:screenOrientation="portrait" />
android:theme="@style/Theme.rust.Concept.NoActionBar" />
<activity <activity
android:name=".ThanksActivity" android:name=".ThanksActivity"
android:exported="false" android:exported="false"
android:screenOrientation="portrait" android:screenOrientation="portrait" />
android:theme="@style/Theme.rust.Concept.NoActionBar" />
<activity <activity
android:name=".WorkManagementActivity" android:name=".WorkManagementActivity"
android:exported="false" android:exported="false"
android:screenOrientation="portrait" android:screenOrientation="portrait" />
android:theme="@style/Theme.rust.Concept.NoActionBar" />
<activity <activity
android:name=".FullScreenCoverActivity" android:name=".FullScreenCoverActivity"
android:exported="false" android:exported="false"
android:screenOrientation="portrait" android:screenOrientation="portrait" />
android:theme="@style/Theme.rust.Concept.NoActionBar" />
<activity <activity
android:name=".TagActivity" android:name=".TagActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait" />
android:theme="@style/Theme.rust.Concept.NoActionBar" />
<activity <activity
android:name=".ReportActivity" android:name=".ReportActivity"
android:exported="false" android:exported="false"
android:screenOrientation="portrait" android:screenOrientation="portrait" />
android:theme="@style/Theme.rust.Concept.NoActionBar" />
<activity <activity
android:name=".EditUserInfoActivity" android:name=".EditUserInfoActivity"
android:exported="false" android:exported="false"
android:screenOrientation="portrait" android:screenOrientation="portrait" />
android:theme="@style/Theme.rust.Concept.NoActionBar" />
<activity <activity
android:name=".UserHomePageActivity" android:name=".UserHomePageActivity"
android:exported="false" android:exported="false"
android:screenOrientation="portrait" android:screenOrientation="portrait" />
android:theme="@style/Theme.rust.Concept.NoActionBar" />
<activity <activity
android:name=".WebModInfoActivity" android:name=".WebModInfoActivity"
android:exported="false" android:exported="false"
android:screenOrientation="portrait" android:screenOrientation="portrait" />
android:theme="@style/Theme.rust.Concept.NoActionBar" />
<provider <provider
android:name="androidx.core.content.FileProvider" android:name="androidx.core.content.FileProvider"
@ -137,8 +119,7 @@
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name="com.yalantis.ucrop.UCropActivity" android:name="com.yalantis.ucrop.UCropActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait" /> <!-- <activity -->
android:theme="@style/Theme.rust.Concept.NoActionBar" /> <!-- <activity -->
<!-- android:name=".StartActivity" --> <!-- android:name=".StartActivity" -->
<!-- android:exported="true" --> <!-- android:exported="true" -->
<!-- android:screenOrientation="portrait" --> <!-- android:screenOrientation="portrait" -->
@ -268,59 +249,49 @@
<activity <activity
android:name=".AboutActivity" android:name=".AboutActivity"
android:exported="false" android:exported="false"
android:screenOrientation="portrait" android:screenOrientation="portrait" />
android:theme="@style/Theme.rust.Concept.NoActionBar" />
<activity <activity
android:name=".ValueTypeActivity" android:name=".ValueTypeActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait" />
android:theme="@style/Theme.rust.Concept.NoActionBar" />
<activity <activity
android:name=".GlobalOperationsActivity" android:name=".GlobalOperationsActivity"
android:label="@string/global_operations" android:label="@string/global_operations"
android:screenOrientation="portrait" android:screenOrientation="portrait" />
android:theme="@style/Theme.rust.Concept.NoActionBar" />
<activity <activity
android:name=".EditActivity" android:name=".EditActivity"
android:configChanges="orientation" android:configChanges="orientation"
android:exported="true" android:exported="true"
android:label="@string/mod_action1" android:label="@string/mod_action1"
android:screenOrientation="portrait" android:screenOrientation="portrait" />
android:theme="@style/Theme.rust.Concept.NoActionBar" />
<activity <activity
android:name=".CreateModActivity" android:name=".CreateModActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".UnitsActivity" android:name=".UnitsActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait" />
android:theme="@style/Theme.rust.Concept.NoActionBar" />
<activity <activity
android:name=".OptimizeActivity" android:name=".OptimizeActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".FileManagerActivity" android:name=".FileManagerActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait" />
android:theme="@style/Theme.rust.Concept.NoActionBar" />
<activity <activity
android:name=".CreateUnitActivity" android:name=".CreateUnitActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".TemplateParserActivity" android:name=".TemplateParserActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait" />
android:theme="@style/Theme.rust.Concept.NoActionBar" />
<activity <activity
android:name=".LibraryActivity" android:name=".LibraryActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait" />
android:theme="@style/Theme.rust.Concept.NoActionBar" />
<activity <activity
android:name=".SettingsActivity" android:name=".SettingsActivity"
android:exported="true" android:exported="true"
android:label="@string/setting" android:label="@string/setting"
android:screenOrientation="portrait" android:screenOrientation="portrait" />
android:theme="@style/Theme.rust.Concept.NoActionBar" />
<activity <activity
android:name=".TemplateMakerActivity" android:name=".TemplateMakerActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait" />
android:theme="@style/Theme.rust.Concept.NoActionBar" />
<activity <activity
android:name=".CreateTemplateActivity" android:name=".CreateTemplateActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
@ -329,39 +300,31 @@
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".LoginActivity" android:name=".LoginActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait" />
android:theme="@style/Theme.rust.Concept.NoActionBar" />
<activity <activity
android:name=".RegisterActivity" android:name=".RegisterActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait" />
android:theme="@style/Theme.rust.Concept.NoActionBar" />
<activity <activity
android:name=".EditModInfoActivity" android:name=".EditModInfoActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait" />
android:theme="@style/Theme.rust.Concept.NoActionBar" />
<activity <activity
android:name=".ApplicationListActivity" android:name=".ApplicationListActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait" />
android:theme="@style/Theme.rust.Concept.NoActionBar" />
<activity <activity
android:name=".GameCheckActivity" android:name=".GameCheckActivity"
android:screenOrientation="portrait" /> android:screenOrientation="portrait" />
<activity <activity
android:name=".RecyclingStationActivity" android:name=".RecyclingStationActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait" />
android:theme="@style/Theme.rust.Concept.NoActionBar" />
<activity <activity
android:name=".BookmarkManagerActivity" android:name=".BookmarkManagerActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait" />
android:theme="@style/Theme.rust.Concept.NoActionBar" />
<activity <activity
android:name=".ReleaseModActivity" android:name=".ReleaseModActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait" />
android:theme="@style/Theme.rust.Concept.NoActionBar" />
<activity <activity
android:name=".PackActivity" android:name=".PackActivity"
android:screenOrientation="portrait" android:screenOrientation="portrait" />
android:theme="@style/Theme.rust.Concept.NoActionBar" />
</application> </application>
</manifest> </manifest>

View File

@ -97,7 +97,6 @@ class AboutActivity : BaseActivity<ActivityAboutBinding>() {
override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) {
if (canUseView) { if (canUseView) {
setSupportActionBar(viewBinding.toolbar)
setReturnButton() setReturnButton()
setTitle(R.string.about) setTitle(R.string.about)
initView() initView()

View File

@ -234,7 +234,6 @@ class ActivateActivity : BaseActivity<ActivityActivateBinding>() {
override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) {
if (canUseView) { if (canUseView) {
viewBinding.toolbar.title = getText(R.string.activation_app) viewBinding.toolbar.title = getText(R.string.activation_app)
setSupportActionBar(viewBinding.toolbar)
setReturnButton() setReturnButton()
val account = appSettings.getValue(AppSettings.Setting.Account, "") val account = appSettings.getValue(AppSettings.Setting.Account, "")
if (account.isBlank()) { if (account.isBlank()) {

View File

@ -147,7 +147,6 @@ class ApplicationListActivity : BaseActivity<ActivityApplicationListBinding>() {
*/ */
private fun setTitleAndActionBar() { private fun setTitleAndActionBar() {
viewBinding.toolbar.setTitle(R.string.select_game_pack) viewBinding.toolbar.setTitle(R.string.select_game_pack)
setSupportActionBar(viewBinding.toolbar)
setReturnButton() setReturnButton()
} }

View File

@ -222,7 +222,6 @@ class BookmarkManagerActivity : BaseActivity<ActivityBookmarkManagerBinding>() {
override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) {
if (canUseView) { if (canUseView) {
setSupportActionBar(viewBinding.toolbar)
setReturnButton() setReturnButton()
setTitle(R.string.bookmark_manager) setTitle(R.string.bookmark_manager)
bookmarkManager = BookmarkManager(this@BookmarkManagerActivity) bookmarkManager = BookmarkManager(this@BookmarkManagerActivity)

View File

@ -449,7 +449,6 @@ class EditActivity : BaseActivity<ActivityEditBinding>() {
override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) {
if (canUseView) { if (canUseView) {
setSupportActionBar(viewBinding.toolbar)
setReturnButton() setReturnButton()
loadStartObserve() loadStartObserve()
loadEndObserve() loadEndObserve()

View File

@ -76,7 +76,6 @@ class EditModInfoActivity : BaseActivity<ActivityEditModInfoBinding>() {
override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) {
if (canUseView) { if (canUseView) {
viewBinding.toolbar.title = getText(R.string.mod_action2) viewBinding.toolbar.title = getText(R.string.mod_action2)
setSupportActionBar(viewBinding.toolbar)
setReturnButton() setReturnButton()
val intent = intent val intent = intent
val bundle = intent.getBundleExtra("data") val bundle = intent.getBundleExtra("data")

View File

@ -53,7 +53,6 @@ class EditUserInfoActivity : BaseActivity<ActivityEditUserInfoBinding>() {
private fun initView() { private fun initView() {
viewBinding.toolbar.title = getText(R.string.editData) viewBinding.toolbar.title = getText(R.string.editData)
setSupportActionBar(viewBinding.toolbar)
setReturnButton() setReturnButton()
val thisIntent = intent val thisIntent = intent
val temUserId = thisIntent.getStringExtra("userId") val temUserId = thisIntent.getStringExtra("userId")

View File

@ -28,7 +28,6 @@ class ErrorInfoActivity : BaseActivity<ActivityErrorInfoBinding>() {
override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) {
if (canUseView) { if (canUseView) {
viewBinding.toolbar.title = getText(R.string.see_error_info) viewBinding.toolbar.title = getText(R.string.see_error_info)
setSupportActionBar(viewBinding.toolbar)
setReturnButton() setReturnButton()
viewBinding.recyclerView.layoutManager = LinearLayoutManager(this) viewBinding.recyclerView.layoutManager = LinearLayoutManager(this)
val path = AppSettings.dataRootDirectory + "/carsh/" val path = AppSettings.dataRootDirectory + "/carsh/"

View File

@ -50,7 +50,6 @@ class FileManagerActivity : BaseActivity<ActivityFileBinding>() {
private var additionalData: String? = null private var additionalData: String? = null
private fun initView() { private fun initView() {
viewBinding.toolbar.setTitle(R.string.file_manager) viewBinding.toolbar.setTitle(R.string.file_manager)
setSupportActionBar(viewBinding.toolbar)
setReturnButton() setReturnButton()
viewBinding.fileList.layoutManager = LinearLayoutManager(this@FileManagerActivity) viewBinding.fileList.layoutManager = LinearLayoutManager(this@FileManagerActivity)
val intent = intent val intent = intent

View File

@ -37,7 +37,6 @@ class GlobalOperationsActivity : BaseActivity<ActivityGlobalOperationsBinding>()
override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) {
if (canUseView) { if (canUseView) {
setSupportActionBar(viewBinding.toolbar)
setReturnButton() setReturnButton()
val modPath = intent.getStringExtra("modPath") val modPath = intent.getStringExtra("modPath")
if (modPath == null) { if (modPath == null) {

View File

@ -155,7 +155,6 @@ class LibraryActivity : BaseActivity<ActivityLibraryBinding>() {
override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) {
if (canUseView) { if (canUseView) {
viewBinding.toolbar.setTitle(R.string.libs) viewBinding.toolbar.setTitle(R.string.libs)
setSupportActionBar(viewBinding.toolbar)
//android:label="@string/mod_action1" //android:label="@string/mod_action1"
setReturnButton() setReturnButton()
viewBinding.libsView.layoutManager = LinearLayoutManager(this@LibraryActivity) viewBinding.libsView.layoutManager = LinearLayoutManager(this@LibraryActivity)

View File

@ -84,7 +84,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
*/ */
fun useToolbarSetSupportActionBar() { fun useToolbarSetSupportActionBar() {
tabLayout = viewBinding.tabLayout tabLayout = viewBinding.tabLayout
setSupportActionBar(viewBinding.toolbar)
} }
/** /**

View File

@ -39,7 +39,6 @@ class OrderListActivity : BaseActivity<ActivityOrderListBinding>() {
override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) {
if (canUseView) { if (canUseView) {
viewBinding.toolbar.title = getText(R.string.order_list) viewBinding.toolbar.title = getText(R.string.order_list)
setSupportActionBar(viewBinding.toolbar)
setReturnButton() setReturnButton()
if (account.isBlank()) { if (account.isBlank()) {
showError(getString(R.string.please_login_first)) showError(getString(R.string.please_login_first))

View File

@ -53,7 +53,6 @@ class PackActivity : BaseActivity<ActivityPackBinding>() {
if (canUseView) if (canUseView)
{ {
viewBinding.toolbar.title = getText(R.string.packmod) viewBinding.toolbar.title = getText(R.string.packmod)
setSupportActionBar(viewBinding.toolbar)
setReturnButton() setReturnButton()
initData() initData()
initAction() initAction()

View File

@ -55,7 +55,6 @@ class PayActivity : BaseActivity<ActivityPayBinding>() {
override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) {
if (canUseView) { if (canUseView) {
viewBinding.toolbar.title = getText(R.string.pay) viewBinding.toolbar.title = getText(R.string.pay)
setSupportActionBar(viewBinding.toolbar)
setReturnButton() setReturnButton()
val thisIntent = intent val thisIntent = intent
val uuid = thisIntent.getStringExtra("uuid") val uuid = thisIntent.getStringExtra("uuid")

View File

@ -23,7 +23,6 @@ class RecyclingStationActivity : BaseActivity<ActivityRecyclingStationBinding>()
override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) {
if (canUseView) { if (canUseView) {
viewBinding.toolbar.setTitle(R.string.enable_the_recovery_station) viewBinding.toolbar.setTitle(R.string.enable_the_recovery_station)
setSupportActionBar(viewBinding.toolbar)
setReturnButton() setReturnButton()
viewBinding.backupList.layoutManager = viewBinding.backupList.layoutManager =
LinearLayoutManager(this@RecyclingStationActivity) LinearLayoutManager(this@RecyclingStationActivity)

View File

@ -451,7 +451,6 @@ class RegisterActivity : BaseActivity<ActivityRegisterBinding>() {
override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) {
if (canUseView) { if (canUseView) {
viewBinding.toolbar.setTitle(R.string.register) viewBinding.toolbar.setTitle(R.string.register)
setSupportActionBar(viewBinding.toolbar)
setReturnButton() setReturnButton()
initAction() initAction()
} }

View File

@ -79,7 +79,6 @@ class ReleaseModActivity : BaseActivity<ActivityReleaseModBinding>() {
override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) {
if (canUseView) { if (canUseView) {
viewBinding.toolbar.title = getText(R.string.release) viewBinding.toolbar.title = getText(R.string.release)
setSupportActionBar(viewBinding.toolbar)
setReturnButton() setReturnButton()
val layoutManager = LinearLayoutManager(this) val layoutManager = LinearLayoutManager(this)
layoutManager.orientation = RecyclerView.HORIZONTAL layoutManager.orientation = RecyclerView.HORIZONTAL

View File

@ -31,7 +31,6 @@ class ReportActivity : BaseActivity<ActivityReportBinding>() {
override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) {
if (canUseView) { if (canUseView) {
viewBinding.toolbar.title = getText(R.string.report) viewBinding.toolbar.title = getText(R.string.report)
setSupportActionBar(viewBinding.toolbar)
setReturnButton() setReturnButton()
val bundle = intent.getBundleExtra("data") val bundle = intent.getBundleExtra("data")
if (bundle == null) { if (bundle == null) {

View File

@ -23,7 +23,6 @@ class ReportListActivity : BaseActivity<ActivityReportListBinding>() {
override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) {
if (canUseView) { if (canUseView) {
viewBinding.toolbar.title = getText(R.string.report_to_deal) viewBinding.toolbar.title = getText(R.string.report_to_deal)
setSupportActionBar(viewBinding.toolbar)
setReturnButton() setReturnButton()
val account = appSettings.getValue(AppSettings.Setting.Account, "") val account = appSettings.getValue(AppSettings.Setting.Account, "")
if (account.isBlank()) { if (account.isBlank()) {

View File

@ -29,7 +29,6 @@ class ReviewModActivity : BaseActivity<ActivityReviewModBinding>() {
override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) {
if (canUseView) { if (canUseView) {
viewBinding.toolbar.title = getText(R.string.review_mod) viewBinding.toolbar.title = getText(R.string.review_mod)
setSupportActionBar(viewBinding.toolbar)
setReturnButton() setReturnButton()
if (account.isBlank()) { if (account.isBlank()) {
showInfoToView(resId = R.string.please_login_first) showInfoToView(resId = R.string.please_login_first)

View File

@ -18,7 +18,6 @@ class SearchActivity : BaseActivity<ActivitySearchBinding>() {
lateinit var keyWord: String lateinit var keyWord: String
override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) {
if (canUseView) { if (canUseView) {
setSupportActionBar(viewBinding.toolbar)
setReturnButton() setReturnButton()
loadData(keyWord) loadData(keyWord)
title = String.format(getString(R.string.search_mod_key), keyWord) title = String.format(getString(R.string.search_mod_key), keyWord)

View File

@ -207,7 +207,6 @@ class SettingsActivity : BaseActivity<ActivitySettingsBinding>() {
override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) {
if (canUseView) { if (canUseView) {
viewBinding.toolbar.setTitle(R.string.set_up) viewBinding.toolbar.setTitle(R.string.set_up)
setSupportActionBar(viewBinding.toolbar)
setReturnButton() setReturnButton()
val settingsFragment = SettingsFragment() val settingsFragment = SettingsFragment()
supportFragmentManager supportFragmentManager

View File

@ -118,7 +118,6 @@ class TagActivity : BaseActivity<ActivityTagBinding>() {
override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) {
if (canUseView) { if (canUseView) {
setSupportActionBar(viewBinding.toolbar)
setReturnButton() setReturnButton()
val thisIntent = intent val thisIntent = intent
val bundle = thisIntent.getBundleExtra("data") val bundle = thisIntent.getBundleExtra("data")

View File

@ -329,7 +329,6 @@ class TemplateMakerActivity : BaseActivity<ActivityTemplateMakerBinding>() {
override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) {
if (canUseView) { if (canUseView) {
setSupportActionBar(viewBinding.toolbar)
setReturnButton() setReturnButton()
viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager) viewBinding.tabLayout.setupWithViewPager(viewBinding.viewPager)
makerView = RecyclerView(this@TemplateMakerActivity) makerView = RecyclerView(this@TemplateMakerActivity)

View File

@ -421,7 +421,6 @@ class TemplateParserActivity() : BaseActivity<ActivityTemplateParserBinding>() {
override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) {
if (canUseView) { if (canUseView) {
setSupportActionBar(viewBinding.toolbar)
setReturnButton() setReturnButton()
viewBinding.fab.hide() viewBinding.fab.hide()
val intent = intent val intent = intent

View File

@ -20,7 +20,6 @@ class ThanksActivity : BaseActivity<ActivityThanksBinding>() {
override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) {
if (canUseView) { if (canUseView) {
viewBinding.toolbar.setTitle(R.string.special_thanks_to) viewBinding.toolbar.setTitle(R.string.special_thanks_to)
setSupportActionBar(viewBinding.toolbar)
setReturnButton() setReturnButton()
viewBinding.recyclerView.layoutManager = LinearLayoutManager(this) viewBinding.recyclerView.layoutManager = LinearLayoutManager(this)
val list = ArrayList<ThanksDataBean>() val list = ArrayList<ThanksDataBean>()

View File

@ -27,7 +27,6 @@ class TurretDesignActivity : BaseActivity<ActivityTurretDesignBinding>() {
override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) {
if (canUseView) { if (canUseView) {
setSupportActionBar(viewBinding.toolbar)
setReturnButton() setReturnButton()
title = getString(R.string.turret_design) title = getString(R.string.turret_design)
val modPath = intent.getStringExtra("modPath") val modPath = intent.getStringExtra("modPath")

View File

@ -226,7 +226,6 @@ class UnitsActivity : BaseActivity<ActivityUnitsBinding>() {
override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) {
if (canUseView) { if (canUseView) {
viewBinding.toolbar.setTitle(R.string.mod_action1) viewBinding.toolbar.setTitle(R.string.mod_action1)
setSupportActionBar(viewBinding.toolbar)
setReturnButton() setReturnButton()
val intent = intent val intent = intent
val bundle = intent.getBundleExtra("data") val bundle = intent.getBundleExtra("data")

View File

@ -82,7 +82,6 @@ class UserHomePageActivity : BaseActivity<ActivityUserHomePageBinding>() {
account = temAccount account = temAccount
} }
viewBinding.toolbar.title = "" viewBinding.toolbar.title = ""
setSupportActionBar(viewBinding.toolbar)
setReturnButton() setReturnButton()
val params = viewBinding.toolbar.layoutParams as CollapsingToolbarLayout.LayoutParams val params = viewBinding.toolbar.layoutParams as CollapsingToolbarLayout.LayoutParams
params.setMargins(0, statusBarHeight(this), 0, 0) params.setMargins(0, statusBarHeight(this), 0, 0)

View File

@ -39,7 +39,6 @@ class UserListActivity : BaseActivity<ActivityUserListBinding>() {
override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) {
if (canUseView) { if (canUseView) {
setSupportActionBar(viewBinding.toolbar)
setReturnButton() setReturnButton()
val thisIntent = intent val thisIntent = intent
val bundle = thisIntent.getBundleExtra("data") val bundle = thisIntent.getBundleExtra("data")

View File

@ -291,7 +291,6 @@ class ValueTypeActivity : BaseActivity<ActivityValueTypeBinding>() {
if (canUseView) { if (canUseView) {
viewBinding.toolbar.title = getText(R.string.value_type_manager) viewBinding.toolbar.title = getText(R.string.value_type_manager)
viewBinding.valueList.layoutManager = LinearLayoutManager(this@ValueTypeActivity) viewBinding.valueList.layoutManager = LinearLayoutManager(this@ValueTypeActivity)
setSupportActionBar(viewBinding.toolbar)
setReturnButton() setReturnButton()
loadList() loadList()
viewBinding.fab.setOnClickListener { showEditDialog(null) } viewBinding.fab.setOnClickListener { showEditDialog(null) }

View File

@ -77,7 +77,6 @@ class WebModInfoActivity : BaseActivity<ActivityWebModInfoBinding>() {
private var isOpen = false private var isOpen = false
private fun initView() { private fun initView() {
setSupportActionBar(viewBinding.toolbar)
setReturnButton() setReturnButton()
val activityIntent = intent val activityIntent = intent
val bundle = activityIntent.getBundleExtra("data") val bundle = activityIntent.getBundleExtra("data")

View File

@ -251,7 +251,6 @@ class WorkManagementActivity : BaseActivity<ActivityWorkmangementBinding>() {
override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) {
if (canUseView) { if (canUseView) {
viewBinding.toolbar.setTitle(R.string.work_management) viewBinding.toolbar.setTitle(R.string.work_management)
setSupportActionBar(viewBinding.toolbar)
setReturnButton() setReturnButton()
viewBinding.recyclerView.layoutManager = LinearLayoutManager(this) viewBinding.recyclerView.layoutManager = LinearLayoutManager(this)
} }

View File

@ -10,6 +10,8 @@ import android.view.inputmethod.InputMethodManager
import android.widget.EditText import android.widget.EditText
import android.widget.Toast import android.widget.Toast
import androidx.appcompat.app.AppCompatDelegate import androidx.appcompat.app.AppCompatDelegate
import androidx.appcompat.widget.Toolbar
import androidx.core.view.WindowCompat
import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModel
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.viewbinding.ViewBinding import androidx.viewbinding.ViewBinding
@ -41,15 +43,21 @@ abstract class BaseActivity<ViewBingType : ViewBinding> :
} }
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
// loadLanguage() // WindowCompat.setDecorFitsSystemWindows(window, false)
whenCreateActivity(savedInstanceState, false) whenCreateActivity(savedInstanceState, false)
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(viewBinding.root) setContentView(viewBinding.root)
val toolBar = findViewById<Toolbar>(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) whenCreateActivity(savedInstanceState, true)
} }
/** /**
* 展示Toast * 展示Toast
* @param str String * @param str String

View File

@ -1,63 +1,86 @@
<?xml version="1.0" encoding="utf-8"?> <?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:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingLeft="16dp" android:fitsSystemWindows="true"
android:paddingTop="8dp" tools:context=".MainActivity">
android:paddingRight="16dp">
<RelativeLayout <com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:fitsSystemWindows="true">
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/modNameInputLayout" android:id="@+id/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="?attr/actionBarSize" />
app:counterEnabled="true"
app:counterMaxLength="255">
<com.google.android.material.textfield.TextInputEditText </com.google.android.material.appbar.AppBarLayout>
android:id="@+id/modNameEdit"
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
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"
android:layout_height="wrap_content">
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/modNameInputLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="@string/name" app:counterEnabled="true"
android:imeOptions="actionNext" app:counterMaxLength="255">
android:inputType="text"
android:maxLength="255"
android:maxLines="1" />
</com.google.android.material.textfield.TextInputLayout> <com.google.android.material.textfield.TextInputEditText
android:id="@+id/modNameEdit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/name"
android:imeOptions="actionNext"
android:inputType="text"
android:maxLength="255"
android:maxLines="1" />
<com.google.android.material.textfield.TextInputLayout </com.google.android.material.textfield.TextInputLayout>
android:id="@+id/modDescribeInputLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/modNameInputLayout"
android:paddingTop="8dp"
app:counterEnabled="true"
app:counterMaxLength="500">
<com.google.android.material.textfield.TextInputEditText <com.google.android.material.textfield.TextInputLayout
android:id="@+id/modDescribeEdit" android:id="@+id/modDescribeInputLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="@string/describe" android:layout_below="@id/modNameInputLayout"
android:imeOptions="actionDone" android:paddingTop="8dp"
android:inputType="text" app:counterEnabled="true"
android:maxLength="500" /> app:counterMaxLength="500">
</com.google.android.material.textfield.TextInputLayout> <com.google.android.material.textfield.TextInputEditText
android:id="@+id/modDescribeEdit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/describe"
android:imeOptions="actionDone"
android:inputType="text"
android:maxLength="500" />
<Button </com.google.android.material.textfield.TextInputLayout>
android:id="@+id/createbutton"
android:layout_width="match_parent" <Button
android:layout_height="wrap_content" android:id="@+id/createbutton"
android:layout_below="@id/modDescribeInputLayout" android:layout_width="match_parent"
android:text="@string/create" /> android:layout_height="wrap_content"
android:layout_below="@id/modDescribeInputLayout"
android:text="@string/create" />
</RelativeLayout> </RelativeLayout>
</androidx.core.widget.NestedScrollView>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</ScrollView>

View File

@ -30,8 +30,8 @@
android:id="@+id/tabLayout" android:id="@+id/tabLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone"
android:background="?android:windowBackground" android:background="?android:windowBackground"
android:visibility="gone"
app:tabMode="fixed" app:tabMode="fixed"
app:tabTextAppearance="@style/TabLayoutTextStyle"> app:tabTextAppearance="@style/TabLayoutTextStyle">

View File

@ -2,7 +2,6 @@
<resources> <resources>
<string name="app_name">Rust Assistant</string> <string name="app_name">Rust Assistant</string>
<string name="dialog_title">Application permission</string> <string name="dialog_title">Application permission</string>
<string name="dialog_msg">We need storage permissions to read module lists, edit source files, import and export modules, and so on.</string>
<string name="dialog_confirm">Authorization</string> <string name="dialog_confirm">Authorization</string>
<string name="dialog_close">Exit</string> <string name="dialog_close">Exit</string>
<string name="dialog_msg29">We need to manage file permissions to read module lists, edit source files, import and export modules, and so on.</string> <string name="dialog_msg29">We need to manage file permissions to read module lists, edit source files, import and export modules, and so on.</string>

View File

@ -3,7 +3,6 @@
<string name="app_name">サビアシスタント</string> <string name="app_name">サビアシスタント</string>
<string name="dialog_title">権限申請</string> <string name="dialog_title">権限申請</string>
<string name="dialog_msg29">モジュールリストの読み込み、ソースファイルの編集、モジュールのインポート、エクスポートなどのファイル権限を管理する必要があります。</string> <string name="dialog_msg29">モジュールリストの読み込み、ソースファイルの編集、モジュールのインポート、エクスポートなどのファイル権限を管理する必要があります。</string>
<string name="dialog_msg">モジュールリストの読み込み、ソースファイルの編集、モジュールのインポートとエクスポートなどのための保存権限が必要です。</string>
<string name="dialog_confirm">オーソライズ</string> <string name="dialog_confirm">オーソライズ</string>
<string name="dialog_close">退く</string> <string name="dialog_close">退く</string>
<string name="not_find_mod">モジュールはありません</string> <string name="not_find_mod">モジュールはありません</string>

View File

@ -2,7 +2,6 @@
<string name="app_name">Помощник по ржавчине</string> <string name="app_name">Помощник по ржавчине</string>
<string name="dialog_title">Заявка на разрешение.</string> <string name="dialog_title">Заявка на разрешение.</string>
<string name="dialog_msg29">Нам нужны права диспетчера файлов для чтения списка модулей, редактирования исходных файлов, импорта модулей экспорта и так далее.</string> <string name="dialog_msg29">Нам нужны права диспетчера файлов для чтения списка модулей, редактирования исходных файлов, импорта модулей экспорта и так далее.</string>
<string name="dialog_msg">Нам нужно сохранить разрешения на чтение списка модулей, редактирование исходных файлов, импорт модулей экспорта и многое другое</string>
<string name="dialog_confirm">Разрешите</string> <string name="dialog_confirm">Разрешите</string>
<string name="dialog_close">Выйдите.</string> <string name="dialog_close">Выйдите.</string>
<string name="dialog_close2">Фон.</string> <string name="dialog_close2">Фон.</string>

View File

@ -3,7 +3,6 @@
<string name="dialog_title">權限申請</string> <string name="dialog_title">權限申請</string>
<string name="app_name">鐵銹助手</string> <string name="app_name">鐵銹助手</string>
<string name="dialog_msg29">我們需要管理文件權限,用於讀取模組列表,編輯源文件,導入導出模組等等。</string> <string name="dialog_msg29">我們需要管理文件權限,用於讀取模組列表,編輯源文件,導入導出模組等等。</string>
<string name="dialog_msg">我們需要存儲權限,用於讀取模組列表,編輯源文件,導入導出模組等等。</string>
<string name="dialog_confirm">授權</string> <string name="dialog_confirm">授權</string>
<string name="dialog_close">退出</string> <string name="dialog_close">退出</string>
<string name="not_find_mod">沒有模組</string> <string name="not_find_mod">沒有模組</string>

View File

@ -1,14 +1,8 @@
<resources xmlns:tools="http://schemas.android.com/tools"> <resources xmlns:tools="http://schemas.android.com/tools">
<!--白色主题适配安卓5.1 SDK 22-->
<style name="Theme.rust.Concept.NoActionBar" parent="Theme.rust.Concept">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<item name="actionBarStyle">@style/ThemeOverlay.rust.Concept.ActionBar</item>
</style>
<style name="Theme.rust.Concept.SplashScreen" parent="Theme.SplashScreen"> <style name="Theme.rust.Concept.SplashScreen" parent="Theme.SplashScreen">
<item name="postSplashScreenTheme">@style/Theme.rust.Concept.NoActionBar</item> <item name="postSplashScreenTheme">@style/Theme.rust.Concept</item>
<item name="windowSplashScreenAnimationDuration">200</item> <item name="windowSplashScreenAnimationDuration">200</item>
<item name="windowSplashScreenAnimatedIcon">@mipmap/ic_launcher</item> <item name="windowSplashScreenAnimatedIcon">@mipmap/ic_launcher</item>
<item name="windowSplashScreenBackground">@color/white_200</item> <item name="windowSplashScreenBackground">@color/white_200</item>
@ -16,27 +10,30 @@
<!--概念主题 --> <!--概念主题 -->
<style name="Theme.rust.Concept" parent="Theme.Material3.DayNight"> <style name="Theme.rust.Concept" parent="Base.rust.Concept">
<!--主色调--> <!--主色调-->
<item name="colorPrimary">@color/pink_500</item> <!-- <item name="colorPrimary">@color/pink_500</item>-->
<!--主色调变体--> <!--主色调变体-->
<item name="colorPrimaryVariant">@color/pink_200</item> <!-- <item name="colorPrimaryVariant">@color/pink_200</item>-->
<!--主色调之上--> <!--主色调之上-->
<item name="colorOnPrimary">@color/white</item> <!-- <item name="colorOnPrimary">@color/white</item>-->
<!--次要颜色--> <!--次要颜色-->
<item name="colorSecondary">@color/blue_500</item> <!-- <item name="colorSecondary">@color/blue_500</item>-->
<item name="colorSecondaryVariant">@color/blue_700</item> <!-- <item name="colorSecondaryVariant">@color/blue_700</item>-->
<item name="colorOnSecondary">@color/black</item> <!-- <item name="colorOnSecondary">@color/black</item>-->
<item name="android:statusBarColor">@color/white_200</item> <!-- <item name="android:statusBarColor">@color/white_200</item>-->
<item name="android:windowLightStatusBar" tools:targetApi="m">true</item> <!-- <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>-->
<item name="actionBarStyle">@style/ThemeOverlay.rust.Concept.ActionBar</item> <!-- <item name="actionBarStyle">@style/ThemeOverlay.rust.Concept.ActionBar</item>-->
<item name="android:windowBackground">@color/white_200</item> <!-- <item name="android:windowBackground">@color/white_200</item>-->
<item name="android:navigationBarColor">@color/white_200</item> <!-- <item name="android:navigationBarColor">@color/white_200</item>-->
<item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item> <!-- <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>-->
</style> </style>
<style name="Base.rust.Concept" parent="Theme.Material3.DayNight.NoActionBar"/>
<!--概念活动栏样式--> <!--概念活动栏样式-->
<style name="ThemeOverlay.rust.Concept.ActionBar" parent="ThemeOverlay.Material3.ActionBar"> <style name="ThemeOverlay.rust.Concept.ActionBar" parent="ThemeOverlay.Material3.ActionBar">
<item name="android:textColorPrimary">@color/black</item> <item name="android:textColorPrimary">@color/black</item>

View File

@ -32,6 +32,7 @@ android {
buildFeatures { buildFeatures {
viewBinding true viewBinding true
} }
namespace 'com.coldmint.rust.core'
kapt.includeCompileClasspath = false kapt.includeCompileClasspath = false
} }

View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android">
package="com.coldmint.rust.core">
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
</manifest> </manifest>

View File

@ -7,7 +7,7 @@ buildscript {
maven { url 'https://repo1.maven.org/maven2/' } maven { url 'https://repo1.maven.org/maven2/' }
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:7.1.3' classpath 'com.android.tools.build:gradle:7.2.0'
// classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.3.5" // classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.3.5"
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10' classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10'

View File

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip

View File

@ -4,5 +4,5 @@
# Location of the SDK. This is only used by Gradle. # Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the # For customization when using a Version Control System, please read the
# header note. # header note.
#Tue May 10 15:48:20 CST 2022 #Fri May 13 19:21:35 CST 2022
sdk.dir=D\:\\Android_SDK sdk.dir=D\:\\Document\\AndroidSdk