caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge branch 'koreandanar' of https://github.com/MilosKozak/AndroidAPS into koreandanar

Browse source
This commit is contained in:
Milos Kozak 2016-12-11 11:15:34 +01:00
commit 7aaa15dd3b
11 changed files with 14 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/info/nightscout/androidaps/Config.java
View file

@ -15,7 +15,6 @@ public class Config {
public static final boolean SMSCOMMUNICATORENABLED = true;
public static final boolean DANAR = true && BuildConfig.PUMPDRIVERS;
public static final boolean MM640G = false && BuildConfig.PUMPDRIVERS;
public static final boolean detailedLog = true;
public static final boolean logFunctionCalls = true;

2
app/src/main/java/info/nightscout/androidaps/PreferencesActivity.java
View file

@ -96,8 +96,6 @@ public class PreferencesActivity extends PreferenceActivity implements SharedPre
addPreferencesFromResource(R.xml.pref_danarprofile);
}
}
if (Config.MM640G)
addPreferencesFromResource(R.xml.pref_mm640g);
if (Config.SMSCOMMUNICATORENABLED)
addPreferencesFromResource(R.xml.pref_smscommunicator);
addPreferencesFromResource(R.xml.pref_others);

7
app/src/main/java/info/nightscout/androidaps/plugins/DanaR/comm/MsgInitConnStatusTime.java
View file

@ -32,6 +32,13 @@ public class MsgInitConnStatusTime extends MessageBase {
((DanaRKoreanPlugin)MainApp.getSpecificPlugin(DanaRKoreanPlugin.class)).setFragmentVisible(PluginBase.PUMP, true);
((DanaRPlugin)MainApp.getSpecificPlugin(DanaRPlugin.class)).setFragmentEnabled(PluginBase.PUMP, false);
((DanaRPlugin)MainApp.getSpecificPlugin(DanaRPlugin.class)).setFragmentVisible(PluginBase.PUMP, false);
//If profile coming from pump, switch it as well
if(MainApp.getSpecificPlugin(DanaRPlugin.class).isEnabled(PluginBase.PROFILE)){
(MainApp.getSpecificPlugin(DanaRPlugin.class)).setFragmentEnabled(PluginBase.PROFILE, false);
(MainApp.getSpecificPlugin(DanaRKoreanPlugin.class)).setFragmentEnabled(PluginBase.PROFILE, true);
}
MainApp.getConfigBuilder().storeSettings();
MainApp.bus().post(new EventRefreshGui(false));
return;

7
app/src/main/java/info/nightscout/androidaps/plugins/DanaRKorean/comm/MsgInitConnStatusTime.java
View file

@ -33,6 +33,13 @@ public class MsgInitConnStatusTime extends MessageBase {
((DanaRKoreanPlugin)MainApp.getSpecificPlugin(DanaRKoreanPlugin.class)).setFragmentVisible(PluginBase.PUMP, false);
((DanaRPlugin)MainApp.getSpecificPlugin(DanaRPlugin.class)).setFragmentEnabled(PluginBase.PUMP, true);
((DanaRPlugin)MainApp.getSpecificPlugin(DanaRPlugin.class)).setFragmentVisible(PluginBase.PUMP, true);
//If profile coming from pump, switch it as well
if(MainApp.getSpecificPlugin(DanaRKoreanPlugin.class).isEnabled(PluginBase.PROFILE)){
(MainApp.getSpecificPlugin(DanaRKoreanPlugin.class)).setFragmentEnabled(PluginBase.PROFILE, false);
(MainApp.getSpecificPlugin(DanaRPlugin.class)).setFragmentEnabled(PluginBase.PROFILE, true);
}
MainApp.getConfigBuilder().storeSettings();
MainApp.bus().post(new EventRefreshGui(false));
return;

7
app/src/main/res/layout/mm640g_fragment.xml
View file

@ -1,7 +0,0 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="info.nightscout.androidaps.plugins.MM640g.MM640gFragment">
</FrameLayout>

1
app/src/main/res/values-bg/strings.xml
View file

@ -280,7 +280,6 @@
<string name="danar_debolus">DE bolus</string>
<string name="danar_dsbolus">DS bolus</string>
<string name="danar_ebolus">E bolus</string>
<string name="mm640g">MM 640g</string>
<string name="objectives_0_objective">Настройка на визуализацията и наблюдението, а също и анализиране на базалните нужди и коефициенти</string>
<string name="objectives_1_gate">Стартиране в Open loop режим за няколко дни и ръчно прилагане на много временни базали</string>
<string name="objectives_1_objective">Стартиране на Open Loop </string>

1
app/src/main/res/values-cs/strings.xml
View file

@ -270,7 +270,6 @@
<string name="uploading">Nahrávám</string>
<string name="pumpbusy">Pumpa je zaneprázdněna</string>
<string name="wrongpumppassword">Špatné heslo k pumpě</string>
<string name="mm640g">MM 640g</string>
<string name="danar_password">Heslo k pumpě</string>
<string name="occlusion">Okluze</string>
<string name="overview_bolusprogress_delivered">Podáno</string>

1
app/src/main/res/values-de/strings.xml
View file

@ -214,7 +214,6 @@
<string name="glucosetype_sensor">Sensor</string>
<string name="glucosetype_finger">Finger</string>
<string name="language">Sprache</string>
<string name="mm640g">MM 640g</string>
<string name="percent">Prozent</string>
<string name="reloadprofile">Profil neuladen</string>
<string name="save">Speichern</string>

1
app/src/main/res/values-es/strings.xml
View file

@ -236,7 +236,6 @@
<string name="absolute">Absoluto</string>
<string name="canceltemp">Cancelar basal temporal</string>
<string name="smscommunicator">SMS Communicator</string>
<string name="mm640g">MM 640g</string>
<string name="waitingforpumpresult">Esperando resultado</string>
<string name="smscommunicator_allowednumbers">Números de teléfono permitidos</string>
<string name="smscommunicator_allowednumbers_summary">XXXXXXXXXX +; + YYYYYYYYYY</string>

1
app/src/main/res/values-ko/strings.xml
View file

@ -238,7 +238,6 @@
<string name="absolute">Absolute</string>
<string name="canceltemp">임시기초주입 취소하기</string>
<string name="smscommunicator">SMS 전송</string>
<string name="mm640g">MM 640g</string>
<string name="waitingforpumpresult">결과 기다리는 중</string>
<string name="smscommunicator_allowednumbers">허가된 전화번호</string>
<string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>

8
app/src/main/res/xml/pref_mm640g.xml
View file

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory
android:key="mm640g"
android:title="@string/mm640g">
</PreferenceCategory>
</PreferenceScreen>