Added navigation graph and corresponding user preference for additional app layout option

2023-06-04 16:59:04 +02:00
parent 26c89108bf
commit 6d1ab773dc
13 changed files with 117 additions and 9 deletions
@@ -1,5 +1,6 @@
 <vector android:height="24dp" android:viewportHeight="357.65"
    android:viewportWidth="357.65" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#000000"
+    <path
+        android:fillColor="#000000"
        android:pathData="m9.82,264.18c-8.93,-19.87 -11.77,-40.45 -8.52,-61.92 0.83,-5.46 3.9,-16.85 5.97,-22.12 4.64,-11.83 11.28,-22.68 19.53,-31.95 4.28,-4.8 9.07,-9.23 15.08,-13.94 3.26,-2.55 3.29,-2.57 53.48,-31.72 27.62,-16.04 63.71,-36.87 80.2,-46.3 32.2,-18.4 30.68,-17.59 38.54,-20.44 20.37,-7.38 42.35,-8.15 63.73,-2.22 11.83,3.28 20.84,7.35 30.69,13.85 14.51,9.59 25.56,21.39 34.42,36.77 8.75,15.19 13.5,30.84 14.5,47.85 0.72,12.08 -0.34,22.3 -3.55,34.32 -2.06,7.73 -4.14,13.31 -7.37,19.8 -7.48,15.01 -16.87,26.39 -30.75,37.23 -3.17,2.48 -4.07,3.02 -32.86,19.81 -16.28,9.49 -52.37,30.33 -80.2,46.31 -54.89,31.51 -51.03,29.4 -59.16,32.34 -16.94,6.14 -35.33,7.71 -53.54,4.58 -4.8,-0.82 -14.51,-3.42 -18.76,-5.01 -20.91,-7.84 -38.04,-20.99 -50.97,-39.13 -2.99,-4.2 -8.45,-13.65 -10.46,-18.13zM42.11,266.92c8.95,12.71 21.97,22.9 36.73,28.75 4.04,1.6 12.72,3.94 17.07,4.6 5.35,0.81 11.08,1.03 16.98,0.64 9.55,-0.63 16,-2.1 25.51,-5.82 2.67,-1.05 7.87,-4 77.26,-43.97 75.11,-43.26 80.44,-46.4 85.04,-50.09 15.54,-12.46 25.59,-29.32 28.95,-48.62 2.81,-16.08 0.72,-32.39 -6.11,-47.81C321.9,100.86 317.37,93.17 314.76,89.65 306.96,79.16 297.19,70.9 285.75,65.14 280.47,62.48 276.22,60.88 270.23,59.28 261.09,56.85 253.97,56.14 244.75,56.75c-9.56,0.63 -16.02,2.1 -25.51,5.82 -2.67,1.05 -7.94,4.04 -77.27,43.97 -75.16,43.29 -80.43,46.39 -85.04,50.09 -15.54,12.46 -25.59,29.32 -28.95,48.62 -3.76,21.54 1.25,43.39 14.14,61.68zM58.8,242.34c-5.27,-11.33 -6.45,-24.6 -3.24,-36.72 1.58,-5.97 3.7,-10.64 7.21,-15.86 3.53,-5.25 7.28,-9.17 12.39,-12.94 1.25,-0.92 28.23,-16.61 77.11,-44.83C234.8,84.33 229.71,87.16 236.14,85.38 253.23,80.64 271.91,85.08 285.31,97.07c18.47,16.53 23.79,43.04 13.03,65.01 -1.56,3.19 -5.3,8.73 -7.73,11.43 -2.19,2.44 -5.26,5.21 -8.14,7.33 -1.26,0.93 -28.03,16.49 -77.13,44.84 -82.51,47.64 -77.44,44.82 -83.85,46.6 -24.98,6.93 -51.4,-5.69 -62.7,-29.95zM86.7,237.05c3.49,4.37 8.08,7.53 13.22,9.12 5.55,1.72 11.81,1.44 17.24,-0.76 2.69,-1.09 146.37,-84.05 149.27,-86.18 10.22,-7.52 13.5,-21.92 7.68,-33.7 -3.92,-7.94 -12,-13.84 -20.51,-14.97 -4.15,-0.55 -9.19,0.1 -13.11,1.69 -2.69,1.09 -146.37,84.04 -149.27,86.18 -10.64,7.84 -13.71,22.99 -7.07,34.92 0.53,0.95 1.68,2.63 2.55,3.72z" android:strokeWidth="0.264583"/>
 </vector>
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
@@ -660,6 +660,33 @@

                    </androidx.appcompat.widget.LinearLayoutCompat>

