From 66ad5e083948b18376543e96cfe04db87694cdc2 Mon Sep 17 00:00:00 2001
From: Tommaso Berlose <tommaso.berlose@gmail.com>
Date: Tue, 19 May 2020 20:01:11 +0200
Subject: [PATCH] Fix #133

---
 .idea/caches/build_file_checksums.ser         | Bin 537 -> 537 bytes
 app/build.gradle                              |   2 +-
 .../ui/fragments/GeneralTabFragment.kt        |  30 ++++++++----------
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index f8737bc3a4d242e972186cda8edfc2529cb15012..f1690a243802d186f11bb6aaead185efc2775a37 100644
GIT binary patch
delta 33
pcmbQqGLvP(3>H1nz^5DM<S+^fF3y%X_H>IHOH76NSq{dM3INYi3^)J)

delta 33
pcmbQqGLvP(3>MvQUsyNJ$zc?H7g2h0;jxQv0tA}WJL*e9D**fu4@Uq1

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<String>(requireContext(), header = getString(R.string.settings_date_format_title)).setSelectedValue(Preferences.dateFormat)
+            val now = Calendar.getInstance()
+            val dialog = BottomSheetMenu<String>(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 {