feat:完成装扮商城/充值中心 等UI替换

app/src/main/java/com/pikolive/app/ui/pay/ChargeActivity.java

@@ -360,8 +360,8 @@ public class ChargeActivity extends BaseMvpActivity<IChargeView, ChargePresenter
         if (mTitleBar != null) {
             mTitleBar.setTitle(getString(R.string.charge_my));
             mTitleBar.setImmersive(false);
-            mTitleBar.setTitleColor(getResources().getColor(R.color.white));
-            mTitleBar.setLeftImageResource(R.drawable.arrow_left_white);
+            mTitleBar.setTitleColor(getResources().getColor(R.color.color_1F1B4F));
+            mTitleBar.setLeftImageResource(R.drawable.arrow_left);
             mTitleBar.setBackgroundResource(R.color.transparent);
             mTitleBar.setLeftClickListener(v -> finish());
         }

app/src/main/java/com/pikolive/app/ui/user/adapter/UserInfoIndicatorAdapter.java

@@ -23,6 +23,7 @@ import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IP
 import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView;
 import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.GradientLinePagerIndicator;
 import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator;
+import com.pikolive.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.ThemePagerIndicator;
 
 import java.util.List;
 
@@ -67,7 +68,7 @@ public class UserInfoIndicatorAdapter extends CommonNavigatorAdapter {
     @Override
     public IPagerIndicator getIndicator(Context context) {
         if (!showIndicator) return null;
-        GradientLinePagerIndicator indicator = new GradientLinePagerIndicator(context);
+        ThemePagerIndicator indicator = new ThemePagerIndicator(context);
         indicator.setMode(LinePagerIndicator.MODE_WRAP_CONTENT);
         indicator.setLineHeight(UIUtil.dip2px(mContext, 8));
         indicator.setRoundRadius(UIUtil.dip2px(mContext, 360));

app/src/main/java/com/pikolive/app/ui/widget/MainRedPointTab.java

@@ -137,19 +137,19 @@ public class MainRedPointTab extends RelativeLayout {
     }
 
     private int getDefaultRes(int tabType, boolean select) {
-        int resId = select ? R.mipmap.ic_main_tab_game_pressed : R.mipmap.ic_main_tab_game_home;
+        int resId = select ? R.drawable.ic_main_tab_game_pressed : R.drawable.ic_main_tab_game_home;
         switch (tabType) {
             case MainTabType.TAB_TYPE_SQUARE:
-                resId = select ? R.mipmap.ic_main_tab_find_pressed : R.mipmap.ic_main_tab_find;
+                resId = select ? R.drawable.ic_main_tab_find_pressed : R.drawable.ic_main_tab_find;
                 break;
             case MainTabType.TAB_TYPE_GAME:
                 resId = select ? R.mipmap.ic_main_tab_peace_pressed : R.mipmap.ic_main_tab_peace;
                 break;
             case MainTabType.TAB_TYPE_MSG:
-                resId = select ? R.mipmap.ic_main_tab_msg_pressed : R.mipmap.ic_main_tab_msg;
+                resId = select ? R.drawable.ic_main_tab_msg_pressed : R.drawable.ic_main_tab_msg;
                 break;
             case MainTabType.TAB_TYPE_ME:
-                resId = select ? R.mipmap.ic_main_tab_me_pressed : R.mipmap.ic_main_tab_me;
+                resId = select ? R.drawable.ic_main_tab_me_pressed : R.drawable.ic_main_tab_me;
                 break;
             default:
                 break;

app/src/main/java/com/pikolive/app/ui/widget/MainTab.java

@@ -43,8 +43,8 @@ public class MainTab extends androidx.appcompat.widget.AppCompatTextView {
         setCompoundDrawablePadding(ScreenUtil.dip2px(0));
 
         TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.MainTab);
-        mTabIcon = typedArray.getResourceId(R.styleable.MainTab_tab_icon, R.mipmap.ic_main_tab_game_home);
-        mTabIconSelect = typedArray.getResourceId(R.styleable.MainTab_tab_icon_select, R.mipmap.ic_main_tab_game_pressed);
+        mTabIcon = typedArray.getResourceId(R.styleable.MainTab_tab_icon, R.drawable.ic_main_tab_game_home);
+        mTabIconSelect = typedArray.getResourceId(R.styleable.MainTab_tab_icon_select, R.drawable.ic_main_tab_game_pressed);
 
         mTabtextColor = typedArray.getColor(R.styleable.MainTab_tab_text_color, DEFAULT_COLOR);
         mTabTextSelectColor = typedArray.getColor(R.styleable.MainTab_tab_text_color_select, DEFAULT_COLOR);

app/src/main/res/drawable/base_theme_btn_21.xml

@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-
-    <gradient
-        android:angle="180"
-        android:endColor="#FF5AECFA"
-        android:centerColor="#FF9DB4FF"
-        android:startColor="#FFCF70FF"
-        android:type="linear"
-        android:useLevel="true" />
+    <solid android:color="#FFFF84C0" />
     <corners android:radius="21dp" />
 
 </shape>

app/src/main/res/drawable/base_theme_btn_24.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="#FFFF84C0" />
+    <corners android:radius="24dp" />
+
+</shape>

app/src/main/res/drawable/base_theme_btn_28.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="#FFFF84C0" />
+    <corners android:radius="28dp" />
+
+</shape>

app/src/main/res/drawable/charge_bg_top_panel.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <stroke
+        android:width="1dp"
+        android:color="#ffffffff" />
+    <solid android:color="#80ffffff" />
+    <corners
+        android:bottomLeftRadius="0dp"
+        android:bottomRightRadius="0dp"
+        android:topLeftRadius="16dp"
+        android:topRightRadius="16dp" />
+
+</shape>

app/src/main/res/drawable/decoration_bg_give.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#FFFFFF" />
+    <stroke
+        android:width="1dp"
+        android:color="#FFFF84C0" />
+    <corners android:radius="24dp" />
+
+</shape>

app/src/main/res/drawable/shape_white_top_16dp.xml

@@ -0,0 +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/white"/>
+    <corners android:topLeftRadius="@dimen/dp_16"
+        android:topRightRadius="@dimen/dp_16"/>
+</shape>

app/src/main/res/layout/activity_charge.xml

@@ -7,11 +7,12 @@
     android:background="@color/white"
     android:orientation="vertical">
 
-    <View
+    <ImageView
         android:id="@+id/iv_bg"
         android:layout_width="match_parent"
-        android:layout_height="210dp"
-        android:background="@drawable/bg_common_normal"
+        android:layout_height="match_parent"
+        android:background="@drawable/home_bg"
+        android:scaleType="centerCrop"
         app:layout_constraintTop_toTopOf="parent" />
 
     <com.pikolive.app.base.TitleBar
@@ -25,19 +26,19 @@
     <View
         android:id="@+id/iv_translate_bg"
         android:layout_width="match_parent"
-        android:layout_height="88dp"
+        android:layout_height="@dimen/dp_88"
         android:layout_marginStart="@dimen/dp_16"
+        android:layout_marginTop="@dimen/dp_15"
         android:layout_marginEnd="@dimen/dp_16"
-        android:layout_marginBottom="@dimen/dp_10"
-        android:background="@drawable/bg_common_translate_rectangle"
-        app:layout_constraintBottom_toBottomOf="@+id/iv_bg"
+        android:background="@drawable/charge_bg_top_panel"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/title_bar" />
 
     <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/dp_4"
+        android:layout_marginEnd="@dimen/dp_7"
         android:src="@mipmap/ic_charge_diamond"
         app:layout_constraintBottom_toBottomOf="@+id/tv_title_diamond"
         app:layout_constraintEnd_toStartOf="@+id/tv_title_diamond"
@@ -47,10 +48,10 @@
         android:id="@+id/tv_title_diamond"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_10"
+        android:layout_marginTop="@dimen/dp_12"
         android:gravity="center"
         android:text="@string/charge_my_diamond"
-        android:textColor="@color/color_333333"
+        android:textColor="#FF1F1B4F"
         android:textSize="@dimen/text_size_14"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -61,12 +62,12 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
-        android:layout_marginTop="12dp"
+        android:layout_marginTop="@dimen/dp_2"
         android:fontFamily="sans-serif-medium"
         android:includeFontPadding="false"
         android:text="0.0"
-        android:textColor="@color/color_333333"
-        android:textSize="@dimen/text_size_30"
+        android:textColor="#FF1F1B4F"
+        android:textSize="@dimen/text_size_32"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tv_title_diamond"
@@ -83,13 +84,13 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@drawable/bg_common_top_14_white"
+            android:background="@drawable/shape_white_top_16dp"
             android:orientation="vertical">
 
             <com.zhpan.bannerview.BannerViewPager
                 android:id="@+id/vp_banner"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/dp_90"
+                android:layout_height="@dimen/dp_94"
                 android:layout_marginStart="@dimen/dp_16"
                 android:layout_marginTop="@dimen/dp_16"
                 android:layout_marginEnd="@dimen/dp_16"
@@ -107,16 +108,16 @@
             <TextView
                 android:id="@+id/tv_charge"
                 android:layout_width="match_parent"
-                android:layout_height="56dp"
-                android:layout_marginStart="16dp"
+                android:layout_height="@dimen/dp_56"
+                android:layout_marginStart="@dimen/dp_16"
                 android:layout_marginTop="@dimen/dp_25"
                 android:layout_marginEnd="@dimen/dp_16"
                 android:layout_marginBottom="@dimen/dp_18"
-                android:background="@drawable/bg_common_confirm_30"
+                android:background="@drawable/base_theme_btn_28"
                 android:gravity="center"
                 android:text="@string/charge_confirm_charge"
                 android:textColor="@color/white"
-                android:textSize="@dimen/sp_20"
+                android:textSize="@dimen/sp_24"
                 android:textStyle="bold"
                 app:layout_constraintBottom_toBottomOf="parent" />
 

app/src/main/res/layout/activity_decoration_store.xml

@@ -54,7 +54,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:drawableStart="@drawable/ic_charge_diamond"
+            android:drawableStart="@mipmap/ic_charge_diamond"
             android:drawablePadding="3dp"
             android:gravity="center"
             android:includeFontPadding="false"
@@ -83,7 +83,7 @@
             android:layout_width="72dp"
             android:layout_height="24dp"
             android:text="@string/layout_activity_decoration_store_02"
-            android:background="@drawable/selector_common_confirm"
+            android:background="@drawable/base_theme_btn_24"
             android:gravity="center"
             android:layout_marginEnd="15dp"
             android:textColor="@color/white"

app/src/main/res/layout/fragment_contact_list.xml

@@ -5,10 +5,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@color/color_white">
     
-    <View
-        android:background="@drawable/bg_message_top"
+    <ImageView
+        android:scaleType="centerCrop"
+        android:background="@drawable/home_bg"
         android:layout_width="match_parent"
-        android:layout_height="169dp"
+        android:layout_height="match_parent"
         app:layout_constraintTop_toTopOf="parent"/>
 
     <LinearLayout

app/src/main/res/layout/fragment_recent_list.xml

@@ -29,7 +29,7 @@
             <ImageView
                 android:layout_width="55dp"
                 android:layout_height="55dp"
-                android:src="@mipmap/ic_find_new"
+                android:src="@drawable/ic_find_new"
                 android:layout_marginStart="@dimen/dp_15"
                 />
             <TextView

app/src/main/res/layout/item_decoration_common.xml

@@ -60,7 +60,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
-        android:drawableStart="@drawable/ic_decoration_diamond"
+        android:drawableStart="@mipmap/ic_charge_diamond"
         android:gravity="center"
         android:includeFontPadding="false"
         android:textColor="#ffffbc51"
@@ -75,11 +75,11 @@
         android:layout_height="24dp"
         android:layout_marginTop="12dp"
         android:layout_marginBottom="12dp"
-        android:background="@drawable/bg_common_confirm_second_30"
+        android:background="@drawable/decoration_bg_give"
         android:gravity="center"
         android:includeFontPadding="false"
         android:text="@string/layout_item_decoration_common_03"
-        android:textColor="@color/text_button_color_second"
+        android:textColor="#FFFF61C4"
         android:textSize="12sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/tv_buy"
@@ -92,7 +92,7 @@
         android:layout_width="72dp"
         android:layout_height="24dp"
         android:layout_marginStart="6dp"
-        android:background="@drawable/selector_common_confirm"
+        android:background="@drawable/base_theme_btn_24"
         android:gravity="center"
         android:includeFontPadding="false"
         android:text="@string/layout_item_decoration_common_04"

app/src/main/res/layout/item_decoration_user_card.xml

@@ -79,7 +79,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="12dp"
-        android:drawableStart="@drawable/ic_decoration_diamond"
+        android:drawableStart="@mipmap/ic_charge_diamond"
         android:gravity="center"
         android:includeFontPadding="false"
         android:textColor="#ffffbc51"

app/src/main/res/values/colors.xml

@@ -712,5 +712,4 @@
     <color name="color_ffffff_30">#4CFFFFFF</color>
     <color name="color_FFE468">#FFFFE468</color>
     <color name="color_FF84C0">#FFFF84C0</color>
-
 </resources>

app/src/main/res/values/strings.xml

@@ -1,4 +1,4 @@
-<!DOCTYPE resources [<!ENTITY app_name "Piko" >]>
+<!DOCTYPE resources [<!ENTITY app_name "Peki" >]>
 <resources>
     <string name="app_name">&app_name;</string>
     <string name="no_list_data">暫無消息</string>
@@ -852,7 +852,7 @@
 
     <string name="hint_input_nick">請輸入昵稱</string>
     <string name="text_bind_phone">綁定手機號</string>
-    <string name="slogan">來&app_name;，邂逅你的專屬聲音</string>
+    <string name="slogan">聆聽佳聲，邂逅緣分</string>
 
     <string name="text_agree">同意</string>
     <string name="text_disagree">不同意</string>

app/src/module_community/java/com/pikolive/app/community/square/adapter/SquareDynamicAdapter.java

@@ -124,7 +124,7 @@ public class SquareDynamicAdapter extends BaseQuickAdapter<WorldDynamicBean, Bas
         final String time = TimeUiUtils.getDynamicUi(item.getPublishTime());
         helper.setGone(R.id.tv_time_publish, !TextUtils.isEmpty(time));
         helper.setText(R.id.tv_time_publish, time);
-        helper.setGone(R.id.iv_in_room, item.getInRoomUid() != null);
+//        helper.setGone(R.id.iv_in_room, item.getInRoomUid() != null);
 
         ExpandableTextView etvContent = helper.getView(R.id.etv_content);
         etvContent.setEventType(4);

app/src/module_community/res/layout/item_square_dynamic.xml

@@ -67,6 +67,7 @@
             android:text="@string/room_in_live"
             android:textColor="@color/color_9168FA"
             android:textSize="@dimen/sp_10"
+            android:visibility="gone"
             app:drawableStartCompat="@drawable/ic_square_live"
             app:layout_constraintBottom_toBottomOf="@id/widget_nick_detail"
             app:layout_constraintEnd_toEndOf="parent" />