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

Merge branch 'dev' of gitlab.ghzhushou.com:halo/assistant-android into dev

Browse Source 
# Conflicts:
#	app/src/main/res/layout/game_horizontal_list.xml
This commit is contained in:
kehaoyuan
2018-06-28 15:50:01 +08:00
parent 33454005c3 37b6e6bce0
commit 76ea9a4ba4
5 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/gh/common/view/NestedRecyclerView.kt
View File

@ -1,6 +1,7 @@
package com.gh.common.view
import android.content.Context
import android.os.Build
import android.support.v4.view.NestedScrollingParent
import android.support.v7.widget.RecyclerView
import android.util.AttributeSet
@ -84,7 +85,9 @@ open class NestedRecyclerView : RecyclerView, NestedScrollingParent {
nestedScrollTargetWasUnableToScroll = false
}
super.onNestedScrollAccepted(child, target, axes)
if (Build.VERSION.SDK_INT >= 21) {
super.onNestedScrollAccepted(child, target, axes)
}
}

2
app/src/main/java/com/gh/gamecenter/category/CategoryDirectoryAdapter.kt
View File

@ -55,7 +55,7 @@ class CategoryDirectoryAdapter(context: Context, var categoryTitle: String) : Li
unexpandableCategoryList.forEachIndexed({ index, c ->
when (index % 3) {
0 -> {
val params = LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.MATCH_PARENT)
val params = LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT)
if (subCategoryView != null) params.setMargins(0, marginTop, 0, 0)
subCategoryView = SubCategoryView(binding.root.context)

4
app/src/main/res/layout/game_horizontal_list.xml
View File

@ -9,7 +9,9 @@
<android.support.v7.widget.RecyclerView
android:id = "@+id/horizontal_rv"
android:layout_width = "match_parent"
android:layout_height = "wrap_content" />
android:layout_height = "wrap_content"
android:paddingLeft = "5dp"
android:paddingRight = "5dp"/>
</android.support.constraint.ConstraintLayout >

4
app/src/main/res/layout/item_category.xml
View File

@ -56,7 +56,7 @@
<LinearLayout
android:id="@+id/container_sub_category"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_toRightOf="@id/container_primary_category"
android:gravity="center_vertical"
@ -64,7 +64,7 @@
<LinearLayout
android:id="@+id/container_unexpandable"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" />

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

@ -1,13 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_left_sub_category"
android:layout_width="85dp"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:gravity="center"
android:textColor="#000000"
@ -24,7 +25,8 @@
<TextView
android:id="@+id/tv_center_sub_category"
android:layout_width="85dp"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:gravity="center"
android:textColor="#000000"
@ -41,7 +43,8 @@
<TextView
android:id="@+id/tv_right_sub_category"
android:layout_width="85dp"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:gravity="center"
android:textColor="#000000"