From df245480185a250be0918dd449709755a741b4b7 Mon Sep 17 00:00:00 2001 From: ocean <503259349@qq.com> Date: Mon, 27 May 2024 18:04:50 +0800 Subject: [PATCH] update --- .../music/activity/SettingsActivity.kt | 16 ++- .../offline/music/fragment/MoMeFragment.kt | 8 +- app/src/main/res/drawable/about_icon.xml | 16 --- app/src/main/res/drawable/drw_main_bg.xml | 6 + app/src/main/res/drawable/feedback_icon.xml | 9 -- app/src/main/res/drawable/pp_icon.xml | 12 -- app/src/main/res/drawable/share_icon.xml | 9 -- app/src/main/res/drawable/tos_icon.xml | 12 -- app/src/main/res/layout/activity_settings.xml | 115 +++++------------- app/src/main/res/layout/fragment_mo_me.xml | 41 +++++-- 10 files changed, 88 insertions(+), 156 deletions(-) delete mode 100644 app/src/main/res/drawable/about_icon.xml create mode 100644 app/src/main/res/drawable/drw_main_bg.xml delete mode 100644 app/src/main/res/drawable/feedback_icon.xml delete mode 100644 app/src/main/res/drawable/pp_icon.xml delete mode 100644 app/src/main/res/drawable/share_icon.xml delete mode 100644 app/src/main/res/drawable/tos_icon.xml diff --git a/app/src/main/java/relax/offline/music/activity/SettingsActivity.kt b/app/src/main/java/relax/offline/music/activity/SettingsActivity.kt index 4cd4070..8b2b2b2 100644 --- a/app/src/main/java/relax/offline/music/activity/SettingsActivity.kt +++ b/app/src/main/java/relax/offline/music/activity/SettingsActivity.kt @@ -6,6 +6,7 @@ import androidx.appcompat.app.AppCompatActivity import com.gyf.immersionbar.ktx.immersionBar import relax.offline.music.R import relax.offline.music.databinding.ActivitySettingsBinding +import relax.offline.music.fragment.MoMeFragment import relax.offline.music.util.PRIVACY_POLICY_URL import relax.offline.music.util.TERMS_OF_SERVICE_URL import relax.offline.music.util.openPrivacyPolicy @@ -14,6 +15,11 @@ import relax.offline.music.util.sendFeedback import relax.offline.music.util.shareApp class SettingsActivity : AppCompatActivity() { + + companion object { + const val FROM_TO_SETTING = "from_to_setting" + } + private lateinit var binding: ActivitySettingsBinding override fun onCreate(savedInstanceState: Bundle?) { @@ -21,7 +27,8 @@ class SettingsActivity : AppCompatActivity() { binding = ActivitySettingsBinding.inflate(layoutInflater) setContentView(binding.root) initImmersionBar() - initView() + val from = intent.getSerializableExtra(FROM_TO_SETTING) as Class<*>? + initView(from) } private fun initImmersionBar() { @@ -31,7 +38,12 @@ class SettingsActivity : AppCompatActivity() { } } - private fun initView() { + private fun initView(from: Class<*>?) { + if (from != null && from == MoMeFragment::class.java) { + binding.bgIv.setImageResource(R.mipmap.settings_bg_img) + } else { + binding.bgIv.setImageResource(R.drawable.drw_main_bg) + } binding.backBtn.setOnClickListener { finish() } diff --git a/app/src/main/java/relax/offline/music/fragment/MoMeFragment.kt b/app/src/main/java/relax/offline/music/fragment/MoMeFragment.kt index 5b38f73..dec1829 100644 --- a/app/src/main/java/relax/offline/music/fragment/MoMeFragment.kt +++ b/app/src/main/java/relax/offline/music/fragment/MoMeFragment.kt @@ -12,6 +12,7 @@ import relax.offline.music.App import relax.offline.music.R import relax.offline.music.activity.MoLikedSongsActivity import relax.offline.music.activity.MoOfflineSongsActivity +import relax.offline.music.activity.SettingsActivity import relax.offline.music.databinding.FragmentMoMeBinding class MoMeFragment : MoBaseFragment() { @@ -56,6 +57,11 @@ class MoMeFragment : MoBaseFragment() { } private fun initView() { + binding.settingBtn.setOnClickListener { + val intent = Intent(requireActivity(), SettingsActivity::class.java) + intent.putExtra(SettingsActivity.FROM_TO_SETTING, MoMeFragment::class.java) + startActivity(intent) + } binding.likedSongsBtn.setOnClickListener { val count = binding.likedSongsTv.text.toString().trim().toInt() if (count > 0) { @@ -86,7 +92,7 @@ class MoMeFragment : MoBaseFragment() { private suspend fun fragmentOnResume() { //过滤只有size大于0的才计数 - val offlineBeans = App.appOfflineDBManager.getAllOfflineBeans() + val offlineBeans = App.appOfflineDBManager.getAllOfflineBeans() val count = offlineBeans.count { it.bytesDownloaded?.let { bytes -> bytes > 0 } == true } binding.offlineSongsTv.text = "$count" diff --git a/app/src/main/res/drawable/about_icon.xml b/app/src/main/res/drawable/about_icon.xml deleted file mode 100644 index acb5eec..0000000 --- a/app/src/main/res/drawable/about_icon.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/drw_main_bg.xml b/app/src/main/res/drawable/drw_main_bg.xml new file mode 100644 index 0000000..ad625d0 --- /dev/null +++ b/app/src/main/res/drawable/drw_main_bg.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/feedback_icon.xml b/app/src/main/res/drawable/feedback_icon.xml deleted file mode 100644 index 7e89b47..0000000 --- a/app/src/main/res/drawable/feedback_icon.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/pp_icon.xml b/app/src/main/res/drawable/pp_icon.xml deleted file mode 100644 index 3576649..0000000 --- a/app/src/main/res/drawable/pp_icon.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/share_icon.xml b/app/src/main/res/drawable/share_icon.xml deleted file mode 100644 index d2b3693..0000000 --- a/app/src/main/res/drawable/share_icon.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/tos_icon.xml b/app/src/main/res/drawable/tos_icon.xml deleted file mode 100644 index a07922c..0000000 --- a/app/src/main/res/drawable/tos_icon.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 8bbf063..6fbd31d 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -9,6 +9,13 @@ android:layout_width="match_parent" android:layout_height="0dp" /> + + - - - - - - - + android:paddingStart="16dp" + android:paddingEnd="16dp"> + - - - - - - + android:paddingStart="16dp" + android:paddingEnd="16dp"> + - - - - - - + android:paddingStart="16dp" + android:paddingEnd="16dp"> + - - - - - - + android:paddingStart="16dp" + android:paddingEnd="16dp"> + - - - - - - + android:paddingStart="16dp" + android:paddingEnd="16dp"> + - - + android:layout_marginEnd="18dp"> + + + + + + + + + + + + + \ No newline at end of file