Browse Source

更改为 as项目,满足google要求

liuyuqi-dellpc 6 years ago
parent
commit
9f1423a456
67 changed files with 385 additions and 97 deletions
  1. 0 9
      .classpath
  2. 13 0
      .gitignore
  3. 3 0
      .idea/dictionaries/liuyuqi.xml
  4. 6 0
      .idea/encodings.xml
  5. 15 0
      .idea/gradle.xml
  6. 17 0
      .idea/misc.xml
  7. 12 0
      .idea/runConfigurations.xml
  8. 0 33
      .project
  9. 1 0
      app/.gitignore
  10. 26 0
      app/build.gradle
  11. 0 0
      app/libs/zxing.jar
  12. 13 35
      app/proguard-project.txt
  13. 0 4
      app/src/main/AndroidManifest.xml
  14. 0 0
      app/src/main/java/com/google/zxing/client/android/camera/AutoFocusManager.java
  15. 0 0
      app/src/main/java/com/google/zxing/client/android/camera/CameraConfigurationManager.java
  16. 0 0
      app/src/main/java/com/google/zxing/client/android/camera/CameraManager.java
  17. 0 0
      app/src/main/java/com/google/zxing/client/android/camera/PreviewCallback.java
  18. 0 0
      app/src/main/java/com/google/zxing/client/android/camera/open/DefaultOpenCameraInterface.java
  19. 0 0
      app/src/main/java/com/google/zxing/client/android/camera/open/GingerbreadOpenCameraInterface.java
  20. 0 0
      app/src/main/java/com/google/zxing/client/android/camera/open/OpenCameraInterface.java
  21. 0 0
      app/src/main/java/com/google/zxing/client/android/camera/open/OpenCameraManager.java
  22. 0 0
      app/src/main/java/com/google/zxing/client/android/common/PlatformSupportManager.java
  23. 0 0
      app/src/main/java/com/google/zxing/client/android/common/executor/AsyncTaskExecInterface.java
  24. 0 0
      app/src/main/java/com/google/zxing/client/android/common/executor/AsyncTaskExecManager.java
  25. 0 0
      app/src/main/java/com/google/zxing/client/android/common/executor/DefaultAsyncTaskExecInterface.java
  26. 0 0
      app/src/main/java/com/google/zxing/client/android/common/executor/HoneycombAsyncTaskExecInterface.java
  27. 0 0
      app/src/main/java/com/google/zxing/client/android/decode/BeepManager.java
  28. 0 0
      app/src/main/java/com/google/zxing/client/android/decode/CaptureActivityHandler.java
  29. 0 0
      app/src/main/java/com/google/zxing/client/android/decode/DecodeFormatManager.java
  30. 0 0
      app/src/main/java/com/google/zxing/client/android/decode/DecodeHandler.java
  31. 0 0
      app/src/main/java/com/google/zxing/client/android/decode/DecodeThread.java
  32. 0 0
      app/src/main/java/com/google/zxing/client/android/decode/InactivityTimer.java
  33. 0 0
      app/src/main/java/com/google/zxing/client/android/decode/IntentSource.java
  34. 0 0
      app/src/main/java/com/google/zxing/client/android/decode/Intents.java
  35. 0 0
      app/src/main/java/com/google/zxing/client/android/decode/ViewfinderResultPointCallback.java
  36. 0 0
      app/src/main/java/com/google/zxing/client/android/decode/ViewfinderView.java
  37. 0 0
      app/src/main/java/com/google/zxing/client/android/result/Contents.java
  38. 0 0
      app/src/main/java/com/google/zxing/client/android/result/DefaultResultHandler.java
  39. 0 0
      app/src/main/java/com/google/zxing/client/android/result/LocaleManager.java
  40. 0 0
      app/src/main/java/com/google/zxing/client/android/result/ResultButtonListener.java
  41. 0 0
      app/src/main/java/com/google/zxing/client/android/result/ResultHandler.java
  42. 0 0
      app/src/main/java/com/google/zxing/client/android/result/ResultHandlerFactory.java
  43. 0 0
      app/src/main/java/com/google/zxing/client/android/result/URIResultHandler.java
  44. 0 0
      app/src/main/java/me/yoqi/qrcode/CaptureActivity.java
  45. 0 0
      app/src/main/java/me/yoqi/qrcode/Config.java
  46. 0 0
      app/src/main/java/me/yoqi/qrcode/ResultActivity.java
  47. 0 0
      app/src/main/res/drawable-hdpi/logo.png
  48. 0 0
      app/src/main/res/drawable-hdpi/logo2.png
  49. 0 0
      app/src/main/res/drawable-hdpi/mzw_camera_close.png
  50. 0 0
      app/src/main/res/drawable-hdpi/mzw_camera_open.png
  51. 0 0
      app/src/main/res/layout/activity_main.xml
  52. 0 0
      app/src/main/res/layout/activity_result.xml
  53. 0 0
      app/src/main/res/layout/capture.xml
  54. 0 0
      app/src/main/res/raw/beep.ogg
  55. 0 0
      app/src/main/res/values-en/strings.xml
  56. 0 0
      app/src/main/res/values/colors.xml
  57. 0 0
      app/src/main/res/values/dimens.xml
  58. 0 0
      app/src/main/res/values/ids.xml
  59. 0 0
      app/src/main/res/values/strings.xml
  60. 0 0
      app/src/main/res/values/styles.xml
  61. 17 0
      build.gradle
  62. BIN
      gradle/wrapper/gradle-wrapper.jar
  63. 5 0
      gradle/wrapper/gradle-wrapper.properties
  64. 172 0
      gradlew
  65. 84 0
      gradlew.bat
  66. 0 16
      project.properties
  67. 1 0
      settings.gradle

