From cbf34916df416a9e8b2263fc1892775c50972a29 Mon Sep 17 00:00:00 2001
From: Marcus Radisch <radischm@gmail.com>
Date: Wed, 6 Jul 2022 11:58:07 +0200
Subject: [PATCH] Version 1.0.10

---
 .idea/misc.xml                                |  3 +-
 app/build.gradle                              |  5 +-
 app/src/main/AndroidManifest.xml              | 10 ++--
 .../ChangelogActivity.java                    | 48 +++++++++++++++++++
 .../SettingsFragment.java                     | 10 ++++
 app/src/main/res/layout/activity_about.xml    |  1 +
 .../main/res/layout/activity_changelog.xml    | 31 ++++++++++++
 app/src/main/res/raw/changelog.txt            |  8 ++++
 app/src/main/res/values-de-rDE/strings.xml    | 19 +++++---
 app/src/main/res/values/strings.xml           | 13 +++--
 app/src/main/res/xml/preferences.xml          |  5 +-
 .../metadata/android/de-DE/changelogs/12.txt  |  8 ----
 .../metadata/android/de-DE/changelogs/13.txt  |  8 ++++
 .../metadata/android/en-US/changelogs/12.txt  |  8 ----
 .../metadata/android/en-US/changelogs/13.txt  |  8 ++++
 15 files changed, 149 insertions(+), 36 deletions(-)
 create mode 100644 app/src/main/java/com/git/amarradi/palatschinkencounter/ChangelogActivity.java
 create mode 100644 app/src/main/res/layout/activity_changelog.xml
 create mode 100644 app/src/main/res/raw/changelog.txt
 delete mode 100644 fastlane/metadata/android/de-DE/changelogs/12.txt
 create mode 100644 fastlane/metadata/android/de-DE/changelogs/13.txt
 delete mode 100644 fastlane/metadata/android/en-US/changelogs/12.txt
 create mode 100644 fastlane/metadata/android/en-US/changelogs/13.txt

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 2ad9442..9819eb0 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -14,7 +14,8 @@
         <entry key="..\:/Users/Marcus Radisch/AndroidStudioProjects/palatschinkencounter/app/src/main/res/layout/arwdfdsfdsdf.xml" value="0.2246376811594203" />
         <entry key="..\:/Users/Marcus Radisch/AndroidStudioProjects/palatschinkencounter/app/src/main/res/menu/menu.xml" value="0.2153153153153153" />
         <entry key="..\:/Users/Marcus Radisch/AndroidStudioProjects/palatschinkencounter/app/src/main/res/menu/menu_about.xml" value="0.2153153153153153" />
-        <entry key="app/src/main/res/layout/activity_about.xml" value="0.15" />
+        <entry key="app/src/main/res/layout/activity_about.xml" value="0.25" />
+        <entry key="app/src/main/res/layout/activity_changelog.xml" value="0.20786516853932585" />
         <entry key="app/src/main/res/layout/activity_main.xml" value="0.33" />
         <entry key="app/src/main/res/layout/simple_list_item_1.xml" value="0.3546875" />
       </map>
diff --git a/app/build.gradle b/app/build.gradle
index 4a738b8..64ed8d1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "com.git.amarradi.palatschinkencounter"
         minSdkVersion 26
         targetSdkVersion 32
