From 1ab74f7a1ca8dd80cf30a1a6e5329315687b4106 Mon Sep 17 00:00:00 2001 From: watson1982 <112817572+watson1982@users.noreply.github.com> Date: Tue, 27 Feb 2024 17:40:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=AE=89=E5=8D=934=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 364e0fc86bb6201ed10f32348b9927fb1940e707. --- .../osc/ui/fragment/ModelSettingFragment.java | 123 +- .../drawable-v21/button_detail_collect.xml | 21 - .../drawable-v21/button_home_sort_focus.xml | 18 - .../main/res/drawable-v21/item_right_bg.xml | 5 - .../drawable-v21/play_progress_horizontal.xml | 19 - .../drawable-v21/play_progress_vertical.xml | 19 - app/src/main/res/drawable-v21/set_hm.xml | 5 - app/src/main/res/drawable-v21/set_play.xml | 5 - app/src/main/res/drawable-v21/set_setting.xml | 5 - .../res/drawable-v21/shape_live_focus.xml | 27 - .../res/drawable-v21/shape_live_select.xml | 27 - .../shape_player_control_vod_seek.xml | 22 - ...e_player_control_vod_seek_thumb_normal.xml | 8 - ...pe_player_control_vod_seek_thumb_press.xml | 8 - .../drawable-v21/shape_search_clearall.xml | 5 - .../drawable-v21/shape_source_flag_focus.xml | 27 - .../drawable-v21/shape_source_flag_line.xml | 8 - .../shape_source_series_focus.xml | 27 - .../res/drawable-v21/shape_speed_hint.xml | 17 - .../main/res/drawable-v21/shape_user_home.xml | 27 - .../res/drawable-v21/shape_user_search.xml | 27 - .../main/res/drawable/button_detail_all.xml | 4 +- .../res/drawable/button_detail_collect.xml | 4 +- .../main/res/drawable/button_dialog_main.xml | 6 +- .../main/res/drawable/button_dialog_vod.xml | 6 +- .../main/res/drawable/button_home_select.xml | 6 +- .../res/drawable/button_home_sort_focus.xml | 2 +- app/src/main/res/drawable/item_right_bg.xml | 2 +- .../res/drawable/play_progress_horizontal.xml | 2 +- .../res/drawable/play_progress_vertical.xml | 2 +- app/src/main/res/drawable/set_hm.xml | 2 +- app/src/main/res/drawable/set_play.xml | 2 +- app/src/main/res/drawable/set_setting.xml | 2 +- .../main/res/drawable/shape_live_focus.xml | 6 +- .../main/res/drawable/shape_live_select.xml | 6 +- .../shape_player_control_vod_seek.xml | 2 +- ...e_player_control_vod_seek_thumb_normal.xml | 2 +- ...pe_player_control_vod_seek_thumb_press.xml | 2 +- .../res/drawable/shape_search_clearall.xml | 2 +- .../drawable/shape_setting_model_focus.xml | 6 +- .../res/drawable/shape_source_flag_focus.xml | 6 +- .../res/drawable/shape_source_flag_line.xml | 2 +- .../drawable/shape_source_series_focus.xml | 6 +- .../main/res/drawable/shape_speed_hint.xml | 4 +- app/src/main/res/drawable/shape_user_home.xml | 6 +- .../main/res/drawable/shape_user_search.xml | 6 +- .../main/res/layout-v21/fragment_model.xml | 1558 ----------------- app/src/main/res/layout/fragment_model.xml | 43 + quickjs/build.gradle | 6 +- 49 files changed, 151 insertions(+), 2002 deletions(-) delete mode 100644 app/src/main/res/drawable-v21/button_detail_collect.xml delete mode 100644 app/src/main/res/drawable-v21/button_home_sort_focus.xml delete mode 100644 app/src/main/res/drawable-v21/item_right_bg.xml delete mode 100644 app/src/main/res/drawable-v21/play_progress_horizontal.xml delete mode 100644 app/src/main/res/drawable-v21/play_progress_vertical.xml delete mode 100644 app/src/main/res/drawable-v21/set_hm.xml delete mode 100644 app/src/main/res/drawable-v21/set_play.xml delete mode 100644 app/src/main/res/drawable-v21/set_setting.xml delete mode 100644 app/src/main/res/drawable-v21/shape_live_focus.xml delete mode 100644 app/src/main/res/drawable-v21/shape_live_select.xml delete mode 100644 app/src/main/res/drawable-v21/shape_player_control_vod_seek.xml delete mode 100644 app/src/main/res/drawable-v21/shape_player_control_vod_seek_thumb_normal.xml delete mode 100644 app/src/main/res/drawable-v21/shape_player_control_vod_seek_thumb_press.xml delete mode 100644 app/src/main/res/drawable-v21/shape_search_clearall.xml delete mode 100644 app/src/main/res/drawable-v21/shape_source_flag_focus.xml delete mode 100644 app/src/main/res/drawable-v21/shape_source_flag_line.xml delete mode 100644 app/src/main/res/drawable-v21/shape_source_series_focus.xml delete mode 100644 app/src/main/res/drawable-v21/shape_speed_hint.xml delete mode 100644 app/src/main/res/drawable-v21/shape_user_home.xml delete mode 100644 app/src/main/res/drawable-v21/shape_user_search.xml delete mode 100644 app/src/main/res/layout-v21/fragment_model.xml diff --git a/app/src/main/java/com/github/tvbox/osc/ui/fragment/ModelSettingFragment.java b/app/src/main/java/com/github/tvbox/osc/ui/fragment/ModelSettingFragment.java index 1c9f8ca4b2..b5afc64ba4 100644 --- a/app/src/main/java/com/github/tvbox/osc/ui/fragment/ModelSettingFragment.java +++ b/app/src/main/java/com/github/tvbox/osc/ui/fragment/ModelSettingFragment.java @@ -2,7 +2,6 @@ import android.content.DialogInterface; import android.content.Intent; -import android.os.Build; import android.os.Bundle; import android.view.View; import android.view.ViewGroup; @@ -66,7 +65,7 @@ public class ModelSettingFragment extends BaseLazyFragment { private TextView tvApi; // Home Section private TextView tvHomeApi; - private TextView tvHomeDefaultShow; + private TextView tvHomeDefaultShow; private TextView tvHomeShow; private TextView tvHomeIcon; private TextView tvHomeRec; @@ -74,7 +73,7 @@ public class ModelSettingFragment extends BaseLazyFragment { // Player Section private TextView tvShowPreviewText; - private TextView tvScale; + private TextView tvScale; private TextView tvPlay; private TextView tvMediaCodec; private TextView tvVideoPurifyText; @@ -104,7 +103,7 @@ protected int getLayoutResID() { @Override protected void init() { - tvFastSearchText = findViewById(R.id.showFastSearchText); + tvFastSearchText = findViewById(R.id.showFastSearchText); tvFastSearchText.setText(Hawk.get(HawkConfig.FAST_SEARCH_MODE, false) ? "已开启" : "已关闭"); tvDebugOpen = findViewById(R.id.tvDebugOpen); tvDebugOpen.setText(Hawk.get(HawkConfig.DEBUG_OPEN, false) ? "开启" : "关闭"); @@ -123,7 +122,7 @@ protected void init() { tvShowPreviewText = findViewById(R.id.showPreviewText); tvShowPreviewText.setText(Hawk.get(HawkConfig.SHOW_PREVIEW, true) ? "开启" : "关闭"); tvScale = findViewById(R.id.tvScaleType); - tvScale.setText(PlayerHelper.getScaleName(Hawk.get(HawkConfig.PLAY_SCALE, 0))); + tvScale.setText(PlayerHelper.getScaleName(Hawk.get(HawkConfig.PLAY_SCALE, 0))); tvPlay = findViewById(R.id.tvPlay); tvPlay.setText(PlayerHelper.getPlayerName(Hawk.get(HawkConfig.PLAY_TYPE, 0))); tvMediaCodec = findViewById(R.id.tvMediaCodec); @@ -135,12 +134,8 @@ protected void init() { // System Section tvLocale = findViewById(R.id.tvLocale); tvLocale.setText(getLocaleView(Hawk.get(HawkConfig.HOME_LOCALE, 0))); - - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - tvTheme = findViewById(R.id.tvTheme); - tvTheme.setText(getThemeView(Hawk.get(HawkConfig.THEME_SELECT, 0))); - } - + tvTheme = findViewById(R.id.tvTheme); + tvTheme.setText(getThemeView(Hawk.get(HawkConfig.THEME_SELECT, 0))); tvRender = findViewById(R.id.tvRenderType); tvRender.setText(PlayerHelper.getRenderName(Hawk.get(HawkConfig.PLAY_RENDER, 0))); tvParseWebView = findViewById(R.id.tvParseWebView); @@ -149,7 +144,7 @@ protected void init() { tvSearchView.setText(getSearchView(Hawk.get(HawkConfig.SEARCH_VIEW, 0))); tvDns = findViewById(R.id.tvDns); tvDns.setText(OkGoHelper.dnsHttpsList.get(Hawk.get(HawkConfig.DOH_URL, 0))); - tvHomeDefaultShow = findViewById(R.id.tvHomeDefaultShow); + tvHomeDefaultShow = findViewById(R.id.tvHomeDefaultShow); tvHomeDefaultShow.setText(Hawk.get(HawkConfig.HOME_DEFAULT_SHOW, false) ? "开启" : "关闭"); //takagen99 : Set HomeApi as default @@ -430,7 +425,6 @@ public void click(String value, int pos) { tvBgPlayType.setText(value); Hawk.put(HawkConfig.BACKGROUND_PLAY_TYPE, pos); } - @Override public String getDisplay(String val) { return val; @@ -440,14 +434,13 @@ public String getDisplay(String val) { public boolean areItemsTheSame(@NonNull @NotNull String oldItem, @NonNull @NotNull String newItem) { return oldItem.equals(newItem); } - @Override public boolean areContentsTheSame(@NonNull @NotNull String oldItem, @NonNull @NotNull String newItem) { return oldItem.equals(newItem); } - }, bgPlayTypes, defaultBgPlayTypePos); + }, bgPlayTypes,defaultBgPlayTypePos); dialog.show(); - }); + }); // Select PLAYER Type -------------------------------------------- findViewById(R.id.llPlay).setOnClickListener(new View.OnClickListener() { @Override @@ -787,58 +780,56 @@ public void onDismiss(DialogInterface dialog) { } }); // Select App Theme Color ------------------------------------- - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - findViewById(R.id.llTheme).setOnClickListener(new View.OnClickListener() { - private final int chkTheme = Hawk.get(HawkConfig.THEME_SELECT, 0); + findViewById(R.id.llTheme).setOnClickListener(new View.OnClickListener() { + private final int chkTheme = Hawk.get(HawkConfig.THEME_SELECT, 0); - @Override - public void onClick(View v) { - FastClickCheckUtil.check(v); - int defaultPos = Hawk.get(HawkConfig.THEME_SELECT, 0); - ArrayList types = new ArrayList<>(); - types.add(0); - types.add(1); - types.add(2); - types.add(3); - types.add(4); - types.add(5); - types.add(6); - SelectDialog dialog = new SelectDialog<>(mActivity); - dialog.setTip(getString(R.string.dia_theme)); - dialog.setAdapter(null, new SelectDialogAdapter.SelectDialogInterface() { - @Override - public void click(Integer value, int pos) { - Hawk.put(HawkConfig.THEME_SELECT, value); - tvTheme.setText(getThemeView(value)); - } + @Override + public void onClick(View v) { + FastClickCheckUtil.check(v); + int defaultPos = Hawk.get(HawkConfig.THEME_SELECT, 0); + ArrayList types = new ArrayList<>(); + types.add(0); + types.add(1); + types.add(2); + types.add(3); + types.add(4); + types.add(5); + types.add(6); + SelectDialog dialog = new SelectDialog<>(mActivity); + dialog.setTip(getString(R.string.dia_theme)); + dialog.setAdapter(null, new SelectDialogAdapter.SelectDialogInterface() { + @Override + public void click(Integer value, int pos) { + Hawk.put(HawkConfig.THEME_SELECT, value); + tvTheme.setText(getThemeView(value)); + } - @Override - public String getDisplay(Integer val) { - return getThemeView(val); - } - }, new DiffUtil.ItemCallback() { - @Override - public boolean areItemsTheSame(@NonNull @NotNull Integer oldItem, @NonNull @NotNull Integer newItem) { - return oldItem.intValue() == newItem.intValue(); - } + @Override + public String getDisplay(Integer val) { + return getThemeView(val); + } + }, new DiffUtil.ItemCallback() { + @Override + public boolean areItemsTheSame(@NonNull @NotNull Integer oldItem, @NonNull @NotNull Integer newItem) { + return oldItem.intValue() == newItem.intValue(); + } - @Override - public boolean areContentsTheSame(@NonNull @NotNull Integer oldItem, @NonNull @NotNull Integer newItem) { - return oldItem.intValue() == newItem.intValue(); - } - }, types, defaultPos); - dialog.setOnDismissListener(new DialogInterface.OnDismissListener() { - @Override - public void onDismiss(DialogInterface dialog) { - if (chkTheme != Hawk.get(HawkConfig.THEME_SELECT, 0)) { - reloadActivity(); - } + @Override + public boolean areContentsTheSame(@NonNull @NotNull Integer oldItem, @NonNull @NotNull Integer newItem) { + return oldItem.intValue() == newItem.intValue(); + } + }, types, defaultPos); + dialog.setOnDismissListener(new DialogInterface.OnDismissListener() { + @Override + public void onDismiss(DialogInterface dialog) { + if (chkTheme != Hawk.get(HawkConfig.THEME_SELECT, 0)) { + reloadActivity(); } - }); - dialog.show(); - } - }); - } + } + }); + dialog.show(); + } + }); // About App ----------------------------------------------- findViewById(R.id.llAbout).setOnClickListener(new View.OnClickListener() { @Override @@ -848,8 +839,8 @@ public void onClick(View v) { dialog.show(); } }); - - findViewById(R.id.llHomeLive).setOnClickListener(new View.OnClickListener() { + + findViewById(R.id.llHomeLive).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { FastClickCheckUtil.check(v); diff --git a/app/src/main/res/drawable-v21/button_detail_collect.xml b/app/src/main/res/drawable-v21/button_detail_collect.xml deleted file mode 100644 index c46142886f..0000000000 --- a/app/src/main/res/drawable-v21/button_detail_collect.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable-v21/button_home_sort_focus.xml b/app/src/main/res/drawable-v21/button_home_sort_focus.xml deleted file mode 100644 index c0ec81e86c..0000000000 --- a/app/src/main/res/drawable-v21/button_home_sort_focus.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable-v21/item_right_bg.xml b/app/src/main/res/drawable-v21/item_right_bg.xml deleted file mode 100644 index 79404e35bc..0000000000 --- a/app/src/main/res/drawable-v21/item_right_bg.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable-v21/play_progress_horizontal.xml b/app/src/main/res/drawable-v21/play_progress_horizontal.xml deleted file mode 100644 index fb3a84759c..0000000000 --- a/app/src/main/res/drawable-v21/play_progress_horizontal.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable-v21/play_progress_vertical.xml b/app/src/main/res/drawable-v21/play_progress_vertical.xml deleted file mode 100644 index 9db3c1bf89..0000000000 --- a/app/src/main/res/drawable-v21/play_progress_vertical.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable-v21/set_hm.xml b/app/src/main/res/drawable-v21/set_hm.xml deleted file mode 100644 index 619468da3a..0000000000 --- a/app/src/main/res/drawable-v21/set_hm.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable-v21/set_play.xml b/app/src/main/res/drawable-v21/set_play.xml deleted file mode 100644 index cd916a0465..0000000000 --- a/app/src/main/res/drawable-v21/set_play.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable-v21/set_setting.xml b/app/src/main/res/drawable-v21/set_setting.xml deleted file mode 100644 index 9127b48bbb..0000000000 --- a/app/src/main/res/drawable-v21/set_setting.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable-v21/shape_live_focus.xml b/app/src/main/res/drawable-v21/shape_live_focus.xml deleted file mode 100644 index e5a078a5f2..0000000000 --- a/app/src/main/res/drawable-v21/shape_live_focus.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable-v21/shape_live_select.xml b/app/src/main/res/drawable-v21/shape_live_select.xml deleted file mode 100644 index dd98b72b81..0000000000 --- a/app/src/main/res/drawable-v21/shape_live_select.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable-v21/shape_player_control_vod_seek.xml b/app/src/main/res/drawable-v21/shape_player_control_vod_seek.xml deleted file mode 100644 index defc4fece9..0000000000 --- a/app/src/main/res/drawable-v21/shape_player_control_vod_seek.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable-v21/shape_player_control_vod_seek_thumb_normal.xml b/app/src/main/res/drawable-v21/shape_player_control_vod_seek_thumb_normal.xml deleted file mode 100644 index 17fb2d54c2..0000000000 --- a/app/src/main/res/drawable-v21/shape_player_control_vod_seek_thumb_normal.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable-v21/shape_player_control_vod_seek_thumb_press.xml b/app/src/main/res/drawable-v21/shape_player_control_vod_seek_thumb_press.xml deleted file mode 100644 index 99621a92cc..0000000000 --- a/app/src/main/res/drawable-v21/shape_player_control_vod_seek_thumb_press.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable-v21/shape_search_clearall.xml b/app/src/main/res/drawable-v21/shape_search_clearall.xml deleted file mode 100644 index 415eaf1be9..0000000000 --- a/app/src/main/res/drawable-v21/shape_search_clearall.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable-v21/shape_source_flag_focus.xml b/app/src/main/res/drawable-v21/shape_source_flag_focus.xml deleted file mode 100644 index 29b51387ec..0000000000 --- a/app/src/main/res/drawable-v21/shape_source_flag_focus.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable-v21/shape_source_flag_line.xml b/app/src/main/res/drawable-v21/shape_source_flag_line.xml deleted file mode 100644 index 8894b809a6..0000000000 --- a/app/src/main/res/drawable-v21/shape_source_flag_line.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable-v21/shape_source_series_focus.xml b/app/src/main/res/drawable-v21/shape_source_series_focus.xml deleted file mode 100644 index 486639eb16..0000000000 --- a/app/src/main/res/drawable-v21/shape_source_series_focus.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable-v21/shape_speed_hint.xml b/app/src/main/res/drawable-v21/shape_speed_hint.xml deleted file mode 100644 index 0534ac02a4..0000000000 --- a/app/src/main/res/drawable-v21/shape_speed_hint.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable-v21/shape_user_home.xml b/app/src/main/res/drawable-v21/shape_user_home.xml deleted file mode 100644 index da417c08c4..0000000000 --- a/app/src/main/res/drawable-v21/shape_user_home.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable-v21/shape_user_search.xml b/app/src/main/res/drawable-v21/shape_user_search.xml deleted file mode 100644 index 82056d2664..0000000000 --- a/app/src/main/res/drawable-v21/shape_user_search.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/button_detail_all.xml b/app/src/main/res/drawable/button_detail_all.xml index 450d8faa3b..d66eb02232 100644 --- a/app/src/main/res/drawable/button_detail_all.xml +++ b/app/src/main/res/drawable/button_detail_all.xml @@ -3,7 +3,7 @@ - + @@ -15,7 +15,7 @@ - + diff --git a/app/src/main/res/drawable/button_detail_collect.xml b/app/src/main/res/drawable/button_detail_collect.xml index 175e1b5c4e..94e999c851 100644 --- a/app/src/main/res/drawable/button_detail_collect.xml +++ b/app/src/main/res/drawable/button_detail_collect.xml @@ -3,14 +3,14 @@ - + - + \ No newline at end of file diff --git a/app/src/main/res/drawable/button_dialog_main.xml b/app/src/main/res/drawable/button_dialog_main.xml index 8879a91f72..41b4abf0df 100644 --- a/app/src/main/res/drawable/button_dialog_main.xml +++ b/app/src/main/res/drawable/button_dialog_main.xml @@ -3,19 +3,19 @@ - + - + - + diff --git a/app/src/main/res/drawable/button_dialog_vod.xml b/app/src/main/res/drawable/button_dialog_vod.xml index af081fa1d4..d36415404a 100644 --- a/app/src/main/res/drawable/button_dialog_vod.xml +++ b/app/src/main/res/drawable/button_dialog_vod.xml @@ -3,19 +3,19 @@ - + - + - + diff --git a/app/src/main/res/drawable/button_home_select.xml b/app/src/main/res/drawable/button_home_select.xml index 68e998debc..3b3d470e53 100644 --- a/app/src/main/res/drawable/button_home_select.xml +++ b/app/src/main/res/drawable/button_home_select.xml @@ -3,19 +3,19 @@ - + - + - + diff --git a/app/src/main/res/drawable/button_home_sort_focus.xml b/app/src/main/res/drawable/button_home_sort_focus.xml index 9ec3f53397..fe7b8e5667 100644 --- a/app/src/main/res/drawable/button_home_sort_focus.xml +++ b/app/src/main/res/drawable/button_home_sort_focus.xml @@ -3,7 +3,7 @@ - + diff --git a/app/src/main/res/drawable/item_right_bg.xml b/app/src/main/res/drawable/item_right_bg.xml index 83aea20ebe..79404e35bc 100644 --- a/app/src/main/res/drawable/item_right_bg.xml +++ b/app/src/main/res/drawable/item_right_bg.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/play_progress_horizontal.xml b/app/src/main/res/drawable/play_progress_horizontal.xml index 007ad17865..fb3a84759c 100644 --- a/app/src/main/res/drawable/play_progress_horizontal.xml +++ b/app/src/main/res/drawable/play_progress_horizontal.xml @@ -11,7 +11,7 @@ android:clipOrientation="horizontal" android:gravity="left"> - + diff --git a/app/src/main/res/drawable/play_progress_vertical.xml b/app/src/main/res/drawable/play_progress_vertical.xml index c29f287914..9db3c1bf89 100644 --- a/app/src/main/res/drawable/play_progress_vertical.xml +++ b/app/src/main/res/drawable/play_progress_vertical.xml @@ -11,7 +11,7 @@ android:clipOrientation="vertical" android:gravity="bottom"> - + diff --git a/app/src/main/res/drawable/set_hm.xml b/app/src/main/res/drawable/set_hm.xml index 114faff3ad..619468da3a 100644 --- a/app/src/main/res/drawable/set_hm.xml +++ b/app/src/main/res/drawable/set_hm.xml @@ -1,4 +1,4 @@ - diff --git a/app/src/main/res/drawable/set_play.xml b/app/src/main/res/drawable/set_play.xml index 03f6f74c3c..cd916a0465 100644 --- a/app/src/main/res/drawable/set_play.xml +++ b/app/src/main/res/drawable/set_play.xml @@ -1,4 +1,4 @@ - diff --git a/app/src/main/res/drawable/set_setting.xml b/app/src/main/res/drawable/set_setting.xml index 410bbe4faa..9127b48bbb 100644 --- a/app/src/main/res/drawable/set_setting.xml +++ b/app/src/main/res/drawable/set_setting.xml @@ -1,4 +1,4 @@ - diff --git a/app/src/main/res/drawable/shape_live_focus.xml b/app/src/main/res/drawable/shape_live_focus.xml index a05d445846..e5a078a5f2 100644 --- a/app/src/main/res/drawable/shape_live_focus.xml +++ b/app/src/main/res/drawable/shape_live_focus.xml @@ -3,19 +3,19 @@ - + - + - + diff --git a/app/src/main/res/drawable/shape_live_select.xml b/app/src/main/res/drawable/shape_live_select.xml index 16f9bf7fea..dd98b72b81 100644 --- a/app/src/main/res/drawable/shape_live_select.xml +++ b/app/src/main/res/drawable/shape_live_select.xml @@ -3,19 +3,19 @@ - + - + - + diff --git a/app/src/main/res/drawable/shape_player_control_vod_seek.xml b/app/src/main/res/drawable/shape_player_control_vod_seek.xml index 1f8a33bf81..defc4fece9 100644 --- a/app/src/main/res/drawable/shape_player_control_vod_seek.xml +++ b/app/src/main/res/drawable/shape_player_control_vod_seek.xml @@ -15,7 +15,7 @@ - + diff --git a/app/src/main/res/drawable/shape_player_control_vod_seek_thumb_normal.xml b/app/src/main/res/drawable/shape_player_control_vod_seek_thumb_normal.xml index 5c1e7ad528..17fb2d54c2 100644 --- a/app/src/main/res/drawable/shape_player_control_vod_seek_thumb_normal.xml +++ b/app/src/main/res/drawable/shape_player_control_vod_seek_thumb_normal.xml @@ -1,7 +1,7 @@ - + diff --git a/app/src/main/res/drawable/shape_player_control_vod_seek_thumb_press.xml b/app/src/main/res/drawable/shape_player_control_vod_seek_thumb_press.xml index 9049f8ce04..99621a92cc 100644 --- a/app/src/main/res/drawable/shape_player_control_vod_seek_thumb_press.xml +++ b/app/src/main/res/drawable/shape_player_control_vod_seek_thumb_press.xml @@ -1,7 +1,7 @@ - + diff --git a/app/src/main/res/drawable/shape_search_clearall.xml b/app/src/main/res/drawable/shape_search_clearall.xml index d9e5cf2b27..415eaf1be9 100644 --- a/app/src/main/res/drawable/shape_search_clearall.xml +++ b/app/src/main/res/drawable/shape_search_clearall.xml @@ -1,4 +1,4 @@ - diff --git a/app/src/main/res/drawable/shape_setting_model_focus.xml b/app/src/main/res/drawable/shape_setting_model_focus.xml index 32bf551d02..8f56af76c7 100644 --- a/app/src/main/res/drawable/shape_setting_model_focus.xml +++ b/app/src/main/res/drawable/shape_setting_model_focus.xml @@ -3,19 +3,19 @@ - + - + - + diff --git a/app/src/main/res/drawable/shape_source_flag_focus.xml b/app/src/main/res/drawable/shape_source_flag_focus.xml index 0c9cbcc06a..29b51387ec 100644 --- a/app/src/main/res/drawable/shape_source_flag_focus.xml +++ b/app/src/main/res/drawable/shape_source_flag_focus.xml @@ -3,19 +3,19 @@ - + - + - + diff --git a/app/src/main/res/drawable/shape_source_flag_line.xml b/app/src/main/res/drawable/shape_source_flag_line.xml index 080eaab310..8894b809a6 100644 --- a/app/src/main/res/drawable/shape_source_flag_line.xml +++ b/app/src/main/res/drawable/shape_source_flag_line.xml @@ -4,5 +4,5 @@ android:width="40mm" android:height="4mm" /> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_source_series_focus.xml b/app/src/main/res/drawable/shape_source_series_focus.xml index 6d982391a4..486639eb16 100644 --- a/app/src/main/res/drawable/shape_source_series_focus.xml +++ b/app/src/main/res/drawable/shape_source_series_focus.xml @@ -3,19 +3,19 @@ - + - + - + diff --git a/app/src/main/res/drawable/shape_speed_hint.xml b/app/src/main/res/drawable/shape_speed_hint.xml index 05c77d08c0..0534ac02a4 100644 --- a/app/src/main/res/drawable/shape_speed_hint.xml +++ b/app/src/main/res/drawable/shape_speed_hint.xml @@ -4,14 +4,14 @@ - + - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_user_home.xml b/app/src/main/res/drawable/shape_user_home.xml index b638bceeac..da417c08c4 100644 --- a/app/src/main/res/drawable/shape_user_home.xml +++ b/app/src/main/res/drawable/shape_user_home.xml @@ -3,19 +3,19 @@ - + - + - + diff --git a/app/src/main/res/drawable/shape_user_search.xml b/app/src/main/res/drawable/shape_user_search.xml index fe8ca004e8..82056d2664 100644 --- a/app/src/main/res/drawable/shape_user_search.xml +++ b/app/src/main/res/drawable/shape_user_search.xml @@ -3,19 +3,19 @@ - + - + - + diff --git a/app/src/main/res/layout-v21/fragment_model.xml b/app/src/main/res/layout-v21/fragment_model.xml deleted file mode 100644 index 0b0a6e3cd5..0000000000 --- a/app/src/main/res/layout-v21/fragment_model.xml +++ /dev/null @@ -1,1558 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_model.xml b/app/src/main/res/layout/fragment_model.xml index 13cd9bf02f..0b0a6e3cd5 100644 --- a/app/src/main/res/layout/fragment_model.xml +++ b/app/src/main/res/layout/fragment_model.xml @@ -1033,6 +1033,49 @@ android:textSize="@dimen/ts_24" /> + + + + + + + + + + +