From 7d834869a2c87caa6b44bd69e1e8ec3cef452673 Mon Sep 17 00:00:00 2001
From: mamutcho <mamut_killer@yahoo.com>
Date: Thu, 12 Dec 2019 19:34:44 +0200
Subject: [PATCH] merge with Gadgetbridge

---
 .../drawable-hdpi/ic_device_watchxplus.png    | Bin 0 -> 1817 bytes
 .../ic_device_watchxplus_disabled.png         | Bin 0 -> 1324 bytes
 .../activity_watchxplus_calibration.xml       | 124 ++++++++++++++++++
 3 files changed, 124 insertions(+)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_device_watchxplus.png
 create mode 100644 app/src/main/res/drawable-hdpi/ic_device_watchxplus_disabled.png
 create mode 100644 app/src/main/res/layout/activity_watchxplus_calibration.xml

diff --git a/app/src/main/res/drawable-hdpi/ic_device_watchxplus.png b/app/src/main/res/drawable-hdpi/ic_device_watchxplus.png
new file mode 100644
index 0000000000000000000000000000000000000000..749155a1928367971987a36462382e570d285638
GIT binary patch
literal 1817
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
Hu0mjfn@diW

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/ic_device_watchxplus_disabled.png b/app/src/main/res/drawable-hdpi/ic_device_watchxplus_disabled.png
new file mode 100644
index 0000000000000000000000000000000000000000..212cb44d55d0c32271ab171d78bffa455032ff6b
GIT binary patch
literal 1324
zcmV+{1=IS8P)<h;3K|Lk000e1NJLTq002k;002k`1^@s6RqeA!00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!~g&e!~vBn4jTXf00v@9M??Ss00000
z`9r&Z00007bV*G`2jU3_3I{C!mIZ|X00f*#L_t(|UhSM;a+@#^hh?xyrhRE&^3pr_
z8aYLdkyGRtIYq9K$Ii3|$O#f-X!nPtWDP6+N&;hl9R>`7ct2K)V2U^Y2zA9tV&+#I
zTm^M-71Y6?8g$xpW9H|=*LUA+`hWLcf^?HjH7{whhwriLBCtYq6!eciT1Q>724_%F
zl&UOCS~e@s1c-o(G)>I1KH**jy}rJhrFF62@6D2%PC=0K{QPV_t&4|;hf0!FAZ3#%
z2&>ST%elL|tLAIr?d`3aTS;Y!n46Lum-*91Ym)<bOsJ~`)m2DBa`2pK2*O4bVN76+
zax6Bs{7|SoFDgNpc!CHSgz8RKkA?ZXe%{{?>X=g&6&S{x4qwC!(ph9yTmT=3qsl2E
z(9NpsU<iV~y4j_0BsnFrr>a4xjvPh0A#&9q7f`5e@8Jl7&_IteFNP}C<`@V#GbjZ2
z_xIH_mZ|%XA*vt@$odTLT}<774ABJnJo7QLD4HPGnYZ1>HA%$GqNrVr!v)x`Q=dSa
zs2I#52m#kcNbojuNt#7an-mvg_VGdEaYuD$OQXvCkgGp`f2)_57qewNHe)0nA0N$9
zlc%RAv(%(*+Ys>Ge*XBSc3Gyrec!2@Y^%20RHdmN7X=sOlEcMFPYmqy8X(EQvnpRF
zuT4<!E+)xAz>s1m3BDce>ymKX7<DPApn3pOphJ)(g(jFFSJ#?KT~g>Q3MQy7#|DPl
zg8Jhtu+Ui)<ucFDI%*08O{pPMy6I4Y2<i&Fk0h)|8-6u&;VT;@f(YVi?>gIUlJFVp
zu^sIs_;L9$e9MZ`#au{|`pA*6$H3etvkC%rNn_+#e9Hl|3j$oySUI6sgdhMZxP4fX
z9IzNcVCuaUvd=e*5;O%|)sTI@$4Eg0@h=(TtO9;q-%>cM$)Hd~5#&3ILS>~yFhL>H
zo)cPDv@V7~rrri%|CreWf(oh!V@JzFMcIAoBV`;v^tdVbGilt7OWlqC&sphjaEa0_
zgfBVxJF`Bt2QEo~i>lLhZ{@4TbqR`6gWAqCB)Fy}5Uoga#uVDv#o028AY>E*wv!9q
zCUh}&5v2wJE`ryOu1Bg|jO!RvSVRqK0|MHnxrru-pZ%%$JXROc1o_N{n3)x=1_4`d
z#s)Zbe~CraAOtogxT*V(!6~TgO}sUsLp|w8p9q4`T5h~n@D}bSkrSdJ$i7sTICfYg
z+cZ%r#hWCFiTf)-oLwxToi2slj>J&Ba04~Gya*XYCXLZc;pR3|S(fUn7iAGgNE7{D
zyv?AlTY)ujd$UzLl9SM-U6&ZMfe<rDH(GxN*^{4=ob47}tQmV_pa|?LG~{nSuMPgj
zGpNe}qM$l$PyNoBJ`d$O1?jE&Cn*jeM|Hsaoq18+j$qdwerE?+fy;MF-6*453Dg{P
zD}bM>Xrq@PG$|+zk0b`~cR~(6<Goh&+ogj5Aqe9g6yj`0f@m3Ey=%PJLy+EVUwB0(
z>1CR#E$2Zc!(@^k^YptI^{PRj5<)FM=VtxcKwr3$WHP3Y9MD@3uq_AdvN*Jq?w`f6
i3=(vSw3qOUN2&kh)|vY=i-e&70000<MNUMnLSTYAwos=4

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/activity_watchxplus_calibration.xml b/app/src/main/res/layout/activity_watchxplus_calibration.xml
new file mode 100644
index 000000000..dc5efc52f
--- /dev/null
+++ b/app/src/main/res/layout/activity_watchxplus_calibration.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/tv_note"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:text="@string/discovery_note"
+        android:textColor="@color/accent"
+        android:textStyle="bold" />
+
+    <TextView
+        android:id="@+id/tv_hint"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignStart="@+id/tv_note"
+        android:layout_below="@+id/tv_note"
+        android:layout_marginTop="16dp"
+        android:text="@string/watch9_calibration_hint" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_above="@id/watch9_bt_calibrate"
+        android:layout_below="@id/tv_hint"
+        android:orientation="horizontal"
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp"
+        android:baselineAligned="false">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/watch9_time_hours"
+                android:textAllCaps="true"
+                android:textColor="@color/accent" />
+
+            <NumberPicker
+                android:id="@+id/np_hour"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:descendantFocusability="blocksDescendants"  />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/watch9_time_minutes"
+                android:textAllCaps="true"
+                android:textColor="@color/accent" />
+
+            <NumberPicker
+                android:id="@+id/np_minute"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:descendantFocusability="blocksDescendants"  />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/watch9_time_seconds"
+                android:textAllCaps="true"
+                android:textColor="@color/accent" />
+
+            <NumberPicker
+                android:id="@+id/np_second"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:descendantFocusability="blocksDescendants"  />
+        </LinearLayout>
+
+
+
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/watch9_bt_calibrate"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="16dp"
+        android:padding="16dp"
+        android:text="@string/watch9_calibration_button" />
+
+</RelativeLayout>
\ No newline at end of file