MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-12-01 06:22:55 +01:00
Code Releases Wiki Activity

Add UI to invoke device specific settings Activity

Browse Source 
Currently the icon in the card is hidden for all devices, since the
functionality is not implemented yet
This commit is contained in:
Daniele Gobbetti 2019-04-21 15:59:39 +02:00
parent f92626f4a5
commit 7c918ee191
4 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/adapter/GBDeviceAdapterv2.java
View File

@ -150,6 +150,9 @@ public class GBDeviceAdapterv2 extends RecyclerView.Adapter<GBDeviceAdapterv2.Vi
holder.batteryIcon.setImageLevel(200); holder.batteryIcon.setImageLevel(200);
} }
//device specific settings
holder.deviceSpecificSettingsView.setVisibility(coordinator.supportsDeviceSpecificSettings(device) ? View.VISIBLE : View.GONE);
//fetch activity data //fetch activity data
holder.fetchActivityDataBox.setVisibility((device.isInitialized() && coordinator.supportsActivityDataFetching()) ? View.VISIBLE : View.GONE); holder.fetchActivityDataBox.setVisibility((device.isInitialized() && coordinator.supportsActivityDataFetching()) ? View.VISIBLE : View.GONE);
holder.fetchActivityData.setOnClickListener(new View.OnClickListener() holder.fetchActivityData.setOnClickListener(new View.OnClickListener()
@ -472,6 +475,7 @@ public class GBDeviceAdapterv2 extends RecyclerView.Adapter<GBDeviceAdapterv2.Vi
LinearLayout batteryStatusBox; LinearLayout batteryStatusBox;
TextView batteryStatusLabel; TextView batteryStatusLabel;
ImageView batteryIcon; ImageView batteryIcon;
ImageView deviceSpecificSettingsView;
LinearLayout fetchActivityDataBox; LinearLayout fetchActivityDataBox;
ImageView fetchActivityData; ImageView fetchActivityData;
ProgressBar busyIndicator; ProgressBar busyIndicator;
@ -504,6 +508,7 @@ public class GBDeviceAdapterv2 extends RecyclerView.Adapter<GBDeviceAdapterv2.Vi
batteryStatusBox = view.findViewById(R.id.device_battery_status_box); batteryStatusBox = view.findViewById(R.id.device_battery_status_box);
batteryStatusLabel = view.findViewById(R.id.battery_status); batteryStatusLabel = view.findViewById(R.id.battery_status);
batteryIcon = view.findViewById(R.id.device_battery_status); batteryIcon = view.findViewById(R.id.device_battery_status);
deviceSpecificSettingsView = view.findViewById(R.id.device_specific_settings);
fetchActivityDataBox = view.findViewById(R.id.device_action_fetch_activity_box); fetchActivityDataBox = view.findViewById(R.id.device_action_fetch_activity_box);
fetchActivityData = view.findViewById(R.id.device_action_fetch_activity); fetchActivityData = view.findViewById(R.id.device_action_fetch_activity);
busyIndicator = view.findViewById(R.id.device_busy_indicator); busyIndicator = view.findViewById(R.id.device_busy_indicator);

5
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java
View File

@ -152,4 +152,9 @@ public abstract class AbstractDeviceCoordinator implements DeviceCoordinator {
@Override @Override
public boolean supportsUnicodeEmojis() { return false; } public boolean supportsUnicodeEmojis() { return false; }
@Override
public boolean supportsDeviceSpecificSettings(GBDevice device) {
return false;
}
} }

5
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java
View File

@ -278,4 +278,9 @@ public interface DeviceCoordinator {
* Indicates whether the device supports unicode emojis. * Indicates whether the device supports unicode emojis.
*/ */
boolean supportsUnicodeEmojis(); boolean supportsUnicodeEmojis();
/**
* Indicates whether the device supports device specific settings (not per device type or family, but unique per device).
*/
boolean supportsDeviceSpecificSettings(GBDevice device);
} }

22
app/src/main/res/layout/device_itemv2.xml
View File

@ -139,12 +139,31 @@
</LinearLayout> </LinearLayout>
<ImageView
android:id="@+id/device_specific_settings"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_below="@id/device_image"
android:layout_marginStart="4dp"
android:layout_marginTop="4dp"
android:layout_marginEnd="4dp"
android:layout_marginBottom="4dp"
android:layout_toEndOf="@id/device_battery_status_box"
android:background="?android:attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:padding="4dp"
android:scaleType="fitXY"
android:tint="@color/secondarytext"
card_view:srcCompat="@drawable/ic_settings" />
<LinearLayout <LinearLayout
android:id="@+id/device_fm_frequency_box" android:id="@+id/device_fm_frequency_box"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/device_image" android:layout_below="@id/device_image"
android:layout_toEndOf="@id/device_battery_status_box" android:layout_toEndOf="@id/device_specific_settings"
android:layout_margin="4dp" android:layout_margin="4dp"
android:orientation="vertical"> android:orientation="vertical">
@ -178,7 +197,6 @@
android:layout_toEndOf="@id/device_fm_frequency_box" android:layout_toEndOf="@id/device_fm_frequency_box"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:clickable="true" android:clickable="true"
android:contentDescription="@string/controlcenter_take_screenshot"
android:padding="4dp" android:padding="4dp"
android:scaleType="fitXY" android:scaleType="fitXY"
card_view:srcCompat="@drawable/ic_led_color" card_view:srcCompat="@drawable/ic_led_color"