Эх сурвалжийг харах

slight whitespace optimizations in accordance with material design guidelines

Andy Scherzinger 8 жил өмнө
parent
commit
aac14ed031

+ 42 - 41
res/layout/participate_layout.xml

@@ -1,27 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ownCloud Android client application
+  Nextcloud Android client application
 
-  Copyright (C) 2016 ownCloud Inc.
+  Copyright (C) 2016 Tobias Kaminsky
+  Copyright (C) 2016 Nextcloud.
 
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License version 2,
-  as published by the Free Software Foundation.
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+  License as published by the Free Software Foundation; either
+  version 3 of the License, or any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:clickable="true"
-    android:fitsSystemWindows="true">
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+
+  You should have received a copy of the GNU Affero General Public
+  License along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<android.support.v4.widget.DrawerLayout android:id="@+id/drawer_layout"
+                                        xmlns:android="http://schemas.android.com/apk/res/android"
+                                        android:layout_width="match_parent"
+                                        android:layout_height="match_parent"
+                                        android:clickable="true"
+                                        android:fitsSystemWindows="true">
 
     <!-- The main content view -->
     <LinearLayout
@@ -33,55 +35,54 @@
             layout="@layout/toolbar_standard"/>
 
         <ScrollView
+            android:id="@+id/scrollView"
             android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:id="@+id/scrollView">
+            android:layout_height="wrap_content">
 
             <LinearLayout
-                android:orientation="vertical"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="@dimen/standard_padding">
 
                 <TextView
+                    android:id="@+id/participate_header"
                     android:layout_width="fill_parent"
                     android:layout_height="fill_parent"
+                    android:paddingBottom="@dimen/standard_half_padding"
                     android:text="@string/participate_header"
-                    android:id="@+id/participate_header"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:layout_margin="5dp"
-                    android:layout_marginBottom="10dp"/>
+                    android:textAppearance="?android:attr/textAppearanceMedium"/>
 
                 <TextView
+                    android:id="@+id/participate_betaView"
                     android:layout_width="fill_parent"
                     android:layout_height="fill_parent"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:id="@+id/participate_betaView"
-                    android:layout_margin="5dp"
-                    android:layout_marginBottom="10dp"/>
+                    android:paddingBottom="@dimen/standard_half_padding"
+                    android:text="@string/participate_beta"
+                    android:textAppearance="?android:attr/textAppearanceMedium"/>
 
                 <TextView
+                    android:id="@+id/participate_rcView"
                     android:layout_width="fill_parent"
                     android:layout_height="fill_parent"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:id="@+id/participate_rcView"
-                    android:layout_margin="5dp"
-                    android:layout_marginBottom="10dp"/>
+                    android:paddingBottom="@dimen/standard_half_padding"
+                    android:text="@string/participate_release_candidate"
+                    android:textAppearance="?android:attr/textAppearanceMedium"/>
 
                 <TextView
+                    android:id="@+id/participate_participateView"
                     android:layout_width="fill_parent"
                     android:layout_height="fill_parent"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:id="@+id/participate_participateView"
-                    android:layout_margin="5dp"
-                    android:layout_marginBottom="10dp"/>
+                    android:paddingBottom="@dimen/standard_half_padding"
+                    android:text="@string/participate_participate"
+                    android:textAppearance="?android:attr/textAppearanceMedium"/>
 
                 <TextView
+                    android:id="@+id/participate_contributeView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:id="@+id/participate_contributeView"
-                    android:layout_margin="5dp"
-                    android:layout_marginBottom="10dp"/>
+                    android:text="@string/participate_contribute"
+                    android:textAppearance="?android:attr/textAppearanceMedium"/>
             </LinearLayout>
         </ScrollView>