From 3cb45c3ba5c94a3088f83acdc61fcfe9a2e79c04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20Ro=CC=88sler?=
 <thorsten.roesler@teaminternet.com>
Date: Mon, 21 Aug 2023 14:28:07 +0200
Subject: [PATCH 1/5] Restyling settings

---
 Ladefuchs/app/build.gradle                    |   4 +-
 .../src/main/res/layout/fragment_about.xml    | 318 ++++++++----------
 .../app/src/main/res/values-v26/styles.xml    |  12 -
 Ladefuchs/app/src/main/res/values/styles.xml  |  42 ++-
 4 files changed, 172 insertions(+), 204 deletions(-)
 delete mode 100644 Ladefuchs/app/src/main/res/values-v26/styles.xml

diff --git a/Ladefuchs/app/build.gradle b/Ladefuchs/app/build.gradle
index 5ed8512..f70c657 100644
--- a/Ladefuchs/app/build.gradle
+++ b/Ladefuchs/app/build.gradle
@@ -11,8 +11,8 @@ android {
         applicationId "app.ladefuchs.android"
         minSdkVersion 26
         targetSdkVersion 33
-        versionCode 204
-        versionName "2.0.4"
+        versionCode 205
+        versionName "2.0.5"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/Ladefuchs/app/src/main/res/layout/fragment_about.xml b/Ladefuchs/app/src/main/res/layout/fragment_about.xml
index 4996f8a..2d749d9 100644
--- a/Ladefuchs/app/src/main/res/layout/fragment_about.xml
+++ b/Ladefuchs/app/src/main/res/layout/fragment_about.xml
@@ -1,100 +1,96 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout 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:id="@+id/constraintLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/rounded_header_card">
 
-    <ImageButton
-        android:id="@+id/back_button"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:layout_marginEnd="6dp"
-        android:layout_marginTop="6dp"
-        android:background="@color/PrimaryBackground"
-        android:contentDescription="@string/zurueck"
-        app:layout_constraintBottom_toTopOf="@+id/einstellungen"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_baseline_cancel_24" />
-
-    <LinearLayout
+    <RelativeLayout
         android:id="@+id/einstellungen"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingLeft="16dp"
+        android:background="@color/colorPrimaryDark"
+        android:orientation="horizontal"
         android:paddingTop="0dp"
-        android:paddingRight="16dp"
         app:layout_constraintBottom_toTopOf="@+id/scrollView"
         app:layout_constraintEnd_toStartOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/back_button">
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageButton
+            android:id="@+id/back_button"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_alignEnd="@+id/einstellungenHeaderText"
+            android:layout_gravity="end"
+            android:layout_marginTop="6dp"
+            android:layout_marginEnd="-6dp"
+            android:background="@color/colorPrimaryDark"
+            android:contentDescription="@string/zurueck"
+            app:srcCompat="@drawable/ic_baseline_cancel_24" />
 
         <TextView
             android:id="@+id/einstellungenHeaderText"
-            android:layout_width="wrap_content"
+            style="@style/AboutTopHeader"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/settings"
+            android:gravity="center"
             android:paddingBottom="8dp"
-            android:textAppearance="@style/AboutTopHeader"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-    </LinearLayout>
+            android:text="@string/settings" />
+    </RelativeLayout>
 
 
     <ScrollView
         android:id="@+id/scrollView"
         android:layout_width="match_parent"
         android:layout_height="0dp"
+        android:background="@color/PrimaryBackground"
         app:layout_constraintHeight_default="percent"
         app:layout_constraintHeight_percent="1.0"
-        android:background="@color/PrimaryBackground"
         app:layout_constraintHorizontal_bias="1.0"
         app:layout_constraintStart_toStartOf="@+id/einstellungen"
         app:layout_constraintTop_toBottomOf="@+id/einstellungen">
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:paddingLeft="16dp"
-            android:paddingBottom="100dp"
-            android:paddingRight="16dp">
+            android:paddingBottom="100dp">
+
+            <View style="@style/Divider" />
 
             <TextView
                 android:id="@+id/teamfuchs"
+                style="@style/AboutHeading"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="1dp"
-                android:text="@string/teamfuchs_header"
-                android:textAllCaps="true"
-                android:textAppearance="@style/AboutHeader"
-                android:textStyle="bold" />
+                android:text="@string/teamfuchs_header" />
 
             <TextView
                 android:id="@+id/teamfuchsSL"
+                style="@style/AboutSubHeader"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginLeft="16dp"
                 android:layout_marginTop="3dp"
+                android:layout_marginRight="16dp"
                 android:layout_marginBottom="25dp"
-                android:fontFamily="@font/bitter"
-                android:text="@string/teamfuchs_sl"
-                android:textAppearance="@style/AboutSubHeader" />
+                android:text="@string/teamfuchs_sl" />
 
 
             <LinearLayout
                 android:id="@+id/team_basti"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginLeft="8dp"
+                android:layout_marginRight="8dp"
                 android:gravity="clip_vertical"
                 android:padding="8dp">
 
-                <de.hdodenhof.circleimageview.CircleImageView xmlns:app="http://schemas.android.com/apk/res-auto"
+                <de.hdodenhof.circleimageview.CircleImageView
                     android:id="@+id/avatar_basti"
                     android:layout_width="125dp"
                     android:layout_height="125dp"
@@ -111,50 +107,42 @@
 
                     <TextView
                         android:id="@+id/basti"
+                        style="@style/Füchse"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="1.5dp"
                         android:layout_marginBottom="1.5dp"
-                        android:fontFamily="@font/roboto_black"
-                        android:text="@string/basti"
-                        android:textAllCaps="true"
-                        android:textAppearance="@style/AboutHeader"
-                        android:textStyle="bold" />
+                        android:text="@string/basti" />
 
                     <TextView
                         android:id="@+id/bastiSL"
+                        style="@style/SubFüchse"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="1.5dp"
                         android:layout_marginBottom="1.5dp"
-                        android:fontFamily="@font/bitter"
-                        android:text="@string/androidfuchs"
-                        android:textAppearance="@style/AboutSubHeader" />
+                        android:text="@string/androidfuchs" />
 
                     <TextView
                         android:id="@+id/bastiSL2"
+                        style="@style/AboutSubHeaderSans"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="1.5dp"
                         android:layout_marginBottom="1.5dp"
-                        android:fontFamily="@font/bitter"
                         android:tag="clickableLink"
-                        android:text="@string/mastodon_schlingel"
-                        android:textAppearance="@style/AboutSubHeaderSans"
-                        android:textColorLink="@color/TextColorBlack" />
+                        android:text="@string/mastodon_schlingel" />
 
                     <TextView
                         android:id="@+id/bastiSL3"
+                        style="@style/AboutSubHeaderSans"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="1.5dp"
                         android:layout_marginBottom="1.5dp"
                         android:autoLink="email"
-                        android:fontFamily="@font/bitter"
                         android:tag="clickableLink"
-                        android:text="@string/android_at_ladefuchs_app"
-                        android:textAppearance="@style/AboutSubHeaderSans"
-                        android:textColorLink="@color/TextColorDark" />
+                        android:text="@string/android_at_ladefuchs_app" />
                 </LinearLayout>
 
             </LinearLayout>
@@ -163,10 +151,12 @@
                 android:id="@+id/team_malik"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginLeft="8dp"
+                android:layout_marginRight="8dp"
                 android:gravity="clip_vertical"
                 android:padding="8dp">
 
-                <de.hdodenhof.circleimageview.CircleImageView xmlns:app="http://schemas.android.com/apk/res-auto"
+                <de.hdodenhof.circleimageview.CircleImageView
                     android:id="@+id/avatar_malik"
                     android:layout_width="125dp"
                     android:layout_height="125dp"
@@ -183,50 +173,43 @@
 
                     <TextView
                         android:id="@+id/malik"
+                        style="@style/Füchse"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="1.5dp"
                         android:layout_marginBottom="1.5dp"
-                        android:fontFamily="@font/roboto_black"
-                        android:text="@string/malik"
-                        android:textAllCaps="true"
-                        android:textAppearance="@style/AboutHeader"
-                        android:textStyle="bold" />
+                        android:text="@string/malik" />
 
                     <TextView
                         android:id="@+id/malikSL"
+                        style="@style/SubFüchse"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="1.5dp"
                         android:layout_marginBottom="1.5dp"
-                        android:fontFamily="@font/bitter"
-                        android:text="@string/designfuchs"
-                        android:textAppearance="@style/AboutSubHeader" />
+                        android:text="@string/designfuchs" />
 
                     <TextView
                         android:id="@+id/malikSL2"
+                        style="@style/AboutSubHeaderSans"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="1.5dp"
                         android:layout_marginBottom="1.5dp"
-                        android:fontFamily="@font/bitter"
                         android:tag="clickableLink"
-                        android:text="@string/mastodon_malik"
-                        android:textAppearance="@style/AboutSubHeaderSans"
-                        android:textColorLink="@color/TextColorBlack" />
+                        android:text="@string/mastodon_malik" />
 
                     <TextView
                         android:id="@+id/malikSL3"
+                        style="@style/AboutSubHeaderSans"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="1.5dp"
                         android:layout_marginBottom="1.5dp"
                         android:autoLink="email"
-                        android:fontFamily="@font/bitter"
+                        android:minHeight="48dp"
                         android:tag="clickableLink"
-                        android:text="@string/malik_at_ladefuchs_app"
-                        android:textAppearance="@style/AboutSubHeaderSans"
-                        android:textColorLink="@color/TextColorDark" />
+                        android:text="@string/malik_at_ladefuchs_app" />
                 </LinearLayout>
             </LinearLayout>
 
@@ -234,10 +217,12 @@
                 android:id="@+id/team_flow"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginLeft="8dp"
+                android:layout_marginRight="8dp"
                 android:gravity="clip_vertical"
                 android:padding="8dp">
 
-                <de.hdodenhof.circleimageview.CircleImageView xmlns:app="http://schemas.android.com/apk/res-auto"
+                <de.hdodenhof.circleimageview.CircleImageView
                     android:id="@+id/avatar_flow"
                     android:layout_width="125dp"
                     android:layout_height="125dp"
@@ -254,51 +239,42 @@
 
                     <TextView
                         android:id="@+id/flowinho"
+                        style="@style/Füchse"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="1.5dp"
                         android:layout_marginBottom="1.5dp"
-                        android:fontFamily="@font/roboto_black"
-                        android:text="@string/flowinho"
-                        android:textAllCaps="true"
-                        android:textAppearance="@style/AboutHeader"
-                        android:textStyle="bold" />
+                        android:text="@string/flowinho" />
 
                     <TextView
                         android:id="@+id/flowinhoSL"
+                        style="@style/SubFüchse"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="1.5dp"
                         android:layout_marginBottom="1.5dp"
-                        android:fontFamily="@font/bitter"
-                        android:text="@string/apfelfuchs"
-                        android:textAppearance="@style/AboutSubHeader" />
+                        android:text="@string/apfelfuchs" />
 
                     <TextView
                         android:id="@+id/flowinhoSL2"
+                        style="@style/AboutSubHeaderSans"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="1.5dp"
                         android:layout_marginBottom="1.5dp"
-                        android:fontFamily="@font/bitter"
                         android:tag="clickableLink"
-                        android:text="@string/twitter_flowinho"
-                        android:textAppearance="@style/AboutSubHeaderSans"
-                        android:textColor="@color/TextColorDark"
-                        android:textColorLink="@color/TextColorBlack" />
+                        android:text="@string/twitter_flowinho" />
 
                     <TextView
                         android:id="@+id/flowinhoSL3"
+                        style="@style/AboutSubHeaderSans"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="1.5dp"
                         android:layout_marginBottom="1.5dp"
                         android:autoLink="email"
-                        android:fontFamily="@font/bitter"
                         android:tag="clickableLink"
-                        android:text="@string/ios_at_ladefuchs_app"
-                        android:textAppearance="@style/AboutSubHeaderSans"
-                        android:textColorLink="@color/TextColorDark" />
+                        android:text="@string/ios_at_ladefuchs_app" />
 
                 </LinearLayout>
             </LinearLayout>
@@ -307,10 +283,12 @@
                 android:id="@+id/team_thorsten"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:layout_marginLeft="8dp"
+                android:layout_marginRight="8dp"
                 android:gravity="clip_vertical"
                 android:padding="8dp">
 
-                <de.hdodenhof.circleimageview.CircleImageView xmlns:app="http://schemas.android.com/apk/res-auto"
+                <de.hdodenhof.circleimageview.CircleImageView
                     android:id="@+id/avatar_thorsten"
                     android:layout_width="125dp"
                     android:layout_height="125dp"
@@ -327,50 +305,42 @@
 
                     <TextView
                         android:id="@+id/thorsten"
+                        style="@style/Füchse"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="1.5dp"
                         android:layout_marginBottom="1.5dp"
-                        android:fontFamily="@font/roboto_black"
-                        android:text="@string/thorsten"
-                        android:textAllCaps="true"
-                        android:textAppearance="@style/AboutHeader"
-                        android:textStyle="bold" />
+                        android:text="@string/thorsten" />
 
                     <TextView
                         android:id="@+id/thorstenSL"
+                        style="@style/SubFüchse"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="1.5dp"
                         android:layout_marginBottom="1.5dp"
-                        android:fontFamily="@font/bitter"
-                        android:text="@string/androidfuchs"
-                        android:textAppearance="@style/AboutSubHeader" />
+                        android:text="@string/androidfuchs" />
 
                     <TextView
                         android:id="@+id/thorstenSL2"
+                        style="@style/AboutSubHeaderSans"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="1.5dp"
                         android:layout_marginBottom="1.5dp"
-                        android:fontFamily="@font/bitter"
                         android:tag="clickableLink"
-                        android:text="@string/twitter_thorsten"
-                        android:textAppearance="@style/AboutSubHeaderSans"
-                        android:textColorLink="@color/TextColorBlack" />
+                        android:text="@string/twitter_thorsten" />
 
                     <TextView
                         android:id="@+id/thorstenSL3"
+                        style="@style/AboutSubHeaderSans"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="1.5dp"
                         android:layout_marginBottom="1.5dp"
                         android:autoLink="email"
-                        android:fontFamily="@font/bitter"
                         android:tag="clickableLink"
-                        android:text="@string/android_at_ladefuchs_app"
-                        android:textAppearance="@style/AboutSubHeaderSans"
-                        android:textColorLink="@color/TextColorDark" />
+                        android:text="@string/android_at_ladefuchs_app" />
                 </LinearLayout>
             </LinearLayout>
 
@@ -379,10 +349,12 @@
                 android:id="@+id/team_roddi"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:layout_marginLeft="8dp"
+                android:layout_marginRight="8dp"
                 android:gravity="clip_vertical"
                 android:padding="8dp">
 
-                <de.hdodenhof.circleimageview.CircleImageView xmlns:app="http://schemas.android.com/apk/res-auto"
+                <de.hdodenhof.circleimageview.CircleImageView
                     android:id="@+id/avatar_roddi"
                     android:layout_width="125dp"
                     android:layout_height="125dp"
@@ -400,50 +372,42 @@
 
                     <TextView
                         android:id="@+id/roddi"
+                        style="@style/Füchse"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="1.5dp"
                         android:layout_marginBottom="1.5dp"
-                        android:fontFamily="@font/roboto_black"
-                        android:text="@string/roddi"
-                        android:textAllCaps="true"
-                        android:textAppearance="@style/AboutHeader"
-                        android:textStyle="bold" />
+                        android:text="@string/roddi" />
 
                     <TextView
                         android:id="@+id/roddiSL"
+                        style="@style/SubFüchse"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="1.5dp"
                         android:layout_marginBottom="1.5dp"
-                        android:fontFamily="@font/bitter"
-                        android:text="@string/apfelfuchs"
-                        android:textAppearance="@style/AboutSubHeader" />
+                        android:text="@string/apfelfuchs" />
 
                     <TextView
                         android:id="@+id/roddiSL2"
+                        style="@style/AboutSubHeaderSans"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="1.5dp"
                         android:layout_marginBottom="1.5dp"
-                        android:fontFamily="@font/bitter"
                         android:tag="clickableLink"
-                        android:text="@string/twitter_roddi"
-                        android:textAppearance="@style/AboutSubHeaderSans"
-                        android:textColorLink="@color/TextColorBlack" />
+                        android:text="@string/twitter_roddi" />
 
                     <TextView
                         android:id="@+id/roddiSL3"
+                        style="@style/AboutSubHeaderSans"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="1.5dp"
                         android:layout_marginBottom="1.5dp"
                         android:autoLink="email"
-                        android:fontFamily="@font/bitter"
                         android:tag="clickableLink"
-                        android:text="@string/ios_at_ladefuchs_app"
-                        android:textAppearance="@style/AboutSubHeaderSans"
-                        android:textColorLink="@color/TextColorDark" />
+                        android:text="@string/ios_at_ladefuchs_app" />
                 </LinearLayout>
             </LinearLayout>
 
@@ -452,10 +416,12 @@
                 android:id="@+id/team_dominic"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:layout_marginLeft="8dp"
+                android:layout_marginRight="8dp"
                 android:gravity="clip_vertical"
                 android:padding="8dp">
 
-                <de.hdodenhof.circleimageview.CircleImageView xmlns:app="http://schemas.android.com/apk/res-auto"
+                <de.hdodenhof.circleimageview.CircleImageView
                     android:id="@+id/avatar_dominic"
                     android:layout_width="125dp"
                     android:layout_height="125dp"
@@ -472,65 +438,57 @@
 
                     <TextView
                         android:id="@+id/dominic"
+                        style="@style/Füchse"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="1.5dp"
                         android:layout_marginBottom="1.5dp"
-                        android:fontFamily="@font/roboto_black"
-                        android:text="@string/dominic"
-                        android:textAllCaps="true"
-                        android:textAppearance="@style/AboutHeader"
-                        android:textStyle="bold" />
+                        android:text="@string/dominic" />
 
                     <TextView
                         android:id="@+id/dominicSL"
+                        style="@style/SubFüchse"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="1.5dp"
                         android:layout_marginBottom="1.5dp"
-                        android:fontFamily="@font/bitter"
-                        android:text="@string/apifuchs"
-                        android:textAppearance="@style/AboutSubHeader" />
+                        android:text="@string/apifuchs" />
 
                     <TextView
                         android:id="@+id/dominicSL2"
+                        style="@style/AboutSubHeaderSans"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="1.5dp"
                         android:layout_marginBottom="1.5dp"
                         android:autoLink="email"
-                        android:fontFamily="@font/bitter"
                         android:tag="clickableLink"
-                        android:text="@string/api_at_ladefuchs_app"
-                        android:textAppearance="@style/AboutSubHeaderSans"
-                        android:textColorLink="@color/TextColorDark" />
+                        android:text="@string/api_at_ladefuchs_app" />
                 </LinearLayout>
             </LinearLayout>
 
             <TextView
                 android:id="@+id/teamfuchs2"
+                style="@style/AboutHeading"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="42dp"
-                android:fontFamily="@font/roboto_black"
-                android:text="@string/podcastfuchs"
-                android:textAllCaps="true"
-                android:textAppearance="@style/AboutHeader"
-                android:textStyle="bold" />
+                android:text="@string/podcastfuchs" />
 
             <TextView
                 android:id="@+id/teamfuchsSL2"
+                style="@style/AboutSubHeader"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:fontFamily="@font/bitter"
                 android:layout_marginTop="3dp"
                 android:layout_marginBottom="16dp"
-                android:text="@string/podcastfuchs_sl"
-                android:textAppearance="@style/AboutSubHeader" />
+                android:text="@string/podcastfuchs_sl" />
 
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="120dp"
+                android:layout_marginLeft="16dp"
+                android:layout_marginRight="16dp"
                 android:weightSum="99">
 
 
@@ -569,29 +527,27 @@
 
             <TextView
                 android:id="@+id/datenfuchs"
+                style="@style/AboutHeading"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="42dp"
-                android:fontFamily="@font/roboto_black"
-                android:text="@string/datenfuchs"
-                android:textAllCaps="true"
-                android:textAppearance="@style/AboutHeader"
-                android:textStyle="bold" />
+                android:text="@string/datenfuchs" />
 
             <TextView
                 android:id="@+id/datenfuchsSL"
+                style="@style/AboutSubHeader"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:fontFamily="@font/bitter"
                 android:layout_marginTop="3dp"
-                android:text="@string/datenfuchs_sl"
-                android:textAppearance="@style/AboutSubHeader" />
+                android:text="@string/datenfuchs_sl" />
 
             <ImageView
                 android:id="@+id/chargeprice_logo"
                 android:layout_width="240dp"
                 android:layout_height="wrap_content"
+                android:layout_marginLeft="16dp"
                 android:layout_marginTop="14dp"
+                android:layout_marginRight="16dp"
                 android:layout_marginBottom="0dp"
                 android:adjustViewBounds="true"
                 android:clickable="true"
@@ -602,86 +558,78 @@
 
             <TextView
                 android:id="@+id/illufuchs"
+                style="@style/AboutHeading"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="42dp"
-                android:fontFamily="@font/roboto_black"
-                android:text="@string/illufuchs"
-                android:textAllCaps="true"
-                android:textAppearance="@style/AboutHeader"
-                android:textStyle="bold" />
+                android:text="@string/illufuchs" />
 
             <TextView
                 android:id="@+id/illufuchsSL"
+                style="@style/AboutSubHeader"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:fontFamily="@font/bitter"
                 android:layout_marginTop="3dp"
-                android:text="@string/illusfuchs_SL"
-                android:textAppearance="@style/AboutSubHeader" />
+                android:text="@string/illusfuchs_SL" />
+
+            <View style="@style/Divider" />
 
             <TextView
                 android:id="@+id/imprint_header"
+                style="@style/AboutHeading"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="42dp"
-                android:fontFamily="@font/bitter"
-                android:text="@string/imprint_header"
-                android:textAllCaps="true"
-                android:textAppearance="@style/AboutHeader"
-                android:textStyle="bold" />
+                android:text="@string/imprint_header" />
 
             <TextView
                 android:id="@+id/imprint_text"
+                style="@style/AboutSubHeader"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="3dp"
-                android:fontFamily="@font/bitter"
-                android:text="@string/imprint_text"
-                android:textAppearance="@style/AboutSubHeader" />
+                android:text="@string/imprint_text" />
+
+            <View style="@style/Divider" />
 
             <TextView
                 android:id="@+id/acknowledgement_header"
+                style="@style/AboutHeading"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="42dp"
-                android:fontFamily="@font/bitter"
-                android:text="@string/acknowledgement_header"
-                android:textAllCaps="true"
-                android:textAppearance="@style/AboutHeader"
-                android:textStyle="bold" />
+                android:text="@string/acknowledgement_header" />
 
             <TextView
                 android:id="@+id/acknowledgement_text"
+                style="@style/AboutSubHeader"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="3dp"
-                android:fontFamily="@font/bitter"
                 android:layout_marginBottom="20dp"
+                android:text="@string/acknowledgement_text" />
 
-                android:textColorLink="#000"
-                android:text="@string/acknowledgement_text"
-                android:textAppearance="@style/AboutSubHeader" />
+            <View style="@style/Divider" />
 
             <TextView
                 android:id="@+id/handcraftedText"
+                style="@style/AboutSubHeader"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="3dp"
-                android:layout_marginEnd="5dp"
-                android:fontFamily="@font/bitter"
                 android:layout_marginBottom="20dp"
-                android:text="@string/handcrafted"
-                android:textAppearance="@style/AboutSubHeader" />
+                android:text="@string/handcrafted" />
+
+            <View style="@style/Divider" />
 
             <TextView
                 android:id="@+id/version_info"
+                style="@style/AboutSubHeader"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="3dp"
                 android:layout_marginBottom="48dp"
-                android:fontFamily="@font/bitter"
-                android:textAppearance="@style/AboutSubHeader" />
+                android:gravity="center" />
 
         </LinearLayout>
 
diff --git a/Ladefuchs/app/src/main/res/values-v26/styles.xml b/Ladefuchs/app/src/main/res/values-v26/styles.xml
deleted file mode 100644
index e000f4b..0000000
--- a/Ladefuchs/app/src/main/res/values-v26/styles.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="AboutHeader" parent="@android:style/TextAppearance.Medium">
-        <item name="android:textSize">24sp</item>
-        <item name="android:textColor">@color/colorAccent</item>
-        <item name="android:typeface">sans</item>
-        <item name="android:fontWeight">900</item>
-    </style>
-
-    
-</resources>
\ No newline at end of file
diff --git a/Ladefuchs/app/src/main/res/values/styles.xml b/Ladefuchs/app/src/main/res/values/styles.xml
index c6edf81..fff41ab 100644
--- a/Ladefuchs/app/src/main/res/values/styles.xml
+++ b/Ladefuchs/app/src/main/res/values/styles.xml
@@ -10,35 +10,57 @@
         <item name="android:windowLightStatusBar">true</item>
     </style>
 
-    <style name="AboutTopHeader" parent="@android:style/TextAppearance.Medium">
+    <style name="AboutTheme" parent="@android:style/TextAppearance.Medium">
+        <item name="android:layout_marginLeft">16dp</item>
+        <item name="android:layout_marginRight">16dp</item>
+    </style>
+
+    <style name="AboutTopHeader" parent="AboutTheme">
         <item name="android:textSize">36sp</item>
         <item name="android:textColor">@color/TextColorBlack</item>
         <item name="android:fontFamily">@font/roboto_bold</item>
         <item name="android:textStyle">normal</item>
+        <item name="android:textAlignment">center</item>
         <item name="android:textAllCaps">false</item>
     </style>
 
-    <style name="AboutHeader" parent="@android:style/TextAppearance.Medium">
+    <style name="AboutHeading" parent="AboutTheme">
         <item name="android:textSize">26sp</item>
-        <item name="android:textColor">@color/colorAccent</item>
+        <item name="android:textColor">@color/TextColorBlack</item>
         <item name="android:fontFamily">@font/roboto_bold</item>
         <item name="android:textStyle">bold</item>
+    </style>
+
+
+    <style name="Füchse" parent="@android:style/TextAppearance.Medium">
+        <item name="android:textSize">26sp</item>
+        <item name="android:textColor">@color/colorAccent</item>
+        <item name="android:fontFamily">@font/roboto_bold</item>
         <item name="android:textAllCaps">true</item>
     </style>
 
-    <style name="AboutSubHeader" parent="@android:style/TextAppearance.Medium">
+    <style name="SubFüchse" parent="@android:style/TextAppearance.Medium">
         <item name="android:textSize">16sp</item>
-        <item name="android:textColor">@color/TextColorDark</item>
+        <item name="android:textColor">@color/TextColorDisabled</item>
+        <item name="android:textColorLink">@color/TextColorDisabled</item>
         <item name="android:fontFamily">@font/roboto_black</item>
         <item name="android:textStyle">italic</item>
         <item name="android:textAllCaps">false</item>
     </style>
 
+    <style name="AboutSubHeader" parent="SubFüchse">
+        <item name="android:layout_marginLeft">16dp</item>
+        <item name="android:layout_marginRight">16dp</item>
+    </style>
+
+
     <style name="AboutSubHeaderSans" parent="@android:style/TextAppearance.Medium">
         <item name="android:textSize">16sp</item>
         <item name="android:textColor">@color/TextColorDark</item>
+        <item name="android:textColorLink">@color/TextColorBlack</item>
         <item name="android:fontFamily">@font/roboto_black</item>
         <item name="android:textAllCaps">false</item>
+
     </style>
 
     <style name="TableHeader" parent="@android:style/TextAppearance.Medium">
@@ -105,4 +127,14 @@
         <item name="android:textAlignment">center</item>
     </style>
 
+    <style name="Divider">
+        <item name="android:layout_width">fill_parent</item>
+        <item name="android:layout_height">1.5dp</item>
+        <item name="android:layout_marginTop">1.5dp</item>
+        <item name="android:layout_marginBottom">1.5dp</item>
+        <item name="android:layout_marginLeft">-15dp</item>
+        <item name="android:background">?android:attr/listDivider</item>
+
+    </style>
+
 </resources>
\ No newline at end of file

From 180be231d140ebe2d89260e1196a8a70d5ec5c24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20Ro=CC=88sler?=
 <thorsten.roesler@teaminternet.com>
Date: Sun, 15 Oct 2023 20:52:09 +0200
Subject: [PATCH 2/5] Boost Version for Settings Design

---
 Ladefuchs/app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Ladefuchs/app/build.gradle b/Ladefuchs/app/build.gradle
index 118b26c..fad173b 100644
--- a/Ladefuchs/app/build.gradle
+++ b/Ladefuchs/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "app.ladefuchs.android"
         minSdkVersion 28
         targetSdkVersion 33
-        versionCode 207
-        versionName "2.0.7"
+        versionCode 210
+        versionName '2.1.0'
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

From 5d2c78862f46b25ad8f087d3cff72f40ed442cef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20Ro=CC=88sler?=
 <thorsten.roesler@teaminternet.com>
Date: Sun, 15 Oct 2023 21:29:35 +0200
Subject: [PATCH 3/5] Rename About stuff to settings and cleanup
 mobile_navigation.xml

---
 .../java/app/ladefuchs/android/helper/API.kt  |  2 +-
 .../ladefuchs/android/helper/drawHelper.kt    |  6 +-
 .../app/ladefuchs/android/helper/helpers.kt   | 17 +-----
 .../ui/chargecards/ChargeCardFragment.kt      |  6 +-
 .../main/res/layout/fragment_chargecards.xml  |  2 +-
 ...agment_about.xml => fragment_settings.xml} | 52 ++++++++--------
 .../main/res/navigation/mobile_navigation.xml | 60 ++-----------------
 Ladefuchs/app/src/main/res/values/strings.xml |  2 +-
 Ladefuchs/app/src/main/res/values/styles.xml  | 10 ++--
 9 files changed, 47 insertions(+), 110 deletions(-)
 rename Ladefuchs/app/src/main/res/layout/{fragment_about.xml => fragment_settings.xml} (95%)

