add toolbar to settings, and create 2.0.1 release

app/build.gradle

@@ -11,8 +11,8 @@ android {
         applicationId "oppen.gemini.ariane"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 8
-        versionName "2.0.0"
+        versionCode 9
+        versionName "2.0.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/release/output-metadata.json

@@ -1,19 +1,17 @@
 {
-  "version": 1,
+  "version": 2,
   "artifactType": {
     "type": "APK",
     "kind": "Directory"
   },
   "applicationId": "oppen.gemini.ariane",
-  "variantName": "release",
+  "variantName": "processReleaseResources",
   "elements": [
     {
       "type": "SINGLE",
       "filters": [],
-      "properties": [],
-      "versionCode": 8,
-      "versionName": "2.0.0",
-      "enabled": true,
+      "versionCode": 9,
+      "versionName": "2.0.1",
       "outputFile": "app-release.apk"
     }
   ]

app/src/main/AndroidManifest.xml

@@ -34,7 +34,10 @@
                 <data android:scheme="gemini" />
             </intent-filter>
         </activity>
-        <activity android:name="oppen.ariane.ui.settings.SettingsActivity" android:label="@string/settings" />
+        <activity
+            android:name="oppen.ariane.ui.settings.SettingsActivity"
+            android:label="@string/settings"
+            android:theme="@style/SettingsTheme"/>
 
     </application>
 

app/src/main/java/oppen/ariane/ui/settings/SettingsActivity.kt

@@ -1,6 +1,7 @@
 package oppen.ariane.ui.settings
 
 import android.os.Bundle
+import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
 import oppen.ariane.R
 
@@ -9,6 +10,15 @@ class SettingsActivity: AppCompatActivity() {
         super.onCreate(savedInstanceState)
 
         setContentView(R.layout.activity_settings)
+
+        supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        supportActionBar?.setHomeAsUpIndicator(R.drawable.vector_close)
+
         supportFragmentManager.beginTransaction().replace(R.id.settings_container, SettingsFragment()).commit()
     }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        finish()
+        return super.onOptionsItemSelected(item)
+    }
 }

app/src/main/res/values/styles.xml

@@ -10,6 +10,17 @@
         <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
     </style>
 
+    <style name="SettingsTheme" parent="Theme.MaterialComponents.DayNight">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        <item name="android:windowTranslucentStatus">false</item>
+        <item name="android:statusBarColor">@color/header_background</item>
+        <item name="windowActionBar">true</item>
+        <item name="windowNoTitle">false</item>
+        <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
+    </style>
+
     <style name="FSDialog" parent="@style/AppTheme">
 
     </style>