+ 0 - 9
.classpath

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>

+ 13 - 0
.gitignore

@@ -2,3 +2,16 @@
 /bin
 /gen
 .svn
+*.iml
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild

+ 3 - 0
.idea/dictionaries/liuyuqi.xml

@@ -0,0 +1,3 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="liuyuqi" />
+</component>

+ 6 - 0
.idea/encodings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8" addBOMForNewFiles="with NO BOM">
+    <file url="PROJECT" charset="UTF-8" />
+  </component>
+</project>

+ 15 - 0
.idea/gradle.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <compositeConfiguration>
+          <compositeBuild compositeDefinitionSource="SCRIPT" />
+        </compositeConfiguration>
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="resolveModulePerSourceSet" value="false" />
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>

+ 17 - 0
.idea/misc.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CMakeSettings">
+    <configurations>
+      <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
+    </configurations>
+  </component>
+  <component name="Kotlin2JsCompilerArguments">
+    <option name="sourceMapEmbedSources" />
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
+</project>

+ 12 - 0
.idea/runConfigurations.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>

+ 0 - 33
.project

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>QRCode</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

+ 1 - 0
app/.gitignore

@@ -0,0 +1 @@
+/build

+ 26 - 0
app/build.gradle

@@ -0,0 +1,26 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 28
+
+    defaultConfig {
+        applicationId "me.yoqi.qrcode"
+        minSdkVersion 14
+        targetSdkVersion 28
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+//    implementation 'com.android.support:appcompat-v7:21.0.3'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+//    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+//    implementation files('libs/zxing.jar')
+}

+ 0 - 0
libs/zxing.jar → app/libs/zxing.jar


+ 13 - 35
proguard-project.txt → app/proguard-project.txt

@@ -1,9 +1,5 @@
 # 保存被AndroidManifest.xml调用或者webview的类
--keepclassmembers
-	class fqcn.of.javascript.interface.for.webview
-	{
-	   public *;
-	}
+-keepclassmembers class fqcn.of.javascript.interface.for.webview {   public *; }
 -keep public class * extends android.app.Activity
 -keep public class * extends android.app.Application                  
 -keep public class * extends android.app.Service                      
@@ -13,36 +9,18 @@
 -keep public class * extends android.preference.Preference
 
 #第三方类库
--keep
-	class android.**
-	 {*;}
--keep
-	class com.jeremyfeinstein.slidingmenu.lib.**
-	 {*;}
--keep
-	class com.actionbarsherlock.**
-	 {*;}
--keep
-	class com.lidroid.xutils.**
-	 {*;}
+-keep 	class android.** {*;}
+-keep 	class com.jeremyfeinstein.slidingmenu.lib.** {*;}
+-keep 	class com.actionbarsherlock.** 	 {*;}
+-keep 	class com.lidroid.xutils.** 	 {*;}
 
 # 保留所有具有公有访问权限的类和其公共成员
--keepclasseswithmembers
-	class *{
-	    public *;
-	}
+-keepclasseswithmembers 	class *{	    public *;	}
+
 # 删除Log代码
