some little improvements colors and so

amarradi · May 24, 2023 · 278f763 · 278f763
1 parent 17f66cf
commit 278f763
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 9 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,7 +9,7 @@ android {
  applicationId "com.git.amarradi.palatschinkencounter"
  minSdkVersion 26
  targetSdkVersion 33
- versionCode 17
+ versionCode 18
  versionName "1.0.14"
 
  testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/app/src/main/java/com/git/amarradi/palatschinkencounter/NotificationDialog.java b/app/src/main/java/com/git/amarradi/palatschinkencounter/NotificationDialog.java
@@ -17,13 +17,12 @@ public class NotificationDialog extends AppCompatDialogFragment {
  public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
  AlertDialog.Builder builder = new AlertDialog.Builder(requireActivity(), R.style.MyAlertDialogTheme);
  builder.setTitle(getResources().getString(R.string.notification))
- .setIcon(R.drawable.logo_psc_512_transparent)
+ .setIcon(R.drawable.outline_info_24)
  .setMessage(getResources().getString(R.string.portionstoosmall))
  .setNeutralButton(getResources().getString(R.string.OK),
  new DialogInterface.OnClickListener() {
  @Override
  public void onClick(DialogInterface dialog, int which) {
-
  }
  });
 

diff --git a/app/src/main/res/drawable-night/outline_info_24.xml b/app/src/main/res/drawable-night/outline_info_24.xml
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+ android:tint="@color/md_theme_light_primaryContainer" android:viewportHeight="24"
+ android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="@android:color/white" android:pathData="M11,7h2v2h-2zM11,11h2v6h-2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>
+</vector>
diff --git a/app/src/main/res/drawable/outline_info_24.xml b/app/src/main/res/drawable/outline_info_24.xml
@@ -0,0 +1,6 @@
+<vector android:autoMirrored="true" android:height="24dp"
+ android:tint="@color/md_theme_light_onPrimary"
+ android:viewportHeight="24"
+ android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="@color/md_theme_light_primaryContainer" android:pathData="M11,7h2v2h-2zM11,11h2v6h-2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>
+</vector>
diff --git a/app/src/main/res/drawable/round_add_24.xml b/app/src/main/res/drawable/round_add_24.xml
@@ -1,8 +1,8 @@
 <vector android:autoMirrored="true" android:height="24dp"
- android:tint="@color/md_theme_light_onPrimary"
+ android:tint="@color/md_theme_light_primaryContainer"
  android:viewportHeight="24"
  android:viewportWidth="24"
  android:width="24dp"
  xmlns:android="http://schemas.android.com/apk/res/android">
- <path android:fillColor="@color/md_theme_light_primaryContainer" android:pathData="M18,13h-5v5c0,0.55 -0.45,1 -1,1s-1,-0.45 -1,-1v-5H6c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1h5V6c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v5h5c0.55,0 1,0.45 1,1s-0.45,1 -1,1z"/>
+ <path android:fillColor="@android:color/white" android:pathData="M18,13h-5v5c0,0.55 -0.45,1 -1,1s-1,-0.45 -1,-1v-5H6c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1h5V6c0,-0.55 0.45,-1 1,-1s1,0.45 1,1v5h5c0.55,0 1,0.45 1,1s-0.45,1 -1,1z"/>
 </vector>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
@@ -102,7 +102,7 @@
  <string name="increase_button">increase</string>
  <string name="decrease_button">decrease</string>
  <string name="notification">Hinweis</string>
- <string name="portionstoosmall">Weniger als 1 Portionen macht keinen Sinn, denn davon wird keiner wirklich satt.</string>
+ <string name="portionstoosmall">Weniger als 1 Portion macht keinen Sinn, denn davon wird wirklich keiner satt.</string>
  <string name="OK">OK</string>
  <string name="undo">Rückgängig</string>
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -122,7 +122,7 @@
  <string name="increase_description">Increase the amounts</string>
  <string name="decrease_description">decrease the amounts</string>
  <string name="notification">notification</string>
- <string name="portionstoosmall">Less than 1 portions makes no sense, because no one really gets full from it.</string>
+ <string name="portionstoosmall">Less than 1 portion makes no sense, because no one really gets full from it.</string>
  <string name="OK">OK</string>
  <string name="undo">UNDO</string>
 

diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -21,7 +21,7 @@
  </style>
  <style name="MyAlertDialogTheme" parent="Theme.MaterialComponents.Dialog.Alert">
  <item name="android:fontFamily">@font/opensans_regular</item>
- <item name="colorPrimary">@color/md_theme_light_primary</item>
+ <item name="colorPrimary">@color/md_theme_dark_secondary</item>
  <item name="colorOnPrimary">@color/md_theme_dark_onPrimary</item>
  <item name="colorSecondary">@color/md_theme_dark_secondary</item>
  <item name="colorOnSecondary">@color/md_theme_dark_onSecondary</item>

diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
- <release version="1.0.14" versioncode="17" >
+ <release version="1.0.14" versioncode="18" >
  <change>neue Änderungshistorie eingefügt</change>
  <change>Übersetzungen überarbeitet</change>
  <change>einen splashscreen beim Start der App eingefügt</change>