diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index f8737bc..f1690a2 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/build.gradle b/app/build.gradle index 78eecac..9ac06a8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,7 +18,7 @@ android { applicationId "com.tommasoberlose.anotherwidget" minSdkVersion 23 targetSdkVersion 29 - versionCode 97 + versionCode 98 versionName "2.0.10" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/GeneralTabFragment.kt b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/GeneralTabFragment.kt index f79eea6..c7c43dc 100644 --- a/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/GeneralTabFragment.kt +++ b/app/src/main/java/com/tommasoberlose/anotherwidget/ui/fragments/GeneralTabFragment.kt @@ -251,24 +251,22 @@ class GeneralTabFragment : Fragment() { } action_date_format.setOnClickListener { - if (Preferences.showEvents) { - val now = Calendar.getInstance() - val dialog = BottomSheetMenu(requireContext(), header = getString(R.string.settings_date_format_title)).setSelectedValue(Preferences.dateFormat) + val now = Calendar.getInstance() + val dialog = BottomSheetMenu(requireContext(), header = getString(R.string.settings_date_format_title)).setSelectedValue(Preferences.dateFormat) - dialog.addItem(DateHelper.getDefaultDateText(requireContext(), now), "") - if (Preferences.dateFormat != "") { - dialog.addItem(DateHelper.getDateText(requireContext(), now), Preferences.dateFormat) - } - dialog.addItem(getString(R.string.custom_date_format), "-") - - dialog.addOnSelectItemListener { value -> - if (value == "-") { - startActivity(Intent(requireContext(), CustomDateActivity::class.java)) - } else { - Preferences.dateFormat = value - } - }.show() + dialog.addItem(DateHelper.getDefaultDateText(requireContext(), now), "") + if (Preferences.dateFormat != "") { + dialog.addItem(DateHelper.getDateText(requireContext(), now), Preferences.dateFormat) } + dialog.addItem(getString(R.string.custom_date_format), "-") + + dialog.addOnSelectItemListener { value -> + if (value == "-") { + startActivity(Intent(requireContext(), CustomDateActivity::class.java)) + } else { + Preferences.dateFormat = value + } + }.show() } action_background_color.setOnClickListener {