From 0a0dae8b2811c895ecdaea4de3eae56b5648fcc2 Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Fri, 28 Nov 2014 16:39:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=20Drawer=20=E5=AE=BD?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 res/layout/user_panel.xml                     | 70 +++++++++----------
 res/values/dimens.xml                         |  2 +-
 src/com/hippo/ehviewer/AppContext.java        |  2 +-
 .../ehviewer/ui/GalleryListActivity.java      | 20 +++---
 4 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/res/layout/user_panel.xml b/res/layout/user_panel.xml
index b4c9489e4..8666e2939 100644
--- a/res/layout/user_panel.xml
+++ b/res/layout/user_panel.xml
@@ -15,7 +15,7 @@
      limitations under the License.
 -->
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:auto="http://schemas.android.com/apk/res-auto"
     android:id="@+id/user_panel"
     android:layout_width="match_parent"
@@ -24,8 +24,9 @@
 
     <LinearLayout
         android:id="@+id/user_info"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_gravity="left|center_vertical"
         android:orientation="horizontal" >
 
         <ImageView
@@ -43,40 +44,39 @@
 
     </LinearLayout>
 
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="right|bottom"
+        android:orientation="vertical" >
+
+        <com.hippo.ehviewer.widget.SuperButton
+            android:id="@+id/register"
+            style="@style/SuperButton.Tile.Small"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/register" />
+
+        <com.hippo.ehviewer.widget.SuperButton
+            android:id="@+id/login"
+            style="@style/SuperButton.Tile.Small"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:text="@string/login" />
+
+        <com.hippo.ehviewer.widget.SuperButton
+            android:id="@+id/logout"
+            style="@style/SuperButton.Tile.Small"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/logout" />
+
+    </LinearLayout>
+
     <com.hippo.ehviewer.widget.MaterialProgress
         android:id="@+id/wait"
         style="@style/MaterialProgress"
-        android:layout_centerInParent="true" />
+        android:layout_gravity="center" />
 
-    <com.hippo.ehviewer.widget.SuperButton
-        android:id="@+id/login"
-        style="@style/SuperButton.Tile.Small"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/user_info"
-        android:layout_marginTop="16dp"
-        android:layout_alignParentRight="true"
-        android:text="@string/login" />
-
-    <com.hippo.ehviewer.widget.SuperButton
-        android:id="@+id/register"
-        style="@style/SuperButton.Tile.Small"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/user_info"
-        android:layout_marginTop="16dp"
-        android:layout_toLeftOf="@id/login"
-        android:layout_marginRight="16dp"
-        android:text="@string/register" />
-
-    <com.hippo.ehviewer.widget.SuperButton
-        android:id="@+id/logout"
-        style="@style/SuperButton.Tile.Small"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/user_info"
-        android:layout_marginTop="16dp"
-        android:layout_alignParentRight="true"
-        android:text="@string/logout" />
-
-</RelativeLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 70045d0e6..4f3ed1d6f 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -17,7 +17,7 @@
 
     <dimen name="action_bar_height">56dp</dimen>
 
-    <dimen name="drawer_max_width">320dip</dimen>
+    <dimen name="drawer_max_width">264dip</dimen>
 
     <dimen name="dialog_title_height">64dp</dimen>
 
diff --git a/src/com/hippo/ehviewer/AppContext.java b/src/com/hippo/ehviewer/AppContext.java
index 53e18b3a3..0bc3d8eda 100644
--- a/src/com/hippo/ehviewer/AppContext.java
+++ b/src/com/hippo/ehviewer/AppContext.java
@@ -81,7 +81,7 @@ public class AppContext extends Application implements UncaughtExceptionHandler
         MaterialToast.setContext(this);
 
         // Set drawer margin
-        SlidingDrawerLayout.setDefaultMinDrawerMargin(Ui.ACTION_BAR_HEIGHT);
+        SlidingDrawerLayout.setDefaultMinDrawerMargin(Ui.ACTION_BAR_HEIGHT * 2);
 
         // Add .nomedia or delete it
         File nomedia = new File(Config.getDownloadPath(), ".nomedia");
diff --git a/src/com/hippo/ehviewer/ui/GalleryListActivity.java b/src/com/hippo/ehviewer/ui/GalleryListActivity.java
index 19c7e6e29..8c7bcbd84 100644
--- a/src/com/hippo/ehviewer/ui/GalleryListActivity.java
+++ b/src/com/hippo/ehviewer/ui/GalleryListActivity.java
@@ -1546,27 +1546,27 @@ public class GalleryListActivity extends AbsTranslucentActivity implements View.
         switch (state) {
         case LOGIN:
             mAvatar.setImageBitmap(mClient.getAvatar());
-            mUsernameView.setVisibility(View.INVISIBLE);
+            mUsernameView.setVisibility(View.GONE);
             mLoginButton.setVisibility(View.VISIBLE);
             mRegisterButton.setVisibility(View.VISIBLE);
-            mLogoutButton.setVisibility(View.INVISIBLE);
-            mWaitLogView.setVisibility(View.INVISIBLE);
+            mLogoutButton.setVisibility(View.GONE);
+            mWaitLogView.setVisibility(View.GONE);
             break;
         case LOGOUT:
             mAvatar.setImageBitmap(mClient.getAvatar());
             mUsernameView.setText(mClient.getDisplayname());
             mUsernameView.setVisibility(View.VISIBLE);
-            mLoginButton.setVisibility(View.INVISIBLE);
-            mRegisterButton.setVisibility(View.INVISIBLE);
+            mLoginButton.setVisibility(View.GONE);
+            mRegisterButton.setVisibility(View.GONE);
             mLogoutButton.setVisibility(View.VISIBLE);
-            mWaitLogView.setVisibility(View.INVISIBLE);
+            mWaitLogView.setVisibility(View.GONE);
             break;
         case WAIT:
             mAvatar.setImageBitmap(mClient.getAvatar());
-            mUsernameView.setVisibility(View.INVISIBLE);
-            mLoginButton.setVisibility(View.INVISIBLE);
-            mRegisterButton.setVisibility(View.INVISIBLE);
-            mLogoutButton.setVisibility(View.INVISIBLE);
+            mUsernameView.setVisibility(View.GONE);
+            mLoginButton.setVisibility(View.GONE);
+            mRegisterButton.setVisibility(View.GONE);
+            mLogoutButton.setVisibility(View.GONE);
             mWaitLogView.setVisibility(View.VISIBLE);
             break;
         }