--assumenosideeffects
-	class android.util.Log
-	{
-		public static ***
-		 e(...);
-		    public static ***
-		 w(...);
-		    public static ***
-		 wtf(...);
-		    public static ***
-		 d(...);
-		    public static ***
-		 v(...);
-	}
+-assumenosideeffects 	class android.util.Log 	{
+		public static ***		 e(...);
+		public static ***		 w(...);
+		public static ***		 wtf(...);
+		public static ***		 d(...);
+		public static ***		 v(...);	}

+ 0 - 4
AndroidManifest.xml → app/src/main/AndroidManifest.xml

@@ -45,10 +45,6 @@
         android:smallScreens="true"
         android:xlargeScreens="true" />
 
-    <uses-sdk
-        android:minSdkVersion="9"
-        android:targetSdkVersion="17" />
-
     <application
         android:allowBackup="true"
         android:icon="@drawable/logo2"

+ 0 - 0
src/com/google/zxing/client/android/camera/AutoFocusManager.java → app/src/main/java/com/google/zxing/client/android/camera/AutoFocusManager.java


+ 0 - 0
src/com/google/zxing/client/android/camera/CameraConfigurationManager.java → app/src/main/java/com/google/zxing/client/android/camera/CameraConfigurationManager.java


+ 0 - 0
src/com/google/zxing/client/android/camera/CameraManager.java → app/src/main/java/com/google/zxing/client/android/camera/CameraManager.java


+ 0 - 0
src/com/google/zxing/client/android/camera/PreviewCallback.java → app/src/main/java/com/google/zxing/client/android/camera/PreviewCallback.java


+ 0 - 0
src/com/google/zxing/client/android/camera/open/DefaultOpenCameraInterface.java → app/src/main/java/com/google/zxing/client/android/camera/open/DefaultOpenCameraInterface.java


+ 0 - 0
src/com/google/zxing/client/android/camera/open/GingerbreadOpenCameraInterface.java → app/src/main/java/com/google/zxing/client/android/camera/open/GingerbreadOpenCameraInterface.java


+ 0 - 0
src/com/google/zxing/client/android/camera/open/OpenCameraInterface.java → app/src/main/java/com/google/zxing/client/android/camera/open/OpenCameraInterface.java


+ 0 - 0
src/com/google/zxing/client/android/camera/open/OpenCameraManager.java → app/src/main/java/com/google/zxing/client/android/camera/open/OpenCameraManager.java


+ 0 - 0
src/com/google/zxing/client/android/common/PlatformSupportManager.java → app/src/main/java/com/google/zxing/client/android/common/PlatformSupportManager.java


+ 0 - 0
src/com/google/zxing/client/android/common/executor/AsyncTaskExecInterface.java → app/src/main/java/com/google/zxing/client/android/common/executor/AsyncTaskExecInterface.java


+ 0 - 0
src/com/google/zxing/client/android/common/executor/AsyncTaskExecManager.java → app/src/main/java/com/google/zxing/client/android/common/executor/AsyncTaskExecManager.java


+ 0 - 0
src/com/google/zxing/client/android/common/executor/DefaultAsyncTaskExecInterface.java → app/src/main/java/com/google/zxing/client/android/common/executor/DefaultAsyncTaskExecInterface.java


+ 0 - 0
src/com/google/zxing/client/android/common/executor/HoneycombAsyncTaskExecInterface.java → app/src/main/java/com/google/zxing/client/android/common/executor/HoneycombAsyncTaskExecInterface.java


+ 0 - 0
src/com/google/zxing/client/android/decode/BeepManager.java → app/src/main/java/com/google/zxing/client/android/decode/BeepManager.java


+ 0 - 0
src/com/google/zxing/client/android/decode/CaptureActivityHandler.java → app/src/main/java/com/google/zxing/client/android/decode/CaptureActivityHandler.java


+ 0 - 0
src/com/google/zxing/client/android/decode/DecodeFormatManager.java → app/src/main/java/com/google/zxing/client/android/decode/DecodeFormatManager.java


+ 0 - 0
src/com/google/zxing/client/android/decode/DecodeHandler.java → app/src/main/java/com/google/zxing/client/android/decode/DecodeHandler.java


+ 0 - 0
src/com/google/zxing/client/android/decode/DecodeThread.java → app/src/main/java/com/google/zxing/client/android/decode/DecodeThread.java


+ 0 - 0
src/com/google/zxing/client/android/decode/InactivityTimer.java → app/src/main/java/com/google/zxing/client/android/decode/InactivityTimer.java


