From a907bd4ac1fc4def3c183d0ce7641a1e52ea4712 Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Thu, 3 May 2012 13:44:58 +0100 Subject: [PATCH] "Shared from FBReader" text + message subject when sharing a book --- TODO.1.5 | 6 ++++-- assets/resources/application/en.xml | 3 +++ src/org/geometerplus/android/fbreader/FBUtil.java | 6 ++++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/TODO.1.5 b/TODO.1.5 index 4b6d07f87..54f9b7737 100644 --- a/TODO.1.5 +++ b/TODO.1.5 @@ -6,8 +6,10 @@ litres: top/hot lists (what's happen?) litres: author photos * Screen orientation by default: not selected? -* Old style seekbar for navigation -* "Shared by FBReader" in message with shared book +DONE Old style seekbar for navigation +* Start position mark in navigation widget +DONE "Shared from FBReader" in message with shared book +* Better file name for shared file * Link sharing * fb2 native: footnote id depth * check new condition syntax diff --git a/assets/resources/application/en.xml b/assets/resources/application/en.xml index 36602fdeb..312c78e9d 100644 --- a/assets/resources/application/en.xml +++ b/assets/resources/application/en.xml @@ -226,6 +226,9 @@ + + + diff --git a/src/org/geometerplus/android/fbreader/FBUtil.java b/src/org/geometerplus/android/fbreader/FBUtil.java index 001ada39b..53198afd2 100644 --- a/src/org/geometerplus/android/fbreader/FBUtil.java +++ b/src/org/geometerplus/android/fbreader/FBUtil.java @@ -23,8 +23,10 @@ import android.app.Activity; import android.content.ActivityNotFoundException; import android.content.Intent; import android.net.Uri; +import android.text.Html; import org.geometerplus.zlibrary.core.filesystem.ZLPhysicalFile; +import org.geometerplus.zlibrary.core.resources.ZLResource; import org.geometerplus.fbreader.library.Book; import org.geometerplus.fbreader.filetype.FileTypeCollection; @@ -37,9 +39,13 @@ public abstract class FBUtil { // That should be impossible return; } + final CharSequence sharedFrom = + Html.fromHtml(ZLResource.resource("sharing").getResource("sharedFrom").getValue()); activity.startActivity( new Intent(Intent.ACTION_SEND) .setType(FileTypeCollection.Instance.simplifiedMimeType(file).Name) + .putExtra(Intent.EXTRA_SUBJECT, book.getTitle()) + .putExtra(Intent.EXTRA_TEXT, sharedFrom) .putExtra(Intent.EXTRA_STREAM, Uri.fromFile(file.javaFile())) ); } catch (ActivityNotFoundException e) {