Merge branch 'release-314'

.gitignore

@@ -1,11 +1,6 @@
-.gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
 .DS_Store
-/build
 .idea/
-Swiftnotes.iml
-app/app.iml
-app/.idea/
-gradle/local.properties
+build/
+local.properties
+*.iml
+.gradle

README.md

@@ -9,7 +9,7 @@ It offers you a quick and easy way to stay organised, capture your thoughts, rem
 ### Build
 
 Steps on how to build Swiftnotes:
-- Make sure you have the latest version of Android Studio with Gradle v1.1.0 and the required Android SDK Tools installed (22.0.1 Build tools)
+- Make sure you have the latest version of Android Studio with Gradle v2.3.1 and the required Android SDK Tools installed (25.0.3 Build tools)
 - Clone this repository
 - Open Android Studio -> File -> Import Project
 - Select build.gradle in Swiftnotes

app/build.gradle

@@ -1,20 +1,20 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion '22.0.1'
+    compileSdkVersion 25
+    buildToolsVersion '25.0.3'
 
     defaultConfig {
         applicationId 'com.moonpi.swiftnotes'
         minSdkVersion 16
-        targetSdkVersion 22
-        versionCode 10
-        versionName '3.1.3'
+        targetSdkVersion 25
+        versionCode 11
+        versionName '3.1.4'
     }
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
@@ -26,6 +26,6 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:22.0.0'
-    compile 'com.android.support:support-v4:22.0.0'
+    compile 'com.android.support:appcompat-v7:25.3.1'
+    compile 'com.android.support:support-v4:25.3.1'
 }

app/src/main/java/com/moonpi/swiftnotes/DataUtils.java

@@ -32,23 +32,23 @@
     */
 
 
