Reverted all changed introduced by PR #295 and #298

They'll be re-add by merging a specific feature branch

Author: Federico Iosue

.travis.yml

@@ -18,10 +18,10 @@ android:
     - tools
 
     # The BuildTools version used by your project
-    - build-tools-23.0.2
+    - build-tools-24.0.2
 
     # The SDK version used to compile your project
-    - android-23
+    - android-24
 
     # Additional components
     #- extra-google-google_play_services

build.gradle

@@ -21,14 +21,18 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:2.2.1'
         classpath 'me.tatarka:gradle-retrolambda:3.2.5'
         classpath 'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2'
     }
     // Exclude the version that the android plugin depends on.
     configurations.classpath.exclude group: 'com.android.tools.external.lombok'
 }
 
+plugins {
+    id "org.sonarqube" version "2.0.1"
+}
+
 allprojects {
     repositories {
         mavenLocal()
@@ -38,9 +42,9 @@ allprojects {
     }
 }
 
-apply plugin: "sonar-runner"
-sonarRunner {
-    sonarProperties {
+apply plugin: 'org.sonarqube'
+sonarqube {
+    properties {
         property "sonar.host.url", "http://localhost:9000"
         property "sonar.analysis.mode", "incremental"
         property 'sonar.sourceEncoding', 'UTF-8'
@@ -49,8 +53,8 @@ sonarRunner {
     }
 }
 subprojects {
-    sonarRunner {
-        sonarProperties {
+    sonarqube {
+        properties {
             properties["sonar.sources"] += "omniNotes/src/main/java"
         }
     }

gradle.properties

@@ -16,9 +16,9 @@
 #
 
 MIN_SDK=14
-TARGET_SDK=23
-VERSION_NAME=5.3.0
-VERSION_CODE=221
+TARGET_SDK=24
+VERSION_NAME=6.0
+VERSION_CODE=229
 PACKAGE=it.feio.android.omninotes
 
 # The following properties are empty defaults to allow build and can EVENTUALLY be overridden to allow:

gradle/wrapper/gradle-wrapper.properties

@@ -1,4 +1,21 @@
-#Thu Dec 01 18:50:36 CET 2016
+#
+# Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com)
+#
+# 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/>.
+#
+
+#Tue Sep 06 19:09:13 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

omniNotes/build.gradle

@@ -20,8 +20,8 @@ apply plugin: 'me.tatarka.retrolambda'
 
 android {
 
-    compileSdkVersion 25
-    buildToolsVersion "25.0.1"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.2"
     defaultConfig {
         applicationId project.PACKAGE
         minSdkVersion project.MIN_SDK
@@ -74,8 +74,6 @@ dependencies {
     }
     compile 'com.github.gabrielemariotti.changeloglib:changelog:2.0.0'
     compile 'be.billington.calendar.recurrencepicker:library:1.1.1'
-    compile 'com.android.support:appcompat-v7:25.0.1'
-    compile 'com.android.support:design:25.0.1'
     compile 'de.greenrobot:eventbus:2.4.0'
     compile 'com.pushbullet:android-extensions:1.0.4@aar'
     compile 'com.getbase:floatingactionbutton:1.10.1'
@@ -108,6 +106,11 @@ dependencies {
     compile 'com.github.federicoiosue:Omni-Notes-Commons:develop-SNAPSHOT'
     compile 'com.github.federicoiosue:checklistview:3.1.3'
     compile 'com.github.federicoiosue:pixlui:2.6'
+
+    compile 'com.android.support:appcompat-v7:24.2.1'
+    compile 'com.android.support:cardview-v7:24.2.1'
+    compile 'com.android.support:recyclerview-v7:24.2.1'
+    compile 'com.android.support:design:24.2.1'
 }
 
 android.buildTypes.each { type ->

omniNotes/src/main/java/it/feio/android/omninotes/BaseActivity.java

@@ -28,10 +28,12 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
+import android.support.design.widget.CollapsingToolbarLayout;
 import android.support.annotation.NonNull;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.content.LocalBroadcastManager;
 import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.*;
 import android.widget.EditText;
@@ -49,12 +51,12 @@
 import java.util.List;
 
 @SuppressLint("Registered")
-public class BaseActivity extends ActionBarActivity {
+public class BaseActivity extends AppCompatActivity {
 
     protected final int TRANSITION_VERTICAL = 0;
     protected final int TRANSITION_HORIZONTAL = 1;
 
-    protected SharedPreferences prefs;
+    public SharedPreferences prefs;
 
     protected String navigation;
     protected String navigationTmp; // used for widget navigation
@@ -186,13 +188,19 @@ protected void setActionBarTitle(String title) {
         int actionBarTitle = Resources.getSystem().getIdentifier("action_bar_title", "id", "android");
         android.widget.TextView actionBarTitleView = (android.widget.TextView) getWindow().findViewById(actionBarTitle);
         Typeface font = Typeface.createFromAsset(getAssets(), "fonts/Roboto-Regular.ttf");
-        if (actionBarTitleView != null) {
-            actionBarTitleView.setTypeface(font);
-        }
+        //if (actionBarTitleView != null) {
+        //    actionBarTitleView.setTypeface(font);
+        //}
 
-        if (getSupportActionBar() != null) {
-            getSupportActionBar().setTitle(title);
-        }
+//        CollapsingToolbarLayout collapsingToolbar =
+//                (CollapsingToolbarLayout) findViewById(R.id.collapsing_toolbar);
+//        collapsingToolbar.setCollapsedTitleTypeface(font);
+//        collapsingToolbar.setTitle("Title");
+
+
+        //if (getSupportActionBar() != null) {
+        //    getSupportActionBar().setTitle(title);
+        //}
     }