Skip to content

Commit 2d48056

Browse files
takagen99takagen99
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

+2-1
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

+6-3
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
});

‎app/src/main/res/drawable-hdpi/app_icon.png

-11.6 KB
Binary file not shown.

‎app/src/main/res/drawable-xhdpi/app_icon.png

-15.5 KB
Binary file not shown.

‎app/src/main/res/drawable-xxhdpi/app_icon.png

-24.2 KB
Binary file not shown.

‎app/src/main/res/drawable-xxxhdpi/app_icon.png

-33.3 KB
Binary file not shown.

‎app/src/main/res/drawable/app_bg.png

93.1 KB
Loading

‎app/src/main/res/drawable/app_icon.png

55.9 KB
Loading

‎app/src/main/res/drawable/button_detail_all.xml

+16
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>

‎app/src/main/res/drawable/icon_filter.xml

+9-7
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>

‎app/src/main/res/layout/activity_detail.xml

+8-8
Original file line numberDiff line numberDiff line change
@@ -155,10 +155,10 @@
155155
android:layout_height="@dimen/vs_40"
156156
android:layout_marginEnd="@dimen/vs_10"
157157
android:layout_marginRight="@dimen/vs_10"
158-
android:background="@drawable/button_detail_play"
158+
android:background="@drawable/button_detail_all"
159159
android:focusable="true"
160160
android:gravity="center"
161-
android:text="立即播放"
161+
android:text="Play"
162162
android:textColor="@android:color/white"
163163
android:textSize="@dimen/vs_20" />
164164

@@ -168,10 +168,10 @@
168168
android:layout_height="@dimen/vs_40"
169169
android:layout_marginEnd="@dimen/vs_10"
170170
android:layout_marginRight="@dimen/vs_10"
171-
android:background="@drawable/button_detail_quick_search"
171+
android:background="@drawable/button_detail_all"
172172
android:focusable="true"
173173
android:gravity="center"
174-
android:text="快速搜索"
174+
android:text="Search"
175175
android:textColor="@android:color/white"
176176
android:textSize="@dimen/vs_20" />
177177

@@ -181,21 +181,21 @@
181181
android:layout_height="@dimen/vs_40"
182182
android:layout_marginEnd="@dimen/vs_10"
183183
android:layout_marginRight="@dimen/vs_10"
184-
android:background="@drawable/button_detail_sort"
184+
android:background="@drawable/button_detail_all"
185185
android:focusable="true"
186186
android:gravity="center"
187-
android:text="倒序"
187+
android:text="Sort"
188188
android:textColor="@android:color/white"
189189
android:textSize="@dimen/vs_20" />
190190

191191
<TextView
192192
android:id="@+id/tvCollect"
193193
android:layout_width="@dimen/vs_120"
194194
android:layout_height="@dimen/vs_40"
195-
android:background="@drawable/button_detail_collect"
195+
android:background="@drawable/button_detail_all"
196196
android:focusable="true"
197197
android:gravity="center"
198-
android:text="加入收藏"
198+
android:text="Favorite"
199199
android:textColor="@android:color/white"
200200
android:textSize="@dimen/vs_20" />
201201
</LinearLayout>

‎app/src/main/res/layout/activity_home.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,9 @@
4343
android:gravity="right|center_vertical"
4444
android:textAlignment="gravity"
4545
android:textColor="@android:color/white"
46-
android:textSize="@dimen/ts_28"
47-
tools:text="111111111111111" />
46+
android:textSize="@dimen/ts_20"
47+
android:textStyle="bold"
48+
tools:text="DateTime" />
4849
</LinearLayout>
4950

5051
<LinearLayout

0 commit comments

Comments
 (0)