From d57e8e6e6d5ca5bf1fdc6955f3090b77066a315d Mon Sep 17 00:00:00 2001 From: badaix Date: Sun, 11 Dec 2016 21:27:55 +0100 Subject: [PATCH] rename ClientList to GroupList --- ...tListFragment.java => GroupListFragment.java} | 16 ++++++++-------- .../java/de/badaix/snapcast/MainActivity.java | 12 ++++++------ .../src/main/res/layout/activity_main.xml | 6 +++--- ...t_client_list.xml => fragment_group_list.xml} | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) rename android/Snapcast/src/main/java/de/badaix/snapcast/{ClientListFragment.java => GroupListFragment.java} (92%) rename android/Snapcast/src/main/res/layout/{fragment_client_list.xml => fragment_group_list.xml} (96%) diff --git a/android/Snapcast/src/main/java/de/badaix/snapcast/ClientListFragment.java b/android/Snapcast/src/main/java/de/badaix/snapcast/GroupListFragment.java similarity index 92% rename from android/Snapcast/src/main/java/de/badaix/snapcast/ClientListFragment.java rename to android/Snapcast/src/main/java/de/badaix/snapcast/GroupListFragment.java index 3f2eb011..2dcc90dc 100644 --- a/android/Snapcast/src/main/java/de/badaix/snapcast/ClientListFragment.java +++ b/android/Snapcast/src/main/java/de/badaix/snapcast/GroupListFragment.java @@ -38,9 +38,9 @@ import de.badaix.snapcast.control.json.ServerStatus; * {@link GroupItem.GroupItemListener} interface * to handle interaction events. */ -public class ClientListFragment extends Fragment { +public class GroupListFragment extends Fragment { - private static final String TAG = "ClientList"; + private static final String TAG = "GroupList"; // TODO: Rename parameter arguments, choose names that match // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER @@ -52,7 +52,7 @@ public class ClientListFragment extends Fragment { private ServerStatus serverStatus = null; private boolean hideOffline = false; - public ClientListFragment() { + public GroupListFragment() { // Required empty public constructor } @@ -62,10 +62,10 @@ public class ClientListFragment extends Fragment { *

* //@param param1 Parameter 1. * - * @return A new instance of fragment ClientListFragment. + * @return A new instance of fragment GroupListFragment. * // TODO: Rename and change types and number of parameters - * public static ClientListFragment newInstance(String param1) { - * ClientListFragment fragment = new ClientListFragment(); + * public static GroupListFragment newInstance(String param1) { + * GroupListFragment fragment = new GroupListFragment(); * Bundle args = new Bundle(); * args.putString(ARG_PARAM1, param1); * fragment.setArguments(args); @@ -86,7 +86,7 @@ public class ClientListFragment extends Fragment { Bundle savedInstanceState) { // Inflate the layout for this fragment Log.d(TAG, "onCreateView: " + this.toString()); - View view = inflater.inflate(R.layout.fragment_client_list, container, false); + View view = inflater.inflate(R.layout.fragment_group_list, container, false); ListView lvGroup = (ListView) view.findViewById(R.id.lvGroup); groupAdapter = new GroupAdapter(getContext(), groupItemListener); groupAdapter.setHideOffline(hideOffline); @@ -174,7 +174,7 @@ public class ClientListFragment extends Fragment { for (Group group : GroupAdapter.this.serverStatus.getGroups()) { add(group); /* for (Client client : group.getClients()) { - if ((client != null) && (!hideOffline || client.isConnected()) && !client.isDeleted())// && client.getConfig().getStream().equals(ClientListFragment.this.stream.getId())) + if ((client != null) && (!hideOffline || client.isConnected()) && !client.isDeleted())// && client.getConfig().getStream().equals(GroupListFragment.this.stream.getId())) add(client); } */ diff --git a/android/Snapcast/src/main/java/de/badaix/snapcast/MainActivity.java b/android/Snapcast/src/main/java/de/badaix/snapcast/MainActivity.java index 020a74e5..3797e1bf 100644 --- a/android/Snapcast/src/main/java/de/badaix/snapcast/MainActivity.java +++ b/android/Snapcast/src/main/java/de/badaix/snapcast/MainActivity.java @@ -75,7 +75,7 @@ public class MainActivity extends AppCompatActivity implements GroupItem.GroupIt private RemoteControl remoteControl = null; private ServerStatus serverStatus = null; private SnapclientService snapclientService; - private ClientListFragment clientListFragment; + private GroupListFragment groupListFragment; private TabLayout tabLayout; private Snackbar warningSamplerateSnackbar = null; private int nativeSampleRate = 0; @@ -130,7 +130,7 @@ public class MainActivity extends AppCompatActivity implements GroupItem.GroupIt // Create the adapter that will return a fragment for each of the three // primary sections of the activity. - clientListFragment = (ClientListFragment) getSupportFragmentManager().findFragmentById(R.id.clientListFragment); + groupListFragment = (GroupListFragment) getSupportFragmentManager().findFragmentById(R.id.groupListFragment); setActionbarSubtitle("Host: no Snapserver found"); @@ -409,7 +409,7 @@ public class MainActivity extends AppCompatActivity implements GroupItem.GroupIt if (client.getConfig().getLatency() != clientOriginal.getConfig().getLatency()) remoteControl.setLatency(client, client.getConfig().getLatency()); serverStatus.updateClient(client); - clientListFragment.updateServer(MainActivity.this.serverStatus); + groupListFragment.updateServer(MainActivity.this.serverStatus); } else if (requestCode == GROUP_PROPERTIES_REQUEST) { ArrayList clients = data.getStringArrayListExtra("clients"); Log.d(TAG, "clients: " + clients); @@ -424,7 +424,7 @@ public class MainActivity extends AppCompatActivity implements GroupItem.GroupIt MainActivity.this.runOnUiThread(new Runnable() { @Override public void run() { - clientListFragment.updateServer(MainActivity.this.serverStatus); + groupListFragment.updateServer(MainActivity.this.serverStatus); } }); */ @@ -447,7 +447,7 @@ public class MainActivity extends AppCompatActivity implements GroupItem.GroupIt public void onDisconnected(RemoteControl remoteControl, Exception e) { Log.d(TAG, "onDisconnected"); serverStatus = new ServerStatus(); - clientListFragment.updateServer(serverStatus); + groupListFragment.updateServer(serverStatus); if (e != null) { if (e instanceof UnknownHostException) setActionbarSubtitle("error: unknown host"); @@ -475,7 +475,7 @@ public class MainActivity extends AppCompatActivity implements GroupItem.GroupIt @Override public void onServerStatus(RemoteControl remoteControl, ServerStatus serverStatus) { this.serverStatus = serverStatus; - clientListFragment.updateServer(serverStatus); + groupListFragment.updateServer(serverStatus); } @Override diff --git a/android/Snapcast/src/main/res/layout/activity_main.xml b/android/Snapcast/src/main/res/layout/activity_main.xml index 26f9be79..d4d9770f 100644 --- a/android/Snapcast/src/main/res/layout/activity_main.xml +++ b/android/Snapcast/src/main/res/layout/activity_main.xml @@ -47,12 +47,12 @@ + tools:layout="@layout/fragment_group_list"/> diff --git a/android/Snapcast/src/main/res/layout/fragment_client_list.xml b/android/Snapcast/src/main/res/layout/fragment_group_list.xml similarity index 96% rename from android/Snapcast/src/main/res/layout/fragment_client_list.xml rename to android/Snapcast/src/main/res/layout/fragment_group_list.xml index 26c57e1f..fd23c41b 100644 --- a/android/Snapcast/src/main/res/layout/fragment_client_list.xml +++ b/android/Snapcast/src/main/res/layout/fragment_group_list.xml @@ -21,7 +21,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context="de.badaix.snapcast.ClientListFragment"> + tools:context="de.badaix.snapcast.GroupListFragment">