diff --git a/app/build.gradle b/app/build.gradle index ff19ac1..7535d0e 100644 --- a/app/build.gradle +++ b/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" } diff --git a/app/release/oppen_gemini_ariane_2_0_1.apk b/app/release/oppen_gemini_ariane_2_0_1.apk new file mode 100644 index 0000000..f8b8b55 Binary files /dev/null and b/app/release/oppen_gemini_ariane_2_0_1.apk differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 783a55c..52d1591 100644 --- a/app/release/output-metadata.json +++ b/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" } ] diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3c039f6..92f7412 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -34,7 +34,10 @@ - + diff --git a/app/src/main/java/oppen/ariane/ui/settings/SettingsActivity.kt b/app/src/main/java/oppen/ariane/ui/settings/SettingsActivity.kt index f49065c..c9b14bb 100644 --- a/app/src/main/java/oppen/ariane/ui/settings/SettingsActivity.kt +++ b/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) + } } diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 8ff00ba..b4bf444 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -10,6 +10,17 @@ true + +