Add Stub Settings to Android

android/app/build.gradle

@@ -55,6 +55,7 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'androidx.preference:preference:1.1.0'
     implementation 'com.google.android.material:material:1.1.0-alpha10'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.1.0'

android/app/src/main/AndroidManifest.xml

@@ -26,6 +26,9 @@
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
             android:screenOrientation="userLandscape"/>
 
+        <activity
+            android:name=".settings.SettingsActivity" />
+
         <activity android:name=".TestStartActivity"
             android:theme="@style/AppTheme.Transparent"/>
     </application>

android/app/src/main/java/com/metallic/chiaki/main/MainActivity.kt

@@ -21,6 +21,8 @@ import android.app.ActivityOptions
 import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.view.Menu
+import android.view.MenuItem
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -28,6 +30,7 @@ import com.metallic.chiaki.R
 import com.metallic.chiaki.TestStartActivity
 import com.metallic.chiaki.common.getDatabase
 import com.metallic.chiaki.common.ext.viewModelFactory
+import com.metallic.chiaki.settings.SettingsActivity
 import io.reactivex.disposables.CompositeDisposable
 import kotlinx.android.synthetic.main.activity_main.*
 
@@ -40,6 +43,10 @@ class MainActivity : AppCompatActivity()
 		super.onCreate(savedInstanceState)
 		setContentView(R.layout.activity_main)
 
+		title = ""
+		setSupportActionBar(toolbar)
+
+
 		addButton.setOnClickListener {
 			Intent(this, TestStartActivity::class.java).also {
 				it.putExtra(TestStartActivity.EXTRA_REVEAL_X, addButton.x + addButton.width * 0.5f)
@@ -63,4 +70,23 @@ class MainActivity : AppCompatActivity()
 		super.onDestroy()
 		disposable.dispose()
 	}
+
+	override fun onCreateOptionsMenu(menu: Menu?): Boolean
+	{
+		menuInflater.inflate(R.menu.main, menu)
+		return true
+	}
+
+	override fun onOptionsItemSelected(item: MenuItem): Boolean = when(item.itemId)
+	{
+		R.id.action_settings ->
+		{
+			Intent(this, SettingsActivity::class.java).also {
+				startActivity(it)
+			}
+			true
+		}
+
+		else -> super.onOptionsItemSelected(item)
+	}
 }

android/app/src/main/java/com/metallic/chiaki/settings/SettingsActivity.kt

@@ -0,0 +1,31 @@
+/*
+ * This file is part of Chiaki.
+ *
+ * Chiaki is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Chiaki is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Chiaki.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.metallic.chiaki.settings
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import com.metallic.chiaki.R
+
+class SettingsActivity: AppCompatActivity()
+{
+	override fun onCreate(savedInstanceState: Bundle?)
+	{
+		super.onCreate(savedInstanceState)
+		setContentView(R.layout.activity_settings)
+	}
+}

android/app/src/main/java/com/metallic/chiaki/settings/SettingsFragment.kt

@@ -0,0 +1,30 @@
+/*
+ * This file is part of Chiaki.
+ *
+ * Chiaki is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Chiaki is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Chiaki.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.metallic.chiaki.settings
+
+import android.os.Bundle
+import androidx.preference.PreferenceFragmentCompat
+import com.metallic.chiaki.R
+
+class SettingsFragment: PreferenceFragmentCompat()
+{
+	override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?)
+	{
+		setPreferencesFromResource(R.xml.preferences, rootKey)
+	}
+}

android/app/src/main/res/drawable/ic_settings_48dp.xml

@@ -0,0 +1,4 @@
+<vector android:height="48dp" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?attr/colorOnSurface" android:pathData="M19.1,12.9a2.8,2.8 0,0 0,0.1 -0.9,2.8 2.8,0 0,0 -0.1,-0.9l2.1,-1.6a0.7,0.7 0,0 0,0.1 -0.6L19.4,5.5a0.7,0.7 0,0 0,-0.6 -0.2l-2.4,1a6.5,6.5 0,0 0,-1.6 -0.9l-0.4,-2.6a0.5,0.5 0,0 0,-0.5 -0.4H10.1a0.5,0.5 0,0 0,-0.5 0.4L9.3,5.4a5.6,5.6 0,0 0,-1.7 0.9l-2.4,-1a0.4,0.4 0,0 0,-0.5 0.2l-2,3.4c-0.1,0.2 0,0.4 0.2,0.6l2,1.6a2.8,2.8 0,0 0,-0.1 0.9,2.8 2.8,0 0,0 0.1,0.9L2.8,14.5a0.7,0.7 0,0 0,-0.1 0.6l1.9,3.4a0.7,0.7 0,0 0,0.6 0.2l2.4,-1a6.5,6.5 0,0 0,1.6 0.9l0.4,2.6a0.5,0.5 0,0 0,0.5 0.4h3.8a0.5,0.5 0,0 0,0.5 -0.4l0.3,-2.6a5.6,5.6 0,0 0,1.7 -0.9l2.4,1a0.4,0.4 0,0 0,0.5 -0.2l2,-3.4c0.1,-0.2 0,-0.4 -0.2,-0.6ZM12,15.6A3.6,3.6 0,1 1,15.6 12,3.6 3.6,0 0,1 12,15.6Z"/>
+</vector>

android/app/src/main/res/layout/activity_main.xml

@@ -26,6 +26,7 @@
         android:layout_height="wrap_content"
         android:layout_width="match_parent">
         <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
             android:layout_height="wrap_content"
             android:layout_width="match_parent"
             android:background="?attr/colorPrimarySurface"

android/app/src/main/res/layout/activity_settings.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <fragment
+        android:id="@+id/settingsFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:name="com.metallic.chiaki.settings.SettingsFragment" />
+
+</LinearLayout>

android/app/src/main/res/menu/main.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/action_settings"
+        android:icon="@drawable/ic_settings_48dp"
+        android:title="@string/action_settings"
+        app:showAsAction="never" />
+</menu>

android/app/src/main/res/values/strings.xml

@@ -8,4 +8,5 @@
     <string name="action_reconnect">Reconnect</string>
     <string name="action_quit_session">Quit</string>
     <string name="action_login_pin_connect">Connect</string>
+    <string name="action_settings">Settings</string>
 </resources>

android/app/src/main/res/xml/preferences.xml

@@ -0,0 +1,11 @@
+<?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"/>
+
+    <Preference
+        app:key="feedback"
+        app:title="Send feedback"
+        app:summary="Report technical issues or suggest new features"/>
+</PreferenceScreen>