Skip to content

Commit 93f971a

Browse files
committed
ignore
1 parent e111790 commit 93f971a

3 files changed

Lines changed: 10 additions & 6 deletions

File tree

app/src/main/java/in/hridayan/ashell/settings/data/datastore/SettingsDataStore.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,13 +126,13 @@ class SettingsDataStore @Inject constructor(
126126

127127
suspend fun resetAndRestoreDefaults(): Boolean {
128128
val preserveKeys = setOf(
129+
SettingsKeys.FIRST_LAUNCH.name,
129130
SettingsKeys.LAST_LOCAL_BACKUP_TIME.name,
130131
SettingsKeys.LAST_CLOUD_BACKUP_TIME.name,
131132
SettingsKeys.SAVED_VERSION_CODE.name,
132133
SettingsKeys.GOOGLE_ACCOUNT_EMAIL.name,
133134
SettingsKeys.GOOGLE_ACCOUNT_PHOTO_URL.name,
134135
SettingsKeys.NEW_COMMANDS_AVAILABLE.name,
135-
SettingsKeys.FIRST_LAUNCH.name
136136
)
137137

138138
val currentPrefs = ds.data.first()

app/src/main/java/in/hridayan/ashell/settings/presentation/page/backup/screens/BackupAndRestoreScreen.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -448,12 +448,15 @@ private fun TimeCard(
448448
roundedCornerShape: RoundedCornerShape,
449449
icon: Painter,
450450
title: String,
451-
timeDescription: String,
451+
timeDescription: String
452452
) {
453+
val context = LocalContext.current
454+
val res = LocalResources.current
455+
453456
RoundedCornerCard(
454457
modifier = modifier,
455458
roundedCornerShape = roundedCornerShape,
456-
onClick = withHaptic { }
459+
onClick = withHaptic { showToast(context, res.getString(R.string.have_a_nice_day)) }
457460
) {
458461
Row(
459462
modifier = Modifier

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,10 @@
115115
<string name="des_crash_history">View all crashes that have occurred in the app</string>
116116
<string name="des_default_language">Choose the default language for the app</string>
117117
<string name="des_disable_softkey">Useful when you want to use an external keyboard</string>
118-
<string name="des_drive_backup">Upload encrypted backup to your Google Drive</string>
118+
<string name="des_drive_backup">Upload encrypted backup to your Google Drive.\nThis action will overwrite any existing cloud backups.</string>
119119
<string name="des_drive_restore">Download your latest backup from Google Drive</string>
120120
<string name="des_dynamic_colors">Automatically set the app theme according to the device wallpaper</string>
121-
<string name="des_enable_direct_download">When turned on, updates will be downloaded directly from Github inside the app. Turn off to visit the Github releases page for manual download instead.</string>
121+
<string name="des_enable_direct_download">When turned on, updates will be downloaded directly from GitHub inside the app. Turn off to visit the Github releases page for manual download instead.</string>
122122
<string name="des_examples">Collection of some command templates</string>
123123
<string name="des_feature_request">If you have any ideas or suggestions for the app, let us know</string>
124124
<string name="des_haptics_and_vibration">Interactive haptics for touch feedback</string>
@@ -127,7 +127,7 @@
127127
<string name="des_local_backup">Save encrypted backup to your device</string>
128128
<string name="des_local_restore">Pick a backup file from your device</string>
129129
<string name="des_look_and_feel">Dynamic colors, Dark theme, Language</string>
130-
<string name="des_override_bookmarks">Might cause lag if a large number of bookmarks are added! Low end devices should keep this option turned off</string>
130+
<string name="des_override_bookmarks">Might cause lag if a large number of bookmarks are added! Low-end devices should keep this option turned off</string>
131131
<string name="des_pair_another_device">Pair another target device</string>
132132
<string name="des_report_issue">Report any issue or bug you have encountered while using the app</string>
133133
<string name="des_reset_app_settings">Reset app settings to default values</string>
@@ -303,6 +303,7 @@
303303
<string name="no_search_results_found">No search results found</string>
304304
<string name="no_wifi_connection">No WiFi connection</string>
305305
<string name="none">None</string>
306+
<string name="have_a_nice_day">Have a nice day!</string>
306307
<string name ="not_signed_in">Not signed in</string>
307308
<string name="fetching_backup_time">Fetching backup time …</string>
308309
<string name="nothing_to_clear">Nothing to clear</string>

0 commit comments

Comments
 (0)