Skip to content

Commit 6661140

Browse files
author
Chris Bellew
committed
Consolidated some code. Adjusted layout of main settings screen.
1 parent 32e0181 commit 6661140

13 files changed

+241
-284
lines changed

‎res/layout/client_list_item.xml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:orientation="vertical"
4+
android:layout_width="match_parent"
5+
android:layout_height="match_parent"
6+
android:padding="10dp"
7+
>
8+
<TextView
9+
android:id="@+id/clientListClientName"
10+
android:layout_width="fill_parent"
11+
android:layout_height="wrap_content"
12+
android:layout_alignParentRight="true"
13+
android:layout_alignParentTop="true"
14+
android:text=""
15+
android:textSize="18sp" />
16+
<TextView
17+
android:id="@+id/clientListClientType"
18+
android:layout_width="fill_parent"
19+
android:layout_height="wrap_content"
20+
android:layout_alignParentRight="true"
21+
android:layout_alignParentTop="true"
22+
android:text=""
23+
android:textSize="12sp"
24+
/>
25+
</LinearLayout>

‎res/layout/main.xml‎

Lines changed: 30 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,39 @@
55
android:background="@color/black"
66
android:textColor="@color/white"
77
android:orientation="vertical" >
8-
9-
<ListView
10-
android:id="@+id/listView1"
11-
android:layout_height="wrap_content"
12-
android:layout_width="match_parent">
13-
</ListView>
148

15-
<CheckBox
16-
android:id="@+id/resumeCheckbox"
17-
android:layout_width="wrap_content"
9+
<ListView
10+
android:id="@+id/listView1"
11+
android:layout_height="wrap_content"
12+
android:layout_width="match_parent">
13+
</ListView>
14+
15+
<LinearLayout
16+
android:layout_width="match_parent"
1817
android:layout_height="wrap_content"
19-
android:onClick="resumeChecked"
20-
android:layout_marginBottom="30dp"
21-
android:layout_marginTop="10dp"
18+
android:orientation="vertical"
2219
android:layout_below="@+id/listView1"
23-
android:text="@string/resume_if_in_progress"
24-
android:textColor="@color/white" />
20+
android:gravity="center">
2521

26-
<Button
27-
android:id="@+id/helpUsageButton"
28-
android:layout_width="wrap_content"
29-
android:layout_height="wrap_content"
30-
android:onClick="showUsageExamples"
31-
android:layout_centerInParent="true"
32-
android:text="@string/help_usage_button" />
22+
<CheckBox
23+
android:id="@+id/resumeCheckbox"
24+
android:layout_width="wrap_content"
25+
android:layout_height="wrap_content"
26+
android:onClick="resumeChecked"
27+
android:layout_marginBottom="30dp"
28+
android:layout_marginTop="10dp"
29+
android:layout_below="@+id/listView1"
30+
android:text="@string/resume_if_in_progress"
31+
android:textColor="@color/white" />
32+
33+
<Button
34+
android:id="@+id/helpUsageButton"
35+
android:layout_width="wrap_content"
36+
android:layout_height="wrap_content"
37+
android:layout_below="@+id/resumeCheckbox"
38+
android:onClick="showUsageExamples"
39+
android:layout_centerInParent="true"
40+
android:text="@string/help_usage_button" />
41+
</LinearLayout>
3342

34-
3543
</RelativeLayout>

‎res/layout/main_setting_item_row.xml‎

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,17 @@
22
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
android:layout_width="match_parent"
44
android:layout_height="match_parent"
5+
android:layout_marginLeft="10dp"
6+
android:padding="10dp"
57
android:descendantFocusability="blocksDescendants"
68
android:orientation="vertical" >
79

