Skip to content

Commit dcefbe9

Browse files
author
Chris Bellew
committed
Redid navigation footer.
1 parent 15ca81b commit dcefbe9

File tree

12 files changed

+108
-47
lines changed

12 files changed

+108
-47
lines changed

mobile/src/main/java/com/atomjack/vcfp/PlexSubscription.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,6 @@ public void subscribe(PlexClient client, final boolean isHeartbeat) {
257257
return;
258258
mClient = client;
259259

260-
261260
PlexHttpClient.subscribe(client, subscriptionPort, commandId, VoiceControlForPlexApplication.getInstance().getUUID(), VoiceControlForPlexApplication.getInstance().getString(R.string.app_name), new PlexHttpResponseHandler() {
262261
@Override
263262
public void onSuccess(PlexResponse response) {
@@ -274,8 +273,6 @@ public void onSuccess(PlexResponse response) {
274273
serverSocket.close();
275274
serverSocket = null;
276275
} catch (Exception e) {}
277-
278-
279276
} else {
280277
timeLastHeardFromClient = new Date();
281278

mobile/src/main/java/com/atomjack/vcfp/activities/MainActivity.java

Lines changed: 43 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@
3434
import android.support.v7.media.MediaRouteSelector;
3535
import android.support.v7.media.MediaRouter;
3636
import android.support.v7.widget.Toolbar;
37-
import android.util.DisplayMetrics;
38-
import android.util.TypedValue;
3937
import android.view.KeyEvent;
4038
import android.view.LayoutInflater;
4139
import android.view.Menu;
@@ -239,7 +237,7 @@ else if (activeNetwork.getType() == ConnectivityManager.TYPE_WIFI)
239237
protected NetworkState currentNetworkState;
240238
protected NetworkMonitor networkMonitor;
241239

242-
NavigationView navigationFooter;
240+
LinearLayout navigationFooter;
243241

244242
@Override
245243
protected void onCreate(Bundle savedInstanceState) {
@@ -847,14 +845,48 @@ public void onDrawerClosed(View drawerView) {
847845
navigationViewMain = (NavigationView) findViewById(R.id.navigationViewMain);
848846

849847
// Footer view
850-
navigationFooter = (NavigationView) findViewById(R.id.navigationViewFooter);
851-
ViewGroup.LayoutParams layoutParams = navigationFooter.getLayoutParams();
852-
TypedValue value = new TypedValue();
853-
getTheme().resolveAttribute(android.R.attr.listPreferredItemHeight, value, true);
854-
DisplayMetrics metrics = new DisplayMetrics();
855-
getWindowManager().getDefaultDisplay().getMetrics(metrics);
856-
layoutParams.height = (int)value.getDimension(metrics)*navigationFooter.getMenu().size();
857-
navigationFooter.setLayoutParams(layoutParams);
848+
navigationFooter = (LinearLayout) findViewById(R.id.navigationViewFooter);
849+
850+
final LinearLayout navigationFooterHelpButton = (LinearLayout)navigationFooter.findViewById(R.id.navigationFooterHelpButton);
851+
navigationFooterHelpButton.setOnClickListener(new View.OnClickListener() {
852+
@Override
853+
public void onClick(View v) {
854+
navigationFooterHelpButton.setBackgroundColor(ContextCompat.getColor(MainActivity.this, R.color.primary_600));
855+
handler.postDelayed(new Runnable() {
856+
@Override
857+
public void run() {
858+
navigationFooterHelpButton.setBackgroundColor(ContextCompat.getColor(MainActivity.this, R.color.navigation_drawer_background));
859+
}
860+
}, 200);
861+
AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this);
862+
View view = getLayoutInflater().inflate(R.layout.help_dialog, null);
863+
builder.setView(view);
864+
final AlertDialog usageDialog = builder.create();
865+
Button button = (Button)view.findViewById(R.id.helpCloseButton);
866+
button.setOnClickListener(new View.OnClickListener() {
867+
@Override
868+
public void onClick(View v) {
869+
usageDialog.dismiss();
870+
}
871+
});
872+
usageDialog.show();
873+
}
874+
});
875+
876+
final LinearLayout navigationFooterSettingsButton = (LinearLayout)navigationFooter.findViewById(R.id.navigationFooterSettingsButton);
877+
navigationFooterSettingsButton.setOnClickListener(new View.OnClickListener() {
878+
@Override
879+
public void onClick(View v) {
880+
navigationFooterSettingsButton.setBackgroundColor(ContextCompat.getColor(MainActivity.this, R.color.primary_600));
881+
handler.postDelayed(new Runnable() {
882+
@Override
883+
public void run() {
884+
navigationFooterSettingsButton.setBackgroundColor(ContextCompat.getColor(MainActivity.this, R.color.navigation_drawer_background));
885+
setNavGroup(R.menu.nav_items_settings);
886+
}
887+
}, 200);
888+
}
889+
});
858890

859891
if(navigationViewMain.getHeaderView(0) != null)
860892
navigationViewMain.removeHeaderView(navigationViewMain.getHeaderView(0));
@@ -1125,25 +1157,6 @@ public void navMenuSettingsBack(MenuItem item) {
11251157
setNavGroup(R.menu.nav_items_main);
11261158
}
11271159

1128-
public void navMenuSettings(MenuItem item) {
1129-
setNavGroup(R.menu.nav_items_settings);
1130-
}
1131-
1132-
public void navMenuHelp(MenuItem item) {
1133-
AlertDialog.Builder builder = new AlertDialog.Builder(this);
1134-
View view = getLayoutInflater().inflate(R.layout.help_dialog, null);
1135-
builder.setView(view);
1136-
final AlertDialog usageDialog = builder.create();
1137-
Button button = (Button)view.findViewById(R.id.helpCloseButton);
1138-
button.setOnClickListener(new View.OnClickListener() {
1139-
@Override
1140-
public void onClick(View v) {
1141-
usageDialog.dismiss();
1142-
}
1143-
});
1144-
usageDialog.show();
1145-
}
1146-
11471160
private void setNavGroup(int group) {
11481161
navigationViewMain.getMenu().clear();
11491162
navigationViewMain.inflateMenu(group);
-127 Bytes
Loading
536 Bytes
Loading
-124 Bytes
Loading
-3.76 KB
Loading
-215 Bytes
Loading
-15.5 KB
Loading
-173 Bytes
Loading
-35.2 KB
Loading

0 commit comments

Comments
 (0)