From 95b4686bb1bcb0db77ebb85769ca3beab5fdf616 Mon Sep 17 00:00:00 2001
From: OliE <olie.xdev@googlemail.com>
Date: Sat, 11 Nov 2017 14:45:43 +0100
Subject: [PATCH] added about page

---
 .../gui/preferences/AboutPreferences.java     |  35 ++++++++++++++++++
 .../drawable-hdpi/ic_preferences_about.png    | Bin 0 -> 460 bytes
 .../drawable-ldpi/ic_preferences_about.png    | Bin 0 -> 253 bytes
 .../drawable-mdpi/ic_preferences_about.png    | Bin 0 -> 333 bytes
 .../drawable-xhdpi/ic_preferences_about.png   | Bin 0 -> 649 bytes
 .../drawable-xxhdpi/ic_preferences_about.png  | Bin 0 -> 1013 bytes
 .../drawable-xxxhdpi/ic_preferences_about.png | Bin 0 -> 1299 bytes
 .../app/src/main/res/values-de/strings.xml    |   4 ++
 .../app/src/main/res/values/strings.xml       |   5 +++
 .../src/main/res/xml/about_preferences.xml    |  23 ++++++++++++
 .../src/main/res/xml/header_preferences.xml   |   4 ++
 11 files changed, 71 insertions(+)
 create mode 100644 android_app/app/src/main/java/com/health/openscale/gui/preferences/AboutPreferences.java
 create mode 100644 android_app/app/src/main/res/drawable-hdpi/ic_preferences_about.png
 create mode 100644 android_app/app/src/main/res/drawable-ldpi/ic_preferences_about.png
 create mode 100644 android_app/app/src/main/res/drawable-mdpi/ic_preferences_about.png
 create mode 100644 android_app/app/src/main/res/drawable-xhdpi/ic_preferences_about.png
 create mode 100644 android_app/app/src/main/res/drawable-xxhdpi/ic_preferences_about.png
 create mode 100644 android_app/app/src/main/res/drawable-xxxhdpi/ic_preferences_about.png
 create mode 100644 android_app/app/src/main/res/xml/about_preferences.xml

