Skip to content

Commit 788e649

Browse files
authored
fix: back button on some settings screens (#161)
fixes: #151
1 parent 9a8aecb commit 788e649

3 files changed

Lines changed: 12 additions & 2 deletions

File tree

android/app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
<activity
8888
android:name=".prefs.CalendarsActivity"
8989
android:label="@string/title_calendars_activity"
90-
android:parentActivityName=".ui.SettingsActivity"
90+
android:parentActivityName=".ui.SettingsActivityX"
9191
android:theme="@style/AppTheme.NoActionBar"
9292
android:exported="true">
9393
<intent-filter>
@@ -100,7 +100,7 @@
100100
<activity
101101
android:name=".prefs.CarModeActivity"
102102
android:label="@string/title_car_mode_activity"
103-
android:parentActivityName=".ui.SettingsActivity"
103+
android:parentActivityName=".ui.SettingsActivityX"
104104
android:theme="@style/AppTheme.NoActionBar"
105105
android:exported="true">
106106
<intent-filter>

android/app/src/main/java/com/github/quarck/calnotify/prefs/CalendarsActivity.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,11 @@ class CalendarsActivity : AppCompatActivity() {
222222
}
223223
}
224224

225+
override fun onSupportNavigateUp(): Boolean {
226+
finish()
227+
return true
228+
}
229+
225230
companion object {
226231
private const val LOG_TAG = "CalendarsActivity"
227232
}

android/app/src/main/java/com/github/quarck/calnotify/prefs/CarModeActivity.kt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,11 @@ class CarModeActivity : AppCompatActivity() {
222222
}
223223
}
224224

225+
override fun onSupportNavigateUp(): Boolean {
226+
finish()
227+
return true
228+
}
229+
225230
companion object {
226231
private const val LOG_TAG = "CarModeActivity"
227232
}

0 commit comments

Comments
 (0)