integration with KnownReader

AndroidManifest.xml

@@ -24,6 +24,11 @@
                 <category android:name="android.intent.category.LAUNCHER" />
                 <category android:name="android.intent.category.MULTIWINDOW_LAUNCHER" />
             </intent-filter>
+            <intent-filter>
+              <action android:name="aard2.search" />
+              <category android:name="android.intent.category.DEFAULT" />
+              <category android:name="android.intent.category.BROWSABLE" />
+            </intent-filter>
         </activity>
 
         <activity

README.org

@@ -162,7 +162,7 @@
    implemented an action to start Aard 2 with lookup intent.
 
    Applications can launch Aard 2 lookup by starting activity with intent
-   ~aard2.lookup~ with text to look up passed as an extra string
+   ~aard2.lookup~ (show lookup card) or ~aard2.search~ (show articles list) with text to look up passed as an extra string
     parameter [[http://developer.android.com/reference/android/app/SearchManager.html#QUERY][SearchManager.QUERY]]. For example:
 
    #+BEGIN_SRC java
@@ -177,3 +177,13 @@
    #+BEGIN_SRC sh
    adb shell am start -a aard2.lookup -f 335544320 -e query "Foo Bar"
    #+END_SRC
+
+   Application can pass extra string SENDER_ACTION to receive back translated text if the user click "return" action (in the article card).
+   The "callback" intent will be as follows:
+
+   #+BEGIN_SRC java
+   Intent intentSender = new Intent(SENDER_ACTION);
+   intentSender.putExtra("extraTitle", "[article key]");
+   intentSender.putExtra("extraText", "[translated text]");
+   Where translated text will be the innerText of artile's webview.
+   #+END_SRC#+END_SRC

res/menu/article.xml

@@ -1,4 +1,12 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item android:id="@+id/action_send_article"
+        android:title="@string/action_send_article"
+        android:checkable="true"
+        android:checked="false"
+        android:showAsAction="always"
+        />
+
     <item android:id="@+id/action_bookmark_article"
           android:title="@string/action_bookmark_article"
           android:checkable="true"

res/menu/lookup.xml

@@ -4,4 +4,8 @@
           android:showAsAction="always"
           android:actionLayout="@layout/action_lookup"
           />
+    <item android:id="@+id/action_backspace"
+        android:title="@string/action_backspace"
+        android:showAsAction="always"
+        />
 </menu>

res/values-de/strings.xml

@@ -7,6 +7,7 @@
 
     <string name="action_find_dictionaries">Finde Wörterbücher</string>
     <string name="action_find_in_page">Suche in Seite</string>
+    <string name="action_send_article">Rückkehr</string>
     <string name="action_bookmark_article">Lesezeichen</string>
     <string name="action_filter">Filter</string>
     <string name="action_ascending">Aufsteigend</string>

res/values-es/strings.xml

@@ -8,6 +8,7 @@
     <string name="subtitle_dictionaries">Diccionarios</string>
     <string name="action_find_dictionaries">Encontrar diccionarios</string>
     <string name="action_find_in_page">Buscar en la página</string>
+    <string name="action_send_article">Regreso</string>
     <string name="action_bookmark_article">Añadir marcadores</string>
     <string name="action_filter">Filtrar</string>
     <string name="action_ascending">Ascendente</string>

res/values-fr/strings.xml

@@ -8,6 +8,7 @@
     <string name="subtitle_dictionaries">Dictionnaires</string>
     <string name="action_find_dictionaries">Chercher dictionnaires</string>
     <string name="action_find_in_page">Chercher sur la page</string>
+    <string name="action_send_article">Retourner</string>
     <string name="action_bookmark_article">Signet</string>
     <string name="action_filter">Filtre</string>
     <string name="action_ascending">Croissant</string>

res/values-it/strings.xml

@@ -8,6 +8,7 @@
 <string name="subtitle_dictionaries">Dizionari</string>
 <string name="action_find_dictionaries">Trova dizionari</string>
 <string name="action_find_in_page">Trova nella pagina</string>
+<string name="action_send_article">Ritorno</string>
 <string name="action_bookmark_article">Segnalibro</string>
 <string name="action_filter">Filtro</string>
 <string name="action_ascending">Ascendente</string>

res/values-kab/strings.xml

@@ -7,6 +7,7 @@
 
     <string name="action_find_dictionaries">Af-d imawalen</string>
     <string name="action_find_in_page">Af-d deg usebter</string>
+    <string name="action_send_article">Return</string>
     <string name="action_bookmark_article">Asɣal</string>
     <string name="action_filter">Imsizdeg</string>
     <string name="action_ascending">Igemment</string>

res/values-nb-rNO/strings.xml

@@ -8,6 +8,7 @@
     <string name="subtitle_dictionaries">Ordlister</string>
     <string name="action_find_dictionaries">Finn ordlister</string>
     <string name="action_find_in_page">Finn på side</string>
+    <string name="action_send_article">Komme tilbake</string>
     <string name="action_bookmark_article">Bokmerk</string>
     <string name="action_filter">Filtrer</string>
     <string name="action_ascending">Stigende</string>

res/values-nl/strings.xml

@@ -8,6 +8,7 @@
     <string name="subtitle_dictionaries">Woordenboeken</string>
     <string name="action_find_dictionaries">Woordenboeken zoeken</string>
     <string name="action_find_in_page">Zoeken in pagina</string>
+    <string name="action_send_article">Opbrengst</string>
     <string name="action_bookmark_article">Toevoegen aan bladwijzers</string>
     <string name="action_filter">Filteren</string>
     <string name="action_ascending">Oplopend</string>

res/values-pl/strings.xml

@@ -8,6 +8,7 @@
     <string name="subtitle_dictionaries">Słowniki</string>
     <string name="action_find_dictionaries">Znajdź słowniki</string>
     <string name="action_find_in_page">Znajdź na stronie</string>
+    <string name="action_send_article">Powrót</string>
     <string name="action_bookmark_article">Dodaj do zakładek</string>
     <string name="action_filter">Filtruj</string>
     <string name="action_ascending">Rosnąco</string>

res/values-pt-rBR/strings.xml

@@ -8,6 +8,7 @@
     <string name="subtitle_dictionaries">Dicionários</string>
     <string name="action_find_dictionaries">Procurar dicionários</string>
     <string name="action_find_in_page">Localizar na página</string>
+    <string name="action_send_article">Retornar</string>
     <string name="action_bookmark_article">Adicionar aos marcadores</string>
     <string name="action_filter">Filtro</string>
     <string name="action_ascending">Ascendente</string>

res/values-pt-rPT/strings.xml

@@ -8,6 +8,7 @@
     <string name="subtitle_dictionaries">Dicionários</string>
     <string name="action_find_dictionaries">Procurar dicionários</string>
     <string name="action_find_in_page">Localizar na página</string>
+    <string name="action_send_article">Retornar</string>
     <string name="action_bookmark_article">Adicionar aos marcadores</string>
     <string name="action_filter">Filtro</string>
     <string name="action_ascending">Ascendente</string>

res/values-ru/strings.xml

@@ -8,6 +8,7 @@
 
     <string name="action_find_dictionaries">Искать словари</string>
     <string name="action_find_in_page">Поиск на странице</string>
+    <string name="action_send_article">Вернуть</string>
     <string name="action_bookmark_article">Закладка</string>
     <string name="action_filter">Фильтр</string>
     <string name="action_ascending">По возрастанию</string>

res/values-uk/strings.xml

@@ -6,6 +6,7 @@
     <string name="action_filter">Фільтр</string>
     <string name="action_find_dictionaries">Шукати словники</string>
     <string name="action_find_in_page">Пошук на сторінці</string>
+    <string name="action_send_article">Повернення</string>
     <string name="action_goto_parent_dir">Вверх</string>
     <string name="action_lookup">Пошук</string>
     <string name="action_reload_directory">Перезавантажити</string>

res/values/strings.xml

@@ -8,6 +8,7 @@
     <string name="subtitle_dictionaries">Dictionaries</string>
     <string name="action_find_dictionaries">Find Dictionaries</string>
     <string name="action_find_in_page">Find in page</string>
+    <string name="action_send_article">Return</string>
     <string name="action_bookmark_article">Bookmark</string>
     <string name="action_filter">Filter</string>
     <string name="action_ascending">Ascending</string>
@@ -94,6 +95,7 @@
     <string name="msg_file_not_css">Doesn\'t appear to be a CSS file</string>
     <string name="msg_no_activity_to_get_content">No activity is available to open file</string>
     <string name="action_add_dictionaries">Add</string>
+    <string name="action_backspace">&lt;</string>
     <string name="title_activity_file_select">Select Dictionary File</string>
     <string name="action_goto_parent_dir">Up</string>
     <string name="action_reload_directory">Reload</string>

src/itkach/aard2/ArticleCollectionActivity.java

@@ -3,6 +3,7 @@
 import android.app.ActionBar;
 import android.app.Activity;
 import android.app.SearchManager;
+import android.content.ActivityNotFoundException;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -43,6 +44,8 @@ public class ArticleCollectionActivity extends FragmentActivity
 
     static final String PREF = "articleCollection";
     static final String PREF_FULLSCREEN = "fullscreen";
+    static String SENDER_ACTION = "";
+    public String mPageTitle = "";
 
     ArticleCollectionPagerAdapter articleCollectionPagerAdapter;
     ViewPager viewPager;
@@ -167,7 +170,25 @@ public void run() {
                 viewPager.setCurrentItem(position);
 
                 PagerTitleStrip titleStrip = (PagerTitleStrip)findViewById(R.id.pager_title_strip);
-                titleStrip.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 10);
+                titleStrip.setTextSize(TypedValue.COMPLEX_UNIT_DIP, 14);
+                titleStrip.setOnClickListener(new View.OnClickListener(){
+                    @Override
+                    public void onClick(View v) {
+                        Intent upIntent = Intent.makeMainActivity(new ComponentName(ArticleCollectionActivity.this, MainActivity.class));
+                        if (NavUtils.shouldUpRecreateTask(ArticleCollectionActivity.this, upIntent)) {
+                            upIntent.putExtra(SearchManager.QUERY, mPageTitle);
+                            TaskStackBuilder.create(ArticleCollectionActivity.this)
+                                    .addNextIntent(upIntent).startActivities();
+                        } else {
+                            // This activity is part of the application's task, so simply
+                            // navigate up to the hierarchical parent activity.
+                            upIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
+                            upIntent.putExtra(SearchManager.QUERY, mPageTitle);
+                            startActivity(upIntent);
+                        }
+                        finish();
+                    }
+                });
                 updateTitle(position);
                 articleCollectionPagerAdapter.registerDataSetObserver(new DataSetObserver() {
                     @Override
@@ -237,6 +258,10 @@ private ArticleCollectionPagerAdapter createFromIntent(Application app, Intent i
         if (lookupKey == null) {
             lookupKey = intent.getStringExtra("EXTRA_QUERY");
         }
+        SENDER_ACTION = intent.getStringExtra("SENDER_ACTION");
+        if (SENDER_ACTION == null) SENDER_ACTION = "";
+        Log.d(TAG, String.format("Sender action is %s", SENDER_ACTION));
+
         String preferredSlobId = null;
         if (lookupKey == null) {
             Uri uri = intent.getData();
@@ -310,6 +335,7 @@ private void updateTitle(int position) {
             actionBar.setTitle("???");
         }
         actionBar.setSubtitle(pageTitle);
+        mPageTitle = pageTitle.toString();
     }
 
 

src/itkach/aard2/ArticleFragment.java

@@ -2,18 +2,23 @@
 
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.app.SearchManager;
+import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.webkit.ValueCallback;
 import android.webkit.WebChromeClient;
 import android.webkit.WebView;
 import android.widget.ImageView;
@@ -26,11 +31,13 @@ public class ArticleFragment extends Fragment {
     public static final String ARG_URL = "articleUrl";
 
     private ArticleWebView  view;
+    private MenuItem        miSend;
     private MenuItem        miBookmark;
     private MenuItem        miFullscreen;
     private Drawable        icBookmark;
     private Drawable        icBookmarkO;
     private Drawable        icFullscreen;
+    private Drawable        icReturn;
     private String          url;
 
 
@@ -42,6 +49,7 @@ public void onCreate(Bundle savedInstanceState) {
         icBookmark =  IconMaker.actionBar(context, IconMaker.IC_BOOKMARK);
         icBookmarkO = IconMaker.actionBar(context, IconMaker.IC_BOOKMARK_O);
         icFullscreen = IconMaker.actionBar(context, IconMaker.IC_FULLSCREEN);
+        icReturn = IconMaker.actionBar(context, IconMaker.IC_SHARE);
         setHasOptionsMenu(true);
     }
 
@@ -52,6 +60,7 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         //to avoid duplicates
         menu.clear();
         inflater.inflate(R.menu.article, menu);
+        miSend = menu.findItem(R.id.action_send_article);
         miBookmark = menu.findItem(R.id.action_bookmark_article);
         miFullscreen = menu.findItem(R.id.action_fullscreen);
         if (Build.VERSION.SDK_INT < 19) {
@@ -80,6 +89,27 @@ public boolean onOptionsItemSelected(MenuItem item) {
             view.showFindDialog(null, true);
             return true;
         }
+        if (itemId == R.id.action_send_article) {
+            if (this.url != null)
+                if (!(ArticleCollectionActivity.SENDER_ACTION == null || ArticleCollectionActivity.SENDER_ACTION.isEmpty()))
+                    view.evaluateJavascript(
+                        //"(function() { return ('<html>'+document.getElementsByTagName('html')[0].innerHTML+'</html>'); })();",
+                        "(function() { return (document.getElementsByTagName('html')[0].innerText); })();",
+                        new ValueCallback<String>() {
+                            @Override
+                            public void onReceiveValue(String txt) {
+                                Intent intentSender = new Intent(ArticleCollectionActivity.SENDER_ACTION);
+                                intentSender.putExtra("extraText", txt);
+                                intentSender.putExtra("extraTitle",((ArticleCollectionActivity)getActivity()).mPageTitle);
+                                try
+                                {
+                                    getActivity().startActivity(intentSender);
+                                } catch ( ActivityNotFoundException e ) {
+                                    Log.e("ERR", "Intent error: " + e.getMessage());
+                                }
+                            }
+                        });
+        }
         if (itemId == R.id.action_bookmark_article) {
             Application app = (Application)getActivity().getApplication();
             if (this.url != null) {
@@ -186,6 +216,7 @@ public void onResume() {
     public void onPrepareOptionsMenu(Menu menu) {
         super.onPrepareOptionsMenu(menu);
         if (this.url == null) {
+            miSend.setVisible(false);
             miBookmark.setVisible(false);
         }
         else {
@@ -197,9 +228,12 @@ public void onPrepareOptionsMenu(Menu menu) {
                 miBookmark.setVisible(false);
             }
         }
+        if (ArticleCollectionActivity.SENDER_ACTION == null || ArticleCollectionActivity.SENDER_ACTION.isEmpty())
+            miSend.setVisible(false);
         applyTextZoomPref();
         applyStylePref();
         miFullscreen.setIcon(icFullscreen);
+        miSend.setIcon(icReturn);
     }
 
     void applyTextZoomPref() {
@@ -225,6 +259,7 @@ public void onDestroy() {
             view = null;
         }
         miFullscreen = null;
+        miSend = null;
         miBookmark = null;
         super.onDestroy();
     }

src/itkach/aard2/IconMaker.java

@@ -9,6 +9,8 @@
 
 class IconMaker {
 
+    //icon codes could be seen at: https://fontawesome.com/v4.7/cheatsheet/
+
     static final String CUSTOM_FONT_PATH = "fontawesome-4.2.0.ttf";
 
     static final char IC_SEARCH = '\uf002';
@@ -39,7 +41,8 @@ class IconMaker {
     static final char IC_LEVEL_UP = '\uf148';
     static final char IC_BAN = '\uf05e';
     static final char IC_FULLSCREEN = '\uf065';
-
+    static final char IC_SHARE = '\uf064';
+    static final char IC_ARROW_LEFT = '\uf060';
 
     static FontDrawable make(Context context, char c, int sizeDp, int color) {
         FontDrawable drawable = new FontDrawable.Builder(context, c, CUSTOM_FONT_PATH)