8-
<!--
9-
<TextView
10-
android:id="@+id/mainSettingItem1"
11-
android:layout_width="50%"
12-
android:layout_height="25dp"
13-
android:text="item1"
14-
android:textColor="@color/white"
15-
android:textSize="20sp" />
16-
17-
<TextView
18-
android:id="@+id/mainSettingItem2"
19-
android:layout_width="50%"
20-
android:layout_height="25dp"
21-
android:layout_toRightOf="@+id/mainSettingItem1"
22-
android:textColor="@color/white"
23-
android:text="item2"
24-
android:textSize="20sp" />
25-
-->
26-
2710
<TextView
2811
android:id="@+id/mainSettingItem1"
2912
android:layout_width="wrap_content"
3013
android:layout_height="wrap_content"
3114
android:layout_alignParentLeft="true"
3215
android:layout_alignParentTop="true"
33-
android:layout_marginBottom="5dp"
3416
android:layout_toLeftOf="@+id/settingRowHelpButton"
3517
android:text=""
3618
android:textSize="20sp" />
@@ -42,7 +24,7 @@
4224
android:layout_alignParentLeft="true"
4325
android:layout_alignRight="@+id/mainSettingItem1"
4426
android:layout_below="@+id/mainSettingItem1"
45-
android:textSize="20sp" />
27+
android:textSize="15sp" />
4628

4729
<ImageButton
4830
android:id="@+id/settingRowHelpButton"

‎src/com/atomjack/vcfpht/ClientListAdapter.java‎

Lines changed: 0 additions & 63 deletions
This file was deleted.

