caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

move ns version to about dialog

Browse source
This commit is contained in:
Milos Kozak 2017-06-30 09:55:47 +02:00
parent 514d6d4dd5
commit 9e8c91319e
11 changed files with 4 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/info/nightscout/androidaps/MainActivity.java
View file

@ -39,6 +39,7 @@ import info.nightscout.androidaps.events.EventAppExit;
import info.nightscout.androidaps.events.EventPreferenceChange;
import info.nightscout.androidaps.events.EventRefreshGui;
import info.nightscout.androidaps.interfaces.PluginBase;
import info.nightscout.androidaps.plugins.ConfigBuilder.ConfigBuilderPlugin;
import info.nightscout.androidaps.tabs.SlidingTabLayout;
import info.nightscout.androidaps.tabs.TabPageAdapter;
import info.nightscout.utils.ImportExportPrefs;
@ -300,7 +301,9 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
builder.setIcon(R.mipmap.yellowowl);
else
builder.setIcon(R.mipmap.blueowl);
builder.setMessage("Build: " + BuildConfig.BUILDVERSION);
String message = "Build: " + BuildConfig.BUILDVERSION + "\n";
message += MainApp.sResources.getString(R.string.configbuilder_nightscoutversion_label) + " " + ConfigBuilderPlugin.nightscoutVersionName;
builder.setMessage(message);
builder.setPositiveButton(MainApp.sResources.getString(R.string.ok), null);
AlertDialog alertDialog = builder.create();
alertDialog.show();

9
app/src/main/java/info/nightscout/androidaps/plugins/ConfigBuilder/ConfigBuilderFragment.java
View file

@ -67,8 +67,6 @@ public class ConfigBuilderFragment extends Fragment {
ListView constraintsListView;
TextView constraintsLabel;
ListView generalListView;
TextView nsclientVerView;
TextView nightscoutVerView;
LinearLayout mainLayout;
Button unlock;
@ -116,17 +114,10 @@ public class ConfigBuilderFragment extends Fragment {
constraintsListView = (ListView) view.findViewById(R.id.configbuilder_constraintslistview);
constraintsLabel = (TextView) view.findViewById(R.id.configbuilder_constraintslabel);
generalListView = (ListView) view.findViewById(R.id.configbuilder_generallistview);
nsclientVerView = (TextView) view.findViewById(R.id.configbuilder_nsclientversion);
nightscoutVerView = (TextView) view.findViewById(R.id.configbuilder_nightscoutversion);
mainLayout = (LinearLayout) view.findViewById(R.id.configbuilder_mainlayout);
unlock = (Button) view.findViewById(R.id.configbuilder_unlock);
nsclientVerView.setText(ConfigBuilderPlugin.nsClientVersionName);
nightscoutVerView.setText(ConfigBuilderPlugin.nightscoutVersionName);
if (ConfigBuilderPlugin.nsClientVersionCode < 117) nsclientVerView.setTextColor(Color.RED);
if (ConfigBuilderPlugin.nightscoutVersionCode < 900)
nightscoutVerView.setTextColor(Color.RED);
setViews();
if (PasswordProtection.isLocked("settings_password")) {

39
app/src/main/res/layout/configbuilder_fragment.xml
View file

@ -194,45 +194,6 @@
android:layout_marginRight="10dp"
android:background="@color/cardColorBackground" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/configbuilder_nsclientversion_label"
android:textAppearance="?android:attr/textAppearanceSmall" />
<TextView
android:id="@+id/configbuilder_nsclientversion"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/configbuilder_nightscoutversion_label"
android:textAppearance="?android:attr/textAppearanceSmall" />
<TextView
android:id="@+id/configbuilder_nightscoutversion"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</ScrollView>

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

@ -171,7 +171,6 @@
<string name="careportal_newnstreatment_glucosetype">КЗ тип</string>
<string name="openapsma">OpenAPS MA</string>
<string name="configbuilder_nightscoutversion_label">Nightscout версия:</string>
<string name="configbuilder_nsclientversion_label">NSClient версия:</string>
<string name="send">ИЗПРАТИ</string>
<string name="missing">Липсва</string>
<string name="enabled">Разрешено</string>

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

@ -172,7 +172,6 @@
<string name="careportal_newnstreatment_glucosetype">Zadání glykémie</string>
<string name="openapsma">OpenAPS MA</string>
<string name="configbuilder_nightscoutversion_label">Verze Nightscoutu:</string>
<string name="configbuilder_nsclientversion_label">Verze NSClienta:</string>
<string name="send">POSLAT</string>
<string name="missing">Chybí</string>
<string name="enabled">Povolený</string>

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

@ -53,7 +53,6 @@
<string name="configbuilder_bgsource">BZ Quelle</string>
<string name="configbuilder_loop">Loop</string>
<string name="configbuilder_nightscoutversion_label">Nightscout Version:</string>
<string name="configbuilder_nsclientversion_label">NSClient Version:</string>
<string name="configbuilder_tempbasals">Temp Basals</string>
<string name="delta">Delta</string>
<string name="duration">Dauer</string>

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

@ -179,7 +179,6 @@
<string name="noprofile">Pendiente carga perfil NS</string>
<string name="overview_tempbasal_button">Basal Temporal</string>
<string name="overview_extendedbolus_button">Bolo extendido</string>
<string name="configbuilder_nsclientversion_label">NSClient versión:</string>
<string name="configbuilder_nightscoutversion_label">Nightscout versión:</string>
<string name="send">ENVIAR</string>
<string name="missing">Faltan</string>

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

@ -81,7 +81,6 @@
<string name="configbuilder_insulin">Insulina</string>
<string name="configbuilder_loop">Loop</string>
<string name="configbuilder_nightscoutversion_label">Versione Nightscout</string>
<string name="configbuilder_nsclientversion_label">Versione NSClient</string>
<string name="configbuilder_profile">Profilo</string>
<string name="configbuilder_pump">Microinfusore</string>
<string name="configbuilder_shortname">Configurazione</string>

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

@ -180,7 +180,6 @@
<string name="noprofile">아직 NS에서 프로파일을 로드하지 못했습니다.</string>
<string name="overview_tempbasal_button">임시기초주입</string>
<string name="overview_extendedbolus_button">확장식사주입</string>
<string name="configbuilder_nsclientversion_label">NSClient 버전:</string>
<string name="configbuilder_nightscoutversion_label">Nightscout 버전:</string>
<string name="send">보내기</string>
<string name="missing">Missing</string>

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

@ -97,7 +97,6 @@
<string name="configbuilder_insulin">инсулин</string>
<string name="configbuilder_loop">замкнутый цикл</string>
<string name="configbuilder_nightscoutversion_label">версия Nightscout:</string>
<string name="configbuilder_nsclientversion_label">версия NSClient:</string>
<string name="configbuilder_profile">профиль</string>
<string name="configbuilder_pump">помпа</string>
<string name="configbuilder_shortname">КОНФ</string>

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

@ -192,7 +192,6 @@
<string name="noprofile">No profile loaded from NS yet</string>
<string name="overview_tempbasal_button">TempBasal</string>
<string name="overview_extendedbolus_button">Extended Bolus</string>
<string name="configbuilder_nsclientversion_label">NSClient version:</string>
<string name="configbuilder_nightscoutversion_label">Nightscout version:</string>
<string name="send">SEND</string>
<string name="missing">Missing</string>