Merged develop

mrblackfree · Mar 2, 2016 · dec05f3 · dec05f3
2 parents 2d548c3 + c7936d3
commit dec05f3
Show file tree

Hide file tree

Showing 9 changed files with 177 additions and 18 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/etc/ON_banner_play.png b/etc/ON_banner_play.png
diff --git a/etc/ON_banner_play.xcf b/etc/ON_banner_play.xcf
diff --git a/gradle.properties.orig b/gradle.properties.orig
@@ -0,0 +1,26 @@
+#
+# Copyright (C) 2015 Federico Iosue ([email protected])
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundatibehaon, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+MIN_SDK=14
+TARGET_SDK=23
+<<<<<<< HEAD
+VERSION_NAME=5.3.0 Alpha 2
+=======
+VERSION_NAME=5.2.5
+>>>>>>> develop
+VERSION_CODE=206
+PACKAGE=it.feio.android.omninotes
diff --git a/omniNotes/build.gradle.orig b/omniNotes/build.gradle.orig
@@ -0,0 +1,136 @@
+/*
+ * Copyright (C) 2015 Federico Iosue ([email protected])
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+apply plugin: 'com.android.application'
+apply plugin: 'me.tatarka.retrolambda'
+
+android {
+    compileSdkVersion 23
+    buildToolsVersion "23.0.2"
+
+    defaultConfig {
+        applicationId project.PACKAGE
+        minSdkVersion project.MIN_SDK
+        targetSdkVersion project.TARGET_SDK
+        versionName project.VERSION_NAME
+        versionCode Integer.parseInt(project.VERSION_CODE)
+    }
+
+    packagingOptions {
+        exclude 'META-INF/LICENSE.txt'
+        exclude 'META-INF/NOTICE.txt'
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled true
+            shrinkResources false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+            applicationVariants.all { variant ->
+                variant.outputs.each { output ->
+                    def file = output.outputFile
+                    output.outputFile = new File(
+                            (String)file.parent,
+                            (String)file.name.replace("omniNotes", "Omni Notes-${variant.versionName}"))
+                }
+            }
+        }
+    }
+
+    productFlavors {
+        prod {}
+        alpha {
+            applicationId project.PACKAGE + ".alpha"
+        }
+    }
+
+    lintOptions {
+        abortOnError false
+        disable 'MissingTranslation'
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    sourceSets {
+        androidTest {
+            java.srcDirs = ['src/androidTest/java']
+        }
+    }
+}
+
+dependencies {
+
+    androidTestCompile 'junit:junit:4.12'
+    androidTestCompile 'com.jayway.android.robotium:robotium-solo:5.5.4'
+
+    testCompile 'junit:junit:4.12'
+
+    compile fileTree(include: '*.jar', dir: 'libs')
+
+    compile 'com.github.flavienlaurent.datetimepicker:library:0.0.2'
+    compile 'com.larswerkman:HoloColorPicker:1.4'
+    compile 'com.jakewharton:disklrucache:2.0.2'
+    compile 'de.keyboardsurfer.android.widget:crouton:1.8.4@aar'
+    compile 'com.google.android.apps.dashclock:dashclock-api:2.0.0'
+    compile('ch.acra:acra:4.7.0-RC.1') {
+        exclude group: 'org.json'
+    }
+    compile 'com.github.gabrielemariotti.changeloglib:changelog:2.0.0'
+    compile 'be.billington.calendar.recurrencepicker:library:1.1.1'
+    compile 'com.android.support:appcompat-v7:23.1.1'
+    compile 'com.android.support:design:23.1.1'
+    compile 'de.greenrobot:eventbus:2.4.0'
+    compile 'com.pushbullet:android-extensions:1.0.4@aar'
+    compile 'com.getbase:floatingactionbutton:1.10.1'
+    compile 'com.nhaarman.listviewanimations:lib-core:3.1.0@aar'
+    compile 'com.nhaarman.listviewanimations:lib-manipulation:3.1.0@aar'
+    compile 'com.github.bumptech.glide:glide:3.6.1'
+    compile('com.afollestad.material-dialogs:core:0.8.3.0@aar') {
+        transitive=true
+    }
+    compile('com.afollestad.material-dialogs:commons:0.8.3.0@aar') {
+        transitive=true
+    }
+    compile 'com.jakewharton:butterknife:7.0.1'
+    compile('org.mnode.ical4j:ical4j:1.0.6') {
+        exclude group: 'commons.io'
+    }
+    debugCompile 'com.squareup.leakcanary:leakcanary-android:1.3'
+    releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.3'
+    compile 'com.pnikosis:materialish-progress:1.5'
+    compile 'com.github.paolorotolo:appintro:1.3.0'
+    compile 'io.nlopez.smartlocation:library:3.2.0'
+    compile 'io.reactivex:rxandroid:1.0.1'
+    compile 'io.reactivex:rxjava:1.0.14'
+    compile 'com.artemzin.rxjava:proguard-rules:1.0.14.2'
+    compile 'com.tbruyelle.rxpermissions:rxpermissions:0.4.2@aar'
+    compile 'org.ocpsoft.prettytime:prettytime:3.2.7.Final'
+
+    compile 'com.github.federicoiosue:SimpleGallery:1.2.0'
+    compile 'com.github.federicoiosue:Springpad-Importer:1.0.1'
+<<<<<<< HEAD
+    compile 'com.github.federicoiosue:Omni-Notes-Commons:1.1.2'
+    compile 'com.github.federicoiosue:CheckListView:3.1.1'
+=======
+    compile 'com.github.federicoiosue:Omni-Notes-Commons:1.1.0'
+    compile 'com.github.federicoiosue:CheckListView:3.1.2'
+>>>>>>> develop
+    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
@@ -216,19 +216,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>