summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorAtef hares <atefhares1@gmail.com>2017-03-12 06:13:24 +0200
committerTomaž Vajngerl <quikee@gmail.com>2017-03-16 19:57:40 +0000
commit135a9e6ac94f7bf83d1a57a4fb4eab1f66c6d71d (patch)
tree522f71e2ed13902b606094aeef2eef50fbac0f94 /android
parent5bb0cc118396c27a880ecab76c3ab383d6c8c0ff (diff)
tdf#106369, New feature, Inserting numbering/bullets format lists
Editing toolbar_bottom to include two more options: 1- Inserting numbering format lists 2- Inserting bullets format lists Change-Id: I35f9238c45ab253ea75c693f7a76601408e36f9a Reviewed-on: https://gerrit.libreoffice.org/35106 Reviewed-by: Tomaž Vajngerl <quikee@gmail.com> Tested-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'android')
-rw-r--r--android/source/res/drawable-xxxhdpi/ic_format_list_bulleted_black_24dp.pngbin0 -> 356 bytes
-rw-r--r--android/source/res/drawable-xxxhdpi/ic_format_list_numbered_black_24dp.pngbin0 -> 324 bytes
-rw-r--r--android/source/res/drawable/ic_format_bullets.xml4
-rw-r--r--android/source/res/drawable/ic_format_numbering.xml4
-rw-r--r--android/source/res/layout/toolbar_bottom.xml21
-rw-r--r--android/source/src/java/org/libreoffice/FormattingController.java13
6 files changed, 42 insertions, 0 deletions
diff --git a/android/source/res/drawable-xxxhdpi/ic_format_list_bulleted_black_24dp.png b/android/source/res/drawable-xxxhdpi/ic_format_list_bulleted_black_24dp.png
new file mode 100644
index 000000000000..dde94b8f7c4a
--- /dev/null
+++ b/android/source/res/drawable-xxxhdpi/ic_format_list_bulleted_black_24dp.png
Binary files differ
diff --git a/android/source/res/drawable-xxxhdpi/ic_format_list_numbered_black_24dp.png b/android/source/res/drawable-xxxhdpi/ic_format_list_numbered_black_24dp.png
new file mode 100644
index 000000000000..c1cf9519d20d
--- /dev/null
+++ b/android/source/res/drawable-xxxhdpi/ic_format_list_numbered_black_24dp.png
Binary files differ
diff --git a/android/source/res/drawable/ic_format_bullets.xml b/android/source/res/drawable/ic_format_bullets.xml
new file mode 100644
index 000000000000..d818dde10d18
--- /dev/null
+++ b/android/source/res/drawable/ic_format_bullets.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+ android:src="@drawable/ic_format_list_bulleted_black_24dp"
+ android:tint="@color/toolbar_forgeround"/> \ No newline at end of file
diff --git a/android/source/res/drawable/ic_format_numbering.xml b/android/source/res/drawable/ic_format_numbering.xml
new file mode 100644
index 000000000000..a5aec9735b91
--- /dev/null
+++ b/android/source/res/drawable/ic_format_numbering.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+ android:src="@drawable/ic_format_list_numbered_black_24dp"
+ android:tint="@color/toolbar_forgeround"/> \ No newline at end of file
diff --git a/android/source/res/layout/toolbar_bottom.xml b/android/source/res/layout/toolbar_bottom.xml
index c3663c88aa9e..dc17a721ac2e 100644
--- a/android/source/res/layout/toolbar_bottom.xml
+++ b/android/source/res/layout/toolbar_bottom.xml
@@ -65,6 +65,27 @@
android:paddingBottom="12dp"
android:paddingTop="12dp"
android:src="@drawable/ic_format_strikethrough"/>
+
+ <ImageButton
+ android:id="@+id/button_insertFormatListNumbering"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="0.25"
+ android:background="@drawable/image_button_background"
+ android:paddingBottom="12dp"
+ android:paddingTop="12dp"
+ android:src="@drawable/ic_format_numbering"/>
+
+ <ImageButton
+ android:id="@+id/button_insertFormatListBullets"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="0.25"
+ android:background="@drawable/image_button_background"
+ android:paddingBottom="12dp"
+ android:paddingTop="12dp"
+ android:src="@drawable/ic_format_bullets"/>
+
</LinearLayout>
<LinearLayout
diff --git a/android/source/src/java/org/libreoffice/FormattingController.java b/android/source/src/java/org/libreoffice/FormattingController.java
index 5d76c0844caf..fd2e007416cf 100644
--- a/android/source/src/java/org/libreoffice/FormattingController.java
+++ b/android/source/src/java/org/libreoffice/FormattingController.java
@@ -14,6 +14,10 @@ import org.libreoffice.kit.Document;
FormattingController(LibreOfficeMainActivity context) {
mContext = context;
+ mContext.findViewById(R.id.button_insertFormatListBullets).setOnClickListener(this);
+
+ mContext.findViewById(R.id.button_insertFormatListNumbering).setOnClickListener(this);
+
mContext.findViewById(R.id.button_bold).setOnClickListener(this);
mContext.findViewById(R.id.button_italic).setOnClickListener(this);
mContext.findViewById(R.id.button_strikethrough).setOnClickListener(this);
@@ -36,6 +40,15 @@ import org.libreoffice.kit.Document;
}
switch(button.getId()) {
+
+ case R.id.button_insertFormatListBullets:
+ LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:DefaultBullet"));
+ break;
+
+ case R.id.button_insertFormatListNumbering:
+ LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:DefaultNumbering"));
+ break;
+
case R.id.button_bold:
LOKitShell.sendEvent(new LOEvent(LOEvent.UNO_COMMAND, ".uno:Bold"));
break;