diff --git a/android_app/app/src/main/java/com/health/openscale/gui/preferences/AboutPreferences.java b/android_app/app/src/main/java/com/health/openscale/gui/preferences/AboutPreferences.java
new file mode 100644
index 00000000..278cbc7f
--- /dev/null
+++ b/android_app/app/src/main/java/com/health/openscale/gui/preferences/AboutPreferences.java
@@ -0,0 +1,35 @@
+/* Copyright (C) 2014  olie.xdev <olie.xdev@googlemail.com>
+*
+*    This program is free software: you can redistribute it and/or modify
+*    it under the terms of the GNU General Public License as published by
+*    the Free Software Foundation, either version 3 of the License, or
+*    (at your option) any later version.
+*
+*    This program is distributed in the hope that it will be useful,
+*    but WITHOUT ANY WARRANTY; without even the implied warranty of
+*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*    GNU General Public License for more details.
+*
+*    You should have received a copy of the GNU General Public License
+*    along with this program.  If not, see <http://www.gnu.org/licenses/>
+*/
+package com.health.openscale.gui.preferences;
+
+import android.os.Bundle;
+import android.preference.PreferenceFragment;
+
+import com.health.openscale.BuildConfig;
+import com.health.openscale.R;
+
+public class AboutPreferences extends PreferenceFragment {
+    private static final String KEY_APP_VERSION = "pref_app_version";
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        addPreferencesFromResource(R.xml.about_preferences);
+
+        findPreference(KEY_APP_VERSION).setSummary("v" + BuildConfig.VERSION_NAME);
+    }
+}
diff --git a/android_app/app/src/main/res/drawable-hdpi/ic_preferences_about.png b/android_app/app/src/main/res/drawable-hdpi/ic_preferences_about.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b8f9d49cf479597b6d0a8bac4d4af4385425c1e
GIT binary patch
literal 460
zcmV;-0W<!IP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x0f9+GK~zYIz17c4R8bTM@Q-gPZlt8KX*TJ`WlSL`^bZJPi+241g-HKK
zYmsp8u2slDy48XL{{-Fi!-6(NAUQJWV$S0|M&~{!#`(hG-gDmfeDAsEaqk_IMh#D}
zf(E7{{u7_^Hta`*&Lzy^4LUfluugDit`Zu%BDR7pOoaar@3CL1w1&r6L>93>c!up%
z<u6NBpJE;L1iy|Av`f2L>qlNLiGRU^R3$xV;%jM<rC!1`ewW1W4IrMQfp4Ml3wO#N
zHx+H^S9w$MW1D?A4;Ag&$b)s9MQ}Y);dK^(*THG)cE+lrcXtzslXx07ncy`P|MEG!
z3uiBpG$=lVW-G(}2!5(a8rN-2Gv+CLjBzGYwB>t6(i{%L<|??yG1jwE@Vp}FzmO>^
zPo3C7k!u}iI0|QBhzl&nc$lFT&b;C5qJc*-Z!v;{#tmN;jNr24hOg@!Lw|5a{$%F3
zjaN8P{pg<r_ttfUdr`v+?CKuKzhOt%(Y=mqDS-<;O_3V0|FmBK0000<MNUMnLSTXs
CIMIjz

literal 0
HcmV?d00001

diff --git a/android_app/app/src/main/res/drawable-ldpi/ic_preferences_about.png b/android_app/app/src/main/res/drawable-ldpi/ic_preferences_about.png
new file mode 100644
index 0000000000000000000000000000000000000000..17da8d23a2b94ce7ab3f7297c5375b8eb44aa209
GIT binary patch
literal 253
zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&kwj^(N7l!{JxM1({$v}}!o-U3d
z8WX2pGR$&v6ls0f-!7$Sqdj{9?-8reBcVGuSecy^3iZG3>U_ZD;_ML9pm6P4*|MGd
z>Wh2r=OoQAetvH5&X|mZ4%5DcqHHTpR~*y-_QOfv<RGJc#i}#DIUjnB{GGVFIdTrL
zmsR-qTn=!Ryn6i6x%rV<)>DiQZaUyC<MpyV=-P`bNrmUk;`6^0wJ}BSxohyGWTURZ
y@!kJ@pHGoUWaEEV6ZY=Uj;<0DzlEzW{$MWF)7X;wwr3{L^$eb_elF{r5}E+B^=5|v

literal 0
HcmV?d00001

diff --git a/android_app/app/src/main/res/drawable-mdpi/ic_preferences_about.png b/android_app/app/src/main/res/drawable-mdpi/ic_preferences_about.png
new file mode 100644
index 0000000000000000000000000000000000000000..025e312f1bcd89e8b37eb1db9285941a901112e2
GIT binary patch
literal 333
zcmV-T0kZyyP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x0Rl-xK~y-6mD9aSLqQY-;4hcNmr!hsQIkRt-_BMLgovQvJ6MFI@$Uh&
z5iE>?mTB#^h$a^IXySEmLI$SUGiP^pcMkv2!V&s-3qGQaW<vjq8cy(uFWllhc!yEc
zjzjwgOSr}u9jqk|sG}R2%i<<yQP`hl5fvPS_Vj1571lb5hWlV~lV0>}i93x-Z0`k&
zXhcuDf@i#AcaHrc9#GA&g4YsJFPOp$R;$S5kCMXj3<qOWG7PXW&u;>o7-YD?j`Smz
zp@D6Ab~G`x_%{y21@i1K8l=PNLJe0YQLZPN*G-~)fof4OJxpWy1a^b{SSuZ-Y5a`y
f6F!1{CFA@Jjs8dmpWj3?00000NkvXXu0mjf`;3hU

literal 0
HcmV?d00001

diff --git a/android_app/app/src/main/res/drawable-xhdpi/ic_preferences_about.png b/android_app/app/src/main/res/drawable-xhdpi/ic_preferences_about.png
new file mode 100644
index 0000000000000000000000000000000000000000..cff26f33a414831bd8f655fb93abe18b1234afd3
GIT binary patch
literal 649
zcmV;40(Sk0P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x0zOGZK~z|U&DXnYR6!I5@ZVlHij5J>ni$Z;bSh|JsiYFLur-Asc9zCc
zM8Tk-{s)PVPEdRlLK;C6QV6zMSjI$96a$h(<2$jq8=bxGV{YOuesE#t%y%C1y5~$m
zJT~Gm4qzv?VQqQr8>aCBk1&ea9JcGC3s><OOOf9KhS9ki$89)+`5cb3-z-j}Sj$PF
zhP;G(=+DT1VnVvaQ+QjJZ$Yngi~6x9qc@HL%+v}b#4fy4Ig>dIVRM9jCocGV<tDMC
zk#ZMaWfX6tBPQ|;O1PV`HKooZ*5heFUX;$d);7hUAYF~c!0r>Qt46+<iFRlejvLv&
zlqGcIQ$V<*@ytg8{zwCE0rvy`SM-I1VU<^>)WBfg07wsKcrZsGk^bS12gJ*GA7L;r
z-r-8nKZbTV8btLSn<5Q%NSCos{4FWrN8oP&t_OngNJFc^MBr~Y!R}!2VG9BXee5Y>
zdmxz3Vd#W3Gm>V&tC4!4kG>){1cEm?0@#Zq<@Sdhdar|ad!q8bFXb@wPmriA9J*WJ
zGxRZ=NHgCudRh=bZ_u7h@H`M4YC!-8gZ8roV}W45_#e?qP{O{TKbGJDK9&VV3^p-<
zQ~p#-^B7H}S@32+8Wfj|@}d(bgZ?dP@%npkPV3U~7nyVnXH^yr%`8aHS0lBlOcc#3
z$sVgyrkA9JW3!6VNfEcKrDgel`7l{VoAj{cc@tK9Bc4-d&tuSo8#x16z%^`bWIWFa
jul77&KAbaF_&omw^y2RaI%Vj&00000NkvXXu0mjfGm;|?

literal 0
HcmV?d00001

diff --git a/android_app/app/src/main/res/drawable-xxhdpi/ic_preferences_about.png b/android_app/app/src/main/res/drawable-xxhdpi/ic_preferences_about.png
new file mode 100644
index 0000000000000000000000000000000000000000..1e5957f5ff0150d863b0f150f58fb71716aa3b05
GIT binary patch
literal 1013
zcmV<R0}A|!P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv0RI60
z0RN!9r;`8x1FA_xK~!jg)!NN#T}2qj@y|U*8>%)jqO>5^Hz)!B04=Dfh;%1ZMI)7p
zHWb`wL07)7L|3}7xYC7ap^BnwMOuihFRLO_s{t3jCDq=hRYI+ai@BE^&z*B$&YhE{
zUl>T{o_U_%nK@^knP*Nz8YXZ%w&F%i;*!EOr|}(*U<RM#&qV$!F^*{*#J^Y`u$;vK
z?84Y;3g3uVuuwsCSviT9ab=yt*Wm^HoltnO{MGWYF17gU@YMi97BPz-TV=LY*Khm7
z*qloIHk|0;@OQj{?YJ6^h@GtU+kM!J`5rd^z}>@&e+2(@aq=bZ#f24YUnJbj*In$N
z!NXO>@5EAx;h$T=Q*l3jE%CL49fKO&ro89(2~%ilF2nv3pJ#AazlJso0VdWHdy-0y
z^R)QLAIDX_8ebqp$(Z=Z>d_lzTKpys2$Ml6Ped9m<H;Jumhn`HmdDE)Y!Z*I`zkn}
zj@X&5VCRE~ou*vG&JV{PTv{;j3wBp<oQhpSjL9=5@<fb__kPu>GSvvcgArRzY+z*s
z9@5$Shwy$yrzv?4-xTV`Fvb6Gpvdb(IGt}f&6oKh?7bGLn`-~DQRkF3CxrU7!l=&J
zw1g`%+@^E!^|28B)(VUGq)^wutr>2PH2AD`NrUrgq;6}5Es-A%)hwn8UqtG*H1Gqi
z&s8qsV&NI9$|P<n)EyKy^;H=W5(D|&+V_M-QvT(b9l}YQlyM->PX(KEna=tDbOJ|p
zu~7JbLu_TYyc$YUk?HL5;)tvzirN-3VZ)whlOAjCbHs=cbn~3ZaI8={ifdLw(STg5
zGhcKp!_mmaH`T9aU}6FHXeJ&Y?x<Nz74D4G&A{b4le0~%AHrGcIIv#GpXTkI#ds!U
zzz!E0jNzUk9HwTw)&?fW44UoP=B-GhXRM9cXavti>fdHX;C`GcTrerOX*h@Mzzv1E
zlUlpQ_6;=gW~A|}>dC_O%Y<-lP-L&pWkqRP<wNmob2n1F#0_B+(>1M9q%5)Z?10Ww
z@M4LU(!>_sQ;R8<!~L>5qM@(UBHfd_&l~)48iWR3iumq3x!a~&di^8yyx0@s&-}6h
z)9Y<^DnH=(O*p+t5hpS{Dx?r&zA7DXwCQ!kbVN8^8LeP@6c6CrF7}5yVrtXRAzu^k
z2zkt2hkR3bSLfQMSdtv_wK=bkS=(g7aP~SL9j45+eAGG9oxh(N6j>7=d!!nw*ylFm
jR<a1Egcm*e=QjTVFQy*x9USPK00000NkvXXu0mjf!(I6Z

literal 0
HcmV?d00001

diff --git a/android_app/app/src/main/res/drawable-xxxhdpi/ic_preferences_about.png b/android_app/app/src/main/res/drawable-xxxhdpi/ic_preferences_about.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d7984f7fd80575e59ba586aab6dd76670357432
GIT binary patch
literal 1299
zcmV+u1?>8XP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00006VoOIv0RI60
z0RN!9r;`8x1jtE5K~#90<=bnh6;%`m@ZTBj;k(p`x<n7s)GR^mQ)m!r4}=IZsX%&v
z3nB_LqDUy{O%Xywl+}l#AhnVRA}ac3CFLt6rP9>Ag{3BCUi+}`?cQ#)=gv82X3jbI
zhyCH~J$tSHT4!dz*4j1Y<5XON^D!Bda56^W_}*v!!a@9st=NJM_yj*!z_D=5##8tP
zJviE6>A}}{5;H5cpaG1=J=mymgNG^`aJTUGv<*gK3HB<_@WEw|;OvnV*cU|&cc5E!
zh7T^gu(+2?r8om0G(o)RvIbp^7}AL6uEtB4P-nkG!Z*BG80io67Q*;3T9_rKU>Zi$
zDZd*x<Gnij<wgyUsc%&O5l`SUoLGmh5tt{;Bs=QR*Mmou@JSqpSL-0LS}-~(K=&}r
z$Gh@7|78p>KsUXDR^?Q@5*HMuI0Z8VN95u1j^Mne@nQ~T+i+D8%5q`>w&&pWLbHk<
z%%S8>jBQp?12_q9=iqmLqY4(t{^ojw#Yn5ML^jVOxUycMXA2vXn9#$*0;FAVlfWs)
zw;N~X6;{Ki8NzySOJUTD!)>xZg^%T&9v2TG=%Ip%7l~!Ex!*99fN|KJAz-EE7a6lM
z<j-nSc1>6b#^nEmF<Am0$mqOXILK%gWjX-H<A)3#_r*Gn!@i7;^9mqG`3``~Gjw!|
zyajh<bXrvqF{*I@VTTygb7xwI*h$V2VTV=}s&c?IfqR;s^@AV2D1+1+1(KpV2f$ky
zx@OY9V_K9UWO>1)w&A*rwj!|{*GAeF;mf`s>!o|?J1sbFDiAgCP1Cx*hfWb+OFv#M
z-%{|j_}Dff!Cdiw`NJw0mW-GU3Fai29(mwTd|nErYVny6c}m0dM0|?dC>&&VIt~g4
zv1ynx9Op(Fx0J)jNKB2iZNeWV=-h$}Q|c!T7Y4yJ6g?&NVJg-}+GgX65_HCFnV5+0
zj(#tJNUQK$q<(B71SHaMAX49n*dM7MlZa1&M@u5p3Pf#5WO%0>E-gXq)OvrG16py^
zT^7bg>h~u?Tt5xxltiW#h}p6?!MBmd*j(L-h}p6^5kl2zI8Xf{>UP8^Au%frTN5d#
zBfU5Q7nee*TFlX(jW!tT6a7JuG|VrBQniTL&?9V=z*o}u%sUhmVjh4hkHm%vv4AvP
zYw1s5_$VTvOJ{!ub8%Xv?LRip5dT+J7EG$jHy|sSV%p$`*F_%e5gb$$s&YWqN%z0I
z(SbQUuS5jZgrH-m;o*$76={_tg$&G?*RCmuSQT%;!VDcdWn`=!)4@@~reRk`=S~lg
z@04Sgdwqt0qdGf5VqsoEA7%*Y)D)RD^$6<{ZfeAY9mcH%5ibI_%TAKoExsU%;tKKb
za$i}dwXwqlkEHM#SdM5Sxg%><=qsy*q{XT+9`EPix3pPB&*xCmuBo!m7NIP`YdMtl
zO_S}CEWJW8+3NHPdM>Bpc1V|hrXbz_!%{;Ji~~#67bgD3z4aK>$Ot|kuZzbNV>l!P
zDYxN!Azkg4-nNOt6`Zq#JmtyiKabpl8^zBy3PqRpyEJursTN1DK=?;nW%wpsTDp}(
z;F!HQIT*+6)!8(3%;o7S*70fA=O+rw=f0rjJ|T%=uZpkF{{z;d+xe0%We5NO002ov
JPDHLkV1h{KXF31?

literal 0
HcmV?d00001

diff --git a/android_app/app/src/main/res/values-de/strings.xml b/android_app/app/src/main/res/values-de/strings.xml
index 240c1e44..69943f6a 100644
--- a/android_app/app/src/main/res/values-de/strings.xml
+++ b/android_app/app/src/main/res/values-de/strings.xml
@@ -149,4 +149,8 @@
     <string name="label_estimate_lbw">Fettfreie Körpermassenschätzung</string>
     <string name="label_estimate_lbw_formula">Fettfreie Körpermassenformel</string>
     <string name="label_lbw">Fettfreie Körpermasse</string>
+    <string name="label_license">Lizenz</string>
+    <string name="label_maintainer">Hauptentwickler</string>
+    <string name="label_website">Webseite</string>
+    <string name="title_about">Info</string>
 </resources>
\ No newline at end of file
diff --git a/android_app/app/src/main/res/values/strings.xml b/android_app/app/src/main/res/values/strings.xml
index 119bd752..34920ba8 100644
--- a/android_app/app/src/main/res/values/strings.xml
+++ b/android_app/app/src/main/res/values/strings.xml
@@ -9,6 +9,7 @@
     <string name="title_users">Users</string>
     <string name="title_data">Data</string>
     <string name="title_measurements">Measurements</string>
+    <string name="title_about">About</string>
 
     <string name="action_settings">Settings</string>
     <string name="action_bluetooth_status">Bluetooth Status</string>
@@ -130,6 +131,10 @@
     <string name="label_category_measurement_database">Measurement database</string>
     <string name="label_category_misc">Miscellaneous</string>
 
+    <string name="label_maintainer">Maintainer</string>
+    <string name="label_website">Website</string>
+    <string name="label_license">License</string>
+
     <string name="label_estimate_water_formula">Body water formula</string>
     <string name="label_estimate_lbw_formula">Body lean body weight formula</string>
     <string name="label_estimate_fat_formula">Body fat formula</string>
diff --git a/android_app/app/src/main/res/xml/about_preferences.xml b/android_app/app/src/main/res/xml/about_preferences.xml
new file mode 100644
index 00000000..7371faf9
--- /dev/null
+++ b/android_app/app/src/main/res/xml/about_preferences.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <Preference
+        android:key="pref_app_version"
+        android:persistent="false"
+        android:selectable="false"
+        android:title="openScale" />
+    <Preference
+        android:persistent="false"
+        android:selectable="false"
+        android:title="@string/label_maintainer"
+        android:summary="olie.xdev &lt;olie.xdev@googlemail.com&gt;"/>
+    <Preference
+        android:persistent="false"
+        android:selectable="false"
+        android:title="@string/label_website"
+        android:summary="https://github.com/oliexdev/openScale"/>
+    <Preference
+        android:persistent="false"
+        android:selectable="false"
+        android:title="@string/label_license"
+        android:summary="GPLv3"/>
+</PreferenceScreen>
\ No newline at end of file
diff --git a/android_app/app/src/main/res/xml/header_preferences.xml b/android_app/app/src/main/res/xml/header_preferences.xml
index 45601994..9130ee37 100644
--- a/android_app/app/src/main/res/xml/header_preferences.xml
+++ b/android_app/app/src/main/res/xml/header_preferences.xml
@@ -24,4 +24,8 @@
         android:fragment="com.health.openscale.gui.preferences.BackupPreferences"
         android:title="@string/label_backup"
         android:icon="@drawable/ic_preferences_backup"/>
+    <header
+        android:fragment="com.health.openscale.gui.preferences.AboutPreferences"
+        android:title="@string/title_about"
+        android:icon="@drawable/ic_preferences_about"/>
 </preference-headers>
\ No newline at end of file