mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed the margins of list items of File Recycler View

Browse Source 
Screenshots of the change:-
Before:
1. https://s19.postimg.org/bbs91keyr/Screenshot_20170212_182941.png
2. https://s19.postimg.org/k5j5io1xf/Screenshot_20170212_183334.png
Now:
1. https://s19.postimg.org/4o08spkub/Screenshot_20170212_222359.png
2. https://s19.postimg.org/5p0hhu1tv/Screenshot_20170212_222406.png

Change-Id: I3137ce2648c4dda30d7bbe93245618a83e9048c0
Reviewed-on: https://gerrit.libreoffice.org/34175
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Aleksandar Stefanović <theonewithideas@gmail.com>
Tested-by: Aleksandar Stefanović <theonewithideas@gmail.com>
This commit is contained in:
brainbreaker
2017-02-12 22:29:21 +05:30
committed by Aleksandar Stefanović
parent b862cbdd34
commit 36a43c356e
4 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
android/source/res/layout/file_list_item.xml
View File

@@ -9,14 +9,19 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp" android:layout_height="48dp"
android:orientation="horizontal" > android:orientation="horizontal"
android:layout_marginStart="@dimen/list_item_margin"
android:layout_marginLeft="@dimen/list_item_margin"
android:layout_marginEnd="@dimen/list_item_margin"
android:layout_marginRight="@dimen/list_item_margin">
<ImageView <ImageView
android:id="@+id/file_list_item_icon" android:id="@+id/file_list_item_icon"
tools:src="@drawable/ic_folder_black_24dp" tools:src="@drawable/ic_folder_black_24dp"
tools:tint="@color/text_color_secondary" tools:tint="@color/text_color_secondary"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_width="32dp" android:layout_width="@dimen/file_icon_width"
android:layout_margin="8dp" android:layout_marginEnd="@dimen/file_icon_margin_end"
android:layout_marginRight="@dimen/file_icon_margin_end"
android:layout_gravity="center" android:layout_gravity="center"
android:contentDescription="@string/file_icon_desc" /> android:contentDescription="@string/file_icon_desc" />
<LinearLayout <LinearLayout
@@ -29,7 +34,9 @@
style="@style/ListItemText" style="@style/ListItemText"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="2" /> android:layout_weight="2"
android:ellipsize="end"
android:maxLines="1"/>
<TextView <TextView
android:id="@+id/file_list_item_size" android:id="@+id/file_list_item_size"
tools:text="filesize" tools:text="filesize"
@@ -43,6 +50,8 @@
style="@style/ListItemText" style="@style/ListItemText"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="2" /> android:layout_weight="2"
android:ellipsize="end"
android:maxLines="1"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

16
android/source/res/layout/item_recent_files.xml
View File

@@ -12,23 +12,27 @@
android:layout_height="48dp" android:layout_height="48dp"
android:orientation="horizontal" android:orientation="horizontal"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:layout_marginStart="@dimen/list_item_margin"
android:layout_marginLeft="@dimen/list_item_margin"
android:layout_marginEnd="@dimen/list_item_margin"
android:layout_marginRight="@dimen/list_item_margin"
tools:ignore="UseCompoundDrawables"> tools:ignore="UseCompoundDrawables">
<!--using compound drawables is ignored because more control over the drawable size is needed--> <!--using compound drawables is ignored because more control over the drawable size is needed-->
<ImageView <ImageView
android:layout_width="32dp" android:layout_width="32dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="8dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginEnd="@dimen/file_icon_margin_end"
android:layout_marginRight="@dimen/file_icon_margin_end"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:id="@+id/imageView" android:id="@+id/imageView"
android:contentDescription="@string/file_icon_desc"/> android:contentDescription="@string/file_icon_desc"/>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/textView" android:id="@+id/textView"
style="@style/ListItemText"/> style="@style/ListItemText"
android:maxLines="1"
</LinearLayout> android:ellipsize="end"/>
</LinearLayout>

3
android/source/res/values/dimens.xml
View File

@@ -5,4 +5,7 @@
<dimen name="text_selection_handle_width">30dp</dimen> <dimen name="text_selection_handle_width">30dp</dimen>
<dimen name="text_selection_handle_height">44dp</dimen> <dimen name="text_selection_handle_height">44dp</dimen>
<dimen name="text_selection_handle_shadow">2dp</dimen> <dimen name="text_selection_handle_shadow">2dp</dimen>
<dimen name="file_icon_margin_end">8dp</dimen>
<dimen name="list_item_margin">8dp</dimen>
<dimen name="file_icon_width">32dp</dimen>
</resources> </resources>

2
android/source/res/values/themes.xml
View File

@@ -8,7 +8,7 @@
<style name="ListItemText"> <style name="ListItemText">
<item name="android:gravity">center</item> <item name="android:gravity">center</item>
<item name="android:textColor">@android:color/black</item> <item name="android:textColor">@android:color/black</item>
<item name="android:textSize">15sp</item> <item name="android:textSize">14sp</item>
</style> </style>
<style name="LibreOfficeTheme.Toolbar" parent="Theme.AppCompat.Light.NoActionBar"> <style name="LibreOfficeTheme.Toolbar" parent="Theme.AppCompat.Light.NoActionBar">