‎src/com/atomjack/vcfpht/MainActivity.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,8 @@ private void showPlexServers() {
324324
final ListView serverListView = (ListView)serverSelectDialog.findViewById(R.id.serverListView);
325325
ConcurrentHashMap<String, PlexServer> servers = new ConcurrentHashMap<String, PlexServer>(VoiceControlForPlexApplication.getPlexMediaServers());
326326
servers.put("Scan All", new PlexServer());
327-
final ServerListAdapter adapter = new ServerListAdapter(this, servers);
327+
final PlexListAdapter adapter = new PlexListAdapter(this, PlexListAdapter.TYPE_SERVER);
328+
adapter.setServers(servers);
328329
serverListView.setAdapter(adapter);
329330
serverListView.setOnItemClickListener(new ListView.OnItemClickListener() {
330331

@@ -342,7 +343,7 @@ public void onItemClick(AdapterView<?> parentAdapter, View view, int position,
342343

343344
private void setServer(PlexServer server) {
344345
Log.v(TAG, "Setting Server " + server.getName());
345-
if(server.getIPAddress().equals("")) {
346+
if(server.getAddress().equals("")) {
346347
this.server = null;
347348
saveSettings();
348349
initMainWithServer();
@@ -475,7 +476,8 @@ private void showPlexClients(List<PlexClient> clients) {
475476
serverSelectDialog.show();
476477

477478
final ListView serverListView = (ListView)serverSelectDialog.findViewById(R.id.serverListView);
478-
final ClientListAdapter adapter = new ClientListAdapter(this, clients);
479+
final PlexListAdapter adapter = new PlexListAdapter(this, PlexListAdapter.TYPE_CLIENT);
480+
adapter.setClients(clients);
479481
serverListView.setAdapter(adapter);
480482
serverListView.setOnItemClickListener(new ListView.OnItemClickListener() {
481483

‎src/com/atomjack/vcfpht/PlayMediaActivity.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ private void startup() {
113113
if(searchDialog == null) {
114114
searchDialog = new Dialog(this);
115115
}
116-
searchDialog.setCancelable(false);
116+
searchDialog.setCancelable(true);
117117
searchDialog.setContentView(R.layout.search_popup);
118118
searchDialog.setTitle("Searching");
119119

@@ -179,10 +179,10 @@ private void setClient() {
179179
serversScanned = 0;
180180
clients = new ArrayList<PlexClient>();
181181
for(PlexServer server : plexmediaServers.values()) {
182-
Log.v(TAG, "ip: " + server.getIPAddress());
182+
Log.v(TAG, "ip: " + server.getAddress());
183183
Log.v(TAG, "port: " + server.getPort());
184184
try {
185-
String url = "http://" + server.getIPAddress() + ":" + server.getPort() + "/clients";
185+
String url = "http://" + server.getAddress() + ":" + server.getPort() + "/clients";
186186
AsyncHttpClient httpClient = new AsyncHttpClient();
187187
httpClient.get(url, new AsyncHttpResponseHandler() {
188188
@Override
@@ -424,7 +424,7 @@ private void searchForSong(final String artist, final String track) {
424424
for(int i=0;i<server.getMusicSections().size();i++) {
425425
String section = server.getMusicSections().get(i);
426426
try {
427-
String url = "http://" + server.getIPAddress() + ":" + server.getPort() + "/library/sections/" + section + "/search?type=10&query=" + track;
427+
String url = "http://" + server.getAddress() + ":" + server.getPort() + "/library/sections/" + section + "/search?type=10&query=" + track;
428428
Log.v(TAG, "URL: " + url);
429429
AsyncHttpClient httpClient = new AsyncHttpClient();
430430
httpClient.get(url, new AsyncHttpResponseHandler() {
@@ -489,7 +489,7 @@ private void doShowSearch(String episodeSpecified, final String showSpecified) {
489489
for(int i=0;i<server.getTvSections().size();i++) {
490490
String section = server.getTvSections().get(i);
491491
try {
492-
String url = "http://" + server.getIPAddress() + ":" + server.getPort() + "/library/sections/" + section + "/search?type=4&query=" + episodeSpecified;
492+
String url = "http://" + server.getAddress() + ":" + server.getPort() + "/library/sections/" + section + "/search?type=4&query=" + episodeSpecified;
493493
AsyncHttpClient httpClient = new AsyncHttpClient();
494494
httpClient.get(url, new AsyncHttpResponseHandler() {
495495
@Override
@@ -563,7 +563,7 @@ private void doShowSearch(final String queryTerm, final String season, final Str
563563
for(int i=0;i<server.getTvSections().size();i++) {
564564
String section = server.getTvSections().get(i);
565565
try {
566-
String url = "http://" + server.getIPAddress() + ":" + server.getPort() + "/library/sections/" + section + "/search?type=2&query=" + queryTerm;
566+
String url = "http://" + server.getAddress() + ":" + server.getPort() + "/library/sections/" + section + "/search?type=2&query=" + queryTerm;
567567
AsyncHttpClient httpClient = new AsyncHttpClient();
568568
httpClient.get(url, new AsyncHttpResponseHandler() {
569569
@Override
@@ -612,7 +612,7 @@ private void doEpisodeSearch(String queryTerm, final String season, final String
612612
final PlexDirectory show = shows.get(0);
613613
Log.v(TAG, "Show key: " + show.getKey());
614614
try {
615-
String url = "http://" + server.getIPAddress() + ":" + server.getPort() + "" + show.getKey();
615+
String url = "http://" + server.getAddress() + ":" + server.getPort() + "" + show.getKey();
616616
AsyncHttpClient httpClient = new AsyncHttpClient();
617617
httpClient.get(url, new AsyncHttpResponseHandler() {
618618
@Override
@@ -644,7 +644,7 @@ public void onSuccess(String response) {
644644
return;
645645
} else if(foundSeason != null) {
646646
try {
647-
String url = "http://" + server.getIPAddress() + ":" + server.getPort() + "" + foundSeason.getKey();
647+
String url = "http://" + server.getAddress() + ":" + server.getPort() + "" + foundSeason.getKey();
648648
AsyncHttpClient httpClient = new AsyncHttpClient();
649649
httpClient.get(url, new AsyncHttpResponseHandler() {
650650
@Override
@@ -715,7 +715,7 @@ private void doLatestEpisodeSearch(final String queryTerm) {
715715
for(int i=0;i<server.getTvSections().size();i++) {
716716
String section = server.getTvSections().get(i);
717717
try {
718-
String url = "http://" + server.getIPAddress() + ":" + server.getPort() + "/library/sections/" + section + "/search?type=2&query=" + queryTerm;
718+
String url = "http://" + server.getAddress() + ":" + server.getPort() + "/library/sections/" + section + "/search?type=2&query=" + queryTerm;
719719
AsyncHttpClient httpClient = new AsyncHttpClient();
720720
httpClient.get(url, new AsyncHttpResponseHandler() {
721721
@Override
@@ -755,7 +755,7 @@ private void doLatestEpisode() {
755755
// For now, just grab the latest show by season/episode
756756
try {
757757
final PlexDirectory show = shows.get(0);
758-
String url = "http://" + show.server.getIPAddress() + ":" + show.server.getPort() + "/library/metadata/" + show.ratingKey + "/allLeaves";
758+
String url = "http://" + show.server.getAddress() + ":" + show.server.getPort() + "/library/metadata/" + show.ratingKey + "/allLeaves";
759759
AsyncHttpClient httpClient = new AsyncHttpClient();
760760
httpClient.get(url, new AsyncHttpResponseHandler() {
761761
@Override
@@ -803,7 +803,7 @@ private void doNextEpisodeSearch(final String queryTerm) {
803803
for(int i=0;i<server.getTvSections().size();i++) {
804804
String section = server.getTvSections().get(i);
805805
try {
806-
String url = "http://" + server.getIPAddress() + ":" + server.getPort() + "/library/sections/" + section + "/onDeck";
806+
String url = "http://" + server.getAddress() + ":" + server.getPort() + "/library/sections/" + section + "/onDeck";
807807
AsyncHttpClient httpClient = new AsyncHttpClient();
808808
httpClient.get(url, new AsyncHttpResponseHandler() {
809809
@Override
@@ -870,7 +870,7 @@ private void doMovieSearch(String mediaType, final String queryTerm) {
870870
for(int i=0;i<server.getMovieSections().size();i++) {
871871
String section = server.getMovieSections().get(i);
872872
try {
873-
String url = "http://" + server.getIPAddress() + ":" + server.getPort() + "/library/sections/" + section + "/search?type=1&query=" + queryTerm;
873+
String url = "http://" + server.getAddress() + ":" + server.getPort() + "/library/sections/" + section + "/search?type=1&query=" + queryTerm;
874874
AsyncHttpClient httpClient = new AsyncHttpClient();
875875
httpClient.get(url, new AsyncHttpResponseHandler() {
876876
@Override
@@ -992,7 +992,7 @@ public void onSuccess(String response) {
992992
if(!track.getThumb().equals("")) {
993993
// final RelativeLayout layout = (RelativeLayout)findViewById(R.id.background);
994994
try {
995-
final String url = "http://" + track.getServer().getIPAddress() + ":" + track.getServer().getPort() + track.getThumb();
995+
final String url = "http://" + track.getServer().getAddress() + ":" + track.getServer().getPort() + track.getThumb();
996996
Log.v(TAG, "url: " + url);
997997
AsyncHttpClient httpClient = new AsyncHttpClient();
998998
httpClient.get(url, new BinaryHttpResponseHandler() {
@@ -1093,7 +1093,7 @@ public void onSuccess(String response) {
10931093
if(!video.getThumb().equals("")) {
10941094
final ScrollView layout = (ScrollView)findViewById(R.id.background);
10951095
try {
1096-
final String url = "http://" + video.getServer().getIPAddress() + ":" + video.getServer().getPort() + video.getThumb();
1096+
final String url = "http://" + video.getServer().getAddress() + ":" + video.getServer().getPort() + video.getThumb();
10971097
Log.v(TAG, "url: " + url);
10981098
AsyncHttpClient httpClient = new AsyncHttpClient();
10991099
httpClient.get(url, new BinaryHttpResponseHandler() {

0 commit comments

Comments
 (0)