From d5c4d7ab9245c2276544a8c6ac1afc4641b57065 Mon Sep 17 00:00:00 2001
From: "David A. Velasco" <dvelasco@solidgear.es>
Date: Thu, 17 Dec 2015 15:49:55 +0100
Subject: [PATCH] Changes from code review

---
 res/layout-v11/activity_row.xml               | 59 ------------
 .../notification_with_progress_bar.xml        | 69 --------------
 res/layout-v14/generic_explanation.xml        | 70 ---------------
 res/layout/activity_row.xml                   |  6 +-
 res/layout/drawer.xml                         |  4 +-
 res/layout/generic_explanation.xml            | 16 ++--
 res/layout/log_send_file.xml                  |  2 +-
 res/layout/notification_with_progress_bar.xml | 90 +++++++++----------
 .../android/ui/activity/FileActivity.java     |  2 +-
 9 files changed, 61 insertions(+), 257 deletions(-)
 delete mode 100644 res/layout-v11/activity_row.xml
 delete mode 100644 res/layout-v11/notification_with_progress_bar.xml
 delete mode 100644 res/layout-v14/generic_explanation.xml

diff --git a/res/layout-v11/activity_row.xml b/res/layout-v11/activity_row.xml
deleted file mode 100644
index a85c3ee96a..0000000000
--- a/res/layout-v11/activity_row.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ownCloud Android client application
-
-  Copyright (C) 2015 ownCloud Inc.
-
-  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 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/>.
--->
-
-<LinearLayout 	xmlns:android="http://schemas.android.com/apk/res/android"
-    			android:id="@+id/list_item"
-				android:layout_width="match_parent"
-				android:layout_height="48dp"
-				android:paddingStart="16dip"
-				android:paddingEnd="16dip"
-				android:paddingRight="16dip"
-				android:paddingLeft="16dip"
-				android:minWidth="196dip"
-				android:background="?android:attr/activatedBackgroundIndicator"
-    			android:orientation="vertical" >
-
-	<LinearLayout
-		android:layout_width="wrap_content"
-		android:layout_height="match_parent"
-		android:duplicateParentState="true" >
-
-		<ImageView
-			android:id="@+id/icon"
-			android:layout_width="40dip"
-			android:layout_height="40dip"
-			android:layout_gravity="center_vertical"
-			android:layout_marginEnd="8dip"
-			android:layout_marginRight="8dip"
-			android:duplicateParentState="true" />
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:textAppearance="?android:attr/textAppearanceLargePopupMenu"
-            android:duplicateParentState="true"
-            android:singleLine="true"
-            android:ellipsize="marquee"
-            android:fadingEdge="horizontal" />
-
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-v11/notification_with_progress_bar.xml b/res/layout-v11/notification_with_progress_bar.xml
deleted file mode 100644
index c67b9a9ece..0000000000
--- a/res/layout-v11/notification_with_progress_bar.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-    ownCloud Android client application
-    Copyright (C) 2015 ownCloud Inc.
-
-    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 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/>.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    >
-    <ImageView android:id="@+id/icon"
-        android:layout_width="@android:dimen/notification_large_icon_width"
-        android:layout_height="@android:dimen/notification_large_icon_height"
-        android:scaleType="center"
-        />
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:minHeight="64dp"
-        android:orientation="vertical"
-        android:paddingRight="12dp"
-        android:paddingLeft="12dp"
-        >
-		<TextView android:id="@+id/title"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:singleLine="true"
-			android:ellipsize="marquee"
-            android:fadingEdge="horizontal"
-            style="@style/Theme.ownCloud.NotificationText.Title"
-        	/>
-        <TextView android:id="@+id/text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="-2dp"
-            android:layout_marginBottom="-2dp"
-            android:singleLine="true"
-            android:fadingEdge="horizontal"
-            android:ellipsize="marquee"
-            style="@style/Theme.ownCloud.NotificationText.Content"
-            />
-        <FrameLayout android:id="@+id/progressHolder"
-            android:layout_width="match_parent"
-            android:layout_height="12dp"
-            >
-            <!--  the FrameLayout is needed to change visibility of the
-            	progress bar in Android 2.2, even though 
-            	https://code.google.com/p/android/issues/detail?id=11040 -->
-	        <ProgressBar
-	            android:id="@+id/progress"
-	            android:layout_width="match_parent"
-	            android:layout_height="match_parent"
-	            style="?android:attr/progressBarStyleHorizontal"
-	            />
-        </FrameLayout>
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-v14/generic_explanation.xml b/res/layout-v14/generic_explanation.xml
deleted file mode 100644
index d90fb8a3c8..0000000000
--- a/res/layout-v14/generic_explanation.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-  ownCloud Android client application
-
-  Copyright (C) 2015 ownCloud Inc.
-
-  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 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/>.
- -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/background_color" 
-    android:id="@+id/explanation"
-    android:orientation="vertical">
-
-	<TextView
-		android:id="@+id/message"
-		android:layout_width="match_parent"
-		android:layout_height="0dp"
-		android:layout_weight="2"
-	    android:padding="10dip"
-	    android:scrollbarAlwaysDrawVerticalTrack="true"
-		android:text="@string/placeholder_sentence" 
-		/>
-    
-	<ListView 
-	    android:id="@+id/list"
-	    android:layout_width="match_parent"
-	    android:layout_height="0dp"
-		android:layout_weight="3"
-	    android:padding="10dip"
-	    />
-	    
-    <LinearLayout
-        android:id="@+id/buttons"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:orientation="horizontal" >
-
-        <!-- 'OK' / 'CANCEL' BUTTONS CHANGE THEIR ORDER FROM ANDROID 4.0 ; THANKS, GOOGLE -->
-        <android.support.v7.widget.AppCompatButton
-            android:id="@+id/cancel"
-            android:theme="@style/Button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/common_cancel" />
-
-        <android.support.v7.widget.AppCompatButton
-		    android:id="@+id/ok"
-            android:theme="@style/Button.Primary"
-		    android:layout_width="wrap_content"
-		    android:layout_height="wrap_content"
-		    android:layout_weight="1"
-		    android:text="@string/common_ok" />
-		
-	</LinearLayout>
-	
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/activity_row.xml b/res/layout/activity_row.xml
index 9297bcdbec..a85c3ee96a 100644
--- a/res/layout/activity_row.xml
+++ b/res/layout/activity_row.xml
@@ -21,9 +21,12 @@
     			android:id="@+id/list_item"
 				android:layout_width="match_parent"
 				android:layout_height="48dp"
