\n" +
+ "";
+
+
+ setProgressBarIndeterminateVisibility(true);
+ setProgressBarVisibility(true);
+
+ webViewContent = (WebView)findViewById(R.id.webViewContent);
+ webViewContent.setWebChromeClient(new WebChromeClient() {
+ public void onProgressChanged(WebView view, int progress) {
+ setProgress(progress * 100);
+ if(progress == 100) {
+ setProgressBarIndeterminateVisibility(false);
+ setProgressBarVisibility(false);
+ }
+ }
+ });
+ webViewContent.loadDataWithBaseURL("file:///android_asset/", htmlHeader + htmlContent + htmlFooter, "text/html", "utf-8", null);
+
btnMarkRead = (Button)findViewById(R.id.btnMarkRead);
btnMarkRead.setOnClickListener(new OnClickListener() {
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 85%
rename from src/fr/gaulupeau/apps/Poche/Settings.java
rename to app/src/main/java/fr/gaulupeau/apps/Poche/Settings.java
index ce2006b..35f6f9b 100644
--- a/src/fr/gaulupeau/apps/Poche/Settings.java
+++ b/app/src/main/java/fr/gaulupeau/apps/Poche/Settings.java
@@ -9,6 +9,7 @@ import android.view.View;
import android.view.View.OnClickListener;
import android.widget.Button;
import android.widget.EditText;
+import android.widget.TextView;
public class Settings extends Activity {
Button btnDone;
@@ -16,6 +17,7 @@ public class Settings extends Activity {
EditText editAPIUsername;
EditText editAPIToken;
EditText editGlobalToken;
+ TextView textViewVersion;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -43,5 +45,11 @@ public class Settings extends Activity {
finish();
}
});
+ try {
+ textViewVersion = (TextView) findViewById(R.id.version);
+ textViewVersion.setText(getApplicationContext().getPackageManager().getPackageInfo(getApplicationContext().getPackageName(), 0).versionName);
+ } catch (Exception e) {
+ //
+ }
}
}
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/app/src/main/res/drawable-hdpi/icon.png b/app/src/main/res/drawable-hdpi/icon.png
new file mode 100755
index 0000000..c6d179d
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/icon.png differ
diff --git a/app/src/main/res/drawable-mdpi/icon.png b/app/src/main/res/drawable-mdpi/icon.png
new file mode 100755
index 0000000..8d2a8b6
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/icon.png differ
diff --git a/app/src/main/res/drawable-xhdpi/icon.png b/app/src/main/res/drawable-xhdpi/icon.png
new file mode 100755
index 0000000..b3e9263
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/icon.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/icon.png b/app/src/main/res/drawable-xxhdpi/icon.png
new file mode 100755
index 0000000..a6c2d0e
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/icon.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/icon.png b/app/src/main/res/drawable-xxxhdpi/icon.png
new file mode 100755
index 0000000..542dff6
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/icon.png differ
diff --git a/app/src/main/res/drawable/welcome.png b/app/src/main/res/drawable/welcome.png
new file mode 100755
index 0000000..8aeb2b3
Binary files /dev/null and b/app/src/main/res/drawable/welcome.png differ
diff --git a/app/src/main/res/layout/article.xml b/app/src/main/res/layout/article.xml
new file mode 100644
index 0000000..5c857c5
--- /dev/null
+++ b/app/src/main/res/layout/article.xml
@@ -0,0 +1,48 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/res/layout/article_list.xml b/app/src/main/res/layout/article_list.xml
similarity index 57%
rename from res/layout/article_list.xml
rename to app/src/main/res/layout/article_list.xml
index a02a4be..fbd4c3b 100644
--- a/res/layout/article_list.xml
+++ b/app/src/main/res/layout/article_list.xml
@@ -1,7 +1,8 @@
-
+
-
+ android:orientation="vertical"
+ tools:context="fr.gaulupeau.apps.Poche.ListArticles" >
-
+ android:layout_height="wrap_content"
+ tools:context="fr.gaulupeau.apps.Poche.Poche" >
+ android:src="@drawable/welcome" />
+ android:textSize="25sp" />
+ android:visibility="gone" />
diff --git a/res/layout/settings.xml b/app/src/main/res/layout/settings.xml
similarity index 88%
rename from res/layout/settings.xml
rename to app/src/main/res/layout/settings.xml
index 1879d91..4cdeb2f 100644
--- a/res/layout/settings.xml
+++ b/app/src/main/res/layout/settings.xml
@@ -1,8 +1,11 @@
-
+ android:orientation="vertical"
+ tools:context="fr.gaulupeau.apps.Poche.Settings" >
@@ -62,6 +66,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
+ android:layout_marginTop="10dp"
android:text="@string/txtAPIToken"
android:textSize="18sp" />
@@ -88,6 +93,7 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
+ android:layout_marginTop="10dp"
android:text="@string/btnDone" />
-
+
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/app/src/main/res/values-v11/styles.xml b/app/src/main/res/values-v11/styles.xml
new file mode 100644
index 0000000..a6f4000
--- /dev/null
+++ b/app/src/main/res/values-v11/styles.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/app/src/main/res/values-v14/styles.xml b/app/src/main/res/values-v14/styles.xml
new file mode 100644
index 0000000..35743c8
--- /dev/null
+++ b/app/src/main/res/values-v14/styles.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
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 53%
rename from res/values/strings.xml
rename to app/src/main/res/values/strings.xml
index 2b7188a..7d4fd68 100644
--- a/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,15 +1,15 @@
- In the poche !
- In the poche
- Add in the poche
+ Welcome to wallabag
+ wallabag
+ Bag it!GAULUPEAU Jonathan - 2013
- To save a web page to poche, open the page in a browser then tap Share and tap on In the poche. \nYou could then see your Poche login page. \nAnd it\'s done ! \nMore infos about poche at http://www.inthepoche.com
+ To save a web page to wallabag, open the page in a browser then tap Share and tap on Bag it!. \nYou could then see your wallabag login page. \nAnd it\'s done ! \nMore infos about wallabag at http://www.wallabag.orgSaveWhich browser would you like to use?http://cv.gaulupeau.fr
- Your poche URL :
- Examples:\nhttp://poche.example.fr\nhttp://www.example.fr/poche
+ Your wallabag URL :
+ Examples:\nhttp://wallabag.example.fr\nhttp://www.example.fr/wallabagList articlesSynchronizeMark as Read
@@ -21,7 +21,6 @@
Check Internet Connectivity !Please configure the app before Syncing !API global token :
- Your username ID (user_id in Feed URL):
- Your token (token in Feed URL):
- 1.5.3.2
+ Your User ID:
+ Your Token:
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
new file mode 100644
index 0000000..ef77173
--- /dev/null
+++ b/app/src/main/res/values/styles.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..488357f
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,16 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+
+buildscript {
+ repositories {
+ mavenCentral()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:0.12.+'
+ }
+}
+
+allprojects {
+ repositories {
+ mavenCentral()
+ }
+}
\ No newline at end of file
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..91a7e26
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# 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
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# 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\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+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" ] ; 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"`
+
+ # 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
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+ JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..aec9973
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,90 @@
+@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
+
+@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=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@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 Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_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=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+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
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/project.properties b/project.properties
deleted file mode 100644
index 85aac54..0000000
--- a/project.properties
+++ /dev/null
@@ -1,14 +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-8
diff --git a/res/drawable-hdpi/icon.png b/res/drawable-hdpi/icon.png
deleted file mode 100644
index e167d3a..0000000
Binary files a/res/drawable-hdpi/icon.png and /dev/null differ
diff --git a/res/drawable-ldpi/icon.png b/res/drawable-ldpi/icon.png
deleted file mode 100644
index 205053e..0000000
Binary files a/res/drawable-ldpi/icon.png and /dev/null differ
diff --git a/res/drawable-mdpi/icon.png b/res/drawable-mdpi/icon.png
deleted file mode 100644
index cb03ec3..0000000
Binary files a/res/drawable-mdpi/icon.png and /dev/null differ
diff --git a/res/drawable-xhdpi/icon.png b/res/drawable-xhdpi/icon.png
deleted file mode 100644
index f210537..0000000
Binary files a/res/drawable-xhdpi/icon.png and /dev/null differ
diff --git a/res/drawable/poche.png b/res/drawable/poche.png
deleted file mode 100644
index c807e7f..0000000
Binary files a/res/drawable/poche.png and /dev/null differ
diff --git a/res/layout/article.xml b/res/layout/article.xml
deleted file mode 100644
index 210eb1d..0000000
--- a/res/layout/article.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
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'