UI / Icons Updates

takagen99 · Jul 9, 2022 · 2d48056 · 2d48056
1 parent 7b78b32
commit 2d48056
Show file tree

Hide file tree

Showing 15 changed files with 115 additions and 51 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -14,10 +14,10 @@
     <application
         android:name=".base.App"
         android:allowBackup="true"
-        android:banner="@drawable/app_banner"
         android:configChanges="orientation|keyboardHidden|screenSize"
         android:hardwareAccelerated="true"
         android:icon="@drawable/app_icon"
+        android:banner="@drawable/app_banner"
         android:label="@string/app_name"
         android:largeHeap="true"
         android:networkSecurityConfig="@xml/network_security_config"
@@ -48,6 +48,7 @@
             android:supportsPictureInPicture="true"
             android:configChanges=
                 "screenSize|smallestScreenSize|screenLayout|orientation">
+        </activity>
         <activity
             android:name=".ui.activity.PushActivity"
             android:screenOrientation="landscape" />

diff --git a/app/src/main/java/com/github/tvbox/osc/ui/activity/HomeActivity.java b/app/src/main/java/com/github/tvbox/osc/ui/activity/HomeActivity.java
@@ -27,7 +27,10 @@
 import com.github.tvbox.osc.base.BaseActivity;
 import com.github.tvbox.osc.base.BaseLazyFragment;
 import com.github.tvbox.osc.bean.AbsSortXml;
+import com.github.tvbox.osc.bean.Movie;
 import com.github.tvbox.osc.bean.MovieSort;
+import com.github.tvbox.osc.bean.VodInfo;
+import com.github.tvbox.osc.cache.RoomDataManger;
 import com.github.tvbox.osc.event.RefreshEvent;
 import com.github.tvbox.osc.server.ControlManager;
 import com.github.tvbox.osc.ui.adapter.HomePageAdapter;
@@ -83,7 +86,7 @@ public class HomeActivity extends BaseActivity {
         public void run() {
             Date date = new Date();
             @SuppressLint("SimpleDateFormat")
-            SimpleDateFormat timeFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm");
+            SimpleDateFormat timeFormat = new SimpleDateFormat("dd MMM yyyy HH:mm");
             tvDate.setText(timeFormat.format(date));
             mHandler.postDelayed(this, 1000);
         }
@@ -222,7 +225,7 @@ public void success() {
                             @Override
                             public void run() {
                                 if (!useCacheConfig)
-                                    Toast.makeText(HomeActivity.this, "自定义jar加载成功", Toast.LENGTH_SHORT).show();
+                                    Toast.makeText(HomeActivity.this, "Load Complete", Toast.LENGTH_SHORT).show();
                                 initData();
                             }
                         }, 50);
