caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #1440 from quizzmaster/fix_1438

Browse source 
fixed typos of pairing
This commit is contained in:
Milos Kozak 2018-09-16 19:37:33 +02:00 committed by GitHub
parent 53389fea3b 6323f2dd49
commit 2eefcfcbd9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/info/nightscout/androidaps/plugins/PumpDanaRS/activities/PairingProgressDialog.java
View file

@ -51,8 +51,8 @@ public class PairingProgressDialog extends DialogFragment implements View.OnClic
Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.danars_pairingprogressdialog, container, false);
getDialog().setTitle(MainApp.gs(R.string.pairing));
statusView = (TextView) view.findViewById(R.id.danars_paringprogress_status);
progressBar = (ProgressBar) view.findViewById(R.id.danars_paringprogress_progressbar);
statusView = (TextView) view.findViewById(R.id.danars_pairingprogress_status);
progressBar = (ProgressBar) view.findViewById(R.id.danars_pairingprogress_progressbar);
button = (Button) view.findViewById(R.id.ok);
progressBar.setMax(100);

4
app/src/main/res/layout/danars_pairingprogressdialog.xml
View file

@ -10,7 +10,7 @@
android:orientation="vertical">
<TextView
android:id="@+id/danars_paringprogress_status"
android:id="@+id/danars_pairingprogress_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
@ -18,7 +18,7 @@
android:text="STATUS" />
<ProgressBar
android:id="@+id/danars_paringprogress_progressbar"
android:id="@+id/danars_pairingprogress_progressbar"
style="@android:style/Widget.ProgressBar.Horizontal"
android:layout_width="match_parent"
android:layout_height="20dp"

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

@ -715,10 +715,10 @@
<string name="date">Date</string>
<string name="invalid">INVALID</string>
<string name="waitingforpairing">Waiting for pairing on pump</string>
<string name="pairingok">Paring OK</string>
<string name="pairingtimedout">Paring timed out</string>
<string name="pairingok">Pairing OK</string>
<string name="pairingtimedout">Pairing timed out</string>
<string name="pairing">PAIRING</string>
<string name="key_danars_pairingkey" translatable="false">danars_paring_key_</string>
<string name="key_danars_pairingkey" translatable="false">danars_pairing_key_</string>
<string name="key_danars_address" translatable="false">danars_address</string>
<string name="key_danars_name" translatable="false">danars_name</string>
<string name="danars_nodeviceavailable">No device found so far</string>