diff --git a/Android.bp b/Android.bp index 0b867ed51ee30f756be6d150e655c7b022eeb85f..8f7f7705c76ad633fb27cc11bc14f43c4305cb73 100644 --- a/Android.bp +++ b/Android.bp @@ -36,5 +36,7 @@ android_app { "androidx.legacy_legacy-support-v4", "androidx.gridlayout_gridlayout", "androidx.recyclerview_recyclerview", + "androidx.webkit_webkit", + "elib", ], } diff --git a/assets/licenses.html b/assets/licenses.html index 4583bf74d041885bf1bf9c365d5de27884c66379..480c32464cef5438c287fd583ad15f47cff4148c 100644 --- a/assets/licenses.html +++ b/assets/licenses.html @@ -1,7 +1,7 @@ - +

Notices for files:

diff --git a/res/drawable/ic_advanced_bar.xml b/res/drawable/ic_advanced_bar.xml new file mode 100644 index 0000000000000000000000000000000000000000..89623f80ea9bf26d41a04890ce2556825c863677 --- /dev/null +++ b/res/drawable/ic_advanced_bar.xml @@ -0,0 +1,25 @@ + + + + + diff --git a/res/drawable/ic_del.xml b/res/drawable/ic_del.xml index f26eac248e552b3d001dcb493cf85a68c99d6b61..14691140fc53090384980b3c53e17af1faf94935 100644 --- a/res/drawable/ic_del.xml +++ b/res/drawable/ic_del.xml @@ -21,7 +21,7 @@ android:viewportHeight="24" android:viewportWidth="24"> + ~ Copyright ECORP SAS 2022 + ~ This program is free software: you can redistribute it and/or modify + ~ it under the terms of the GNU General Public License as published by + ~ the Free Software Foundation, either version 3 of the License, or + ~ (at your option) any later version. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ~ GNU General Public License for more details. + ~ + ~ You should have received a copy of the GNU General Public License + ~ along with this program. If not, see . + --> - - - - - - - - - - - + android:pathData="M0,0h108v108h-108z"> + + + + + + + diff --git a/res/drawable/ic_launcher_foreground.xml b/res/drawable/ic_launcher_foreground.xml index e2f10e21febbc49eb4d7e78e7b77bd71942e79c3..da55a6b12975c4d4e00cd4342b316e7f504e251f 100644 --- a/res/drawable/ic_launcher_foreground.xml +++ b/res/drawable/ic_launcher_foreground.xml @@ -1,57 +1,67 @@ + ~ Copyright ECORP SAS 2022 + ~ This program is free software: you can redistribute it and/or modify + ~ it under the terms of the GNU General Public License as published by + ~ the Free Software Foundation, either version 3 of the License, or + ~ (at your option) any later version. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ~ GNU General Public License for more details. + ~ + ~ You should have received a copy of the GNU General Public License + ~ along with this program. If not, see . + --> - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/res/layout-land/pad_advanced_3x5.xml b/res/layout-land/pad_advanced_3x5.xml new file mode 100644 index 0000000000000000000000000000000000000000..dfd283d5938e77835b0015dbcc75e1c8721f3bd2 --- /dev/null +++ b/res/layout-land/pad_advanced_3x5.xml @@ -0,0 +1,208 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/res/layout/activity_calculator_land.xml b/res/layout/activity_calculator_land.xml index a19cd8615f27c49b64c7a34ab31c8c0a601a5e31..5a487e3215ea5b4da64e893d937a70f14a4d4ad3 100644 --- a/res/layout/activity_calculator_land.xml +++ b/res/layout/activity_calculator_land.xml @@ -26,6 +26,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" /> + + + + + + diff --git a/res/layout/history_item.xml b/res/layout/history_item.xml index cf8b6c062223836e1bad1c441c12115e07e291f8..4b319df8fcab2c04758b9af3b1ca9878e344491e 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="?android:attr/textColorPrimary" android:textSize="14dp" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:orientation="horizontal" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@color/pad_advanced_background_color" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/mipmap-anydpi/ic_launcher.xml b/res/mipmap-anydpi/ic_launcher.xml index 3d90bc5c3365d4775bbf1cccb9e699f0f1d06931..18e000c2d8cc0200a1c0bc975c3915e93483c100 100644 --- a/res/mipmap-anydpi/ic_launcher.xml +++ b/res/mipmap-anydpi/ic_launcher.xml @@ -1,9 +1,22 @@ + ~ Copyright ECORP SAS 2022 + ~ This program is free software: you can redistribute it and/or modify + ~ it under the terms of the GNU General Public License as published by + ~ the Free Software Foundation, either version 3 of the License, or + ~ (at your option) any later version. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ~ GNU General Public License for more details. + ~ + ~ You should have received a copy of the GNU General Public License + ~ along with this program. If not, see . + --> - - - + + + + + \ No newline at end of file diff --git a/res/values-night/lineage_colors.xml b/res/values-night/lineage_colors.xml deleted file mode 100644 index bfda51b606d6b67a69d49d37e5f79b83e12ff573..0000000000000000000000000000000000000000 --- a/res/values-night/lineage_colors.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - #212121 - - - #000000 - - - #1E1E1E - - - @android:color/white - - - #6CFFFFFF - - - #40FFFFFF - - - @android:color/white - - - #33FFFFFF - diff --git a/res/values-night/lineage_styles.xml b/res/values-night/lineage_styles.xml index 9d9eb6b9151f28db482cbe2e481e3c1ba23c2568..90016c792318ccba33408c79db2eb780d92d93bc 100644 --- a/res/values-night/lineage_styles.xml +++ b/res/values-night/lineage_styles.xml @@ -20,7 +20,10 @@ @color/calculator_primary_color @color/calculator_accent_color @color/calculator_statusbar_color + @color/navigationBar_color stateAlwaysHidden + false + false - + + diff --git a/src/com/android/calculator2/Calculator.java b/src/com/android/calculator2/Calculator.java index 81ab1f6511c4e65cd7c6576fa7b6fe4a0e48ffc5..d765e05502cf964940d93efc84bf74dbf4559db9 100644 --- a/src/com/android/calculator2/Calculator.java +++ b/src/com/android/calculator2/Calculator.java @@ -520,7 +520,6 @@ public class Calculator extends Activity ContextCompat.getColor(this, R.color.calculator_error_color); mFormulaText.setTextColor(errorColor); mResultText.setTextColor(errorColor); - getWindow().setStatusBarColor(errorColor); } else if (mCurrentState != CalculatorState.RESULT) { mFormulaText.setTextColor( ContextCompat.getColor(this, R.color.display_formula_text_color)); diff --git a/src/com/android/calculator2/Licenses.java b/src/com/android/calculator2/Licenses.java index 4af1ea6d09bb8f45364033c19a1d9f34298289c2..81bf117ef10e215003bf60d33c5e5e986d5c5767 100644 --- a/src/com/android/calculator2/Licenses.java +++ b/src/com/android/calculator2/Licenses.java @@ -4,6 +4,10 @@ import android.app.Activity; import android.os.Bundle; import android.view.MenuItem; import android.webkit.WebView; +import android.content.res.Configuration; +import androidx.webkit.WebViewFeature; +import androidx.webkit.WebSettingsCompat; + public class Licenses extends Activity { @@ -17,6 +21,19 @@ public class Licenses extends Activity { webView.loadUrl(LICENSE_URL); setContentView(webView); + + if (WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK)) { + switch (getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) { + case Configuration.UI_MODE_NIGHT_YES: + WebSettingsCompat.setForceDark(webView.getSettings(), WebSettingsCompat.FORCE_DARK_ON); + break; + case Configuration.UI_MODE_NIGHT_NO: + case Configuration.UI_MODE_NIGHT_UNDEFINED: + WebSettingsCompat.setForceDark(webView.getSettings(), WebSettingsCompat.FORCE_DARK_OFF); + break; + } +} + } @Override