From 65193fb575e5efbc1d344c0de55fc5b6f844d84a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Wed, 16 Oct 2019 16:44:23 +0200
Subject: [PATCH] Some Android Settings

---
 .../chiaki/settings/SettingsActivity.kt       |  3 ++
 .../app/src/main/res/layout/activity_main.xml |  2 +-
 .../src/main/res/layout/activity_settings.xml | 28 +++++++++++++++----
 android/app/src/main/res/values/strings.xml   |  7 ++++-
 android/app/src/main/res/xml/preferences.xml  | 19 ++++++++-----
 5 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/android/app/src/main/java/com/metallic/chiaki/settings/SettingsActivity.kt b/android/app/src/main/java/com/metallic/chiaki/settings/SettingsActivity.kt
index 45919bd..17df044 100644
--- a/android/app/src/main/java/com/metallic/chiaki/settings/SettingsActivity.kt
+++ b/android/app/src/main/java/com/metallic/chiaki/settings/SettingsActivity.kt
@@ -20,6 +20,7 @@ package com.metallic.chiaki.settings
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import com.metallic.chiaki.R
+import kotlinx.android.synthetic.main.activity_settings.*
 
 class SettingsActivity: AppCompatActivity()
 {
@@ -27,5 +28,7 @@ class SettingsActivity: AppCompatActivity()
 	{
 		super.onCreate(savedInstanceState)
 		setContentView(R.layout.activity_settings)
+		title = ""
+		setSupportActionBar(toolbar)
 	}
 }
\ No newline at end of file
diff --git a/android/app/src/main/res/layout/activity_main.xml b/android/app/src/main/res/layout/activity_main.xml
index f2d27a0..a042b36 100644
--- a/android/app/src/main/res/layout/activity_main.xml
+++ b/android/app/src/main/res/layout/activity_main.xml
@@ -122,7 +122,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:fontFamily="sans-serif-condensed"
-                android:text="@string/main_title"
+                android:text="@string/title_main"
                 android:textColor="?attr/colorOnPrimary"
                 android:textSize="20dp" />
 
diff --git a/android/app/src/main/res/layout/activity_settings.xml b/android/app/src/main/res/layout/activity_settings.xml
index 0113aed..9522232 100644
--- a/android/app/src/main/res/layout/activity_settings.xml
+++ b/android/app/src/main/res/layout/activity_settings.xml
@@ -1,14 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        android:theme="@style/AppTheme.Toolbar">
+        <androidx.appcompat.widget.AppCompatTextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:fontFamily="sans-serif-condensed"
+            android:text="@string/title_settings"
+            android:textColor="?attr/colorOnPrimary"
+            android:textSize="20dp" />
+    </com.google.android.material.appbar.MaterialToolbar>
+
     <fragment
         android:id="@+id/settingsFragment"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:name="com.metallic.chiaki.settings.SettingsFragment" />
+        android:layout_height="0dp"
+        android:name="com.metallic.chiaki.settings.SettingsFragment"
+        app:layout_constraintTop_toBottomOf="@id/toolbar"
+        app:layout_constraintBottom_toBottomOf="parent"/>
 
-</LinearLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 99ed915..34b3ecf 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -1,6 +1,7 @@
 <resources>
     <string name="app_name">Chiaki</string>
-    <string name="main_title">Chiaki 千秋</string>
+    <string name="title_main">Chiaki 千秋</string>
+    <string name="title_settings">Settings</string>
     <string name="alert_message_session_quit">Session has quit: %s</string>
     <string name="alert_message_session_create_error">Failed to create Session: %s</string>
     <string name="alert_message_login_pin_request">Login PIN:</string>
@@ -38,4 +39,8 @@
     <string name="alert_regist_duplicate">The console with MAC %s has already been registered. Should the previous record be overwritten?</string>
     <string name="action_regist_overwrite">Overwrite</string>
     <string name="action_regist_discard">Cancel</string>
+    <string name="preferences_category_title_general">General</string>
+    <string name="preferences_category_title_stream">Stream</string>
+    <string name="preferences_registered_hosts_title">Registered Consoles</string>
+    <string name="preferences_registered_hosts_summary">Currently registered: %d</string>
 </resources>
diff --git a/android/app/src/main/res/xml/preferences.xml b/android/app/src/main/res/xml/preferences.xml
index 19e2975..9929ea5 100644
--- a/android/app/src/main/res/xml/preferences.xml
+++ b/android/app/src/main/res/xml/preferences.xml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
-    <SwitchPreferenceCompat
-        app:key="notifications"
-        app:title="Enable message notifications"/>
+    <PreferenceCategory
+        app:key="category_general"
+        app:title="@string/preferences_category_title_general">
+        <Preference
+            app:key="registered_hosts"
+            app:summary="@string/preferences_registered_hosts_summary"
+            app:title="@string/preferences_registered_hosts_title"/>
+    </PreferenceCategory>
 
-    <Preference
-        app:key="feedback"
-        app:title="Send feedback"
-        app:summary="Report technical issues or suggest new features"/>
+    <PreferenceCategory
+        app:key="category_stream"
+        app:title="@string/preferences_category_title_stream">
+    </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file