moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:调整负面按钮颜色、补充遗漏的场景换色

Browse Source
This commit is contained in:
Max
2023-11-27 10:22:45 +08:00
parent 5f2dce29e1
commit 780613ee56
11 changed files with 26 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/GradientLinePagerIndicator.java
View File

@@ -15,7 +15,7 @@ public class GradientLinePagerIndicator extends LinePagerIndicator {
@Override
protected void onDraw(Canvas canvas) {
LinearGradient lg = new LinearGradient(getLineRect().left, getLineRect().top, getLineRect().right, getLineRect().bottom, new int[]{0xFF13E2F5, 0xFFCC66FF}, null, LinearGradient.TileMode.CLAMP);
LinearGradient lg = new LinearGradient(getLineRect().left, getLineRect().top, getLineRect().right, getLineRect().bottom, new int[]{0xFFCBFF00, 0xFFCBFF00}, null, LinearGradient.TileMode.CLAMP);
getPaint().setShader(lg);
canvas.drawOval(getLineRect(), getPaint());
}

2
app/src/main/java/com/chwl/app/ui/widget/magicindicator/buildins/commonnavigator/indicators/GradientLineRoundPagerIndicator.java
View File

@@ -20,7 +20,7 @@ public class GradientLineRoundPagerIndicator extends LinePagerIndicator {
@Override
protected void onDraw(Canvas canvas) {
LinearGradient lg = new LinearGradient(getLineRect().left, getLineRect().top, getLineRect().right, getLineRect().bottom, new int[]{0xFF13E2F5, 0xFFCC66FF}, null, LinearGradient.TileMode.CLAMP);
LinearGradient lg = new LinearGradient(getLineRect().left, getLineRect().top, getLineRect().right, getLineRect().bottom, new int[]{0xFFCBFF00, 0xFFCBFF00}, null, LinearGradient.TileMode.CLAMP);
getPaint().setShader(lg);
canvas.drawRoundRect(getLineRect(), UIUtil.dip2px(mContext, 2), UIUtil.dip2px(mContext, 2), getPaint());
}

15
app/src/module_labour_union/res/layout/layout_clan_msg_view_holder.xml
View File

@@ -60,11 +60,10 @@
android:layout_height="24dp"
android:gravity="center"
android:text="@string/lu_reject"
android:textColor="@color/color_B3B3C3"
android:background="@drawable/base_shape_negative_5dp"
android:textColor="@color/white"
android:layout_marginEnd="@dimen/dp_30"
android:textSize="@dimen/sp_14"
app:corner="@dimen/dp_4"
app:solid="@color/color_E6E6F0" />
android:textSize="@dimen/sp_14"/>
<com.coorchice.library.SuperTextView
android:id="@+id/stv_agree"
@@ -72,13 +71,9 @@
android:layout_height="24dp"
android:gravity="center"
android:text="@string/lu_agree"
android:textColor="@color/color_FFFFFF"
android:textColor="@color/base_color_positive_text"
android:textSize="@dimen/sp_14"
app:corner="@dimen/dp_4"
app:shaderMode="leftToRight"
app:shaderEnable="true"
app:shaderStartColor="@color/color_13E2F5"
app:shaderEndColor="@color/color_CC66FF"/>
android:background="@drawable/base_shape_positive_5dp"/>
</LinearLayout>

2
library/src/module_easypermission/res/drawable/bg_common_cancel.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#1E1E1F" />
<corners android:radius="30dp" />
<solid android:color="#E6E6F0" />
</shape>

10
library/src/module_easypermission/res/drawable/bg_common_confirm_normal.xml
View File

@@ -1,14 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:angle="180"
android:endColor="#13E2F5"
android:centerColor="#9DB4FF"
android:startColor="#CC67FF"
android:type="linear"
android:useLevel="true" />
<solid android:color="#CBFF00" />
<corners android:radius="30dp" />
</shape>

4
library/src/module_easypermission/res/layout/layout_permission_rationale_dialog.xml
View File

@@ -36,7 +36,7 @@
android:background="@drawable/bg_common_cancel"
android:gravity="center"
android:text="@string/cancel"
android:textColor="@color/color_B3B3C3"
android:textColor="@color/color_white"
android:textSize="15sp" />
<Button
@@ -46,7 +46,7 @@
android:background="@drawable/bg_common_confirm_normal"
android:gravity="center"
android:text="@string/sure"
android:textColor="@color/color_white"
android:textColor="#1E1E1F"
android:textSize="15sp" />
</LinearLayout>

5
modules/module_base/src/main/res/drawable/base_shape_negative_15dp.xml
View File

@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<stroke
android:width="1dp"
android:color="#1E1E1F" />
<solid android:color="#FFFFFF" />
<solid android:color="#1E1E1F" />
<corners android:radius="30dp" />
</shape>

5
modules/module_base/src/main/res/drawable/base_shape_negative_30dp.xml
View File

@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<stroke
android:width="1dp"
android:color="#1E1E1F" />
<solid android:color="#FFFFFF" />
<solid android:color="#1E1E1F" />
<corners android:radius="30dp" />
</shape>

6
modules/module_base/src/main/res/drawable/base_shape_negative_5dp.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#1E1E1F" />
<corners android:radius="5dp" />
</shape>

6
modules/module_base/src/main/res/drawable/base_shape_positive_5dp.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/base_color_theme" />
<corners android:radius="5dp" />
</shape>

2
modules/module_base/src/main/res/values/colors.xml
View File

@@ -10,5 +10,5 @@
<color name="base_color_positive_text">#1E1E1F</color>
<!--负面按钮-文本色-->
<color name="base_color_negative_text">#1E1E1F</color>
<color name="base_color_negative_text">#FFFFFF</color>
</resources>