diff --git a/app/build.gradle b/app/build.gradle
index 6e232ed67..dc6725f37 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -67,6 +67,7 @@ dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:23.4.0'
compile 'com.android.support:cardview-v7:23.4.0'
+ compile 'com.android.support:recyclerview-v7:23.4.0'
compile 'com.android.support:support-v4:23.4.0'
compile 'com.android.support:design:23.4.0'
compile 'com.github.tony19:logback-android-classic:1.1.1-4'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c14f0e687..7bbaeae1c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -302,6 +302,7 @@
android:label="@string/title_activity_controlcenter"
android:theme="@style/GadgetbridgeTheme.NoActionBar">
+
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenterv2.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenterv2.java
index 0c2ff80c8..b99b0e190 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenterv2.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenterv2.java
@@ -2,12 +2,12 @@ package nodomain.freeyourgadget.gadgetbridge.activities;
import android.Manifest;
import android.annotation.TargetApi;
-import android.app.Activity;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.pm.PackageManager;
+import android.graphics.Canvas;
import android.os.Build;
import android.os.Bundle;
import android.support.design.widget.FloatingActionButton;
@@ -19,13 +19,16 @@ import android.support.v4.view.GravityCompat;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBarDrawerToggle;
import android.support.v7.app.AppCompatActivity;
+import android.support.v7.app.AppCompatDelegate;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
+import android.support.v7.widget.helper.ItemTouchHelper;
import android.view.MenuItem;
import android.view.View;
-import android.widget.AdapterView;
import android.widget.ImageView;
-import android.widget.ListView;
import android.widget.TextView;
+import android.widget.Toast;
import java.util.ArrayList;
import java.util.List;
@@ -45,11 +48,18 @@ import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
public class ControlCenterv2 extends AppCompatActivity
implements NavigationView.OnNavigationItemSelectedListener {
+ //needed for KK compatibility
+ static {
+ AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
+ }
+
private DeviceManager deviceManager;
private ImageView background;
private TextView hintTextView;
+ private List deviceList;
private GBDeviceAdapterv2 mGBDeviceAdapter;
+ private RecyclerView deviceListView;
private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
@Override
@@ -99,30 +109,51 @@ public class ControlCenterv2 extends AppCompatActivity
//end of material design boilerplate
deviceManager = GBApplication.getDeviceManager();
hintTextView = (TextView) findViewById(R.id.hintTextView);
- ListView deviceListView = (ListView) findViewById(R.id.deviceListView);
+
+ deviceListView = (RecyclerView) findViewById(R.id.deviceListView);
+ deviceListView.setHasFixedSize(true);
+ deviceListView.setLayoutManager(new LinearLayoutManager(this));
background = (ImageView) findViewById(R.id.no_items_bg);
- final List deviceList = deviceManager.getDevices();
+ deviceList = deviceManager.getDevices();
mGBDeviceAdapter = new GBDeviceAdapterv2(this, deviceList);
+
deviceListView.setAdapter(this.mGBDeviceAdapter);
- deviceListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+
+ ItemTouchHelper swipeToDismissTouchHelper = new ItemTouchHelper(new ItemTouchHelper.SimpleCallback(
+ ItemTouchHelper.LEFT , ItemTouchHelper.RIGHT) {
@Override
- public void onItemClick(AdapterView parent, View v, int position, long id) {
- GBDevice gbDevice = mGBDeviceAdapter.getItem(position);
- if (gbDevice.isInitialized()) {
- DeviceCoordinator coordinator = DeviceHelper.getInstance().getCoordinator(gbDevice);
- Class primaryActivity = coordinator.getPrimaryActivity();
- if (primaryActivity != null) {
- Intent startIntent = new Intent(ControlCenterv2.this, primaryActivity);
- startIntent.putExtra(GBDevice.EXTRA_DEVICE, gbDevice);
- startActivity(startIntent);
- }
- } else {
- GBApplication.deviceService().connect(gbDevice);
- }
+ public void onChildDraw(Canvas c, RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, float dX, float dY, int actionState, boolean isCurrentlyActive) {
+ if(dX>50)
+ dX = 50;
+ super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive);
+
+ }
+
+ @Override
+ public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) {
+ GB.toast(getBaseContext(), "onMove", Toast.LENGTH_LONG, GB.ERROR);
+
+ return false;
+ }
+
+ @Override
+ public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
+ GB.toast(getBaseContext(), "onSwiped", Toast.LENGTH_LONG, GB.ERROR);
+
+ }
+
+ @Override
+ public void onChildDrawOver(Canvas c, RecyclerView recyclerView,
+ RecyclerView.ViewHolder viewHolder, float dX, float dY,
+ int actionState, boolean isCurrentlyActive) {
}
});
+ //uncomment to enable fixed-swipe to reveal more actions
+ //swipeToDismissTouchHelper.attachToRecyclerView(deviceListView);
+
+
registerForContextMenu(deviceListView);
IntentFilter filterLocal = new IntentFilter();
@@ -257,5 +288,4 @@ public class ControlCenterv2 extends AppCompatActivity
ActivityCompat.requestPermissions(this, wantedPermissions.toArray(new String[wantedPermissions.size()]), 0);
}
-
}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java
index 9f891c6fa..153cb8161 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java
@@ -1,7 +1,12 @@
package nodomain.freeyourgadget.gadgetbridge.adapter;
+import android.app.Activity;
+import android.app.ProgressDialog;
import android.content.Context;
+import android.content.DialogInterface;
import android.content.Intent;
+import android.support.v7.widget.RecyclerView;
+import android.transition.TransitionManager;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -27,213 +32,282 @@ import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper;
/**
* Adapter for displaying GBDevice instances.
*/
-public class GBDeviceAdapterv2 extends ArrayAdapter {
+public class GBDeviceAdapterv2 extends RecyclerView.Adapter {
private final Context context;
- private DeviceCoordinator coordinator;
+ private List deviceList;
+ private int expandedDevicePosition = RecyclerView.NO_POSITION;
+ private ViewGroup parent;
public GBDeviceAdapterv2(Context context, List deviceList) {
- super(context, 0, deviceList);
-
this.context = context;
+ this.deviceList = deviceList;
}
@Override
- public View getView(int position, View view, ViewGroup parent) {
- final GBDevice device = getItem(position);
- coordinator = DeviceHelper.getInstance().getCoordinator(device);
+ public GBDeviceAdapterv2.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+ this.parent = parent;
+ View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.device_itemv2, parent, false);
+ ViewHolder vh = new ViewHolder(view);
+ return vh;
+ }
- if (view == null) {
- LayoutInflater inflater = (LayoutInflater) context
- .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+ @Override
+ public void onBindViewHolder(ViewHolder holder, final int position) {
+ final GBDevice device = deviceList.get(position);
+ DeviceCoordinator coordinator = DeviceHelper.getInstance().getCoordinator(device);
- view = inflater.inflate(R.layout.device_itemv2, parent, false);
- }
- TextView deviceStatusLabel = (TextView) view.findViewById(R.id.device_status);
- TextView deviceNameLabel = (TextView) view.findViewById(R.id.device_name);
+ holder.deviceImageView.setOnClickListener(new View.OnClickListener() {
- TextView batteryStatusLabel = (TextView) view.findViewById(R.id.battery_status);
- final ImageView deviceImageView = (ImageView) view.findViewById(R.id.device_image);
- deviceImageView.setOnLongClickListener(new View.OnLongClickListener(){
+ @Override
+ public void onClick(View v) {
+ if (device.isInitialized()) {
+ DeviceCoordinator coordinator = DeviceHelper.getInstance().getCoordinator(device);
+ Class primaryActivity = coordinator.getPrimaryActivity();
+ if (primaryActivity != null) {
+ Intent startIntent = new Intent(context, primaryActivity);
+ startIntent.putExtra(GBDevice.EXTRA_DEVICE, device);
+ context.startActivity(startIntent);
+ }
+ } else {
+ //TODO: move somewhere else
+ GBApplication.deviceService().connect(device);
+ }
+ }
+ });
+ holder.deviceImageView.setOnLongClickListener(new View.OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
//TODO: move somewhere else
GBApplication.deviceService().disconnect();
-
return true;
}
});
- ProgressBar busyIndicator = (ProgressBar) view.findViewById(R.id.device_busy_indicator);
-
- deviceNameLabel.setText(getUniqueDeviceName(device));
+ holder.deviceNameLabel.setText(getUniqueDeviceName(device));
if (device.isBusy()) {
- deviceStatusLabel.setText(device.getBusyTask());
- busyIndicator.setVisibility(View.VISIBLE);
+ holder.deviceStatusLabel.setText(device.getBusyTask());
+ holder.busyIndicator.setVisibility(View.VISIBLE);
} else {
- deviceStatusLabel.setText(device.getStateString());
- busyIndicator.setVisibility(View.INVISIBLE);
+ holder.deviceStatusLabel.setText(device.getStateString());
+ holder.busyIndicator.setVisibility(View.INVISIBLE);
}
//begin of action row
//battery
- LinearLayout batteryStatusBox = (LinearLayout) view.findViewById(R.id.device_battery_status_box);
- batteryStatusBox.setVisibility(View.GONE);
-
- ImageView batteryIcon = (ImageView) view.findViewById(R.id.device_battery_status);
-
+ holder.batteryStatusBox.setVisibility(View.GONE);
short batteryLevel = device.getBatteryLevel();
if (batteryLevel != GBDevice.BATTERY_UNKNOWN) {
- batteryStatusBox.setVisibility(View.VISIBLE);
- batteryStatusLabel.setText(device.getBatteryLevel() + "%");
+ holder.batteryStatusBox.setVisibility(View.VISIBLE);
+ holder.batteryStatusLabel.setText(device.getBatteryLevel() + "%");
BatteryState batteryState = device.getBatteryState();
if (BatteryState.BATTERY_CHARGING.equals(batteryState) ||
BatteryState.BATTERY_CHARGING_FULL.equals(batteryState)) {
- batteryIcon.setImageLevel(device.getBatteryLevel() + 100);
+ holder.batteryIcon.setImageLevel(device.getBatteryLevel() + 100);
} else {
- batteryIcon.setImageLevel(device.getBatteryLevel());
+ holder.batteryIcon.setImageLevel(device.getBatteryLevel());
}
}
//fetch activity data
- ImageView fetchActivityData = (ImageView) view.findViewById(R.id.device_action_fetch_activity);
- LinearLayout fetchActivityDataBox = (LinearLayout) view.findViewById(R.id.device_action_fetch_activity_box);
+ holder.fetchActivityDataBox.setVisibility((device.isInitialized() && coordinator.supportsActivityDataFetching()) ? View.VISIBLE : View.GONE);
+ holder.fetchActivityData.setOnClickListener(new View.OnClickListener()
- fetchActivityDataBox.setVisibility((device.isInitialized() && coordinator.supportsActivityDataFetching()) ? View.VISIBLE : View.GONE);
- fetchActivityData.setOnClickListener(new View.OnClickListener()
+ {
+ @Override
+ public void onClick(View v) {
+ GBApplication.deviceService().onFetchActivityData();
+ }
+ }
+ );
+
+
+ //take screenshot
+ holder.takeScreenshotView.setVisibility((device.isInitialized() && coordinator.supportsScreenshots()) ? View.VISIBLE : View.GONE);
+ holder.takeScreenshotView.setOnClickListener(new View.OnClickListener()
+
+ {
+ @Override
+ public void onClick(View v) {
+ GBApplication.deviceService().onScreenshotReq();
+ }
+ }
+ );
+
+ //set alarms
+ holder.setAlarmsView.setVisibility(coordinator.supportsAlarmConfiguration() ? View.VISIBLE : View.GONE);
+ holder.setAlarmsView.setOnClickListener(new View.OnClickListener()
+
+ {
+ @Override
+ public void onClick(View v) {
+ Intent startIntent;
+ startIntent = new Intent(context, ConfigureAlarms.class);
+ context.startActivity(startIntent);
+ }
+ }
+ );
+
+ //show graphs
+ holder.showActivityGraphs.setVisibility(coordinator.supportsActivityTracking() ? View.VISIBLE : View.GONE);
+ holder.showActivityGraphs.setOnClickListener(new View.OnClickListener()
+
+ {
+ @Override
+ public void onClick(View v) {
+ Intent startIntent;
+ startIntent = new Intent(context, ChartsActivity.class);
+ startIntent.putExtra(GBDevice.EXTRA_DEVICE, device);
+ context.startActivity(startIntent);
+ }
+ }
+ );
+
+ //Info icon is last in the row
+ ItemWithDetailsAdapter infoAdapter = new ItemWithDetailsAdapter(context, device.getDeviceInfos());
+ infoAdapter.setHorizontalAlignment(true);
+ holder.deviceInfoList.setAdapter(infoAdapter);
+ justifyListViewHeightBasedOnChildren(holder.deviceInfoList);
+ holder.deviceInfoList.setFocusable(false);
+
+ final boolean detailsShown = position == expandedDevicePosition;
+ boolean showInfoIcon = device.hasDeviceInfos() && !device.isBusy();
+ holder.deviceInfoView.setVisibility(showInfoIcon ? View.VISIBLE : View.GONE);
+ holder.deviceInfoBox.setActivated(detailsShown);
+ holder.deviceInfoBox.setVisibility(detailsShown ? View.VISIBLE : View.GONE);
+ holder.deviceInfoView.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ expandedDevicePosition = detailsShown ? -1 : position;
+ TransitionManager.beginDelayedTransition(parent);
+ notifyDataSetChanged();
+ }
+ }
+
+ );
+
+ //find lost device, hidden under details
+ holder.findDevice.setVisibility(device.isInitialized() ? View.VISIBLE : View.GONE);
+ holder.findDevice.setOnClickListener(new View.OnClickListener()
{
@Override
public void onClick(View v) {
- GBApplication.deviceService().onFetchActivityData();
+ GBApplication.deviceService().onFindDevice(true);
+ ProgressDialog.show(
+ context,
+ context.getString(R.string.control_center_find_lost_device),
+ context.getString(R.string.control_center_cancel_to_stop_vibration),
+ true, true,
+ new DialogInterface.OnCancelListener() {
+ @Override
+ public void onCancel(DialogInterface dialog) {
+ GBApplication.deviceService().onFindDevice(false);
+ }
+ });
}
}
);
-
- //take screenshot
- ImageView takeScreenshotView = (ImageView) view.findViewById(R.id.device_action_take_screenshot);
- takeScreenshotView.setVisibility((device.isInitialized() && coordinator.supportsScreenshots()) ? View.VISIBLE : View.GONE);
- takeScreenshotView.setOnClickListener(new View.OnClickListener()
-
- {
- @Override
- public void onClick(View v) {
- GBApplication.deviceService().onScreenshotReq();
- }
- }
-
- );
-
- //set alarms
- ImageView setAlarmsView = (ImageView) view.findViewById(R.id.device_action_set_alarms);
- setAlarmsView.setVisibility(coordinator.supportsAlarmConfiguration() ? View.VISIBLE : View.GONE);
- setAlarmsView.setOnClickListener(new View.OnClickListener()
-
- {
- @Override
- public void onClick(View v) {
- Intent startIntent;
- startIntent = new Intent(context, ConfigureAlarms.class);
- context.startActivity(startIntent);
- }
- }
-
- );
-
- //show graphs
- ImageView showActivityGraphs = (ImageView) view.findViewById(R.id.device_action_show_activity_graphs);
- showActivityGraphs.setVisibility(coordinator.supportsActivityTracking() ? View.VISIBLE : View.GONE);
- showActivityGraphs.setOnClickListener(new View.OnClickListener()
-
- {
- @Override
- public void onClick(View v) {
- Intent startIntent;
- startIntent = new Intent(context, ChartsActivity.class);
- startIntent.putExtra(GBDevice.EXTRA_DEVICE, device);
- context.startActivity(startIntent);
- }
- }
-
- );
-
- //Info icon is last in the row
- ImageView deviceInfoView = (ImageView) view.findViewById(R.id.device_info_image);
- final RelativeLayout deviceInfoBox = (RelativeLayout) view.findViewById(R.id.device_item_infos_box);
- ListView deviceInfoList = (ListView) view.findViewById(R.id.device_item_infos);
- ItemWithDetailsAdapter infoAdapter = new ItemWithDetailsAdapter(context, device.getDeviceInfos());
- infoAdapter.setHorizontalAlignment(true);
- deviceInfoList.setAdapter(infoAdapter);
- justifyListViewHeightBasedOnChildren(deviceInfoList);
- deviceInfoList.setFocusable(false);
-
- boolean showInfoIcon = device.hasDeviceInfos() && !device.isBusy();
- deviceInfoView.setVisibility(showInfoIcon ? View.VISIBLE : View.GONE);
- deviceInfoView.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- if (deviceInfoBox.getVisibility() == View.VISIBLE) {
- deviceInfoBox.setVisibility(View.GONE);
- } else {
- deviceInfoBox.setVisibility(View.VISIBLE);
- }
- }
- }
-
- );
-
//remove device, hidden under details
- ImageView removeDevice = (ImageView) view.findViewById(R.id.device_action_remove);
- removeDevice.setOnClickListener(new View.OnClickListener()
-
- {
- @Override
- public void onClick(View v) {
- //TODO: the logic is bolted to controlcenter, but I don't think it belongs here
- }
- }
-
- );
-
-
- switch (device.getType())
+ holder.removeDevice.setOnClickListener(new View.OnClickListener()
{
+ @Override
+ public void onClick(View v) {
+ //TODO: the logic is bolted to controlcenter, but I don't think it belongs here
+ }
+ });
+
+ switch (device.getType()) {
case PEBBLE:
if (device.isConnected()) {
- deviceImageView.setImageResource(R.drawable.ic_device_pebble);
+ holder.deviceImageView.setImageResource(R.drawable.ic_device_pebble);
} else {
- deviceImageView.setImageResource(R.drawable.ic_device_pebble_disabled);
+ holder.deviceImageView.setImageResource(R.drawable.ic_device_pebble_disabled);
}
break;
case MIBAND:
case MIBAND2:
if (device.isConnected()) {
- deviceImageView.setImageResource(R.drawable.ic_device_miband);
+ holder.deviceImageView.setImageResource(R.drawable.ic_device_miband);
} else {
- deviceImageView.setImageResource(R.drawable.ic_device_miband_disabled);
+ holder.deviceImageView.setImageResource(R.drawable.ic_device_miband_disabled);
}
break;
case VIBRATISSIMO:
if (device.isConnected()) {
- deviceImageView.setImageResource(R.drawable.ic_device_lovetoy);
+ holder.deviceImageView.setImageResource(R.drawable.ic_device_lovetoy);
} else {
- deviceImageView.setImageResource(R.drawable.ic_device_lovetoy_disabled);
+ holder.deviceImageView.setImageResource(R.drawable.ic_device_lovetoy_disabled);
}
break;
default:
if (device.isConnected()) {
- deviceImageView.setImageResource(R.drawable.ic_launcher);
+ holder.deviceImageView.setImageResource(R.drawable.ic_launcher);
} else {
- deviceImageView.setImageResource(R.drawable.ic_device_default_disabled);
+ holder.deviceImageView.setImageResource(R.drawable.ic_device_default_disabled);
}
}
+ }
+
+ @Override
+ public int getItemCount() {
+ return deviceList.size();
+ }
+
+ static class ViewHolder extends RecyclerView.ViewHolder {
+
+ ImageView deviceImageView;
+ TextView deviceNameLabel;
+ TextView deviceStatusLabel;
+
+ //actions
+ LinearLayout batteryStatusBox;
+ TextView batteryStatusLabel;
+ ImageView batteryIcon;
+ LinearLayout fetchActivityDataBox;
+ ImageView fetchActivityData;
+ ProgressBar busyIndicator;
+ ImageView takeScreenshotView;
+ ImageView setAlarmsView;
+ ImageView showActivityGraphs;
+
+ ImageView deviceInfoView;
+ //overflow
+ final RelativeLayout deviceInfoBox;
+ ListView deviceInfoList;
+ ImageView findDevice;
+ ImageView removeDevice;
+
+ ViewHolder(View view) {
+ super(view);
+ deviceImageView = (ImageView) view.findViewById(R.id.device_image);
+ deviceNameLabel = (TextView) view.findViewById(R.id.device_name);
+ deviceStatusLabel = (TextView) view.findViewById(R.id.device_status);
+
+ //actions
+ batteryStatusBox = (LinearLayout) view.findViewById(R.id.device_battery_status_box);
+ batteryStatusLabel = (TextView) view.findViewById(R.id.battery_status);
+ batteryIcon = (ImageView) view.findViewById(R.id.device_battery_status);
+ fetchActivityDataBox = (LinearLayout) view.findViewById(R.id.device_action_fetch_activity_box);
+ fetchActivityData = (ImageView) view.findViewById(R.id.device_action_fetch_activity);
+ busyIndicator = (ProgressBar) view.findViewById(R.id.device_busy_indicator);
+ takeScreenshotView = (ImageView) view.findViewById(R.id.device_action_take_screenshot);
+ setAlarmsView = (ImageView) view.findViewById(R.id.device_action_set_alarms);
+ showActivityGraphs = (ImageView) view.findViewById(R.id.device_action_show_activity_graphs);
+ deviceInfoView = (ImageView) view.findViewById(R.id.device_info_image);
+
+ deviceInfoBox = (RelativeLayout) view.findViewById(R.id.device_item_infos_box);
+ //overflow
+ deviceInfoList = (ListView) view.findViewById(R.id.device_item_infos);
+ findDevice = (ImageView) view.findViewById(R.id.device_action_find);
+ removeDevice = (ImageView) view.findViewById(R.id.device_action_remove);
+ }
- return view;
}
public void justifyListViewHeightBasedOnChildren(ListView listView) {
@@ -272,8 +346,8 @@ public class GBDeviceAdapterv2 extends ArrayAdapter {
}
private boolean isUniqueDeviceName(GBDevice device, String deviceName) {
- for (int i = 0; i < getCount(); i++) {
- GBDevice item = getItem(i);
+ for (int i = 0; i < deviceList.size(); i++) {
+ GBDevice item = deviceList.get(i);
if (item == device) {
continue;
}
@@ -283,5 +357,4 @@ public class GBDeviceAdapterv2 extends ArrayAdapter {
}
return true;
}
-
}
diff --git a/app/src/main/res/drawable/ic_action_find_lost_device.xml b/app/src/main/res/drawable/ic_action_find_lost_device.xml
new file mode 100644
index 000000000..74f549430
--- /dev/null
+++ b/app/src/main/res/drawable/ic_action_find_lost_device.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/layout/activity_controlcenterv2_content_main.xml b/app/src/main/res/layout/activity_controlcenterv2_content_main.xml
index f95b30dc7..a9b73d319 100644
--- a/app/src/main/res/layout/activity_controlcenterv2_content_main.xml
+++ b/app/src/main/res/layout/activity_controlcenterv2_content_main.xml
@@ -17,7 +17,7 @@
android:layout_centerInParent="true"
android:src="@drawable/gadgetbridge_img" />
-
-
+ card_view:srcCompat="@drawable/ic_activity_graphs"
+ android:background="?android:attr/selectableItemBackground"
+ android:contentDescription="@string/controlcenter_start_activitymonitor" />
+ android:background="?android:attr/selectableItemBackground"
+ card_view:srcCompat="@drawable/ic_more_vert" />
+ android:background="?android:attr/selectableItemBackground"
+ card_view:srcCompat="@drawable/ic_action_find_lost_device"
+ android:contentDescription="@string/controlcenter_find_device" />
+
+
@@ -203,4 +228,4 @@
-
+