MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-12-27 19:15:50 +01:00
Code Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Vadim Kaushan 2018-07-31 09:18:50 +03:00
commit e3408197f2
2 changed files with 1 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -108,9 +108,7 @@ public class GBDeviceAdapterv2 extends RecyclerView.Adapter<GBDeviceAdapterv2.Vi
return true;
}
});
holder.deviceImageView.setImageResource(R.drawable.level_list_device);
//level-list does not allow negative values, hence we always add 100 to the key.
holder.deviceImageView.setImageLevel(device.getType().getKey() + 100 + (device.isInitialized() ? 100 : 0));
holder.deviceImageView.setImageResource(device.isInitialized() ? device.getType().getIcon() : device.getType().getDisabledIcon());
holder.deviceNameLabel.setText(getUniqueDeviceName(device));

33
app/src/main/res/drawable/level_list_device.xml
View File

@ -1,33 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<level-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:maxLevel="99" android:drawable="@drawable/ic_device_default_disabled" />
<item android:maxLevel="101" android:drawable="@drawable/ic_device_pebble_disabled" />
<item android:maxLevel="110" android:drawable="@drawable/ic_device_miband_disabled" />
<item android:maxLevel="111" android:drawable="@drawable/ic_device_miband_disabled" />
<item android:maxLevel="112" android:drawable="@drawable/ic_device_hplus_disabled" />
<item android:maxLevel="113" android:drawable="@drawable/ic_device_default_disabled" />
<item android:maxLevel="114" android:drawable="@drawable/ic_device_miband_disabled" />
<item android:maxLevel="120" android:drawable="@drawable/ic_device_lovetoy_disabled" />
<item android:maxLevel="130" android:drawable="@drawable/ic_device_default_disabled" />
<item android:maxLevel="140" android:drawable="@drawable/ic_device_hplus_disabled" />
<item android:maxLevel="141" android:drawable="@drawable/ic_device_hplus_disabled" />
<item android:maxLevel="150" android:drawable="@drawable/ic_device_hplus_disabled" />
<item android:maxLevel="160" android:drawable="@drawable/ic_device_h30_h10_disabled" />
<item android:maxLevel="190" android:drawable="@drawable/ic_device_h30_h10_disabled" />
<item android:maxLevel="199" android:drawable="@drawable/ic_launcher" />
<item android:maxLevel="201" android:drawable="@drawable/ic_device_pebble" />
<item android:maxLevel="210" android:drawable="@drawable/ic_device_miband" />
<item android:maxLevel="211" android:drawable="@drawable/ic_device_miband" />
<item android:maxLevel="212" android:drawable="@drawable/ic_device_hplus" />
<item android:maxLevel="213" android:drawable="@drawable/ic_device_default" />
<item android:maxLevel="214" android:drawable="@drawable/ic_device_miband" />
<item android:maxLevel="220" android:drawable="@drawable/ic_device_lovetoy" />
<item android:maxLevel="230" android:drawable="@drawable/ic_launcher" />
<item android:maxLevel="240" android:drawable="@drawable/ic_device_hplus" />
<item android:maxLevel="241" android:drawable="@drawable/ic_device_hplus" />
<item android:maxLevel="250" android:drawable="@drawable/ic_device_hplus" />
<item android:maxLevel="260" android:drawable="@drawable/ic_device_h30_h10" />
<item android:maxLevel="290" android:drawable="@drawable/ic_device_h30_h10" />
</level-list>