diff --git a/app/build.gradle.kts b/app/build.gradle.kts index bf65dc56..838a6040 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -12,8 +12,8 @@ android { applicationId = "snow.music" minSdk = 21 targetSdk = 35 - versionCode = 5 - versionName = "1.2.8" + versionCode = 6 + versionName = "1.2.14" multiDexEnabled = true vectorDrawables.useSupportLibrary = true diff --git a/app/src/main/java/snow/music/activity/setting/SettingActivity.java b/app/src/main/java/snow/music/activity/setting/SettingActivity.java index f0764a37..c35932b1 100644 --- a/app/src/main/java/snow/music/activity/setting/SettingActivity.java +++ b/app/src/main/java/snow/music/activity/setting/SettingActivity.java @@ -10,13 +10,16 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.provider.Settings; import android.view.View; import android.widget.ImageView; +import android.widget.TextView; import java.util.Objects; +import snow.music.BuildConfig; import snow.music.R; import snow.music.dialog.MessageDialog; import snow.music.service.AppPlayerService; @@ -37,6 +40,7 @@ public class SettingActivity extends AppCompatActivity { private View itemFollowSystem; private View itemDarkModeOff; private View itemDarkModeOn; + private TextView tvVersion; private View itemPlayWithOtherApp; private SwitchCompat swPlayWithOtherApp; @@ -74,6 +78,7 @@ private void findViews() { itemFollowSystem = findViewById(R.id.itemFollowSystem); itemDarkModeOff = findViewById(R.id.itemDarkModeOff); itemDarkModeOn = findViewById(R.id.itemDarkModeOn); + tvVersion = findViewById(R.id.tvVersion); itemPlayWithOtherApp = findViewById(R.id.itemPlayWithOtherApp); swPlayWithOtherApp = findViewById(R.id.swPlayWithOtherApp); @@ -107,6 +112,8 @@ private void initViews() { Boolean value = mSettingViewModel.getPlayWithOtherApp().getValue(); swPlayWithOtherApp.setChecked(Objects.requireNonNull(value)); + + tvVersion.setText(BuildConfig.VERSION_NAME); } private void addClickListener() { diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml index 7041b980..3ee412ba 100644 --- a/app/src/main/res/layout/activity_setting.xml +++ b/app/src/main/res/layout/activity_setting.xml @@ -76,9 +76,7 @@ android:focusable="true" android:gravity="center_vertical" android:paddingStart="16dp" - android:paddingLeft="16dp" - android:paddingEnd="8dp" - android:paddingRight="8dp"> + android:paddingEnd="8dp"> + android:paddingEnd="8dp"> + android:paddingEnd="8dp"> + + + + + + + + + + 暗色模式 普通模式 与游戏/其他APP同时播放 + 版本 开启之后,在其他应用播放音频、视频或者视频语言通话时,音乐不会自动暂停,将始终作为BGM保持播放,您可以在通知栏中手动暂停播放。 无音频媒体访问权限! 警告!为了避免忽略音频焦点后播放器不会在手机来电期间自动暂停播放,请授予应用读取手机状态权限! diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e9246620..c71687f1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -60,6 +60,7 @@ Dark mode Normal mode Background mode + Version Music playback won\'t be paused by other apps in Background mode. You\'ll be able to pause music playback manually in the Notification shade. Warning! In order to avoid that the player will not automatically pause playing when the phone calls after ignoring the audio focus, please grant the app the permission to read the phone status!