+				android:paddingStart="16dip"
+				android:paddingEnd="16dip"
 				android:paddingRight="16dip"
 				android:paddingLeft="16dip"
 				android:minWidth="196dip"
+				android:background="?android:attr/activatedBackgroundIndicator"
     			android:orientation="vertical" >
 
 	<LinearLayout
@@ -36,6 +39,7 @@
 			android:layout_width="40dip"
 			android:layout_height="40dip"
 			android:layout_gravity="center_vertical"
+			android:layout_marginEnd="8dip"
 			android:layout_marginRight="8dip"
 			android:duplicateParentState="true" />
 
@@ -44,7 +48,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:textAppearance="?android:attr/textAppearanceLargePopupMenu"
             android:duplicateParentState="true"
             android:singleLine="true"
             android:ellipsize="marquee"
diff --git a/res/layout/drawer.xml b/res/layout/drawer.xml
index 485ff52b35..f3f7c4764e 100644
--- a/res/layout/drawer.xml
+++ b/res/layout/drawer.xml
@@ -75,8 +75,8 @@
 
             <ImageView
                 android:id="@+id/itemIcon"
-                android:layout_width="24sp"
-                android:layout_height="24sp"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
                 android:layout_marginLeft="@dimen/standard_padding"
                 android:layout_marginBottom="3dp"
                 android:layout_gravity="bottom"
diff --git a/res/layout/generic_explanation.xml b/res/layout/generic_explanation.xml
index 64c9ed0c73..848121654a 100644
--- a/res/layout/generic_explanation.xml
+++ b/res/layout/generic_explanation.xml
@@ -48,14 +48,6 @@
         android:gravity="center"
         android:orientation="horizontal" >
 
-        <android.support.v7.widget.AppCompatButton
-		    android:id="@+id/ok"
-            android:theme="@style/Button.Primary"
-		    android:layout_width="wrap_content"
-		    android:layout_height="wrap_content"
-		    android:layout_weight="1"
-		    android:text="@string/common_ok" />
-
         <android.support.v7.widget.AppCompatButton
             android:id="@+id/cancel"
             android:theme="@style/Button"
@@ -64,6 +56,14 @@
             android:layout_weight="1"
             android:text="@string/common_cancel" />
 
+        <android.support.v7.widget.AppCompatButton
+		    android:id="@+id/ok"
+            android:theme="@style/Button.Primary"
+		    android:layout_width="wrap_content"
+		    android:layout_height="wrap_content"
+		    android:layout_weight="1"
+		    android:text="@string/common_ok" />
+		
 	</LinearLayout>
 	
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/log_send_file.xml b/res/layout/log_send_file.xml
index 921528e9a2..0f916c359e 100644
--- a/res/layout/log_send_file.xml
+++ b/res/layout/log_send_file.xml
@@ -54,7 +54,7 @@
         android:layout_marginLeft="@dimen/standard_margin"
         android:layout_marginRight="@dimen/standard_margin">
 
