Skip to content

Commit 2d48056

Browse files
committed
UI / Icons Updates
1 parent 7b78b32 commit 2d48056

File tree

15 files changed

+115
-51
lines changed

15 files changed

+115
-51
lines changed

app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
<application
1515
android:name=".base.App"
1616
android:allowBackup="true"
17-
android:banner="@drawable/app_banner"
1817
android:configChanges="orientation|keyboardHidden|screenSize"
1918
android:hardwareAccelerated="true"
2019
android:icon="@drawable/app_icon"
20+
android:banner="@drawable/app_banner"
2121
android:label="@string/app_name"
2222
android:largeHeap="true"
2323
android:networkSecurityConfig="@xml/network_security_config"
@@ -48,6 +48,7 @@
4848
android:supportsPictureInPicture="true"
4949
android:configChanges=
5050
"screenSize|smallestScreenSize|screenLayout|orientation">
51+
</activity>
5152
<activity
5253
android:name=".ui.activity.PushActivity"
5354
android:screenOrientation="landscape" />

app/src/main/java/com/github/tvbox/osc/ui/activity/HomeActivity.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@
2727
import com.github.tvbox.osc.base.BaseActivity;
2828
import com.github.tvbox.osc.base.BaseLazyFragment;
2929
import com.github.tvbox.osc.bean.AbsSortXml;
30+
import com.github.tvbox.osc.bean.Movie;
3031
import com.github.tvbox.osc.bean.MovieSort;
32+
import com.github.tvbox.osc.bean.VodInfo;
33+
import com.github.tvbox.osc.cache.RoomDataManger;
3134
import com.github.tvbox.osc.event.RefreshEvent;
3235
import com.github.tvbox.osc.server.ControlManager;
3336
import com.github.tvbox.osc.ui.adapter.HomePageAdapter;
@@ -83,7 +86,7 @@ public class HomeActivity extends BaseActivity {
8386
public void run() {
8487
Date date = new Date();
8588
@SuppressLint("SimpleDateFormat")
86-
SimpleDateFormat timeFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm");
89+
SimpleDateFormat timeFormat = new SimpleDateFormat("dd MMM yyyy HH:mm");
8790
tvDate.setText(timeFormat.format(date));
8891
mHandler.postDelayed(this, 1000);
8992
}
@@ -222,7 +225,7 @@ public void success() {
222225
@Override
223226
public void run() {
224227
if (!useCacheConfig)
225-
Toast.makeText(HomeActivity.this, "自定义jar加载成功", Toast.LENGTH_SHORT).show();
228+
Toast.makeText(HomeActivity.this, "Load Complete", Toast.LENGTH_SHORT).show();
226229
initData();
227230
}
228231
}, 50);
@@ -239,7 +242,7 @@ public void error(String msg) {
239242
mHandler.post(new Runnable() {
240243
@Override
241244
public void run() {
242-
Toast.makeText(HomeActivity.this, "jar加载失败", Toast.LENGTH_SHORT).show();
245+
Toast.makeText(HomeActivity.this, "Load Failed", Toast.LENGTH_SHORT).show();
243246
initData();
244247
}
245248
});
-11.6 KB
Binary file not shown.
-15.5 KB
Binary file not shown.
-24.2 KB
Binary file not shown.
-33.3 KB
Binary file not shown.
93.1 KB
Loading
55.9 KB
Loading
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3+
<item android:state_focused="true">
4+
<shape>
5+
<corners android:radius="@dimen/vs_20" />
6+
<solid android:color="@color/color_2A2A2A" />
7+
<stroke android:width="2mm" android:color="@android:color/white" />
8+
</shape>
9+
</item>
10+
<item android:state_focused="false">
11+
<shape>
12+
<corners android:radius="@dimen/vs_20" />
13+
<solid android:color="@color/color_1A1A1A" />
14+
</shape>
15+
</item>
16+
</selector>
Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2-
android:width="48dp"
3-
android:height="48dp"
4-
android:viewportWidth="1024"
5-
android:viewportHeight="1024">
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:tint="#FFFFFF"
5+
android:viewportWidth="24"
6+
android:viewportHeight="24">
7+
68
<path
7-
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"
8-
android:fillColor="#ffffff"/>
9-
</vector>
9+
android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z"
10+
android:fillColor="@android:color/white"/>
11+
</vector>

0 commit comments

Comments
 (0)