From 135a9e6ac94f7bf83d1a57a4fb4eab1f66c6d71d Mon Sep 17 00:00:00 2001
From: Atef hares <atefhares1@gmail.com>
Date: Sun, 12 Mar 2017 06:13:24 +0200
Subject: [PATCH] tdf#106369, New feature, Inserting  numbering/bullets format
 lists
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 .../ic_format_list_bulleted_black_24dp.png    | Bin 0 -> 356 bytes
 .../ic_format_list_numbered_black_24dp.png    | Bin 0 -> 324 bytes
 .../source/res/drawable/ic_format_bullets.xml |   4 ++++
 .../res/drawable/ic_format_numbering.xml      |   4 ++++
 android/source/res/layout/toolbar_bottom.xml  |  21 ++++++++++++++++++
 .../org/libreoffice/FormattingController.java |  13 +++++++++++
 6 files changed, 42 insertions(+)
 create mode 100644 android/source/res/drawable-xxxhdpi/ic_format_list_bulleted_black_24dp.png
 create mode 100644 android/source/res/drawable-xxxhdpi/ic_format_list_numbered_black_24dp.png
 create mode 100644 android/source/res/drawable/ic_format_bullets.xml
 create mode 100644 android/source/res/drawable/ic_format_numbering.xml

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 0000000000000000000000000000000000000000..dde94b8f7c4adb7e6c52cfdb814468022d5ac05b
GIT binary patch
literal 356
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>VAS?>aSW-r_4Za^UXy_g`-7^k
z)Xz0JF@<i=^#aZ_`>*3Sz07`kR-osH-;@4#E8h6R&U&j2s2c?C+*<M~_-IJ-x*7Gi
zU(DOKZRNh;x$mzSUY(tnRsM9k)qks&OLGh2Dornkn=BGP@F&Stc@e`i^DvVnkp>1H
zN2U(~aiI)x&f<IuPx{v+KRmy`rekIo$lQjj29nzqem9Bj`{X@0-|^U_C9aj-pLlOh
zQ(|zQpm@Uh#y*Ah3%{}cR4^801gYmQnAv09djI5(U<1kT0_#`uJ^WYlMN!^)vG)Ee
zKd0Yf=Qi@K2{CyT%kX)#Mt=0EVs?WNlO%x##f(zM64BllEEk@cmV9q#tMQxT&hY<(
wk>DXcdFRL03r|1(GeO&r#~Ne>1H*yfUyO{!of%Ws7wLoep00i_>zopr0I?a5`v3p{

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..c1cf9519d20d7394e7f2f399b65afa087fca1541
GIT binary patch
literal 324
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7Ro>VC436aSW-r_4f8g&O;6&4G%Y8
zVmu<qGCkmeWsc0zL%umNhYu;Tm`}KJ>xH(?6ON7qzR5N6dwwa{&$4OOWCR++z_8@Y
z4+9Pb2Bt6OC)PJ_t7Q>zU|@t3ECLK5Rk!w3RC?++FfjeeY*>9d^qkhSe`O!@4L`Hl
z1;(AYGUI5-&4aJo_FZB*;gh6ybKz~a_nJ(5B#+M7#QdH2{uR~=$s;nG4)+;4GoE6(
zk;*<d`53EQHY>;MS;x<2F5J85JL5Fd{@LA4-LdbPL(CHGT{#pQKn@c#?4H5E1mrlx
zvwd)KYsmW>90zflc_Jgri!_Gr8NLxf0gze-hK%LvQmf{AN?EPQ193fF{an^LB{Ts5
D-+*yZ

literal 0
HcmV?d00001

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;