+                    <!-- Android version -->
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:id="@+id/button_android_version"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="@drawable/selectable_item_background"
+                        android:clickable="true"
+                        android:focusable="true"
+                        android:orientation="vertical"
+                        android:paddingHorizontal="16dp"
+                        android:paddingVertical="8dp">
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            app:fontFamily="@font/lato_bolditalic"
+                            android:text="@string/settings_api_level"
+                            android:textSize="16sp" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/text_android_version"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textSize="16sp" />
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
                    <!-- Build time -->
                    <androidx.appcompat.widget.LinearLayoutCompat
                        android:id="@+id/button_build_time"
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<navigation 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/nav_graph_compact"
+    app:startDestination="@id/schedule">
+
+    <fragment
+        android:id="@+id/compact_overview"
+        android:name="com.denizk0461.weserplaner.fragment.CompactOverviewFragment"
+        android:label="CompactOverviewFragment"
+        tools:layout="@layout/fragment_compact_overview">
+
+        <action
+            android:id="@+id/action_compact_overview_to_schedule"
+            app:destination="@id/schedule" />
+        <action
+            android:id="@+id/action_compact_overview_to_canteen"
+            app:destination="@id/canteen" />
+        <action
+            android:id="@+id/action_compact_overview_to_settings"
+            app:destination="@id/settings" />
+    </fragment>
+
+    <fragment
+        android:id="@+id/schedule"
+        android:name="com.denizk0461.weserplaner.fragment.EventFragment"
+        android:label="EventFragment"
+        tools:layout="@layout/fragment_event"/>
+    <fragment
+        android:id="@+id/canteen"
+        android:name="com.denizk0461.weserplaner.fragment.CanteenFragment"
+        android:label="CanteenFragment"
+        tools:layout="@layout/fragment_canteen"/>
+    <fragment
+        android:id="@+id/settings"
+        android:name="com.denizk0461.weserplaner.fragment.SettingsFragment"
+        android:label="SettingsFragment"
+        tools:layout="@layout/fragment_settings"/>
+
+</navigation>
@@ -2,7 +2,7 @@
 <navigation 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/main_nav_graph"
+    android:id="@+id/nav_graph_detailed"
    app:startDestination="@id/schedule">

    <fragment
@@ -30,4 +30,5 @@
        android:name="com.denizk0461.weserplaner.fragment.SettingsFragment"
        android:label="SettingsFragment"
        tools:layout="@layout/fragment_settings"/>
+
 </navigation>
@@ -286,6 +286,8 @@
    <string name="settings_hide_experiments_title">Verstecke experimentelle Einstellungen</string>
    <string name="settings_hide_experiments_subtitle">Rufe sie wieder über den Lizenzen-Knopf auf</string>

+    <string name="settings_api_level">Android-Version &amp; API-Level</string>
+
    <string name="settings_build_time">Gradle Build-Code &amp; Zeit</string>

    <string name="settings_beta_nav_title">Zeige in-Entwicklung-Bildschirme</string>
@@ -297,6 +297,8 @@
    <string name="settings_hide_experiments_title">Hide experimental settings</string>
    <string name="settings_hide_experiments_subtitle">Show them again via licences button</string>

+    <string name="settings_api_level">Android version &amp; API level</string>
+
    <string name="settings_build_time">Gradle build code &amp; time</string>

    <string name="settings_beta_nav_title">Show in-development screens</string>