Bug fixes

Author: Jizzu

app/src/main/java/apps/jizzu/simpletodo/activity/AddTaskActivity.java

@@ -4,19 +4,24 @@
 import android.app.DatePickerDialog;
 import android.app.DialogFragment;
 import android.app.TimePickerDialog;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.design.widget.TextInputLayout;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.SwitchCompat;
 import android.support.v7.widget.Toolbar;
+import android.util.Log;
+import android.view.Display;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.DatePicker;
 import android.widget.EditText;
 import android.widget.RelativeLayout;
+import android.widget.TextView;
 import android.widget.TimePicker;
 
 import java.util.Calendar;
@@ -26,6 +31,8 @@
 import apps.jizzu.simpletodo.fragment.TimePickerFragment;
 import apps.jizzu.simpletodo.utils.Utils;
 
+import static android.content.ContentValues.TAG;
+
 /**
  * Activity for adding a new task to RecyclerView.
  */
@@ -62,6 +69,17 @@ protected void onCreate(Bundle savedInstanceState) {
         mTime = findViewById(R.id.taskTime);
         Button addTaskButton = findViewById(R.id.addTaskButton);
         mReminderSwitch = findViewById(R.id.reminderSwitch);
+        TextView reminderText = findViewById(R.id.tvSetReminder);
+
+        // Get the resolution of the user's screen
+        Display d = ((WindowManager) this.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
+        int width = d.getWidth();
+        int height = d.getHeight();
+        Log.d(TAG, "width = " + width + ", height = " + height);
+
+        if (width >= 480 || height >= 800) {
+            reminderText.setText(R.string.set_reminder_short);
+        }
 
         mReminderLayout.setVisibility(View.INVISIBLE);
 

app/src/main/java/apps/jizzu/simpletodo/activity/EditTaskActivity.java

@@ -5,6 +5,7 @@
 import android.app.DatePickerDialog;
 import android.app.DialogFragment;
 import android.app.TimePickerDialog;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.support.design.widget.TextInputLayout;
@@ -13,14 +14,17 @@
 import android.support.v7.widget.SwitchCompat;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
+import android.view.Display;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.DatePicker;
 import android.widget.EditText;
 import android.widget.RelativeLayout;
+import android.widget.TextView;
 import android.widget.TimePicker;
 import android.widget.Toast;
 
@@ -78,7 +82,17 @@ protected void onCreate(Bundle savedInstanceState) {
         mTimeEditText = findViewById(R.id.taskTime);
         Button addTaskButton = findViewById(R.id.addTaskButton);
         mReminderSwitch = findViewById(R.id.reminderSwitch);
+        TextView reminderText = findViewById(R.id.tvSetReminder);
 
+        // Get the resolution of the user's screen
+        Display d = ((WindowManager) this.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
+        int width = d.getWidth();
+        int height = d.getHeight();
+        Log.d(TAG, "width = " + width + ", height = " + height);
+
+        if (width >= 480 || height >= 800) {
+            reminderText.setText(R.string.set_reminder_short);
+        }
 
         // Get Intent data
         Intent intent = getIntent();

app/src/main/java/apps/jizzu/simpletodo/activity/MainActivity.java

@@ -179,6 +179,8 @@ public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
             int resId = R.anim.layout_animation;
             LayoutAnimationController animation = AnimationUtils.loadLayoutAnimation(this, resId);
             mRecyclerView.setLayoutAnimation(animation);
+        } else {
+            mFab.setVisibility(View.VISIBLE);
         }
     }
 
@@ -300,6 +302,8 @@ public void run() {
                     mFab.startAnimation(myAnim);
                 }
             }, 300);
+        } else {
+            mFab.setVisibility(View.VISIBLE);
         }
         MyApplication.activityResumed();
     }

app/src/main/res/values-ru/strings.xml

@@ -4,6 +4,7 @@
     <string name="empty_view_text">Создайте новые задачи \n с помощью кнопки +</string>
     <string name="create_task">Новая задача</string>
     <string name="set_reminder">Добавить напоминание</string>
+    <string name="set_reminder_short">Напоминание</string>
     <string name="hint_title">Заголовок</string>
     <string name="hint_date">Дата</string>
     <string name="hint_time">Время</string>

app/src/main/res/values/strings.xml

@@ -4,6 +4,7 @@
     <string name="empty_view_text">You can create new tasks \n using the + button</string>
     <string name="create_task">NEW TASK</string>
     <string name="set_reminder">Set reminder</string>
+    <string name="set_reminder_short">Reminder</string>
     <string name="hint_title">Title</string>
     <string name="hint_date">Date</string>
     <string name="hint_time">Time</string>