From 5a23deb2c0b60cc4c540120fe7c64bf5dc212300 Mon Sep 17 00:00:00 2001 From: Fahim Date: Wed, 7 Apr 2021 00:48:56 +0600 Subject: [PATCH 1/3] fix dark-mode color mismatch for pie --- res/layout/fragment_history.xml | 2 +- res/values-night/lineage_colors.xml | 9 +++++++++ res/values-night/lineage_styles.xml | 1 + res/values/color.xml | 5 ++--- res/values/lineage_styles.xml | 1 + 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/res/layout/fragment_history.xml b/res/layout/fragment_history.xml index 0559c871..236c94c0 100644 --- a/res/layout/fragment_history.xml +++ b/res/layout/fragment_history.xml @@ -31,7 +31,7 @@ android:minHeight="?android:attr/actionBarSize" android:navigationContentDescription="@string/desc_navigate_up" android:navigationIcon="?android:attr/homeAsUpIndicator" - android:popupTheme="@android:style/ThemeOverlay.Material.Light" + android:popupTheme="@style/Theme.Toolbar.Popup" android:theme="@style/Theme.Toolbar" android:title="@string/title_history" /> diff --git a/res/values-night/lineage_colors.xml b/res/values-night/lineage_colors.xml index bfda51b6..2222e36f 100644 --- a/res/values-night/lineage_colors.xml +++ b/res/values-night/lineage_colors.xml @@ -39,4 +39,13 @@ #33FFFFFF + + + #131313 + + + #CCFFFFFF + + + #1AFFFFFF diff --git a/res/values-night/lineage_styles.xml b/res/values-night/lineage_styles.xml index 9d9eb6b9..a8546543 100644 --- a/res/values-night/lineage_styles.xml +++ b/res/values-night/lineage_styles.xml @@ -24,4 +24,5 @@ + + +

Notices for files:

