From 23d6aa98e0088c6aa010351cb03fec80c25b20a8 Mon Sep 17 00:00:00 2001
From: Geoffroy Bonneville <wismna@protonmail.com>
Date: Wed, 27 Dec 2023 22:30:50 +0100
Subject: [PATCH] Restore min SDK version Fix empty today view issue Fix
 toolbar loading issue in history view

---
 .idea/misc.xml                                    |  1 -
 app/build.gradle                                  |  2 +-
 .../donext/activities/HistoryActivity.java        |  5 +++++
 .../geoffroy/donext/activities/TodayActivity.java | 15 +++++++++++----
 app/src/main/res/menu/menu_today.xml              |  3 +--
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index d312de9..5d5260e 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
diff --git a/app/build.gradle b/app/build.gradle
index b0bfbeb..74d584c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,7 +5,7 @@ android {
 
     defaultConfig {
         applicationId "com.wismna.geoffroy.donext"
-        minSdkVersion 31
+        minSdkVersion 21
         targetSdkVersion 34
         versionCode 30
         versionName "1.9"
diff --git a/app/src/main/java/com/wismna/geoffroy/donext/activities/HistoryActivity.java b/app/src/main/java/com/wismna/geoffroy/donext/activities/HistoryActivity.java
index 501f65a..2e0731b 100644
--- a/app/src/main/java/com/wismna/geoffroy/donext/activities/HistoryActivity.java
+++ b/app/src/main/java/com/wismna/geoffroy/donext/activities/HistoryActivity.java
@@ -14,6 +14,11 @@ public class HistoryActivity extends ToolBarActivityBase {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_history);
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
         initToolBar();
     }
 }
diff --git a/app/src/main/java/com/wismna/geoffroy/donext/activities/TodayActivity.java b/app/src/main/java/com/wismna/geoffroy/donext/activities/TodayActivity.java
index 9bf1c7c..e3e9318 100644
--- a/app/src/main/java/com/wismna/geoffroy/donext/activities/TodayActivity.java
+++ b/app/src/main/java/com/wismna/geoffroy/donext/activities/TodayActivity.java
@@ -2,14 +2,15 @@ package com.wismna.geoffroy.donext.activities;
 
 import android.os.Build;
 import android.os.Bundle;
-import com.google.android.material.floatingactionbutton.FloatingActionButton;
-import androidx.fragment.app.FragmentManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.appcompat.widget.Toolbar;
 import android.view.Menu;
 import android.view.View;
 import android.widget.TextView;
 
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.FragmentManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.wismna.geoffroy.donext.R;
 import com.wismna.geoffroy.donext.adapters.TaskRecyclerViewAdapter;
 import com.wismna.geoffroy.donext.database.TaskDataAccess;
@@ -36,6 +37,12 @@ public class TodayActivity extends ToolBarActivityBase
         TextView date = findViewById(R.id.today_date);
         date.setText(LocalDate.now().toString("EEEE, dd MMMM yyyy", getCurrentLocale()));
 
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+
         // Set the no tasks texts
         TextView noTasks = findViewById(R.id.no_more_tasks);
         noTasks.setText(R.string.today_no_tasks);
diff --git a/app/src/main/res/menu/menu_today.xml b/app/src/main/res/menu/menu_today.xml
index ac68310..4159f22 100644
--- a/app/src/main/res/menu/menu_today.xml
+++ b/app/src/main/res/menu/menu_today.xml
@@ -1,4 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+<menu>
 </menu>
\ No newline at end of file