Sora 1 год назад
Родитель
Сommit
70ced97b07

+ 6 - 3
app/src/main/java/com/sheep/gamegroup/view/activity/ActSetting.java

@@ -4,13 +4,14 @@ import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_CLEAN;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.USER_CLEAN_SURE;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.Intent;
 import android.net.Uri;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.Button;
 
+import androidx.appcompat.app.AlertDialog;
 import androidx.viewbinding.ViewBinding;
 
 import com.kfzs.duanduan.utils.ApkUtils;
@@ -92,8 +93,10 @@ public class ActSetting extends BaseActivity {
                             }
                         }
                     });
-                })
-                .show();
+                }).create();
+        dialog.show();
+        Button positiveButton = dialog.getButton(AlertDialog.BUTTON_POSITIVE);
+        positiveButton.setTextColor(getResources().getColor(R.color.text33));
     }
 
     public void onResume() {

+ 3 - 2
app/src/main/res/layout/act_game_group_or_game_detail.xml

@@ -124,7 +124,8 @@
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:paddingBottom="16dp">
+                    android:paddingBottom="16dp"
+                    >
 
                     <ImageView
                         android:id="@+id/gc_game_app_detail_icon"
@@ -132,7 +133,6 @@
                         android:layout_height="78dp"
                         android:layout_marginStart="16dp"
                         android:layout_marginTop="16dp"
-                        android:layout_marginBottom="20dp"
                         android:src="@drawable/icon_lj"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
@@ -174,6 +174,7 @@
                         android:layout_marginTop="6dp"
                         android:orientation="horizontal"
                         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                        app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="@+id/gc_game_app_detail_name"
                         app:layout_constraintStart_toStartOf="@id/gc_game_app_detail_name"
                         app:layout_constraintTop_toBottomOf="@+id/gc_game_app_detail_score_tv"

+ 4 - 3
app/src/main/res/layout/act_gc_game_app_detail.xml

@@ -53,9 +53,8 @@
                         android:gravity="center_vertical"
                         android:onClick="onClickBackImg"
                         android:scaleType="centerInside"
-                        android:tint="@color/text33"
-                        android:src="@drawable/arrow_back_ios_new_24"
-                        />
+
+                        android:src="@drawable/narrow_back_black" />
 
                     <ImageView
                         android:layout_width="?attr/actionBarSize"
@@ -107,6 +106,8 @@
                         android:id="@+id/gc_game_app_detail_tag_list"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
+                        android:orientation="horizontal"
+                        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="@id/gc_game_app_detail_name"

+ 11 - 6
app/src/main/res/layout/act_gift_detail.xml

@@ -42,7 +42,7 @@
                         android:id="@+id/imageView4"
                         android:layout_width="86dp"
                         android:layout_height="86dp"
-                        android:layout_marginTop="112dp"
+                        android:layout_marginTop="80dp"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
@@ -110,7 +110,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="礼包名称"
-                    android:textColor="@android:color/black"
+                    android:textStyle="bold"
+                    android:textColor="@color/text33"
                     android:textSize="14sp" />
 
                 <TextView
@@ -127,7 +128,8 @@
                     android:layout_marginTop="24dp"
                     android:gravity="center"
                     android:text="礼包内容"
-                    android:textColor="@color/black"
+                    android:textStyle="bold"
+                    android:textColor="@color/text33"
                     android:textSize="14sp"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -149,7 +151,8 @@
                     android:layout_marginTop="24dp"
                     android:gravity="center"
                     android:text="使用有效期"
-                    android:textColor="#ff333333"
+                    android:textStyle="bold"
+                    android:textColor="@color/text33"
                     android:textSize="14sp"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -172,7 +175,8 @@
                     android:layout_marginTop="24dp"
                     android:gravity="center"
                     android:text="使用方法"
-                    android:textColor="@color/black"
+                    android:textStyle="bold"
+                    android:textColor="@color/text33"
                     android:textSize="14sp"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -200,7 +204,8 @@
                         android:layout_marginTop="24dp"
                         android:gravity="center"
                         android:text="兑换码"
-                        android:textColor="@color/black"
+                        android:textStyle="bold"
+                        android:textColor="@color/text33"
                         android:textSize="14sp"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent" />