Update [2.2.5]

-Dark UI added -Changelog added to Settings
aschot-myan · Dec 15, 2014 · d2bfd72 · d2bfd72
1 parent 7e8356a
commit d2bfd72
Show file tree

Hide file tree

Showing 17 changed files with 490 additions and 590 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 ====================
 
+Update [2.2.5]
+
+-Dark UI added
+-Changelog added to Settings
+
 Update [2.2.4]
 
 -Fixed first start error

diff --git a/CardsUILib/build.gradle b/CardsUILib/build.gradle
@@ -1,21 +1,8 @@
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0-rc1'
-    }
-}
 apply plugin: 'com.android.library'
 
-
-dependencies {
-    compile fileTree(dir: 'libs', include: '*.jar')
-}
-
 android {
     compileSdkVersion 21
-    buildToolsVersion '21.1.1'
+    buildToolsVersion '21.1.2'
 
     sourceSets {
         main {
@@ -40,4 +27,7 @@ android {
         debug.setRoot('build-types/debug')
         release.setRoot('build-types/release')
     }
+    dependencies {
+        compile fileTree(dir: 'libs', include: '*.jar')
+    }
 }
diff --git a/CardsUILib/src/com/fima/cardsui/views/MyCard.java b/CardsUILib/src/com/fima/cardsui/views/MyCard.java
@@ -43,8 +43,8 @@ protected void applyTo(View convertView) {
 	    if (fontColor != 0) {
 		    ((TextView) convertView.findViewById(R.id.title)).setTextColor(fontColor);
 	    }
-        if (!this.description.equals("")) {
-	        ((TextView) convertView.findViewById(R.id.description)).setText(this.description);
+        if (!description.equals("")) {
+	        ((TextView) convertView.findViewById(R.id.description)).setText(description);
 	        if (fontColor != 0)
 		        ((TextView) convertView.findViewById(R.id.description)).setTextColor(fontColor);
         }

diff --git a/RashrApp/RashrApp-release.apk b/RashrApp/RashrApp-release.apk
diff --git a/RashrApp/RashrApp.iml b/RashrApp/RashrApp.iml
@@ -83,10 +83,10 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="support-v4-21.0.2" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-21.0.2" level="project" />
-    <orderEntry type="library" exported="" name="play-services-6.1.71" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-21.0.2" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="play-services-6.5.87" level="project" />
     <orderEntry type="module" module-name="CardsUILib" exported="" />
     <orderEntry type="module" module-name="root-commands" exported="" />
     <orderEntry type="module" module-name="Utils-Library" exported="" />

diff --git a/RashrApp/build.gradle b/RashrApp/build.gradle
@@ -2,35 +2,28 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 21
-    buildToolsVersion '21.1.1'
+    buildToolsVersion '21.1.2'
     defaultConfig {
         minSdkVersion 9
-        versionCode 91
-        versionName '2.2.4'
+        versionCode 92
+        versionName '2.2.5'
     }
     signingConfigs {
         DsLNeXuS {
             storeFile file('C:/Users/ashot_000/Google Drive/workspace/Keystone.key')
         }
     }
-    buildTypes {
-        release {
-            debuggable false
-        }
-    }
     lintOptions {
         abortOnError false
     }
-    productFlavors {
-    }
-}
 
-dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile project(':root-commands')
-    compile project(':Utils-Library')
-    compile project(':CardsUILib')
-    compile 'com.android.support:support-v4:21.0.2'
-    compile 'com.android.support:appcompat-v7:21.0.2'
-    compile 'com.google.android.gms:play-services:6.1.71'
+    dependencies {
+        compile fileTree(include: ['*.jar'], dir: 'libs')
+        compile project(':root-commands')
+        compile project(':Utils-Library')
+        compile project(':CardsUILib')
+        compile 'com.android.support:support-v4:21.0.3'
+        compile 'com.android.support:appcompat-v7:21.0.3'
+        compile 'com.google.android.gms:play-services:6.5.87'
+    }
 }
diff --git a/RashrApp/src/main/java/de/mkrtchyan/recoverytools/RashrActivity.java b/RashrApp/src/main/java/de/mkrtchyan/recoverytools/RashrActivity.java
@@ -43,9 +43,6 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;

diff --git a/Utils-Library/Utils-Library.iml b/Utils-Library/Utils-Library.iml
@@ -84,8 +84,8 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="support-v4-21.0.2" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-21.0.2" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
   </component>
 </module>
 
diff --git a/Utils-Library/build.gradle b/Utils-Library/build.gradle
@@ -2,17 +2,14 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 21
-    buildToolsVersion '21.1.1'
+    buildToolsVersion '21.1.2'
     defaultConfig {
         minSdkVersion 9
         versionCode 1
         versionName '1.0'
     }
-    productFlavors {
+    dependencies {
+        compile fileTree(include: ['*.jar'], dir: 'libs')
+        compile 'com.android.support:support-v4:21.0.3'
     }
 }
-
-dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:support-v4:21.0.2'
-}
diff --git a/Utils-Library/src/main/java/de/mkrtchyan/utils/Common.java b/Utils-Library/src/main/java/de/mkrtchyan/utils/Common.java
@@ -1,7 +1,7 @@
 package de.mkrtchyan.utils;
 
 /**
- * Copyright (c) 2014 Ashot Mkrtchyan
+ * Copyright (c) 2014 Aschot Mkrtchyan
  * Permission is hereby granted, free of charge, to any person obtaining a copy 
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights 
@@ -41,8 +41,6 @@
 
 public class Common {
 
-    public static final String PREF_NAME = "de_mkrtchyan_utils_common";
-
     public static void pushFileFromRAW(Context mContext, File outputFile, int RAW, boolean Override) throws IOException {
         if (!outputFile.exists() || Override) {
             if (Override)

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.0-rc4'
+        classpath 'com.android.tools.build:gradle:1.0.0'
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Nov 29 11:29:47 CET 2014
+#Sat Dec 13 13:17:58 CET 2014
 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-2.2.1-bin.zip
diff --git a/local.properties b/local.properties
@@ -7,5 +7,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Fri Nov 28 21:55:06 CET 2014
-sdk.dir=C\:\\Android\\sdk
+#Sat Dec 13 13:14:23 CET 2014
+sdk.dir=C\:\\Users\\Ashot\\AppData\\Local\\Android\\sdk
diff --git a/root-commands/build.gradle b/root-commands/build.gradle
@@ -2,16 +2,13 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 21
-    buildToolsVersion '21.1.1'
+    buildToolsVersion '21.1.2'
     defaultConfig {
         minSdkVersion 9
         versionCode 1
         versionName '1.0'
     }
-    buildTypes {
+    dependencies {
+        compile fileTree(dir: 'libs', include: ['*.jar'])
     }
 }
-
-dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-}