调整 Drawer 宽度

This commit is contained in:
seven332 committed 2014-11-28 16:39:04 +08:00
1 parent 23f430dfd1
commit 0a0dae8b28
4 files changed
+47 -47

No files matched your search

+35 -35
View File
@@ -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>
</FrameLayout>
+1 -1
View File
@@ -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>
+1 -1
View File
@@ -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");
@@ -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;
}