Skip to content

Commit 40a5127

Browse files
tibbitibbi
committed
adding some widget related UI changes
1 parent 447e521 commit 40a5127

4 files changed

Lines changed: 46 additions & 34 deletions

File tree

‎app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetBrightDisplayConfigureActivity.kt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ import android.graphics.Color
77
import android.os.Bundle
88
import android.widget.SeekBar
99
import com.simplemobiletools.commons.dialogs.ColorPickerDialog
10-
import com.simplemobiletools.commons.extensions.adjustAlpha
11-
import com.simplemobiletools.commons.extensions.applyColorFilter
12-
import com.simplemobiletools.commons.extensions.setFillWithStroke
10+
import com.simplemobiletools.commons.extensions.*
1311
import com.simplemobiletools.commons.helpers.DEFAULT_WIDGET_BG_COLOR
1412
import com.simplemobiletools.commons.helpers.IS_CUSTOMIZING_COLORS
1513
import com.simplemobiletools.flashlight.R
@@ -39,6 +37,9 @@ class WidgetBrightDisplayConfigureActivity : SimpleActivity() {
3937

4038
config_save.setOnClickListener { saveConfig() }
4139
config_widget_color.setOnClickListener { pickBackgroundColor() }
40+
41+
val primaryColor = getProperPrimaryColor()
42+
config_widget_seekbar.setColors(getProperTextColor(), primaryColor, primaryColor)
4243
}
4344

