Kaydet (Commit) 64619789 authored tarafından Christian Lohmaier's avatar Christian Lohmaier

android: fix some layout issues with new-document buttons

functionality to create new documents was added for tdf#106325 with
commit 1503769f
However the commit had some issues, most notably clipping of the shadow
effect and alignment issues to to scaling down (via the animation
effect, took me quite a while until I looked at that) with having a
centered pivot. I think it was due to those alignment issues that the
label was set to a fixed with - which is a problem for future
translation.
This commit:
* changes the animation to not scale down the initial views
* changes the FABs' setting to use compatPadding - this not only ensures
  enough room for the shadow, but also allows for consistent look across
  android versions. Side effect is that it needs more height, so
* the effect was adjusted accordingly, to shrink to/expand from the
  lower-right corner of the parent view, instead of "mid-air"
* the labels were given a proper background drawable with rounded
  corners and some padding for a (much more9 polished look
* formatting of the labels was split out to a style, for ease of
  tweaking the looks
* add tools:visibility statement to see the elements in layout editor
* fixed the strings for the labels (and ID) to some less awkward ones

Change-Id: Ifd2d90ec8d23e40603edff19c9af9e0b32090c9f
Reviewed-on: https://gerrit.libreoffice.org/42033Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>
üst cd581e18
...@@ -3,16 +3,17 @@ ...@@ -3,16 +3,17 @@
android:fillAfter="true"> android:fillAfter="true">
<scale <scale
android:duration="300" android:duration="300"
android:fromXScale="0.8" android:fromXScale="1.0"
android:fromYScale="0.8" android:fromYScale="1.0"
android:interpolator="@android:anim/linear_interpolator" android:interpolator="@android:anim/linear_interpolator"
android:pivotX="100%p"
android:pivotY="100%p"
android:toXScale="0.0" android:toXScale="0.0"
android:pivotX="50%"
android:pivotY="50%"
android:toYScale="0.0" /> android:toYScale="0.0" />
<alpha android:fromAlpha="1.0" <alpha
android:toAlpha="0.0" android:duration="300"
android:fromAlpha="1.0"
android:interpolator="@android:anim/accelerate_interpolator" android:interpolator="@android:anim/accelerate_interpolator"
android:duration="300"/> android:toAlpha="0.0" />
</set> </set>
...@@ -6,14 +6,14 @@ ...@@ -6,14 +6,14 @@
android:fromXScale="0.0" android:fromXScale="0.0"
android:fromYScale="0.0" android:fromYScale="0.0"
android:interpolator="@android:anim/linear_interpolator" android:interpolator="@android:anim/linear_interpolator"
android:toXScale="0.8" android:pivotX="100%p"
android:pivotX="50%" android:pivotY="100%p"
android:pivotY="50%" android:toXScale="1.0"
android:toYScale="0.8"/> android:toYScale="1.0" />
<alpha <alpha
android:duration="300"
android:fromAlpha="0.0" android:fromAlpha="0.0"
android:toAlpha="1.0"
android:interpolator="@android:anim/accelerate_interpolator" android:interpolator="@android:anim/accelerate_interpolator"
android:duration="300"/> android:toAlpha="1.0" />
</set> </set>
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle">
<solid android:color="@color/background_normal" />
<corners android:radius="5dp" />
</shape>
</item>
</selector>
\ No newline at end of file
...@@ -124,15 +124,13 @@ ...@@ -124,15 +124,13 @@
android:id="@+id/editFAB" android:id="@+id/editFAB"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:layout_marginEnd="16dp"
android:layout_marginRight="16dp"
android:clickable="true" android:clickable="true"
app:backgroundTint="@color/background_normal"
app:fabSize="normal" app:fabSize="normal"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
app:backgroundTint="@color/background_normal" app:srcCompat="@drawable/ic_add_black_24dp"
app:srcCompat="@drawable/ic_add_black_24dp" /> app:useCompatPadding="true" />
<LinearLayout <LinearLayout
android:id="@+id/writerLayout" android:id="@+id/writerLayout"
...@@ -141,31 +139,28 @@ ...@@ -141,31 +139,28 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:visibility="invisible" android:visibility="invisible"
app:layout_constraintBottom_toTopOf="@+id/editFAB" app:layout_constraintBottom_toTopOf="@id/editFAB"
app:layout_constraintRight_toRightOf="parent"> app:layout_constraintRight_toRightOf="@id/editFAB"
tools:visibility="visible">
<TextView <TextView
android:id="@+id/newWriterTextView" android:id="@+id/newWriterTextView"
android:layout_width="120dp" style="@style/NewDocumentTextView"
android:layout_height="wrap_content" android:layout_marginBottom="@dimen/new_doc_fab_tweak_bottom"
android:layout_marginEnd="8dp" android:layout_marginTop="@dimen/new_doc_fab_tweak_top"
android:layout_marginRight="8dp" android:text="@string/new_textdocument" />
android:elevation="2dp"
android:gravity="center_horizontal"
android:text="@string/new_write"
android:textSize="18sp"
android:textStyle="bold"
android:background="@color/background_normal"
android:typeface="normal" />
<android.support.design.widget.FloatingActionButton <android.support.design.widget.FloatingActionButton
android:id="@+id/newWriterFAB" android:id="@+id/newWriterFAB"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/new_doc_fab_tweak_bottom"
android:layout_marginTop="@dimen/new_doc_fab_tweak_top"
android:clickable="true" android:clickable="true"
app:fabSize="normal"
app:backgroundTint="@color/background_normal" app:backgroundTint="@color/background_normal"
app:srcCompat="@drawable/writer" /> app:fabSize="mini"
app:srcCompat="@drawable/writer"
app:useCompatPadding="true" />
</LinearLayout> </LinearLayout>
...@@ -177,31 +172,27 @@ ...@@ -177,31 +172,27 @@
android:orientation="horizontal" android:orientation="horizontal"
android:visibility="invisible" android:visibility="invisible"
app:layout_constraintBottom_toTopOf="@+id/writerLayout" app:layout_constraintBottom_toTopOf="@+id/writerLayout"
app:layout_constraintLeft_toLeftOf="@+id/writerLayout" app:layout_constraintRight_toRightOf="@id/editFAB"
app:layout_constraintRight_toRightOf="parent"> tools:visibility="visible">
<TextView <TextView
android:id="@+id/newImpressTextView" android:id="@+id/newImpressTextView"
android:layout_width="120dp" style="@style/NewDocumentTextView"
android:layout_height="wrap_content" android:layout_marginBottom="@dimen/new_doc_fab_tweak_bottom"
android:layout_marginEnd="8dp" android:layout_marginTop="@dimen/new_doc_fab_tweak_top"
android:layout_marginRight="8dp" android:text="@string/new_presentation" />
android:elevation="2dp"
android:gravity="center_horizontal"
android:text="@string/new_impress"
android:textSize="18sp"
android:textStyle="bold"
android:background="@color/background_normal"
android:typeface="normal" />
<android.support.design.widget.FloatingActionButton <android.support.design.widget.FloatingActionButton
android:id="@+id/newImpressFAB" android:id="@+id/newImpressFAB"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/new_doc_fab_tweak_bottom"
android:layout_marginTop="@dimen/new_doc_fab_tweak_top"
android:clickable="true" android:clickable="true"
app:fabSize="normal"
app:backgroundTint="@color/background_normal" app:backgroundTint="@color/background_normal"
app:srcCompat="@drawable/impress" /> app:fabSize="mini"
app:srcCompat="@drawable/impress"
app:useCompatPadding="true" />
</LinearLayout> </LinearLayout>
...@@ -212,32 +203,28 @@ ...@@ -212,32 +203,28 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:visibility="invisible" android:visibility="invisible"
tools:visibility="visible"
app:layout_constraintBottom_toTopOf="@+id/impressLayout" app:layout_constraintBottom_toTopOf="@+id/impressLayout"
app:layout_constraintLeft_toLeftOf="@+id/impressLayout" app:layout_constraintRight_toRightOf="@id/editFAB">
app:layout_constraintRight_toRightOf="parent">
<TextView <TextView
android:id="@+id/newCalcTextView" android:id="@+id/newCalcTextView"
android:layout_width="120dp" style="@style/NewDocumentTextView"
android:layout_height="wrap_content" android:layout_marginBottom="@dimen/new_doc_fab_tweak_bottom"
android:layout_marginEnd="8dp" android:layout_marginTop="@dimen/new_doc_fab_tweak_top"
android:layout_marginRight="8dp" android:text="@string/new_spreadsheet" />
android:elevation="2dp"
android:gravity="center_horizontal"
android:text="@string/new_spreadsheet"
android:background="@color/background_normal"
android:textSize="18sp"
android:textStyle="bold"
android:typeface="normal" />
<android.support.design.widget.FloatingActionButton <android.support.design.widget.FloatingActionButton
android:id="@+id/newCalcFAB" android:id="@+id/newCalcFAB"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/new_doc_fab_tweak_bottom"
android:layout_marginTop="@dimen/new_doc_fab_tweak_top"
android:clickable="true" android:clickable="true"
app:fabSize="normal"
app:backgroundTint="@color/background_normal" app:backgroundTint="@color/background_normal"
app:srcCompat="@drawable/calc" /> app:fabSize="mini"
app:srcCompat="@drawable/calc"
app:useCompatPadding="true" />
</LinearLayout> </LinearLayout>
...@@ -248,32 +235,28 @@ ...@@ -248,32 +235,28 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:visibility="invisible" android:visibility="invisible"
tools:visibility="visible"
app:layout_constraintBottom_toTopOf="@+id/calcLayout" app:layout_constraintBottom_toTopOf="@+id/calcLayout"
app:layout_constraintLeft_toLeftOf="@+id/calcLayout" app:layout_constraintRight_toRightOf="@id/editFAB">
app:layout_constraintRight_toRightOf="parent">
<TextView <TextView
android:id="@+id/newDrawTextView" android:id="@+id/newDrawTextView"
android:layout_width="120dp" style="@style/NewDocumentTextView"
android:layout_height="wrap_content" android:layout_marginBottom="@dimen/new_doc_fab_tweak_bottom"
android:layout_marginEnd="8dp" android:layout_marginTop="@dimen/new_doc_fab_tweak_top"
android:layout_marginRight="8dp" android:text="@string/new_drawing" />
android:elevation="2dp"
android:gravity="center_horizontal"
android:text="@string/new_draw"
android:background="@color/background_normal"
android:textSize="18sp"
android:textStyle="bold"
android:typeface="normal" />
<android.support.design.widget.FloatingActionButton <android.support.design.widget.FloatingActionButton
android:id="@+id/newDrawFAB" android:id="@+id/newDrawFAB"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/new_doc_fab_tweak_bottom"
android:layout_marginTop="@dimen/new_doc_fab_tweak_top"
android:clickable="true" android:clickable="true"
app:fabSize="normal"
app:backgroundTint="@color/background_normal" app:backgroundTint="@color/background_normal"
app:srcCompat="@drawable/draw" /> app:fabSize="mini"
app:srcCompat="@drawable/draw"
app:useCompatPadding="true" />
</LinearLayout> </LinearLayout>
......
...@@ -13,4 +13,6 @@ ...@@ -13,4 +13,6 @@
<dimen name="calc_header_height">24dp</dimen> <dimen name="calc_header_height">24dp</dimen>
<dimen name="calc_toolbar_height">40dp</dimen> <dimen name="calc_toolbar_height">40dp</dimen>
<dimen name="calc_address_bar_width">96dp</dimen> <dimen name="calc_address_bar_width">96dp</dimen>
<dimen name="new_doc_fab_tweak_top">-11dp</dimen>
<dimen name="new_doc_fab_tweak_bottom">-7dp</dimen>
</resources> </resources>
...@@ -16,10 +16,10 @@ ...@@ -16,10 +16,10 @@
<string name="about_moreinfo">More Info</string> <string name="about_moreinfo">More Info</string>
<string name="back_again_to_quit">Press back again to quit</string> <string name="back_again_to_quit">Press back again to quit</string>
<string name="new_write">New Write</string> <string name="new_textdocument">New Text Document</string>
<string name="new_impress">New Impress</string> <string name="new_presentation">New Presentation</string>
<string name="new_spreadsheet">New Sheet</string> <string name="new_spreadsheet">New Spreadsheet</string>
<string name="new_draw">New Draw</string> <string name="new_drawing">New Drawing</string>
<string name="default_document_name">untitled</string> <string name="default_document_name">untitled</string>
<string name="browser_app_name">LibreOffice Browser</string> <string name="browser_app_name">LibreOffice Browser</string>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources xmlns:tools="http://schemas.android.com/tools">
<style name="LibreOfficeTheme" parent="LibreOfficeTheme.Base"/> <style name="LibreOfficeTheme" parent="LibreOfficeTheme.Base"/>
<style name="LibreOfficeTheme.Base" parent="Theme.AppCompat.Light.NoActionBar"> <style name="LibreOfficeTheme.Base" parent="Theme.AppCompat.Light.NoActionBar">
...@@ -19,4 +19,14 @@ ...@@ -19,4 +19,14 @@
<item name="colorPrimary">@android:color/black</item> <item name="colorPrimary">@android:color/black</item>
</style> </style>
<style name="NewDocumentTextView">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:elevation" tools:ignore="NewApi">2dp</item>
<item name="android:textSize">16sp</item>
<item name="android:textStyle">bold</item>
<item name="android:typeface">normal</item>
<item name="android:padding">5dp</item>
<item name="android:background">@drawable/label_background</item>
</style>
</resources> </resources>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment