New material things

vmihalachi · Oct 25, 2014 · 78407c2 · 78407c2
1 parent 4d26fa7
commit 78407c2
Show file tree

Hide file tree

Showing 164 changed files with 1,424 additions and 1,546 deletions.
diff --git a/app-pro/build.gradle b/app-pro/build.gradle
@@ -20,14 +20,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 20
-    buildToolsVersion '20.0.0'
+    compileSdkVersion 21
+    buildToolsVersion '21.0.2'
 
     defaultConfig {
         applicationId "com.maskyn.fileeditorpro"
         minSdkVersion 11
-        targetSdkVersion 19
-        versionCode 29
+        targetSdkVersion 21
+        versionCode 31
         versionName "1.12"
     }
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -19,32 +19,34 @@
 
 buildscript {
     repositories {
-        maven { url 'http://download.crashlytics.com/maven' }
+        mavenCentral()
+        maven { url 'https://maven.fabric.io/repo' }
     }
 
     dependencies {
-        classpath 'com.crashlytics.tools.gradle:crashlytics-gradle:1.+'
+        classpath 'io.fabric.tools:gradle:1.+'
     }
 
 }
 
 apply plugin: 'com.android.application'
-apply plugin: 'crashlytics'
+apply plugin: 'io.fabric'
 
 repositories {
-    maven { url 'http://download.crashlytics.com/maven' }
+    mavenCentral()
+    maven { url 'https://maven.fabric.io/repo' }
 }
 
 
 
 android {
-    compileSdkVersion 20
-    buildToolsVersion '20.0.0'
+    compileSdkVersion 21
+    buildToolsVersion '21.0.2'
     defaultConfig {
         applicationId "com.maskyn.fileeditor"
         minSdkVersion 11
-        targetSdkVersion 19
-        versionCode 30
+        targetSdkVersion 21
+        versionCode 31
         versionName "1.13"
     }
     compileOptions {
@@ -69,6 +71,8 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: '*.jar')
     compile project(':libraries:sharedCode')
-    compile 'com.google.android.gms:play-services:5.0.89'
-    compile 'com.crashlytics.android:crashlytics:1.+'
+    compile 'com.google.android.gms:play-services:6.1.11'
+    compile('com.crashlytics.sdk.android:crashlytics:2.+@aar') {
+        transitive = true;
+    }
 }
diff --git a/app/src/main/java/com/maskyn/fileeditor/HomeActivity.java b/app/src/main/java/com/maskyn/fileeditor/HomeActivity.java
@@ -23,6 +23,7 @@
 
 import com.crashlytics.android.Crashlytics;
 
+import io.fabric.sdk.android.Fabric;
 import sharedcode.turboeditor.activity.BaseHomeActivity;
 import sharedcode.turboeditor.preferences.PreferenceHelper;
 import sharedcode.turboeditor.util.ProCheckUtils;
@@ -36,7 +37,7 @@ public class HomeActivity extends BaseHomeActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if(PreferenceHelper.getSendErrorReports(this))
-            Crashlytics.start(this);
+            Fabric.with(this, new Crashlytics());
         // setup the ads
         if(!ProCheckUtils.isPro(this))
             adsHelper = new AdsHelper(this);

