Skip to content

Commit 0ec6b8b

Browse files
author
Chris Bellew
committed
Fixed up layout of client selector popup.
1 parent 0248d96 commit 0ec6b8b

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ private void showWhatsNewDialog(boolean force) {
471471
+ ".date { font-size: 9pt; color: #606060; display: block; }", String.format("#%06X", (0xFFFFFF & ContextCompat.getColor(this, R.color.settings_popup_background)))));
472472
View customView = LayoutInflater.from(this).inflate(R.layout.popup_whatsnew, null, false);
473473
whatsNewDialog.setCustomView(customView);
474-
if(force || true)
474+
if(force)
475475
whatsNewDialog.forceShow();
476476
else
477477
whatsNewDialog.show();
@@ -1381,10 +1381,13 @@ public void onClick(View v) {
13811381
}
13821382
});
13831383

1384-
if(VoiceControlForPlexApplication.getAllClients().size() == 0)
1384+
if(VoiceControlForPlexApplication.getAllClients().size() == 0) {
13851385
layout.findViewById(R.id.deviceSelectNoDevicesFound).setVisibility(View.VISIBLE);
1386-
else
1386+
layout.findViewById(R.id.deviceListResume).setVisibility(View.GONE);
1387+
} else {
13871388
layout.findViewById(R.id.deviceSelectNoDevicesFound).setVisibility(View.GONE);
1389+
layout.findViewById(R.id.deviceListResume).setVisibility(View.VISIBLE);
1390+
}
13881391
builder.setView(layout);
13891392
deviceSelectDialog = builder.create();
13901393

mobile/src/main/res/layout/device_select.xml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
android:layout_height="match_parent"
55
android:id="@+id/device_select_root"
66
android:orientation="vertical"
7-
android:background="@color/settings_popup_background">
7+
android:background="@color/settings_popup_background"
8+
android:padding="20dp">
89

910
<LinearLayout
1011
android:layout_width="match_parent"
@@ -19,7 +20,6 @@
1920
android:id="@+id/deviceListHeader"
2021
android:layout_gravity="center_vertical"
2122
android:text="Select Device"
22-
android:layout_marginLeft="10dp"
2323
android:layout_weight="1"
2424
android:textSize="18dp"
2525
android:textColor="@color/white"/>
@@ -55,9 +55,9 @@
5555
android:text="@string/no_clients_found"
5656
android:id="@+id/deviceSelectNoDevicesFound"
5757
android:gravity="center_vertical"
58-
android:layout_marginLeft="20dp"
5958
android:textColor="@color/white"
60-
android:visibility="gone"/>
59+
android:visibility="gone"
60+
/>
6161

6262
<ListView
6363
android:id="@+id/serverListView"
@@ -75,7 +75,6 @@
7575
android:id="@+id/deviceListResume"
7676
android:layout_width="wrap_content"
7777
android:layout_height="wrap_content"
78-
android:layout_marginBottom="30dp"
7978
android:layout_marginTop="10dp"
8079
android:text="@string/resume_if_in_progress"
8180
android:textColor="@color/white"
@@ -94,8 +93,8 @@
9493
android:layout_height="wrap_content"
9594
android:text="@string/unauthorized_local_server_found_logged_out"
9695
android:id="@+id/unauthorizedLocalServerFoundTextViewLoggedOut"
97-
android:visibility="invisible"
98-
android:layout_margin="25dp"/>
96+
android:layout_margin="25dp"
97+
android:visibility="invisible"/>
9998

10099
<TextView
101100
android:layout_width="wrap_content"

0 commit comments

Comments
 (0)