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

Merge remote-tracking branch 'origin/dev-4.9.0' into dev-4.9.0

Browse Source
This commit is contained in:
juntao
2021-04-26 16:20:37 +08:00
parent 8a98d6323a 1b67ff5d12
commit ea388a8e1b
4 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt
View File

@ -308,7 +308,7 @@ class UserHomeFragment : NormalFragment() {
?: UserVideoHistoryFragment.getInstance(mUserHomeViewModel.userId, count)
val fragmentList = listOf(commentFragment, qaFragment, videoFragment)
val titleList = listOf("游戏评论", "我的论坛", "视频")
val titleList = listOf("游戏评论", "论坛", "视频")
val countList = listOf(count.gameComment, count.getQaCount(), count.video)
viewpager.offscreenPageLimit = fragmentList.size

2
app/src/main/java/com/gh/gamecenter/personalhome/home/UserCommentHistoryFragment.kt
View File

@ -101,7 +101,7 @@ class UserCommentHistoryFragment : ListFragment<UserCommentHistoryItemData, User
sizeTv.setTextColor(R.color.theme_font.toColor())
sizeTv.setBackgroundResource(R.drawable.button_round_ebf5ff)
} else {
sizeTv.setTextColor(R.color.text_999999.toColor())
sizeTv.setTextColor(R.color.text_333333.toColor())
sizeTv.setBackgroundResource(R.drawable.button_round_f5f5f5)
}
}

37
app/src/main/res/layout/fragment_home.xml
View File

@ -79,7 +79,7 @@
android:id="@+id/user_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="192dp"
android:layout_marginBottom="182dp"
app:avatar_width="64dp"
app:badge_width="18dp"
app:layout_constraintLeft_toLeftOf="parent"
@ -107,8 +107,8 @@
android:id="@+id/user_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="92dp"
android:layout_marginLeft="16dp"
android:layout_marginBottom="180dp"
android:clickable="true"
android:focusable="true"
android:includeFontPadding="false"
@ -118,17 +118,17 @@
android:textSize="16sp"
tools:text="我的名字很长的哟"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintBottom_toBottomOf="@+id/user_background_container" />
app:layout_constraintTop_toTopOf="@+id/user_icon" />
<LinearLayout
android:id="@+id/regulation_and_badge_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginBottom="154dp"
android:layout_marginTop="12dp"
android:orientation="horizontal"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintBottom_toBottomOf="@+id/user_background_container">
app:layout_constraintTop_toBottomOf="@+id/user_name">
<LinearLayout
tools:visibility="visible"
@ -246,11 +246,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginBottom="130dp"
android:layout_marginTop="12dp"
android:gravity="center_vertical"
android:orientation="horizontal"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintBottom_toBottomOf="@+id/user_background_container">
app:layout_constraintTop_toBottomOf="@+id/regulation_and_badge_container">
<ImageView
android:layout_width="12dp"
@ -273,7 +273,7 @@
android:id="@+id/user_introduce"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="66dp"
android:layout_marginTop="16dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:includeFontPadding="false"
@ -285,14 +285,15 @@
android:text='@{TextUtils.isEmpty(entity.introduce)?"这是一个很神秘的崽~":entity.introduce}'
tools:text="这是我的个性签名呀欢迎大家来撩，特别长的签名，很长很长,这是我的个性签名呀欢迎大家来撩，特别长的签名，很长很长,这是我的个性签名呀欢迎大家来撩，特别长的签名，很长很长这是我的个性签名呀欢迎大家来撩，特别长的签名，很长很长这是我的个性签名呀欢迎大家来撩，特别长的签名，很长很长这是我的个性签名呀欢迎大家来撩，特别长的签名，很长很长"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/user_name" />
app:layout_constraintTop_toBottomOf="@+id/auth_container" />
<RelativeLayout
tools:visibility="visible"
android:visibility="gone"
android:id="@+id/recent_visit_container"
android:layout_width="80dp"
android:layout_height="42dp"
android:paddingLeft="12dp"
android:paddingLeft="14dp"
android:clickable="true"
android:focusable="true"
android:background="@drawable/bg_recent_visit"
@ -317,7 +318,7 @@
android:layout_width="12dp"
android:layout_height="12dp"
android:layout_marginTop="8dp"
android:layout_marginLeft="4dp"
android:layout_marginLeft="8dp"
style="@style/frescoCircleStyle"
imageUrl="@{entity.lastVisitor.icon}" />
@ -328,7 +329,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginLeft="4dp"
android:layout_marginLeft="8dp"
android:includeFontPadding="false"
android:textColor="@color/white"
android:textSize="10sp"
@ -365,10 +366,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginBottom="48dp"
android:layout_marginTop="24dp"
android:orientation="horizontal"
android:gravity="center_vertical"
app:layout_constraintBottom_toBottomOf="@+id/user_background_container"
app:layout_constraintTop_toBottomOf="@+id/user_introduce"
app:layout_constraintLeft_toLeftOf="parent">
<LinearLayout
@ -554,7 +555,7 @@
android:layout_marginTop="16dp"
android:text="玩过的游戏"
android:textColor="@color/text_333333"
android:textSize="14sp"
android:textSize="16sp"
android:textStyle="bold"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@ -564,7 +565,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="15dp"
android:text="查看更多 >"
android:text="更多 >"
android:textColor="@color/text_999999"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="@id/playedGameTitleTv"
@ -576,7 +577,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipToPadding="false"
android:paddingLeft="18dp"
android:paddingLeft="16dp"
android:paddingTop="16dp"
android:paddingBottom="16dp"
app:layout_constraintTop_toBottomOf="@id/playedGameTitleTv" />
@ -699,7 +700,7 @@
<com.google.android.material.tabs.TabLayout
android:id="@+id/tabLayout"
android:layout_width="match_parent"
android:layout_height="38dp"
android:layout_height="42dp"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:tabTextAppearance="@style/TabLayoutTextAppearance" />

15
app/src/main/res/layout/fragment_user_comment_history.xml
View File

@ -16,7 +16,7 @@
<TextView
android:id="@+id/allType"
android:layout_width="48dp"
android:layout_height="24dp"
android:layout_height="28dp"
android:gravity="center"
android:background="@drawable/button_round_ebf5ff"
android:textColor="@color/theme_font"
@ -26,27 +26,27 @@
<TextView
android:id="@+id/excellentType"
android:layout_width="48dp"
android:layout_height="24dp"
android:layout_height="28dp"
android:layout_marginLeft="8dp"
android:gravity="center"
android:background="@drawable/button_round_f5f5f5"
android:textColor="@color/text_999999"
android:textColor="@color/text_333333"
android:textSize="12sp"
android:text="精彩" />
<TextView
android:id="@+id/anliType"
android:layout_width="60dp"
android:layout_height="24dp"
android:layout_height="28dp"
android:layout_marginLeft="8dp"
android:gravity="center"
android:background="@drawable/button_round_f5f5f5"
android:textColor="@color/text_999999"
android:textColor="@color/text_333333"
android:textSize="12sp"
android:text="安利墙" />
</LinearLayout>
<FrameLayout
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/typeContainer">
@ -57,7 +57,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/list_rv"
android:layout_width="match_parent"
@ -74,6 +73,6 @@
<include layout="@layout/reuse_no_connection" />
<include layout="@layout/reuse_none_data" />
</FrameLayout>
</RelativeLayout>
</RelativeLayout>