[mobile] clean setting code

pull/219/head
FongMi 2 years ago
parent dbb63997a7
commit 30f8df964b
  1. 2
      app/src/mobile/java/com/fongmi/android/tv/ui/dialog/BufferDialog.java
  2. 2
      app/src/mobile/java/com/fongmi/android/tv/ui/dialog/DanmuLineDialog.java
  3. 2
      app/src/mobile/java/com/fongmi/android/tv/ui/dialog/DanmuSizeDialog.java
  4. 2
      app/src/mobile/java/com/fongmi/android/tv/ui/dialog/SubtitleDialog.java
  5. 2
      app/src/mobile/java/com/fongmi/android/tv/ui/dialog/UaDialog.java
  6. 39
      app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingFragment.java
  7. 13
      app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingPlayerFragment.java
  8. 91
      app/src/mobile/res/layout/fragment_setting.xml
  9. 140
      app/src/mobile/res/layout/fragment_setting_player.xml

@ -33,7 +33,7 @@ public class BufferDialog {
}
private void initDialog() {
AlertDialog dialog = new MaterialAlertDialogBuilder(binding.getRoot().getContext()).setTitle(R.string.setting_player_buffer).setView(binding.getRoot()).setPositiveButton(R.string.dialog_positive, this::onPositive).setNegativeButton(R.string.dialog_negative, this::onNegative).create();
AlertDialog dialog = new MaterialAlertDialogBuilder(binding.getRoot().getContext()).setTitle(R.string.player_exo_buffer).setView(binding.getRoot()).setPositiveButton(R.string.dialog_positive, this::onPositive).setNegativeButton(R.string.dialog_negative, this::onNegative).create();
dialog.getWindow().setDimAmount(0);
dialog.show();
}

@ -33,7 +33,7 @@ public class DanmuLineDialog {
}
private void initDialog() {
AlertDialog dialog = new MaterialAlertDialogBuilder(binding.getRoot().getContext()).setTitle(R.string.setting_danmu_line).setView(binding.getRoot()).setPositiveButton(R.string.dialog_positive, this::onPositive).setNegativeButton(R.string.dialog_negative, this::onNegative).create();
AlertDialog dialog = new MaterialAlertDialogBuilder(binding.getRoot().getContext()).setTitle(R.string.player_danmu_line).setView(binding.getRoot()).setPositiveButton(R.string.dialog_positive, this::onPositive).setNegativeButton(R.string.dialog_negative, this::onNegative).create();
dialog.getWindow().setDimAmount(0);
dialog.show();
}

@ -33,7 +33,7 @@ public class DanmuSizeDialog {
}
private void initDialog() {
AlertDialog dialog = new MaterialAlertDialogBuilder(binding.getRoot().getContext()).setTitle(R.string.setting_danmu_size).setView(binding.getRoot()).setPositiveButton(R.string.dialog_positive, this::onPositive).setNegativeButton(R.string.dialog_negative, this::onNegative).create();
AlertDialog dialog = new MaterialAlertDialogBuilder(binding.getRoot().getContext()).setTitle(R.string.player_danmu_size).setView(binding.getRoot()).setPositiveButton(R.string.dialog_positive, this::onPositive).setNegativeButton(R.string.dialog_negative, this::onNegative).create();
dialog.getWindow().setDimAmount(0);
dialog.show();
}

@ -50,7 +50,7 @@ public class SubtitleDialog {
}
private void initDialog() {
AlertDialog dialog = new MaterialAlertDialogBuilder(binding.getRoot().getContext()).setTitle(R.string.setting_player_subtitle).setView(binding.getRoot()).setPositiveButton(R.string.dialog_positive, this::onPositive).setNegativeButton(R.string.dialog_negative, this::onNegative).create();
AlertDialog dialog = new MaterialAlertDialogBuilder(binding.getRoot().getContext()).setTitle(R.string.player_subtitle).setView(binding.getRoot()).setPositiveButton(R.string.dialog_positive, this::onPositive).setNegativeButton(R.string.dialog_negative, this::onNegative).create();
dialog.getWindow().setDimAmount(0);
dialog.show();
}

