From e72e0f61dd78e51affdbdaf610b917d406caff9c Mon Sep 17 00:00:00 2001 From: Nicolas Fella Date: Sat, 3 Mar 2018 17:21:16 +0100 Subject: [PATCH] Rename MaterialActivity to MainActivity Summary: Its more descriptive Reviewers: #kde_connect, mtijink Reviewed By: #kde_connect, mtijink Subscribers: mtijink, #kde_connect Tags: #kde_connect Differential Revision: https://phabricator.kde.org/D10951 --- AndroidManifest.xml | 26 ++++++++-------- res/layout/activity_list.xml | 2 +- res/layout/activity_main.xml | 2 +- src/org/kde/kdeconnect/Device.java | 12 ++++---- .../NotificationsPlugin.java | 4 +-- .../Plugins/PingPlugin/PingPlugin.java | 6 ++-- .../ReceiveNotificationsPlugin.java | 6 ++-- .../RemoteKeyboardService.java | 4 +-- .../UserInterface/DeviceFragment.java | 10 +++---- ...aterialActivity.java => MainActivity.java} | 30 +++++++++---------- .../UserInterface/PairingFragment.java | 4 +-- 11 files changed, 53 insertions(+), 53 deletions(-) rename src/org/kde/kdeconnect/UserInterface/{MaterialActivity.java => MainActivity.java} (91%) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 78b722ac..b8780b89 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -63,7 +63,7 @@ @@ -75,26 +75,26 @@ + android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity"> + android:value="org.kde.kdeconnect.UserInterface.MainActivity" /> + android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity"> + android:value="org.kde.kdeconnect.UserInterface.MainActivity" /> + android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity"> + android:value="org.kde.kdeconnect.UserInterface.MainActivity" /> + android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity"> + android:value="org.kde.kdeconnect.UserInterface.MainActivity" /> @@ -160,20 +160,20 @@ + android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity"> + android:value="org.kde.kdeconnect.UserInterface.MainActivity" /> + android:value="org.kde.kdeconnect.UserInterface.MainActivity" /> + tools:context="org.kde.kdeconnect.UserInterface.MainActivity"> diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml index 8166cc43..493a9938 100644 --- a/res/layout/activity_main.xml +++ b/res/layout/activity_main.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:fitsSystemWindows="true" - tools:context="org.kde.kdeconnect.UserInterface.MaterialActivity"> + tools:context="org.kde.kdeconnect.UserInterface.MainActivity"> show main activity view - Intent intent = new Intent(this, MaterialActivity.class); + Intent intent = new Intent(this, MainActivity.class); intent.putExtra("forceOverview", true); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); startActivity(intent); diff --git a/src/org/kde/kdeconnect/UserInterface/DeviceFragment.java b/src/org/kde/kdeconnect/UserInterface/DeviceFragment.java index 568ab61d..2146a5c2 100644 --- a/src/org/kde/kdeconnect/UserInterface/DeviceFragment.java +++ b/src/org/kde/kdeconnect/UserInterface/DeviceFragment.java @@ -68,7 +68,7 @@ public class DeviceFragment extends Fragment { static String mDeviceId; //Static because if we get here by using the back button in the action bar, the extra deviceId will not be set. Device device; - MaterialActivity mActivity; + MainActivity mActivity; ArrayList pluginListItems; @@ -82,7 +82,7 @@ public class DeviceFragment extends Fragment { this.setArguments(args); } - public DeviceFragment(String deviceId, MaterialActivity activity) { + public DeviceFragment(String deviceId, MainActivity activity) { this.mActivity = activity; Bundle args = new Bundle(); args.putString(ARG_DEVICE_ID, deviceId); @@ -92,7 +92,7 @@ public class DeviceFragment extends Fragment { @Override public void onAttach(Activity activity) { super.onAttach(activity); - mActivity = ((MaterialActivity) getActivity()); + mActivity = ((MainActivity) getActivity()); } @Override @@ -436,7 +436,7 @@ public class DeviceFragment extends Fragment { }; - public static void acceptPairing(final String devId, final MaterialActivity activity) { + public static void acceptPairing(final String devId, final MainActivity activity) { final DeviceFragment frag = new DeviceFragment(devId, activity); BackgroundService.RunCommand(activity, new BackgroundService.InstanceCallback() { public void onServiceStart(BackgroundService service) { @@ -459,7 +459,7 @@ public class DeviceFragment extends Fragment { }); } - public static void rejectPairing(final String devId, final MaterialActivity activity) { + public static void rejectPairing(final String devId, final MainActivity activity) { final DeviceFragment frag = new DeviceFragment(devId, activity); BackgroundService.RunCommand(activity, new BackgroundService.InstanceCallback() { public void onServiceStart(BackgroundService service) { diff --git a/src/org/kde/kdeconnect/UserInterface/MaterialActivity.java b/src/org/kde/kdeconnect/UserInterface/MainActivity.java similarity index 91% rename from src/org/kde/kdeconnect/UserInterface/MaterialActivity.java rename to src/org/kde/kdeconnect/UserInterface/MainActivity.java index 1bcfa69f..16031cc9 100644 --- a/src/org/kde/kdeconnect/UserInterface/MaterialActivity.java +++ b/src/org/kde/kdeconnect/UserInterface/MainActivity.java @@ -33,7 +33,7 @@ import org.kde.kdeconnect_tp.R; import java.util.Collection; import java.util.HashMap; -public class MaterialActivity extends AppCompatActivity { +public class MainActivity extends AppCompatActivity { private static final String STATE_SELECTED_DEVICE = "selected_device"; @@ -109,24 +109,24 @@ public class MaterialActivity extends AppCompatActivity { String savedDevice; String pairStatus = ""; if (getIntent().hasExtra("forceOverview")) { - Log.i("MaterialActivity", "Requested to start main overview"); + Log.i("MainActivity", "Requested to start main overview"); savedDevice = null; } else if (getIntent().hasExtra("deviceId")) { - Log.i("MaterialActivity", "Loading selected device from parameter"); + Log.i("MainActivity", "Loading selected device from parameter"); savedDevice = getIntent().getStringExtra("deviceId"); if (getIntent().hasExtra(PAIR_REQUEST_STATUS)) { pairStatus = getIntent().getStringExtra(PAIR_REQUEST_STATUS); } } else if (savedInstanceState != null) { - Log.i("MaterialActivity", "Loading selected device from saved activity state"); + Log.i("MainActivity", "Loading selected device from saved activity state"); savedDevice = savedInstanceState.getString(STATE_SELECTED_DEVICE); } else { - Log.i("MaterialActivity", "Loading selected device from persistent storage"); + Log.i("MainActivity", "Loading selected device from persistent storage"); savedDevice = preferences.getString(STATE_SELECTED_DEVICE, null); } //if pairStatus is not empty, then the decision has been made... if (!pairStatus.equals("")) { - Log.i("MaterialActivity", "pair status is " + pairStatus); + Log.i("MainActivity", "pair status is " + pairStatus); onNewDeviceSelected(savedDevice, pairStatus); } onDeviceSelected(savedDevice); @@ -172,9 +172,9 @@ public class MaterialActivity extends AppCompatActivity { private void updateComputerList() { - //Log.e("MaterialActivity", "UpdateComputerList"); + //Log.e("MainActivity", "UpdateComputerList"); - BackgroundService.RunCommand(MaterialActivity.this, new BackgroundService.InstanceCallback() { + BackgroundService.RunCommand(MainActivity.this, new BackgroundService.InstanceCallback() { @Override public void onServiceStart(final BackgroundService service) { @@ -211,7 +211,7 @@ public class MaterialActivity extends AppCompatActivity { BackgroundService.RunCommand(this, new BackgroundService.InstanceCallback() { @Override public void onServiceStart(BackgroundService service) { - service.addDeviceListChangedCallback("MaterialActivity", new BackgroundService.DeviceListChangedCallback() { + service.addDeviceListChangedCallback("MainActivity", new BackgroundService.DeviceListChangedCallback() { @Override public void onDeviceListChanged() { updateComputerList(); @@ -228,7 +228,7 @@ public class MaterialActivity extends AppCompatActivity { BackgroundService.RunCommand(this, new BackgroundService.InstanceCallback() { @Override public void onServiceStart(BackgroundService service) { - service.removeDeviceListChangedCallback("MaterialActivity"); + service.removeDeviceListChangedCallback("MainActivity"); } }); super.onStop(); @@ -313,8 +313,8 @@ public class MaterialActivity extends AppCompatActivity { public void renameDevice() { final TextView nameView = (TextView) mNavigationView.findViewById(R.id.device_name); - final EditText deviceNameEdit = new EditText(MaterialActivity.this); - String deviceName = DeviceHelper.getDeviceName(MaterialActivity.this); + final EditText deviceNameEdit = new EditText(MainActivity.this); + String deviceName = DeviceHelper.getDeviceName(MainActivity.this); deviceNameEdit.setText(deviceName); deviceNameEdit.setPadding( ((int) (18 * getResources().getDisplayMetrics().density)), @@ -322,15 +322,15 @@ public class MaterialActivity extends AppCompatActivity { ((int) (18 * getResources().getDisplayMetrics().density)), ((int) (12 * getResources().getDisplayMetrics().density)) ); - new AlertDialog.Builder(MaterialActivity.this) + new AlertDialog.Builder(MainActivity.this) .setView(deviceNameEdit) .setPositiveButton(R.string.device_rename_confirm, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { String deviceName = deviceNameEdit.getText().toString(); - DeviceHelper.setDeviceName(MaterialActivity.this, deviceName); + DeviceHelper.setDeviceName(MainActivity.this, deviceName); nameView.setText(deviceName); - BackgroundService.RunCommand(MaterialActivity.this, new BackgroundService.InstanceCallback() { + BackgroundService.RunCommand(MainActivity.this, new BackgroundService.InstanceCallback() { @Override public void onServiceStart(final BackgroundService service) { service.onNetworkChange(); diff --git a/src/org/kde/kdeconnect/UserInterface/PairingFragment.java b/src/org/kde/kdeconnect/UserInterface/PairingFragment.java index 3f0418ee..d347d90d 100644 --- a/src/org/kde/kdeconnect/UserInterface/PairingFragment.java +++ b/src/org/kde/kdeconnect/UserInterface/PairingFragment.java @@ -58,7 +58,7 @@ public class PairingFragment extends Fragment implements PairingDeviceItem.Callb private View rootView; private SwipeRefreshLayout mSwipeRefreshLayout; - private MaterialActivity mActivity; + private MainActivity mActivity; boolean listRefreshCalledThisFrame = false; @@ -97,7 +97,7 @@ public class PairingFragment extends Fragment implements PairingDeviceItem.Callb @Override public void onAttach(Context context) { super.onAttach(context); - mActivity = ((MaterialActivity) getActivity()); + mActivity = ((MainActivity) getActivity()); } private void updateComputerListAction() {