@@ -239,7 +242,7 @@ public void error(String msg) {
                         mHandler.post(new Runnable() {
                             @Override
                             public void run() {
-                                Toast.makeText(HomeActivity.this, "jar加载失败", Toast.LENGTH_SHORT).show();
+                                Toast.makeText(HomeActivity.this, "Load Failed", Toast.LENGTH_SHORT).show();
                                 initData();
                             }
                         });

diff --git a/app/src/main/res/drawable-hdpi/app_icon.png b/app/src/main/res/drawable-hdpi/app_icon.png
diff --git a/app/src/main/res/drawable-xhdpi/app_icon.png b/app/src/main/res/drawable-xhdpi/app_icon.png
diff --git a/app/src/main/res/drawable-xxhdpi/app_icon.png b/app/src/main/res/drawable-xxhdpi/app_icon.png
diff --git a/app/src/main/res/drawable-xxxhdpi/app_icon.png b/app/src/main/res/drawable-xxxhdpi/app_icon.png
diff --git a/app/src/main/res/drawable/app_bg.png b/app/src/main/res/drawable/app_bg.png
diff --git a/app/src/main/res/drawable/app_icon.png b/app/src/main/res/drawable/app_icon.png
diff --git a/app/src/main/res/drawable/button_detail_all.xml b/app/src/main/res/drawable/button_detail_all.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true">
+        <shape>
+            <corners android:radius="@dimen/vs_20" />
+            <solid android:color="@color/color_2A2A2A" />
+            <stroke android:width="2mm" android:color="@android:color/white" />
+        </shape>
+    </item>
+    <item android:state_focused="false">
+        <shape>
+            <corners android:radius="@dimen/vs_20" />
+            <solid android:color="@color/color_1A1A1A" />
+        </shape>
+    </item>
+</selector>
diff --git a/app/src/main/res/drawable/icon_filter.xml b/app/src/main/res/drawable/icon_filter.xml
@@ -1,9 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48dp"
-    android:height="48dp"
-    android:viewportWidth="1024"
-    android:viewportHeight="1024">
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#FFFFFF"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
   <path
-      android:pathData="M540.44,541.27l255.72,-370.61L227.84,170.67l255.72,370.61L483.56,832.5l56.89,34.13L540.44,541.27zM426.67,559L168.7,185.14a45.51,45.51 0,0 1,-8.05 -25.85c0,-25.14 20.38,-45.51 45.51,-45.51h611.68c9.23,0 18.25,2.81 25.85,8.05 20.69,14.27 25.89,42.62 11.61,63.31L597.33,559v408.12l-170.67,-102.4v-305.72z"
-      android:fillColor="#ffffff"/>
-</vector>
+      android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z"
+      android:fillColor="@android:color/white"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_detail.xml b/app/src/main/res/layout/activity_detail.xml
@@ -155,10 +155,10 @@
                         android:layout_height="@dimen/vs_40"
                         android:layout_marginEnd="@dimen/vs_10"
                         android:layout_marginRight="@dimen/vs_10"
-                        android:background="@drawable/button_detail_play"
+                        android:background="@drawable/button_detail_all"
                         android:focusable="true"
                         android:gravity="center"
-                        android:text="立即播放"
+                        android:text="Play"
                         android:textColor="@android:color/white"
                         android:textSize="@dimen/vs_20" />
 
@@ -168,10 +168,10 @@
                         android:layout_height="@dimen/vs_40"
                         android:layout_marginEnd="@dimen/vs_10"
                         android:layout_marginRight="@dimen/vs_10"
-                        android:background="@drawable/button_detail_quick_search"
+                        android:background="@drawable/button_detail_all"
                         android:focusable="true"
                         android:gravity="center"
-                        android:text="快速搜索"
+                        android:text="Search"
                         android:textColor="@android:color/white"
                         android:textSize="@dimen/vs_20" />
 
@@ -181,21 +181,21 @@
                         android:layout_height="@dimen/vs_40"
                         android:layout_marginEnd="@dimen/vs_10"
                         android:layout_marginRight="@dimen/vs_10"
-                        android:background="@drawable/button_detail_sort"
+                        android:background="@drawable/button_detail_all"
                         android:focusable="true"
                         android:gravity="center"
-                        android:text="倒序"
+                        android:text="Sort"
                         android:textColor="@android:color/white"
                         android:textSize="@dimen/vs_20" />
 
                     <TextView
                         android:id="@+id/tvCollect"
                         android:layout_width="@dimen/vs_120"
                         android:layout_height="@dimen/vs_40"
-                        android:background="@drawable/button_detail_collect"
+                        android:background="@drawable/button_detail_all"
                         android:focusable="true"
                         android:gravity="center"
-                        android:text="加入收藏"
+                        android:text="Favorite"
                         android:textColor="@android:color/white"
                         android:textSize="@dimen/vs_20" />
                 </LinearLayout>

diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
@@ -43,8 +43,9 @@
             android:gravity="right|center_vertical"
             android:textAlignment="gravity"
             android:textColor="@android:color/white"
-            android:textSize="@dimen/ts_28"
-            tools:text="111111111111111" />
+            android:textSize="@dimen/ts_20"
+            android:textStyle="bold"
+            tools:text="DateTime" />
     </LinearLayout>
 
     <LinearLayout