Merge pull request #1 from andresusanto/fulljava

Fuse to master
andresusanto · Oct 25, 2015 · e72d0a5 · e72d0a5
2 parents 1c91aa2 + 9a3b172
commit e72d0a5
Show file tree

Hide file tree

Showing 100 changed files with 4,462 additions and 1,533 deletions.
diff --git a/.gitattributes b/.gitattributes
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,53 @@
 .DS_Store
 /build
 /captures
+gradle.properties
+gradlew
+gradlew.bat
+
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio
+
+*.iml
+
+## Directory-based project format:
+.idea/
+# if you remove the above rule, at least ignore the following:
+
+# User-specific stuff:
+# .idea/workspace.xml
+# .idea/tasks.xml
+# .idea/dictionaries
+
+# Sensitive or high-churn files:
+# .idea/dataSources.ids
+# .idea/dataSources.xml
+# .idea/sqlDataSources.xml
+# .idea/dynamic.xml
+# .idea/uiDesigner.xml
+
+# Gradle:
+# .idea/gradle.xml
+# .idea/libraries
+
+# Mongo Explorer plugin:
+# .idea/mongoSettings.xml
+
+## File-based project format:
+*.ipr
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+/out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/NumberVision.iml b/NumberVision.iml
diff --git a/Test Case/1.bmp b/Test Case/1.bmp
diff --git a/testcases/MOBIL2.jpg → Test Case/MOBIL2.jpg b/testcases/MOBIL2.jpg → Test Case/MOBIL2.jpg
diff --git a/testcases/city.png → Test Case/city.png b/testcases/city.png → Test Case/city.png
diff --git a/testcases/mobil.jpg → Test Case/mobil.jpg b/testcases/mobil.jpg → Test Case/mobil.jpg
diff --git a/app/app.iml b/app/app.iml
diff --git a/app/build.gradle b/app/build.gradle
@@ -16,15 +16,16 @@ android {
             stl "stlport_shared"
             ldLibs "log", "jnigraphics"
         }
+
     }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-
-    productFlavors {
+	
+	productFlavors {
         x86 {
             ndk {
                 abiFilter "x86"
@@ -44,7 +45,6 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:22.+'
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile 'com.android.support:appcompat-v7:22.2.0'
 }