From f64c71b7c9ce2a3521b43e548f91262340654ab2 Mon Sep 17 00:00:00 2001 From: Scott Jackson Date: Sat, 18 Jul 2015 17:32:52 -0700 Subject: Fix drawer header in offline mode --- .../daneren2005/dsub/activity/SubsonicActivity.java | 21 +++++++++++++++++---- .../daneren2005/dsub/fragments/MainFragment.java | 1 + 2 files changed, 18 insertions(+), 4 deletions(-) (limited to 'app') diff --git a/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java b/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java index 1492c778..f2339165 100644 --- a/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java +++ b/app/src/main/java/github/daneren2005/dsub/activity/SubsonicActivity.java @@ -102,6 +102,7 @@ public class SubsonicActivity extends AppCompatActivity implements OnItemSelecte NavigationView drawerList; View drawerHeader; ImageView drawerUserAvatar; + ImageView drawerHeaderToggle; TextView drawerServerName; TextView drawerUserName; int lastSelectedPosition = 0; @@ -323,6 +324,7 @@ public class SubsonicActivity extends AppCompatActivity implements OnItemSelecte } }); + drawerHeaderToggle = (ImageView) drawerHeader.findViewById(R.id.header_select_image); drawerServerName = (TextView) drawerHeader.findViewById(R.id.header_server_name); drawerUserName = (TextView) drawerHeader.findViewById(R.id.header_user_name); @@ -935,10 +937,21 @@ public class SubsonicActivity extends AppCompatActivity implements OnItemSelecte updateDrawerHeader(); } } - private void updateDrawerHeader() { - drawerServerName.setText(Util.getServerName(this)); - drawerUserName.setText(UserUtil.getCurrentUsername(this)); - getImageLoader().loadAvatar(this, drawerUserAvatar, UserUtil.getCurrentUsername(this)); + public void updateDrawerHeader() { + if(Util.isOffline(this)) { + drawerServerName.setText(R.string.select_album_offline); + drawerUserName.setText(""); + drawerUserAvatar.setVisibility(View.GONE); + drawerHeader.setClickable(false); + drawerHeaderToggle.setVisibility(View.GONE); + } else { + drawerServerName.setText(Util.getServerName(this)); + drawerUserName.setText(UserUtil.getCurrentUsername(this)); + drawerUserAvatar.setVisibility(View.VISIBLE); + getImageLoader().loadAvatar(this, drawerUserAvatar, UserUtil.getCurrentUsername(this)); + drawerHeader.setClickable(true); + drawerHeaderToggle.setVisibility(View.VISIBLE); + } } private void setUncaughtExceptionHandler() { diff --git a/app/src/main/java/github/daneren2005/dsub/fragments/MainFragment.java b/app/src/main/java/github/daneren2005/dsub/fragments/MainFragment.java index be3fedf7..87da5d9c 100644 --- a/app/src/main/java/github/daneren2005/dsub/fragments/MainFragment.java +++ b/app/src/main/java/github/daneren2005/dsub/fragments/MainFragment.java @@ -165,6 +165,7 @@ public class MainFragment extends SelectRecyclerFragment { } UserUtil.seedCurrentUser(context); + context.updateDrawerHeader(); } private void showAlbumList(String type) { -- cgit v1.2.3