diff --git a/Ladefuchs/app/src/main/java/app/ladefuchs/android/helper/API.kt b/Ladefuchs/app/src/main/java/app/ladefuchs/android/helper/API.kt
index 857d255..a84917f 100644
--- a/Ladefuchs/app/src/main/java/app/ladefuchs/android/helper/API.kt
+++ b/Ladefuchs/app/src/main/java/app/ladefuchs/android/helper/API.kt
@@ -180,7 +180,7 @@ fun retrieveOperatorList(context: Context): List<Operator> {
                 ""
             }
         } else {
-            val sharedPreferences = context?.let {
+            val sharedPreferences = context.let {
                 PreferenceManager.getDefaultSharedPreferences(
                     it
                 )
diff --git a/Ladefuchs/app/src/main/java/app/ladefuchs/android/helper/drawHelper.kt b/Ladefuchs/app/src/main/java/app/ladefuchs/android/helper/drawHelper.kt
index 5aac3d9..b435e23 100644
--- a/Ladefuchs/app/src/main/java/app/ladefuchs/android/helper/drawHelper.kt
+++ b/Ladefuchs/app/src/main/java/app/ladefuchs/android/helper/drawHelper.kt
@@ -348,10 +348,10 @@ private fun createSingleCell(
     return cell
 }
 
-fun createAboutPopup(context: Context, view: View) {
+fun createSettingsPopup(context: Context, view: View) {
     currentDialog?.dismiss()
 
-    val popUpView: View = LayoutInflater.from(context).inflate(R.layout.fragment_about, null)
+    val popUpView: View = LayoutInflater.from(context).inflate(R.layout.fragment_settings, null)
     currentDialog = createDialog(popUpView, view)
     currentDialog?.show()
 
@@ -360,7 +360,7 @@ fun createAboutPopup(context: Context, view: View) {
             currentDialog?.dismiss()
         }
 
-    aboutPopUpSetUp(popUpView)
+    settingsPopUpSetUp(popUpView)
 }
 
 @SuppressLint("SetTextI18n")
diff --git a/Ladefuchs/app/src/main/java/app/ladefuchs/android/helper/helpers.kt b/Ladefuchs/app/src/main/java/app/ladefuchs/android/helper/helpers.kt
index 03be23c..053ce45 100644
--- a/Ladefuchs/app/src/main/java/app/ladefuchs/android/helper/helpers.kt
+++ b/Ladefuchs/app/src/main/java/app/ladefuchs/android/helper/helpers.kt
@@ -6,35 +6,20 @@ import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.content.res.Resources
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
 import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
-import android.graphics.drawable.Drawable
 import android.net.Uri
 import android.os.Build
-import android.renderscript.Allocation
-import android.renderscript.RenderScript
-import android.renderscript.ScriptIntrinsicBlur
 import android.text.SpannableString
 import android.text.TextPaint
 import android.text.method.LinkMovementMethod
 import android.text.style.URLSpan
-import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewGroup
 import android.widget.*
-import androidx.appcompat.content.res.AppCompatResources
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.view.WindowInsetsCompat
 import androidx.navigation.NavController
 import app.ladefuchs.android.BuildConfig
 import app.ladefuchs.android.R
-import app.ladefuchs.android.dataClasses.CardMetaData
-import app.ladefuchs.android.dataClasses.ChargeCards
 import app.ladefuchs.android.dataClasses.ChargeType
 import app.ladefuchs.android.dataClasses.Operator
-import com.beust.klaxon.Klaxon
 import java.io.File
 import java.net.URL
 import java.text.DecimalFormat
@@ -160,7 +145,7 @@ private fun TextView.removeLinksUnderline() {
 
 
 @SuppressLint("SetTextI18n")
-fun aboutPopUpSetUp(view: View) {
+fun settingsPopUpSetUp(view: View) {
 
     val acknowledgementText = view.findViewById(R.id.acknowledgement_text) as TextView
     acknowledgementText.movementMethod = LinkMovementMethod.getInstance()
diff --git a/Ladefuchs/app/src/main/java/app/ladefuchs/android/ui/chargecards/ChargeCardFragment.kt b/Ladefuchs/app/src/main/java/app/ladefuchs/android/ui/chargecards/ChargeCardFragment.kt
index bd231ac..9d84e0e 100644
--- a/Ladefuchs/app/src/main/java/app/ladefuchs/android/ui/chargecards/ChargeCardFragment.kt
+++ b/Ladefuchs/app/src/main/java/app/ladefuchs/android/ui/chargecards/ChargeCardFragment.kt
@@ -89,10 +89,10 @@ class ChargeCardFragment : Fragment() {
             nerdGlasses.visibility = VISIBLE
         }
 
-        val aboutButton = view.findViewById<ImageButton>(R.id.aboutButton)
+        val settingsButton = view.findViewById<ImageButton>(R.id.settingsButton)
 
-        aboutButton.setOnClickListener {
-            context?.let { createAboutPopup(it, view) }
+        settingsButton.setOnClickListener {
+            context?.let { createSettingsPopup(it, view) }
         }
 
         // retrieve what shall be shown in the footer
diff --git a/Ladefuchs/app/src/main/res/layout/fragment_chargecards.xml b/Ladefuchs/app/src/main/res/layout/fragment_chargecards.xml
index c2ef7d3..eae0b18 100644
--- a/Ladefuchs/app/src/main/res/layout/fragment_chargecards.xml
+++ b/Ladefuchs/app/src/main/res/layout/fragment_chargecards.xml
@@ -318,7 +318,7 @@
         android:visibility="invisible" />
 
     <ImageButton
-        android:id="@+id/aboutButton"
+        android:id="@+id/settingsButton"
         android:layout_width="50dp"
         android:layout_height="50dp"
         android:layout_marginTop="40dp"
diff --git a/Ladefuchs/app/src/main/res/layout/fragment_about.xml b/Ladefuchs/app/src/main/res/layout/fragment_settings.xml
similarity index 95%
rename from Ladefuchs/app/src/main/res/layout/fragment_about.xml
rename to Ladefuchs/app/src/main/res/layout/fragment_settings.xml
index 2d749d9..9d65d57 100644
--- a/Ladefuchs/app/src/main/res/layout/fragment_about.xml
+++ b/Ladefuchs/app/src/main/res/layout/fragment_settings.xml
@@ -33,7 +33,7 @@
 
         <TextView
             android:id="@+id/einstellungenHeaderText"
-            style="@style/AboutTopHeader"
+            style="@style/SettingsTopHeader"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
@@ -63,7 +63,7 @@
 
             <TextView
                 android:id="@+id/teamfuchs"
-                style="@style/AboutHeading"
+                style="@style/SettingsHeading"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="1dp"
@@ -71,7 +71,7 @@
 
             <TextView
                 android:id="@+id/teamfuchsSL"
-                style="@style/AboutSubHeader"
+                style="@style/SettingsSubHeader"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="16dp"
@@ -125,7 +125,7 @@
 
                     <TextView
                         android:id="@+id/bastiSL2"
-                        style="@style/AboutSubHeaderSans"
+                        style="@style/SettingsSubHeaderSans"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="1.5dp"
@@ -135,7 +135,7 @@
 
                     <TextView
                         android:id="@+id/bastiSL3"
-                        style="@style/AboutSubHeaderSans"
+                        style="@style/SettingsSubHeaderSans"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="1.5dp"
@@ -191,7 +191,7 @@
 
                     <TextView
                         android:id="@+id/malikSL2"
-                        style="@style/AboutSubHeaderSans"
+                        style="@style/SettingsSubHeaderSans"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="1.5dp"
@@ -201,7 +201,7 @@
 
                     <TextView
                         android:id="@+id/malikSL3"
-                        style="@style/AboutSubHeaderSans"
+                        style="@style/SettingsSubHeaderSans"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="1.5dp"
@@ -257,7 +257,7 @@
 
                     <TextView
                         android:id="@+id/flowinhoSL2"
-                        style="@style/AboutSubHeaderSans"
+                        style="@style/SettingsSubHeaderSans"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="1.5dp"
@@ -267,7 +267,7 @@
 
                     <TextView
                         android:id="@+id/flowinhoSL3"
-                        style="@style/AboutSubHeaderSans"
+                        style="@style/SettingsSubHeaderSans"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="1.5dp"
@@ -323,7 +323,7 @@
 
                     <TextView
                         android:id="@+id/thorstenSL2"
-                        style="@style/AboutSubHeaderSans"
+                        style="@style/SettingsSubHeaderSans"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="1.5dp"
@@ -333,7 +333,7 @@
 
                     <TextView
                         android:id="@+id/thorstenSL3"
-                        style="@style/AboutSubHeaderSans"
+                        style="@style/SettingsSubHeaderSans"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="1.5dp"
@@ -390,7 +390,7 @@
 
                     <TextView
                         android:id="@+id/roddiSL2"
-                        style="@style/AboutSubHeaderSans"
+                        style="@style/SettingsSubHeaderSans"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="1.5dp"
@@ -400,7 +400,7 @@
 
                     <TextView
                         android:id="@+id/roddiSL3"
-                        style="@style/AboutSubHeaderSans"
+                        style="@style/SettingsSubHeaderSans"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="1.5dp"
@@ -456,7 +456,7 @@
 
                     <TextView
                         android:id="@+id/dominicSL2"
-                        style="@style/AboutSubHeaderSans"
+                        style="@style/SettingsSubHeaderSans"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="1.5dp"
@@ -469,7 +469,7 @@
 
             <TextView
                 android:id="@+id/teamfuchs2"
-                style="@style/AboutHeading"
+                style="@style/SettingsHeading"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="42dp"
@@ -477,7 +477,7 @@
 
             <TextView
                 android:id="@+id/teamfuchsSL2"
-                style="@style/AboutSubHeader"
+                style="@style/SettingsSubHeader"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="3dp"
@@ -527,7 +527,7 @@
 
             <TextView
                 android:id="@+id/datenfuchs"
-                style="@style/AboutHeading"
+                style="@style/SettingsHeading"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="42dp"
@@ -535,7 +535,7 @@
 
             <TextView
                 android:id="@+id/datenfuchsSL"
-                style="@style/AboutSubHeader"
+                style="@style/SettingsSubHeader"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="3dp"
@@ -558,7 +558,7 @@
 
             <TextView
                 android:id="@+id/illufuchs"
-                style="@style/AboutHeading"
+                style="@style/SettingsHeading"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="42dp"
@@ -566,7 +566,7 @@
 
             <TextView
                 android:id="@+id/illufuchsSL"
-                style="@style/AboutSubHeader"
+                style="@style/SettingsSubHeader"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="3dp"
@@ -576,7 +576,7 @@
 
             <TextView
                 android:id="@+id/imprint_header"
-                style="@style/AboutHeading"
+                style="@style/SettingsHeading"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="42dp"
@@ -584,7 +584,7 @@
 
             <TextView
                 android:id="@+id/imprint_text"
-                style="@style/AboutSubHeader"
+                style="@style/SettingsSubHeader"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="3dp"
@@ -594,7 +594,7 @@
 
             <TextView
                 android:id="@+id/acknowledgement_header"
-                style="@style/AboutHeading"
+                style="@style/SettingsHeading"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="42dp"
@@ -602,7 +602,7 @@
 
             <TextView
                 android:id="@+id/acknowledgement_text"
-                style="@style/AboutSubHeader"
+                style="@style/SettingsSubHeader"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="3dp"
@@ -613,7 +613,7 @@
 
             <TextView
                 android:id="@+id/handcraftedText"
-                style="@style/AboutSubHeader"
+                style="@style/SettingsSubHeader"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="3dp"
@@ -624,7 +624,7 @@
 
             <TextView
                 android:id="@+id/version_info"
-                style="@style/AboutSubHeader"
+                style="@style/SettingsSubHeader"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="3dp"
diff --git a/Ladefuchs/app/src/main/res/navigation/mobile_navigation.xml b/Ladefuchs/app/src/main/res/navigation/mobile_navigation.xml
index 246e49c..0b1971c 100644
--- a/Ladefuchs/app/src/main/res/navigation/mobile_navigation.xml
+++ b/Ladefuchs/app/src/main/res/navigation/mobile_navigation.xml
@@ -6,22 +6,13 @@
     app:startDestination="@id/navigation_chargecards">
 
     <fragment
-        android:id="@+id/navigation_about"
-        android:name="app.ladefuchs.android.ui.about.AboutFragment"
+        android:id="@+id/navigation_settings"
+        android:name="app.ladefuchs.android.ui.settings.SettingsFragment"
         android:label="@string/title_home"
-        tools:layout="@layout/fragment_about" >
+        tools:layout="@layout/fragment_settings" >
         <action
-            android:id="@+id/action_navigation_about_to_navigation_chargecards"
+            android:id="@+id/action_navigation_settings_to_navigation_chargecards"
             app:destination="@id/navigation_chargecards" />
-        <action
-            android:id="@+id/action_navigation_about_to_feedbackfuchs"
-            app:destination="@id/feedbackfuchs" />
-        <action
-            android:id="@+id/action_navigation_about_to_imprint"
-            app:destination="@id/imprint" />
-        <action
-            android:id="@+id/action_navigation_about_to_acknowledgement"
-            app:destination="@id/acknowledgement" />
     </fragment>
 
     <fragment
@@ -30,51 +21,12 @@
         android:label="@string/title_chargecards"
         tools:layout="@layout/fragment_chargecards">
         <action
-            android:id="@+id/action_navigation_chargecards_to_navigation_about"
-            app:destination="@id/navigation_about" />
-        <action
-            android:id="@+id/action_navigation_chargecards_to_settingsFragment"
-            app:destination="@id/settingsFragment" />
+            android:id="@+id/action_navigation_chargecards_to_navigation_settings"
+            app:destination="@id/navigation_settings" />
         <action
             android:id="@+id/action_card_to_detail"
             app:destination="@id/card_detail" />
     </fragment>
-    <fragment
-        android:id="@+id/feedbackfuchs"
-        android:name="app.ladefuchs.android.ui.feedbackfuchs.Feedbackfuchs"
-        android:label="feedbackfuchs_fragment"
-        tools:layout="@layout/fragment_feedbackfuchs" >
-        <action
-            android:id="@+id/action_feedbackfuchs_to_navigation_about"
-            app:destination="@id/navigation_about" />
-    </fragment>
-    <fragment
-        android:id="@+id/settingsFragment"
-        android:name="app.ladefuchs.android.ui.settings.SettingsFragment"
-        android:label="SettingsFragment" >
-        <action
-            android:id="@+id/action_settingsFragment_to_navigation_about"
-            app:destination="@id/navigation_about" />
-        <action
-            android:id="@+id/action_settingsFragment_to_feedbackfuchs"
-            app:destination="@id/feedbackfuchs" />
-    </fragment>
-    <fragment
-        android:id="@+id/imprint"
-        android:name="app.ladefuchs.android.ui.imprint.Imprint"
-        android:label="Imprint" >
-        <action
-            android:id="@+id/action_imprint_to_navigation_about"
-            app:destination="@id/navigation_about" />
-    </fragment>
-    <fragment
-        android:id="@+id/acknowledgement"
-        android:name="app.ladefuchs.android.ui.acknowledgement.Acknowledgement"
-        android:label="Acknowledgement">
-        <action
-            android:id="@+id/action_acknowledgement_to_navigation_about"
-            app:destination="@id/navigation_about" />
-    </fragment>
 
     <fragment
         android:id="@+id/card_detail"
diff --git a/Ladefuchs/app/src/main/res/values/strings.xml b/Ladefuchs/app/src/main/res/values/strings.xml
index dd0959c..bd4a390 100644
--- a/Ladefuchs/app/src/main/res/values/strings.xml
+++ b/Ladefuchs/app/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <string name="app_name">Ladefuchs</string>
-    <string name="title_home">About</string>
+    <string name="title_home">Settings</string>
     <string name="title_chargecards">Ladekarten</string>
     <string name="title_notifications">Notifications</string>
     <string name="ladefuchs_logo_description">Ladefuchs Logo Description</string>
diff --git a/Ladefuchs/app/src/main/res/values/styles.xml b/Ladefuchs/app/src/main/res/values/styles.xml
index fff41ab..fa0170c 100644
--- a/Ladefuchs/app/src/main/res/values/styles.xml
+++ b/Ladefuchs/app/src/main/res/values/styles.xml
@@ -10,12 +10,12 @@
         <item name="android:windowLightStatusBar">true</item>
     </style>
 
-    <style name="AboutTheme" parent="@android:style/TextAppearance.Medium">
+    <style name="SettingsTheme" parent="@android:style/TextAppearance.Medium">
         <item name="android:layout_marginLeft">16dp</item>
         <item name="android:layout_marginRight">16dp</item>
     </style>
 
-    <style name="AboutTopHeader" parent="AboutTheme">
+    <style name="SettingsTopHeader" parent="SettingsTheme">
         <item name="android:textSize">36sp</item>
         <item name="android:textColor">@color/TextColorBlack</item>
         <item name="android:fontFamily">@font/roboto_bold</item>
@@ -24,7 +24,7 @@
         <item name="android:textAllCaps">false</item>
     </style>
 
-    <style name="AboutHeading" parent="AboutTheme">
+    <style name="SettingsHeading" parent="SettingsTheme">
         <item name="android:textSize">26sp</item>
         <item name="android:textColor">@color/TextColorBlack</item>
         <item name="android:fontFamily">@font/roboto_bold</item>
@@ -48,13 +48,13 @@
         <item name="android:textAllCaps">false</item>
     </style>
 
-    <style name="AboutSubHeader" parent="SubFüchse">
+    <style name="SettingsSubHeader" parent="SubFüchse">
         <item name="android:layout_marginLeft">16dp</item>
         <item name="android:layout_marginRight">16dp</item>
     </style>
 
 
-    <style name="AboutSubHeaderSans" parent="@android:style/TextAppearance.Medium">
+    <style name="SettingsSubHeaderSans" parent="@android:style/TextAppearance.Medium">
         <item name="android:textSize">16sp</item>
         <item name="android:textColor">@color/TextColorDark</item>
         <item name="android:textColorLink">@color/TextColorBlack</item>

From c5921e12b6de44797b222803e51480ce5cd9e85f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20Ro=CC=88sler?=
 <thorsten.roesler@teaminternet.com>
Date: Mon, 16 Oct 2023 12:19:58 +0200
Subject: [PATCH 4/5] Add ListAdapter aswell as ListItemView

---
 .../ladefuchs/android/dataClasses/Operator.kt | 14 ++++-
 .../android/helper/OperatorListAdapter.kt     | 47 +++++++++++++++
 .../app/src/main/res/drawable/add_circle.xml  | 10 ++++
 .../app/src/main/res/drawable/cancel.xml      | 10 ++++
 .../main/res/layout/cpo_emp_picker_item.xml   | 50 ++++++++++++++++
 .../src/main/res/layout/fragment_picker.xml   | 60 +++++++++++++++++++
 Ladefuchs/app/src/main/res/values/colors.xml  |  1 +
 Ladefuchs/app/src/main/res/values/dimens.xml  |  5 ++
 Ladefuchs/app/src/main/res/values/ids.xml     |  4 ++
 Ladefuchs/app/src/main/res/values/strings.xml |  2 +
 Ladefuchs/app/src/main/res/values/styles.xml  |  7 +++
 11 files changed, 209 insertions(+), 1 deletion(-)
 create mode 100644 Ladefuchs/app/src/main/java/app/ladefuchs/android/helper/OperatorListAdapter.kt
 create mode 100644 Ladefuchs/app/src/main/res/drawable/add_circle.xml
 create mode 100644 Ladefuchs/app/src/main/res/drawable/cancel.xml
 create mode 100644 Ladefuchs/app/src/main/res/layout/cpo_emp_picker_item.xml
 create mode 100644 Ladefuchs/app/src/main/res/layout/fragment_picker.xml
 create mode 100644 Ladefuchs/app/src/main/res/values/dimens.xml
 create mode 100644 Ladefuchs/app/src/main/res/values/ids.xml

diff --git a/Ladefuchs/app/src/main/java/app/ladefuchs/android/dataClasses/Operator.kt b/Ladefuchs/app/src/main/java/app/ladefuchs/android/dataClasses/Operator.kt
index 60cd52c..9355bf5 100644
--- a/Ladefuchs/app/src/main/java/app/ladefuchs/android/dataClasses/Operator.kt
+++ b/Ladefuchs/app/src/main/java/app/ladefuchs/android/dataClasses/Operator.kt
@@ -6,6 +6,18 @@ data class Operator(
     val types: List<String>,
     val updated: Long? = null,
     val image: String? = null
-){
+) {
     override fun toString(): String = displayName
+
+    override fun equals(other: Any?): Boolean {
+        if (this === other) return true
+        if (other !is Operator)
+            return false
+        if (this.displayName !== other.displayName) return false
+        if (this.identifier !== other.identifier) return false
+        if (this.types !== other.types) return false
+        if (this.updated !== other.updated) return false
+        if (this.image !== other.image) return false
+        return true
+    }
 }
diff --git a/Ladefuchs/app/src/main/java/app/ladefuchs/android/helper/OperatorListAdapter.kt b/Ladefuchs/app/src/main/java/app/ladefuchs/android/helper/OperatorListAdapter.kt
new file mode 100644
index 0000000..c06ad88
--- /dev/null
+++ b/Ladefuchs/app/src/main/java/app/ladefuchs/android/helper/OperatorListAdapter.kt
@@ -0,0 +1,47 @@
+package app.ladefuchs.android.helper
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.RecyclerView
+import app.ladefuchs.android.R
+import app.ladefuchs.android.dataClasses.Operator
+
+class BaseViewHolder(container: ViewGroup) : RecyclerView.ViewHolder(container)
+
+class BaseItemCallback : DiffUtil.ItemCallback<Operator>() {
+    override fun areItemsTheSame(oldItem: Operator, newItem: Operator) = oldItem.toString() == newItem.toString()
+
+    override fun areContentsTheSame(oldItem: Operator, newItem: Operator) = oldItem == newItem
+}
+
+class OperatorListAdapter(private val dataSet: Array<Operator>) :
+    RecyclerView.Adapter<OperatorListAdapter.ViewHolder>() {
+
+    class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+        //val textView: TextView
+
+        init {
+            // Define click listener for the ViewHolder's View
+            textView = view.findViewById(R.id.textView)
+        }
+    }
+    override fun onBindViewHolder(viewHolder: ViewHolder, position: Int) {
+        viewHolder.textView.text = dataSet[position].toString()
+    }
+
+    // Create new views (invoked by the layout manager)
+    override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): ViewHolder {
+        // Create a new view, which defines the UI of the list item
+        val view = LayoutInflater.from(viewGroup.context)
+            .inflate(R.layout.cpo_emp_picker_item, viewGroup, false)
+
+        return ViewHolder(view)
+    }
+
+    override fun getItemCount() = dataSet.size
+
+}
+
diff --git a/Ladefuchs/app/src/main/res/drawable/add_circle.xml b/Ladefuchs/app/src/main/res/drawable/add_circle.xml
new file mode 100644
index 0000000..c20287c
--- /dev/null
+++ b/Ladefuchs/app/src/main/res/drawable/add_circle.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="200dp"
+    android:height="200dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    >
+  <path
+      android:fillColor="@color/coloraddBtn"
+      android:pathData="M440,680L520,680L520,520L680,520L680,440L520,440L520,280L440,280L440,440L280,440L280,520L440,520L440,680ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/>
+</vector>
diff --git a/Ladefuchs/app/src/main/res/drawable/cancel.xml b/Ladefuchs/app/src/main/res/drawable/cancel.xml
new file mode 100644
index 0000000..578c0ba
--- /dev/null
+++ b/Ladefuchs/app/src/main/res/drawable/cancel.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    >
+  <path
+      android:fillColor="@color/colorAccentIntense"
+      android:pathData="M336,680L480,536L624,680L680,624L536,480L680,336L624,280L480,424L336,280L280,336L424,480L280,624L336,680ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/>
+</vector>
diff --git a/Ladefuchs/app/src/main/res/layout/cpo_emp_picker_item.xml b/Ladefuchs/app/src/main/res/layout/cpo_emp_picker_item.xml
new file mode 100644
index 0000000..711987c
--- /dev/null
+++ b/Ladefuchs/app/src/main/res/layout/cpo_emp_picker_item.xml
@@ -0,0 +1,50 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/list_item_height"
+    android:layout_marginLeft="@dimen/margin_medium"
+    android:layout_marginRight="@dimen/margin_medium"
+    android:background="@color/TableColorDark"
+    android:gravity="center_vertical">
+
+    <ImageButton
+        android:id="@+id/settingsButton"
+        android:layout_width="16dp"
+        android:layout_height="16dp"
+        android:background="transparent"
+        android:contentDescription="@string/settings_button"
+        android:scaleType="fitCenter"
+        android:layout_gravity="start|center"
+        android:src="@drawable/add_circle"
+        />
+    <ImageView
+        android:id="@+id/cpo_logo"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginStart="18dp"
+        android:layout_gravity="start|center"
+        android:src="@drawable/cpo_generic" />
+    <TextView
+        android:id="@+id/textViewHeading"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/element_text"
+        android:layout_marginStart="52dp"
+        android:layout_marginTop="5dp"
+        android:textSize="10sp"
+        android:textStyle="bold"
+        android:textColor="@color/TextColorBlack"
+        android:layout_gravity="start|top"
+        />
+
+    <TextView
+        android:id="@+id/textViewSubHeading"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/element_text"
+        android:layout_marginStart="52dp"
+        android:layout_marginTop="6dp"
+        android:textSize="8sp"
+        android:textColor="@color/TextColorDisabled"
+        android:layout_gravity="start|center"
+        />
+</FrameLayout>
\ No newline at end of file
diff --git a/Ladefuchs/app/src/main/res/layout/fragment_picker.xml b/Ladefuchs/app/src/main/res/layout/fragment_picker.xml
new file mode 100644
index 0000000..1b45441
--- /dev/null
+++ b/Ladefuchs/app/src/main/res/layout/fragment_picker.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/constraintLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/rounded_header_card">
+
+    <RelativeLayout
+        android:id="@+id/picker"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/colorPrimaryDark"
+        android:orientation="horizontal"
+        android:paddingTop="0dp"
+        app:layout_constraintBottom_toTopOf="@+id/scrollView"
+        app:layout_constraintEnd_toStartOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageButton
+            android:id="@+id/back_button"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_alignEnd="@+id/pickerHeaderText"
+            android:layout_gravity="end"
+            android:layout_marginTop="6dp"
+            android:layout_marginEnd="-6dp"
+            android:background="@color/colorPrimaryDark"
+            android:contentDescription="@string/zurueck"
+            app:srcCompat="@drawable/ic_baseline_cancel_24" />
+
+        <TextView
+            android:id="@+id/pickerHeaderText"
+            style="@style/PickerTopHeader"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:paddingBottom="8dp"
+            android:text="@string/picker" />
+    </RelativeLayout>
+
+
+    <ScrollView
+        android:id="@+id/scrollView"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:background="@color/PrimaryBackground"
+        app:layout_constraintHeight_default="percent"
+        app:layout_constraintHeight_percent="1.0"
+        app:layout_constraintHorizontal_bias="1.0"
+        app:layout_constraintStart_toStartOf="@+id/picker"
+        app:layout_constraintTop_toBottomOf="@+id/picker">
+
+
+    </ScrollView>
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Ladefuchs/app/src/main/res/values/colors.xml b/Ladefuchs/app/src/main/res/values/colors.xml
index 1036c96..ef4a8c4 100644
--- a/Ladefuchs/app/src/main/res/values/colors.xml
+++ b/Ladefuchs/app/src/main/res/values/colors.xml
@@ -4,6 +4,7 @@
     <color name="colorPrimaryDark">#CEC0AC</color>
     <color name="colorAccent">#F45A30</color>
     <color name="colorAccentIntense">#D23D26</color>
+    <color name="coloraddBtn">#00B500</color>
     <color name="colorCardDetails">#C6BBA4</color>
     <color name="colorCardDetailsPrice">#DDD9C6</color>
     <color name="PrimaryBackground">#EDE6D8</color>
diff --git a/Ladefuchs/app/src/main/res/values/dimens.xml b/Ladefuchs/app/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..1df5b4f
--- /dev/null
+++ b/Ladefuchs/app/src/main/res/values/dimens.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="list_item_height">120dp</dimen>
+    <dimen name="margin_medium">0dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/Ladefuchs/app/src/main/res/values/ids.xml b/Ladefuchs/app/src/main/res/values/ids.xml
new file mode 100644
index 0000000..4b83a22
--- /dev/null
+++ b/Ladefuchs/app/src/main/res/values/ids.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item name="textViewHeading" type="id" />
+</resources>
\ No newline at end of file
diff --git a/Ladefuchs/app/src/main/res/values/strings.xml b/Ladefuchs/app/src/main/res/values/strings.xml
index bd4a390..64a5744 100644
--- a/Ladefuchs/app/src/main/res/values/strings.xml
+++ b/Ladefuchs/app/src/main/res/values/strings.xml
@@ -29,6 +29,7 @@
     </string>
     <string name="attachment_summary_off">Only download attachments when manually requested</string>
     <string name="settings">Einstellungen</string>
+    <string name="picker">Anbieter hinzufügen</string>
     <string name="illusfuchs_SL">Der kleine Fuchs wurde mit ♥️ illustriert von Aga und Marcel-André</string>
     <string name="teamfuchs_header">Teamfuchs</string>
     <string name="teamfuchs_sl">Wir sind schuld. Wirklich!\nTrotzdem alle Angaben ohne Gewähr.</string>
@@ -98,4 +99,5 @@
     <string name="blockFeeHeader">Blockiergebühr</string>
     <string name="monthlyFeeHeader">Monatliche Gebühr</string>
     <string name="NotesHeader">Notizen</string>
+    <string name="element_text">Here will be the CPO/EMP</string>
 </resources>
\ No newline at end of file
diff --git a/Ladefuchs/app/src/main/res/values/styles.xml b/Ladefuchs/app/src/main/res/values/styles.xml
index fa0170c..24b35ec 100644
--- a/Ladefuchs/app/src/main/res/values/styles.xml
+++ b/Ladefuchs/app/src/main/res/values/styles.xml
@@ -31,6 +31,13 @@
         <item name="android:textStyle">bold</item>
     </style>
 
+    -- Picker
+
+    <style name="PickerTopHeader" parent="SettingsTopHeader">
+        <item name="android:textAlignment">textStart</item>
+        <item name="android:textSize">32sp</item>
+    </style>
+
 
     <style name="Füchse" parent="@android:style/TextAppearance.Medium">
         <item name="android:textSize">26sp</item>

From 7f9cfc8648472ea24e03f0d0616d8b9f7b19ad34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorsten=20Ro=CC=88sler?=
 <thorsten.roesler@teaminternet.com>
Date: Mon, 16 Oct 2023 12:31:44 +0200
Subject: [PATCH 5/5] Fix Dimensions

---
 .../app/ladefuchs/android/helper/OperatorListAdapter.kt  | 9 ++++++---
 Ladefuchs/app/src/main/res/layout/card_detail_dialog.xml | 1 -
 Ladefuchs/app/src/main/res/values/dimens.xml             | 2 +-
 Ladefuchs/app/src/main/res/values/ids.xml                | 4 ----
 4 files changed, 7 insertions(+), 9 deletions(-)
 delete mode 100644 Ladefuchs/app/src/main/res/values/ids.xml

diff --git a/Ladefuchs/app/src/main/java/app/ladefuchs/android/helper/OperatorListAdapter.kt b/Ladefuchs/app/src/main/java/app/ladefuchs/android/helper/OperatorListAdapter.kt
index c06ad88..18dd8a6 100644
--- a/Ladefuchs/app/src/main/java/app/ladefuchs/android/helper/OperatorListAdapter.kt
+++ b/Ladefuchs/app/src/main/java/app/ladefuchs/android/helper/OperatorListAdapter.kt
@@ -21,15 +21,18 @@ class OperatorListAdapter(private val dataSet: Array<Operator>) :
     RecyclerView.Adapter<OperatorListAdapter.ViewHolder>() {
 
     class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-        //val textView: TextView
+        val textViewHeading: TextView
+        val textViewSubHeading: TextView
 
         init {
             // Define click listener for the ViewHolder's View
-            textView = view.findViewById(R.id.textView)
+            textViewHeading = view.findViewById(R.id.textViewHeading)
+            textViewSubHeading = view.findViewById(R.id.textViewSubHeading)
         }
     }
     override fun onBindViewHolder(viewHolder: ViewHolder, position: Int) {
-        viewHolder.textView.text = dataSet[position].toString()
+        viewHolder.textViewHeading.text = dataSet[position].toString()
+        viewHolder.textViewHeading.text = dataSet[position].identifier
     }
 
     // Create new views (invoked by the layout manager)
diff --git a/Ladefuchs/app/src/main/res/layout/card_detail_dialog.xml b/Ladefuchs/app/src/main/res/layout/card_detail_dialog.xml
index e3df0dd..93e1773 100644
--- a/Ladefuchs/app/src/main/res/layout/card_detail_dialog.xml
+++ b/Ladefuchs/app/src/main/res/layout/card_detail_dialog.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout 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:background="@drawable/rounded_header_card">
diff --git a/Ladefuchs/app/src/main/res/values/dimens.xml b/Ladefuchs/app/src/main/res/values/dimens.xml
index 1df5b4f..9f93128 100644
--- a/Ladefuchs/app/src/main/res/values/dimens.xml
+++ b/Ladefuchs/app/src/main/res/values/dimens.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="list_item_height">120dp</dimen>
+    <dimen name="list_item_height">35dp</dimen>
     <dimen name="margin_medium">0dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/Ladefuchs/app/src/main/res/values/ids.xml b/Ladefuchs/app/src/main/res/values/ids.xml
deleted file mode 100644
index 4b83a22..0000000
--- a/Ladefuchs/app/src/main/res/values/ids.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <item name="textViewHeading" type="id" />
-</resources>
\ No newline at end of file