杨充 5 лет назад
Родитель
Сommit
ab31785f6b

+ 1 - 1
VideoPlayer/src/main/res/drawable/shape_back_bg.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape android:shape="oval"
        xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/dkplayer_background_color"/>
+    <solid android:color="#4D000000"/>
     <size
         android:height="40dp"
         android:width="40dp"/>

+ 1 - 1
VideoPlayer/src/main/res/drawable/shape_play_bg.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape android:shape="oval"
        xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/dkplayer_theme_color_translucent"/>
+    <solid android:color="#9939C5BB"/>
     <size
         android:height="40dp"
         android:width="40dp"/>

+ 1 - 1
VideoPlayer/src/main/res/drawable/shape_status_view_bg.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/dkplayer_theme_color"/>
+    <solid android:color="#39C5BB"/>
     <corners android:radius="30dp"/>
 </shape>

+ 0 - 3
VideoPlayer/src/main/res/values/colors.xml

@@ -3,7 +3,4 @@
     <color name="dialog_bg">#bc000000</color>
     <color name="alpha_25_black">#40000000</color>
     <color name="redTab">#D03E49</color>
-    <color name="dkplayer_theme_color">#39C5BB</color>
-    <color name="dkplayer_theme_color_translucent">#9939C5BB</color>
-    <color name="dkplayer_background_color">#4D000000</color>
 </resources>

+ 0 - 13
VideoPlayer/src/main/res/values/dimens.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="dkplayer_controller_height">46dp</dimen>
-    <dimen name="dkplayer_controller_icon_padding">12dp</dimen>
-    <dimen name="dkplayer_controller_text_size">16sp</dimen>
-    <dimen name="dkplayer_default_spacing">10dp</dimen>
-    <dimen name="dkplayer_controller_seekbar_size_n">14dp</dimen>
-    <dimen name="dkplayer_controller_seekbar_size_s">14dp</dimen>
-    <dimen name="dkplayer_controller_seekbar_max_size">1dp</dimen>
-    <dimen name="dkplayer_play_btn_size">50dp</dimen>
-    <dimen name="dkplayer_controller_time_text_size">14sp</dimen>
-
-</resources>

+ 1 - 1
app/src/main/res/drawable/shape_ad_bg.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@color/dkplayer_background_color" />
+    <solid android:color="#4D000000" />
     <size
         android:width="80dp"
         android:height="40dp" />

+ 2 - 2
app/src/main/res/layout/layout_definition_control_view.xml

@@ -50,7 +50,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@android:color/white"
-            android:textSize="@dimen/dkplayer_controller_time_text_size"
+            android:textSize="14sp"
             tools:text="00:00" />
 
         <TextView
@@ -58,7 +58,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@android:color/white"
-            android:textSize="@dimen/dkplayer_controller_time_text_size"
+            android:textSize="14sp"
             android:layout_marginLeft="12dp"
             tools:text="高清" />
 

+ 3 - 3
app/src/main/res/layout/layout_tiktok_controller.xml

@@ -12,11 +12,11 @@
 
     <ImageView
         android:id="@+id/play_btn"
-        android:layout_width="@dimen/dkplayer_play_btn_size"
-        android:layout_height="@dimen/dkplayer_play_btn_size"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
         android:layout_gravity="center"
         android:background="@drawable/shape_play_bg"
-        android:padding="@dimen/dkplayer_default_spacing"
+        android:padding="10dp"
         android:src="@drawable/selector_play_button"
         android:visibility="gone"
         tools:visibility="visible"/>