Skip to content

Commit d12ab55

Browse files
committed
allow changing the selected date and time format
1 parent 12f0d5c commit d12ab55

File tree

2 files changed

+43
-14
lines changed

2 files changed

+43
-14
lines changed

app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/SettingsActivity.kt

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.simplemobiletools.filemanager.pro.activities
22

33
import android.content.Intent
44
import android.os.Bundle
5+
import com.simplemobiletools.commons.dialogs.ChangeDateTimeFormatDialog
56
import com.simplemobiletools.commons.dialogs.ConfirmationDialog
67
import com.simplemobiletools.commons.dialogs.SecurityDialog
78
import com.simplemobiletools.commons.extensions.beVisibleIf
@@ -28,6 +29,7 @@ class SettingsActivity : SimpleActivity() {
2829
setupCustomizeColors()
2930
setupUseEnglish()
3031
setupManageFavorites()
32+
setupChangeDateTimeFormat()
3133
setupShowHidden()
3234
setupHiddenItemPasswordProtection()
3335
setupAppPasswordProtection()
@@ -52,12 +54,6 @@ class SettingsActivity : SimpleActivity() {
5254
}
5355
}
5456

55-
private fun setupManageFavorites() {
56-
settings_manage_favorites_holder.setOnClickListener {
57-
startActivity(Intent(this, FavoritesActivity::class.java))
58-
}
59-
}
60-
6157
private fun setupUseEnglish() {
6258
settings_use_english_holder.beVisibleIf(config.wasUseEnglishToggled || Locale.getDefault().language != "en")
6359
settings_use_english.isChecked = config.useEnglish
@@ -68,6 +64,18 @@ class SettingsActivity : SimpleActivity() {
6864
}
6965
}
7066

67+
private fun setupManageFavorites() {
68+
settings_manage_favorites_holder.setOnClickListener {
69+
startActivity(Intent(this, FavoritesActivity::class.java))
70+
}
71+
}
72+
73+
private fun setupChangeDateTimeFormat() {
74+
settings_change_date_time_format_holder.setOnClickListener {
75+
ChangeDateTimeFormatDialog(this) {}
76+
}
77+
}
78+
7179
private fun setupShowHidden() {
7280
settings_show_hidden.isChecked = config.showHidden
7381
settings_show_hidden_holder.setOnClickListener {

app/src/main/res/layout/activity_settings.xml

Lines changed: 29 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,29 @@
3333

3434
</RelativeLayout>
3535

36+
<RelativeLayout
37+
android:id="@+id/settings_use_english_holder"
38+
android:layout_width="match_parent"
39+
android:layout_height="wrap_content"
40+
android:layout_marginTop="@dimen/medium_margin"
41+
android:background="?attr/selectableItemBackground"
42+
android:paddingLeft="@dimen/normal_margin"
43+
android:paddingTop="@dimen/activity_margin"
44+
android:paddingRight="@dimen/normal_margin"
45+
android:paddingBottom="@dimen/activity_margin">
46+
47+
<com.simplemobiletools.commons.views.MySwitchCompat
48+
android:id="@+id/settings_use_english"
49+
android:layout_width="match_parent"
50+
android:layout_height="wrap_content"
51+
android:background="@null"
52+
android:clickable="false"
53+
android:paddingStart="@dimen/medium_margin"
54+
android:text="@string/use_english_language"
55+
app:switchPadding="@dimen/medium_margin"/>
56+
57+
</RelativeLayout>
58+
3659
<RelativeLayout
3760
android:id="@+id/settings_manage_favorites_holder"
3861
android:layout_width="match_parent"
@@ -56,7 +79,7 @@
5679
</RelativeLayout>
5780

5881
<RelativeLayout
59-
android:id="@+id/settings_use_english_holder"
82+
android:id="@+id/settings_change_date_time_format_holder"
6083
android:layout_width="match_parent"
6184
android:layout_height="wrap_content"
6285
android:layout_marginTop="@dimen/medium_margin"
@@ -66,15 +89,13 @@
6689
android:paddingRight="@dimen/normal_margin"
6790
android:paddingBottom="@dimen/activity_margin">
6891

69-
<com.simplemobiletools.commons.views.MySwitchCompat
70-
android:id="@+id/settings_use_english"
71-
android:layout_width="match_parent"
92+
<com.simplemobiletools.commons.views.MyTextView
93+
android:id="@+id/settings_change_date_time_format"
94+
android:layout_width="wrap_content"
7295
android:layout_height="wrap_content"
73-
android:background="@null"
74-
android:clickable="false"
96+
android:layout_centerVertical="true"
7597
android:paddingStart="@dimen/medium_margin"
76-
android:text="@string/use_english_language"
77-
app:switchPadding="@dimen/medium_margin"/>
98+
android:text="@string/change_date_and_time_format"/>
7899

79100
</RelativeLayout>
80101

0 commit comments

Comments
 (0)