4445
private fun initVariables() {
@@ -84,7 +85,7 @@ class WidgetBrightDisplayConfigureActivity : SimpleActivity() {
8485

8586
private fun updateColors() {
8687
mWidgetColor = mWidgetColorWithoutTransparency.adjustAlpha(mWidgetAlpha)
87-
config_widget_color.setFillWithStroke(mWidgetColor, Color.BLACK)
88+
config_widget_color.setFillWithStroke(mWidgetColor, mWidgetColor)
8889
config_image.background.mutate().applyColorFilter(mWidgetColor)
8990
}
9091

‎app/src/main/kotlin/com/simplemobiletools/flashlight/activities/WidgetTorchConfigureActivity.kt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ import android.graphics.Color
77
import android.os.Bundle
88
import android.widget.SeekBar
99
import com.simplemobiletools.commons.dialogs.ColorPickerDialog
10-
import com.simplemobiletools.commons.extensions.adjustAlpha
11-
import com.simplemobiletools.commons.extensions.applyColorFilter
12-
import com.simplemobiletools.commons.extensions.setFillWithStroke
10+
import com.simplemobiletools.commons.extensions.*
1311
import com.simplemobiletools.commons.helpers.DEFAULT_WIDGET_BG_COLOR
1412
import com.simplemobiletools.commons.helpers.IS_CUSTOMIZING_COLORS
1513
import com.simplemobiletools.flashlight.R
@@ -40,6 +38,9 @@ class WidgetTorchConfigureActivity : SimpleActivity() {
4038

4139
config_save.setOnClickListener { saveConfig() }
4240
config_widget_color.setOnClickListener { pickBackgroundColor() }
41+
42+
val primaryColor = getProperPrimaryColor()
43+
config_widget_seekbar.setColors(getProperTextColor(), primaryColor, primaryColor)
4344
}
4445

4546
private fun initVariables() {
@@ -87,7 +88,7 @@ class WidgetTorchConfigureActivity : SimpleActivity() {
8788

8889
private fun updateColors() {
8990
mWidgetColor = mWidgetColorWithoutTransparency.adjustAlpha(mWidgetAlpha)
90-
config_widget_color.setFillWithStroke(mWidgetColor, Color.BLACK)
91+
config_widget_color.setFillWithStroke(mWidgetColor, mWidgetColor)
9192
config_image.background.mutate().applyColorFilter(mWidgetColor)
9293
}
9394

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

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:id="@+id/config_bright_display_holder"
34
android:layout_width="match_parent"
45
android:layout_height="wrap_content"
56
android:layout_centerHorizontal="true"
6-
android:layout_margin="@dimen/activity_margin"
7-
android:paddingBottom="@dimen/activity_margin">
7+
android:layout_margin="@dimen/activity_margin">
88

99
<RelativeLayout
10+
android:id="@+id/config_bright_display_wrapper"
1011
android:layout_width="match_parent"
1112
android:layout_height="match_parent"
1213
android:layout_above="@+id/config_widget_color"
@@ -24,38 +25,42 @@
2425
android:id="@+id/config_widget_color"
2526
android:layout_width="@dimen/widget_colorpicker_size"
2627
android:layout_height="@dimen/widget_colorpicker_size"
27-
android:layout_above="@+id/config_save" />
28+
android:layout_above="@+id/config_save"
29+
android:layout_margin="@dimen/tiny_margin" />
2830

2931
<RelativeLayout
3032
android:id="@+id/config_widget_seekbar_holder"
3133
android:layout_width="match_parent"
3234
android:layout_height="match_parent"
3335
android:layout_alignTop="@+id/config_widget_color"
3436
android:layout_alignBottom="@+id/config_widget_color"
35-
android:layout_toRightOf="@+id/config_widget_color"
36-
android:background="@android:color/white">
37+
android:layout_marginStart="@dimen/medium_margin"
38+
android:layout_toEndOf="@+id/config_widget_color"
39+
android:background="@drawable/widget_config_seekbar_background">
3740

38-
<SeekBar
41+
<com.simplemobiletools.commons.views.MySeekBar
3942
android:id="@+id/config_widget_seekbar"
4043
android:layout_width="match_parent"
4144
android:layout_height="wrap_content"
4245
android:layout_centerVertical="true"
43-
android:paddingLeft="@dimen/activity_margin"
44-
android:paddingRight="@dimen/activity_margin" />
46+
android:paddingStart="@dimen/activity_margin"
47+
android:paddingEnd="@dimen/activity_margin" />
4548
</RelativeLayout>
4649

4750
<Button
4851
android:id="@+id/config_save"
4952
android:layout_width="wrap_content"
5053
android:layout_height="wrap_content"
51-
android:layout_alignParentRight="true"
54+
android:layout_alignParentEnd="true"
5255
android:layout_alignParentBottom="true"
53-
android:background="@color/gradient_grey_start"
56+
android:layout_marginTop="@dimen/small_margin"
57+
android:background="@drawable/widget_config_seekbar_background"
5458
android:fontFamily="sans-serif-light"
55-
android:paddingLeft="@dimen/activity_margin"
56-
android:paddingRight="@dimen/activity_margin"
59+
android:paddingStart="@dimen/activity_margin"
60+
android:paddingEnd="@dimen/activity_margin"
5761
android:text="@string/ok"
58-
android:textColor="@color/color_primary"
62+
android:textColor="@color/dark_grey"
63+
android:textFontWeight="400"
5964
android:textSize="@dimen/big_text_size" />
6065

6166
</RelativeLayout>

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

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:id="@+id/config_torch_holder"
34
android:layout_width="match_parent"
45
android:layout_height="wrap_content"
56
android:layout_centerHorizontal="true"
6-
android:layout_margin="@dimen/activity_margin"
7-
android:paddingBottom="@dimen/activity_margin">
7+
android:layout_margin="@dimen/activity_margin">
88

99
<RelativeLayout
10+
android:id="@+id/config_torch_wrapper"
1011
android:layout_width="match_parent"
1112
android:layout_height="match_parent"
1213
android:layout_above="@+id/config_widget_color"
@@ -24,38 +25,42 @@
2425
android:id="@+id/config_widget_color"
2526
android:layout_width="@dimen/widget_colorpicker_size"
2627
android:layout_height="@dimen/widget_colorpicker_size"
27-
android:layout_above="@+id/config_save" />
28+
android:layout_above="@+id/config_save"
29+
android:layout_margin="@dimen/tiny_margin" />
2830

2931
<RelativeLayout
3032
android:id="@+id/config_widget_seekbar_holder"
3133
android:layout_width="match_parent"
3234
android:layout_height="match_parent"
3335
android:layout_alignTop="@+id/config_widget_color"
3436
android:layout_alignBottom="@+id/config_widget_color"
35-
android:layout_toRightOf="@+id/config_widget_color"
36-
android:background="@android:color/white">
37+
android:layout_marginStart="@dimen/medium_margin"
38+
android:layout_toEndOf="@+id/config_widget_color"
39+
android:background="@drawable/widget_config_seekbar_background">
3740

38-
<SeekBar
41+
<com.simplemobiletools.commons.views.MySeekBar
3942
android:id="@+id/config_widget_seekbar"
4043
android:layout_width="match_parent"
4144
android:layout_height="wrap_content"
4245
android:layout_centerVertical="true"
43-
android:paddingLeft="@dimen/activity_margin"
44-
android:paddingRight="@dimen/activity_margin" />
46+
android:paddingStart="@dimen/activity_margin"
47+
android:paddingEnd="@dimen/activity_margin" />
4548
</RelativeLayout>
4649

4750
<Button
4851
android:id="@+id/config_save"
4952
android:layout_width="wrap_content"
5053
android:layout_height="wrap_content"
51-
android:layout_alignParentRight="true"
54+
android:layout_alignParentEnd="true"
5255
android:layout_alignParentBottom="true"
53-
android:background="@color/gradient_grey_start"
56+
android:layout_marginTop="@dimen/small_margin"
57+
android:background="@drawable/widget_config_seekbar_background"
5458
android:fontFamily="sans-serif-light"
55-
android:paddingLeft="@dimen/activity_margin"
56-
android:paddingRight="@dimen/activity_margin"
59+
android:paddingStart="@dimen/activity_margin"
60+
android:paddingEnd="@dimen/activity_margin"
5761
android:text="@string/ok"
58-
android:textColor="@color/color_primary"
62+
android:textColor="@color/dark_grey"
63+
android:textFontWeight="400"
5964
android:textSize="@dimen/big_text_size" />
6065

6166
</RelativeLayout>

0 commit comments

Comments
 (0)