diff --git a/app/aliyun-libs/rpsdk-4.14.3-open.aar b/app/aliyun-libs/rpsdk-4.14.3-open.aar index 61de65683..1ac67b1b7 100644 Binary files a/app/aliyun-libs/rpsdk-4.14.3-open.aar and b/app/aliyun-libs/rpsdk-4.14.3-open.aar differ diff --git a/app/src/main/java/com/mango/moshen/MainActivity.java b/app/src/main/java/com/mango/moshen/MainActivity.java index 36a4230d0..847765640 100644 --- a/app/src/main/java/com/mango/moshen/MainActivity.java +++ b/app/src/main/java/com/mango/moshen/MainActivity.java @@ -223,7 +223,7 @@ public class MainActivity extends BaseMvpActivity initView(); InitialModel.get().getMainTabInfosLiveData().observeForever(mainTabInfos -> { if (mainTabInfos != null) { - mMainTabLayout.setMainTabInfoList(mainTabInfos); + mMainTabLayout.setMainTabInfoList(InitialModel.getDefaultMainTab()); } }); initMaterialView(); diff --git a/app/src/main/java/com/mango/moshen/ui/user/adapter/UserInfoIndicatorAdapter.java b/app/src/main/java/com/mango/moshen/ui/user/adapter/UserInfoIndicatorAdapter.java index 95a52df9c..825cbd8ab 100644 --- a/app/src/main/java/com/mango/moshen/ui/user/adapter/UserInfoIndicatorAdapter.java +++ b/app/src/main/java/com/mango/moshen/ui/user/adapter/UserInfoIndicatorAdapter.java @@ -64,7 +64,7 @@ public class UserInfoIndicatorAdapter extends CommonNavigatorAdapter { indicator.setMode(LinePagerIndicator.MODE_WRAP_CONTENT); indicator.setLineHeight(UIUtil.dip2px(mContext, 10)); indicator.setRoundRadius(UIUtil.dip2px(mContext, 7)); - indicator.setColors(Color.parseColor("#FFC000")); + indicator.setColors(Color.parseColor("#5FCCE4")); FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); lp.gravity = Gravity.END; lp.bottomMargin = UIUtil.dip2px(mContext, 0); diff --git a/app/src/main/res/color/color_selector_main_tab.xml b/app/src/main/res/color/color_selector_main_tab.xml index 36ffb7525..32e9b559e 100644 --- a/app/src/main/res/color/color_selector_main_tab.xml +++ b/app/src/main/res/color/color_selector_main_tab.xml @@ -1,7 +1,7 @@ - + diff --git a/app/src/main/res/drawable-xhdpi/bg_me_page.png b/app/src/main/res/drawable-xhdpi/bg_me_page.png index bdaf51043..88614b454 100644 Binary files a/app/src/main/res/drawable-xhdpi/bg_me_page.png and b/app/src/main/res/drawable-xhdpi/bg_me_page.png differ diff --git a/app/src/main/res/drawable-xhdpi/bg_me_wallet_entrance.png b/app/src/main/res/drawable-xhdpi/bg_me_wallet_entrance.png index 0c930ab47..64a3a3a93 100644 Binary files a/app/src/main/res/drawable-xhdpi/bg_me_wallet_entrance.png and b/app/src/main/res/drawable-xhdpi/bg_me_wallet_entrance.png differ diff --git a/app/src/main/res/drawable-xhdpi/bg_vip_me_entrance.png b/app/src/main/res/drawable-xhdpi/bg_vip_me_entrance.png index ae84a7daa..6bb59121d 100644 Binary files a/app/src/main/res/drawable-xhdpi/bg_vip_me_entrance.png and b/app/src/main/res/drawable-xhdpi/bg_vip_me_entrance.png differ diff --git a/app/src/main/res/drawable-xhdpi/default_avatar.png b/app/src/main/res/drawable-xhdpi/default_avatar.png index 6d3a5784d..c1b64c090 100644 Binary files a/app/src/main/res/drawable-xhdpi/default_avatar.png and b/app/src/main/res/drawable-xhdpi/default_avatar.png differ diff --git a/app/src/main/res/drawable-xhdpi/default_banner.png b/app/src/main/res/drawable-xhdpi/default_banner.png index c67443169..ff59876ad 100644 Binary files a/app/src/main/res/drawable-xhdpi/default_banner.png and b/app/src/main/res/drawable-xhdpi/default_banner.png differ diff --git a/app/src/main/res/drawable-xhdpi/default_cover.png b/app/src/main/res/drawable-xhdpi/default_cover.png index 8aa5323a1..ae4930146 100644 Binary files a/app/src/main/res/drawable-xhdpi/default_cover.png and b/app/src/main/res/drawable-xhdpi/default_cover.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_msg_attention.png b/app/src/main/res/drawable-xhdpi/ic_msg_attention.png index 0fb4f217b..9cef8268a 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_msg_attention.png and b/app/src/main/res/drawable-xhdpi/ic_msg_attention.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_msg_fans.png b/app/src/main/res/drawable-xhdpi/ic_msg_fans.png index ef6148ffd..99a36a461 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_msg_fans.png and b/app/src/main/res/drawable-xhdpi/ic_msg_fans.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_msg_friend.png b/app/src/main/res/drawable-xhdpi/ic_msg_friend.png index 0b879f85b..e81686971 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_msg_friend.png and b/app/src/main/res/drawable-xhdpi/ic_msg_friend.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_msg_relation.png b/app/src/main/res/drawable-xhdpi/ic_msg_relation.png index a1cd17950..32e29726c 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_msg_relation.png and b/app/src/main/res/drawable-xhdpi/ic_msg_relation.png differ diff --git a/app/src/main/res/drawable/bg_game_status_playing.xml b/app/src/main/res/drawable/bg_game_status_playing.xml index 1a4e1f5fd..3b9322ebb 100644 --- a/app/src/main/res/drawable/bg_game_status_playing.xml +++ b/app/src/main/res/drawable/bg_game_status_playing.xml @@ -5,6 +5,6 @@ - + diff --git a/app/src/main/res/drawable/bg_room_follow_room.xml b/app/src/main/res/drawable/bg_room_follow_room.xml index 5905bfed6..e4a2152a4 100644 --- a/app/src/main/res/drawable/bg_room_follow_room.xml +++ b/app/src/main/res/drawable/bg_room_follow_room.xml @@ -4,8 +4,8 @@ + android:startColor="#66D9D9" + android:endColor="#66D9D9"/> \ No newline at end of file diff --git a/app/src/main/res/drawable/common_btn_bg.xml b/app/src/main/res/drawable/common_btn_bg.xml index 18f3258e5..b4f4693c6 100644 --- a/app/src/main/res/drawable/common_btn_bg.xml +++ b/app/src/main/res/drawable/common_btn_bg.xml @@ -2,13 +2,13 @@ - + - + @@ -22,7 +22,7 @@ - + diff --git a/app/src/main/res/drawable/selector_game_status_bg.xml b/app/src/main/res/drawable/selector_game_status_bg.xml index 78748e170..b26d7b61e 100644 --- a/app/src/main/res/drawable/selector_game_status_bg.xml +++ b/app/src/main/res/drawable/selector_game_status_bg.xml @@ -3,7 +3,7 @@ - + diff --git a/app/src/main/res/drawable/shape_ffcb47_to_ffa936.xml b/app/src/main/res/drawable/shape_ffcb47_to_ffa936.xml index c5084cb86..d2ddfd129 100644 --- a/app/src/main/res/drawable/shape_ffcb47_to_ffa936.xml +++ b/app/src/main/res/drawable/shape_ffcb47_to_ffa936.xml @@ -2,8 +2,8 @@ \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_ffd15a_to_ffc000.xml b/app/src/main/res/drawable/shape_ffd15a_to_ffc000.xml index dd3caed28..be981c15f 100644 --- a/app/src/main/res/drawable/shape_ffd15a_to_ffc000.xml +++ b/app/src/main/res/drawable/shape_ffd15a_to_ffc000.xml @@ -2,7 +2,7 @@ + android:endColor="#5FCCE4" + android:startColor="#5FCCE4" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_me_indicator_visible.xml b/app/src/main/res/drawable/shape_me_indicator_visible.xml index ae656f321..a6a343f27 100644 --- a/app/src/main/res/drawable/shape_me_indicator_visible.xml +++ b/app/src/main/res/drawable/shape_me_indicator_visible.xml @@ -2,7 +2,7 @@ - + diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml index dcc245271..f49ab3250 100644 --- a/app/src/main/res/layout/fragment_me.xml +++ b/app/src/main/res/layout/fragment_me.xml @@ -35,7 +35,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:background="@drawable/bg_me_page" - app:layout_constraintDimensionRatio="750:672" + app:layout_constraintDimensionRatio="750:1334" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/item_my_chat_bubble.xml b/app/src/main/res/layout/item_my_chat_bubble.xml index 36457a4de..8a196482b 100644 --- a/app/src/main/res/layout/item_my_chat_bubble.xml +++ b/app/src/main/res/layout/item_my_chat_bubble.xml @@ -27,9 +27,9 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" app:shaderEnable="true" - app:shaderEndColor="#FFFFA936" + app:shaderEndColor="#66D9D9" app:shaderMode="topToBottom" - app:shaderStartColor="#FFFFCB47" /> + app:shaderStartColor="#5BC8F8" /> + app:shaderStartColor="#5BC8F8" /> #66D9D9 #5CAAFF - #66333333 + #8A8CAB diff --git a/core/src/main/java/com/mango/core/initial/InitialModel.java b/core/src/main/java/com/mango/core/initial/InitialModel.java index 06cc5e1b9..05b02cb8c 100644 --- a/core/src/main/java/com/mango/core/initial/InitialModel.java +++ b/core/src/main/java/com/mango/core/initial/InitialModel.java @@ -407,7 +407,7 @@ public class InitialModel extends BaseModel implements IInitialModel { } - private List getDefaultMainTab() { + public static List getDefaultMainTab() { return new ArrayList<>(Arrays.asList( new MainTabInfo( "",