Skip to content

Commit 08b4db3

Browse files
committed
Update
1 parent f522f6d commit 08b4db3

6 files changed

Lines changed: 21 additions & 10 deletions

File tree

app/src/main/java/com/omarea/common/ui/BlurEngine.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import android.graphics.*;
44
import android.view.View;
55
import com.tool.tree.ThemeModeState;
6+
import androidx.core.content.ContextCompat;
7+
import com.tool.tree.R;
68

79
public final class BlurEngine {
810
public static BlurController controller = new BlurController();
@@ -89,9 +91,9 @@ public Bitmap getUpdatedBlurBitmap() {
8991
private int getBlurTintColor() {
9092
// Tối ưu màu sắc cho SDK 23+ (Dark mode hệ thống chưa có nên dựa vào ThemeModeState là chuẩn)
9193
if (ThemeModeState.isDarkMode()) {
92-
return Color.parseColor("#88000000"); // Đậm hơn một chút cho sang
94+
return ContextCompat.getColor(targetView.getContext(), R.color.colorBlurDark); // Đậm hơn một chút cho sang
9395
} else {
94-
return Color.parseColor("#c0FFFFFF"); // Trắng mờ nhẹ
96+
return ContextCompat.getColor(targetView.getContext(), R.color.colorBlurLight); // Trắng mờ nhẹ
9597
}
9698
}
9799

@@ -104,9 +106,9 @@ public static Paint getStrokePaint() {
104106

105107
// Cập nhật màu viền theo Theme hiện tại
106108
if (ThemeModeState.isDarkMode()) {
107-
strokePaint.setColor(Color.parseColor("#80888888"));
109+
strokePaint.setColor(ContextCompat.getColor(targetView.getContext(), R.color.colorPirmLight));
108110
} else {
109-
strokePaint.setColor(Color.parseColor("#80888888"));
111+
strokePaint.setColor(ContextCompat.getColor(targetView.getContext(), R.color.colorPirmDark));
110112
}
111113
return strokePaint;
112114
}

app/src/main/res/drawable/krscript_item_ripple_kin.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<shape android:shape="rectangle">
1414
<stroke
1515
android:width="3px"
16-
android:color="@color/colorPirnm" />
16+
android:color="?attr/colorPirm" />
1717
<corners android:radius="9dp" />
1818
</shape>
1919
</item>

app/src/main/res/drawable/krscript_item_ripple_kon.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<shape android:shape="rectangle">
1111
<stroke
1212
android:width="3px"
13-
android:color="@color/colorPirnm" />
13+
android:color="?attr/colorPirm" />
1414
<corners android:radius="9dp" />
1515
</shape>
1616
</item>

app/src/main/res/values/attrs.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<!-- Thuộc tính chung -->
1515
<attr name="cardBg" format="color"/>
1616
<attr name="colorParse" format="color" />
17+
<attr name="colorPirm" format="color" />
1718

1819
<!-- Trạng thái tiến trình -->
1920
<declare-styleable name="ProgressState">

app/src/main/res/values/colors.xml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,23 @@
66
<color name="status_bg_light">@android:color/white</color>
77
<color name="cardBgDark">#222222</color>
88
<color name="cardBgDarkTransparent">#a0000000</color>
9-
<color name="cardBgLight">#ddffffff</color>
10-
<color name="cardBgLightTransparent">#c0ffffff</color>
9+
<color name="cardBgLight">#DDFFFFFF</color>
10+
<color name="cardBgLightTransparent">#C0FFFFFF</color>
1111

1212
<color name="color_load_low">#02d98d</color>
1313
<color name="color_load_mid">#87cb00</color>
1414
<color name="color_load_hight">#fc8a1b</color>
1515
<color name="color_load_veryhight">#f9592f</color>
1616

17-
<color name="colorPirnm">#80888888</color>
17+
<color name="colorBlurLight">#80000000</color>
18+
<color name="colorBlurDark">#C0FFFFFF</color>
19+
20+
<color name="colorPirmLight">#25FFFFFF</color>
21+
<color name="colorPirmDark">#55000000</color>
22+
1823
<color name="colorParseLight">#25FFFFFF</color>
19-
<color name="colorParseDark">#25888888</color>
24+
<color name="colorParseDark">#25000000</color>
25+
2026
<color name="colorAccent">#0dbda2</color>
2127
<color name="colorPrimary">#64CDB6</color>
2228
<color name="colorPrimaryDark">#30C7B6</color>

app/src/main/res/values/styles.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
66
<item name="colorAccent">@color/colorAccent</item>
77
<item name="colorParse">@color/colorParseDark</item>
8+
<item name="colorPirm">@color/colorParseDark</item>
89
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
910
<item name="android:windowTranslucentStatus">false</item>
1011
<item name="android:windowTranslucentNavigation">false</item>
@@ -33,6 +34,7 @@
3334
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
3435
<item name="colorAccent">@color/colorAccent</item>
3536
<item name="colorParse">@color/colorParseLight</item>
37+
<item name="colorPirm">@color/colorPirmLight</item>
3638
<item name="windowActionBar">false</item>
3739
<item name="windowNoTitle">true</item>
3840
<item name="android:windowAnimationStyle">@style/activityAnim</item>

0 commit comments

Comments
 (0)