Skip to content

Commit 57c9a8f

Browse files
committed
新增设置淡入淡出+1
1 parent 7a507fe commit 57c9a8f

File tree

7 files changed

+21
-8
lines changed

7 files changed

+21
-8
lines changed

app/src/main/java/remix/myplayer/ui/activity/SettingActivity.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,8 @@ class SettingActivity : ToolbarActivity(), ColorChooserDialog.ColorCallback,
445445
binding.settingAudioFocusContainer,
446446
binding.settingRestoreDeleteContainer,
447447
binding.settingFilterContainer,
448-
binding.settingPlayerBackground
448+
binding.settingPlayerBackground,
449+
binding.settingCrossfadeContainer
449450
).forEach {
450451
it.setOnClickListener(object : View.OnClickListener {
451452
override fun onClick(v: View?) {
@@ -568,6 +569,8 @@ class SettingActivity : ToolbarActivity(), ColorChooserDialog.ColorCallback,
568569
R.id.setting_auto_play_headset_container -> configAutoPlay()
569570
//自定义播放界面背景
570571
R.id.setting_player_background -> configPlayerBackgroundConfig()
572+
//淡入淡出
573+
R.id.setting_crossfade_container -> binding.settingCrossfadeSwitch.isChecked = !binding.settingCrossfadeSwitch.isChecked
571574
}
572575
}
573576
})

app/src/main/res/layout/activity_setting.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -502,22 +502,22 @@
502502
android:layout_centerVertical="true"
503503
android:layout_marginStart="@dimen/d16_size"
504504
android:layout_marginEnd="@dimen/d16_size"
505-
android:layout_toStartOf="@+id/setting_audio_focus_switch"
505+
android:layout_toStartOf="@+id/setting_crossfade_switch"
506506
android:gravity="center_vertical"
507507
android:orientation="vertical">
508508

509509
<TextView
510510
android:layout_width="wrap_content"
511511
android:layout_height="wrap_content"
512512
android:layout_marginBottom="@dimen/d2_size"
513-
android:text="淡入淡出"
513+
android:text="@string/play_cross_fade"
514514
android:textColor="?attr/text_color_primary"
515515
android:textSize="@dimen/s16_size" />
516516

517517
<TextView
518518
android:layout_width="wrap_content"
519519
android:layout_height="wrap_content"
520-
android:text="播放、暂停时使用淡入淡出效果"
520+
android:text="@string/play_cross_fade_tip"
521521
android:textColor="?attr/text_color_secondary"
522522
android:textSize="@dimen/s14_size" />
523523
</LinearLayout>

app/src/main/res/values-ja-rJP/strings.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -473,5 +473,7 @@
473473
<string name="connect">せつぞく</string>
474474
<string name="edit">編集</string>
475475
<string name="buffering_wait">バッファリングです,ちょっと待ってください</string>
476-
<string name="last_play">最後にプレイした</string>
476+
<string name="last_play">最後にプレイした</string>
477+
<string name="play_cross_fade">フェードインとフェードアウト</string>
478+
<string name="play_cross_fade_tip">再生中および一時停止中にフェード効果を使用する</string>
477479
</resources>

app/src/main/res/values-zh-rCN/strings.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,8 @@
475475
<string name="speed_at_2x">2x倍速播放中</string>
476476
<string name="local_lyric_tip">如果你的Android版本在11以及以上,本地歌词文件请确保放在公共目录中(如Downloads、Music等目录)</string>
477477
<string name="buffering_wait">缓冲中,请稍后</string>
478-
<string name="last_play">最后播放</string>
478+
<string name="last_play">最后播放</string>
479479
<string name="last_play_desc">最后播放降序</string>
480+
<string name="play_cross_fade">淡入淡出</string>
481+
<string name="play_cross_fade_tip">播放、暂停时使用淡入淡出效果</string>
480482
</resources>

app/src/main/res/values-zh-rHK/strings.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,6 +474,8 @@
474474
<string name="speed_at_2x">2x倍速播放中</string>
475475
<string name="local_lyric_tip">如果你的Android版本在11以及以上,本地歌詞檔案請確保放在公共目錄中(如Downloads、Music等目錄)</string>
476476
<string name="buffering_wait">緩衝中,請稍後</string>
477-
<string name="last_play">最後播放</string>
477+
<string name="last_play">最後播放</string>
478478
<string name="last_play_desc">最後播放降序</string>
479+
<string name="play_cross_fade">淡入淡出</string>
480+
<string name="play_cross_fade_tip">播放、暫停時使用淡入淡出效果</string>
479481
</resources>

app/src/main/res/values-zh-rTW/strings.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,8 @@
475475
<string name="speed_at_2x">2x倍速播放中</string>
476476
<string name="local_lyric_tip">如果你的Android版本在11以及以上,本地歌詞檔案請確保放在公共目錄中(如Downloads、Music等目錄)</string>
477477
<string name="buffering_wait">緩衝中,請稍後</string>
478-
<string name="last_play">最後播放</string>
478+
<string name="last_play">最後播放</string>
479479
<string name="last_play_desc">最後播放降序</string>
480+
<string name="play_cross_fade">淡入淡出</string>
481+
<string name="play_cross_fade_tip">播放、暫停時使用淡入淡出效果</string>
480482
</resources>

app/src/main/res/values/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -477,4 +477,6 @@
477477
<string name="buffering_wait">Buffering, please wait</string>
478478
<string name="last_play">Last Play TimeAt</string>
479479
<string name="last_play_desc">Last Play TimeAt Desc</string>
480+
<string name="play_cross_fade">Fade in and out</string>
481+
<string name="play_cross_fade_tip">Use fade-in and fade-out effects when playing and pausing</string>
480482
</resources>

0 commit comments

Comments
 (0)