Skip to content

Commit ebce2e6

Browse files
thanksmisterthanksmister
committed
* fix for settings icons clipped in portrait on some devices
* fix for fingerprint being used without setting active * fix error on logs layout screen
1 parent 86c566e commit ebce2e6

File tree

8 files changed

+323
-38
lines changed

8 files changed

+323
-38
lines changed

‎app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ repositories {
4040
def versionMajor = 0
4141
def versionMinor = 7
4242
def versionPatch = 7
43-
def versionBuild = 0 // bump for dog food builds, public betas, etc.
43+
def versionBuild = 1 // bump for dog food builds, public betas, etc.
4444

4545
def ALARM_CODE() {
4646
Properties properties = new Properties()

‎app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/ui/views/BaseAlarmView.kt

+17-16
Original file line numberDiff line numberDiff line change
@@ -97,23 +97,24 @@ abstract class BaseAlarmView : LinearLayout {
9797
@SuppressLint("InlinedApi")
9898
override fun onVisibilityChanged(changedView: View?, visibility: Int) {
9999
super.onVisibilityChanged(changedView, visibility)
100+
if(useFingerprint) {
101+
// TODO looks like this throws an error internally
102+
try {
103+
fingerPrintIdentity = FingerprintIdentify(context, BaseFingerprint.FingerprintIdentifyExceptionListener {
104+
Timber.w("Fingerprint Error: " + it.message)
105+
})
106+
} catch (e: ClassNotFoundException) {
107+
Timber.w("Fingerprint: " + e.message)
108+
}
100109

101-
// TODO looks like this throws an error internally
102-
try {
103-
fingerPrintIdentity = FingerprintIdentify(context, BaseFingerprint.FingerprintIdentifyExceptionListener {
104-
Timber.e("Fingerprint Error: " + it.message)
105-
})
106-
} catch (e : ClassNotFoundException) {
107-
Timber.e("Fingerprint: " + e.message)
108-
}
109-
110-
if(fingerPrintIdentity != null) {
111-
if(fingerPrintIdentity!!.isFingerprintEnable && fingerPrintIdentity!!.isHardwareEnable) {
112-
if (!this.isShown){
113-
stopFingerprintIdentity()
114-
return
115-
} else {
116-
startFingerprintIdentity()
110+
if (fingerPrintIdentity != null) {
111+
if (fingerPrintIdentity!!.isFingerprintEnable && fingerPrintIdentity!!.isHardwareEnable) {
112+
if (!this.isShown) {
113+
stopFingerprintIdentity()
114+
return
115+
} else {
116+
startFingerprintIdentity()
117+
}
117118
}
118119
}
119120
}

‎app/src/main/res/layout-land/fragment_settings.xml

+285
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,285 @@
1+
<!--
2+
~
3+
~ ~ Copyright (c) 2017. ThanksMister LLC
4+
~ ~
5+
~ ~ Licensed under the Apache License, Version 2.0 (the "License");
6+
~ ~ you may not use this file except in compliance with the License.
7+
~ ~ You may obtain a copy of the License at
8+
~ ~
9+
~ ~ http://www.apache.org/licenses/LICENSE-2.0
10+
~ ~
11+
~ ~ Unless required by applicable law or agreed to in writing, software distributed
12+
~ ~ under the License is distributed on an "AS IS" BASIS,
13+
~ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
~ ~ See the License for the specific language governing permissions and
15+
~ ~ limitations under the License.
16+
~
17+
-->
18+
19+
20+
<android.support.v7.widget.GridLayout
21+
xmlns:android="http://schemas.android.com/apk/res/android"
22+
xmlns:app="http://schemas.android.com/apk/lib/android.support.v7.widget.GridLayout"
23+
xmlns:grid="http://schemas.android.com/apk/res-auto"
24+
android:layout_width="match_parent"
25+
android:layout_height="wrap_content"
26+
grid:alignmentMode="alignBounds"
27+
grid:columnCount="3">
28+
29+
<LinearLayout
30+
android:id="@+id/buttonAlarmSettings"
31+
android:layout_width="wrap_content"
32+
android:layout_height="wrap_content"
33+
android:foreground="?android:attr/selectableItemBackground"
34+
android:orientation="vertical"
35+
grid:layout_columnWeight="1"
36+
grid:layout_gravity="center"
37+
grid:layout_rowWeight="1">
38+
39+
<ImageView
40+
android:layout_width="48dp"
41+
android:layout_height="48dp"
42+
android:layout_gravity="center_horizontal"
43+
android:src="@drawable/ic_lock"
44+
android:tint="@color/gray" />
45+
46+
<Space
47+
android:layout_width="wrap_content"
48+
android:layout_height="8dp" />
49+
50+
<TextView
51+
style="@style/TextAppearance.TextLarge"
52+
android:layout_width="wrap_content"
53+
android:layout_height="wrap_content"
54+
android:layout_gravity="fill_horizontal"
55+
android:lines="1"
56+
android:ellipsize="end"
57+
android:text="@string/preference_title_alarm" />
58+
59+
</LinearLayout>
60+
61+
<LinearLayout
62+
android:id="@+id/buttonMqttSettings"
63+
android:layout_width="wrap_content"
64+
android:layout_height="wrap_content"
65+
android:foreground="?android:attr/selectableItemBackground"
66+
android:orientation="vertical"
67+
grid:layout_columnWeight="1"
68+
grid:layout_gravity="center"
69+
grid:layout_rowWeight="1">
70+
71+
<ImageView
72+
android:layout_width="48dp"
73+
android:layout_height="48dp"
74+
android:layout_gravity="center_horizontal"
75+
android:src="@drawable/ic_cloud"
76+
android:tint="@color/gray" />
77+
78+
<Space
79+
android:layout_width="wrap_content"
80+
android:layout_height="8dp" />
81+
82+
<TextView
83+
style="@style/TextAppearance.TextLarge"
84+
android:layout_width="wrap_content"
85+
android:layout_height="wrap_content"
86+
android:layout_gravity="fill_horizontal"
87+
android:lines="1"
88+
android:ellipsize="end"
89+
android:text="@string/preference_title_mqtt_server" />
90+
91+
</LinearLayout>
92+
93+
<LinearLayout
94+
android:id="@+id/buttonNotificationSettings"
95+
android:layout_width="wrap_content"
96+
android:layout_height="wrap_content"
97+
android:foreground="?android:attr/selectableItemBackground"
98+
android:orientation="vertical"
99+
grid:layout_columnWeight="1"
100+
grid:layout_gravity="center"
101+
grid:layout_rowWeight="1">
102+
103+
<ImageView
104+
android:layout_width="48dp"
105+
android:layout_height="48dp"
106+
android:layout_gravity="center_horizontal"
107+
android:src="@drawable/ic_room_service"
108+
android:tint="@color/gray" />
109+
110+
<Space
111+
android:layout_width="wrap_content"
112+
android:layout_height="8dp" />
113+
114+
<TextView
115+
style="@style/TextAppearance.TextLarge"
116+
android:layout_width="wrap_content"
117+
android:layout_height="wrap_content"
118+
android:layout_gravity="fill_horizontal"
119+
android:lines="1"
120+
android:ellipsize="end"
121+
android:text="@string/preference_title_notification" />
122+
123+
</LinearLayout>
124+
125+
<LinearLayout
126+
android:id="@+id/buttonCameraSettings"
127+
android:layout_width="wrap_content"
128+
android:layout_height="wrap_content"
129+
android:foreground="?android:attr/selectableItemBackground"
130+
android:orientation="vertical"
131+
grid:layout_columnWeight="1"
132+
grid:layout_gravity="center"
133+
grid:layout_rowWeight="1">
134+
135+
<ImageView
136+
android:layout_width="48dp"
137+
android:layout_height="48dp"
138+
android:layout_gravity="center_horizontal"
139+
android:src="@drawable/ic_photo_camera"
140+
android:tint="@color/gray" />
141+
142+
<Space
143+
android:layout_width="wrap_content"
144+
android:layout_height="8dp" />
145+
146+
<TextView
147+
style="@style/TextAppearance.TextLarge"
148+
android:layout_width="wrap_content"
149+
android:layout_height="wrap_content"
150+
android:layout_gravity="fill_horizontal"
151+
android:lines="1"
152+
android:ellipsize="end"
153+
android:text="@string/preference_camera"/>
154+
155+
</LinearLayout>
156+
157+
<LinearLayout
158+
android:id="@+id/buttonScreenSaverSettings"
159+
android:layout_width="wrap_content"
160+
android:layout_height="wrap_content"
161+
android:foreground="?android:attr/selectableItemBackground"
162+
android:orientation="vertical"
163+
grid:layout_columnWeight="1"
164+
grid:layout_gravity="center"
165+
grid:layout_rowWeight="1">
166+
167+
<ImageView
168+
android:layout_width="48dp"
169+
android:layout_height="48dp"
170+
android:layout_gravity="center_horizontal"
171+
android:src="@drawable/ic_wallpaper"
172+
android:tint="@color/gray" />
173+
174+
<Space
175+
android:layout_width="wrap_content"
176+
android:layout_height="8dp" />
177+
178+
<TextView
179+
style="@style/TextAppearance.TextLarge"
180+
android:layout_width="wrap_content"
181+
android:layout_height="wrap_content"
182+
android:layout_gravity="fill_horizontal"
183+
android:lines="1"
184+
android:ellipsize="end"
185+
android:text="@string/preference_title_screen_saver_title" />
186+
187+
</LinearLayout>
188+
189+
<LinearLayout
190+
android:id="@+id/buttonWeatherSettings"
191+
android:layout_width="wrap_content"
192+
android:layout_height="wrap_content"
193+
android:foreground="?android:attr/selectableItemBackground"
194+
android:orientation="vertical"
195+
grid:layout_columnWeight="1"
196+
grid:layout_gravity="center"
197+
grid:layout_rowWeight="1">
198+
199+
<ImageView
200+
android:layout_width="48dp"
201+
android:layout_height="48dp"
202+
android:layout_gravity="center_horizontal"
203+
android:src="@drawable/ic_wb_sunny"
204+
android:tint="@color/gray" />
205+
206+
<Space
207+
android:layout_width="wrap_content"
208+
android:layout_height="8dp" />
209+
210+
<TextView
211+
style="@style/TextAppearance.TextLarge"
212+
android:layout_width="wrap_content"
213+
android:layout_height="wrap_content"
214+
android:layout_gravity="fill_horizontal"
215+
android:lines="1"
216+
android:ellipsize="end"
217+
android:text="@string/preference_title_weather_settings" />
218+
219+
</LinearLayout>
220+
221+
<LinearLayout
222+
android:id="@+id/buttonPlatformSettings"
223+
android:layout_width="wrap_content"
224+
android:layout_height="wrap_content"
225+
android:foreground="?android:attr/selectableItemBackground"
226+
android:orientation="vertical"
227+
grid:layout_columnWeight="1"
228+
grid:layout_gravity="center"
229+
grid:layout_rowWeight="1">
230+
231+
<ImageView
232+
android:layout_width="48dp"
233+
android:layout_height="48dp"
234+
android:layout_gravity="center_horizontal"
235+
android:src="@drawable/ic_home"
236+
android:tint="@color/gray" />
237+
238+
<Space
239+
android:layout_width="wrap_content"
240+
android:layout_height="8dp" />
241+
242+
<TextView
243+
style="@style/TextAppearance.TextLarge"
244+
android:layout_width="wrap_content"
245+
android:layout_height="wrap_content"
246+
android:lines="1"
247+
android:ellipsize="end"
248+
android:layout_gravity="fill_horizontal"
249+
android:text="@string/preference_title_web_settings" />
250+
251+
</LinearLayout>
252+
253+
<LinearLayout
254+
android:id="@+id/buttonAboutSettings"
255+
android:layout_width="wrap_content"
256+
android:layout_height="wrap_content"
257+
android:foreground="?android:attr/selectableItemBackground"
258+
android:orientation="vertical"
259+
grid:layout_columnWeight="1"
260+
grid:layout_gravity="center"
261+
grid:layout_rowWeight="1">
262+
263+
<ImageView
264+
android:layout_width="48dp"
265+
android:layout_height="48dp"
266+
android:layout_gravity="center_horizontal"
267+
android:src="@drawable/ic_mister"
268+
android:tint="@color/gray" />
269+
270+
<Space
271+
android:layout_width="wrap_content"
272+
android:layout_height="8dp" />
273+
274+
<TextView
275+
style="@style/TextAppearance.TextLarge"
276+
android:layout_width="wrap_content"
277+
android:layout_height="wrap_content"
278+
android:layout_gravity="fill_horizontal"
279+
android:lines="1"
280+
android:ellipsize="end"
281+
android:text="@string/text_about"/>
282+
283+
</LinearLayout>
284+
285+
</android.support.v7.widget.GridLayout>

‎app/src/main/res/layout/fragment_logs.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,4 @@
2222
xmlns:tools="http://schemas.android.com/tools"
2323
android:id="@+id/list"
2424
android:layout_width="match_parent"
25-
android:layout_height="match_parent"
26-
app:layoutManager="LinearLayoutManager"/>
25+
android:layout_height="match_parent"/>

‎app/src/main/res/values-es/strings.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<!-- Preferences -->
2323
<string name="preference_summary_security_code">Establece el código por defecto para la alarma (el preestablecido es 1234).</string>
2424
<string name="preference_title_security_code">Código de seguridad</string>
25-
<string name="preference_title_mqtt_server">Ajustes de MQTT</string>
25+
<string name="preference_title_mqtt_server">MQTT</string>
2626
<string name="preference_summary_mqtt_server">Ajuste de los valores para el servicio MQTT</string>
2727
<string name="preference_title_broker">MQTT Broker</string>
2828
<string name="preference_summary_broker">Especifica la dirrección del servidor "MQTT broker". Para tcp/ssl, no incluyas el prefijo (192.168.1.1). De lo contrario, inclúyelo (http://192.168.1.1).</string>
@@ -40,7 +40,7 @@
4040
<string name="preference_summary_username">Especifica el usuario para el servicio, si es necesario.</string>
4141
<string name="preference_title_password">Contraseña</string>
4242
<string name="preference_summary_password">Especifica la contraseña para el servicio, si es necesaria.</string>
43-
<string name="preference_title_alarm">Ajustes de la alarma</string>
43+
<string name="preference_title_alarm">Alarma</string>
4444
<string name="preference_summary_alarm">Ajustes del código de la alrma</string>
4545
<string name="preference_title_pending_time">Tiempo de espera</string>
4646
<string name="preference_summary_pending_time">El tiempo espera en segundos antes de que la alarma se active en los mdos "En casa" o "Fuera de casa". Actualmente es de %1$s segundos.</string>
@@ -80,7 +80,7 @@
8080
<string name="preference_title_image_rotation">Intervalo de la rotación de imágenes</string>
8181
<string name="preference_summary_image_rotation">Tiempo en minutos para la actualización de las imágenes. Actualmete es de %1$s.</string>
8282

83-
<string name="preference_title_web_settings">Domótica</string>
83+
<string name="preference_title_web_settings">HASS</string>
8484
<string name="preference_summary_web_settings">Te permite introducir una dirección para el acceso a tu sistema de domótica.</string>
8585
<string name="preference_title_web">Página para el sistema de domótica</string>
8686
<string name="preference_summary_web">Visualiza la página de tu sistema de domótica deslizando la pantalla principal.</string>
@@ -113,7 +113,7 @@
113113
<string name="preference_tts_topic_summary">Formato de ejemplo para el "message topic" y "alarmState" que será reproducido (ten en cuenta que para reproducir locuciones TTS, se necesitan unos altavoces externos): \n\n"{\"topic\":\"home/notification\", \"payload\":\"Hello!\"}"</string>
114114

115115

116-
<string name="preference_camera"> Cámara</string>
116+
<string name="preference_camera">Cámara</string>
117117
<string name="preference_camera_title">Capturas con la cámara</string>
118118
<string name="preference_camera_summary">Uso de la cámara para la captura de una imagen y enviarla por email cuando alguien desactiva la alarma. (Nota: Requiere Android Lollipop o superior.)</string>
119119

0 commit comments

Comments
 (0)