Android: implement copying of selected text to clipboard

5 files changed, 62 insertions, 3 deletions

diff --git a/android/res/animator/info.xml b/android/res/animator/info.xml
new file mode 100644
index 00000000..cd7bff28
--- /dev/null
+++ b/android/res/animator/info.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:ordering="sequentially" >
+
+    <objectAnimator
+        android:propertyName="alpha"
+        android:valueFrom="0.0"
+        android:valueTo="1.0"
+        android:duration="200" />
+
+    <objectAnimator
+        android:propertyName="alpha"
+        android:valueTo="1.0"
+        android:duration="800" />
+
+    <objectAnimator
+        android:propertyName="alpha"
+        android:valueTo="0.0"
+        android:duration="400" />
+</set>
\ No newline at end of file
diff --git a/android/res/drawable-ldpi/ic_clipboard.png b/android/res/drawable-ldpi/ic_clipboard.png
new file mode 100644
index 00000000..1fbc90fa
--- /dev/null
+++ b/android/res/drawable-ldpi/ic_clipboard.png
diff --git a/android/res/drawable-mdpi/ic_clipboard.png b/android/res/drawable-mdpi/ic_clipboard.png
new file mode 100644
index 00000000..3f22aab5
--- /dev/null
+++ b/android/res/drawable-mdpi/ic_clipboard.png
diff --git a/android/res/layout/buttons.xml b/android/res/layout/buttons.xml
index c8c95153..910076b7 100644
--- a/android/res/layout/buttons.xml
+++ b/android/res/layout/buttons.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
 
-    <ViewSwitcher
+    <ViewAnimator
         android:id="@+id/switcher"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -97,7 +97,7 @@
                 android:layout_toRightOf="@+id/cancel"
                 android:layout_toLeftOf="@+id/searchBack"
                 android:inputType="text"
-                android:hint="Search"
+                android:hint="@string/search"
                 android:singleLine="true" />
 
             <ImageButton
@@ -122,7 +122,34 @@
 
         </RelativeLayout>
 
-    </ViewSwitcher>
+        <RelativeLayout
+            android:id="@+id/topBar3"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/toolbar" >
+
+            <ImageButton
+                android:id="@+id/cancelSelectButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_alignParentLeft="true"
+                android:contentDescription="@string/cancel"
+                android:background="@drawable/button"
+                android:src="@drawable/ic_cancel" />
+
+            <ImageButton
+                android:id="@+id/copySelectButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_alignParentRight="true"
+                android:contentDescription="@string/copy"
+                android:background="@drawable/button"
+                android:src="@drawable/ic_clipboard" />
+
+        </RelativeLayout>
+    </ViewAnimator>
 
     <RelativeLayout
         android:id="@+id/lowerButtons"
@@ -160,4 +187,14 @@
 
     </RelativeLayout>
 
+    <TextView
+        android:id="@+id/info"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/pageSlider"
+        android:layout_centerHorizontal="true"
+        android:layout_centerVertical="true"
+        android:background="@drawable/page_num"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textColor="#FFFFFF" />
 </RelativeLayout>
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 2022e3eb..826ada55 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -17,4 +17,6 @@
     <string name="link_control">Link highlighting and enabling</string>
     <string name="no_further_occurences_found">No further occurences found</string>
     <string name="select">Select</string>
+    <string name="search">Search</string>
+    <string name="copy">Copy</string>
 </resources>