diff --git a/bin/Poche.apk b/bin/Poche.apk deleted file mode 100644 index dafe4d2..0000000 Binary files a/bin/Poche.apk and /dev/null differ diff --git a/bin/classes.dex b/bin/classes.dex index 9d5a206..c1224c5 100644 Binary files a/bin/classes.dex and b/bin/classes.dex differ diff --git a/bin/classes/fr/gaulupeau/apps/Poche/Poche$1.class b/bin/classes/fr/gaulupeau/apps/Poche/Poche$1.class index 71f0402..2ba9129 100644 Binary files a/bin/classes/fr/gaulupeau/apps/Poche/Poche$1.class and b/bin/classes/fr/gaulupeau/apps/Poche/Poche$1.class differ diff --git a/bin/classes/fr/gaulupeau/apps/Poche/Poche.class b/bin/classes/fr/gaulupeau/apps/Poche/Poche.class index 271dead..15b6905 100644 Binary files a/bin/classes/fr/gaulupeau/apps/Poche/Poche.class and b/bin/classes/fr/gaulupeau/apps/Poche/Poche.class differ diff --git a/bin/classes/fr/gaulupeau/apps/Poche/R$id.class b/bin/classes/fr/gaulupeau/apps/Poche/R$id.class index afee20a..fa59c31 100644 Binary files a/bin/classes/fr/gaulupeau/apps/Poche/R$id.class and b/bin/classes/fr/gaulupeau/apps/Poche/R$id.class differ diff --git a/bin/classes/fr/gaulupeau/apps/Poche/R$layout.class b/bin/classes/fr/gaulupeau/apps/Poche/R$layout.class index 03a6667..6df967d 100644 Binary files a/bin/classes/fr/gaulupeau/apps/Poche/R$layout.class and b/bin/classes/fr/gaulupeau/apps/Poche/R$layout.class differ diff --git a/bin/classes/fr/gaulupeau/apps/Poche/R$string.class b/bin/classes/fr/gaulupeau/apps/Poche/R$string.class index 5efd034..16e1fdc 100644 Binary files a/bin/classes/fr/gaulupeau/apps/Poche/R$string.class and b/bin/classes/fr/gaulupeau/apps/Poche/R$string.class differ diff --git a/bin/resources.ap_ b/bin/resources.ap_ index 92de4d9..d846642 100644 Binary files a/bin/resources.ap_ and b/bin/resources.ap_ differ diff --git a/gen/fr/gaulupeau/apps/Poche/R.java b/gen/fr/gaulupeau/apps/Poche/R.java index 215f0d3..75cb4a4 100644 --- a/gen/fr/gaulupeau/apps/Poche/R.java +++ b/gen/fr/gaulupeau/apps/Poche/R.java @@ -17,12 +17,14 @@ public final class R { public static final int icon=0x7f020000; } public static final class id { - public static final int author=0x7f060004; - public static final int btnDone=0x7f060005; - public static final int instructions=0x7f060003; - public static final int pageUrl_label=0x7f060001; - public static final int pocheUrl=0x7f060002; + public static final int author=0x7f060007; + public static final int btnDone=0x7f060006; + public static final int imageView1=0x7f060001; + public static final int instructions=0x7f060005; + public static final int pageUrl_label=0x7f060002; + public static final int pocheUrl=0x7f060004; public static final int scrollView1=0x7f060000; + public static final int textView1=0x7f060003; } public static final class layout { public static final int main=0x7f030000; @@ -34,6 +36,7 @@ public final class R { public static final int btnDone=0x7f050004; public static final int hello=0x7f050000; public static final int instructions=0x7f050003; + public static final int url_help=0x7f050008; public static final int url_label=0x7f050007; public static final int which_browser=0x7f050005; } diff --git a/res/layout/main.xml b/res/layout/main.xml index c9c280d..90166ad 100644 --- a/res/layout/main.xml +++ b/res/layout/main.xml @@ -1,50 +1,100 @@ - - + android:layout_height="wrap_content" > - + - + - + - - + - + - + + + + + + + + + + + + + - \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 4b9f5c3..ef182b3 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -3,9 +3,10 @@ Welcome to Android2Poche ! Android2Poche By GAULUPEAU Jonathan - To save a web page to Poche, open the page in a browser then tap Share and tap on Android to Poche. You should then see a save window. When you have finished the browser will return to the original location. + To save a web page to Poche, open the page in a browser then tap Share and tap on Android2Poche. \nYou could then see your Poche login page. \nAnd it\'s done ! Done Which browser would you like to use? http://links.gaulupeau.fr - Your Poche URL : + Your Poche URL : + Examples:\nhttp://poche.example.fr\nhttp://www.example.fr/poche diff --git a/src/fr/gaulupeau/apps/Poche/Poche.java b/src/fr/gaulupeau/apps/Poche/Poche.java index 72b3ffa..a8730e3 100644 --- a/src/fr/gaulupeau/apps/Poche/Poche.java +++ b/src/fr/gaulupeau/apps/Poche/Poche.java @@ -68,6 +68,7 @@ import android.widget.TextView; e.printStackTrace(); } String base64 = Base64.encodeToString(data, Base64.DEFAULT); + System.out.println(base64); deliciousSaveUrl.appendQueryParameter("url", base64); //System.out.println("base64 : " + base64); //System.out.println("pageurl : " + pageUrl); @@ -92,7 +93,6 @@ import android.widget.TextView; btnDone.setOnClickListener(new OnClickListener() { public void onClick(View v) { // close the app - System.out.println(editPocheUrl.getText().toString()); SharedPreferences settings = getSharedPreferences(PREFS_NAME, 0); SharedPreferences.Editor editor = settings.edit(); editor.putString("pocheUrl", editPocheUrl.getText().toString());