diff --git a/app/src/main/res/color/nav.xml b/app/src/main/res/color/nav.xml index e8c22ee27..b00aa46bf 100644 --- a/app/src/main/res/color/nav.xml +++ b/app/src/main/res/color/nav.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java index a28150218..b98767ecf 100644 --- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java +++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/MainActivity.java @@ -65,12 +65,7 @@ public class MainActivity extends BaseActivity implements NavigationBarView.OnIt mManager = new FragmentStateManager(mBinding.container, getSupportFragmentManager()) { @Override public Fragment getItem(int position) { - switch (position) { - case 0: - return VodFragment.newInstance(); - default: - return SettingFragment.newInstance(); - } + return position == 0 ? VodFragment.newInstance() : SettingFragment.newInstance(); } }; if (savedInstanceState == null) mManager.change(0); diff --git a/app/src/mobile/res/layout/activity_main.xml b/app/src/mobile/res/layout/activity_main.xml index 71d5af32a..7e58eedcc 100644 --- a/app/src/mobile/res/layout/activity_main.xml +++ b/app/src/mobile/res/layout/activity_main.xml @@ -16,7 +16,7 @@ android:layout_width="match_parent" android:layout_height="56dp" android:layout_alignParentBottom="true" - android:background="@color/transparent" + android:background="@color/white_10" app:elevation="0dp" app:itemIconTint="@color/nav" app:itemTextColor="@color/white" diff --git a/app/src/mobile/res/layout/dialog_control.xml b/app/src/mobile/res/layout/dialog_control.xml index 48ebf8341..c1d635dee 100644 --- a/app/src/mobile/res/layout/dialog_control.xml +++ b/app/src/mobile/res/layout/dialog_control.xml @@ -10,7 +10,7 @@ @@ -32,7 +32,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="8dp" - android:text="縮放" + android:text="@string/control_scale" android:textColor="@color/black" android:textSize="16sp" /> @@ -112,7 +112,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="8dp" - android:text="播放" + android:text="@string/play" android:textColor="@color/black" android:textSize="16sp" /> @@ -177,7 +177,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginBottom="8dp" - android:text="軌道" + android:text="@string/control_track" android:textColor="@color/black" android:textSize="16sp" android:visibility="gone" diff --git a/app/src/mobile/res/layout/dialog_history.xml b/app/src/mobile/res/layout/dialog_history.xml index 5c71ec7bf..29632553f 100644 --- a/app/src/mobile/res/layout/dialog_history.xml +++ b/app/src/mobile/res/layout/dialog_history.xml @@ -6,4 +6,4 @@ android:layout_height="wrap_content" android:padding="16dp" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" - app:maxHeight="296dp" /> \ No newline at end of file + app:maxHeight="352dp" /> \ No newline at end of file diff --git a/app/src/mobile/res/values-zh-rCN/strings.xml b/app/src/mobile/res/values-zh-rCN/strings.xml index 76f340684..df6ace70b 100644 --- a/app/src/mobile/res/values-zh-rCN/strings.xml +++ b/app/src/mobile/res/values-zh-rCN/strings.xml @@ -20,6 +20,11 @@ 简介 快搜“%s + + 倍速 + 缩放 + 轨道 + 删除全部纪录? 收藏纪录将会全部删除。 diff --git a/app/src/mobile/res/values-zh-rTW/strings.xml b/app/src/mobile/res/values-zh-rTW/strings.xml index 8da9806d9..3f8c7f3a8 100644 --- a/app/src/mobile/res/values-zh-rTW/strings.xml +++ b/app/src/mobile/res/values-zh-rTW/strings.xml @@ -20,6 +20,11 @@ 簡介 快搜「%s + + 倍速 + 縮放 + 軌道 + 刪除全部紀錄? 收藏紀錄將會全部刪除。 diff --git a/app/src/mobile/res/values/strings.xml b/app/src/mobile/res/values/strings.xml index 384181b27..4c61cde2d 100644 --- a/app/src/mobile/res/values/strings.xml +++ b/app/src/mobile/res/values/strings.xml @@ -20,6 +20,11 @@ Summary Searching %s + + Speed + Scale + Track + Delete all records? All keep records will be removed.