Update android studio. Add compose settings screen.
Some checks are pending
continuous-integration/drone/push Build is pending

This commit is contained in:
2023-01-19 19:38:01 +01:00
parent bcc08e4605
commit e09bd26859
16 changed files with 245 additions and 107 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

View File

@@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:showIn="navigation_view">
<group android:checkableBehavior="single">
<item
android:id="@+id/nav_counter"
android:icon="@drawable/ic_menu_camera"
android:title="@string/menu_counter" />
<item
android:id="@+id/nav_history"
android:icon="@drawable/ic_menu_gallery"
android:title="@string/menu_history" />
<item
android:id="@+id/nav_settings"
android:icon="@drawable/ic_menu_slideshow"
android:title="@string/menu_settings" />
</group>
</menu>

View File

@@ -1,18 +0,0 @@
<menu 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"
tools:context="me.zobrist.tichucounter.MainActivity">
<item
android:id="@+id/action_undo"
android:icon="@drawable/ic_baseline_undo_24"
android:orderInCategory="5"
android:title="@string/undo"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_new"
android:checkable="false"
android:icon="@drawable/ic_baseline_add_24"
android:orderInCategory="10"
android:title="@string/clear"
app:showAsAction="ifRoom" />
</menu>

View File

@@ -1,24 +0,0 @@
<?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/mobile_navigation"
app:startDestination="@+id/nav_counter">
<fragment
android:id="@+id/nav_counter"
android:name="me.zobrist.tichucounter.ui.counter.CounterFragment"
android:label="@string/menu_counter"
tools:layout="@layout/fragment_counter" />
<fragment
android:id="@+id/nav_history"
android:name="me.zobrist.tichucounter.ui.history.HistoryFragment"
android:label="@string/menu_history"
tools:layout="@layout/fragment_slideshow" />
<fragment
android:id="@+id/nav_settings"
android:name="me.zobrist.tichucounter.ui.settings.SettingsFragment"
android:label="@string/menu_settings" />
</navigation>

View File

@@ -1,25 +0,0 @@
<resources>
<!-- Theme Preference -->
<string-array name="theme_entries">
<item>@string/dark</item>
<item>@string/light</item>
<item>@string/android_default_text</item>
</string-array>
<string-array name="theme_values">
<item>dark</item>
<item>light</item>
<item>default</item>
</string-array>
<!-- Language Preference -->
<string-array name="language_entries">
<item>@string/english</item>
<item>@string/german</item>
</string-array>
<string-array name="language_values">
<item>en</item>
<item>de</item>
</string-array>
</resources>