diff --git a/app/src/main/java/org/autojs/autojs/theme/dialog/ThemeColorMaterialDialogBuilder.java b/app/src/main/java/org/autojs/autojs/theme/dialog/ThemeColorMaterialDialogBuilder.java index 5aeb2b4a..fec3ec6c 100644 --- a/app/src/main/java/org/autojs/autojs/theme/dialog/ThemeColorMaterialDialogBuilder.java +++ b/app/src/main/java/org/autojs/autojs/theme/dialog/ThemeColorMaterialDialogBuilder.java @@ -6,9 +6,11 @@ import androidx.annotation.NonNull; import com.afollestad.materialdialogs.MaterialDialog; +import com.afollestad.materialdialogs.Theme; import org.autojs.autojs.theme.ThemeColor; import org.autojs.autojs.theme.ThemeColorManager; import org.autojs.autojs.theme.ThemeColorMutable; +import org.autojs.autojs.util.ColorUtils; /** * Created by Stardust on Mar 5, 2017. @@ -21,7 +23,7 @@ public class ThemeColorMaterialDialogBuilder extends MaterialDialog.Builder impl @Override public void setThemeColor(ThemeColor themeColor) { - int color = themeColor.colorPrimary; + int color = ColorUtils.adjustColorForContrast(backgroundColor, themeColor.colorPrimary, 2.3); positiveColor(color); negativeColor(color); neutralColor(color); diff --git a/app/src/main/java/org/autojs/autojs/theme/widget/ThemeColorSwipeRefreshLayout.java b/app/src/main/java/org/autojs/autojs/theme/widget/ThemeColorSwipeRefreshLayout.java index 13012d23..6ef15bf5 100644 --- a/app/src/main/java/org/autojs/autojs/theme/widget/ThemeColorSwipeRefreshLayout.java +++ b/app/src/main/java/org/autojs/autojs/theme/widget/ThemeColorSwipeRefreshLayout.java @@ -8,6 +8,7 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import org.autojs.autojs.theme.ThemeColor; import org.autojs.autojs.theme.ThemeColorManager; import org.autojs.autojs.theme.ThemeColorMutable; +import org.autojs.autojs.util.ColorUtils; import org.autojs.autojs6.R; /** @@ -32,7 +33,9 @@ public class ThemeColorSwipeRefreshLayout extends SwipeRefreshLayout implements @Override public void setThemeColor(ThemeColor themeColor) { - setColorSchemeColors(themeColor.colorPrimary); + int backgroundColor = getContext().getColor(R.color.swipe_refresh_background); + int adjustedColor = ColorUtils.adjustColorForContrast(backgroundColor, themeColor.colorPrimary, 2.3); + setColorSchemeColors(adjustedColor); } } diff --git a/app/src/main/java/org/autojs/autojs/theme/widget/ThemeColorSwitch.java b/app/src/main/java/org/autojs/autojs/theme/widget/ThemeColorSwitch.java index 6f50470b..e6aa28a2 100644 --- a/app/src/main/java/org/autojs/autojs/theme/widget/ThemeColorSwitch.java +++ b/app/src/main/java/org/autojs/autojs/theme/widget/ThemeColorSwitch.java @@ -14,6 +14,7 @@ import org.autojs.autojs.theme.ThemeColorMutable; * Created by Stardust on Aug 7, 2016. */ public class ThemeColorSwitch extends SwitchCompat implements ThemeColorMutable { + public ThemeColorSwitch(Context context) { super(context); init(); @@ -35,6 +36,7 @@ public class ThemeColorSwitch extends SwitchCompat implements ThemeColorMutable @Override public void setThemeColor(ThemeColor color) { - ThemeColorHelper.setColorPrimary(this, color.colorPrimary); + ThemeColorHelper.setColorPrimary(this, color.colorPrimary, true); } + } diff --git a/app/src/main/java/org/autojs/autojs/util/ColorUtils.kt b/app/src/main/java/org/autojs/autojs/util/ColorUtils.kt index 75a03ef6..fd16048b 100644 --- a/app/src/main/java/org/autojs/autojs/util/ColorUtils.kt +++ b/app/src/main/java/org/autojs/autojs/util/ColorUtils.kt @@ -653,6 +653,7 @@ object ColorUtils { * @return The adjusted color. (zh-CN: 调整后的颜色.) */ @JvmStatic + @JvmOverloads fun adjustColorForContrast( @ColorInt background: Int, @ColorInt reference: Int, diff --git a/version.properties b/version.properties index cd223611..7b0d3881 100644 --- a/version.properties +++ b/version.properties @@ -1,5 +1,5 @@ -#Wed Mar 19 00:38:56 CST 2025 -BUILD_TIME=1742315936702 +#Wed Mar 19 00:50:23 CST 2025 +BUILD_TIME=1742316623695 COMPILE_SDK_VERSION=35 JAVA_VERSION=23 JAVA_VERSION_MIN_RADICAL=0