caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

wear PoweRGbg fixes

Browse source
This commit is contained in:
AdrianLxM 2016-11-28 18:40:50 +01:00
parent 96e6303a42
commit 70338ac158
13 changed files with 98 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/info/nightscout/androidaps/plugins/Wear/wearintegration/WatchUpdaterService.java
View file

@ -276,6 +276,7 @@ public class WatchUpdaterService extends WearableListenerService implements
NSProfile profile = MainApp.getConfigBuilder().getActiveProfile().getProfile(); NSProfile profile = MainApp.getConfigBuilder().getActiveProfile().getProfile();
if( profile == null) return;
long beginBasalSegmentTime = startTimeWindow; long beginBasalSegmentTime = startTimeWindow;
long runningTime = startTimeWindow; long runningTime = startTimeWindow;

1
wear/build.gradle
View file

@ -52,4 +52,5 @@ dependencies {
compile files('libs/hellocharts-library-1.5.5.jar') compile files('libs/hellocharts-library-1.5.5.jar')
compile(name:'ustwo-clockwise-debug', ext:'aar') compile(name:'ustwo-clockwise-debug', ext:'aar')
compile 'com.android.support:support-v4:23.0.1' compile 'com.android.support:support-v4:23.0.1'
compile 'me.denley.wearpreferenceactivity:wearpreferenceactivity:0.5.0'
} }

3
wear/src/main/java/info/nightscout/androidaps/NWPreferences.java
View file