-    <Button
+    <android.support.v7.widget.AppCompatButton
         android:id="@+id/deleteLogHistoryButton"
         android:theme="@style/Button"
         android:layout_width="fill_parent"
diff --git a/res/layout/notification_with_progress_bar.xml b/res/layout/notification_with_progress_bar.xml
index ae2dbfaa6c..c67b9a9ece 100644
--- a/res/layout/notification_with_progress_bar.xml
+++ b/res/layout/notification_with_progress_bar.xml
@@ -16,56 +16,54 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:paddingTop="5dp"
-        android:paddingLeft="5dp"
-        >
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    >
+    <ImageView android:id="@+id/icon"
+        android:layout_width="@android:dimen/notification_large_icon_width"
+        android:layout_height="@android:dimen/notification_large_icon_height"
+        android:scaleType="center"
+        />
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingTop="3dp"
+        android:layout_gravity="center"
+        android:minHeight="64dp"
+        android:orientation="vertical"
+        android:paddingRight="12dp"
+        android:paddingLeft="12dp"
         >
-        <ImageView android:id="@+id/icon"
-            android:layout_width="25dp"
-            android:layout_height="25dp"
-            android:scaleType="centerInside"
-            />
-        <TextView android:id="@+id/title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:singleLine="true"
-            android:ellipsize="marquee"
+		<TextView android:id="@+id/title"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:singleLine="true"
+			android:ellipsize="marquee"
             android:fadingEdge="horizontal"
-            android:paddingLeft="4dp"
-        	style="@style/Theme.ownCloud.NotificationText.Title"
+            style="@style/Theme.ownCloud.NotificationText.Title"
+        	/>
+        <TextView android:id="@+id/text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="-2dp"
+            android:layout_marginBottom="-2dp"
+            android:singleLine="true"
+            android:fadingEdge="horizontal"
+            android:ellipsize="marquee"
+            style="@style/Theme.ownCloud.NotificationText.Content"
             />
+        <FrameLayout android:id="@+id/progressHolder"
+            android:layout_width="match_parent"
+            android:layout_height="12dp"
+            >
+            <!--  the FrameLayout is needed to change visibility of the
+            	progress bar in Android 2.2, even though 
+            	https://code.google.com/p/android/issues/detail?id=11040 -->
+	        <ProgressBar
+	            android:id="@+id/progress"
+	            android:layout_width="match_parent"
+	            android:layout_height="match_parent"
+	            style="?android:attr/progressBarStyleHorizontal"
+	            />
+        </FrameLayout>
     </LinearLayout>
-	<TextView android:id="@+id/text"
-	    android:layout_width="match_parent"
-	    android:layout_height="wrap_content"
-	    android:singleLine="true"
-	    android:ellipsize="marquee"
-	    android:fadingEdge="horizontal"
-        style="@style/Theme.ownCloud.NotificationText.Content"
-	    />
-    <FrameLayout android:id="@+id/progressHolder"
-        android:layout_width="match_parent"
-        android:layout_height="10dp"
-        android:paddingTop="2dp"
-        android:paddingBottom="2dp"
-        >
-        <!--  the FrameLayout is needed to change visibility of the
-        	progress bar in Android 2.2, even though 
-        	https://code.google.com/p/android/issues/detail?id=11040 -->
-		<ProgressBar
-    		android:id="@+id/progress"
-    		android:layout_width="match_parent"
-    		android:layout_height="match_parent"
-    		style="?android:attr/progressBarStyleHorizontal"
-    	/>
-    </FrameLayout>
-</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/src/com/owncloud/android/ui/activity/FileActivity.java b/src/com/owncloud/android/ui/activity/FileActivity.java
index 571c90de35..e0d1ee4d85 100644
--- a/src/com/owncloud/android/ui/activity/FileActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileActivity.java
@@ -445,7 +445,7 @@ public class FileActivity extends AppCompatActivity
      * @param account                the account to be set in the drawer
      */
     protected void setUsernameInDrawer(RelativeLayout navigationDrawerLayout, Account account) {
-        if (navigationDrawerLayout != null && getAccount() != null) {
+        if (navigationDrawerLayout != null && account != null) {
             TextView username = (TextView) navigationDrawerLayout.findViewById(R.id.drawer_username);
             int lastAtPos = account.name.lastIndexOf("@");
             username.setText(account.name.substring(0, lastAtPos));