[mobile] revert scale setting

pull/219/head
FongMi 2 years ago
parent e74ae2b401
commit 17d265eab0
  1. 1
      app/src/main/res/values-zh-rCN/strings.xml
  2. 1
      app/src/main/res/values-zh-rTW/strings.xml
  3. 1
      app/src/main/res/values/strings.xml
  4. 15
      app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingPlayerFragment.java
  5. 27
      app/src/mobile/res/layout/fragment_setting_player.xml

@ -81,6 +81,7 @@
<!-- Player -->
<string name="player">播放核心</string>
<string name="player_render">渲染方式</string>
<string name="player_scale">缩放比例</string>
<string name="player_caption">字幕样式</string>
<string name="player_subtitle">字幕大小</string>
<string name="player_danmu_speed">弹幕速度</string>

@ -81,6 +81,7 @@
<!-- Player -->
<string name="player">播放核心</string>
<string name="player_render">渲染方式</string>
<string name="player_scale">縮放比例</string>
<string name="player_caption">字幕樣式</string>
<string name="player_subtitle">字幕大小</string>
<string name="player_danmu_speed">彈幕速度</string>

@ -81,6 +81,7 @@
<!-- Player -->
<string name="player">Player</string>
<string name="player_render">Render</string>
<string name="player_scale">Scale</string>
<string name="player_caption">Caption style</string>
<string name="player_subtitle">Subtitle size</string>
<string name="player_danmu_speed">Danmu speed</string>

@ -37,6 +37,7 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B
private String[] caption;
private String[] player;
private String[] render;
private String[] scale;
private String[] http;
private String[] flag;
@ -65,6 +66,7 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B
mBinding.danmuLineText.setText(String.valueOf(Setting.getDanmuLine(2)));
mBinding.flagText.setText((flag = ResUtil.getStringArray(R.array.select_flag))[Setting.getFlag()]);
mBinding.httpText.setText((http = ResUtil.getStringArray(R.array.select_exo_http))[Setting.getHttp()]);
mBinding.scaleText.setText((scale = ResUtil.getStringArray(R.array.select_scale))[Setting.getScale()]);
mBinding.playerText.setText((player = ResUtil.getStringArray(R.array.select_player))[Setting.getPlayer()]);
mBinding.renderText.setText((render = ResUtil.getStringArray(R.array.select_render))[Setting.getRender()]);
mBinding.captionText.setText((caption = ResUtil.getStringArray(R.array.select_caption))[Setting.isCaption() ? 1 : 0]);
@ -77,6 +79,7 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B
mBinding.ua.setOnClickListener(this::onUa);
mBinding.http.setOnClickListener(this::setHttp);
mBinding.flag.setOnClickListener(this::setFlag);
mBinding.scale.setOnClickListener(this::onScale);
mBinding.buffer.setOnClickListener(this::onBuffer);
mBinding.player.setOnClickListener(this::setPlayer);
mBinding.render.setOnClickListener(this::setRender);
@ -87,7 +90,7 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B
mBinding.danmuSize.setOnClickListener(this::onDanmuSize);
mBinding.danmuLine.setOnClickListener(this::onDanmuLine);
mBinding.danmuSpeed.setOnClickListener(this::onDanmuSpeed);
mBinding.background.setOnClickListener(this::setBackground);
mBinding.background.setOnClickListener(this::onBackground);
}
private void setVisible() {
@ -120,6 +123,14 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B
mBinding.flagText.setText(flag[index]);
}
private void onScale(View view) {
new MaterialAlertDialogBuilder(getActivity()).setTitle(R.string.player_scale).setNegativeButton(R.string.dialog_negative, null).setSingleChoiceItems(scale, Setting.getScale(), (dialog, which) -> {
mBinding.scaleText.setText(scale[which]);
Setting.putScale(which);
dialog.dismiss();
}).show();
}
private void onBuffer(View view) {
BufferDialog.create(this).show();
}
@ -195,7 +206,7 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B
}).show();
}
private void setBackground(View view) {
private void onBackground(View view) {
new MaterialAlertDialogBuilder(getActivity()).setTitle(R.string.player_background).setNegativeButton(R.string.dialog_negative, null).setSingleChoiceItems(background, Setting.getBackground(), (dialog, which) -> {
mBinding.backgroundText.setText(background[which]);
Setting.putBackground(which);

@ -98,6 +98,33 @@
</LinearLayout>
<LinearLayout
android:id="@+id/scale"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:background="@drawable/shape_item"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:text="@string/player_scale"
android:textColor="@color/white"
android:textSize="16sp" />
<TextView
android:id="@+id/scaleText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="end"
android:textColor="@color/white"
android:textSize="16sp"
tools:text="Fill" />
</LinearLayout>
<LinearLayout
android:id="@+id/caption"
android:layout_width="match_parent"

Loading…
Cancel
Save