@ -5,8 +5,9 @@ import android.os.Bundle;
import android.preference.PreferenceActivity; import android.preference.PreferenceActivity;
import info.nightscout.androidaps.R; import info.nightscout.androidaps.R;
import preference.WearPreferenceActivity;
public class NWPreferences extends PreferenceActivity { public class NWPreferences extends WearPreferenceActivity {
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {

BIN
wear/src/main/res/drawable-hdpi/settings_off.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 851 B

BIN
wear/src/main/res/drawable-hdpi/settings_on.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 601 B

BIN
wear/src/main/res/drawable-mdpi/settings_off.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 551 B

BIN
wear/src/main/res/drawable-mdpi/settings_on.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 408 B

BIN
wear/src/main/res/drawable-xhdpi/settings_off.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
wear/src/main/res/drawable-xhdpi/settings_on.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 779 B

BIN
wear/src/main/res/drawable-xxhdpi/settings_off.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
wear/src/main/res/drawable-xxhdpi/settings_on.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

144
wear/src/main/res/xml/preferences.xml
View file

@ -1,73 +1,99 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
<PreferenceCategory xmlns:app="http://schemas.android.com/apk/res-auto">
android:title="@string/app_settings" <CheckBoxPreference
android:key="category" android:defaultValue="true"
android:selectable="false"> android:key="showExternalStatus"
android:title="Show Loop Status"
app:wear_iconOff="@drawable/settings_off"
app:wear_iconOn="@drawable/settings_on" />
<CheckBoxPreference android:title="Show Loop Status" <CheckBoxPreference
android:defaultValue="true" android:defaultValue="false"
android:summary="Show Loop Staus (Temps and IOB)." android:key="highlight_basals"
android:key="showExternalStatus" /> android:summary="Better visible basal rate and temp basals"
android:title="Highlight Basals"
app:wear_iconOff="@drawable/settings_off"
app:wear_iconOn="@drawable/settings_on"/>
<ListPreference <CheckBoxPreference
android:key="chart_timeframe" android:defaultValue="true"
android:title="Chart Timeframe" android:key="showAvgDelta"
android:summary="Chart Timeframe" android:summary="Show the avgDelta."
android:entries="@array/chart_timeframe" android:title="Show AvgDelta"
android:entryValues="@array/chart_timeframe_values" app:wear_iconOff="@drawable/settings_off"
android:defaultValue="3" /> app:wear_iconOn="@drawable/settings_on"/>
<CheckBoxPreference android:title="Highlight Basals" <CheckBoxPreference
android:defaultValue="false" android:defaultValue="true"
android:summary="Better visible basal rate and temp basals" android:key="dark"
android:key="highlight_basals" /> android:summary="Dark theme"
android:title="Dark"
app:wear_iconOff="@drawable/settings_off"
app:wear_iconOn="@drawable/settings_on"/>
<CheckBoxPreference android:title="Show AvgDelta" <ListPreference
android:defaultValue="true" android:defaultValue="3"
android:summary="Show the avgDelta." android:entries="@array/chart_timeframe"
android:key="showAvgDelta" /> android:entryValues="@array/chart_timeframe_values"
android:key="chart_timeframe"
android:summary="Chart Timeframe"
android:title="Chart Timeframe" />
<CheckBoxPreference android:title="Dark" <CheckBoxPreference
android:defaultValue="true" android:defaultValue="true"
android:summary="Dark theme" android:key="showAgo"
android:key="dark" /> android:summary="Minutes since last reading. (Circle WF)"
android:title="Show Ago"
app:wear_iconOff="@drawable/settings_off"
app:wear_iconOn="@drawable/settings_on"/>
<CheckBoxPreference android:title="Show Ago" <CheckBoxPreference
android:defaultValue="true" android:defaultValue="true"
android:summary="Minutes since last reading. (Circle WF)" android:key="showDelta"
android:key="showAgo" /> android:summary="Show delta. (Circle WF)"
android:title="Show Delta"
app:wear_iconOff="@drawable/settings_off"
app:wear_iconOn="@drawable/settings_on"/>
<CheckBoxPreference android:title="Show Delta" <CheckBoxPreference
android:defaultValue="true" android:defaultValue="true"
android:summary="Show delta. (Circle WF)" android:key="showBG"
android:key="showDelta" /> android:summary="Show BG. (Circle WF)"
android:title="Show BG"
app:wear_iconOff="@drawable/settings_off"
app:wear_iconOn="@drawable/settings_on"/>
<CheckBoxPreference android:title="Show BG" <CheckBoxPreference
android:defaultValue="true" android:defaultValue="false"
android:summary="Show BG. (Circle WF)" android:key="showBigNumbers"
android:key="showBG" /> android:summary="Big numbers. (Circle WF)"
android:title="Big Numbers"
app:wear_iconOff="@drawable/settings_off"
app:wear_iconOn="@drawable/settings_on"/>
<CheckBoxPreference android:title="Show Big Numbers" <CheckBoxPreference
android:defaultValue="false" android:defaultValue="false"
android:summary="Big numbers. (Circle WF)" android:key="showRingHistory"
android:key="showBigNumbers" /> android:summary="Graphical history. (Circle WF)"
android:title="Ring History"
app:wear_iconOff="@drawable/settings_off"
app:wear_iconOn="@drawable/settings_on" />
<CheckBoxPreference android:title="Show Ring History" <CheckBoxPreference
android:defaultValue="false" android:defaultValue="true"
android:summary="Graphical history. (Circle WF)" android:key="softRingHistory"
android:key="showRingHistory" /> android:summary="Less eyecandy. (Circle WF)"
android:title="Light Ring History"
<CheckBoxPreference android:title="Light Ring History" app:wear_iconOff="@drawable/settings_off"
android:defaultValue="true" app:wear_iconOn="@drawable/settings_on"/>
android:summary="Less eyecandy. (Circle WF)"
android:key="softRingHistory" />
<CheckBoxPreference android:title="Show Animations" <CheckBoxPreference
android:defaultValue="true" android:defaultValue="true"
android:summary="Animations. (Circle WF)" android:key="animation"
android:key="animation" /> android:summary="Animations. (Circle WF)"
android:title="Animations"
</PreferenceCategory> app:wear_iconOff="@drawable/settings_off"
app:wear_iconOn="@drawable/settings_on"/>
</PreferenceScreen> </PreferenceScreen>

16
wear/wear.iml
View file

@ -43,6 +43,13 @@
<sourceFolder url="file://$MODULE_DIR$/src/fullDebug/jni" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/fullDebug/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/fullDebug/rs" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/fullDebug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/fullDebug/shaders" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/fullDebug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/full/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/full/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/full/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/full/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/full/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/full/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/full/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testFullDebug/res" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/testFullDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testFullDebug/resources" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/testFullDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testFullDebug/assets" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/testFullDebug/assets" type="java-test-resource" />
@ -51,13 +58,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/testFullDebug/jni" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/testFullDebug/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testFullDebug/rs" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/testFullDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testFullDebug/shaders" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/testFullDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/full/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/full/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/full/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/full/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/full/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/full/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/full/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/full/res" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/full/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/full/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/full/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/full/assets" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/full/assets" type="java-resource" />
@ -131,6 +131,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-base/7.3.0/jars" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-base/7.3.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-wearable/7.3.0/jars" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-wearable/7.3.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.support/wearable/1.4.0/jars" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.support/wearable/1.4.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/me.denley.wearpreferenceactivity/wearpreferenceactivity/0.5.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/ustwo-clockwise-debug/jars" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/ustwo-clockwise-debug/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
@ -151,6 +152,7 @@
<orderEntry type="library" exported="" name="ustwo-clockwise-debug-" level="project" /> <orderEntry type="library" exported="" name="ustwo-clockwise-debug-" level="project" />
<orderEntry type="library" exported="" name="hellocharts-library-1.5.5" level="project" /> <orderEntry type="library" exported="" name="hellocharts-library-1.5.5" level="project" />
<orderEntry type="library" exported="" name="play-services-wearable-7.3.0" level="project" /> <orderEntry type="library" exported="" name="play-services-wearable-7.3.0" level="project" />
<orderEntry type="library" exported="" name="wearpreferenceactivity-0.5.0" level="project" />
<orderEntry type="library" exported="" name="wearable-1.4.0" level="project" /> <orderEntry type="library" exported="" name="wearable-1.4.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" /> <orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
<orderEntry type="library" exported="" name="play-services-base-7.3.0" level="project" /> <orderEntry type="library" exported="" name="play-services-base-7.3.0" level="project" />