-public class DataUtils {
+class DataUtils {
 
-    public static final String NOTES_FILE_NAME = "notes.json"; // Local notes file name
-    public static final String NOTES_ARRAY_NAME = "notes"; // Root object name
+    static final String NOTES_FILE_NAME = "notes.json"; // Local notes file name
+    private static final String NOTES_ARRAY_NAME = "notes"; // Root object name
 
-    public static final String BACKUP_FOLDER_PATH = "/Swiftnotes"; // Backup folder path
-    public static final String BACKUP_FILE_NAME = "swiftnotes_backup.json"; // Backup file name
+    static final String BACKUP_FOLDER_PATH = "/Swiftnotes"; // Backup folder path
+    static final String BACKUP_FILE_NAME = "swiftnotes_backup.json"; // Backup file name
 
     // Note data constants used in intents and in key-value store
-    public static final int NEW_NOTE_REQUEST = 60000;
-    public static final String NOTE_REQUEST_CODE = "requestCode";
-    public static final String NOTE_TITLE = "title";
-    public static final String NOTE_BODY = "body";
-    public static final String NOTE_COLOUR = "colour";
-    public static final String NOTE_FAVOURED = "favoured";
-    public static final String NOTE_FONT_SIZE = "fontSize";
-    public static final String NOTE_HIDE_BODY = "hideBody";
+    static final int NEW_NOTE_REQUEST = 60000;
+    static final String NOTE_REQUEST_CODE = "requestCode";
+    static final String NOTE_TITLE = "title";
+    static final String NOTE_BODY = "body";
+    static final String NOTE_COLOUR = "colour";
+    static final String NOTE_FAVOURED = "favoured";
+    static final String NOTE_FONT_SIZE = "fontSize";
+    static final String NOTE_HIDE_BODY = "hideBody";
 
 
     /**
@@ -57,7 +57,7 @@ public class DataUtils {
      * @param notes Array of notes to be saved
      * @return true if successfully saved, false otherwise
      */
-    public static boolean saveData(File toFile, JSONArray notes) {
+    static boolean saveData(File toFile, JSONArray notes) {
         Boolean successful = false;
 
         JSONObject root = new JSONObject();
@@ -153,7 +153,7 @@ else if (toFile == getLocalPath() && !toFile.exists()) {
      * @param fromFile File we are reading from
      * @return JSONArray of notes
      */
-    public static JSONArray retrieveData(File fromFile) {
+    static JSONArray retrieveData(File fromFile) {
         JSONArray notes = null;
 
         // If file is backup and it doesn't exist -> return null
@@ -234,7 +234,7 @@ else if (fromFile == getLocalPath() && !fromFile.exists()) {
      * @param selectedNotes ArrayList of Integer which represent note positions to be deleted
      * @return New JSONArray of notes without the notes at positions 'selectedNotes'
      */
-    public static JSONArray deleteNotes(JSONArray from, ArrayList<Integer> selectedNotes) {
+    static JSONArray deleteNotes(JSONArray from, ArrayList<Integer> selectedNotes) {
         // Init new JSONArray
         JSONArray newNotes = new JSONArray();
 
@@ -260,15 +260,15 @@ public static JSONArray deleteNotes(JSONArray from, ArrayList<Integer> selectedN
      * Check if external storage is writable or not
      * @return true if writable, false otherwise
      */
-    public static boolean isExternalStorageWritable() {
+    static boolean isExternalStorageWritable() {
         return Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState());
     }
 
     /**
      * Check if external storage is readable or not
      * @return true if readable, false otherwise
      */
-    public static boolean isExternalStorageReadable() {
+    static boolean isExternalStorageReadable() {
         String state = Environment.getExternalStorageState();
 
         return Environment.MEDIA_MOUNTED.equals(state) ||

app/src/main/java/com/moonpi/swiftnotes/EditActivity.java

@@ -9,7 +9,7 @@
 import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.util.TypedValue;
 import android.view.Menu;
@@ -24,11 +24,18 @@
 
 import com.moonpi.swiftnotes.ColorPicker.ColorPickerDialog;
 
-import static com.moonpi.swiftnotes.ColorPicker.ColorPickerSwatch.*;
-import static com.moonpi.swiftnotes.DataUtils.*;
+import static com.moonpi.swiftnotes.ColorPicker.ColorPickerSwatch.OnColorSelectedListener;
+import static com.moonpi.swiftnotes.ColorPicker.ColorPickerSwatch.OnTouchListener;
+import static com.moonpi.swiftnotes.DataUtils.NEW_NOTE_REQUEST;
+import static com.moonpi.swiftnotes.DataUtils.NOTE_BODY;
+import static com.moonpi.swiftnotes.DataUtils.NOTE_COLOUR;
+import static com.moonpi.swiftnotes.DataUtils.NOTE_FONT_SIZE;
+import static com.moonpi.swiftnotes.DataUtils.NOTE_HIDE_BODY;
+import static com.moonpi.swiftnotes.DataUtils.NOTE_REQUEST_CODE;
+import static com.moonpi.swiftnotes.DataUtils.NOTE_TITLE;
 
 
-public class EditActivity extends ActionBarActivity implements Toolbar.OnMenuItemClickListener {
+public class EditActivity extends AppCompatActivity implements Toolbar.OnMenuItemClickListener {
 
     // Layout components
     private EditText titleEdit, bodyEdit;
@@ -147,7 +154,7 @@ protected void initToolbar() {
         toolbar.setTitle("");
 
         // Set a 'Back' navigation icon in the Toolbar and handle the click
-        toolbar.setNavigationIcon(R.drawable.abc_ic_ab_back_mtrl_am_alpha);
+        toolbar.setNavigationIcon(R.drawable.abc_ic_ab_back_material);
         toolbar.setNavigationOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -225,7 +232,7 @@ public void onClick(DialogInterface dialog, int which) {
                     public void onClick(DialogInterface dialog, int which) {
                         // If 'Yes' clicked -> check if title is empty
                         // If title not empty -> save and go back; Otherwise toast
-                        if (!isEmpty(titleEdit))
+                        if (!isEmpty(titleEdit) || !isEmpty(bodyEdit))
                             saveChanges();
 
                         else
@@ -360,7 +367,7 @@ public void onBackPressed() {
              *  If yes -> saveChanges
              *  If not -> hide keyboard if showing and finish
              */
-            if (!isEmpty(titleEdit)) {
+            if (!isEmpty(titleEdit) || !isEmpty(bodyEdit)) {
                 if (!(titleEdit.getText().toString().equals(bundle.getString(NOTE_TITLE))) ||
                     !(bodyEdit.getText().toString().equals(bundle.getString(NOTE_BODY))) ||
                     !(colour.equals(bundle.getString(NOTE_COLOUR))) ||

app/src/main/java/com/moonpi/swiftnotes/MainActivity.java

@@ -11,7 +11,7 @@
 import android.os.Bundle;
 import android.os.Environment;
 import android.support.v4.view.MenuItemCompat;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.SearchView;
 import android.support.v7.widget.Toolbar;
 import android.view.ActionMode;
@@ -32,10 +32,25 @@
 import java.io.File;
 import java.util.ArrayList;
 
-import static com.moonpi.swiftnotes.DataUtils.*;
-
-
-public class MainActivity extends ActionBarActivity implements AdapterView.OnItemClickListener,
+import static com.moonpi.swiftnotes.DataUtils.BACKUP_FILE_NAME;
+import static com.moonpi.swiftnotes.DataUtils.BACKUP_FOLDER_PATH;
+import static com.moonpi.swiftnotes.DataUtils.NEW_NOTE_REQUEST;
+import static com.moonpi.swiftnotes.DataUtils.NOTES_FILE_NAME;
+import static com.moonpi.swiftnotes.DataUtils.NOTE_BODY;
+import static com.moonpi.swiftnotes.DataUtils.NOTE_COLOUR;
+import static com.moonpi.swiftnotes.DataUtils.NOTE_FAVOURED;
+import static com.moonpi.swiftnotes.DataUtils.NOTE_FONT_SIZE;
+import static com.moonpi.swiftnotes.DataUtils.NOTE_HIDE_BODY;
+import static com.moonpi.swiftnotes.DataUtils.NOTE_REQUEST_CODE;
+import static com.moonpi.swiftnotes.DataUtils.NOTE_TITLE;
+import static com.moonpi.swiftnotes.DataUtils.deleteNotes;
+import static com.moonpi.swiftnotes.DataUtils.isExternalStorageReadable;
+import static com.moonpi.swiftnotes.DataUtils.isExternalStorageWritable;
+import static com.moonpi.swiftnotes.DataUtils.retrieveData;
+import static com.moonpi.swiftnotes.DataUtils.saveData;
+
+
+public class MainActivity extends AppCompatActivity implements AdapterView.OnItemClickListener,
         Toolbar.OnMenuItemClickListener, AbsListView.MultiChoiceModeListener,
         SearchView.OnQueryTextListener {
 

app/src/main/java/com/moonpi/swiftnotes/NoteAdapter.java

@@ -25,7 +25,7 @@
 /**
  * Adapter class for custom notes ListView
  */
-public class NoteAdapter extends BaseAdapter implements ListAdapter {
+class NoteAdapter extends BaseAdapter implements ListAdapter {
     private Context context;
     private JSONArray adapterData;
     private LayoutInflater inflater;
@@ -35,7 +35,7 @@ public class NoteAdapter extends BaseAdapter implements ListAdapter {
      * @param context application context
      * @param adapterData JSONArray of notes
      */
-    public NoteAdapter(Context context, JSONArray adapterData) {
+    NoteAdapter(Context context, JSONArray adapterData) {
         this.context = context;
         this.adapterData = adapterData;
         this.inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);

app/src/main/res/menu/menu_main.xml

@@ -7,7 +7,7 @@
 
     <item android:id="@+id/action_search"
         android:title="@string/action_search"
-        android:icon="@drawable/abc_ic_search_api_mtrl_alpha"
+        android:icon="@drawable/abc_ic_search_api_material"
         android:hint="@string/action_search"
         android:orderInCategory="100"
         app:actionViewClass="android.support.v7.widget.SearchView"

app/src/main/res/value-it/strings.xml → app/src/main/res/values-it/strings.xml

@@ -37,15 +37,15 @@
     <string name="action_delete">Elimina</string>
     <string name="action_delete_selected_number">Selezionati</string>
     <string name="action_font_size">Dimensione carattere nota</string>
-    <string name="action_hide_body">Nascondi il corpo della nota nell'elenco</string>
-    <string name="action_show_body">Mostra il corpo della nota nell'elenco</string>
+    <string name="action_hide_body">Nascondi il corpo della nota nell\'elenco</string>
+    <string name="action_show_body">Mostra il corpo della nota nell\'elenco</string>
     <!-- -->
     <string name="dialog_delete">Le note selezionate saranno eliminate!</string>
     <string name="dialog_note_colour">Cambia colore nota</string>
     <string name="dialog_save_changes">Salva modifiche?</string>
     <string name="dialog_font_size">Cambia dimensione carattere nota</string>
     <string name="dialog_rate_title">Vota app</string>
-    <string name="dialog_rate_message">Apri la pagina dell'app nel Play Store?
+    <string name="dialog_rate_message">Apri la pagina dell\'app nel Play Store?
         (Grazie mille per votare! Ci fa molto piacere!)</string>
     <string name="dialog_check_backup_if_sure">Sei sicuro di voler fare il backup delle note?</string>
     <string name="dialog_backup_created_title">Backup eseguito con successo</string>
@@ -64,8 +64,8 @@
     <string name="toast_note_saved">Nota salvata</string>
     <string name="toast_empty_note_discarded">Nota vuota rimossa</string>
     <string name="toast_edittext_cannot_be_empty">Il titolo non può essere vuoto</string>
-    <string name="toast_note_body_hidden">Il corpo della nota sarà ora nascosto nell'elenco delle note</string>
-    <string name="toast_note_body_showing">Il corpo della nota sarà ora mostrato nell'elenco delle note</string>
+    <string name="toast_note_body_hidden">Il corpo della nota sarà ora nascosto nell\'elenco delle note</string>
+    <string name="toast_note_body_showing">Il corpo della nota sarà ora mostrato nell\'elenco delle note</string>
     <string name="toast_backup_failed">Backup fallito</string>
     <string name="toast_backup_no_notes">Nessuna nota da fare il backup</string>
     <string name="toast_restore_successful">Note ripristinate</string>

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

@@ -13,6 +13,7 @@
         <item name="android:textColorPrimary">@color/white</item>
         <item name="actionModeStyle">@style/ActionModeStyle</item>
         <item name="actionMenuTextColor">@color/white</item>
+        <item name="android:alertDialogTheme">@style/Theme.AppCompat.Light.Dialog.Alert</item>
     </style>
 
     <style name="ActionModeStyle" parent="Widget.AppCompat.ActionMode" >

build.gradle

@@ -4,7 +4,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.5.0'
+        classpath 'com.android.tools.build:gradle:2.3.1'
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Dec 21 18:25:35 GMT 2014
+#Wed Apr 26 12:37:57 EEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip