diff --git a/app/src/main/java/com/chwl/app/MainActivity.java b/app/src/main/java/com/chwl/app/MainActivity.java index b2be40301..7a97113a9 100644 --- a/app/src/main/java/com/chwl/app/MainActivity.java +++ b/app/src/main/java/com/chwl/app/MainActivity.java @@ -23,6 +23,7 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentTransaction; import androidx.lifecycle.ViewModelProvider; +import com.chwl.app.star.StarFragment; import com.chwl.app.ui.login.LoginPasswordActivity; import com.chwl.core.settings.SettingsModel; import com.netease.nim.uikit.StatusBarUtil; @@ -140,7 +141,7 @@ public class MainActivity extends BaseMvpActivity private MainTabLayout mMainTabLayout; private AnchorCardView anchorCardView; private View viewClose; - private int mCurrentTabType = MainTabType.TAB_TYPE_HOME; + private int mCurrentTabType = MainTabType.TAB_TYPE_STAR; /** * 房间最小化动画,换成属性动画,原先的补间动画影响了activity的生命周期 */ @@ -158,6 +159,7 @@ public class MainActivity extends BaseMvpActivity private Runnable touchRunnable; { + fragmentArray.put(MainTabType.TAB_TYPE_STAR, new StarFragment()); fragmentArray.put(MainTabType.TAB_TYPE_HOME, new HomeFragment()); fragmentArray.put(MainTabType.TAB_TYPE_MSG, new ContactsListFragment()); fragmentArray.put(MainTabType.TAB_TYPE_ME, new MeFragment()); @@ -345,10 +347,10 @@ public class MainActivity extends BaseMvpActivity userLivingView.setColor(Color.WHITE); mMainTabLayout.setOnTabClickListener(this); anchorCardView = findViewById(R.id.vs_anchor_card); + mMainTabLayout.setDefaultTabType(mCurrentTabType); } private void updateDatas() { - mMainTabLayout.setDefaultTabType(mCurrentTabType); handleNimIntent(); } diff --git a/app/src/main/java/com/chwl/app/home/HomeViewModel.kt b/app/src/main/java/com/chwl/app/home/HomeViewModel.kt index d217945a8..b44afc95b 100644 --- a/app/src/main/java/com/chwl/app/home/HomeViewModel.kt +++ b/app/src/main/java/com/chwl/app/home/HomeViewModel.kt @@ -229,7 +229,16 @@ class HomeViewModel : BaseViewModel() { }, block = { val result = HomeModel.getHotRoom() - _homeHotRoomLiveData.value = ListResult.success(result, 1) + val list = ArrayList() + result?.let { + list.addAll(result) + list.addAll(list) + list.addAll(list) + list.addAll(list) + list.addAll(list) + list.addAll(list) + } + _homeHotRoomLiveData.value = ListResult.success(list, 1) } ) } diff --git a/app/src/main/java/com/chwl/app/home/fragment/ContactsListFragment.kt b/app/src/main/java/com/chwl/app/home/fragment/ContactsListFragment.kt index df5f17fed..008bf68ef 100644 --- a/app/src/main/java/com/chwl/app/home/fragment/ContactsListFragment.kt +++ b/app/src/main/java/com/chwl/app/home/fragment/ContactsListFragment.kt @@ -41,22 +41,6 @@ class ContactsListFragment : BaseViewBindingFragment private var pagerAdapter: UserInfoPagerAdapter? = null override fun init() { -// //标记已读消息 -// binding.ivContactTrash.setOnClickListener { -// if (NIMClient.getService(MsgService::class.java).totalUnreadCount > 0) { -// dialogManager.showOkCancelDialog(getString(R.string.tips_clear_unread_count), -// getString(R.string.text_canle), getString(R.string.tips_ok_label_clear), -// object : AbsOkDialogListener() { -// override fun onOk() {} -// override fun onCancel() { -// EventBus.getDefault().post(ContactTrashEvent()) -// } -// }) -// } else { -// toast(ResUtil.getString(R.string.home_fragment_contactslistfragment_01)) -// } -// } - initViewPager() } diff --git a/app/src/main/java/com/chwl/app/star/StarFragment.kt b/app/src/main/java/com/chwl/app/star/StarFragment.kt new file mode 100644 index 000000000..d573aa4b0 --- /dev/null +++ b/app/src/main/java/com/chwl/app/star/StarFragment.kt @@ -0,0 +1,9 @@ +package com.chwl.app.star + +import com.chwl.app.base.BaseViewBindingFragment +import com.chwl.app.databinding.StarFragmentBinding + +class StarFragment : BaseViewBindingFragment() { + override fun init() { + } +} \ No newline at end of file diff --git a/app/src/main/java/com/chwl/app/ui/widget/MainRedPointTab.java b/app/src/main/java/com/chwl/app/ui/widget/MainRedPointTab.java index 6979297aa..9dc869080 100644 --- a/app/src/main/java/com/chwl/app/ui/widget/MainRedPointTab.java +++ b/app/src/main/java/com/chwl/app/ui/widget/MainRedPointTab.java @@ -137,13 +137,12 @@ public class MainRedPointTab extends RelativeLayout { } private int getDefaultRes(int tabType, boolean select) { - int resId = select ? R.drawable.ic_main_tab_game_pressed : R.drawable.ic_main_tab_game_home; + int resId = select ? R.drawable.ic_main_tab_home_pressed : R.drawable.ic_main_tab_home; switch (tabType) { case MainTabType.TAB_TYPE_SQUARE: - 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; + case MainTabType.TAB_TYPE_STAR: + resId = select ? R.drawable.ic_main_tab_star_pressed : R.drawable.ic_main_tab_star; break; case MainTabType.TAB_TYPE_MSG: resId = select ? R.drawable.ic_main_tab_msg_pressed : R.drawable.ic_main_tab_msg; diff --git a/app/src/main/java/com/chwl/app/ui/widget/MainTab.java b/app/src/main/java/com/chwl/app/ui/widget/MainTab.java index b522baf1f..e717e4144 100644 --- a/app/src/main/java/com/chwl/app/ui/widget/MainTab.java +++ b/app/src/main/java/com/chwl/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.drawable.ic_main_tab_game_home); - mTabIconSelect = typedArray.getResourceId(R.styleable.MainTab_tab_icon_select, R.drawable.ic_main_tab_game_pressed); + mTabIcon = typedArray.getResourceId(R.styleable.MainTab_tab_icon, R.drawable.ic_main_tab_home); + mTabIconSelect = typedArray.getResourceId(R.styleable.MainTab_tab_icon_select, R.drawable.ic_main_tab_home_pressed); mTabtextColor = typedArray.getColor(R.styleable.MainTab_tab_text_color, DEFAULT_COLOR); mTabTextSelectColor = typedArray.getColor(R.styleable.MainTab_tab_text_color_select, DEFAULT_COLOR); diff --git a/app/src/main/java/com/chwl/app/ui/widget/MainTabLayout.java b/app/src/main/java/com/chwl/app/ui/widget/MainTabLayout.java index 346f385ae..8228be4a8 100644 --- a/app/src/main/java/com/chwl/app/ui/widget/MainTabLayout.java +++ b/app/src/main/java/com/chwl/app/ui/widget/MainTabLayout.java @@ -26,7 +26,7 @@ public class MainTabLayout extends LinearLayout implements View.OnClickListener private final List tabViewList = new ArrayList<>(5); private MainRedPointTab homeTab; private MainRedPointTab squareTab; - private MainRedPointTab gameTab; + private MainRedPointTab starTab; private MainRedPointTab msgTab; private MainRedPointTab meTab; private int mLastPosition = -1; @@ -58,19 +58,19 @@ public class MainTabLayout extends LinearLayout implements View.OnClickListener squareTab = findViewById(R.id.main_square_tab); msgTab = findViewById(R.id.main_msg_tab); - gameTab = findViewById(R.id.main_game_tab); + starTab = findViewById(R.id.main_star_tab); homeTab = findViewById(R.id.main_home_tab); meTab = findViewById(R.id.main_me_tab); homeTab.setOnClickListener(this); meTab.setOnClickListener(this); - gameTab.setOnClickListener(this); + starTab.setOnClickListener(this); squareTab.setOnClickListener(this); msgTab.setOnClickListener(this); tabViewList.add(homeTab); tabViewList.add(squareTab); - tabViewList.add(gameTab); + tabViewList.add(starTab); tabViewList.add(msgTab); tabViewList.add(meTab); } @@ -107,19 +107,19 @@ public class MainTabLayout extends LinearLayout implements View.OnClickListener if (ListUtils.isListEmpty(mainTabInfoList)) return; switch (v.getId()) { case R.id.main_home_tab: - select(mainTabInfoList.get(0).getTabType()); + select(MainTabType.TAB_TYPE_HOME); break; case R.id.main_square_tab: - select(mainTabInfoList.get(1).getTabType()); + select(MainTabType.TAB_TYPE_SQUARE); break; - case R.id.main_game_tab: - select(mainTabInfoList.get(2).getTabType()); + case R.id.main_star_tab: + select(MainTabType.TAB_TYPE_STAR); break; case R.id.main_msg_tab: - select(mainTabInfoList.get(3).getTabType()); + select(MainTabType.TAB_TYPE_MSG); break; case R.id.main_me_tab: - select(mainTabInfoList.get(4).getTabType()); + select(MainTabType.TAB_TYPE_ME); break; } } @@ -129,7 +129,7 @@ public class MainTabLayout extends LinearLayout implements View.OnClickListener if (mLastPosition == tabType) return; squareTab.select(tabType == MainTabType.TAB_TYPE_SQUARE); msgTab.select(tabType == MainTabType.TAB_TYPE_MSG); - gameTab.select(tabType == MainTabType.TAB_TYPE_GAME); + starTab.select(tabType == MainTabType.TAB_TYPE_STAR); homeTab.select(tabType == MainTabType.TAB_TYPE_HOME); meTab.select(tabType == MainTabType.TAB_TYPE_ME); if (mOnTabClickListener != null) { diff --git a/app/src/main/res/drawable-xxhdpi/ic_main_tab_find.webp b/app/src/main/res/drawable-xxhdpi/ic_main_tab_find.webp deleted file mode 100644 index 85d4d46c8..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_main_tab_find.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_main_tab_find_pressed.webp b/app/src/main/res/drawable-xxhdpi/ic_main_tab_find_pressed.webp deleted file mode 100644 index 7f2782705..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_main_tab_find_pressed.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_main_tab_game_home.webp b/app/src/main/res/drawable-xxhdpi/ic_main_tab_game_home.webp deleted file mode 100644 index dccc6495a..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_main_tab_game_home.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_main_tab_game_pressed.webp b/app/src/main/res/drawable-xxhdpi/ic_main_tab_game_pressed.webp deleted file mode 100644 index 32d5d3e1a..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_main_tab_game_pressed.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_main_tab_home.png b/app/src/main/res/drawable-xxhdpi/ic_main_tab_home.png new file mode 100644 index 000000000..3193a934d Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_main_tab_home.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_main_tab_home_pressed.png b/app/src/main/res/drawable-xxhdpi/ic_main_tab_home_pressed.png new file mode 100644 index 000000000..474fa983d Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_main_tab_home_pressed.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_main_tab_me.png b/app/src/main/res/drawable-xxhdpi/ic_main_tab_me.png new file mode 100644 index 000000000..a0930daaa Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_main_tab_me.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_main_tab_me.webp b/app/src/main/res/drawable-xxhdpi/ic_main_tab_me.webp deleted file mode 100644 index 96f1db4b4..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_main_tab_me.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_main_tab_me_pressed.png b/app/src/main/res/drawable-xxhdpi/ic_main_tab_me_pressed.png new file mode 100644 index 000000000..c5ba23a5e Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_main_tab_me_pressed.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_main_tab_me_pressed.webp b/app/src/main/res/drawable-xxhdpi/ic_main_tab_me_pressed.webp deleted file mode 100644 index d99bfd75c..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_main_tab_me_pressed.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_main_tab_msg.png b/app/src/main/res/drawable-xxhdpi/ic_main_tab_msg.png new file mode 100644 index 000000000..84ca95718 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_main_tab_msg.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_main_tab_msg.webp b/app/src/main/res/drawable-xxhdpi/ic_main_tab_msg.webp deleted file mode 100644 index df67a7a3a..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_main_tab_msg.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_main_tab_msg_pressed.png b/app/src/main/res/drawable-xxhdpi/ic_main_tab_msg_pressed.png new file mode 100644 index 000000000..8af04dd8b Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_main_tab_msg_pressed.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_main_tab_msg_pressed.webp b/app/src/main/res/drawable-xxhdpi/ic_main_tab_msg_pressed.webp deleted file mode 100644 index c34211c68..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_main_tab_msg_pressed.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_main_tab_star.png b/app/src/main/res/drawable-xxhdpi/ic_main_tab_star.png new file mode 100644 index 000000000..b542d16b2 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_main_tab_star.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_main_tab_star_pressed.png b/app/src/main/res/drawable-xxhdpi/ic_main_tab_star_pressed.png new file mode 100644 index 000000000..4bf0f1242 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_main_tab_star_pressed.png differ diff --git a/app/src/main/res/drawable/shape_white_top_24dp.xml b/app/src/main/res/drawable/shape_white_top_24dp.xml new file mode 100644 index 000000000..04c69035f --- /dev/null +++ b/app/src/main/res/drawable/shape_white_top_24dp.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index b816132e4..73a1c412a 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -10,32 +10,32 @@ android:id="@+id/main_fragment" android:layout_width="match_parent" android:layout_height="0dp" - app:layout_constraintBottom_toTopOf="@id/view_bottom" + android:layout_marginBottom="@dimen/main_bottom_bar_top_height" + app:layout_constraintBottom_toTopOf="@id/layout_bottom" app:layout_constraintTop_toTopOf="parent" /> - - - + app:layout_constraintStart_toStartOf="parent"> + + + + + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:src="@drawable/default_avatar" /> + app:layout_constraintStart_toStartOf="@+id/avatar_image" + app:layout_constraintTop_toTopOf="@+id/avatar_image" /> diff --git a/app/src/main/res/layout/fragment_contact_list.xml b/app/src/main/res/layout/fragment_contact_list.xml index db3261781..5daf0c2c3 100644 --- a/app/src/main/res/layout/fragment_contact_list.xml +++ b/app/src/main/res/layout/fragment_contact_list.xml @@ -1,8 +1,8 @@ - - - - - - - - - - - - - - - + android:layout_marginTop="@dimen/dp_15" + android:layout_marginBottom="@dimen/main_bottom_bar_top_margin" + android:background="@drawable/shape_white_top_12dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toBottomOf="@+id/ll_title" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 3fb1d7aa1..e50508ab6 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -69,6 +69,7 @@ android:id="@+id/frameLayout" android:layout_width="match_parent" android:layout_height="0dp" + android:layout_marginBottom="@dimen/main_bottom_bar_top_margin" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@id/iv_indicator" /> diff --git a/app/src/main/res/layout/fragment_recent_list.xml b/app/src/main/res/layout/fragment_recent_list.xml index 987cdd51b..f31b662c5 100644 --- a/app/src/main/res/layout/fragment_recent_list.xml +++ b/app/src/main/res/layout/fragment_recent_list.xml @@ -9,7 +9,5 @@ + android:layout_height="match_parent"/> \ No newline at end of file diff --git a/app/src/main/res/layout/main_tab_layout.xml b/app/src/main/res/layout/main_tab_layout.xml index eefb2627f..7cc744544 100644 --- a/app/src/main/res/layout/main_tab_layout.xml +++ b/app/src/main/res/layout/main_tab_layout.xml @@ -2,31 +2,29 @@ + + - - @@ -34,14 +32,14 @@ android:id="@+id/main_msg_tab" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_gravity="bottom" + android:layout_gravity="center_vertical" android:layout_weight="1" /> \ No newline at end of file diff --git a/app/src/main/res/layout/maint_tab_red_poin_layout.xml b/app/src/main/res/layout/maint_tab_red_poin_layout.xml index b7f3569ca..91f7e6a76 100644 --- a/app/src/main/res/layout/maint_tab_red_poin_layout.xml +++ b/app/src/main/res/layout/maint_tab_red_poin_layout.xml @@ -2,7 +2,7 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-xhdpi/ic_main_tab_peace.webp b/app/src/main/res/mipmap-xhdpi/ic_main_tab_peace.webp deleted file mode 100644 index cea359182..000000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_main_tab_peace.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_main_tab_peace_pressed.webp b/app/src/main/res/mipmap-xhdpi/ic_main_tab_peace_pressed.webp deleted file mode 100644 index 98ab8e943..000000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_main_tab_peace_pressed.webp and /dev/null differ diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 56ade6102..ef4c13e5a 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -6,8 +6,10 @@ 17sp + + -24dp + 27dp - 18sp diff --git a/core/src/main/java/com/chwl/core/home/bean/MainTabType.java b/core/src/main/java/com/chwl/core/home/bean/MainTabType.java index 402924525..ea432b145 100644 --- a/core/src/main/java/com/chwl/core/home/bean/MainTabType.java +++ b/core/src/main/java/com/chwl/core/home/bean/MainTabType.java @@ -4,7 +4,7 @@ public interface MainTabType { //tabType(1-派对,2-广场,3-赛事,4-消息,5-我的) int TAB_TYPE_HOME = 1; int TAB_TYPE_SQUARE = 2; - int TAB_TYPE_GAME = 3; int TAB_TYPE_MSG = 4; int TAB_TYPE_ME = 5; + int TAB_TYPE_STAR = 6; } diff --git a/core/src/main/java/com/chwl/core/initial/InitialModel.java b/core/src/main/java/com/chwl/core/initial/InitialModel.java index 9b5b4e7d3..e12debe92 100644 --- a/core/src/main/java/com/chwl/core/initial/InitialModel.java +++ b/core/src/main/java/com/chwl/core/initial/InitialModel.java @@ -436,6 +436,13 @@ public class InitialModel extends BaseModel implements IInitialModel { private List getDefaultMainTab() { return new ArrayList<>(Arrays.asList( + new MainTabInfo( + "", + "", + "", + MainTabType.TAB_TYPE_STAR, + null + ), new MainTabInfo( "", "", @@ -450,13 +457,6 @@ public class InitialModel extends BaseModel implements IInitialModel { MainTabType.TAB_TYPE_SQUARE, null ), - new MainTabInfo( - "", - "", - ResUtil.getString(R.string.xchat_android_core_initial_initialmodel_05), - MainTabType.TAB_TYPE_GAME, - null - ), new MainTabInfo( "", "",