[leanback] clean setting code

pull/219/head
FongMi 2 years ago
parent 588631846b
commit dbb63997a7
  1. 35
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingActivity.java
  2. 9
      app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingPlayerActivity.java
  3. 132
      app/src/leanback/res/layout/activity_setting.xml
  4. 115
      app/src/leanback/res/layout/activity_setting_player.xml
  5. 2
      app/src/leanback/res/layout/dialog_ua.xml
  6. 31
      app/src/main/res/values-zh-rCN/strings.xml
  7. 31
      app/src/main/res/values-zh-rTW/strings.xml
  8. 35
      app/src/main/res/values/strings.xml

@ -49,10 +49,6 @@ public class SettingActivity extends BaseActivity implements ConfigCallback, Sit
private ActivitySettingBinding mBinding;
private String[] quality;
private String[] render;
private String[] decode;
private String[] player;
private String[] scale;
private String[] size;
private int type;
@ -86,10 +82,6 @@ public class SettingActivity extends BaseActivity 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()]);
mBinding.qualityText.setText((quality = ResUtil.getStringArray(R.array.select_quality))[Setting.getQuality()]);
setCacheText();
}
@ -111,6 +103,7 @@ public class SettingActivity extends BaseActivity 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);
@ -121,14 +114,9 @@ public class SettingActivity extends BaseActivity implements ConfigCallback, Sit
mBinding.vodHistory.setOnClickListener(this::onVodHistory);
mBinding.version.setOnLongClickListener(this::onVersionDev);
mBinding.liveHistory.setOnClickListener(this::onLiveHistory);
mBinding.player.setOnLongClickListener(this::onPlayerSetting);
mBinding.wallDefault.setOnClickListener(this::setWallDefault);
mBinding.wallRefresh.setOnClickListener(this::setWallRefresh);
mBinding.quality.setOnClickListener(this::setQuality);
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);
}
@ -259,9 +247,8 @@ public class SettingActivity extends BaseActivity implements ConfigCallback, Sit
HistoryDialog.create(this).type(type = 1).show();
}
private boolean onPlayerSetting(View view) {
private void onPlayer(View view) {
SettingPlayerActivity.start(this);
return true;
}
private void onVersion(View view) {
@ -295,24 +282,6 @@ public class SettingActivity extends BaseActivity implements ConfigCallback, Sit
RefreshEvent.image();
}
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) {
int index = Setting.getScale();
Setting.putScale(index = index == scale.length - 1 ? 0 : ++index);
mBinding.scaleText.setText(scale[index]);
}
private void setSize(View view) {
int index = Setting.getSize();
Setting.putSize(index = index == size.length - 1 ? 0 : ++index);

@ -31,6 +31,7 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B
private String[] danmuSpeed;
private String[] caption;
private String[] player;
private String[] render;
private String[] http;
private String[] flag;
@ -60,6 +61,7 @@ public class SettingPlayerActivity extends BaseActivity 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.danmuSpeedText.setText((danmuSpeed = ResUtil.getStringArray(R.array.select_danmu_speed))[Setting.getDanmuSpeed()]);
}
@ -71,6 +73,7 @@ public class SettingPlayerActivity extends BaseActivity 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);
@ -127,6 +130,12 @@ public class SettingPlayerActivity extends BaseActivity 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()));

@ -148,7 +148,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:nextFocusDown="@id/render"
android:orientation="horizontal">
<LinearLayout
@ -212,135 +211,24 @@
</LinearLayout>
<LinearLayout
android:id="@+id/player"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:background="@drawable/selector_item"
android:focusable="true"
android:focusableInTouchMode="true"
android:nextFocusDown="@id/quality"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/player"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_weight="1"
android:background="@drawable/selector_item"
android:focusable="true"
android:focusableInTouchMode="true"
android:orientation="horizontal">
<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="18sp" />
<TextView
android:id="@+id/playerText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="end"
android:textColor="@color/white"
android:textSize="18sp"
tools:text="EXO" />
</LinearLayout>
<LinearLayout
android:id="@+id/decode"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/selector_item"
android:focusable="true"
android:focusableInTouchMode="true"
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="18sp" />
<TextView
android:id="@+id/decodeText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="end"
android:textColor="@color/white"
android:textSize="18sp"
tools:text="硬解" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/render"
android:layout_width="0dp"
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_weight="1"
android:background="@drawable/selector_item"
android:focusable="true"
android:focusableInTouchMode="true"
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="18sp" />
<TextView
android:id="@+id/renderText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="end"
android:textColor="@color/white"
android:textSize="18sp"
tools:text="Surface" />
</LinearLayout>
<LinearLayout
android:id="@+id/scale"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/selector_item"
android:focusable="true"
android:focusableInTouchMode="true"
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="18sp" />
<TextView
android:id="@+id/scaleText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="end"
android:textColor="@color/white"
android:textSize="18sp"
tools:text="Fill" />
android:text="@string/setting_player"
android:textColor="@color/white"
android:textSize="18sp" />
</LinearLayout>
</LinearLayout>
<LinearLayout