@ -40,7 +40,7 @@ public class UaDialog {
}
private void initDialog() {
dialog = new MaterialAlertDialogBuilder(binding.getRoot().getContext()).setTitle(R.string.setting_player_ua).setView(binding.getRoot()).setPositiveButton(R.string.dialog_positive, this::onPositive).setNegativeButton(R.string.dialog_negative, this::onNegative).create();
dialog = new MaterialAlertDialogBuilder(binding.getRoot().getContext()).setTitle(R.string.player_ua).setView(binding.getRoot()).setPositiveButton(R.string.dialog_positive, this::onPositive).setNegativeButton(R.string.dialog_negative, this::onNegative).create();
dialog.getWindow().setDimAmount(0);
dialog.show();
}

@ -54,10 +54,6 @@ import java.util.List;
public class SettingFragment extends BaseFragment implements ConfigCallback, SiteCallback, LiveCallback, ProxyCallback {
private FragmentSettingBinding mBinding;
private String[] render;
private String[] decode;
private String[] player;
private String[] scale;
private String[] size;
private int type;
@ -94,10 +90,6 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit
mBinding.versionText.setText(BuildConfig.VERSION_NAME);
mBinding.proxyText.setText(UrlUtil.scheme(Setting.getProxy()));
mBinding.sizeText.setText((size = ResUtil.getStringArray(R.array.select_size))[Setting.getSize()]);
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.decodeText.setText((decode = ResUtil.getStringArray(R.array.select_decode))[Setting.getDecode()]);
mBinding.renderText.setText((render = ResUtil.getStringArray(R.array.select_render))[Setting.getRender()]);
setCacheText();
}
@ -118,6 +110,7 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit
mBinding.proxy.setOnClickListener(this::onProxy);
mBinding.cache.setOnClickListener(this::onCache);
mBinding.backup.setOnClickListener(this::onBackup);
mBinding.player.setOnClickListener(this::onPlayer);
mBinding.version.setOnClickListener(this::onVersion);
mBinding.vod.setOnLongClickListener(this::onVodEdit);
mBinding.vodHome.setOnClickListener(this::onVodHome);
@ -130,10 +123,6 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit
mBinding.liveHistory.setOnClickListener(this::onLiveHistory);
mBinding.wallDefault.setOnClickListener(this::setWallDefault);
mBinding.wallRefresh.setOnClickListener(this::setWallRefresh);
mBinding.player.setOnClickListener(this::onPlayerSetting);
mBinding.decode.setOnClickListener(this::setDecode);
mBinding.render.setOnClickListener(this::setRender);
mBinding.scale.setOnClickListener(this::setScale);
mBinding.size.setOnClickListener(this::setSize);
mBinding.doh.setOnClickListener(this::setDoh);
}
@ -265,7 +254,7 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit
HistoryDialog.create(this).type(type = 1).show();
}
private void onPlayerSetting(View view) {
private void onPlayer(View view) {
getRoot().change(2);
}
@ -293,26 +282,6 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit
});
}
private void setDecode(View view) {
int index = Setting.getDecode();
Setting.putDecode(index = index == decode.length - 1 ? 0 : ++index);
mBinding.decodeText.setText(decode[index]);
}
private void setRender(View view) {
int index = Setting.getRender();
Setting.putRender(index = index == render.length - 1 ? 0 : ++index);
mBinding.renderText.setText(render[index]);
}
private void setScale(View view) {
new MaterialAlertDialogBuilder(getActivity()).setTitle(R.string.setting_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 setSize(View view) {
new MaterialAlertDialogBuilder(getActivity()).setTitle(R.string.setting_size).setNegativeButton(R.string.dialog_negative, null).setSingleChoiceItems(size, Setting.getSize(), (dialog, which) -> {
mBinding.sizeText.setText(size[which]);
@ -377,13 +346,11 @@ public class SettingFragment extends BaseFragment implements ConfigCallback, Sit
@Override
public void onHiddenChanged(boolean hidden) {
if (hidden || player == null || decode == null) return;
if (hidden) return;
mBinding.vodUrl.setText(VodConfig.getDesc());
mBinding.liveUrl.setText(LiveConfig.getDesc());
mBinding.wallUrl.setText(WallConfig.getDesc());
mBinding.dohText.setText(getDohList()[getDohIndex()]);
mBinding.playerText.setText(player[Setting.getPlayer()]);
mBinding.decodeText.setText(decode[Setting.getDecode()]);
setCacheText();
}

@ -36,6 +36,7 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B
private String[] background;
private String[] caption;
private String[] player;
private String[] render;
private String[] http;
private String[] flag;
@ -65,6 +66,7 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B
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.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]);
mBinding.backgroundText.setText((background = ResUtil.getStringArray(R.array.select_background))[Setting.getBackground()]);
mBinding.danmuSpeedText.setText((danmuSpeed = ResUtil.getStringArray(R.array.select_danmu_speed))[Setting.getDanmuSpeed()]);
@ -77,6 +79,7 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B
mBinding.flag.setOnClickListener(this::setFlag);
mBinding.buffer.setOnClickListener(this::onBuffer);
mBinding.player.setOnClickListener(this::setPlayer);
mBinding.render.setOnClickListener(this::setRender);
mBinding.tunnel.setOnClickListener(this::setTunnel);
mBinding.caption.setOnClickListener(this::setCaption);
mBinding.subtitle.setOnClickListener(this::onSubtitle);
@ -134,6 +137,12 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B
setVisible();
}
private void setRender(View view) {
int index = Setting.getRender();
Setting.putRender(index = index == render.length - 1 ? 0 : ++index);
mBinding.renderText.setText(render[index]);
}
private void setTunnel(View view) {
Setting.putTunnel(!Setting.isTunnel());
mBinding.tunnelText.setText(getSwitch(Setting.isTunnel()));
@ -179,7 +188,7 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B
}
public void onDanmuSpeed(View view) {
new MaterialAlertDialogBuilder(getActivity()).setTitle(R.string.setting_danmu_speed).setNegativeButton(R.string.dialog_negative, null).setSingleChoiceItems(danmuSpeed, Setting.getDanmuSpeed(), (dialog, which) -> {
new MaterialAlertDialogBuilder(getActivity()).setTitle(R.string.player_danmu_speed).setNegativeButton(R.string.dialog_negative, null).setSingleChoiceItems(danmuSpeed, Setting.getDanmuSpeed(), (dialog, which) -> {
mBinding.danmuSpeedText.setText(danmuSpeed[which]);
Setting.putDanmuSpeed(which);
dialog.dismiss();
@ -187,7 +196,7 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B
}
private void setBackground(View view) {
new MaterialAlertDialogBuilder(getActivity()).setTitle(R.string.setting_player_background).setNegativeButton(R.string.dialog_negative, null).setSingleChoiceItems(background, Setting.getBackground(), (dialog, which) -> {
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);
dialog.dismiss();

@ -224,101 +224,10 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:text="@string/setting_player"
android:textColor="@color/white"
android:textSize="16sp" />
<TextView
android:id="@+id/playerText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="end"
android:textColor="@color/white"
android:textSize="16sp"
tools:text="EXO" />
</LinearLayout>
<LinearLayout
android:id="@+id/decode"
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/setting_decode"
android:textColor="@color/white"
android:textSize="16sp" />
<TextView
android:id="@+id/decodeText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="end"
android:textColor="@color/white"
android:textSize="16sp"
tools:text="硬解" />
</LinearLayout>
<LinearLayout
android:id="@+id/render"
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/setting_render"
android:textColor="@color/white"
android:textSize="16sp" />
<TextView
android:id="@+id/renderText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="end"
android:textColor="@color/white"
android:textSize="16sp"
tools:text="Surface" />
</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/setting_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

@ -43,7 +43,6 @@
android:paddingEnd="16dp"
android:paddingBottom="16dp">
<LinearLayout
android:id="@+id/player"
android:layout_width="match_parent"
@ -55,7 +54,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:text="@string/setting_player"
android:text="@string/player"
android:textColor="@color/white"
android:textSize="16sp" />
@ -73,7 +72,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/ua"
android:id="@+id/render"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
@ -84,20 +83,18 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:text="@string/setting_player_ua"
android:text="@string/player_render"
android:textColor="@color/white"
android:textSize="16sp" />
<TextView
android:id="@+id/uaText"
android:id="@+id/renderText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="middle"
android:gravity="end"
android:singleLine="true"
android:textColor="@color/white"
android:textSize="16sp"
tools:text="okhttp/4.11.0" />
tools:text="Surface" />
</LinearLayout>
@ -113,7 +110,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:text="@string/setting_player_caption"
android:text="@string/player_caption"
android:textColor="@color/white"
android:textSize="16sp" />
@ -142,7 +139,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:text="@string/setting_player_subtitle"
android:text="@string/player_subtitle"
android:textColor="@color/white"
android:textSize="16sp" />
@ -160,7 +157,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/flag"
android:id="@+id/danmuSpeed"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
@ -171,25 +168,23 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:text="@string/setting_player_flag"
android:text="@string/player_danmu_speed"
android:textColor="@color/white"
android:textSize="16sp" />
<TextView
android:id="@+id/flagText"
android:id="@+id/danmuSpeedText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="middle"
android:gravity="end"
android:singleLine="true"
android:textColor="@color/white"
android:textSize="16sp"
tools:text="自動" />
tools:text="" />
</LinearLayout>
<LinearLayout
android:id="@+id/background"
android:id="@+id/danmuSize"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
@ -200,50 +195,32 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:text="@string/setting_player_background"
android:text="@string/player_danmu_size"
android:textColor="@color/white"
android:textSize="16sp" />
<TextView
android:id="@+id/backgroundText"
android:layout_width="match_parent"
android:id="@+id/danmuSizeText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="end"
android:textColor="@color/white"
android:textSize="16sp"
tools:text="畫中畫" />
</LinearLayout>
<LinearLayout
android:id="@+id/danmuSpeed"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:background="@drawable/shape_item"
android:orientation="horizontal">
tools:text="1" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:text="@string/setting_danmu_speed"
android:layout_marginStart="4dp"
android:text="@string/times"
android:textColor="@color/white"
android:textSize="16sp" />
<TextView
android:id="@+id/danmuSpeedText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="end"
android:textColor="@color/white"
android:textSize="16sp"
tools:text="慢" />
</LinearLayout>
<LinearLayout
android:id="@+id/danmuSize"
android:id="@+id/danmuLine"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
@ -254,12 +231,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:text="@string/setting_danmu_size"
android:text="@string/player_danmu_line"
android:textColor="@color/white"
android:textSize="16sp" />
<TextView
android:id="@+id/danmuSizeText"
android:id="@+id/danmuLineText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
@ -272,14 +249,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:text="@string/times"
android:text="@string/lines"
android:textColor="@color/white"
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/danmuLine"
android:id="@+id/background"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
@ -290,28 +267,48 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:text="@string/setting_danmu_line"
android:text="@string/player_background"
android:textColor="@color/white"
android:textSize="16sp" />
<TextView
android:id="@+id/danmuLineText"
android:layout_width="0dp"
android:id="@+id/backgroundText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="end"
android:textColor="@color/white"
android:textSize="16sp"
tools:text="1" />
tools:text="畫中畫" />
</LinearLayout>
<LinearLayout
android:id="@+id/flag"
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_marginStart="4dp"
android:text="@string/lines"
android:layout_marginEnd="16dp"
android:text="@string/player_flag"
android:textColor="@color/white"
android:textSize="16sp" />
<TextView
android:id="@+id/flagText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="middle"
android:gravity="end"
android:singleLine="true"
android:textColor="@color/white"
android:textSize="16sp"
tools:text="自動" />
</LinearLayout>
<LinearLayout
@ -326,7 +323,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:text="@string/setting_player_tunnel"
android:text="@string/player_exo_tunnel"
android:textColor="@color/white"
android:textSize="16sp" />
@ -353,7 +350,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:text="@string/setting_player_http"
android:text="@string/player_exo_http"
android:textColor="@color/white"
android:textSize="16sp" />
@ -380,7 +377,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:text="@string/setting_player_buffer"
android:text="@string/player_exo_buffer"
android:textColor="@color/white"
android:textSize="16sp" />
@ -403,6 +400,35 @@
android:textSize="16sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/ua"
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_ua"
android:textColor="@color/white"
android:textSize="16sp" />
<TextView
android:id="@+id/uaText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="middle"
android:gravity="end"
android:singleLine="true"
android:textColor="@color/white"
android:textSize="16sp"
tools:text="okhttp/4.11.0" />
</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
Loading…
Cancel
Save