Merge pull request #126 from peervalhoegen/master

switch to android studio and material design
tim3z · Sep 17, 2015 · 8c734d6 · 8c734d6
2 parents 409a4b7 + 6d4f6a6
commit 8c734d6
Show file tree

Hide file tree

Showing 1,373 changed files with 10,165 additions and 1,997 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,13 +19,15 @@ local.properties
 *.snm
 *.class
 *.cfg
+*.bin
 lint.xml
 sudoq-model/bin
 test-model/bin
 sudoq-app/bin
 sudoq-app/gen
 sudoq-app/assets
 sudoq-app/libs/model.jar
+sudoq-app/sudoqapp/build/intermediates/
 test-app/bin
 test-app/gen
 test-app/coverage/

diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/SudoQ.iml b/.idea/SudoQ.iml
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/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/codeStyle.xml b/codeStyle.xml
diff --git a/sudoq-app/.classpath b/sudoq-app/.classpath
diff --git a/sudoq-app/.gradle/2.2.1/taskArtifacts/cache.properties b/sudoq-app/.gradle/2.2.1/taskArtifacts/cache.properties
@@ -0,0 +1 @@
+#Fri Aug 28 00:08:23 CEST 2015
diff --git a/sudoq-app/.gradle/2.2.1/taskArtifacts/cache.properties.lock b/sudoq-app/.gradle/2.2.1/taskArtifacts/cache.properties.lock
diff --git a/sudoq-app/.idea/.name b/sudoq-app/.idea/.name
diff --git a/sudoq-app/.idea/compiler.xml b/sudoq-app/.idea/compiler.xml
diff --git a/sudoq-app/.idea/copyright/profiles_settings.xml b/sudoq-app/.idea/copyright/profiles_settings.xml
diff --git a/sudoq-app/.idea/gradle.xml b/sudoq-app/.idea/gradle.xml
diff --git a/sudoq-app/.idea/libraries/appcompat_v7_23_0_0.xml b/sudoq-app/.idea/libraries/appcompat_v7_23_0_0.xml
diff --git a/sudoq-app/.idea/libraries/cardview_v7_23_0_0.xml b/sudoq-app/.idea/libraries/cardview_v7_23_0_0.xml
diff --git a/sudoq-app/.idea/libraries/commons_io_2_4.xml b/sudoq-app/.idea/libraries/commons_io_2_4.xml
diff --git a/sudoq-app/.idea/libraries/commons_lang3_3_1.xml b/sudoq-app/.idea/libraries/commons_lang3_3_1.xml
diff --git a/sudoq-app/.idea/libraries/design_23_0_0.xml b/sudoq-app/.idea/libraries/design_23_0_0.xml
diff --git a/sudoq-app/.idea/libraries/hamcrest_core_1_3.xml b/sudoq-app/.idea/libraries/hamcrest_core_1_3.xml
diff --git a/sudoq-app/.idea/libraries/junit_4_11.xml b/sudoq-app/.idea/libraries/junit_4_11.xml
diff --git a/sudoq-app/.idea/libraries/org_apache_commons_io_2_4.xml b/sudoq-app/.idea/libraries/org_apache_commons_io_2_4.xml
diff --git a/sudoq-app/.idea/libraries/robotium_solo_4_1.xml b/sudoq-app/.idea/libraries/robotium_solo_4_1.xml
diff --git a/sudoq-app/.idea/libraries/robotium_solo_5_4_1.xml b/sudoq-app/.idea/libraries/robotium_solo_5_4_1.xml
diff --git a/sudoq-app/.idea/libraries/sudoqmodel_sudoqmodel.xml b/sudoq-app/.idea/libraries/sudoqmodel_sudoqmodel.xml
diff --git a/sudoq-app/.idea/libraries/support_annotations_23_0_0.xml b/sudoq-app/.idea/libraries/support_annotations_23_0_0.xml
diff --git a/sudoq-app/.idea/libraries/support_v4_23_0_0.xml b/sudoq-app/.idea/libraries/support_v4_23_0_0.xml