diff --git a/build.gradle b/build.gradle
@@ -24,7 +24,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.+'
+        classpath 'com.android.tools.build:gradle:0.13.+'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/build/intermediates/dex-cache/cache.xml b/build/intermediates/dex-cache/cache.xml
diff --git a/build/intermediates/model_data.bin b/build/intermediates/model_data.bin
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,25 +1,6 @@
-#
-# Copyright (C) 2014 Vlad Mihalachi
-#
-# This file is part of Turbo Editor.
-#
-# Turbo Editor 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.
-#
-# Turbo Editor 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/>.
-#
-
-#Wed Apr 10 15:27:10 PDT 2013
+#Wed Oct 22 18:10:25 CEST 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-all.zip
diff --git a/libraries/FloatingActionButton/build.gradle b/libraries/FloatingActionButton/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 android {
-    compileSdkVersion 20
-    buildToolsVersion '20.0.0'
+    compileSdkVersion 21
+    buildToolsVersion '21.0.2'
 
     defaultConfig {
         applicationId 'com.faizmalkani.floatingactionbutton'
         minSdkVersion 7
-        targetSdkVersion 19
+        targetSdkVersion 21
         versionName "1.0"
         versionCode 1
     }
@@ -22,6 +22,10 @@ android {
             assets.srcDirs = ['assets']
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
 }
 
 dependencies {

diff --git a/.../generated/source/buildConfig/debug/com/faizmalkani/floatingactionbutton/BuildConfig.java b/.../generated/source/buildConfig/debug/com/faizmalkani/floatingactionbutton/BuildConfig.java
@@ -5,9 +5,14 @@
 
 public final class BuildConfig {
   public static final boolean DEBUG = Boolean.parseBoolean("true");
-  public static final String PACKAGE_NAME = "com.faizmalkani.floatingactionbutton";
+  public static final String APPLICATION_ID = "com.faizmalkani.floatingactionbutton";
   public static final String BUILD_TYPE = "debug";
   public static final String FLAVOR = "";
   public static final int VERSION_CODE = 1;
   public static final String VERSION_NAME = "1.0";
+  /**
+   * @deprecated Use {@link #APPLICATION_ID}
+   */
+  @Deprecated
+  public static final String PACKAGE_NAME = "com.faizmalkani.floatingactionbutton";
 }
diff --git a/...enerated/source/buildConfig/release/com/faizmalkani/floatingactionbutton/BuildConfig.java b/...enerated/source/buildConfig/release/com/faizmalkani/floatingactionbutton/BuildConfig.java
@@ -5,9 +5,14 @@
 
 public final class BuildConfig {
   public static final boolean DEBUG = false;
-  public static final String PACKAGE_NAME = "com.faizmalkani.floatingactionbutton";
+  public static final String APPLICATION_ID = "com.faizmalkani.floatingactionbutton";
   public static final String BUILD_TYPE = "release";
   public static final String FLAVOR = "";
   public static final int VERSION_CODE = 1;
   public static final String VERSION_NAME = "1.0";
+  /**
+   * @deprecated Use {@link #APPLICATION_ID}
+   */
+  @Deprecated
+  public static final String PACKAGE_NAME = "com.faizmalkani.floatingactionbutton";
 }
diff --git a/.../source/buildConfig/test/debug/com/faizmalkani/floatingactionbutton/test/BuildConfig.java b/.../source/buildConfig/test/debug/com/faizmalkani/floatingactionbutton/test/BuildConfig.java
@@ -5,9 +5,14 @@
 
 public final class BuildConfig {
   public static final boolean DEBUG = Boolean.parseBoolean("true");
-  public static final String PACKAGE_NAME = "com.faizmalkani.floatingactionbutton.test";
+  public static final String APPLICATION_ID = "com.faizmalkani.floatingactionbutton.test";
   public static final String BUILD_TYPE = "debug";
   public static final String FLAVOR = "";
   public static final int VERSION_CODE = 1;
   public static final String VERSION_NAME = "1.0";
+  /**
+   * @deprecated Use {@link #APPLICATION_ID}
+   */
+  @Deprecated
+  public static final String PACKAGE_NAME = "com.faizmalkani.floatingactionbutton.test";
 }
diff --git a/...ngActionButton/build/generated/source/r/debug/com/faizmalkani/floatingactionbutton/R.java b/...ngActionButton/build/generated/source/r/debug/com/faizmalkani/floatingactionbutton/R.java
@@ -17,7 +17,7 @@ theme attribute (in the form
 "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>")
 containing a value of this type.
          */
-        public static int color=0x7f010001;
+        public static int colour=0x7f010001;
         /** <p>Must be an integer value, such as "<code>100</code>".
 <p>This may also be a reference to a resource (in the form
 "<code>@[<i>package</i>:]<i>type</i>:<i>name</i></code>") or
@@ -66,14 +66,14 @@ public static final class styleable {
            <colgroup align="left" />
            <colgroup align="left" />
            <tr><th>Attribute</th><th>Description</th></tr>
-           <tr><td><code>{@link #FloatingActionButton_color com.faizmalkani.floatingactionbutton:color}</code></td><td></td></tr>
+           <tr><td><code>{@link #FloatingActionButton_colour com.faizmalkani.floatingactionbutton:colour}</code></td><td></td></tr>
            <tr><td><code>{@link #FloatingActionButton_drawable com.faizmalkani.floatingactionbutton:drawable}</code></td><td></td></tr>
            <tr><td><code>{@link #FloatingActionButton_shadowColor com.faizmalkani.floatingactionbutton:shadowColor}</code></td><td></td></tr>
            <tr><td><code>{@link #FloatingActionButton_shadowDx com.faizmalkani.floatingactionbutton:shadowDx}</code></td><td></td></tr>
            <tr><td><code>{@link #FloatingActionButton_shadowDy com.faizmalkani.floatingactionbutton:shadowDy}</code></td><td></td></tr>
            <tr><td><code>{@link #FloatingActionButton_shadowRadius com.faizmalkani.floatingactionbutton:shadowRadius}</code></td><td></td></tr>
            </table>
-           @see #FloatingActionButton_color
+           @see #FloatingActionButton_colour
            @see #FloatingActionButton_drawable
            @see #FloatingActionButton_shadowColor
            @see #FloatingActionButton_shadowDx
@@ -85,7 +85,7 @@ public static final class styleable {
             0x7f010004, 0x7f010005
         };
         /**
-          <p>This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#color}
+          <p>This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#colour}
           attribute's value can be found in the {@link #FloatingActionButton} array.
 
 
@@ -96,9 +96,9 @@ <p>This may also be a reference to a resource (in the form
 theme attribute (in the form
 "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>")
 containing a value of this type.
-          @attr name com.faizmalkani.floatingactionbutton:color
+          @attr name com.faizmalkani.floatingactionbutton:colour
         */
-        public static final int FloatingActionButton_color = 1;
+        public static int FloatingActionButton_colour = 1;
         /**
           <p>This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#drawable}
           attribute's value can be found in the {@link #FloatingActionButton} array.
@@ -112,7 +112,7 @@ theme attribute (in the form
 containing a value of this type.
           @attr name com.faizmalkani.floatingactionbutton:drawable
         */
-        public static final int FloatingActionButton_drawable = 0;
+        public static int FloatingActionButton_drawable = 0;
         /**
           <p>This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#shadowColor}
           attribute's value can be found in the {@link #FloatingActionButton} array.
@@ -126,7 +126,7 @@ theme attribute (in the form
 containing a value of this type.
           @attr name com.faizmalkani.floatingactionbutton:shadowColor
         */
-        public static final int FloatingActionButton_shadowColor = 5;
+        public static int FloatingActionButton_shadowColor = 5;
         /**
           <p>This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#shadowDx}
           attribute's value can be found in the {@link #FloatingActionButton} array.
@@ -140,7 +140,7 @@ theme attribute (in the form
 containing a value of this type.
           @attr name com.faizmalkani.floatingactionbutton:shadowDx
         */
-        public static final int FloatingActionButton_shadowDx = 3;
+        public static int FloatingActionButton_shadowDx = 3;
         /**
           <p>This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#shadowDy}
           attribute's value can be found in the {@link #FloatingActionButton} array.
@@ -154,7 +154,7 @@ theme attribute (in the form
 containing a value of this type.
           @attr name com.faizmalkani.floatingactionbutton:shadowDy
         */
-        public static final int FloatingActionButton_shadowDy = 4;
+        public static int FloatingActionButton_shadowDy = 4;
         /**
           <p>This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#shadowRadius}
           attribute's value can be found in the {@link #FloatingActionButton} array.
@@ -168,6 +168,6 @@ theme attribute (in the form
 containing a value of this type.
           @attr name com.faizmalkani.floatingactionbutton:shadowRadius
         */
-        public static final int FloatingActionButton_shadowRadius = 2;
+        public static int FloatingActionButton_shadowRadius = 2;
     };
 }
