Browse Source

修改更新问题

niusongtao@dl-cg.com 5 years ago
parent
commit
a46d8692a7

+ 63 - 40
base_library/src/main/res/layout/dialog_update.xml

@@ -1,69 +1,92 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="@color/transparent"
-    android:layout_height="match_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/transparent">
+
     <com.coorchice.library.SuperTextView
     <com.coorchice.library.SuperTextView
-        android:id="@+id/dialog_update_bg"
+        android:id="@+id/dialog_bg"
         android:layout_width="@dimen/dp_0"
         android:layout_width="@dimen/dp_0"
-        android:background="@color/white"
         android:layout_height="@dimen/dp_0"
         android:layout_height="@dimen/dp_0"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
+        android:layout_marginStart="@dimen/dp_40"
+        android:layout_marginTop="@dimen/dp_50"
+        android:layout_marginEnd="@dimen/dp_40"
+        app:layout_constraintDimensionRatio="284:284"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintDimensionRatio="284:386"
-        app:stv_corner="@dimen/dp_20"
-        android:layout_marginStart="@dimen/dp_50"
-        android:layout_marginEnd="@dimen/dp_50"
-        android:layout_marginTop="@dimen/dp_50"/>
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:stv_solid="@color/white"
+        app:stv_corner="@dimen/dp_20" />
+
     <ImageView
     <ImageView
         android:id="@+id/dialog_update_img"
         android:id="@+id/dialog_update_img"
         android:layout_width="wrap_content"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="@id/dialog_update_bg"
-        app:layout_constraintEnd_toEndOf="@id/dialog_update_bg"
-        android:src="@drawable/update_img"/>
+        android:src="@drawable/update_img"
+        app:layout_constraintEnd_toEndOf="@id/dialog_bg"
+        app:layout_constraintStart_toStartOf="@id/dialog_bg"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <TextView
     <TextView
-        android:id="@+id/dialog_update_title"
+        android:id="@+id/dialog_title"
         android:layout_width="@dimen/dp_0"
         android:layout_width="@dimen/dp_0"
         android:layout_height="wrap_content"
         android:layout_height="wrap_content"
-        app:layout_constraintStart_toStartOf="@id/dialog_update_bg"
-        app:layout_constraintEnd_toEndOf="@id/dialog_update_bg"
-        app:layout_constraintTop_toBottomOf="@id/dialog_update_img"
         android:layout_marginTop="@dimen/dp_5"
         android:layout_marginTop="@dimen/dp_5"
-        android:text="Discover new releases"
         android:gravity="center"
         android:gravity="center"
-        android:textColor="#FFB717"/>
+        android:textColor="#FFB717"
+        android:textSize="@dimen/sp_18"
+        android:layout_marginStart="@dimen/dp_20"
+        android:layout_marginEnd="@dimen/dp_20"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toEndOf="@id/dialog_bg"
+        app:layout_constraintStart_toStartOf="@id/dialog_bg"
+        app:layout_constraintTop_toBottomOf="@id/dialog_update_img" />
+
+
+    <TextView
+        android:id="@+id/dialog_message"
+        android:layout_width="@dimen/dp_0"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/dp_20"
+        android:layout_marginTop="@dimen/dp_15"
+        android:layout_marginEnd="@dimen/dp_20"
+        android:gravity="center"
+        android:textColor="@color/black_alpha_50"
+        android:textSize="@dimen/sp_13"
+        app:layout_constraintEnd_toEndOf="@id/dialog_bg"
+        app:layout_constraintStart_toStartOf="@id/dialog_bg"
+        app:layout_constraintTop_toBottomOf="@id/dialog_title" />
 
 
     <com.coorchice.library.SuperTextView
     <com.coorchice.library.SuperTextView
-        android:id="@+id/dialog_update_update"
+        android:id="@+id/dialog_positive"
         android:layout_width="@dimen/dp_0"
         android:layout_width="@dimen/dp_0"
         android:layout_height="@dimen/dp_40"
         android:layout_height="@dimen/dp_40"
