diff --git a/app/tmp/full-r8-config.txt b/app/tmp/full-r8-config.txt index 1804dd9f1..859dfb00d 100644 --- a/app/tmp/full-r8-config.txt +++ b/app/tmp/full-r8-config.txt @@ -888,8 +888,6 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode; -keep class com.yunbao.common.custom.CommonRefreshView { (android.content.Context, android.util.AttributeSet); } --keep class com.yunbao.common.custom.CommonRefreshWaterfallView { (android.content.Context, android.util.AttributeSet); } - -keep class com.yunbao.common.custom.DrawableCheckBox { (android.content.Context, android.util.AttributeSet); } -keep class com.yunbao.common.custom.DrawableRadioButton { (android.content.Context, android.util.AttributeSet); } diff --git a/common/src/main/res/layout/item_game_type_select_view.xml b/common/src/main/res/layout/item_game_type_select_view.xml index 9577da7d0..55ba94362 100644 --- a/common/src/main/res/layout/item_game_type_select_view.xml +++ b/common/src/main/res/layout/item_game_type_select_view.xml @@ -42,9 +42,12 @@ + app:layout_constraintVertical_bias="0.34" /> diff --git a/common/src/main/res/layout/item_home_sud_game_list2.xml b/common/src/main/res/layout/item_home_sud_game_list2.xml index a684cb6d2..b95f6027b 100644 --- a/common/src/main/res/layout/item_home_sud_game_list2.xml +++ b/common/src/main/res/layout/item_home_sud_game_list2.xml @@ -8,7 +8,7 @@ android:layout_marginStart="16dp" android:layout_marginTop="9dp" android:layout_marginEnd="16dp" - android:background="@drawable/bg_f2edd7_10"> + android:background="@mipmap/background_home_sud_game_list"> 僅展示離線 展示對方已讀 展示對方未讀 + 用戶權益 + 創作中心 + 其他功能 + 遊戲大廳 + 不限門檻 + 不限玩家 + 遊戲人數 + 在線人數 + 互動 + 系統消息 + 使用手機號登錄 diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index f8e4b5b3c..dd6829156 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -1428,4 +1428,8 @@ Limited ride And limited avatar frame 不限玩家 遊戲人數 在線人數 + 互動 + 系統消息 + Sign in with Phone number + diff --git a/main/src/main/res/layout/activity_entry2.xml b/main/src/main/res/layout/activity_entry2.xml index c4e895cba..5117ca544 100644 --- a/main/src/main/res/layout/activity_entry2.xml +++ b/main/src/main/res/layout/activity_entry2.xml @@ -99,7 +99,7 @@ android:id="@+id/googleTv" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/user_login_facebook" + android:text="@string/user_login_google" android:textColor="@color/color_111111" android:textSize="14sp" app:layout_constraintBottom_toBottomOf="@+id/btn_google" @@ -143,7 +143,7 @@ Join Guard tasks game - 互動 - 系統消息 +