mirror
/
ariane
mirror of https://git.sr.ht/~oppen/ariane
1
0
Fork 0
Code Issues Releases Wiki Activity

add toolbar to settings, and create 2.0.1 release

This commit is contained in:
Jonathan Fisher 2020-11-10 11:37:49 +00:00
parent ee38122931
commit 5e7faedc7d
6 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

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

BIN
app/release/oppen_gemini_ariane_2_0_1.apk Normal file
View File

Binary file not shown.

10
app/release/output-metadata.json
View File

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

5
app/src/main/AndroidManifest.xml
View File

@ -34,7 +34,10 @@
<data android:scheme="gemini" /> <data android:scheme="gemini" />
</intent-filter> </intent-filter>
</activity> </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> </application>

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

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

11
app/src/main/res/values/styles.xml
View File

@ -10,6 +10,17 @@
<item name="android:windowLightStatusBar" tools:targetApi="m">true</item> <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
</style> </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 name="FSDialog" parent="@style/AppTheme">
</style> </style>