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 f9eeab0..501f65a 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
@@ -1,8 +1,6 @@
package com.wismna.geoffroy.donext.activities;
import android.os.Bundle;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
import com.wismna.geoffroy.donext.R;
@@ -10,17 +8,12 @@ import com.wismna.geoffroy.donext.R;
* Created by gbe on 17-12-19.
* History Activity class
*/
-public class HistoryActivity extends AppCompatActivity {
+public class HistoryActivity extends ToolBarActivityBase {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_history);
- ActionBar toolbar = getSupportActionBar();
-
- // Show back button on toolbar
- assert toolbar != null;
- toolbar.setDisplayHomeAsUpEnabled(true);
- toolbar.setDisplayShowHomeEnabled(true);
+ 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 ef633e6..d53e24e 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
@@ -1,41 +1,51 @@
package com.wismna.geoffroy.donext.activities;
import android.content.SharedPreferences;
+import android.os.Build;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.design.widget.FloatingActionButton;
import android.support.v4.app.FragmentManager;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
+import android.widget.TextView;
import com.wismna.geoffroy.donext.R;
import com.wismna.geoffroy.donext.adapters.TaskRecyclerViewAdapter;
import com.wismna.geoffroy.donext.database.TaskDataAccess;
import com.wismna.geoffroy.donext.fragments.TodayFormDialogFragment;
-public class TodayActivity extends AppCompatActivity
+import org.joda.time.LocalDate;
+
+import java.util.Locale;
+
+public class TodayActivity extends ToolBarActivityBase
implements TodayFormDialogFragment.TodayTaskListener {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_today);
+
Toolbar toolbar = findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
+ initToolBar();
- // Get a support ActionBar corresponding to this toolbar
- ActionBar ab = getSupportActionBar();
+ // Show the date
+ TextView date = findViewById(R.id.today_date);
+ date.setText(LocalDate.now().toString("EEEE, dd MMMM yyyy", getCurrentLocale()));
- if (ab != null) {
- // Enable the Up button
- ab.setDisplayHomeAsUpEnabled(true);
- ab.setHomeButtonEnabled(true);
- }
+ // Set the no tasks texts
+ TextView noTasks = findViewById(R.id.no_more_tasks);
+ noTasks.setText(R.string.today_no_tasks);
+ noTasks.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_smiley_satisfied_light, 0);
+ noTasks.setCompoundDrawablePadding(10);
+
+ TextView createTasks = findViewById(R.id.create_tasks);
+ createTasks.setText(R.string.today_create_tasks);
}
@Override
@@ -44,6 +54,22 @@ public class TodayActivity extends AppCompatActivity
return true;
}
+ @Override
+ public void onTodayTaskDialogPositiveClick(View dialogView) {
+ FloatingActionButton fab = findViewById(R.id.fab);
+ fab.setEnabled(false);
+ }
+
+ @Override
+ public void onTodayTasksUpdated() {
+ FloatingActionButton fab = findViewById(R.id.fab);
+ fab.setEnabled(true);
+ try (TaskDataAccess taskDataAccess = new TaskDataAccess(this)) {
+ RecyclerView recyclerView = findViewById(R.id.task_list_view);
+ ((TaskRecyclerViewAdapter)recyclerView.getAdapter()).setItems(taskDataAccess.getTodayTasks());
+ }
+ }
+
/** Called when the user clicks on the Change Layout button */
public void changeLayout(MenuItem item) {
SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
@@ -58,7 +84,6 @@ public class TodayActivity extends AppCompatActivity
this.recreate();
}
-
public void onNewTaskClick(View view) {
TodayFormDialogFragment taskDialogFragment =
TodayFormDialogFragment.newInstance(TodayActivity.this);
@@ -77,19 +102,13 @@ public class TodayActivity extends AppCompatActivity
taskDialogFragment.showFragment(fragmentManager, title, getResources().getBoolean(R.bool.large_layout));
}
- @Override
- public void onTodayTaskDialogPositiveClick(View dialogView) {
- FloatingActionButton fab = findViewById(R.id.fab);
- fab.setEnabled(false);
- }
- @Override
- public void onTodayTasksUpdated() {
- FloatingActionButton fab = findViewById(R.id.fab);
- fab.setEnabled(true);
- try (TaskDataAccess taskDataAccess = new TaskDataAccess(this)) {
- RecyclerView recyclerView = findViewById(R.id.task_list_view);
- ((TaskRecyclerViewAdapter)recyclerView.getAdapter()).setItems(taskDataAccess.getTodayTasks());
+ private Locale getCurrentLocale(){
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N){
+ return getResources().getConfiguration().getLocales().get(0);
+ } else{
+ //noinspection deprecation
+ return getResources().getConfiguration().locale;
}
}
}
diff --git a/app/src/main/java/com/wismna/geoffroy/donext/activities/ToolBarActivityBase.java b/app/src/main/java/com/wismna/geoffroy/donext/activities/ToolBarActivityBase.java
new file mode 100644
index 0000000..aef7de3
--- /dev/null
+++ b/app/src/main/java/com/wismna/geoffroy/donext/activities/ToolBarActivityBase.java
@@ -0,0 +1,20 @@
+package com.wismna.geoffroy.donext.activities;
+
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AppCompatActivity;
+
+/**
+ * Created by GBE on 27/12/2017.
+ * Defines a template for sub activities
+ */
+
+public abstract class ToolBarActivityBase extends AppCompatActivity {
+ protected void initToolBar() {
+ ActionBar toolbar = getSupportActionBar();
+
+ // Show back button on toolbar
+ assert toolbar != null;
+ toolbar.setDisplayHomeAsUpEnabled(true);
+ toolbar.setDisplayShowHomeEnabled(true);
+ }
+}
diff --git a/app/src/main/java/com/wismna/geoffroy/donext/fragments/TasksFragment.java b/app/src/main/java/com/wismna/geoffroy/donext/fragments/TasksFragment.java
index f258dc1..5716652 100644
--- a/app/src/main/java/com/wismna/geoffroy/donext/fragments/TasksFragment.java
+++ b/app/src/main/java/com/wismna/geoffroy/donext/fragments/TasksFragment.java
@@ -197,12 +197,15 @@ public class TasksFragment extends Fragment implements
int totalTasks = taskRecyclerViewAdapter.getItemCount();
TextView totalTasksView = view.findViewById(R.id.total_task_count);
View noMoreTasks = view.findViewById(R.id.no_more_tasks);
+ View createTasks = view.findViewById(R.id.create_tasks);
if (totalTasks == 0) {
noMoreTasks.setVisibility(View.VISIBLE);
+ createTasks.setVisibility(View.VISIBLE);
totalTasksView.setVisibility(View.GONE);
}
else {
noMoreTasks.setVisibility(View.GONE);
+ createTasks.setVisibility(View.GONE);
totalTasksView.setVisibility(View.VISIBLE);
totalTasksView.setText(resources.getQuantityString(R.plurals.task_total, totalTasks, totalTasks));
}
diff --git a/app/src/main/res/drawable-hdpi/ic_arrow_right_light.png b/app/src/main/res/drawable-hdpi/ic_arrow_right_light.png
new file mode 100644
index 0000000..82ac72e
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_arrow_right_light.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_smiley_satisfied_light.png b/app/src/main/res/drawable-hdpi/ic_smiley_satisfied_light.png
new file mode 100644
index 0000000..a6847c2
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_smiley_satisfied_light.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_arrow_right_light.png b/app/src/main/res/drawable-mdpi/ic_arrow_right_light.png
new file mode 100644
index 0000000..11f7ab2
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_arrow_right_light.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_smiley_satisfied_light.png b/app/src/main/res/drawable-mdpi/ic_smiley_satisfied_light.png
new file mode 100644
index 0000000..612749d
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_smiley_satisfied_light.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_arrow_right_light.png b/app/src/main/res/drawable-xhdpi/ic_arrow_right_light.png
new file mode 100644
index 0000000..10850a3
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_arrow_right_light.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_smiley_satisfied_light.png b/app/src/main/res/drawable-xhdpi/ic_smiley_satisfied_light.png
new file mode 100644
index 0000000..6f755fa
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_smiley_satisfied_light.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_arrow_right_light.png b/app/src/main/res/drawable-xxhdpi/ic_arrow_right_light.png
new file mode 100644
index 0000000..a79ee94
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_arrow_right_light.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_smiley_satisfied_light.png b/app/src/main/res/drawable-xxhdpi/ic_smiley_satisfied_light.png
new file mode 100644
index 0000000..63dd2b8
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_smiley_satisfied_light.png differ
diff --git a/app/src/main/res/layout-v21/content_task_form.xml b/app/src/main/res/layout-v21/content_task_form.xml
index 1b4f80a..c793aa9 100644
--- a/app/src/main/res/layout-v21/content_task_form.xml
+++ b/app/src/main/res/layout-v21/content_task_form.xml
@@ -14,20 +14,6 @@
android:focusable="true"
android:focusableInTouchMode="true"
tools:context=".activities.MainActivity">
-
-
-
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_today.xml b/app/src/main/res/layout/activity_today.xml
index 467768c..fa7fd5b 100644
--- a/app/src/main/res/layout/activity_today.xml
+++ b/app/src/main/res/layout/activity_today.xml
@@ -12,7 +12,13 @@
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay">
-
+
-
-
-
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_tasks.xml b/app/src/main/res/layout/fragment_tasks.xml
index f60e379..c1e72ed 100644
--- a/app/src/main/res/layout/fragment_tasks.xml
+++ b/app/src/main/res/layout/fragment_tasks.xml
@@ -18,10 +18,25 @@
+
Annuler
Supprimer
Description de la tâche (optionnel)
- Liste
+ Ajouter à la liste
Le nom de la tâche ne peut pas être vide
Nom de la tâche
Priorité
@@ -46,7 +46,7 @@
Le nom de la liste ne peut pas être vide
Nom de la liste
Créer une nouvelle liste de tâches
- Super! Aucune tâche en cours!
+ Aucune tâche !
Vue Aujourd\'hui
Activer la vue Aujourd\'hui?
La vue Aujourd\'hui est une façon particulière d\'organiser vos tâches. Choisissez quelles tâches vous voulez faire dans la journée et elles apparaîtront dans cette vue. À la fin de la journée, cette vue est réinitialisée.
@@ -66,4 +66,7 @@
DoNext est un nouveau genre de gestionnaire de tâches, basé sur le principe que créer trop de tâches est contre-productif. Faites plutôt glisser vos tâches vers la gauche ou la droite pour les mettre à la fin de votre liste et travailler dessus plus tard !
Mes tâches
Editer les listes de tâches
+ Rien à faire aujourd\'hui
+ Créez-en une là
+ Ajoutez des tâches là
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 61837b9..0f986c9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -7,6 +7,7 @@
New task
Edit
Change layout
+ History
Left scroll arrow
@@ -24,7 +25,7 @@
OK
- List
+ Add to list
New task name
Task name cannot be blank
Optional task description
@@ -35,8 +36,9 @@
Delete
- Yay! No more tasks!
+ No tasks here!
Task is past due date
+ Create one there
Task %s
@@ -82,7 +84,8 @@
Select tasks
List name
Sorry, your Android version is not supported.
- History
+ Noting to do today
+ Add some tasks there
History