diff --git a/...ActionButton/build/generated/source/r/release/com/faizmalkani/floatingactionbutton/R.java b/...ActionButton/build/generated/source/r/release/com/faizmalkani/floatingactionbutton/R.java
@@ -17,7 +17,7 @@ theme attribute (in the form
 "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>")
 containing a value of this type.
          */
-        public static int color=0x7f010001;
+        public static int colour=0x7f010001;
         /** <p>Must be an integer value, such as "<code>100</code>".
 <p>This may also be a reference to a resource (in the form
 "<code>@[<i>package</i>:]<i>type</i>:<i>name</i></code>") or
@@ -66,14 +66,14 @@ public static final class styleable {
            <colgroup align="left" />
            <colgroup align="left" />
            <tr><th>Attribute</th><th>Description</th></tr>
-           <tr><td><code>{@link #FloatingActionButton_color com.faizmalkani.floatingactionbutton:color}</code></td><td></td></tr>
+           <tr><td><code>{@link #FloatingActionButton_colour com.faizmalkani.floatingactionbutton:colour}</code></td><td></td></tr>
            <tr><td><code>{@link #FloatingActionButton_drawable com.faizmalkani.floatingactionbutton:drawable}</code></td><td></td></tr>
            <tr><td><code>{@link #FloatingActionButton_shadowColor com.faizmalkani.floatingactionbutton:shadowColor}</code></td><td></td></tr>
            <tr><td><code>{@link #FloatingActionButton_shadowDx com.faizmalkani.floatingactionbutton:shadowDx}</code></td><td></td></tr>
            <tr><td><code>{@link #FloatingActionButton_shadowDy com.faizmalkani.floatingactionbutton:shadowDy}</code></td><td></td></tr>
            <tr><td><code>{@link #FloatingActionButton_shadowRadius com.faizmalkani.floatingactionbutton:shadowRadius}</code></td><td></td></tr>
            </table>
-           @see #FloatingActionButton_color
+           @see #FloatingActionButton_colour
            @see #FloatingActionButton_drawable
            @see #FloatingActionButton_shadowColor
            @see #FloatingActionButton_shadowDx
@@ -85,7 +85,7 @@ public static final class styleable {
             0x7f010004, 0x7f010005
         };
         /**
-          <p>This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#color}
+          <p>This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#colour}
           attribute's value can be found in the {@link #FloatingActionButton} array.
 
 
@@ -96,9 +96,9 @@ <p>This may also be a reference to a resource (in the form
 theme attribute (in the form
 "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>")
 containing a value of this type.
-          @attr name com.faizmalkani.floatingactionbutton:color
+          @attr name com.faizmalkani.floatingactionbutton:colour
         */
