From aa190ac0cd3bc93b5141cd0b30b53d1ce0184795 Mon Sep 17 00:00:00 2001 From: pqaikc Date: Fri, 29 May 2020 10:56:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ccb/arcselect/ui/ArcSelectActivity.java | 10 ++++++++-- .../com/ccb/arcselect/ui/ArcSelectRotateActivity.java | 10 ++++++++-- .../com/ccb/arcselect/ui/HorizontalSelectActivity.java | 10 ++++++++-- app/src/main/res/drawable/text_background.xml | 4 ++-- app/src/main/res/layout/item_arc.xml | 7 +++---- app/src/main/res/layout/item_auto_select_h.xml | 7 +++---- app/src/main/res/layout/item_pading.xml | 5 ++--- app/src/main/res/values/colors.xml | 3 ++- 8 files changed, 36 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/com/ccb/arcselect/ui/ArcSelectActivity.java b/app/src/main/java/com/ccb/arcselect/ui/ArcSelectActivity.java index 2e366c8..873e618 100644 --- a/app/src/main/java/com/ccb/arcselect/ui/ArcSelectActivity.java +++ b/app/src/main/java/com/ccb/arcselect/ui/ArcSelectActivity.java @@ -7,6 +7,7 @@ import androidx.recyclerview.widget.RecyclerView; import android.os.Build; import android.os.Bundle; +import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; import android.view.MotionEvent; @@ -192,9 +193,14 @@ public class ArcSelectActivity extends AppCompatActivity { if (selectPosition == position) { vh.tv.setTextColor(getResources().getColor(R.color.textSelect)); } else { - vh.tv.setTextColor(getResources().getColor(R.color.colorText)); + vh.tv.setTextColor(getResources().getColor(R.color.white)); + } + if (TextUtils.isEmpty(mDatas.get(position))){ + vh.itemView.setVisibility(View.INVISIBLE); + }else { + vh.itemView.setVisibility(View.VISIBLE); + vh.tv.setText(mDatas.get(position)); } - vh.tv.setText(mDatas.get(position)); final int fp = position; vh.itemView.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/ccb/arcselect/ui/ArcSelectRotateActivity.java b/app/src/main/java/com/ccb/arcselect/ui/ArcSelectRotateActivity.java index caf06f2..be81a82 100644 --- a/app/src/main/java/com/ccb/arcselect/ui/ArcSelectRotateActivity.java +++ b/app/src/main/java/com/ccb/arcselect/ui/ArcSelectRotateActivity.java @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView; import android.animation.ObjectAnimator; import android.os.Build; import android.os.Bundle; +import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; import android.view.MotionEvent; @@ -231,9 +232,14 @@ public class ArcSelectRotateActivity extends AppCompatActivity { if (selectPosition == position) { vh.tv.setTextColor(getResources().getColor(R.color.textSelect)); } else { - vh.tv.setTextColor(getResources().getColor(R.color.colorText)); + vh.tv.setTextColor(getResources().getColor(R.color.white)); + } + if (TextUtils.isEmpty(mDatas.get(position))){ + vh.itemView.setVisibility(View.INVISIBLE); + }else { + vh.itemView.setVisibility(View.VISIBLE); + vh.tv.setText(mDatas.get(position)); } - vh.tv.setText(mDatas.get(position)); final int fp = position; vh.itemView.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/com/ccb/arcselect/ui/HorizontalSelectActivity.java b/app/src/main/java/com/ccb/arcselect/ui/HorizontalSelectActivity.java index 49afbc5..f7dc580 100644 --- a/app/src/main/java/com/ccb/arcselect/ui/HorizontalSelectActivity.java +++ b/app/src/main/java/com/ccb/arcselect/ui/HorizontalSelectActivity.java @@ -2,6 +2,7 @@ package com.ccb.arcselect.ui; import android.os.Build; import android.os.Bundle; +import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; import android.view.MotionEvent; @@ -189,9 +190,14 @@ private final int CHILDVIEWSIZE = 100; if (selectPosition == position) { vh.tv.setTextColor(getResources().getColor(R.color.textSelect)); } else { - vh.tv.setTextColor(getResources().getColor(R.color.colorText)); + vh.tv.setTextColor(getResources().getColor(R.color.white)); + } + if (TextUtils.isEmpty(mDatas.get(position))){ + vh.itemView.setVisibility(View.INVISIBLE); + }else { + vh.itemView.setVisibility(View.VISIBLE); + vh.tv.setText(mDatas.get(position)); } - vh.tv.setText(mDatas.get(position)); final int fp = position; vh.itemView.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/res/drawable/text_background.xml b/app/src/main/res/drawable/text_background.xml index 2ba91e7..cf4eb30 100644 --- a/app/src/main/res/drawable/text_background.xml +++ b/app/src/main/res/drawable/text_background.xml @@ -3,8 +3,8 @@ - \ No newline at end of file diff --git a/app/src/main/res/layout/item_arc.xml b/app/src/main/res/layout/item_arc.xml index 832270a..b37ec3a 100644 --- a/app/src/main/res/layout/item_arc.xml +++ b/app/src/main/res/layout/item_arc.xml @@ -13,11 +13,10 @@ android:layout_height="wrap_content" tools:text="你好" android:id="@+id/tv" - android:paddingStart="110dp" - android:paddingEnd="0dp" + android:layout_marginLeft="110dp" android:textColor="#222" - android:textSize="22sp" - android:textStyle="bold" + android:textSize="18sp" + android:background="@drawable/text_background" /> diff --git a/app/src/main/res/layout/item_auto_select_h.xml b/app/src/main/res/layout/item_auto_select_h.xml index b9a3ff4..0d22830 100644 --- a/app/src/main/res/layout/item_auto_select_h.xml +++ b/app/src/main/res/layout/item_auto_select_h.xml @@ -11,10 +11,9 @@ android:layout_height="wrap_content" tools:text="你好" android:id="@+id/tv" - android:paddingEnd="0dp" - android:textColor="#222" - android:textSize="20sp" - android:textStyle="bold" + android:textColor="#fff" + android:textSize="17sp" + android:background="@drawable/text_background" /> diff --git a/app/src/main/res/layout/item_pading.xml b/app/src/main/res/layout/item_pading.xml index 1769970..54391d5 100644 --- a/app/src/main/res/layout/item_pading.xml +++ b/app/src/main/res/layout/item_pading.xml @@ -9,9 +9,8 @@ android:text="你好" android:layout_centerVertical="true" android:id="@+id/tv" - android:textColor="#222" - android:textSize="22dp" - android:textStyle="bold" + android:textColor="#fff" + android:textSize="18dp" android:background="@drawable/text_background" /> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 88bf921..b9195f7 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -4,6 +4,7 @@ #00574B #D81B60 #222222 + #ffffff #FD3535 - #88FD7777 + #11B898 -- GitLab