diff options
Diffstat (limited to 'android/source/res/layout/activity_document_browser.xml')
-rw-r--r-- | android/source/res/layout/activity_document_browser.xml | 95 |
1 files changed, 39 insertions, 56 deletions
diff --git a/android/source/res/layout/activity_document_browser.xml b/android/source/res/layout/activity_document_browser.xml index 8e17a3e1624f..72b6e42b29b2 100644 --- a/android/source/res/layout/activity_document_browser.xml +++ b/android/source/res/layout/activity_document_browser.xml @@ -6,7 +6,7 @@ License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" +<androidx.constraintlayout.widget.ConstraintLayout 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:layout_width="match_parent" @@ -14,12 +14,11 @@ android:orientation="vertical"> <!-- The toolbar --> - <android.support.v7.widget.Toolbar + <com.google.android.material.appbar.MaterialToolbar android:id="@+id/toolbar" android:layout_width="0dp" android:layout_height="wrap_content" android:elevation="3dp" - android:background="@color/toolbar_background" app:theme="@style/LibreOfficeTheme.Toolbar" tools:theme="@style/LibreOfficeTheme.Toolbar" app:popupTheme="@style/LibreOfficeTheme" @@ -30,10 +29,10 @@ app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent"> - </android.support.v7.widget.Toolbar> + </com.google.android.material.appbar.MaterialToolbar> - <android.support.v4.widget.DrawerLayout + <androidx.drawerlayout.widget.DrawerLayout android:id="@+id/drawer_layout" android:layout_width="0dp" android:layout_height="0dp" @@ -47,7 +46,7 @@ app:layout_constraintLeft_toLeftOf="parent"> <!-- The content --> - <android.support.v4.widget.NestedScrollView + <androidx.core.widget.NestedScrollView android:layout_width="match_parent" android:layout_height="match_parent"> @@ -59,78 +58,62 @@ android:showDividers="middle"> <TextView + android:id="@+id/header_browser" android:layout_width="match_parent" - android:layout_height="48dp" - android:id="@+id/header_recents" - android:text="@string/title_recents" + android:layout_height="wrap_content" android:gravity="center_vertical" - android:textSize="14sp" android:padding="16dp" + android:text="@string/title_browser" + android:textSize="14sp" android:textStyle="bold" /> - <!--Recent files--> - <android.support.v7.widget.RecyclerView - android:id="@+id/list_recent" + <Button + android:id="@+id/open_file_button" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" /> + android:layout_weight="1" + android:gravity="center_vertical" + android:text="@string/select_file_to_open" + android:textSize="14dp" + app:drawableLeftCompat="@drawable/ic_folder_48dp" /> <TextView android:layout_width="match_parent" - android:layout_height="48dp" - android:id="@+id/header_browser" - android:text="@string/title_browser" + android:layout_height="wrap_content" + android:id="@+id/header_recents" + android:text="@string/title_recents" android:gravity="center_vertical" android:textSize="14sp" android:padding="16dp" android:textStyle="bold" /> - <TextView + <!--Recent files--> + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/list_recent" android:layout_width="match_parent" android:layout_height="wrap_content" - android:textSize="14sp" - android:padding="7dp" - android:id="@+id/text_directory_path" - android:background="@color/background_normal" - /> - - - <!--Document browser--> - <android.support.v7.widget.RecyclerView - android:id="@+id/file_recycler_view" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@color/background_normal" - android:orientation="vertical" /> + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" /> </LinearLayout> - </android.support.v4.widget.NestedScrollView> + </androidx.core.widget.NestedScrollView> <!-- The navigation drawer --> - <android.support.design.widget.NavigationView - android:id="@+id/navigation_drawer" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_gravity="start" - android:background="@color/background_normal" - app:menu="@menu/navigation_menu" - android:theme="@style/LibreOfficeTheme.NavigationView" /> - </android.support.v4.widget.DrawerLayout> + </androidx.drawerlayout.widget.DrawerLayout> - <android.support.design.widget.FloatingActionButton + <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/editFAB" + android:contentDescription="@string/create_file" android:layout_width="wrap_content" android:layout_height="wrap_content" android:clickable="true" - android:visibility="invisible" - app:backgroundTint="@color/background_normal" + app:backgroundTint="@color/background_floating" app:fabSize="normal" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" - app:srcCompat="@drawable/ic_add_black_24dp" + app:srcCompat="@drawable/ic_add_24dp" app:useCompatPadding="true" /> <LinearLayout @@ -151,14 +134,14 @@ android:layout_marginTop="@dimen/new_doc_fab_tweak_top" android:text="@string/new_textdocument" /> - <android.support.design.widget.FloatingActionButton + <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/newWriterFAB" android:layout_width="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" - app:backgroundTint="@color/background_normal" + app:backgroundTint="@color/background_floating" app:fabSize="mini" app:srcCompat="@drawable/writer" app:useCompatPadding="true" /> @@ -183,14 +166,14 @@ android:layout_marginTop="@dimen/new_doc_fab_tweak_top" android:text="@string/new_presentation" /> - <android.support.design.widget.FloatingActionButton + <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/newImpressFAB" android:layout_width="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" - app:backgroundTint="@color/background_normal" + app:backgroundTint="@color/background_floating" app:fabSize="mini" app:srcCompat="@drawable/impress" app:useCompatPadding="true" /> @@ -215,14 +198,14 @@ android:layout_marginTop="@dimen/new_doc_fab_tweak_top" android:text="@string/new_spreadsheet" /> - <android.support.design.widget.FloatingActionButton + <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/newCalcFAB" android:layout_width="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" - app:backgroundTint="@color/background_normal" + app:backgroundTint="@color/background_floating" app:fabSize="mini" app:srcCompat="@drawable/calc" app:useCompatPadding="true" /> @@ -247,18 +230,18 @@ android:layout_marginTop="@dimen/new_doc_fab_tweak_top" android:text="@string/new_drawing" /> - <android.support.design.widget.FloatingActionButton + <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/newDrawFAB" android:layout_width="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" - app:backgroundTint="@color/background_normal" + app:backgroundTint="@color/background_floating" app:fabSize="mini" app:srcCompat="@drawable/draw" app:useCompatPadding="true" /> </LinearLayout> -</android.support.constraint.ConstraintLayout> +</androidx.constraintlayout.widget.ConstraintLayout> |