-        public static final int FloatingActionButton_color = 1;
+        public static int FloatingActionButton_colour = 1;
         /**
           <p>This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#drawable}
           attribute's value can be found in the {@link #FloatingActionButton} array.
@@ -112,7 +112,7 @@ theme attribute (in the form
 containing a value of this type.
           @attr name com.faizmalkani.floatingactionbutton:drawable
         */
-        public static final int FloatingActionButton_drawable = 0;
+        public static int FloatingActionButton_drawable = 0;
         /**
           <p>This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#shadowColor}
           attribute's value can be found in the {@link #FloatingActionButton} array.
@@ -126,7 +126,7 @@ theme attribute (in the form
 containing a value of this type.
           @attr name com.faizmalkani.floatingactionbutton:shadowColor
         */
-        public static final int FloatingActionButton_shadowColor = 5;
+        public static int FloatingActionButton_shadowColor = 5;
         /**
           <p>This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#shadowDx}
           attribute's value can be found in the {@link #FloatingActionButton} array.
@@ -140,7 +140,7 @@ theme attribute (in the form
 containing a value of this type.
           @attr name com.faizmalkani.floatingactionbutton:shadowDx
         */
-        public static final int FloatingActionButton_shadowDx = 3;
+        public static int FloatingActionButton_shadowDx = 3;
         /**
           <p>This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#shadowDy}
           attribute's value can be found in the {@link #FloatingActionButton} array.
@@ -154,7 +154,7 @@ theme attribute (in the form
 containing a value of this type.
           @attr name com.faizmalkani.floatingactionbutton:shadowDy
         */
-        public static final int FloatingActionButton_shadowDy = 4;
+        public static int FloatingActionButton_shadowDy = 4;
         /**
           <p>This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#shadowRadius}
           attribute's value can be found in the {@link #FloatingActionButton} array.
@@ -168,6 +168,6 @@ theme attribute (in the form
 containing a value of this type.
           @attr name com.faizmalkani.floatingactionbutton:shadowRadius
         */
-        public static final int FloatingActionButton_shadowRadius = 2;
+        public static int FloatingActionButton_shadowRadius = 2;
     };
 }