-        versionCode 12
-        versionName "1.0.9"
+        versionCode 13
+        versionName "1.0.10"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -28,6 +28,7 @@ android {
 }
 
 dependencies {
+    implementation 'androidx.appcompat:appcompat:1.4.2'
     def preference_version = "1.2.0"
     implementation 'com.google.android.material:material:1.6.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d70baca..d124982 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,13 +4,18 @@
 
     <application
         android:allowBackup="true"
-        android:fullBackupContent="true"
+        android:fullBackupContent="false"
         android:icon="@drawable/logo_psc_512_transparent"
         android:label="@string/app_name"
         android:roundIcon="@drawable/logo_psc_512_transparent"
         android:supportsRtl="true"
         android:theme="@style/Theme.Palatschinkencounter">
-
+        <activity
+            android:name=".ChangelogActivity"
+            android:exported="true"
+            android:label="@string/change"
+            android:icon="@drawable/logo_psc_512_transparent"
+            android:parentActivityName=".MainActivity"/>
         <activity
             android:name=".MainActivity"
             android:exported="true"
@@ -27,7 +32,6 @@
             android:icon="@drawable/logo_psc_512_transparent"
             android:label="@string/settings"
             android:parentActivityName=".MainActivity" />
-
         <activity
             android:name=".AboutActivity"
             android:icon="@drawable/logo_psc_512_transparent"
diff --git a/app/src/main/java/com/git/amarradi/palatschinkencounter/ChangelogActivity.java b/app/src/main/java/com/git/amarradi/palatschinkencounter/ChangelogActivity.java
new file mode 100644
index 0000000..512a86c
--- /dev/null
+++ b/app/src/main/java/com/git/amarradi/palatschinkencounter/ChangelogActivity.java
@@ -0,0 +1,48 @@
+package com.git.amarradi.palatschinkencounter;
+
+import android.os.Bundle;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import java.io.BufferedReader;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+
+public class ChangelogActivity extends AppCompatActivity {
+    TextView tv_changelog, et_changelog;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_changelog);
+
+        tv_changelog = findViewById(R.id.tvChangeloghead);
+        et_changelog = findViewById(R.id.etChangelog);
+
+        readChangelog();
+
+    }
+
+    private void readChangelog() {
+        try {
+            InputStream inputStream = getResources().openRawResource(R.raw.changelog);
+            BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
+            StringBuffer stringBuffer = new StringBuffer();
+
+            String s;
+
+            while ((s = bufferedReader.readLine()) != null) {
+                stringBuffer.append(s).append("\n");
+            }
+            et_changelog.setText(stringBuffer.toString());
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/git/amarradi/palatschinkencounter/SettingsFragment.java b/app/src/main/java/com/git/amarradi/palatschinkencounter/SettingsFragment.java
index 9451857..ce0ecfe 100644
--- a/app/src/main/java/com/git/amarradi/palatschinkencounter/SettingsFragment.java
+++ b/app/src/main/java/com/git/amarradi/palatschinkencounter/SettingsFragment.java
@@ -72,6 +72,16 @@ public boolean onPreferenceClick(@NonNull Preference preference) {
             startActivity(about_intent);
             return false;
         });
+
+        Preference changelog = getPreferenceManager().findPreference("version_preference");
+        Objects.requireNonNull(changelog).setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
+            @Override
+            public boolean onPreferenceClick(@NonNull Preference preference) {
+                Intent change_intent = new Intent(getActivity(), ChangelogActivity.class);
+                startActivity(change_intent);
+                return false;
+            }
+        });
     }
 
     @Override
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index fc552e8..39dcd8e 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -50,6 +50,7 @@
             android:layout_height="wrap_content"
             android:text="@string/intention"
             android:gravity="center"
+            android:padding="5dp"
             android:textAppearance="?android:attr/textAppearanceSmall"/>
 
         <View
diff --git a/app/src/main/res/layout/activity_changelog.xml b/app/src/main/res/layout/activity_changelog.xml
new file mode 100644
index 0000000..7beb0e5
--- /dev/null
+++ b/app/src/main/res/layout/activity_changelog.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".ChangelogActivity" android:layout_gravity="center">
+
+
+    <TextView
+        android:id="@+id/tvChangeloghead"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:text="@string/change"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:gravity="center"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/etChangelog"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:autofillHints="@string/change"
+
+        android:gravity="start|top" />
+
+</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/app/src/main/res/raw/changelog.txt b/app/src/main/res/raw/changelog.txt
new file mode 100644
index 0000000..0c55d92
--- /dev/null
+++ b/app/src/main/res/raw/changelog.txt
@@ -0,0 +1,8 @@
+## [1.0.10] - 2022-07-06
+### Added
+- new Changelog for current version
+### Changed
+- some textual improvements
+- changed text About the App
+### Fixed
+- theme defaultvalue in english not set
\ No newline at end of file
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index df04067..78b85c0 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -24,8 +24,14 @@
     <string name="intention">Wenn man Palatschinken mag, dann sollten das natürlich die besten der
     Welt sein. Mit dem Palatschinkencounter und dem Rezept ist jeder in der Lage die besten
     Palatschinken der Welt zuzubereiten und sogar mitzuzählen.</string>
