diff --git a/android-app.iml b/android-app.iml
index 4e9a28d..0bb6048 100644
--- a/android-app.iml
+++ b/android-app.iml
@@ -1,82 +1,19 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
-
-
-
diff --git a/app/.gitignore b/app/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/app/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/app/app.iml b/app/app.iml
new file mode 100644
index 0000000..227bfdd
--- /dev/null
+++ b/app/app.iml
@@ -0,0 +1,87 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/build.gradle b/app/build.gradle
new file mode 100644
index 0000000..b8146b3
--- /dev/null
+++ b/app/build.gradle
@@ -0,0 +1,24 @@
+apply plugin: 'com.android.application'
+
+android {
+ compileSdkVersion 20
+ buildToolsVersion '20'
+
+ defaultConfig {
+ applicationId "fr.gaulupeau.apps.InThePoche"
+ minSdkVersion 8
+ targetSdkVersion 20
+ versionCode 9
+ versionName "1.6"
+ }
+ buildTypes {
+ release {
+ runProguard false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ }
+ }
+}
+
+dependencies {
+ compile 'com.android.support:appcompat-v7:20.0.0'
+}
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
new file mode 100644
index 0000000..2d34300
--- /dev/null
+++ b/app/proguard-rules.pro
@@ -0,0 +1,16 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+# http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+# public *;
+#}
diff --git a/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
similarity index 89%
rename from AndroidManifest.xml
rename to app/src/main/AndroidManifest.xml
index 4e0fb97..9466ad0 100644
--- a/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -26,8 +26,8 @@
-
-
-
+
+
+
diff --git a/assets/main.css b/app/src/main/assets/main.css
similarity index 100%
rename from assets/main.css
rename to app/src/main/assets/main.css
diff --git a/assets/ratatouille.css b/app/src/main/assets/ratatouille.css
similarity index 100%
rename from assets/ratatouille.css
rename to app/src/main/assets/ratatouille.css
diff --git a/src/fr/gaulupeau/apps/Poche/Article.java b/app/src/main/java/fr/gaulupeau/apps/Poche/Article.java
similarity index 100%
rename from src/fr/gaulupeau/apps/Poche/Article.java
rename to app/src/main/java/fr/gaulupeau/apps/Poche/Article.java
diff --git a/src/fr/gaulupeau/apps/Poche/ArticlesSQLiteOpenHelper.java b/app/src/main/java/fr/gaulupeau/apps/Poche/ArticlesSQLiteOpenHelper.java
similarity index 100%
rename from src/fr/gaulupeau/apps/Poche/ArticlesSQLiteOpenHelper.java
rename to app/src/main/java/fr/gaulupeau/apps/Poche/ArticlesSQLiteOpenHelper.java
diff --git a/src/fr/gaulupeau/apps/Poche/Helpers.java b/app/src/main/java/fr/gaulupeau/apps/Poche/Helpers.java
similarity index 100%
rename from src/fr/gaulupeau/apps/Poche/Helpers.java
rename to app/src/main/java/fr/gaulupeau/apps/Poche/Helpers.java
diff --git a/src/fr/gaulupeau/apps/Poche/ListArticles.java b/app/src/main/java/fr/gaulupeau/apps/Poche/ListArticles.java
similarity index 100%
rename from src/fr/gaulupeau/apps/Poche/ListArticles.java
rename to app/src/main/java/fr/gaulupeau/apps/Poche/ListArticles.java
diff --git a/src/fr/gaulupeau/apps/Poche/Poche.java b/app/src/main/java/fr/gaulupeau/apps/Poche/Poche.java
similarity index 100%
rename from src/fr/gaulupeau/apps/Poche/Poche.java
rename to app/src/main/java/fr/gaulupeau/apps/Poche/Poche.java
diff --git a/src/fr/gaulupeau/apps/Poche/ReadArticle.java b/app/src/main/java/fr/gaulupeau/apps/Poche/ReadArticle.java
similarity index 100%
rename from src/fr/gaulupeau/apps/Poche/ReadArticle.java
rename to app/src/main/java/fr/gaulupeau/apps/Poche/ReadArticle.java
diff --git a/src/fr/gaulupeau/apps/Poche/ReadingListAdapter.java b/app/src/main/java/fr/gaulupeau/apps/Poche/ReadingListAdapter.java
similarity index 100%
rename from src/fr/gaulupeau/apps/Poche/ReadingListAdapter.java
rename to app/src/main/java/fr/gaulupeau/apps/Poche/ReadingListAdapter.java
diff --git a/src/fr/gaulupeau/apps/Poche/Settings.java b/app/src/main/java/fr/gaulupeau/apps/Poche/Settings.java
similarity index 100%
rename from src/fr/gaulupeau/apps/Poche/Settings.java
rename to app/src/main/java/fr/gaulupeau/apps/Poche/Settings.java
diff --git a/src/fr/gaulupeau/apps/Poche/arrays.java b/app/src/main/java/fr/gaulupeau/apps/Poche/arrays.java
similarity index 100%
rename from src/fr/gaulupeau/apps/Poche/arrays.java
rename to app/src/main/java/fr/gaulupeau/apps/Poche/arrays.java
diff --git a/res/drawable-hdpi/icon.png b/app/src/main/res/drawable-hdpi/icon.png
similarity index 100%
rename from res/drawable-hdpi/icon.png
rename to app/src/main/res/drawable-hdpi/icon.png
diff --git a/res/drawable-mdpi/icon.png b/app/src/main/res/drawable-mdpi/icon.png
similarity index 100%
rename from res/drawable-mdpi/icon.png
rename to app/src/main/res/drawable-mdpi/icon.png
diff --git a/res/drawable-xhdpi/icon.png b/app/src/main/res/drawable-xhdpi/icon.png
similarity index 100%
rename from res/drawable-xhdpi/icon.png
rename to app/src/main/res/drawable-xhdpi/icon.png
diff --git a/res/drawable-xxhdpi/icon.png b/app/src/main/res/drawable-xxhdpi/icon.png
similarity index 100%
rename from res/drawable-xxhdpi/icon.png
rename to app/src/main/res/drawable-xxhdpi/icon.png
diff --git a/res/drawable-xxxhdpi/icon.png b/app/src/main/res/drawable-xxxhdpi/icon.png
similarity index 100%
rename from res/drawable-xxxhdpi/icon.png
rename to app/src/main/res/drawable-xxxhdpi/icon.png
diff --git a/res/drawable/welcome.png b/app/src/main/res/drawable/welcome.png
similarity index 100%
rename from res/drawable/welcome.png
rename to app/src/main/res/drawable/welcome.png
diff --git a/res/layout/article.xml b/app/src/main/res/layout/article.xml
similarity index 100%
rename from res/layout/article.xml
rename to app/src/main/res/layout/article.xml
diff --git a/res/layout/article_list.xml b/app/src/main/res/layout/article_list.xml
similarity index 100%
rename from res/layout/article_list.xml
rename to app/src/main/res/layout/article_list.xml
diff --git a/res/layout/list.xml b/app/src/main/res/layout/list.xml
similarity index 100%
rename from res/layout/list.xml
rename to app/src/main/res/layout/list.xml
diff --git a/res/layout/main.xml b/app/src/main/res/layout/main.xml
similarity index 100%
rename from res/layout/main.xml
rename to app/src/main/res/layout/main.xml
diff --git a/res/layout/settings.xml b/app/src/main/res/layout/settings.xml
similarity index 100%
rename from res/layout/settings.xml
rename to app/src/main/res/layout/settings.xml
diff --git a/res/menu/option.xml b/app/src/main/res/menu/option.xml
similarity index 100%
rename from res/menu/option.xml
rename to app/src/main/res/menu/option.xml
diff --git a/res/menu/option_list.xml b/app/src/main/res/menu/option_list.xml
similarity index 100%
rename from res/menu/option_list.xml
rename to app/src/main/res/menu/option_list.xml
diff --git a/res/values-v11/styles.xml b/app/src/main/res/values-v11/styles.xml
similarity index 100%
rename from res/values-v11/styles.xml
rename to app/src/main/res/values-v11/styles.xml
diff --git a/res/values-v14/styles.xml b/app/src/main/res/values-v14/styles.xml
similarity index 100%
rename from res/values-v14/styles.xml
rename to app/src/main/res/values-v14/styles.xml
diff --git a/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
similarity index 100%
rename from res/values/dimens.xml
rename to app/src/main/res/values/dimens.xml
diff --git a/res/values/strings.xml b/app/src/main/res/values/strings.xml
similarity index 100%
rename from res/values/strings.xml
rename to app/src/main/res/values/strings.xml
diff --git a/res/values/styles.xml b/app/src/main/res/values/styles.xml
similarity index 100%
rename from res/values/styles.xml
rename to app/src/main/res/values/styles.xml
diff --git a/build.gradle b/build.gradle
index 6c9c613..488357f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,3 +1,5 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
buildscript {
repositories {
mavenCentral()
@@ -6,44 +8,9 @@ buildscript {
classpath 'com.android.tools.build:gradle:0.12.+'
}
}
-apply plugin: 'com.android.application'
-dependencies {
- compile fileTree(dir: 'libs', include: '*.jar')
-}
-
-android {
- compileSdkVersion 20
- buildToolsVersion "20.0.0"
-
- defaultConfig {
- minSdkVersion 8
- targetSdkVersion 20
- versionCode 9
- versionName "1.6"
+allprojects {
+ repositories {
+ mavenCentral()
}
-
- sourceSets {
- main {
- manifest.srcFile 'AndroidManifest.xml'
- java.srcDirs = ['src']
- resources.srcDirs = ['src']
- aidl.srcDirs = ['src']
- renderscript.srcDirs = ['src']
- res.srcDirs = ['res']
- assets.srcDirs = ['assets']
- }
-
- // Move the tests to tests/java, tests/res, etc...
- instrumentTest.setRoot('tests')
-
- // Move the build types to build-types/
- // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
- // This moves them out of them default location under src//... which would
- // conflict with src/ being used by the main source set.
- // Adding new build types or product flavors should be accompanied
- // by a similar customization.
- debug.setRoot('build-types/debug')
- release.setRoot('build-types/release')
- }
-}
+}
\ No newline at end of file
diff --git a/libs/json-smart-1.2.jar b/libs/json-smart-1.2.jar
deleted file mode 100644
index 6e4ffd8..0000000
Binary files a/libs/json-smart-1.2.jar and /dev/null differ
diff --git a/libs/jsonrpc2-base-1.35.jar b/libs/jsonrpc2-base-1.35.jar
deleted file mode 100644
index 37fd3d2..0000000
Binary files a/libs/jsonrpc2-base-1.35.jar and /dev/null differ
diff --git a/libs/jsonrpc2-client-1.14.4.jar b/libs/jsonrpc2-client-1.14.4.jar
deleted file mode 100644
index c601b3f..0000000
Binary files a/libs/jsonrpc2-client-1.14.4.jar and /dev/null differ
diff --git a/lint.xml b/lint.xml
deleted file mode 100644
index ee0eead..0000000
--- a/lint.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..e7b4def
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+include ':app'