diff options
author | Tor Andersson <tor.andersson@artifex.com> | 2013-05-27 14:51:33 +0200 |
---|---|---|
committer | Tor Andersson <tor.andersson@artifex.com> | 2013-05-27 14:51:33 +0200 |
commit | 868a21fe07d4ac760a3bc429edefe860b8255b6d (patch) | |
tree | ad6dc7f02cd757c3de22417dcf41233c93e188bf /android/res | |
parent | af13164924fb4c627f201c943c7a18e5dbe39507 (diff) | |
download | mupdf-868a21fe07d4ac760a3bc429edefe860b8255b6d.tar.xz |
Fix indentation to be consistent with regard to tabs/spaces.
Diffstat (limited to 'android/res')
-rw-r--r-- | android/res/animator/info.xml | 30 | ||||
-rw-r--r-- | android/res/drawable/busy.xml | 14 | ||||
-rw-r--r-- | android/res/drawable/button.xml | 38 | ||||
-rw-r--r-- | android/res/drawable/page_num.xml | 14 | ||||
-rw-r--r-- | android/res/drawable/search.xml | 66 | ||||
-rw-r--r-- | android/res/drawable/seek_progress.xml | 4 | ||||
-rw-r--r-- | android/res/drawable/seek_thumb.xml | 6 | ||||
-rw-r--r-- | android/res/drawable/tiled_background.xml | 4 | ||||
-rw-r--r-- | android/res/layout/buttons.xml | 724 | ||||
-rw-r--r-- | android/res/layout/main.xml | 6 | ||||
-rw-r--r-- | android/res/layout/outline_entry.xml | 42 | ||||
-rw-r--r-- | android/res/layout/picker_entry.xml | 38 | ||||
-rw-r--r-- | android/res/layout/print_dialog.xml | 12 | ||||
-rw-r--r-- | android/res/layout/textentry.xml | 12 | ||||
-rw-r--r-- | android/res/values-da/strings.xml | 2 | ||||
-rw-r--r-- | android/res/values/colors.xml | 26 | ||||
-rw-r--r-- | android/res/values/strings.xml | 104 |
17 files changed, 571 insertions, 571 deletions
diff --git a/android/res/animator/info.xml b/android/res/animator/info.xml index cd7bff28..9085a9ee 100644 --- a/android/res/animator/info.xml +++ b/android/res/animator/info.xml @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="utf-8"?> <set xmlns:android="http://schemas.android.com/apk/res/android" - android:ordering="sequentially" > + android:ordering="sequentially" > - <objectAnimator - android:propertyName="alpha" - android:valueFrom="0.0" - android:valueTo="1.0" - android:duration="200" /> + <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="1.0" + android:duration="800" /> - <objectAnimator - android:propertyName="alpha" - android:valueTo="0.0" - android:duration="400" /> -</set>
\ No newline at end of file + <objectAnimator + android:propertyName="alpha" + android:valueTo="0.0" + android:duration="400" /> +</set> diff --git a/android/res/drawable/busy.xml b/android/res/drawable/busy.xml index 5ac0ce76..f7f42a44 100644 --- a/android/res/drawable/busy.xml +++ b/android/res/drawable/busy.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle"> - <corners android:radius="12dp" /> - <padding android:left="16dp" - android:right="16dp" - android:top="16dp" - android:bottom="16dp" /> - <solid android:color="@color/busy_indicator" /> + android:shape="rectangle"> + <corners android:radius="12dp" /> + <padding android:left="16dp" + android:right="16dp" + android:top="16dp" + android:bottom="16dp" /> + <solid android:color="@color/busy_indicator" /> </shape> diff --git a/android/res/drawable/button.xml b/android/res/drawable/button.xml index 3b87ccb6..0a9bcd51 100644 --- a/android/res/drawable/button.xml +++ b/android/res/drawable/button.xml @@ -1,23 +1,23 @@ <?xml version="1.0" encoding="utf-8"?> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_pressed="true"> - <shape> - <solid android:color="@color/button_pressed" /> - <padding android:left="8dp" android:top="8dp" android:right="8dp" android:bottom="8dp" /> - </shape> - </item> - <item android:state_focused="true"> - <shape> - <solid android:color="@color/button_normal" /> - <stroke android:width="4dp" android:color="@color/button_pressed" /> - <padding android:left="8dp" android:top="8dp" android:right="8dp" android:bottom="8dp" /> - </shape> - </item> - <item> - <shape> - <solid android:color="@color/button_normal" /> - <padding android:left="8dp" android:top="8dp" android:right="8dp" android:bottom="8dp" /> - </shape> - </item> + <item android:state_pressed="true"> + <shape> + <solid android:color="@color/button_pressed" /> + <padding android:left="8dp" android:top="8dp" android:right="8dp" android:bottom="8dp" /> + </shape> + </item> + <item android:state_focused="true"> + <shape> + <solid android:color="@color/button_normal" /> + <stroke android:width="4dp" android:color="@color/button_pressed" /> + <padding android:left="8dp" android:top="8dp" android:right="8dp" android:bottom="8dp" /> + </shape> + </item> + <item> + <shape> + <solid android:color="@color/button_normal" /> + <padding android:left="8dp" android:top="8dp" android:right="8dp" android:bottom="8dp" /> + </shape> + </item> </selector> diff --git a/android/res/drawable/page_num.xml b/android/res/drawable/page_num.xml index 533579e1..8d50df85 100644 --- a/android/res/drawable/page_num.xml +++ b/android/res/drawable/page_num.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle"> - <padding android:left="8dp" - android:right="8dp" - android:top="1dp" - android:bottom="2dp" /> - <solid android:color="@color/page_indicator" /> +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + <padding android:left="8dp" + android:right="8dp" + android:top="1dp" + android:bottom="2dp" /> + <solid android:color="@color/page_indicator" /> </shape> diff --git a/android/res/drawable/search.xml b/android/res/drawable/search.xml index d689c465..4fc58830 100644 --- a/android/res/drawable/search.xml +++ b/android/res/drawable/search.xml @@ -1,37 +1,37 @@ <?xml version="1.0" encoding="utf-8"?> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_pressed="true"> - <shape android:shape="rectangle"> - <solid android:color="@color/text_pressed" /> - <stroke android:width="4dp" android:color="@color/text_border_pressed" /> - <padding - android:left="12dp" - android:right="12dp" - android:top="8dp" - android:bottom="8dp" /> - </shape> - </item> - <item android:state_focused="true"> - <shape> - <solid android:color="@color/text_normal" /> - <stroke android:width="4dp" android:color="@color/text_border_focused" /> - <padding - android:left="12dp" - android:right="12dp" - android:top="8dp" - android:bottom="8dp" /> - </shape> - </item> - <item> - <shape> - <solid android:color="@color/text_normal" /> - <stroke android:width="4dp" android:color="@color/text_border_normal" /> - <padding - android:left="12dp" - android:right="12dp" - android:top="8dp" - android:bottom="8dp" /> - </shape> - </item> + <item android:state_pressed="true"> + <shape android:shape="rectangle"> + <solid android:color="@color/text_pressed" /> + <stroke android:width="4dp" android:color="@color/text_border_pressed" /> + <padding + android:left="12dp" + android:right="12dp" + android:top="8dp" + android:bottom="8dp" /> + </shape> + </item> + <item android:state_focused="true"> + <shape> + <solid android:color="@color/text_normal" /> + <stroke android:width="4dp" android:color="@color/text_border_focused" /> + <padding + android:left="12dp" + android:right="12dp" + android:top="8dp" + android:bottom="8dp" /> + </shape> + </item> + <item> + <shape> + <solid android:color="@color/text_normal" /> + <stroke android:width="4dp" android:color="@color/text_border_normal" /> + <padding + android:left="12dp" + android:right="12dp" + android:top="8dp" + android:bottom="8dp" /> + </shape> + </item> </selector> diff --git a/android/res/drawable/seek_progress.xml b/android/res/drawable/seek_progress.xml index 2722ed07..328139c2 100644 --- a/android/res/drawable/seek_progress.xml +++ b/android/res/drawable/seek_progress.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="line" > - <stroke android:width="6dp" android:color="@color/seek_progress" /> + android:shape="line" > + <stroke android:width="6dp" android:color="@color/seek_progress" /> </shape> diff --git a/android/res/drawable/seek_thumb.xml b/android/res/drawable/seek_thumb.xml index 518aa588..e3a9bad4 100644 --- a/android/res/drawable/seek_thumb.xml +++ b/android/res/drawable/seek_thumb.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="oval" > - <size android:width="28dp" android:height="28dp" /> - <solid android:color="@color/seek_thumb" /> + android:shape="oval" > + <size android:width="28dp" android:height="28dp" /> + <solid android:color="@color/seek_thumb" /> </shape> diff --git a/android/res/drawable/tiled_background.xml b/android/res/drawable/tiled_background.xml index a8233975..60e08f3c 100644 --- a/android/res/drawable/tiled_background.xml +++ b/android/res/drawable/tiled_background.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> <bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/darkdenim3" - android:tileMode="repeat" /> + android:src="@drawable/darkdenim3" + android:tileMode="repeat" /> diff --git a/android/res/layout/buttons.xml b/android/res/layout/buttons.xml index 3659b3e9..5d082578 100644 --- a/android/res/layout/buttons.xml +++ b/android/res/layout/buttons.xml @@ -1,371 +1,371 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" > + android:layout_width="match_parent" + android:layout_height="match_parent" > - <ViewAnimator - android:id="@+id/switcher" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_centerHorizontal="true" > + <ViewAnimator + android:id="@+id/switcher" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:layout_centerHorizontal="true" > - <RelativeLayout + <RelativeLayout android:id="@+id/topBar0Main" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@color/toolbar" > - - <TextView - android:id="@+id/docNameText" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_toLeftOf="@+id/linkButton" - android:layout_alignParentLeft="true" - android:paddingLeft="16dp" - android:singleLine="true" - android:textColor="#FFFFFF" - android:textStyle="bold" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <ImageButton - android:id="@+id/linkButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_toLeftOf="@+id/reflowButton" - android:contentDescription="@string/toggle_links" - android:background="@drawable/button" - android:src="@drawable/ic_link" /> - - <ImageButton - android:id="@+id/reflowButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_toLeftOf="@+id/outlineButton" - android:contentDescription="@string/search_document" - android:background="@drawable/button" - android:src="@drawable/ic_reflow" /> - - <ImageButton - android:id="@+id/outlineButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_toLeftOf="@+id/searchButton" - android:contentDescription="@string/search_document" - android:background="@drawable/button" - android:src="@drawable/ic_list" /> - - <ImageButton - android:id="@+id/searchButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_toLeftOf="@+id/moreButton" - android:contentDescription="@string/search_document" - android:background="@drawable/button" - android:src="@drawable/ic_magnifying_glass" /> - - <ImageButton - android:id="@+id/moreButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_alignParentRight="true" - android:contentDescription="@string/more" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@color/toolbar" > + + <TextView + android:id="@+id/docNameText" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_toLeftOf="@+id/linkButton" + android:layout_alignParentLeft="true" + android:paddingLeft="16dp" + android:singleLine="true" + android:textColor="#FFFFFF" + android:textStyle="bold" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <ImageButton + android:id="@+id/linkButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_toLeftOf="@+id/reflowButton" + android:contentDescription="@string/toggle_links" + android:background="@drawable/button" + android:src="@drawable/ic_link" /> + + <ImageButton + android:id="@+id/reflowButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_toLeftOf="@+id/outlineButton" + android:contentDescription="@string/search_document" + android:background="@drawable/button" + android:src="@drawable/ic_reflow" /> + + <ImageButton + android:id="@+id/outlineButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_toLeftOf="@+id/searchButton" + android:contentDescription="@string/search_document" + android:background="@drawable/button" + android:src="@drawable/ic_list" /> + + <ImageButton + android:id="@+id/searchButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_toLeftOf="@+id/moreButton" + android:contentDescription="@string/search_document" + android:background="@drawable/button" + android:src="@drawable/ic_magnifying_glass" /> + + <ImageButton + android:id="@+id/moreButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_alignParentRight="true" + android:contentDescription="@string/more" android:background="@drawable/button" android:onClick="OnMoreButtonClick" - android:src="@drawable/ic_more" /> - - </RelativeLayout> - - <RelativeLayout - android:id="@+id/topBar1Search" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@color/toolbar" > - - <ImageButton - android:id="@+id/cancelSearch" - 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:onClick="OnCancelSearchButtonClick" - android:src="@drawable/ic_cancel" /> - - <EditText - android:id="@+id/searchText" - android:background="@drawable/search" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_toRightOf="@+id/cancelSearch" - android:layout_toLeftOf="@+id/searchBack" - android:inputType="text" - android:hint="@string/search" - android:singleLine="true" /> - - <ImageButton - android:id="@+id/searchBack" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_toLeftOf="@+id/searchForward" - android:contentDescription="@string/search_backwards" - android:background="@drawable/button" - android:src="@drawable/ic_arrow_left" /> - - <ImageButton - android:id="@+id/searchForward" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_alignParentRight="true" - android:contentDescription="@string/search_forwards" - android:background="@drawable/button" - android:src="@drawable/ic_arrow_right" /> - - </RelativeLayout> - - <RelativeLayout - android:id="@+id/topBar2Annot" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@color/toolbar" > - - <ImageButton - android:id="@+id/cancelAnnotButton" - 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:onClick="OnCancelAnnotButtonClick" - android:src="@drawable/ic_cancel" /> - - <ImageButton - android:id="@+id/highlightButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_toLeftOf="@+id/underlineButton" - android:contentDescription="@string/highlight" - android:background="@drawable/button" - android:onClick="OnHighlightButtonClick" - android:src="@drawable/ic_highlight" /> - - <ImageButton - android:id="@+id/underlineButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_toLeftOf="@+id/strikeOutButton" - android:contentDescription="@string/underline" - android:background="@drawable/button" - android:onClick="OnUnderlineButtonClick" - android:src="@drawable/ic_underline" /> - - <ImageButton - android:id="@+id/strikeOutButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_toLeftOf="@+id/inkButton" - android:contentDescription="@string/strike_out" - android:background="@drawable/button" - android:onClick="OnStrikeOutButtonClick" - android:src="@drawable/ic_strike" /> - - <ImageButton - android:id="@+id/inkButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_alignParentRight="true" - android:contentDescription="@string/ink" - android:background="@drawable/button" - android:onClick="OnInkButtonClick" - android:src="@drawable/ic_pen" /> - - </RelativeLayout> - - <RelativeLayout - android:id="@+id/topBar3Delete" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@color/toolbar" > - - <ImageButton - android:id="@+id/cancelDeleteButton" - 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:onClick="OnCancelDeleteButtonClick" - android:src="@drawable/ic_cancel" /> - - <ImageButton - android:id="@+id/deleteButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_alignParentRight="true" - android:contentDescription="@string/delete" - android:background="@drawable/button" - android:onClick="OnDeleteButtonClick" - android:src="@drawable/ic_trash" /> - - </RelativeLayout> - - <RelativeLayout - android:id="@+id/topBar4More" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@color/toolbar" > - - <ImageButton - android:id="@+id/cancelMoreButton" - 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:onClick="OnCancelMoreButtonClick" - android:src="@drawable/ic_cancel" /> - - <ImageButton - android:id="@+id/printButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_toLeftOf="@+id/copyTextButton" - android:contentDescription="@string/print" - android:background="@drawable/button" - android:onClick="OnPrintButtonClick" - android:src="@drawable/ic_print" /> - - <ImageButton - android:id="@+id/copyTextButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_toLeftOf="@+id/editAnnotButton" - android:layout_alignWithParentIfMissing="true" - android:contentDescription="@string/copy_text_to_the_clipboard" - android:background="@drawable/button" - android:onClick="OnCopyTextButtonClick" - android:src="@drawable/ic_clipboard" /> - - <ImageButton - android:id="@+id/editAnnotButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_alignParentRight="true" - android:contentDescription="@string/edit_annotations" - android:background="@drawable/button" - android:onClick="OnEditAnnotButtonClick" - android:src="@drawable/ic_annotation" /> - </RelativeLayout> - - <RelativeLayout - android:id="@+id/topBar5Accept" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@color/toolbar" > - - <ImageButton - android:id="@+id/cancelAcceptButton" - 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:onClick="OnCancelAcceptButtonClick" - android:src="@drawable/ic_cancel" /> - - <TextView - android:id="@+id/annotType" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_toRightOf="@+id/cancelAcceptButton" - android:layout_toLeftOf="@+id/acceptButton" - android:gravity="center" - android:singleLine="true" - android:textColor="#FFFFFF" - android:textStyle="bold" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <ImageButton - android:id="@+id/acceptButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_alignParentRight="true" - android:contentDescription="@string/accept" - android:background="@drawable/button" - android:onClick="OnAcceptButtonClick" - android:src="@drawable/ic_check" /> - </RelativeLayout> - </ViewAnimator> - - <RelativeLayout - android:id="@+id/lowerButtons" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_centerHorizontal="true" > - - <SeekBar - android:id="@+id/pageSlider" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_centerHorizontal="true" - android:layout_margin="0dp" - android:thumb="@drawable/seek_thumb" - android:progressDrawable="@drawable/seek_progress" - android:paddingLeft="16dp" - android:paddingRight="16dp" - android:paddingTop="12dp" - android:paddingBottom="8dp" - android:background="@color/toolbar" - /> - - <TextView - android:id="@+id/pageNumber" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_above="@+id/pageSlider" - android:layout_centerHorizontal="true" - android:layout_marginBottom="16dp" - android:background="@drawable/page_num" - android:textColor="#FFFFFF" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - </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" /> + android:src="@drawable/ic_more" /> + + </RelativeLayout> + + <RelativeLayout + android:id="@+id/topBar1Search" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@color/toolbar" > + + <ImageButton + android:id="@+id/cancelSearch" + 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:onClick="OnCancelSearchButtonClick" + android:src="@drawable/ic_cancel" /> + + <EditText + android:id="@+id/searchText" + android:background="@drawable/search" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_toRightOf="@+id/cancelSearch" + android:layout_toLeftOf="@+id/searchBack" + android:inputType="text" + android:hint="@string/search" + android:singleLine="true" /> + + <ImageButton + android:id="@+id/searchBack" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_toLeftOf="@+id/searchForward" + android:contentDescription="@string/search_backwards" + android:background="@drawable/button" + android:src="@drawable/ic_arrow_left" /> + + <ImageButton + android:id="@+id/searchForward" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_alignParentRight="true" + android:contentDescription="@string/search_forwards" + android:background="@drawable/button" + android:src="@drawable/ic_arrow_right" /> + + </RelativeLayout> + + <RelativeLayout + android:id="@+id/topBar2Annot" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@color/toolbar" > + + <ImageButton + android:id="@+id/cancelAnnotButton" + 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:onClick="OnCancelAnnotButtonClick" + android:src="@drawable/ic_cancel" /> + + <ImageButton + android:id="@+id/highlightButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_toLeftOf="@+id/underlineButton" + android:contentDescription="@string/highlight" + android:background="@drawable/button" + android:onClick="OnHighlightButtonClick" + android:src="@drawable/ic_highlight" /> + + <ImageButton + android:id="@+id/underlineButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_toLeftOf="@+id/strikeOutButton" + android:contentDescription="@string/underline" + android:background="@drawable/button" + android:onClick="OnUnderlineButtonClick" + android:src="@drawable/ic_underline" /> + + <ImageButton + android:id="@+id/strikeOutButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_toLeftOf="@+id/inkButton" + android:contentDescription="@string/strike_out" + android:background="@drawable/button" + android:onClick="OnStrikeOutButtonClick" + android:src="@drawable/ic_strike" /> + + <ImageButton + android:id="@+id/inkButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_alignParentRight="true" + android:contentDescription="@string/ink" + android:background="@drawable/button" + android:onClick="OnInkButtonClick" + android:src="@drawable/ic_pen" /> + + </RelativeLayout> + + <RelativeLayout + android:id="@+id/topBar3Delete" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@color/toolbar" > + + <ImageButton + android:id="@+id/cancelDeleteButton" + 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:onClick="OnCancelDeleteButtonClick" + android:src="@drawable/ic_cancel" /> + + <ImageButton + android:id="@+id/deleteButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_alignParentRight="true" + android:contentDescription="@string/delete" + android:background="@drawable/button" + android:onClick="OnDeleteButtonClick" + android:src="@drawable/ic_trash" /> + + </RelativeLayout> + + <RelativeLayout + android:id="@+id/topBar4More" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@color/toolbar" > + + <ImageButton + android:id="@+id/cancelMoreButton" + 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:onClick="OnCancelMoreButtonClick" + android:src="@drawable/ic_cancel" /> + + <ImageButton + android:id="@+id/printButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_toLeftOf="@+id/copyTextButton" + android:contentDescription="@string/print" + android:background="@drawable/button" + android:onClick="OnPrintButtonClick" + android:src="@drawable/ic_print" /> + + <ImageButton + android:id="@+id/copyTextButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_toLeftOf="@+id/editAnnotButton" + android:layout_alignWithParentIfMissing="true" + android:contentDescription="@string/copy_text_to_the_clipboard" + android:background="@drawable/button" + android:onClick="OnCopyTextButtonClick" + android:src="@drawable/ic_clipboard" /> + + <ImageButton + android:id="@+id/editAnnotButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_alignParentRight="true" + android:contentDescription="@string/edit_annotations" + android:background="@drawable/button" + android:onClick="OnEditAnnotButtonClick" + android:src="@drawable/ic_annotation" /> + </RelativeLayout> + + <RelativeLayout + android:id="@+id/topBar5Accept" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@color/toolbar" > + + <ImageButton + android:id="@+id/cancelAcceptButton" + 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:onClick="OnCancelAcceptButtonClick" + android:src="@drawable/ic_cancel" /> + + <TextView + android:id="@+id/annotType" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_toRightOf="@+id/cancelAcceptButton" + android:layout_toLeftOf="@+id/acceptButton" + android:gravity="center" + android:singleLine="true" + android:textColor="#FFFFFF" + android:textStyle="bold" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <ImageButton + android:id="@+id/acceptButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_alignParentRight="true" + android:contentDescription="@string/accept" + android:background="@drawable/button" + android:onClick="OnAcceptButtonClick" + android:src="@drawable/ic_check" /> + </RelativeLayout> + </ViewAnimator> + + <RelativeLayout + android:id="@+id/lowerButtons" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:layout_centerHorizontal="true" > + + <SeekBar + android:id="@+id/pageSlider" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:layout_centerHorizontal="true" + android:layout_margin="0dp" + android:thumb="@drawable/seek_thumb" + android:progressDrawable="@drawable/seek_progress" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:paddingTop="12dp" + android:paddingBottom="8dp" + android:background="@color/toolbar" + /> + + <TextView + android:id="@+id/pageNumber" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_above="@+id/pageSlider" + android:layout_centerHorizontal="true" + android:layout_marginBottom="16dp" + android:background="@drawable/page_num" + android:textColor="#FFFFFF" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + </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/layout/main.xml b/android/res/layout/main.xml index 6ae2638d..50b4746b 100644 --- a/android/res/layout/main.xml +++ b/android/res/layout/main.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" /> + android:orientation="vertical" + android:layout_width="fill_parent" + android:layout_height="fill_parent" /> diff --git a/android/res/layout/outline_entry.xml b/android/res/layout/outline_entry.xml index e0a23db5..ea7912e4 100644 --- a/android/res/layout/outline_entry.xml +++ b/android/res/layout/outline_entry.xml @@ -1,27 +1,27 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" > + android:layout_width="match_parent" + android:layout_height="wrap_content" > - <TextView - android:id="@+id/title" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_toLeftOf="@+id/page" - android:singleLine="true" - android:layout_centerVertical="true" - android:paddingLeft="8dp" - android:textAppearance="?android:attr/textAppearanceMedium" /> + <TextView + android:id="@+id/title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_toLeftOf="@+id/page" + android:singleLine="true" + android:layout_centerVertical="true" + android:paddingLeft="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" /> - <TextView - android:id="@+id/page" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignBaseline="@+id/title" - android:layout_alignBottom="@+id/title" - android:layout_alignParentRight="true" - android:paddingRight="8dp" - android:textAppearance="?android:attr/textAppearanceMedium" /> + <TextView + android:id="@+id/page" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignBaseline="@+id/title" + android:layout_alignBottom="@+id/title" + android:layout_alignParentRight="true" + android:paddingRight="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" /> </RelativeLayout> diff --git a/android/res/layout/picker_entry.xml b/android/res/layout/picker_entry.xml index fe4b580c..673a4724 100644 --- a/android/res/layout/picker_entry.xml +++ b/android/res/layout/picker_entry.xml @@ -1,25 +1,25 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingLeft="8dp" > + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingLeft="8dp" > - <ImageView - android:id="@+id/icon" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_alignParentLeft="true" /> + <ImageView + android:id="@+id/icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_alignParentLeft="true" /> - <TextView - android:id="@+id/name" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_toRightOf="@+id/icon" - android:paddingBottom="8dp" - android:paddingLeft="12dp" - android:paddingRight="12dp" - android:paddingTop="8dp" - android:textAppearance="?android:attr/textAppearanceLarge" /> + <TextView + android:id="@+id/name" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_toRightOf="@+id/icon" + android:paddingBottom="8dp" + android:paddingLeft="12dp" + android:paddingRight="12dp" + android:paddingTop="8dp" + android:textAppearance="?android:attr/textAppearanceLarge" /> </RelativeLayout> diff --git a/android/res/layout/print_dialog.xml b/android/res/layout/print_dialog.xml index a95840f3..1d54d22f 100644 --- a/android/res/layout/print_dialog.xml +++ b/android/res/layout/print_dialog.xml @@ -1,9 +1,9 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> - <WebView android:id="@+id/webview" - android:layout_width="fill_parent" - android:layout_height="fill_parent"/> + android:layout_width="fill_parent" + android:layout_height="fill_parent"> + <WebView android:id="@+id/webview" + android:layout_width="fill_parent" + android:layout_height="fill_parent"/> </RelativeLayout> diff --git a/android/res/layout/textentry.xml b/android/res/layout/textentry.xml index 0ac4b44d..08823df8 100644 --- a/android/res/layout/textentry.xml +++ b/android/res/layout/textentry.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <EditText xmlns:android="http://schemas.android.com/apk/res/android" - android:singleLine="false" - android:minLines="3" - android:inputType="textMultiLine" - android:layout_width="match_parent" - android:layout_height="wrap_content" > -</EditText>
\ No newline at end of file + android:singleLine="false" + android:minLines="3" + android:inputType="textMultiLine" + android:layout_width="match_parent" + android:layout_height="wrap_content" > +</EditText> diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml index a70c05cc..b7de1fdc 100644 --- a/android/res/values-da/strings.xml +++ b/android/res/values-da/strings.xml @@ -26,7 +26,7 @@ <string name="leaving_reflow_mode">Forlader konverteringstilstand</string> <string name="more">Mere</string> <string name="no">Nej</string> - <string name="no_further_occurrences_found">Der blev ikke fundet flere tilfælde</string> + <string name="no_further_occurrences_found">Der blev ikke fundet flere tilfælde</string> <string name="no_media_hint">Deles lagermediet med en PC, kan det gøre det utilgængeligt</string> <string name="no_media_warning">Lagermedie ikke fundet</string> <string name="no_text_selected">Ingen tekst valgt</string> diff --git a/android/res/values/colors.xml b/android/res/values/colors.xml index 1a02ca21..ecd1519d 100644 --- a/android/res/values/colors.xml +++ b/android/res/values/colors.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <color name="canvas">#404040</color> - <color name="toolbar">#C0000000</color> - <color name="page_indicator">#C0202020</color> - <color name="busy_indicator">#C0202020</color> - <color name="button_normal">#00000000</color> - <color name="button_pressed">#FF2572AC</color> - <color name="text_normal">#FFFFFF</color> - <color name="text_pressed">#FFFFFF</color> - <color name="text_border_normal">#000000</color> - <color name="text_border_pressed">#2572AC</color> - <color name="text_border_focused">#000000</color> - <color name="seek_thumb">#2572AC</color> - <color name="seek_progress">#FFFFFF</color> + <color name="canvas">#404040</color> + <color name="toolbar">#C0000000</color> + <color name="page_indicator">#C0202020</color> + <color name="busy_indicator">#C0202020</color> + <color name="button_normal">#00000000</color> + <color name="button_pressed">#FF2572AC</color> + <color name="text_normal">#FFFFFF</color> + <color name="text_pressed">#FFFFFF</color> + <color name="text_border_normal">#000000</color> + <color name="text_border_pressed">#2572AC</color> + <color name="text_border_focused">#000000</color> + <color name="seek_thumb">#2572AC</color> + <color name="seek_progress">#FFFFFF</color> </resources> diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml index 2fb655ab..a3f353d7 100644 --- a/android/res/values/strings.xml +++ b/android/res/values/strings.xml @@ -1,55 +1,55 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name">MuPDF</string> - <string name="version">1.2</string> - <string name="no_media_warning">Storage media not present</string> - <string name="no_media_hint">Sharing the storage media with a PC can make it inaccessible</string> - <string name="cancel">Cancel</string> - <string name="search_backwards">Search backwards</string> - <string name="search_forwards">Search forwards</string> - <string name="search_document">Search document</string> - <string name="picker_title_App_Ver_Dir">%1$s %2$s: %3$s</string> - <string name="outline_title">Table of Contents</string> - <string name="enter_password">Enter password</string> - <string name="text_not_found">Text not found</string> - <string name="searching_">Searching…</string> - <string name="toggle_links">Highlight and enable links</string> - <string name="no_further_occurrences_found">No further occurrences found</string> - <string name="select">Select</string> - <string name="search">Search</string> - <string name="copy">Copy</string> - <string name="strike_out">Strike-out</string> - <string name="delete">Delete</string> - <string name="highlight">Highlight</string> - <string name="underline">Underline</string> - <string name="edit_annotations">Edit annotations</string> - <string name="ink">Ink</string> - <string name="save">Save</string> - <string name="print">Print</string> - <string name="dismiss">Dismiss</string> - <string name="parent_directory">[Up one level]</string> - <string name="yes">Yes</string> - <string name="no">No</string> - <string name="entering_reflow_mode">Entering reflow mode</string> - <string name="leaving_reflow_mode">Leaving reflow mode</string> - <string name="print_failed">Print failed</string> - <string name="select_text">Select text</string> - <string name="copied_to_clipboard">Copied to clipboard</string> - <string name="no_text_selected">No text selected</string> - <string name="draw_annotation">Draw annotation</string> - <string name="nothing_to_save">Nothing to save</string> - <string name="document_has_changes_save_them_">Document has changes. Save them?</string> - <string name="cannot_open_document">Cannot open document</string> - <string name="cannot_open_document_Reason">Cannot open document: %1$s</string> - <string name="cannot_open_file_Path">Cannot open file: %1$s</string> - <string name="cannot_open_buffer">Cannot open buffer</string> - <string name="fill_out_text_field">Fill out text field</string> - <string name="okay">Okay</string> - <string name="choose_value">Choose value</string> - <string name="not_supported">Not supported</string> - <string name="copy_text_to_the_clipboard">Copy text to the clipboard</string> - <string name="more">More</string> - <string name="accept">Accept</string> - <string name="copy_text">copy text</string> - <string name="format_currently_not_supported">Format currently not supported</string> + <string name="app_name">MuPDF</string> + <string name="version">1.2</string> + <string name="no_media_warning">Storage media not present</string> + <string name="no_media_hint">Sharing the storage media with a PC can make it inaccessible</string> + <string name="cancel">Cancel</string> + <string name="search_backwards">Search backwards</string> + <string name="search_forwards">Search forwards</string> + <string name="search_document">Search document</string> + <string name="picker_title_App_Ver_Dir">%1$s %2$s: %3$s</string> + <string name="outline_title">Table of Contents</string> + <string name="enter_password">Enter password</string> + <string name="text_not_found">Text not found</string> + <string name="searching_">Searching…</string> + <string name="toggle_links">Highlight and enable links</string> + <string name="no_further_occurrences_found">No further occurrences found</string> + <string name="select">Select</string> + <string name="search">Search</string> + <string name="copy">Copy</string> + <string name="strike_out">Strike-out</string> + <string name="delete">Delete</string> + <string name="highlight">Highlight</string> + <string name="underline">Underline</string> + <string name="edit_annotations">Edit annotations</string> + <string name="ink">Ink</string> + <string name="save">Save</string> + <string name="print">Print</string> + <string name="dismiss">Dismiss</string> + <string name="parent_directory">[Up one level]</string> + <string name="yes">Yes</string> + <string name="no">No</string> + <string name="entering_reflow_mode">Entering reflow mode</string> + <string name="leaving_reflow_mode">Leaving reflow mode</string> + <string name="print_failed">Print failed</string> + <string name="select_text">Select text</string> + <string name="copied_to_clipboard">Copied to clipboard</string> + <string name="no_text_selected">No text selected</string> + <string name="draw_annotation">Draw annotation</string> + <string name="nothing_to_save">Nothing to save</string> + <string name="document_has_changes_save_them_">Document has changes. Save them?</string> + <string name="cannot_open_document">Cannot open document</string> + <string name="cannot_open_document_Reason">Cannot open document: %1$s</string> + <string name="cannot_open_file_Path">Cannot open file: %1$s</string> + <string name="cannot_open_buffer">Cannot open buffer</string> + <string name="fill_out_text_field">Fill out text field</string> + <string name="okay">Okay</string> + <string name="choose_value">Choose value</string> + <string name="not_supported">Not supported</string> + <string name="copy_text_to_the_clipboard">Copy text to the clipboard</string> + <string name="more">More</string> + <string name="accept">Accept</string> + <string name="copy_text">copy text</string> + <string name="format_currently_not_supported">Format currently not supported</string> </resources> |