-        app:layout_constraintStart_toStartOf="@id/dialog_update_bg"
-        app:layout_constraintEnd_toEndOf="@id/dialog_update_bg"
-        app:layout_constraintBottom_toTopOf="@id/dialog_update_dismiss"
-        android:layout_margin="@dimen/dp_20"
-        app:stv_solid="#FFAA00"
-        app:stv_corner="@dimen/dp_25"
-        android:textColor="@color/black"
+        android:layout_marginStart="@dimen/dp_20"
+        android:layout_marginEnd="@dimen/dp_20"
+        android:layout_marginBottom="@dimen/dp_10"
         android:gravity="center"
         android:gravity="center"
-        android:text="Upgrade"/>
+        android:textColor="@color/black"
+        app:layout_constraintBottom_toTopOf="@id/dialog_negative"
+        app:layout_constraintEnd_toEndOf="@id/dialog_bg"
+        app:layout_constraintStart_toStartOf="@id/dialog_bg"
+        app:stv_corner="@dimen/dp_25"
+        app:stv_solid="#FFAA00" />
 
 
     <com.coorchice.library.SuperTextView
     <com.coorchice.library.SuperTextView
-        android:id="@+id/dialog_update_dismiss"
+        android:id="@+id/dialog_negative"
         android:layout_width="@dimen/dp_0"
         android:layout_width="@dimen/dp_0"
         android:layout_height="@dimen/dp_40"
         android:layout_height="@dimen/dp_40"
-        app:layout_constraintStart_toStartOf="@id/dialog_update_bg"
-        app:layout_constraintEnd_toEndOf="@id/dialog_update_bg"
-        app:layout_constraintBottom_toBottomOf="@id/dialog_update_bg"
-        android:layout_margin="@dimen/dp_20"
-        app:stv_solid="#0F000000"
-        app:stv_corner="@dimen/dp_25"
-        android:textColor="@color/black_alpha_50"
+        android:layout_marginStart="@dimen/dp_20"
+        android:layout_marginEnd="@dimen/dp_20"
+        android:layout_marginBottom="@dimen/dp_20"
         android:gravity="center"
         android:gravity="center"
-        android:text="Ignore"/>
+        android:textColor="@color/black_alpha_50"
+        app:layout_constraintBottom_toBottomOf="@id/dialog_bg"
+        app:layout_constraintEnd_toEndOf="@id/dialog_bg"
+        app:layout_constraintStart_toStartOf="@id/dialog_bg"
+        app:stv_corner="@dimen/dp_25"
+        app:stv_solid="#0F000000" />
 
 
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>

+ 3 - 0
base_library/src/main/res/values-en/strings.xml

@@ -67,6 +67,9 @@
     <string name="custom_load_loading">Loading...</string>
     <string name="custom_load_loading">Loading...</string>
     <string name="custom_load_failed">Loading failed, please click me to try again</string>
     <string name="custom_load_failed">Loading failed, please click me to try again</string>
     <string name="custom_load_complete">No more data</string>
     <string name="custom_load_complete">No more data</string>
+    <string name="common_upgrade">Upgrade</string>
+    <string name="common_ignore">Ignore</string>
+    <string name="common_update_title">Discover new releases</string>
 
 
 
 
 
 

+ 3 - 0
base_library/src/main/res/values-in/strings.xml

@@ -68,6 +68,9 @@
     <string name="custom_load_loading">Memuat...</string>
     <string name="custom_load_loading">Memuat...</string>
     <string name="custom_load_failed">Gagal memuat, klik saya untuk mencoba lagi</string>
     <string name="custom_load_failed">Gagal memuat, klik saya untuk mencoba lagi</string>
     <string name="custom_load_complete">Tidak ada lagi data</string>
     <string name="custom_load_complete">Tidak ada lagi data</string>
+    <string name="common_upgrade">Meningkatkan</string>
+    <string name="common_ignore">Mengabaikan</string>
+    <string name="common_update_title">Temukan rilis baru</string>
 
 
 
 
     <string name="biometricprompt_tip">Tip</string>
     <string name="biometricprompt_tip">Tip</string>

+ 4 - 0
base_library/src/main/res/values/strings.xml

@@ -74,6 +74,10 @@
     <string name="custom_load_failed">加载失败,请点我重试</string>
     <string name="custom_load_failed">加载失败,请点我重试</string>
     <string name="custom_load_complete">没有更多数据</string>
     <string name="custom_load_complete">没有更多数据</string>
 
 
+    <string name="common_upgrade">更新</string>
+    <string name="common_ignore">忽略</string>
+    <string name="common_update_title">发现新版本</string>
+