From c219e92777f7385bdabf9bde55c87cba2712231b Mon Sep 17 00:00:00 2001 From: muqing <1966944300@qq.com> Date: Sun, 11 Feb 2024 18:03:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DBUG=EF=BC=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../coldmint/rust/pro/CodeTableActivity.kt | 7 ++- .../com/coldmint/rust/pro/MainActivity.kt | 50 +++++++-------- .../com/coldmint/rust/pro/RustApplication.kt | 2 +- .../com/coldmint/rust/pro/SearchActivity.kt | 55 +++++++++------- .../rust/pro/fragments/CommunityFragment.kt | 62 +++++++------------ .../pro/fragments/PersonalHomeFragment.kt | 13 ++-- .../rust/pro/fragments/TemplateFragment.kt | 9 +-- .../rust/pro/fragments/WarehouseFragment.kt | 32 ++++------ .../pro/fragments/WebModDetailsFragment.kt | 3 +- .../rust/pro => muqing}/muqing/gj.java | 2 +- .../rust/pro => muqing}/muqing/wj.java | 2 +- .../main/res/layout-sw600dp/activity_main.xml | 4 +- .../main/res/layout/activity_code_table.xml | 2 - app/src/main/res/layout/activity_main.xml | 23 +------ .../main/res/layout/fragment_community.xml | 6 +- app/src/main/res/layout/fragment_follow.xml | 6 +- .../res/layout/fragment_personal_home.xml | 4 ++ app/src/main/res/layout/fragment_template.xml | 11 +++- .../main/res/layout/fragment_warehouse.xml | 8 ++- .../res/layout/fragment_web_mod_details.xml | 3 +- app/src/main/res/layout/item_string.xml | 7 ++- app/src/main/res/layout/item_user_head.xml | 2 + dialog/build.gradle | 1 - 23 files changed, 150 insertions(+), 164 deletions(-) rename app/src/main/java/com/{coldmint/rust/pro => muqing}/muqing/gj.java (99%) rename app/src/main/java/com/{coldmint/rust/pro => muqing}/muqing/wj.java (99%) diff --git a/app/src/main/java/com/coldmint/rust/pro/CodeTableActivity.kt b/app/src/main/java/com/coldmint/rust/pro/CodeTableActivity.kt index 5f622ab..23975a5 100644 --- a/app/src/main/java/com/coldmint/rust/pro/CodeTableActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/CodeTableActivity.kt @@ -20,6 +20,7 @@ import com.coldmint.rust.core.database.code.SectionInfo import com.coldmint.rust.pro.adapters.CodeTableAdapter import com.coldmint.rust.pro.base.BaseActivity import com.coldmint.rust.pro.databinding.ActivityCodeTableBinding +import com.muqing.muqing.gj import java.util.concurrent.Executors class CodeTableActivity : BaseActivity() { @@ -48,7 +49,7 @@ class CodeTableActivity : BaseActivity() { if (v?.text.isNullOrEmpty()) { loadData() }else - loadData(v?.text.toString()) + loadData(v?.text.toString()) } false } @@ -231,9 +232,9 @@ class CodeTableActivity : BaseActivity() { viewBinding.edittext.isVisible = b if (!b) { viewBinding.edittext.setText("") - com.coldmint.rust.pro.muqing.gj.ycjp(viewBinding.edittext) + gj.ycjp(viewBinding.edittext) } else { - com.coldmint.rust.pro.muqing.gj.tcjp(viewBinding.edittext) + gj.tcjp(viewBinding.edittext) } } 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 314483e..1d877f4 100644 --- a/app/src/main/java/com/coldmint/rust/pro/MainActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/MainActivity.kt @@ -43,7 +43,6 @@ import com.coldmint.rust.pro.viewmodel.StartViewModel import com.google.android.material.color.DynamicColors import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.snackbar.Snackbar -import com.google.android.material.tabs.TabLayout import com.google.gson.Gson import com.gyf.immersionbar.ImmersionBar import org.json.JSONObject @@ -56,14 +55,12 @@ class MainActivity : BaseActivity() { private lateinit var appBarConfiguration: AppBarConfiguration private var oldLanguage: String? = null private var first = true - var oldDynamicColor = false - var tabLayout: TabLayout? = null - val headLayout by lazy { + private var oldDynamicColor = false + private val headLayout by lazy { HeadLayoutBinding.inflate(layoutInflater) } - val startViewModel by lazy { - ViewModelProvider(this).get(StartViewModel::class.java) + ViewModelProvider(this)[StartViewModel::class.java] } companion object { @@ -75,14 +72,13 @@ class MainActivity : BaseActivity() { /** * 将Toolbar设置为ActionBar */ - fun useToolbarSetSupportActionBar() { - tabLayout = viewBinding.tabLayout + private fun useToolbarSetSupportActionBar() { } /** * 初始化导航 */ - fun initNav() { + private fun initNav() { appBarConfiguration = AppBarConfiguration( setOf(R.id.community_item, R.id.mod_item, R.id.database_item, R.id.template_item), viewBinding.drawerlayout @@ -119,7 +115,7 @@ class MainActivity : BaseActivity() { /** * 检查App更新 */ - fun checkAppUpdate() { + private fun checkAppUpdate() { AppUpdate().getUpdate(object : ApiCallBack { override fun onResponse(t: AppUpdateData) { val data = t.data @@ -183,12 +179,12 @@ class MainActivity : BaseActivity() { } else { materialAlertDialogBuilder.setNegativeButton( R.string.dialog_cancel - ) { i, i2 -> + ) { _, _ -> } } materialAlertDialogBuilder.setPositiveButton( R.string.downlod - ) { i, i2 -> + ) { _, _ -> AppOperator.useBrowserAccessWebPage(this, data.link) } materialAlertDialogBuilder.show() @@ -200,7 +196,7 @@ class MainActivity : BaseActivity() { /** * 显示游戏配置对话框 */ - fun showGameConfiguredDialog() { + private fun showGameConfiguredDialog() { if (!AppSettings.getValue(AppSettings.Setting.SetGameStorage, false)) { try { val packageInfo = packageManager.getPackageInfo( @@ -212,16 +208,16 @@ class MainActivity : BaseActivity() { if (versionCode >= 159) { MaterialAlertDialogBuilder(this).setTitle(R.string.game_configured) .setMessage(R.string.unable_to_detect) - .setPositiveButton(R.string.show_details) { i, i2 -> + .setPositiveButton(R.string.show_details) { _, _ -> startActivity( Intent( this@MainActivity, GameCheckActivity::class.java ) ) - }.setNeutralButton(R.string.no_longer_prompt) { i, i2 -> + }.setNeutralButton(R.string.no_longer_prompt) { _, _ -> AppSettings.setValue(AppSettings.Setting.SetGameStorage, true) - }.setNeutralButton(R.string.dialog_cancel) { i, i2 -> + }.setNeutralButton(R.string.dialog_cancel) { _, _ -> }.setCancelable(false).show() } else { AppSettings.setValue(AppSettings.Setting.SetGameStorage, true) @@ -260,7 +256,7 @@ class MainActivity : BaseActivity() { /** * 初始化导航菜单 */ - fun initNavigationMenu(isActive: Boolean = GlobalMethod.isActive) { + private fun initNavigationMenu(isActive: Boolean = GlobalMethod.isActive) { val menu = viewBinding.navaiagtion.menu val dataBase = menu.findItem(R.id.database_item) val template = menu.findItem(R.id.template_item) @@ -292,7 +288,7 @@ class MainActivity : BaseActivity() { //数据库 dataBase.setOnMenuItemClickListener { viewBinding.mainButton.postOnAnimationDelayed({ - viewBinding.tabLayout.isVisible = false +// viewBinding.tabLayout.isVisible = false viewBinding.mainButton.hide() }, hideViewDelay) false @@ -300,7 +296,7 @@ class MainActivity : BaseActivity() { template.setOnMenuItemClickListener { viewBinding.mainButton.postOnAnimationDelayed({ - viewBinding.tabLayout.isVisible = true +// viewBinding.tabLayout.isVisible = true viewBinding.mainButton.show() }, hideViewDelay) false @@ -339,7 +335,7 @@ class MainActivity : BaseActivity() { GlobalMethod.requestStoragePermissions(this) { if (it) { viewBinding.mainButton.postOnAnimationDelayed({ - viewBinding.tabLayout.isVisible = true +// viewBinding.tabLayout.isVisible = true if (isActive) { viewBinding.mainButton.show() } @@ -348,15 +344,13 @@ class MainActivity : BaseActivity() { } false } - community.setOnMenuItemClickListener { viewBinding.mainButton.postOnAnimationDelayed({ - viewBinding.tabLayout.isVisible = true +// viewBinding.tabLayout.isVisible = true viewBinding.mainButton.hide() }, hideViewDelay) false } - menu.findItem(R.id.startGame).setOnMenuItemClickListener { val packName = AppSettings.getValue( AppSettings.Setting.GamePackage, @@ -480,7 +474,7 @@ class MainActivity : BaseActivity() { * @param formFile File 文件 * @param templateDirectory File 模板文件夹 */ - fun importTemplate(formFile: File, templateDirectory: File) { + private fun importTemplate(formFile: File, templateDirectory: File) { val handler = Handler(Looper.getMainLooper()) Thread(Runnable { //如果建立缓存完成，并且模板文件存在 @@ -533,10 +527,10 @@ class MainActivity : BaseActivity() { getString(R.string.covers_the_import), newInfo.versionName, oldInfo.versionName ) - ).setPositiveButton(R.string.dialog_ok) { i, i2 -> + ).setPositiveButton(R.string.dialog_ok) { _, _ -> FileOperator.delete_files(templateDirectory) importTemplate(formFile, templateDirectory) - }.setNegativeButton(R.string.dialog_cancel) { i, i2 -> + }.setNegativeButton(R.string.dialog_cancel) { _, _ -> }.show() } return@Runnable @@ -661,7 +655,7 @@ class MainActivity : BaseActivity() { /** * 观察启动视图 */ - fun observeStartViewModel() { + private fun observeStartViewModel() { startViewModel.userLiveData.observe(this) { headLayout.nameView.text = it.data.userName headLayout.emailView.text = it.data.email @@ -746,7 +740,7 @@ class MainActivity : BaseActivity() { AppSettings.Setting.DynamicColor, DynamicColors.isDynamicColorAvailable() ) - useToolbarSetSupportActionBar() +// useToolbarSetSupportActionBar() initNav() observeStartViewModel() //偏移fab diff --git a/app/src/main/java/com/coldmint/rust/pro/RustApplication.kt b/app/src/main/java/com/coldmint/rust/pro/RustApplication.kt index 83ec3db..786a6c8 100644 --- a/app/src/main/java/com/coldmint/rust/pro/RustApplication.kt +++ b/app/src/main/java/com/coldmint/rust/pro/RustApplication.kt @@ -9,7 +9,7 @@ import android.os.Bundle import cat.ereza.customactivityoncrash.config.CaocConfig import com.coldmint.rust.core.debug.LogCat import com.coldmint.rust.core.debug.LogCatObserver -import com.coldmint.rust.pro.muqing.wj +import com.muqing.muqing.wj import com.coldmint.rust.pro.tool.AppSettings import com.google.android.material.color.DynamicColors import com.google.android.material.color.DynamicColorsOptions 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 cd752de..2b94f90 100644 --- a/app/src/main/java/com/coldmint/rust/pro/SearchActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/SearchActivity.kt @@ -2,7 +2,6 @@ package com.coldmint.rust.pro import android.annotation.SuppressLint import android.content.Context -import android.content.Intent import android.os.Bundle import android.view.LayoutInflater import android.view.Menu @@ -29,7 +28,6 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder * 搜索界面 */ class SearchActivity : BaseActivity() { - lateinit var list: MutableList @SuppressLint("CommitPrefEdits", "NotifyDataSetChanged") @@ -48,43 +46,54 @@ class SearchActivity : BaseActivity() { viewBinding.deleat.setOnClickListener { MaterialAlertDialogBuilder(this@SearchActivity) .setTitle("清空所有历史记录") - .setPositiveButton("确定"){ _, _ -> - list.clear() - getSharedPreferences("lishi", - Context.MODE_PRIVATE).edit().putStringSet( - "data", list.toSet()).apply() - adapter.notifyDataSetChanged() + .setPositiveButton("确定") { _, _ -> + while (list.isNotEmpty()) { + val index = 0 + list.removeAt(index) + adapter.notifyItemRemoved(index) + } + getSharedPreferences("lishi", + Context.MODE_PRIVATE).edit().putStringSet( + "data", list.toSet()).apply() + /* CoroutineScope(Dispatchers.Main).launch { + while (list.isNotEmpty()) { + list.removeAt(0) // 删除第一个数据 + adapter.notifyItemRemoved(0) // 刷新 RecyclerView + delay(300) // 每隔一秒执行一次删除操作 + } + }*/ } - .setNegativeButton("取消"){ _, _ -> - - }.show() + .setNegativeButton("取消", null).show() } viewBinding.searchView.onActionViewExpanded() - } - @SuppressLint("NotifyDataSetChanged") + private fun additem(string: String) { - list.remove(string) - list.add(0,string) - adapter.notifyDataSetChanged() + val indexOf = list.indexOf(string) + if (indexOf != -1) { + list.remove(string) + adapter.notifyItemRemoved(indexOf) + } + list.add(0, string) + adapter.notifyItemInserted(0) // 限制历史记录数量为10 if (list.size > 10) { list.removeAt(list.lastIndex) } - val editor = getSharedPreferences("lishi", Context.MODE_PRIVATE).edit() editor.putStringSet("data", list.toSet()) editor.apply() } fun search(string: String) { - val intent = Intent(this@SearchActivity, SearchResultActivity::class.java) - intent.putExtra("key",string) - startActivity(intent) + /* val intent = Intent(this@SearchActivity, SearchResultActivity::class.java) + intent.putExtra("key",string) + startActivity(intent)*/ additem(string) } - val adapter: RecyclerView.Adapter = object :RecyclerView.Adapter() { + + val adapter: RecyclerView.Adapter = object : RecyclerView.Adapter() { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): VH { return VH(ItemStringBinding.bind( @@ -95,13 +104,13 @@ class SearchActivity : BaseActivity() { override fun onBindViewHolder(holder: VH, position: Int) { holder.binding.button.text = list[position] - holder.binding.button.setOnClickListener{ + holder.binding.button.setOnClickListener { val a: Button = it as Button search(a.text.toString()) } } - override fun getItemCount() :Int { + override fun getItemCount(): Int { viewBinding.textview1Text1.isVisible = list.isEmpty() return list.size } diff --git a/app/src/main/java/com/coldmint/rust/pro/fragments/CommunityFragment.kt b/app/src/main/java/com/coldmint/rust/pro/fragments/CommunityFragment.kt index a7f9846..496da83 100644 --- a/app/src/main/java/com/coldmint/rust/pro/fragments/CommunityFragment.kt +++ b/app/src/main/java/com/coldmint/rust/pro/fragments/CommunityFragment.kt @@ -1,53 +1,41 @@ package com.coldmint.rust.pro.fragments -import android.view.LayoutInflater import android.os.Bundle -import android.os.Parcelable -import android.view.View -import android.widget.Toast -import androidx.core.view.isVisible -import androidx.fragment.app.Fragment -import androidx.viewpager2.adapter.FragmentStateAdapter -import com.coldmint.rust.pro.MainActivity +import android.view.LayoutInflater import com.coldmint.rust.pro.R import com.coldmint.rust.pro.adapters.CommunityAdapter import com.coldmint.rust.pro.base.BaseFragment -import com.coldmint.rust.pro.databinding.* -import com.google.android.material.tabs.TabLayout +import com.coldmint.rust.pro.databinding.FragmentCommunityBinding import com.google.android.material.tabs.TabLayoutMediator class CommunityFragment : BaseFragment() { - - - - fun loadTab() { + private fun loadTab() { if (!isAdded) { return } - val mainActivity = requireActivity() as MainActivity - val tabLayout: TabLayout? = mainActivity.tabLayout - if (tabLayout != null) { - tabLayout.isVisible = true - TabLayoutMediator(tabLayout, viewBinding.pager) - { tab, position -> - when (position) { - 0 -> { - tab.text = getText(R.string.recommended) - } - 1 -> { - tab.text = getText(R.string.follow) - } - 2 -> { - tab.text = getText(R.string.ranking) - } - 3 -> { - tab.text = getText(R.string.my) - } + TabLayoutMediator(viewBinding.tabLayout, viewBinding.pager) + { tab, position -> + when (position) { + 0 -> { + tab.text = getText(R.string.recommended) } - }.attach() - } else { + + 1 -> { + tab.text = getText(R.string.follow) + } + + 2 -> { + tab.text = getText(R.string.ranking) + } + + 3 -> { + tab.text = getText(R.string.my) + } + } + }.attach() + /* else { viewBinding.pager.postDelayed({ loadTab() }, MainActivity.linkInterval) - } + }*/ } @@ -60,6 +48,4 @@ class CommunityFragment : BaseFragment() { viewBinding.pager.isSaveEnabled = false loadTab() } - - } \ No newline at end of file diff --git a/app/src/main/java/com/coldmint/rust/pro/fragments/PersonalHomeFragment.kt b/app/src/main/java/com/coldmint/rust/pro/fragments/PersonalHomeFragment.kt index 981ac88..fe44fea 100644 --- a/app/src/main/java/com/coldmint/rust/pro/fragments/PersonalHomeFragment.kt +++ b/app/src/main/java/com/coldmint/rust/pro/fragments/PersonalHomeFragment.kt @@ -16,6 +16,7 @@ import com.coldmint.rust.pro.WebModInfoActivity import com.coldmint.rust.pro.adapters.WebModAdapter import com.coldmint.rust.pro.base.BaseFragment import com.coldmint.rust.pro.databinding.FragmentPersonalHomeBinding +import com.coldmint.rust.pro.ui.ScrollLinearLayoutManager import com.coldmint.rust.pro.ui.StableLinearLayoutManager /** @@ -30,30 +31,30 @@ class PersonalHomeFragment(val userId: String) : BaseFragment() { fun loadTab() { val mainActivity = requireActivity() as MainActivity - val tabLayout: TabLayout? = mainActivity.tabLayout - if (tabLayout != null) { - tabLayout.isVisible = true - TabLayoutMediator(tabLayout, viewBinding.viewPager2) + TabLayoutMediator(viewBinding.tabLayout, viewBinding.viewPager2) { tab, position -> when (position) { 0 -> { @@ -38,9 +35,9 @@ class TemplateFragment : BaseFragment() { } } }.attach() - } else { +/* } else { viewBinding.viewPager2.postDelayed({ loadTab() }, MainActivity.linkInterval) - } + }*/ } override fun getViewBindingObject(layoutInflater: LayoutInflater): FragmentTemplateBinding { diff --git a/app/src/main/java/com/coldmint/rust/pro/fragments/WarehouseFragment.kt b/app/src/main/java/com/coldmint/rust/pro/fragments/WarehouseFragment.kt index 8ffc269..62c00c0 100644 --- a/app/src/main/java/com/coldmint/rust/pro/fragments/WarehouseFragment.kt +++ b/app/src/main/java/com/coldmint/rust/pro/fragments/WarehouseFragment.kt @@ -1,15 +1,10 @@ package com.coldmint.rust.pro.fragments -import android.app.Activity import android.os.Bundle import android.view.LayoutInflater -import android.view.View -import android.widget.Toast -import androidx.core.view.isVisible import com.coldmint.rust.pro.MainActivity import com.coldmint.rust.pro.R import com.coldmint.rust.pro.adapters.WarehouseAdapter -import com.coldmint.rust.pro.base.BaseAdapter import com.coldmint.rust.pro.base.BaseFragment import com.coldmint.rust.pro.databinding.FragmentWarehouseBinding import com.google.android.material.tabs.TabLayoutMediator @@ -24,23 +19,20 @@ class WarehouseFragment : BaseFragment() { private fun loadTab() { if (isAdded) { val mainActivity = activity as MainActivity - val tableLayout = mainActivity.tabLayout - if (tableLayout == null) { +/* if (tableLayout == null) { viewBinding.pager.postDelayed({ loadTab() }, MainActivity.linkInterval) - } else { - tableLayout.isVisible = true - TabLayoutMediator(tableLayout, viewBinding.pager) - { tab, position -> - when (position) { - 0 -> { - tab.text = getText(R.string.mod_title) - } - 1 -> { - tab.text = getText(R.string.map) - } + } else {*/ + TabLayoutMediator(viewBinding.tabLayout, viewBinding.pager) { tab, position -> + when (position) { + 0 -> { + tab.text = getText(R.string.mod_title) } - }.attach() - } + + 1 -> { + tab.text = getText(R.string.map) + } + } + }.attach() } } diff --git a/app/src/main/java/com/coldmint/rust/pro/fragments/WebModDetailsFragment.kt b/app/src/main/java/com/coldmint/rust/pro/fragments/WebModDetailsFragment.kt index ef195a4..e89f3f9 100644 --- a/app/src/main/java/com/coldmint/rust/pro/fragments/WebModDetailsFragment.kt +++ b/app/src/main/java/com/coldmint/rust/pro/fragments/WebModDetailsFragment.kt @@ -22,7 +22,6 @@ import com.coldmint.rust.pro.databinding.FragmentWebModDetailsBinding import com.coldmint.rust.pro.tool.AppSettings import com.coldmint.rust.pro.tool.GlobalMethod import com.coldmint.rust.pro.tool.TextStyleMaker -import com.coldmint.rust.pro.viewmodel.StartViewModel import com.coldmint.rust.pro.viewmodel.WebModDetailsViewModel import com.google.android.material.chip.Chip import com.youth.banner.adapter.BannerImageAdapter @@ -125,7 +124,7 @@ class WebModDetailsFragment(val modId: String, val modNameLiveData: MutableLiveD /** * 加载页面信息 */ - fun loadInfo() { + private fun loadInfo() { val token = AppSettings.getValue(AppSettings.Setting.Token, "") WebMod.instance.getInfo(token, modId, object : ApiCallBack { override fun onResponse(t: WebModInfoData) { diff --git a/app/src/main/java/com/coldmint/rust/pro/muqing/gj.java b/app/src/main/java/com/muqing/muqing/gj.java similarity index 99% rename from app/src/main/java/com/coldmint/rust/pro/muqing/gj.java rename to app/src/main/java/com/muqing/muqing/gj.java index 3fb05ef..5f27309 100644 --- a/app/src/main/java/com/coldmint/rust/pro/muqing/gj.java +++ b/app/src/main/java/com/muqing/muqing/gj.java @@ -1,4 +1,4 @@ -package com.coldmint.rust.pro.muqing; +package com.muqing.muqing; import android.annotation.SuppressLint; import android.content.ClipData; diff --git a/app/src/main/java/com/coldmint/rust/pro/muqing/wj.java b/app/src/main/java/com/muqing/muqing/wj.java similarity index 99% rename from app/src/main/java/com/coldmint/rust/pro/muqing/wj.java rename to app/src/main/java/com/muqing/muqing/wj.java index 76d6b51..8d9514d 100644 --- a/app/src/main/java/com/coldmint/rust/pro/muqing/wj.java +++ b/app/src/main/java/com/muqing/muqing/wj.java @@ -1,4 +1,4 @@ -package com.coldmint.rust.pro.muqing; +package com.muqing.muqing; import android.content.Context; import android.os.Build; diff --git a/app/src/main/res/layout-sw600dp/activity_main.xml b/app/src/main/res/layout-sw600dp/activity_main.xml index e609e29..7586585 100644 --- a/app/src/main/res/layout-sw600dp/activity_main.xml +++ b/app/src/main/res/layout-sw600dp/activity_main.xml @@ -1,6 +1,7 @@ + app:menu="@menu/menu_drawer_left" + tools:ignore="VisualLintBounds" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_code_table.xml b/app/src/main/res/layout/activity_code_table.xml index e5cfd4b..b326359 100644 --- a/app/src/main/res/layout/activity_code_table.xml +++ b/app/src/main/res/layout/activity_code_table.xml @@ -57,7 +57,5 @@ android:layout_height="wrap_content" android:layout_gravity="top" android:visibility="gone" /> - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index d2942bc..daa7461 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:id="@+id/drawerlayout" android:layout_width="match_parent" - android:fitsSystemWindows="true" + android:fitsSystemWindows="false" android:layout_height="match_parent"> - - - - - - - @@ -70,7 +52,8 @@ android:layout_height="match_parent" android:layout_gravity="start" app:elevation="2dp" - app:menu="@menu/menu_drawer_left" /> + app:menu="@menu/menu_drawer_left" + tools:ignore="VisualLintBounds" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_community.xml b/app/src/main/res/layout/fragment_community.xml index 2a39598..073270d 100644 --- a/app/src/main/res/layout/fragment_community.xml +++ b/app/src/main/res/layout/fragment_community.xml @@ -3,7 +3,11 @@ android:layout_height="match_parent" android:layout_width="match_parent" android:orientation="vertical"> - + + android:textSize="16sp" /> diff --git a/app/src/main/res/layout/fragment_personal_home.xml b/app/src/main/res/layout/fragment_personal_home.xml index e681420..d407117 100644 --- a/app/src/main/res/layout/fragment_personal_home.xml +++ b/app/src/main/res/layout/fragment_personal_home.xml @@ -52,6 +52,8 @@ android:id="@+id/highestScoreRecycleView" android:layout_width="match_parent" android:layout_height="wrap_content" + android:focusableInTouchMode="false" + android:nestedScrollingEnabled="false" android:layout_marginTop="8dp" /> @@ -110,6 +112,8 @@ android:id="@+id/latestWorkRecycleView" android:layout_width="match_parent" android:layout_height="wrap_content" + android:focusableInTouchMode="false" + android:nestedScrollingEnabled="false" android:layout_marginTop="8dp" /> diff --git a/app/src/main/res/layout/fragment_template.xml b/app/src/main/res/layout/fragment_template.xml index 29acee5..86ac81e 100644 --- a/app/src/main/res/layout/fragment_template.xml +++ b/app/src/main/res/layout/fragment_template.xml @@ -1,12 +1,17 @@ - + android:layout_height="match_parent" + android:orientation="vertical"> + + android:layout_height="match_parent" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_warehouse.xml b/app/src/main/res/layout/fragment_warehouse.xml index 6528017..1b476e0 100644 --- a/app/src/main/res/layout/fragment_warehouse.xml +++ b/app/src/main/res/layout/fragment_warehouse.xml @@ -1,9 +1,15 @@ + + @@ -125,7 +126,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:orientation="vertical" - android:visibility="visible"> + android:visibility="gone"> \ No newline at end of file diff --git a/app/src/main/res/layout/item_user_head.xml b/app/src/main/res/layout/item_user_head.xml index ac97135..9b13016 100644 --- a/app/src/main/res/layout/item_user_head.xml +++ b/app/src/main/res/layout/item_user_head.xml @@ -20,6 +20,8 @@ style="@style/TextAppearance.Material3.BodyMedium" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:paddingStart="3dp" + android:paddingEnd="3dp" android:text="@string/name" /> \ No newline at end of file diff --git a/dialog/build.gradle b/dialog/build.gradle index ec00129..9acb98c 100644 --- a/dialog/build.gradle +++ b/dialog/build.gradle @@ -35,7 +35,6 @@ android { dependencies { implementation 'com.google.android.material:material:1.6.1' - implementation 'androidx.core:core-ktx:1.8.0' implementation 'androidx.appcompat:appcompat:1.5.0' testImplementation 'junit:junit:4.13.2'