From 90c83a0b85381ddd8bf26d53fb02a0cf72f228a8 Mon Sep 17 00:00:00 2001
From: TecCheck <mcteccy@gmail.com>
Date: Tue, 16 Mar 2021 20:42:12 +0100
Subject: [PATCH] Rearrange strings

---
 app/src/main/AndroidManifest.xml                   |  4 ++--
 app/src/main/res/layout/activity_database_list.xml |  2 +-
 app/src/main/res/layout/activity_login.xml         |  2 +-
 app/src/main/res/values-de/strings.xml             |  4 ++--
 app/src/main/res/values/strings.xml                | 10 ++++++----
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 737142c..3816bbb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,10 +11,10 @@
         android:theme="@style/Theme.StoRe">
         <activity
             android:name=".DatabaseListActivity"
-            android:label="@string/select_database" />
+            android:label="@string/title_activity_database_list" />
         <activity
             android:name=".LoginActivity"
-            android:label="@string/login"
+            android:label="@string/title_activity_login"
             android:theme="@style/Theme.Store.Login" />
         <activity
             android:name=".AppSettingsActivity"
diff --git a/app/src/main/res/layout/activity_database_list.xml b/app/src/main/res/layout/activity_database_list.xml
index a6435ae..55c2f5c 100644
--- a/app/src/main/res/layout/activity_database_list.xml
+++ b/app/src/main/res/layout/activity_database_list.xml
@@ -15,7 +15,7 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             app:navigationIcon="@drawable/ic_baseline_arrow_back_24"
-            app:title="@string/select_database" />
+            app:title="@string/title_activity_database_list" />
 
     </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 41f6133..863b3ef 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -31,7 +31,7 @@
             android:layout_gravity="center_vertical"
             android:layout_marginStart="16dp"
             android:layout_weight="1"
-            android:text="@string/login"
+            android:text="@string/title_activity_login"
             android:textAppearance="@style/TextAppearance.MaterialComponents.Headline4"
             android:textColor="?attr/colorOnBackground" />
     </LinearLayout>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 059eadb..1f09477 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -31,7 +31,7 @@
     <string name="title_activity_app_settings">App Einstellungen</string>
 
     <!-- Login Activity -->
-    <string name="login">Login</string>
+    <string name="title_activity_login">Login</string>
     <string name="server_address">Server Adresse</string>
     <string name="username">Benutzername</string>
     <string name="password">Passwort</string>
@@ -42,6 +42,6 @@
     <string name="wrong_credentials">Benutzername und Passwort stimmen nicht überein</string>
 
     <!-- DatabaseListActivity -->
-    <string name="select_database">Datenbank auswählen</string>
+    <string name="title_activity_database_list">Datenbank auswählen</string>
     <string name="database_settings">Datenbank Einstellungen</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7733463..cb4feaf 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,8 +1,10 @@
 <resources>
     <string name="app_name" translatable="false">StoRe</string>
 
+    <!-- Main Activity -->
     <string name="no_database_text">There is no database to show here. You can create a new one here or in the nav menu on the left.</string>
     <string name="no_database_button">Create Database</string>
+    <string name="fab_add_item">Add Item</string>
 
     <!-- Main Navigation Drawer -->
     <string name="navigation_drawer_open">Open navigation drawer</string>
@@ -24,16 +26,16 @@
     <string name="nav_app">App</string>
     <string name="nav_app_settings">App Settings</string>
 
+    <!-- Main Action Menu -->
     <string name="action_search">Search</string>
     <string name="action_scanner">Code Scanner</string>
     <string name="action_tags">Tags</string>
 
-    <string name="fab_add_item">Add Item</string>
-
+    <!-- App Settings Activity -->
     <string name="title_activity_app_settings">App Settings</string>
 
     <!-- Login Activity -->
-    <string name="login">Login</string>
+    <string name="title_activity_login">Login</string>
     <string name="server_address">Server Address</string>
     <string name="username">Username</string>
     <string name="password">Password</string>
@@ -44,6 +46,6 @@
     <string name="wrong_credentials">Username or Password was wrong</string>
 
     <!-- Database List Activity -->
-    <string name="select_database">Select Database</string>
+    <string name="title_activity_database_list">Select Database</string>
     <string name="database_settings">Database Settings</string>
 </resources>
\ No newline at end of file