@ -26,7 +26,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="18sp" />
@ -42,7 +42,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"
@ -52,25 +52,21 @@
android:orientation="horizontal">
<TextView
android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_weight="0.3"
android:text="@string/setting_player_ua"
android:text="@string/player_render"
android:textColor="@color/white"
android:textSize="18sp" />
<TextView
android:id="@+id/uaText"
android:layout_width="0dp"
android:id="@+id/renderText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0.7"
android:ellipsize="middle"
android:gravity="end"
android:singleLine="true"
android:textColor="@color/white"
android:textSize="18sp"
tools:text="okhttp/4.11.0" />
tools:text="Surface" />
</LinearLayout>
@ -88,7 +84,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="18sp" />
@ -117,7 +113,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="18sp" />
@ -133,7 +129,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"
@ -146,23 +142,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="18sp" />
<TextView
android:id="@+id/flagText"
android:id="@+id/danmuSpeedText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="end"
android:textColor="@color/white"
android:textSize="18sp"
tools:text="自動" />
tools:text="" />
</LinearLayout>
<LinearLayout
android:id="@+id/danmuSpeed"
android:id="@+id/danmuSize"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
@ -175,23 +171,32 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:text="@string/setting_danmu_speed"
android:text="@string/player_danmu_size"
android:textColor="@color/white"
android:textSize="18sp" />
<TextView
android:id="@+id/danmuSpeedText"
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="18sp"
tools:text="慢" />
tools:text="1" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:text="@string/times"
android:textColor="@color/white"
android:textSize="18sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/danmuSize"
android:id="@+id/danmuLine"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
@ -204,12 +209,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="18sp" />
<TextView
android:id="@+id/danmuSizeText"
android:id="@+id/danmuLineText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
@ -222,14 +227,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="18sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/danmuLine"
android:id="@+id/flag"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
@ -242,27 +247,18 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:text="@string/setting_danmu_line"
android:text="@string/player_flag"
android:textColor="@color/white"
android:textSize="18sp" />
<TextView
android:id="@+id/danmuLineText"
android:layout_width="0dp"
android:id="@+id/flagText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="end"
android:textColor="@color/white"
android:textSize="18sp"
tools:text="1" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:text="@string/lines"
android:textColor="@color/white"
android:textSize="18sp" />
tools:text="自動" />
</LinearLayout>
@ -280,7 +276,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="18sp" />
@ -309,7 +305,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="18sp" />
@ -338,7 +334,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="18sp" />
@ -361,5 +357,38 @@
android:textSize="18sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/ua"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:background="@drawable/selector_item"
android:focusable="true"
android:focusableInTouchMode="true"
android:orientation="horizontal">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_weight="0.3"
android:text="@string/player_ua"
android:textColor="@color/white"
android:textSize="18sp" />
<TextView
android:id="@+id/uaText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.7"
android:ellipsize="middle"
android:gravity="end"
android:singleLine="true"
android:textColor="@color/white"
android:textSize="18sp"
tools:text="okhttp/4.11.0" />
</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>

@ -34,7 +34,7 @@
android:layout_above="@+id/bottom"
android:layout_alignStart="@+id/info"
android:layout_marginBottom="10dp"
android:hint="@string/setting_player_ua"
android:hint="@string/player_ua"
android:imeOptions="actionDone"
android:importantForAutofill="no"
android:inputType="text"

@ -65,21 +65,7 @@
<string name="setting_vod">点播</string>
<string name="setting_live">直播</string>
<string name="setting_wall">壁纸</string>
<string name="setting_player">播放器</string>
<string name="setting_player_ua">User-Agent</string>
<string name="setting_player_flag">线路播放</string>
<string name="setting_player_http">连线方式</string>
<string name="setting_player_buffer">缓冲时间</string>
<string name="setting_player_tunnel">隧道模式</string>
<string name="setting_player_caption">字幕样式</string>
<string name="setting_player_subtitle">字幕大小</string>
<string name="setting_player_background">后台播放</string>
<string name="setting_danmu_size">弹幕大小</string>
<string name="setting_danmu_speed">弹幕速度</string>
<string name="setting_danmu_line">弹幕行数</string>
<string name="setting_decode">解码方式</string>
<string name="setting_render">渲染方式</string>
<string name="setting_scale">缩放比例</string>
<string name="setting_player">播放设置</string>
<string name="setting_quality">图片品质</string>
<string name="setting_size">图片尺寸</string>
<string name="setting_doh">DoH</string>
@ -92,6 +78,21 @@
<string name="setting_off">关闭</string>
<string name="setting_on">开启</string>
<!-- Player -->
<string name="player">播放器</string>
<string name="player_render">渲染方式</string>
<string name="player_caption">字幕样式</string>
<string name="player_subtitle">字幕大小</string>
<string name="player_danmu_speed">弹幕速度</string>
<string name="player_danmu_size">弹幕大小</string>
<string name="player_danmu_line">弹幕行数</string>
<string name="player_background">后台播放</string>
<string name="player_flag">线路播放</string>
<string name="player_exo_tunnel">隧道模式</string>
<string name="player_exo_http">连线方式</string>
<string name="player_exo_buffer">缓冲时间</string>
<string name="player_ua">User-Agent</string>
<!-- Search -->
<string name="search_keyword">关键字…</string>
<string name="search_record">历史</string>

