Merged hotfix/5.2.5 into master

federicoiosue · Mar 2, 2016 · eb7a785 · eb7a785
2 parents f621607 + 2580372
commit eb7a785
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 21 deletions.
diff --git a/build.gradle b/build.gradle
@@ -21,7 +21,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0-beta5'
+        classpath 'com.android.tools.build:gradle:2.0.0-beta6'
         classpath 'me.tatarka:gradle-retrolambda:3.2.2'
     }
 }

diff --git a/gradle.properties b/gradle.properties
@@ -17,6 +17,6 @@
 
 MIN_SDK=14
 TARGET_SDK=23
-VERSION_NAME=5.2.4
-VERSION_CODE=205
+VERSION_NAME=5.2.5
+VERSION_CODE=206
 PACKAGE=it.feio.android.omninotes
diff --git a/omniNotes/build.gradle b/omniNotes/build.gradle
@@ -112,6 +112,6 @@ dependencies {
     compile 'com.github.federicoiosue:SimpleGallery:1.2.0'
     compile 'com.github.federicoiosue:Springpad-Importer:1.0.1'
     compile 'com.github.federicoiosue:Omni-Notes-Commons:1.1.0'
-    compile 'com.github.federicoiosue:CheckListView:3.1.1'
+    compile 'com.github.federicoiosue:CheckListView:3.1.2'
     compile 'com.github.federicoiosue:pixlUI:2.3'
 }
diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/DetailFragment.java b/omniNotes/src/main/java/it/feio/android/omninotes/DetailFragment.java
@@ -219,19 +219,7 @@ public void onResume() {
 		activityPausing = false;
 	}
 
-
-	@Override
-	public void onDestroy() {
-		super.onDestroy();
-		cleanMemoryLeaks();
-	}
-
-
-	private void cleanMemoryLeaks() {
-		ChecklistManager.unregister();
-	}
-
-
+
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		View view = inflater.inflate(R.layout.fragment_detail, container, false);

diff --git a/...tes/src/main/java/it/feio/android/omninotes/models/adapters/NavDrawerCategoryAdapter.java b/...tes/src/main/java/it/feio/android/omninotes/models/adapters/NavDrawerCategoryAdapter.java
@@ -116,7 +116,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
 
         // Set the results into ImageView checking if an icon is present before
         if (category.getColor() != null && category.getColor().length() > 0) {
-            Drawable img = mActivity.getResources().getDrawable(R.drawable.square);
+            Drawable img = mActivity.getResources().getDrawable(R.drawable.ic_folder_special_black_24dp);
             ColorFilter cf = new LightingColorFilter(Color.parseColor("#000000"), Integer.parseInt(category.getColor()));
             // Before API 16 the object is mutable yet
             if (Build.VERSION.SDK_INT >= 16) {
@@ -125,7 +125,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
                 img.setColorFilter(cf);
             }
             holder.imgIcon.setImageDrawable(img);
-            int padding = 12;
+            int padding = 4;
             holder.imgIcon.setPadding(padding, padding, padding, padding);
         }
 

diff --git a/omniNotes/src/main/res/layout/drawer_list_item.xml b/omniNotes/src/main/res/layout/drawer_list_item.xml
@@ -57,6 +57,10 @@
                 android:background="@drawable/category_count_bg"
                 android:paddingLeft="7dp"
                 android:paddingRight="7dp"
+                android:paddingStart="7dp"
+                android:paddingEnd="7dp"
+                android:paddingTop="1dp"
+                android:paddingBottom="1dp"
                 android:gravity="center"
                 android:visibility="gone"/>
 

diff --git a/omniNotes/src/main/res/raw/changelog.xml b/omniNotes/src/main/res/raw/changelog.xml
@@ -17,14 +17,19 @@
   -->
 <changelog bulletedList="true">
 
-    <changelogversion versionName="5.2.4" changeDate="Feb 28 2015">
+    <changelogversion versionName="5.2.5" changeDate="Mar 2, 2015">
+        <changelogtext>[i]Improved[/i] Categories layout in navigation panel</changelogtext>
+        <changelogtext>[i]Fixed[/i] Crash on checklist's items drag and drop on Android minor than KitKat</changelogtext>
+    </changelogversion>
+
+    <changelogversion versionName="5.2.4" changeDate="Feb 28, 2015">
         <changelogtext>[b]New![/b] Checklists animations and item deletion undo action</changelogtext>
         <changelogtext>[i]Improved[/i] Audio recording quality</changelogtext>
         <changelogtext>[i]Fixed[/i] Keyboard not shown creating note from home widget</changelogtext>
         <changelogtext>[i]Fixed[/i] Invisible note content field when switched back from checklist</changelogtext>
     </changelogversion>
 
-    <changelogversion versionName="5.2.3" changeDate="Jan 30 2015">
+    <changelogversion versionName="5.2.3" changeDate="Jan 30, 2015">
         <changelogtext>[b]New![/b] New section into settings containing privacy preferences</changelogtext>
         <changelogtext>[i]Improved[/i] Option to choose between prettied or precise dates into settings</changelogtext>
         <changelogtext>[i]Improved[/i] Keyboard is not automatically shown when creating a note from shared content</changelogtext>