Merge branch 'master' of github.com:sbley/Projectiler

sbley · May 23, 2014 · 9d2cd9f · 9d2cd9f
2 parents 3cdd039 + 85b58ba
commit 9d2cd9f
Show file tree

Hide file tree

Showing 197 changed files with 2,692 additions and 924 deletions.
diff --git a/...ilerApp/Projectiler/app/src/main/java/de/saxsys/android/projectiler/app/MainActivity.java b/...ilerApp/Projectiler/app/src/main/java/de/saxsys/android/projectiler/app/MainActivity.java
diff --git a/...Projectiler/app/src/main/java/de/saxsys/android/projectiler/app/crawler/JSoupCrawler.java b/...Projectiler/app/src/main/java/de/saxsys/android/projectiler/app/crawler/JSoupCrawler.java
diff --git a/...App/Projectiler/app/src/main/java/de/saxsys/android/projectiler/app/crawler/Settings.java b/...App/Projectiler/app/src/main/java/de/saxsys/android/projectiler/app/crawler/Settings.java
diff --git a/ProjectilerApp/Projectiler/app/src/main/res/drawable-hdpi/ic_launcher.png b/ProjectilerApp/Projectiler/app/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/ProjectilerApp/Projectiler/app/src/main/res/drawable-mdpi/ic_launcher.png b/ProjectilerApp/Projectiler/app/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/ProjectilerApp/Projectiler/app/src/main/res/drawable-xhdpi/ic_launcher.png b/ProjectilerApp/Projectiler/app/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/ProjectilerApp/Projectiler/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/ProjectilerApp/Projectiler/app/src/main/res/drawable-xxhdpi/ic_launcher.png
diff --git a/ProjectilerApp/Projectiler/app/src/main/res/layout/fragment_main.xml b/ProjectilerApp/Projectiler/app/src/main/res/layout/fragment_main.xml
diff --git a/ProjectilerApp/Projectiler/app/src/main/res/values/strings.xml b/ProjectilerApp/Projectiler/app/src/main/res/values/strings.xml
diff --git a/ProjectilerApp/Projectiler/.gitignore → android/Projectiler/.gitignore b/ProjectilerApp/Projectiler/.gitignore → android/Projectiler/.gitignore
diff --git a/ProjectilerApp/Projectiler/app/.gitignore → android/Projectiler/app/.gitignore b/ProjectilerApp/Projectiler/app/.gitignore → android/Projectiler/app/.gitignore
diff --git a/ProjectilerApp/Projectiler/app/build.gradle → android/Projectiler/app/build.gradle b/ProjectilerApp/Projectiler/app/build.gradle → android/Projectiler/app/build.gradle
@@ -25,4 +25,6 @@ dependencies {
     compile files('libs/backend-1.0.0-beta-2.jar')
     compile files('libs/jsoup-1.7.3.jar')
     compile files('libs/crouton-1.6.1.jar')
+    compile files('libs/droidparts-2.0.5.jar')
+    compile files('libs/droidparts-support-2.0.5.jar')
 }
diff --git a/...pp/Projectiler/app/libs/crouton-1.6.1.jar → ...id/Projectiler/app/libs/crouton-1.6.1.jar b/...pp/Projectiler/app/libs/crouton-1.6.1.jar → ...id/Projectiler/app/libs/crouton-1.6.1.jar
diff --git a/android/Projectiler/app/libs/droidparts-2.0.5.jar b/android/Projectiler/app/libs/droidparts-2.0.5.jar
diff --git a/android/Projectiler/app/libs/droidparts-support-2.0.5.jar b/android/Projectiler/app/libs/droidparts-support-2.0.5.jar
diff --git a/...rApp/Projectiler/app/libs/jsoup-1.7.3.jar → android/Projectiler/app/libs/jsoup-1.7.3.jar b/...rApp/Projectiler/app/libs/jsoup-1.7.3.jar → android/Projectiler/app/libs/jsoup-1.7.3.jar
diff --git a/...lerApp/Projectiler/app/proguard-rules.txt → android/Projectiler/app/proguard-rules.txt b/...lerApp/Projectiler/app/proguard-rules.txt → android/Projectiler/app/proguard-rules.txt