[Android] Browser: Remove unnecessary layout layer

Geoffrey Métais git at videolan.org
Fri Apr 20 16:46:18 CEST 2018


vlc-android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Fri Apr 20 16:45:58 2018 +0200| [a182c0c593c2bb420baaaf92ca56ae05dfa93991] | committer: Geoffrey Métais

Browser: Remove unnecessary layout layer

> https://code.videolan.org/videolan/vlc-android/commit/a182c0c593c2bb420baaaf92ca56ae05dfa93991
---

 vlc-android/res/layout/directory_browser.xml | 39 ++++++++++++++++------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/vlc-android/res/layout/directory_browser.xml b/vlc-android/res/layout/directory_browser.xml
index 5afd4b654..63e37afe4 100644
--- a/vlc-android/res/layout/directory_browser.xml
+++ b/vlc-android/res/layout/directory_browser.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <data>
         <import type="android.view.View" />
         <variable
@@ -7,53 +8,57 @@
             type="boolean" />
     </data>
     <org.videolan.vlc.gui.view.SwipeRefreshLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/swipeLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent" >
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center_horizontal">
         <android.support.constraint.ConstraintLayout
-            android:layout_width="@dimen/default_content_width"
-            android:layout_height="match_parent"
-            android:background="?attr/background_default" >
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" >
             <include layout="@layout/button_search"
-                android:layout_width="wrap_content"
+                android:layout_width="@dimen/default_content_width"
                 android:layout_height="wrap_content"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:layout_constraintTop_toTopOf="parent"
+                android:background="?attr/background_default" />
             <TextView
                 android:id="@+id/favorites_title"
-                android:layout_width="wrap_content"
+                android:layout_width="@dimen/default_content_width"
                 android:layout_height="wrap_content"
+                app:layout_constraintHeight_default="spread"
                 android:padding="8dp"
                 android:text="@string/network_favorites"
+                android:background="?attr/background_default"
                 app:layout_constraintTop_toBottomOf="@+id/searchButton"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
                 android:visibility="@{showFavorites ? View.VISIBLE : View.GONE}" />
             <android.support.v7.widget.RecyclerView
                 android:id="@+id/favorites_list"
-                android:layout_width="0dp"
+                android:layout_width="@dimen/default_content_width"
                 android:layout_height="wrap_content"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/favorites_title"
+                android:background="?attr/background_default"
                 android:visibility="@{showFavorites ? View.VISIBLE : View.GONE}" />
             <TextView
                 android:id="@+id/folders_title"
-                android:layout_width="wrap_content"
+                android:layout_width="@dimen/default_content_width"
                 android:layout_height="wrap_content"
+                android:background="?attr/background_default"
                 android:padding="8dp"
                 android:text="@string/network_shared_folders"
                 app:layout_constraintTop_toBottomOf="@+id/favorites_list"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
                 android:visibility="@{showFavorites ? View.VISIBLE : View.GONE}" />
             <org.videolan.vlc.gui.view.ContextMenuRecyclerView
                 android:id="@+id/network_list"
-                android:layout_width="0dp"
+                android:layout_width="@dimen/default_content_width"
                 android:layout_height="0dp"
+                app:layout_constraintHeight_default="spread"
+                android:background="?attr/background_default"
                 app:layout_constraintTop_toBottomOf="@+id/folders_title"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
@@ -70,6 +75,6 @@
                 android:gravity="center"
                 android:text="@string/loading" />
 
-        </android.support.constraint.ConstraintLayout></LinearLayout>
+        </android.support.constraint.ConstraintLayout>
     </org.videolan.vlc.gui.view.SwipeRefreshLayout>
 </layout>



More information about the Android mailing list