Skip to content

Commit

Permalink
* Fix for text not showing in night mode for fingerprint scanner
Browse files Browse the repository at this point in the history 
* Adjusted disable dialog UI for larger screens
  • Loading branch information
@thanksmister
thanksmister committed Sep 2, 2018
1 parent 7b4be51 commit 4bb7ae1
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 28 deletions.
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ repositories {
def versionMajor = 0
def versionMinor = 8
def versionPatch = 3
def versionBuild = 3 // bump for dog food builds, public betas, etc.
def versionBuild = 4 // bump for dog food builds, public betas, etc.

def ALARM_CODE() {
Properties properties = new Properties()
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/thanksmister/iot/mqtt/alarmpanel/ui/activities/MainActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class MainActivity : BaseActivity(), ViewPager.OnPageChangeListener, ControlsFra
view_pager.addOnPageChangeListener(this)
view_pager.setPagingEnabled(false)

/* if(BuildConfig.DEBUG) {
if(BuildConfig.DEBUG) {
configuration.alarmCode = BuildConfig.ALARM_CODE
darkSkyOptions.darkSkyKey = BuildConfig.DARK_SKY_KEY
darkSkyOptions.latitude = BuildConfig.LATITUDE
Expand All @@ -104,7 +104,7 @@ class MainActivity : BaseActivity(), ViewPager.OnPageChangeListener, ControlsFra
configuration.setWebModule(true)
configuration.setShowWeatherModule(true)
configuration.setTssModule(true)
}*/
}

if (configuration.isFirstTime) {
alertDialog = AlertDialog.Builder(this@MainActivity, R.style.CustomAlertDialog)
Expand Down
4 changes: 1 addition & 3 deletions app/src/main/res/layout-land/dialog_alarm_disable.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@

<TextView
android:id="@+id/disable_fingerprint_layout"
android:textColor="@color/body_text_1"
tools:visibility="visible"
android:visibility="invisible"
android:layout_width="wrap_content"
Expand All @@ -75,9 +76,6 @@
android:drawableLeft="@drawable/ic_fingerprint"
android:drawableStart="@drawable/ic_fingerprint"
android:paddingBottom="8dp"
android:paddingEnd="4dp"
android:paddingRight="4dp"
android:paddingTop="8dp"
android:text="@string/text_touch_sensor"/>

<LinearLayout
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/layout-sw600dp-land/dialog_alarm_code_set.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
android:orientation="horizontal">

<include layout="@layout/view_keypad"
android:layout_width="300dp"
android:layout_height="360dp"/>
android:layout_width="320dp"
android:layout_height="400dp"/>

<android.support.v4.widget.Space
android:layout_width="8dp"
Expand All @@ -36,7 +36,7 @@
<RelativeLayout
android:layout_width="320dp"
android:paddingTop="16dp"
android:layout_height="360dp"
android:layout_height="400dp"
android:orientation="vertical">

<TextView
Expand Down
25 changes: 9 additions & 16 deletions app/src/main/res/layout-sw600dp-land/dialog_alarm_disable.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,20 @@
android:id="@+id/alarmDisableView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

android:padding="16dp"
android:orientation="horizontal">

<include layout="@layout/view_keypad"
android:layout_width="460dp"
android:layout_height="460dp"/>
android:layout_width="320dp"
android:layout_height="400dp"/>

<android.support.v4.widget.Space
android:layout_width="16dp"
android:layout_width="8dp"
android:layout_height="match_parent"/>

<RelativeLayout
android:layout_width="320dp"
android:layout_height="460dp"
android:layout_height="400dp"
android:orientation="vertical">

<LinearLayout
Expand All @@ -46,10 +45,7 @@
android:layout_alignParentTop="true"
android:gravity="center_horizontal|top"
android:layout_above="@+id/disable_fingerprint_layout"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:paddingRight="32dp"
android:paddingLeft="32dp">
android:padding="8dp">

<com.todddavies.components.progressbar.ProgressWheel
android:id="@+id/countDownProgressWheel"
Expand All @@ -66,21 +62,18 @@
</LinearLayout>

<TextView
android:visibility="invisible"
tools:visibility="visible"
android:id="@+id/disable_fingerprint_layout"
android:textColor="@color/body_text_1"
tools:visibility="visible"
android:visibility="invisible"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@+id/imageLayout"
android:layout_centerHorizontal="true"
android:drawableLeft="@drawable/ic_fingerprint"
android:drawableStart="@drawable/ic_fingerprint"
android:layout_centerInParent="true"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingRight="4dp"
android:paddingEnd="4dp"
android:text="@string/text_touch_sensor"/>

<LinearLayout
android:id="@+id/imageLayout"
android:orientation="horizontal"
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/layout-sw600dp-land/dialog_settings_code.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
android:orientation="horizontal">

<include layout="@layout/view_keypad"
android:layout_width="300dp"
android:layout_height="360dp"/>
android:layout_width="320dp"
android:layout_height="400dp"/>

<android.support.v4.widget.Space
android:layout_width="8dp"
Expand All @@ -36,7 +36,7 @@
<RelativeLayout
android:layout_width="320dp"
android:paddingTop="16dp"
android:layout_height="360dp"
android:layout_height="400dp"
android:orientation="vertical">

<TextView
Expand Down

0 comments on commit 4bb7ae1

Please sign in to comment.