-    <string name="really_important">Die wichtigste Entscheidung im Leben. Hast Du dein Leben
-        Jesus übergeben?</string>
+    <string name="really_important">Wir entscheiden uns im Leben doch immer für das Beste,
+        so ist es auch bei den ungarischen Palatschinken. Wir geben uns nie mit den zweitbesten
+        Palatschinken zufrieden. Im eigenen Leben ist das doch genauso. Nur das beste ist gerade
+        gut genug. Hast du die beste Entscheidung deines Lebens bereits getroffen? <b>Hast Du
+            dein Leben Jesus übergeben?</b></string>
+    <string name="txt_menu_item_recipe">Das Palatschinkenrezept</string>
+    <string name="txt_recipe_entry_txt">Ich nehme für die besten ungarischen Palatschinken vom
+        Balaton für 2 Personen folgende Zutaten.</string>
     <string-array name="ingredients_array">
         <item>200 Gramm Weizenmehl (Typ 405)</item>
         <item>2 Eier</item>
@@ -67,21 +73,20 @@
         </item>
     </string-array>
     <string name="thanks">Danke Papa für das Rezept</string>
-    <string name="about">Über uns</string>
+    <string name="about">Über die App</string>
+    <string name="about_summary">Was ich über diese App sagen möchte</string>
     <string name="image">Bild</string>
     <string name="reset">Zähler zurückgesetzt</string>
     <string name="whatsdo">Mit dieser App kannst du alle deine gegessenen Palatschinken zählen.</string>
     <string name="havefun">Habt Spaß :-)</string>
-    <string name="txt_menu_item_recipe">Das Palatschinkenrezept</string>
-    <string name="txt_recipe_entry_txt">Ich nehme für die besten ungarischen Palatschinken vom
-        Balaton für 2 Personen folgende Zutaten.</string>
+
     <string name="pancake_ingredients">Ich nehme folgende Zutaten</string>
     <string name="pancake_preparation">Zubereitung Jetzt ist es Zeit, die Palatschinken zu backen :-)</string>
     <string name="itsos">Dieses Projekt ist OpenSource und auf GitHub unter https://github.com/amarradi/palatschinkencounter zu finden.</string>
     <string name="darkmode_preference">dunkel</string>
     <string name="lightmode_preference">hell</string>
     <string name="recipe_summary">Das Rezept für die weltbesten Palatschinken</string>
-    <string name="about_summary">Was ist das für eine App</string>
+
    <string name="theme_preference">Farbschema</string>
     <string name="recipe_preference">Das Palatschinkenrezept</string>
     <string name="resethowto">Es ist nicht nötig und unter absolut keinem Umstand empfohlen den Zähler jemals zurückzusetzen. Falls Du es trotzdem machen möchtet, muss du auf der Startseite auf deinen Zähler tippen und halten. Nach dem zurücksetzen ist der Zähler unwiederbringlich gelöscht.</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 63b25e0..4322470 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -31,7 +31,8 @@
 
     <string name="cancel" tools:ignore="ButtonCase">cancel</string>
     <string name="resetOK">yes</string>
-    <string name="about">About us</string>
+    <string name="about">About the App</string>
+    <string name="about_summary">What I want to tell about this app</string>
     <string name="image">image</string>
     <string name="reset">reset counter</string>
     <string name="version" translatable="false">%1$s</string>
