yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.更多房间UI交互修改

Browse Source 
2.fix PK平局可以点击到切换查看对方队伍按钮的 bug
This commit is contained in:
huangjian
2020-12-22 15:39:45 +08:00
parent 7fb16e468f
commit ac10029d92
4 changed files with 55 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/yizhuan/erban/home/activity/HomeMoreRoomActivity.java
View File

@@ -301,6 +301,7 @@ public class HomeMoreRoomActivity extends BaseMvpActivity<IMainFragmentView, Mai
CommonNavigator commonNavigator = new CommonNavigator(HomeMoreRoomActivity.this);
MainMagicIndicatorAdapter magicIndicatorAdapter = new MainMagicIndicatorAdapter(HomeMoreRoomActivity.this, mTabInfoList, true);
magicIndicatorAdapter.setOnItemSelectListener(this);
commonNavigator.setTitleWrapContent(true);
commonNavigator.setAdapter(magicIndicatorAdapter);
magicIndicator.setNavigator(commonNavigator);
commonNavigator.getTitleContainer().setShowDividers(LinearLayout.SHOW_DIVIDER_MIDDLE);

80
app/src/main/res/layout/activity_home_more_room.xml
View File

@@ -4,8 +4,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_F9F9F9"
android:orientation="vertical"
>
android:orientation="vertical">
<ImageView
android:id="@+id/iv_bg_top"
@@ -20,46 +19,63 @@
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
/>
app:layout_constraintTop_toTopOf="parent" />
<androidx.core.widget.NestedScrollView
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/coordinator_layout"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintTop_toBottomOf="@id/title_bar"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:fillViewport="true"
>
app:layout_constraintTop_toBottomOf="@id/title_bar">
<LinearLayout
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_bar_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:layout_height="wrap_content"
android:background="@color/translucent"
app:elevation="0dp"
app:layout_behavior="com.yizhuan.erban.ui.widget.AppBarLayoutBehavior">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_follow_room"
<com.google.android.material.appbar.CollapsingToolbarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"/>
app:contentScrim="@color/translucent"
app:layout_scrollFlags="scroll|enterAlwaysCollapsed">
<com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator
android:id="@+id/magic_indicator"
android:layout_width="match_parent"
android:layout_height="40dp"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
app:layout_constraintTop_toBottomOf="@id/rv_follow_room"
/>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_follow_room"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15" />
<androidx.viewpager.widget.ViewPager
android:id="@+id/view_pager"
</com.google.android.material.appbar.CollapsingToolbarLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
android:layout_height="wrap_content"
android:background="@color/white"
android:paddingTop="8dp"
android:paddingBottom="3dp">
<com.yizhuan.erban.ui.widget.magicindicator.MagicIndicator
android:id="@+id/magic_indicator"
android:layout_width="match_parent"
android:layout_height="30dp"
android:paddingStart="@dimen/dp_15"
android:paddingEnd="@dimen/dp_15"
app:layout_constraintTop_toBottomOf="@id/rv_follow_room" />
</FrameLayout>
</com.google.android.material.appbar.AppBarLayout>
<androidx.viewpager.widget.ViewPager
android:id="@+id/view_pager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_F9F9F9"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

2
app/src/main/res/layout/dialog_pk_result.xml
View File

@@ -187,7 +187,7 @@
<TextView
android:id="@+id/tv_see_other_team"
android:layout_width="231dp"
android:layout_width="wrap_content"
android:layout_height="30dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="12dp"

11
app/src/main/res/layout/fragment_home_tab_map.xml
View File

@@ -7,17 +7,16 @@
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/swipe_refresh"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:paddingStart="12.5dp"
android:paddingEnd="12.5dp"
android:paddingTop="2dp"
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
android:clipToPadding="false"
android:paddingStart="12.5dp"
android:paddingTop="2dp"
android:paddingEnd="12.5dp" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>