- some view improvements

amarradi · Jul 19, 2022 · 96f4dbf · 96f4dbf
1 parent bbd6375
commit 96f4dbf
Show file tree

Hide file tree

Showing 9 changed files with 112 additions and 74 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -3,14 +3,14 @@ plugins {
 }
 
 android {
-    compileSdkVersion 32
+    compileSdkVersion 33
 
     defaultConfig {
         applicationId "com.git.amarradi.palatschinkencounter"
         minSdkVersion 26
-        targetSdkVersion 32
-        versionCode 14
-        versionName "1.0.11"
+        targetSdkVersion 33
+        versionCode 15
+        versionName "1.0.12"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml
@@ -6,61 +6,75 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="vertical"
+
     tools:context=".MainActivity">
+
+
     <TextView
         android:id="@+id/tv_startpage"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:textAlignment="center"
         android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
-        android:layout_marginStart="32dp"
-        android:layout_marginTop="64dp"
+        android:layout_gravity="center"
+        android:layout_marginTop="8dp"
         android:text="@string/textviewComplain"
         android:textAppearance="?android:attr/textAppearanceMedium" />
 
     <TextView
         android:id="@+id/textview"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_above="@+id/image_startpage"
+
+
+        android:layout_alignParentStart="true"
+
+        android:layout_alignParentEnd="true"
+        android:layout_gravity="center"
+
+
 
-        android:layout_alignParentTop="true"
-        android:layout_marginStart="72dp"
-        android:layout_marginTop="59dp"
-        android:layout_toEndOf="@+id/tv_startpage"
         android:text="@string/txViewCounterState"
-        android:textAppearance="?android:attr/textAppearanceLarge" />
+        android:textAlignment="center"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
     <ImageView
-
         android:id="@+id/image_startpage"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
-        android:layout_below="@+id/tv_startpage"
-
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
 
+        android:layout_alignParentStart="true"
         android:layout_centerVertical="true"
-        android:layout_marginStart="41dp"
-        android:layout_marginTop="99dp"
+        android:layout_gravity="center"
+        android:layout_marginTop="16dp"
         android:contentDescription="@string/image"
         app:srcCompat="@drawable/logo_psc_512_transparent" />
 
-    <Button
+    <RelativeLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:layout_marginBottom="4dp"
+        android:layout_alignParentBottom="true">
 
-        android:id="@+id/counter_text_button"
-        android:layout_width="75dp"
-        android:layout_height="75dp"
-        android:layout_alignParentStart="true"
 
-        android:layout_alignParentBottom="true"
-        android:layout_marginStart="265dp"
-        android:layout_marginBottom="58dp"
 
-        android:background="@drawable/counter_plus_btn_bg_shape"
-        android:fontFamily="@font/opensans_extrabold"
+        <Button
+            android:id="@+id/counter_text_button"
+
+            android:layout_width="75dp"
+            android:layout_height="75dp"
+
+            android:gravity="center"
 
-        android:text="@string/btnCounter"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textColor="@color/md_theme_light_onPrimary" />
+            android:background="@drawable/counter_plus_btn_bg_shape"
+            android:fontFamily="@font/opensans_extrabold"
+            android:text="@string/btnCounter"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textColor="@color/md_theme_light_onPrimary" />
 
+    </RelativeLayout>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout-land/activity_recipe.xml b/app/src/main/res/layout-land/activity_recipe.xml
@@ -4,7 +4,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fillViewport="true"
-    android:overScrollMode="always">
+    android:overScrollMode="always"
+    android:layout_margin="5dp">
 
     <LinearLayout
         android:layout_width="match_parent"

diff --git a/app/src/main/res/layout-land/recycler_view_row.xml b/app/src/main/res/layout-land/recycler_view_row.xml
@@ -24,7 +24,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
-                android:paddingStart="8dp"
+                android:paddingStart="0dp"
                 android:paddingEnd="0dp"
                 android:paddingBottom="16dp"
                 android:textAppearance="?android:attr/textAppearanceMedium"

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<RelativeLayout
     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"
@@ -11,49 +11,69 @@
 
 
     <TextView
-        android:layout_gravity="center"
-        android:layout_marginTop="32dp"
-        android:layout_marginBottom="64dp"
         android:id="@+id/tv_startpage"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center"
+        android:layout_alignParentStart="true"
+
+        android:layout_alignParentTop="true"
+
+        android:layout_gravity="center"
+        android:layout_marginTop="32dp"
 
         android:text="@string/textviewComplain"
-        android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+        android:textAlignment="center"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
 
     <TextView
-        android:layout_gravity="center"
-        android:layout_marginBottom="32dp"
         android:id="@+id/textview"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_above="@+id/image_startpage"
+        android:layout_alignParentStart="true"
+
+
+        android:layout_gravity="center"
 
         android:text="@string/txViewCounterState"
-        android:textAppearance="?android:attr/textAppearanceLarge"
-        android:textSize="50sp" />
+        android:textAlignment="center"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
 
     <ImageView
-        android:layout_gravity="center"
-        android:layout_marginBottom="64dp"
         android:id="@+id/image_startpage"
-        android:layout_width="100dp"
+        android:layout_width="match_parent"
         android:layout_height="100dp"
+
+        android:layout_alignParentStart="true"
+        android:layout_centerVertical="true"
+        android:layout_gravity="center"
+        android:layout_marginTop="64dp"
         android:contentDescription="@string/image"
         app:srcCompat="@drawable/logo_psc_512_transparent" />
 
-        <Button
-            android:layout_gravity="center"
+    <RelativeLayout
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:layout_marginBottom="16dp"
+        android:layout_alignParentBottom="true">
+
+
 
-            android:id="@+id/counter_text_button"
-            android:layout_width="75dp"
-            android:layout_height="75dp"
+    <Button
+        android:id="@+id/counter_text_button"
 
-            android:background="@drawable/counter_plus_btn_bg_shape"
-            android:fontFamily="@font/opensans_extrabold"
+        android:layout_width="75dp"
+        android:layout_height="75dp"
+
+        android:gravity="center"
 
-            android:text="@string/btnCounter"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="@color/md_theme_light_onPrimary" />
+        android:background="@drawable/counter_plus_btn_bg_shape"
+        android:fontFamily="@font/opensans_extrabold"
+        android:text="@string/btnCounter"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textColor="@color/md_theme_light_onPrimary" />
 
-</LinearLayout>
+    </RelativeLayout>
+</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_recipe.xml b/app/src/main/res/layout/activity_recipe.xml
@@ -4,9 +4,11 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fillViewport="true"
-    android:overScrollMode="always">
+    android:overScrollMode="always"
+    android:layout_margin="5dp">
 
     <LinearLayout
+
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">

diff --git a/app/src/main/res/layout/recycler_view_row.xml b/app/src/main/res/layout/recycler_view_row.xml
@@ -24,7 +24,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
-                android:paddingStart="8dp"
+                android:paddingStart="0dp"
                 android:paddingEnd="0dp"
                 android:paddingBottom="16dp"
                 android:textAppearance="?android:attr/textAppearanceMedium"

diff --git a/app/src/main/res/raw/changelog.txt b/app/src/main/res/raw/changelog.txt
@@ -1,13 +1,8 @@
-## [1.0.11] - 2022-07-15
+## [1.0.12] - 2022-07-25
+happy birthday Palatschinkencounter
 ### Added
-- added option for follow the system in theme chooser
-- added icon to reset-Dialog
-- landscape-mode
+-margin in recipe
 ### Changed
-- Changed a margin in the changelog. Now it is easier to read
-- Changed the texts of the About page. A little more text but also a little cleared up
-- The logo reduced by 50dp in height and width
-- greater +1 Button on the Startpage
-- changed color of the +1 Button
-### Removed
-- unused fonts
+- landscape-mode-layout
+- portrait-mode-layout
+- added margin in recipe
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -52,4 +52,10 @@
         <item name="android:textColor">@color/md_theme_light_onPrimary</item>
         <item name="backgroundColor">@color/md_theme_light_primary</item>
     </style>
+
+    <style name="TextAppearance.AppCompat.Medium" parent="TextAppearance.AppCompat">
+        <item name="android:fontFamily">@font/opensans_regular</item>
+        <item name="android:textSize">64sp</item>
+        <item name="android:textColor">@color/md_theme_light_outline</item>
+    </style>
 </resources>