forked from amazingfate/loongoffice
9123ba9632
It was coded pretty badly, so I cleaned it up. Most notably, it used a static instance of the Activity, which is a huge no-no which creates memory leaks. The irony is, it already had a reference to the Activity used correctly in the constructor. One memory-leak fixed, 29 more to go (LibreOfficeMainActivity holds that static Activity object which needs fixing). Also, simplified the "bottom toolbar" in preparation for the CoordinatorLayout implementation which will allow the activity to have fancy animations and smart interactions. Change-Id: I31aa117f6179910db73a5256b0a287357e1dec83 Reviewed-on: https://gerrit.libreoffice.org/33010 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org>
171 lines
7.0 KiB
XML
171 lines
7.0 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
|
|
<LinearLayout
|
|
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:id="@+id/toolbar_bottom"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="vertical"
|
|
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:id="@+id/formatting_toolbar"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:orientation="vertical">
|
|
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="horizontal">
|
|
|
|
<ImageButton
|
|
android:id="@+id/button_bold"
|
|
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_bold"/>
|
|
|
|
<ImageButton
|
|
android:id="@+id/button_italic"
|
|
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_italic"/>
|
|
|
|
<ImageButton
|
|
android:id="@+id/button_underlined"
|
|
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_underlined"/>
|
|
|
|
<ImageButton
|
|
android:id="@+id/button_strikethrough"
|
|
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_strikethrough"/>
|
|
</LinearLayout>
|
|
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="horizontal">
|
|
|
|
<ImageButton
|
|
android:id="@+id/button_align_left"
|
|
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_align_left"/>
|
|
|
|
<ImageButton
|
|
android:id="@+id/button_align_center"
|
|
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_align_center"/>
|
|
|
|
<ImageButton
|
|
android:id="@+id/button_align_right"
|
|
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_align_right"/>
|
|
|
|
<ImageButton
|
|
android:id="@+id/button_align_justify"
|
|
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_align_justify"/>
|
|
</LinearLayout>
|
|
|
|
<Spinner
|
|
android:id="@+id/font_name_spinner"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_weight="1"
|
|
android:minHeight="50dip"/>
|
|
|
|
<Spinner
|
|
android:id="@+id/font_size_spinner"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:layout_weight="1"
|
|
android:minHeight="50dip"/>
|
|
|
|
|
|
</LinearLayout>
|
|
|
|
<LinearLayout
|
|
android:id="@+id/search_toolbar"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:orientation="vertical">
|
|
|
|
<LinearLayout
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:orientation="horizontal">
|
|
|
|
<EditText
|
|
android:id="@+id/search_string"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:layout_weight="0.2"/>
|
|
|
|
<ImageButton
|
|
android:id="@+id/button_search_up"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:layout_weight="0.6"
|
|
android:background="@drawable/image_button_background"
|
|
android:padding="10dp"
|
|
android:src="@drawable/ic_search_direction_down"/>
|
|
|
|
<ImageButton
|
|
android:id="@+id/button_search_down"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:layout_weight="0.6"
|
|
android:background="@drawable/image_button_background"
|
|
android:padding="10dp"
|
|
android:src="@drawable/ic_search_direction_up"/>
|
|
</LinearLayout>
|
|
</LinearLayout>
|
|
|
|
</LinearLayout>
|