+ 0 - 0
src/com/google/zxing/client/android/decode/IntentSource.java → app/src/main/java/com/google/zxing/client/android/decode/IntentSource.java


+ 0 - 0
src/com/google/zxing/client/android/decode/Intents.java → app/src/main/java/com/google/zxing/client/android/decode/Intents.java


+ 0 - 0
src/com/google/zxing/client/android/decode/ViewfinderResultPointCallback.java → app/src/main/java/com/google/zxing/client/android/decode/ViewfinderResultPointCallback.java


+ 0 - 0
src/com/google/zxing/client/android/decode/ViewfinderView.java → app/src/main/java/com/google/zxing/client/android/decode/ViewfinderView.java


+ 0 - 0
src/com/google/zxing/client/android/result/Contents.java → app/src/main/java/com/google/zxing/client/android/result/Contents.java


+ 0 - 0
src/com/google/zxing/client/android/result/DefaultResultHandler.java → app/src/main/java/com/google/zxing/client/android/result/DefaultResultHandler.java


+ 0 - 0
src/com/google/zxing/client/android/result/LocaleManager.java → app/src/main/java/com/google/zxing/client/android/result/LocaleManager.java


+ 0 - 0
src/com/google/zxing/client/android/result/ResultButtonListener.java → app/src/main/java/com/google/zxing/client/android/result/ResultButtonListener.java


+ 0 - 0
src/com/google/zxing/client/android/result/ResultHandler.java → app/src/main/java/com/google/zxing/client/android/result/ResultHandler.java


+ 0 - 0
src/com/google/zxing/client/android/result/ResultHandlerFactory.java → app/src/main/java/com/google/zxing/client/android/result/ResultHandlerFactory.java


+ 0 - 0
src/com/google/zxing/client/android/result/URIResultHandler.java → app/src/main/java/com/google/zxing/client/android/result/URIResultHandler.java


+ 0 - 0
src/me/yoqi/qrcode/CaptureActivity.java → app/src/main/java/me/yoqi/qrcode/CaptureActivity.java


+ 0 - 0
src/me/yoqi/qrcode/Config.java → app/src/main/java/me/yoqi/qrcode/Config.java


+ 0 - 0
src/me/yoqi/qrcode/ResultActivity.java → app/src/main/java/me/yoqi/qrcode/ResultActivity.java


+ 0 - 0
res/drawable-hdpi/logo.png → app/src/main/res/drawable-hdpi/logo.png


+ 0 - 0
res/drawable-hdpi/logo2.png → app/src/main/res/drawable-hdpi/logo2.png


+ 0 - 0
res/drawable-hdpi/mzw_camera_close.png → app/src/main/res/drawable-hdpi/mzw_camera_close.png


+ 0 - 0
res/drawable-hdpi/mzw_camera_open.png → app/src/main/res/drawable-hdpi/mzw_camera_open.png


+ 0 - 0
res/layout/activity_main.xml → app/src/main/res/layout/activity_main.xml


+ 0 - 0
res/layout/activity_result.xml → app/src/main/res/layout/activity_result.xml


+ 0 - 0
res/layout/capture.xml → app/src/main/res/layout/capture.xml


+ 0 - 0
res/raw/beep.ogg → app/src/main/res/raw/beep.ogg


+ 0 - 0
res/values-en/strings.xml → app/src/main/res/values-en/strings.xml


+ 0 - 0
res/values/colors.xml → app/src/main/res/values/colors.xml


+ 0 - 0
res/values/dimens.xml → app/src/main/res/values/dimens.xml


+ 0 - 0
res/values/ids.xml → app/src/main/res/values/ids.xml


+ 0 - 0
res/values/strings.xml → app/src/main/res/values/strings.xml


+ 0 - 0
res/values/styles.xml → app/src/main/res/values/styles.xml


+ 17 - 0
build.gradle

@@ -0,0 +1,17 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    repositories {
+        google()
+        maven{url'http://maven.aliyun.com/nexus/content/groups/public/'}
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.4.2'
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        maven{url'http://maven.aliyun.com/nexus/content/groups/public/'}
+    }
+}

BIN
gradle/wrapper/gradle-wrapper.jar


+ 5 - 0
gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

+ 172 - 0
gradlew

@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

+ 84 - 0
gradlew.bat

@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

+ 0 - 16
project.properties

@@ -1,16 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-21
-android.library=false
-android.library.reference.1=../appcompat_v7

+ 1 - 0
settings.gradle

@@ -0,0 +1 @@
+include ':app'