提交 aa190ac0 编写于 作者: P pqaikc

样式调整

上级 130cfb54
...@@ -7,6 +7,7 @@ import androidx.recyclerview.widget.RecyclerView; ...@@ -7,6 +7,7 @@ import androidx.recyclerview.widget.RecyclerView;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MotionEvent; import android.view.MotionEvent;
...@@ -192,9 +193,14 @@ public class ArcSelectActivity extends AppCompatActivity { ...@@ -192,9 +193,14 @@ public class ArcSelectActivity extends AppCompatActivity {
if (selectPosition == position) { if (selectPosition == position) {
vh.tv.setTextColor(getResources().getColor(R.color.textSelect)); vh.tv.setTextColor(getResources().getColor(R.color.textSelect));
} else { } 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; final int fp = position;
vh.itemView.setOnClickListener(new View.OnClickListener() { vh.itemView.setOnClickListener(new View.OnClickListener() {
@Override @Override
......
...@@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView; ...@@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView;
import android.animation.ObjectAnimator; import android.animation.ObjectAnimator;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MotionEvent; import android.view.MotionEvent;
...@@ -231,9 +232,14 @@ public class ArcSelectRotateActivity extends AppCompatActivity { ...@@ -231,9 +232,14 @@ public class ArcSelectRotateActivity extends AppCompatActivity {
if (selectPosition == position) { if (selectPosition == position) {
vh.tv.setTextColor(getResources().getColor(R.color.textSelect)); vh.tv.setTextColor(getResources().getColor(R.color.textSelect));
} else { } 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; final int fp = position;
vh.itemView.setOnClickListener(new View.OnClickListener() { vh.itemView.setOnClickListener(new View.OnClickListener() {
@Override @Override
......
...@@ -2,6 +2,7 @@ package com.ccb.arcselect.ui; ...@@ -2,6 +2,7 @@ package com.ccb.arcselect.ui;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MotionEvent; import android.view.MotionEvent;
...@@ -189,9 +190,14 @@ private final int CHILDVIEWSIZE = 100; ...@@ -189,9 +190,14 @@ private final int CHILDVIEWSIZE = 100;
if (selectPosition == position) { if (selectPosition == position) {
vh.tv.setTextColor(getResources().getColor(R.color.textSelect)); vh.tv.setTextColor(getResources().getColor(R.color.textSelect));
} else { } 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; final int fp = position;
vh.itemView.setOnClickListener(new View.OnClickListener() { vh.itemView.setOnClickListener(new View.OnClickListener() {
@Override @Override
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<corners android:radius="8dp"/> <corners android:radius="8dp"/>
<solid android:color="@color/textback"/> <solid android:color="@color/textback"/>
<padding android:right="5dp" <padding android:right="10dp"
android:left="5dp" android:left="10dp"
android:top="5dp" android:top="5dp"
android:bottom="5dp"/> android:bottom="5dp"/>
</shape> </shape>
\ No newline at end of file
...@@ -13,11 +13,10 @@ ...@@ -13,11 +13,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
tools:text="你好" tools:text="你好"
android:id="@+id/tv" android:id="@+id/tv"
android:paddingStart="110dp" android:layout_marginLeft="110dp"
android:paddingEnd="0dp"
android:textColor="#222" android:textColor="#222"
android:textSize="22sp" android:textSize="18sp"
android:textStyle="bold" android:background="@drawable/text_background"
/> />
</RelativeLayout> </RelativeLayout>
......
...@@ -11,10 +11,9 @@ ...@@ -11,10 +11,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
tools:text="你好" tools:text="你好"
android:id="@+id/tv" android:id="@+id/tv"
android:paddingEnd="0dp" android:textColor="#fff"
android:textColor="#222" android:textSize="17sp"
android:textSize="20sp" android:background="@drawable/text_background"
android:textStyle="bold"
/> />
</RelativeLayout> </RelativeLayout>
...@@ -9,9 +9,8 @@ ...@@ -9,9 +9,8 @@
android:text="你好" android:text="你好"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:id="@+id/tv" android:id="@+id/tv"
android:textColor="#222" android:textColor="#fff"
android:textSize="22dp" android:textSize="18dp"
android:textStyle="bold"
android:background="@drawable/text_background" android:background="@drawable/text_background"
/> />
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<color name="colorPrimaryDark">#00574B</color> <color name="colorPrimaryDark">#00574B</color>
<color name="colorAccent">#D81B60</color> <color name="colorAccent">#D81B60</color>
<color name="colorText">#222222</color> <color name="colorText">#222222</color>
<color name="white">#ffffff</color>
<color name="textSelect">#FD3535</color> <color name="textSelect">#FD3535</color>
<color name="textback">#88FD7777</color> <color name="textback">#11B898</color>
</resources> </resources>
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册