@ -65,21 +65,7 @@
<string name="setting_vod">點播</string>
<string name="setting_live">直播</string>
<string name="setting_wall">壁紙</string>
<string name="setting_player">播放器</string>
<string name="setting_player_ua">User-Agent</string>
<string name="setting_player_flag">線路播放</string>
<string name="setting_player_http">連線方式</string>
<string name="setting_player_buffer">緩衝時間</string>
<string name="setting_player_tunnel">隧道模式</string>
<string name="setting_player_caption">字幕樣式</string>
<string name="setting_player_subtitle">字幕大小</string>
<string name="setting_player_background">背景播放</string>
<string name="setting_danmu_size">彈幕大小</string>
<string name="setting_danmu_speed">彈幕速度</string>
<string name="setting_danmu_line">彈幕行數</string>
<string name="setting_decode">解碼方式</string>
<string name="setting_render">渲染方式</string>
<string name="setting_scale">縮放比例</string>
<string name="setting_player">播放設定</string>
<string name="setting_quality">圖片品質</string>
<string name="setting_size">圖片尺寸</string>
<string name="setting_doh">DoH</string>
@ -92,6 +78,21 @@
<string name="setting_off">關閉</string>
<string name="setting_on">開啟</string>
<!-- Player -->
<string name="player">播放器</string>
<string name="player_render">渲染方式</string>
<string name="player_caption">字幕樣式</string>
<string name="player_subtitle">字幕大小</string>
<string name="player_danmu_speed">彈幕速度</string>
<string name="player_danmu_size">彈幕大小</string>
<string name="player_danmu_line">彈幕行數</string>
<string name="player_background">背景播放</string>
<string name="player_flag">線路播放</string>
<string name="player_exo_tunnel">隧道模式</string>
<string name="player_exo_http">連線方式</string>
<string name="player_exo_buffer">緩衝時間</string>
<string name="player_ua">User-Agent</string>
<!-- Search -->
<string name="search_keyword">關鍵字…</string>
<string name="search_record">歷史</string>

@ -65,21 +65,7 @@
<string name="setting_vod">Vod</string>
<string name="setting_live">Live</string>
<string name="setting_wall">Wallpaper</string>
<string name="setting_player">Player</string>
<string name="setting_player_ua">User-Agent</string>
<string name="setting_player_flag">Flag play</string>
<string name="setting_player_http">HTTP method</string>
<string name="setting_player_buffer">Buffer time</string>
<string name="setting_player_tunnel">Tunnel mode</string>
<string name="setting_player_caption">Caption style</string>
<string name="setting_player_subtitle">Subtitle size</string>
<string name="setting_player_background">Background play</string>
<string name="setting_danmu_size">Danmu size</string>
<string name="setting_danmu_speed">Danmu speed</string>
<string name="setting_danmu_line">Danmu line</string>
<string name="setting_decode">Decode</string>
<string name="setting_render">Render</string>
<string name="setting_scale">Scale</string>
<string name="setting_player">Player setting</string>
<string name="setting_quality">Image quality</string>
<string name="setting_size">Image size</string>
<string name="setting_doh">DoH</string>
@ -92,6 +78,21 @@
<string name="setting_off">Off</string>
<string name="setting_on">On</string>
<!-- Player -->
<string name="player">Player</string>
<string name="player_render">Render</string>
<string name="player_caption">Caption style</string>
<string name="player_subtitle">Subtitle size</string>
<string name="player_danmu_speed">Danmu speed</string>
<string name="player_danmu_size">Danmu size</string>
<string name="player_danmu_line">Danmu line</string>
<string name="player_background">Background play</string>
<string name="player_flag">Flag play</string>
<string name="player_exo_tunnel">Tunnel mode</string>
<string name="player_exo_http">HTTP method</string>
<string name="player_exo_buffer">Buffer time</string>
<string name="player_ua">User-Agent</string>
<!-- Search -->
<string name="search_keyword">Keywords…</string>
<string name="search_record">History</string>
@ -147,11 +148,11 @@
</string-array>
<string-array name="select_danmu_speed">
<item>Super Slow</item>
<item>Super slow</item>
<item>Slow</item>
<item>Moderate</item>
<item>Fast</item>
<item>Super Fast</item>
<item>Super fast</item>
</string-array>
<string-array name="select_render">

Loading…
Cancel
Save