diff --git a/app/src/main/java/com/simplemobiletools/calculator/MainActivity.java b/app/src/main/java/com/simplemobiletools/calculator/MainActivity.java index 829a112c..81635c1e 100644 --- a/app/src/main/java/com/simplemobiletools/calculator/MainActivity.java +++ b/app/src/main/java/com/simplemobiletools/calculator/MainActivity.java @@ -54,10 +54,10 @@ public class MainActivity extends AppCompatActivity implements Calculator { private void setupResultView() { final Resources res = getResources(); result.setBackgroundColor(res.getColor(android.R.color.white)); - result.setTextColor(res.getColor(R.color.dark_grey)); + result.setTextColor( res.getColor(R.color.text_grey)); formula.setBackgroundColor(res.getColor(android.R.color.white)); - formula.setTextColor(res.getColor(R.color.dark_grey)); + formula.setTextColor(res.getColor(R.color.text_grey)); } @OnClick(R.id.btn_plus) diff --git a/app/src/main/java/com/simplemobiletools/calculator/MyWidgetConfigure.java b/app/src/main/java/com/simplemobiletools/calculator/MyWidgetConfigure.java index 0d13a5ff..0d9af5af 100644 --- a/app/src/main/java/com/simplemobiletools/calculator/MyWidgetConfigure.java +++ b/app/src/main/java/com/simplemobiletools/calculator/MyWidgetConfigure.java @@ -56,7 +56,7 @@ public class MyWidgetConfigure extends AppCompatActivity { bgColor = prefs.getInt(Constants.WIDGET_BG_COLOR, 1); if (bgColor == 1) { bgColor = Color.BLACK; - bgAlpha = .5f; + bgAlpha = .2f; } else { bgAlpha = Color.alpha(bgColor) / (float) 255; } @@ -67,7 +67,7 @@ public class MyWidgetConfigure extends AppCompatActivity { bgSeekBar.setProgress((int) (bgAlpha * 100)); updateBackgroundColor(); - textColor = prefs.getInt(Constants.WIDGET_TEXT_COLOR, Color.WHITE); + textColor = prefs.getInt(Constants.WIDGET_TEXT_COLOR, getResources().getColor(R.color.colorPrimary)); updateTextColor(); formula.setText("15,937*5"); diff --git a/app/src/main/java/com/simplemobiletools/calculator/MyWidgetProvider.java b/app/src/main/java/com/simplemobiletools/calculator/MyWidgetProvider.java index 6ee9dad9..2af7e51b 100644 --- a/app/src/main/java/com/simplemobiletools/calculator/MyWidgetProvider.java +++ b/app/src/main/java/com/simplemobiletools/calculator/MyWidgetProvider.java @@ -62,7 +62,7 @@ public class MyWidgetProvider extends AppWidgetProvider implements Calculator { cxt = context; updateWidgetIds(); prefs = initPrefs(cxt); - final int defaultColor = cxt.getResources().getColor(R.color.dark_grey); + final int defaultColor = cxt.getResources().getColor(R.color.text_grey); final int newBgColor = prefs.getInt(Constants.WIDGET_BG_COLOR, defaultColor); final int newTextColor = prefs.getInt(Constants.WIDGET_TEXT_COLOR, Color.WHITE); diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index cadc4d9b..ba4fad9e 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -5,7 +5,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/dark_grey" + android:background="@color/buttons_background" android:orientation="vertical" android:theme="@style/MainTheme" tools:context=".MainActivity"> @@ -15,6 +15,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_weight="2.1" + android:fontFamily="sans-serif-light" android:gravity="right|bottom" android:lines="1" android:paddingLeft="@dimen/activity_margin" @@ -27,6 +28,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_weight="1.8" + android:fontFamily="sans-serif-light" android:gravity="center_vertical|right" android:lines="1" android:paddingLeft="@dimen/activity_margin" diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml index 083dcdfb..3f344e16 100644 --- a/app/src/main/res/values-v21/styles.xml +++ b/app/src/main/res/values-v21/styles.xml @@ -1,9 +1,10 @@ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 8b20aeb6..0fac03a7 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,9 +1,9 @@ - #3F51B5 - #303F9F - #FF0000 - #88000000 - #aa000000 - #22000000 + #ffff6f00 + #ffe46300 + @color/colorPrimary + #05000000 + #77000000 + #11000000 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 57b137c2..a4249801 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -11,9 +11,10 @@