@@ -41,8 +42,10 @@
     <string name="intention">If you like pancakes, then of course they should be the best in the
         world. With the pancake counter and the recipe, everyone is able to prepare the best pancakes in the world and even count them.</string>
     <!-- recipe -->
-    <string name="really_important">The most important decision in life. Have you given your life
-        to Jesus?</string>
+    <string name="really_important">We always choose the best in life, it is the same with
+        hungarian pancakes. We never satisfy ourselves with the second best pancakes.
+        It is the same in our own lives. Only the best is just good enough. Have you already made
+        the best decision of your life? <b>Have you given your life to Jesus?</b></string>
     <string-array name="ingredients_array">
 
         <item>200 Gramm of wheat flour (Type 405)</item>
@@ -65,7 +68,7 @@
             it</item>
         <item>Lastly I put in the sunflower oil und the pinch of salt under stirring</item>
         <item>I now stir the dough well again for 5–7 minutes</item>
-        <item >Now I let the dough rest for 10–20 min.</item>
+        <item>Now I let the dough rest for 10–20 min.</item>
 
         <item>Meanwhile, I can heat the pan with a very small amount of oil or lard. Attention
             not too hot! On our electric stove I got good results at level 7 of 10</item>
@@ -92,7 +95,7 @@
 
     <string name="darkmode_preference">darkmode</string>
     <string name="lightmode_preference">lightmode</string>
-    <string name="about_summary">What is that App</string>
+    <string name="change" tools:ignore="MissingTranslation">Changelog</string>
 
     <string name="theme_preference">Theme</string>
     <string name="recipe_preference">The pancake recipe</string>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 7eed360..ebd36d8 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -35,7 +35,8 @@
     <PreferenceCategory android:title="@string/version_preference">
         <Preference
             android:key="version_preference"
-            android:selectable="false"
-            app:icon="@drawable/ic_baseline_numbers_24" />
+            android:selectable="true"
+            app:icon="@drawable/ic_baseline_numbers_24"
+            android:summary="@string/change"/>
     </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/fastlane/metadata/android/de-DE/changelogs/12.txt b/fastlane/metadata/android/de-DE/changelogs/12.txt
deleted file mode 100644
index f5c4aac..0000000
--- a/fastlane/metadata/android/de-DE/changelogs/12.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-## [1.0.9] - 02.07.2022
-### Added
-- neues Rezept und Layout
-- neue übersichtliche Einstellungsseite
-### Changed
-- neuer runder +1 Button
-### Fixed
-- kleinere Fehler behoben
diff --git a/fastlane/metadata/android/de-DE/changelogs/13.txt b/fastlane/metadata/android/de-DE/changelogs/13.txt
new file mode 100644
index 0000000..f3b1fae
--- /dev/null
+++ b/fastlane/metadata/android/de-DE/changelogs/13.txt
@@ -0,0 +1,8 @@
+## [1.0.10] - 2022-07-06
+### Added
+- new Changelog for current version
+### Changed
+- some textual improvements
+- changed text About the App
+### Fixed
+- theme defaultvalue in english not set
diff --git a/fastlane/metadata/android/en-US/changelogs/12.txt b/fastlane/metadata/android/en-US/changelogs/12.txt
deleted file mode 100644
index 494c9e7..0000000
--- a/fastlane/metadata/android/en-US/changelogs/12.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-## [1.0.9] - 02.07.2022
-### Added
-- new recipe text and layout
-- new Settingpage
-### Changed
-- new round +1 Button
-### Fixed
-- Some little Bugs
diff --git a/fastlane/metadata/android/en-US/changelogs/13.txt b/fastlane/metadata/android/en-US/changelogs/13.txt
new file mode 100644
index 0000000..f3b1fae
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/13.txt
@@ -0,0 +1,8 @@
+## [1.0.10] - 2022-07-06
+### Added
+- new Changelog for current version
+### Changed
+- some textual improvements
+- changed text About the App
+### Fixed
+- theme defaultvalue in english not set