+ +
+Copyright (c) 1999, Silicon Graphics, Inc. -- ALL RIGHTS RESERVED
+
+Permission is granted free of charge to copy, modify, use and distribute this software  provided you include the entirety of this notice in all copies made.
+
+THIS SOFTWARE IS PROVIDED ON AN AS IS BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE SUBJECT SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.   SGI ASSUMES NO RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE.   SHOULD THE SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, SGI ASSUMES NO COST OR LIABILITY FOR ANY SERVICING, REPAIR OR CORRECTION.  THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY SUBJECT SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR STRICT LIABILITY), CONTRACT, OR OTHERWISE, SHALL SGI BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER WITH RESPECT TO THE SOFTWARE INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, LOSS OF DATA, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SGI SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES.  THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY RESULTING FROM SGI's NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION.  SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+These license terms shall be governed by and construed in accordance with the laws of the United States and the State of California as applied to agreements entered into and to be performed entirely within California between California residents.  Any litigation relating to these license terms shall be subject to the exclusive jurisdiction of the Federal Courts of the Northern District of California (or, absent subject matter jurisdiction in such courts, the courts of the State of California), with venue lying exclusively in Santa Clara County, California.
+
+Copyright (c) 2001-2004, Hewlett-Packard Development Company, L.P.
+
+Permission is granted free of charge to copy, modify, use and distribute this software  provided you include the entirety of this notice in all copies made.
+
+THIS SOFTWARE IS PROVIDED ON AN AS IS BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE SUBJECT SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.   HEWLETT-PACKARD ASSUMES NO RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE.  SHOULD THE SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, HEWLETT-PACKARD ASSUMES NO COST OR LIABILITY FOR ANY SERVICING, REPAIR OR CORRECTION.  THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY SUBJECT SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING, WITHOUT LIMITATION, NEGLIGENCE OR STRICT LIABILITY), CONTRACT, OR OTHERWISE, SHALL HEWLETT-PACKARD BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER WITH RESPECT TO THE SOFTWARE INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, LOSS OF DATA, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF HEWLETT-PACKARD SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES.  THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY RESULTING FROM HEWLETT-PACKARD's NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION.  SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THAT EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+ + diff --git a/src/com/android/calculator2/Licenses.java b/src/com/android/calculator2/Licenses.java index 4af1ea6d..e5cbc473 100644 --- a/src/com/android/calculator2/Licenses.java +++ b/src/com/android/calculator2/Licenses.java @@ -1,6 +1,8 @@ package com.android.calculator2; import android.app.Activity; +import android.content.res.Configuration; +import android.os.Build; import android.os.Bundle; import android.view.MenuItem; import android.webkit.WebView; @@ -8,15 +10,17 @@ import android.webkit.WebView; public class Licenses extends Activity { private static final String LICENSE_URL = "file:///android_asset/licenses.html"; + private static final String LICENSE_URL_NIGHT = "file:///android_asset/licenses_night.html"; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); final WebView webView = new WebView(this); - webView.loadUrl(LICENSE_URL); setContentView(webView); + + handleDayNightMode(webView); } @Override @@ -27,4 +31,21 @@ public class Licenses extends Activity { } return super.onOptionsItemSelected(item); } + + private void handleDayNightMode(WebView webView) { + if (isInDarkMode()) { + webView.loadUrl(LICENSE_URL_NIGHT); + } else { + webView.loadUrl(LICENSE_URL); + } + } + + + private boolean isInDarkMode() { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.FROYO) { + int nightModeFlags = getApplication().getApplicationContext().getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK; + return nightModeFlags == Configuration.UI_MODE_NIGHT_YES; + } + return false; + } } -- GitLab From e5a62106ac7b8fbfebcb4f7bb36f428f72f8c419 Mon Sep 17 00:00:00 2001 From: Fahim Date: Thu, 8 Apr 2021 23:43:54 +0600 Subject: [PATCH 3/3] replace 'color_default_blue1' with 'color_default_accent' --- res/drawable/circle_bg.xml | 2 +- res/drawable/eq_button_backgroud.xml | 4 ++-- res/drawable/ic_del.xml | 2 +- res/layout/activity_calculator_land.xml | 2 +- res/layout/activity_calculator_port.xml | 2 +- res/layout/history_item.xml | 2 +- res/values/color.xml | 4 +--- 7 files changed, 8 insertions(+), 10 deletions(-) diff --git a/res/drawable/circle_bg.xml b/res/drawable/circle_bg.xml index 3eac55fb..060e18d6 100644 --- a/res/drawable/circle_bg.xml +++ b/res/drawable/circle_bg.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/res/drawable/eq_button_backgroud.xml b/res/drawable/eq_button_backgroud.xml index 701f9024..9cabf00a 100644 --- a/res/drawable/eq_button_backgroud.xml +++ b/res/drawable/eq_button_backgroud.xml @@ -2,8 +2,8 @@ - - + + diff --git a/res/drawable/ic_del.xml b/res/drawable/ic_del.xml index f36ae61b..3e5ffb61 100644 --- a/res/drawable/ic_del.xml +++ b/res/drawable/ic_del.xml @@ -20,7 +20,7 @@ android:width="24dp" android:viewportHeight="24" android:viewportWidth="24" - android:tint="@color/color_default_blue1" + android:tint="@color/calculator_accent_color" > diff --git a/res/layout/activity_calculator_port.xml b/res/layout/activity_calculator_port.xml index 46918910..72c09a6e 100644 --- a/res/layout/activity_calculator_port.xml +++ b/res/layout/activity_calculator_port.xml @@ -23,7 +23,7 @@ diff --git a/res/layout/history_item.xml b/res/layout/history_item.xml index cf8b6c06..17561329 100644 --- a/res/layout/history_item.xml +++ b/res/layout/history_item.xml @@ -42,7 +42,7 @@ android:paddingStart="@dimen/result_padding_start" android:paddingEnd="@dimen/result_padding_end" android:text="@string/title_current_expression" - android:textColor="?android:attr/colorAccent" + android:textColor="@color/calculator_accent_color" android:textSize="14dp" /> #333 - @lineageos.platform:color/color_default_primary_text - - @lineageos.platform:color/color_default_blue1 + @lineageos.platform:color/color_default_primary_text #33000000 -- GitLab