diff options
Diffstat (limited to 'android/source/res')
33 files changed, 223 insertions, 26 deletions
diff --git a/android/source/res/drawable-hdpi/ic_format_bold.xml b/android/source/res/drawable-hdpi/ic_format_bold.xml new file mode 100644 index 000000000000..83de6472d6ae --- /dev/null +++ b/android/source/res/drawable-hdpi/ic_format_bold.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_format_bold_black_24dp" + android:tint="@color/toolbar_forgeround"/>
\ No newline at end of file diff --git a/android/source/res/drawable-hdpi/ic_format_italic.xml b/android/source/res/drawable-hdpi/ic_format_italic.xml new file mode 100644 index 000000000000..515568aaa8b6 --- /dev/null +++ b/android/source/res/drawable-hdpi/ic_format_italic.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_format_italic_black_24dp" + android:tint="@color/toolbar_forgeround"/>
\ No newline at end of file diff --git a/android/source/res/drawable-hdpi/ic_format_strikethrough.xml b/android/source/res/drawable-hdpi/ic_format_strikethrough.xml new file mode 100644 index 000000000000..4ca24bc9333c --- /dev/null +++ b/android/source/res/drawable-hdpi/ic_format_strikethrough.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_format_strikethrough_black_24dp" + android:tint="@color/toolbar_forgeround"/>
\ No newline at end of file diff --git a/android/source/res/drawable-hdpi/ic_format_underlined.xml b/android/source/res/drawable-hdpi/ic_format_underlined.xml new file mode 100644 index 000000000000..89beb910b3aa --- /dev/null +++ b/android/source/res/drawable-hdpi/ic_format_underlined.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_format_underlined_black_24dp" + android:tint="@color/toolbar_forgeround"/>
\ No newline at end of file diff --git a/android/source/res/drawable-hdpi/ic_keyboard.xml b/android/source/res/drawable-hdpi/ic_keyboard.xml new file mode 100644 index 000000000000..d95890b3f0bc --- /dev/null +++ b/android/source/res/drawable-hdpi/ic_keyboard.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_keyboard_black_24dp" + android:tint="@color/toolbar_forgeround"/>
\ No newline at end of file diff --git a/android/source/res/drawable-hdpi/ic_menu.xml b/android/source/res/drawable-hdpi/ic_menu.xml new file mode 100644 index 000000000000..62440f0eea3d --- /dev/null +++ b/android/source/res/drawable-hdpi/ic_menu.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_menu_black_24dp" + android:tint="@color/toolbar_forgeround"/>
\ No newline at end of file diff --git a/android/source/res/drawable-hdpi/ic_text_format.xml b/android/source/res/drawable-hdpi/ic_text_format.xml new file mode 100644 index 000000000000..20a786995255 --- /dev/null +++ b/android/source/res/drawable-hdpi/ic_text_format.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_text_format_black_24dp" + android:tint="@color/toolbar_forgeround"/>
\ No newline at end of file diff --git a/android/source/res/drawable-xxxhdpi/ic_check_black_24dp.png b/android/source/res/drawable-xxxhdpi/ic_check_black_24dp.png Binary files differnew file mode 100644 index 000000000000..2f6d6386de95 --- /dev/null +++ b/android/source/res/drawable-xxxhdpi/ic_check_black_24dp.png diff --git a/android/source/res/drawable-xxxhdpi/ic_check_grey600_24dp.png b/android/source/res/drawable-xxxhdpi/ic_check_grey600_24dp.png Binary files differdeleted file mode 100644 index 121ac9aacc46..000000000000 --- a/android/source/res/drawable-xxxhdpi/ic_check_grey600_24dp.png +++ /dev/null diff --git a/android/source/res/drawable-xxxhdpi/ic_format_align_center_black_24dp.png b/android/source/res/drawable-xxxhdpi/ic_format_align_center_black_24dp.png Binary files differnew file mode 100644 index 000000000000..b20b21b03128 --- /dev/null +++ b/android/source/res/drawable-xxxhdpi/ic_format_align_center_black_24dp.png diff --git a/android/source/res/drawable-xxxhdpi/ic_format_align_justify_black_24dp.png b/android/source/res/drawable-xxxhdpi/ic_format_align_justify_black_24dp.png Binary files differnew file mode 100644 index 000000000000..15eece7a4bff --- /dev/null +++ b/android/source/res/drawable-xxxhdpi/ic_format_align_justify_black_24dp.png diff --git a/android/source/res/drawable-xxxhdpi/ic_format_align_left_black_24dp.png b/android/source/res/drawable-xxxhdpi/ic_format_align_left_black_24dp.png Binary files differnew file mode 100644 index 000000000000..c1d927a28a96 --- /dev/null +++ b/android/source/res/drawable-xxxhdpi/ic_format_align_left_black_24dp.png diff --git a/android/source/res/drawable-xxxhdpi/ic_format_align_right_black_24dp.png b/android/source/res/drawable-xxxhdpi/ic_format_align_right_black_24dp.png Binary files differnew file mode 100644 index 000000000000..e5b306391f0e --- /dev/null +++ b/android/source/res/drawable-xxxhdpi/ic_format_align_right_black_24dp.png diff --git a/android/source/res/drawable-xxxhdpi/ic_format_bold_black_24dp.png b/android/source/res/drawable-xxxhdpi/ic_format_bold_black_24dp.png Binary files differnew file mode 100644 index 000000000000..4d8b8f47b927 --- /dev/null +++ b/android/source/res/drawable-xxxhdpi/ic_format_bold_black_24dp.png diff --git a/android/source/res/drawable-xxxhdpi/ic_format_italic_black_24dp.png b/android/source/res/drawable-xxxhdpi/ic_format_italic_black_24dp.png Binary files differnew file mode 100644 index 000000000000..cf85387d5f83 --- /dev/null +++ b/android/source/res/drawable-xxxhdpi/ic_format_italic_black_24dp.png diff --git a/android/source/res/drawable-xxxhdpi/ic_format_keyboard_grey600_24dp.png b/android/source/res/drawable-xxxhdpi/ic_format_keyboard_grey600_24dp.png Binary files differdeleted file mode 100644 index f9ae47eded01..000000000000 --- a/android/source/res/drawable-xxxhdpi/ic_format_keyboard_grey600_24dp.png +++ /dev/null diff --git a/android/source/res/drawable-xxxhdpi/ic_format_strikethrough_black_24dp.png b/android/source/res/drawable-xxxhdpi/ic_format_strikethrough_black_24dp.png Binary files differnew file mode 100644 index 000000000000..f94704e31a0f --- /dev/null +++ b/android/source/res/drawable-xxxhdpi/ic_format_strikethrough_black_24dp.png diff --git a/android/source/res/drawable-xxxhdpi/ic_format_underlined_black_24dp.png b/android/source/res/drawable-xxxhdpi/ic_format_underlined_black_24dp.png Binary files differnew file mode 100644 index 000000000000..8a2adce407d2 --- /dev/null +++ b/android/source/res/drawable-xxxhdpi/ic_format_underlined_black_24dp.png diff --git a/android/source/res/drawable-xxxhdpi/ic_keyboard_black_24dp.png b/android/source/res/drawable-xxxhdpi/ic_keyboard_black_24dp.png Binary files differnew file mode 100644 index 000000000000..ba4d5be6d74d --- /dev/null +++ b/android/source/res/drawable-xxxhdpi/ic_keyboard_black_24dp.png diff --git a/android/source/res/drawable-xxxhdpi/ic_menu_black_24dp.png b/android/source/res/drawable-xxxhdpi/ic_menu_black_24dp.png Binary files differnew file mode 100644 index 000000000000..5c747ed00e39 --- /dev/null +++ b/android/source/res/drawable-xxxhdpi/ic_menu_black_24dp.png diff --git a/android/source/res/drawable-xxxhdpi/ic_menu_grey600_24dp.png b/android/source/res/drawable-xxxhdpi/ic_menu_grey600_24dp.png Binary files differdeleted file mode 100644 index 873fa7ab8432..000000000000 --- a/android/source/res/drawable-xxxhdpi/ic_menu_grey600_24dp.png +++ /dev/null diff --git a/android/source/res/drawable-xxxhdpi/ic_text_format_black_24dp.png b/android/source/res/drawable-xxxhdpi/ic_text_format_black_24dp.png Binary files differnew file mode 100644 index 000000000000..f38063688d0e --- /dev/null +++ b/android/source/res/drawable-xxxhdpi/ic_text_format_black_24dp.png diff --git a/android/source/res/drawable-xxxhdpi/image_button_background.xml b/android/source/res/drawable-xxxhdpi/image_button_background.xml new file mode 100644 index 000000000000..db8b67b17df8 --- /dev/null +++ b/android/source/res/drawable-xxxhdpi/image_button_background.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:drawable="@color/button_selected_background" android:state_pressed="true"/> + <item android:drawable="@color/button_selected_background" android:state_selected="true" /> + <item android:drawable="@android:color/transparent" android:state_selected="false" /> +</selector>
\ No newline at end of file diff --git a/android/source/res/drawable/ic_check.xml b/android/source/res/drawable/ic_check.xml new file mode 100644 index 000000000000..be95fc8fdfba --- /dev/null +++ b/android/source/res/drawable/ic_check.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_check_black_24dp" + android:tint="@color/toolbar_forgeround"/>
\ No newline at end of file diff --git a/android/source/res/drawable/ic_format_align_center.xml b/android/source/res/drawable/ic_format_align_center.xml new file mode 100644 index 000000000000..5c2b4a08766f --- /dev/null +++ b/android/source/res/drawable/ic_format_align_center.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_format_align_center_black_24dp" + android:tint="@color/toolbar_forgeround"/>
\ No newline at end of file diff --git a/android/source/res/drawable/ic_format_align_justify.xml b/android/source/res/drawable/ic_format_align_justify.xml new file mode 100644 index 000000000000..e1e69e205552 --- /dev/null +++ b/android/source/res/drawable/ic_format_align_justify.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_format_align_justify_black_24dp" + android:tint="@color/toolbar_forgeround"/>
\ No newline at end of file diff --git a/android/source/res/drawable/ic_format_align_left.xml b/android/source/res/drawable/ic_format_align_left.xml new file mode 100644 index 000000000000..497a94f81aa7 --- /dev/null +++ b/android/source/res/drawable/ic_format_align_left.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_format_align_left_black_24dp" + android:tint="@color/toolbar_forgeround"/>
\ No newline at end of file diff --git a/android/source/res/drawable/ic_format_align_right.xml b/android/source/res/drawable/ic_format_align_right.xml new file mode 100644 index 000000000000..a8d6dfb4c2cd --- /dev/null +++ b/android/source/res/drawable/ic_format_align_right.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/ic_format_align_right_black_24dp" + android:tint="@color/toolbar_forgeround"/>
\ No newline at end of file diff --git a/android/source/res/layout/activity_main.xml b/android/source/res/layout/activity_main.xml index 63695e584279..881466d39f19 100644 --- a/android/source/res/layout/activity_main.xml +++ b/android/source/res/layout/activity_main.xml @@ -12,9 +12,14 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + <include layout="@layout/toolbar"/> + + <include layout="@layout/toolbar_bottom"/> + <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" + android:layout_above="@+id/toolbar_bottom" android:orientation="vertical"> <include layout="@layout/toolbar"/> @@ -30,7 +35,10 @@ android:layout_width="match_parent" android:layout_height="match_parent"/> - <include layout="@layout/text_selection_handles"/> + <org.libreoffice.overlay.DocumentOverlayView + android:id="@+id/text_cursor_view" + android:layout_width="fill_parent" + android:layout_height="fill_parent"/> </RelativeLayout> </LinearLayout> @@ -43,9 +51,11 @@ android:gravity="center"> <ProgressBar + android:id="@+id/progressBar" android:layout_width="wrap_content" android:layout_height="wrap_content" android:indeterminate="true"/> + </RelativeLayout> <View diff --git a/android/source/res/layout/toolbar_bottom.xml b/android/source/res/layout/toolbar_bottom.xml new file mode 100644 index 000000000000..7b4d01be2a03 --- /dev/null +++ b/android/source/res/layout/toolbar_bottom.xml @@ -0,0 +1,136 @@ +<?xml version="1.0" encoding="utf-8"?> + +<android.support.v7.widget.Toolbar + android:id="@+id/toolbar_bottom" + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:elevation="3dp" + android:background="@color/toolbar_background" + app:popupTheme="@style/LibreOfficeTheme.Toolbar" + app:theme="@style/LibreOfficeTheme.Toolbar" + tools:showIn="@layout/activity_main"> + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical"> + + <LinearLayout + android:id="@+id/formatting_toolbar" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical"> + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <ImageButton + android:id="@+id/button_bold" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="0.25" + android:background="@drawable/image_button_background" + android:paddingBottom="5dp" + android:paddingTop="5dp" + android:src="@drawable/ic_format_bold"/> + + <ImageButton + android:id="@+id/button_italic" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="0.25" + android:background="@drawable/image_button_background" + android:paddingBottom="5dp" + android:paddingTop="5dp" + android:src="@drawable/ic_format_italic"/> + + <ImageButton + android:id="@+id/button_underlined" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="0.25" + android:background="@drawable/image_button_background" + android:paddingBottom="5dp" + android:paddingTop="5dp" + android:src="@drawable/ic_format_underlined"/> + + <ImageButton + android:id="@+id/button_strikethrough" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="0.25" + android:background="@drawable/image_button_background" + android:paddingBottom="5dp" + android:paddingTop="5dp" + android:src="@drawable/ic_format_strikethrough"/> + </LinearLayout> + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <ImageButton + android:id="@+id/button_align_left" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="0.25" + android:background="@drawable/image_button_background" + android:paddingBottom="5dp" + android:paddingTop="5dp" + android:src="@drawable/ic_format_align_left"/> + + <ImageButton + android:id="@+id/button_align_center" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="0.25" + android:background="@drawable/image_button_background" + android:paddingBottom="5dp" + android:paddingTop="5dp" + android:src="@drawable/ic_format_align_center"/> + + <ImageButton + android:id="@+id/button_align_right" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="0.25" + android:background="@drawable/image_button_background" + android:paddingBottom="5dp" + android:paddingTop="5dp" + android:src="@drawable/ic_format_align_right"/> + + <ImageButton + android:id="@+id/button_align_justify" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="0.25" + android:background="@drawable/image_button_background" + android:paddingBottom="5dp" + android:paddingTop="5dp" + android:src="@drawable/ic_format_align_justify"/> + </LinearLayout> + + <Spinner + android:id="@+id/font_name_spinner" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:minHeight="50dip"/> + + <Spinner + android:id="@+id/font_size_spinner" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:minHeight="50dip"/> + </LinearLayout> + </LinearLayout> + +</android.support.v7.widget.Toolbar> diff --git a/android/source/res/menu/main.xml b/android/source/res/menu/main.xml index ccf0dce2b964..b80cae9db8e8 100644 --- a/android/source/res/menu/main.xml +++ b/android/source/res/menu/main.xml @@ -6,36 +6,19 @@ <group android:id="@+id/group_edit_actions" tools:visible="true" android:visible="false"> - <item android:id="@+id/action_bold" - android:title="@string/action_bold" - android:icon="@drawable/action_bold" - android:orderInCategory="100" - app:showAsAction="always"/> - - <item android:id="@+id/action_italic" - android:title="@string/action_italic" - android:icon="@drawable/action_italic" - android:orderInCategory="100" - app:showAsAction="always"/> - - <item android:id="@+id/action_underline" - android:title="@string/action_underline" - android:icon="@drawable/action_underline" - android:orderInCategory="100" - app:showAsAction="always"/> - - <item android:id="@+id/action_strikeout" - android:title="@string/action_strikeout" - android:icon="@drawable/action_strikeout" - android:orderInCategory="100" - app:showAsAction="always"/> <item android:id="@+id/action_keyboard" android:title="@string/action_keyboard" - android:icon="@drawable/ic_format_keyboard_grey600_24dp" + android:icon="@drawable/ic_keyboard" android:orderInCategory="100" app:showAsAction="always"/> + <item android:id="@+id/action_format" + android:title="@string/action_fromat" + android:icon="@drawable/ic_text_format" + android:orderInCategory="100" + app:showAsAction="always"/> + <item android:id="@+id/action_save" android:title="@string/action_save" android:orderInCategory="100" /> diff --git a/android/source/res/values/colors.xml b/android/source/res/values/colors.xml index 89d106265fed..8cd9e955e6b4 100644 --- a/android/source/res/values/colors.xml +++ b/android/source/res/values/colors.xml @@ -95,7 +95,8 @@ <color name="toolbar_forgeround">#3e3e3e</color> <color name="toolbar_background">#ffffff</color> - <color name="handle_color">#40A040</color> + <color name="handle_color">#26a69a</color> + <color name="button_selected_background">#33000000</color> </resources> diff --git a/android/source/res/values/strings.xml b/android/source/res/values/strings.xml index 78318b9f32ca..ed8529fca699 100644 --- a/android/source/res/values/strings.xml +++ b/android/source/res/values/strings.xml @@ -64,6 +64,7 @@ <string name="action_strikeout">Strike Out</string> <string name="action_keyboard">Show keyboard</string> <string name="action_save">Save</string> + <string name="action_fromat">Enable Format</string> <!-- Feedback messages --> <string name="message_saved">Save complete</string> |
