Skip to content

Commit fc0870a

Browse files
tibbitibbi
committed
adding some widget config related UI improvements
1 parent aac1aa7 commit fc0870a

7 files changed

Lines changed: 38 additions & 29 deletions

File tree

‎app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ android {
7070
}
7171

7272
dependencies {
73-
implementation 'com.github.SimpleMobileTools:Simple-Commons:e3376e4f56'
73+
implementation 'com.github.SimpleMobileTools:Simple-Commons:b30a1e0b37'
7474
implementation 'androidx.multidex:multidex:2.0.1'
7575
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
7676
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'

‎app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/WidgetDateConfigureActivity.kt‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,17 +116,15 @@ class WidgetDateConfigureActivity : SimpleActivity() {
116116
mWeakTextColor = mTextColorWithoutTransparency.adjustAlpha(LOWER_ALPHA)
117117
mPrimaryColor = getProperPrimaryColor()
118118

119-
config_text_color.setFillWithStroke(mTextColor, Color.BLACK)
120-
config_save.setTextColor(mTextColor)
119+
config_text_color.setFillWithStroke(mTextColor, mTextColor)
121120
widget_date_label.setTextColor(mTextColor)
122121
widget_month_label.setTextColor(mTextColor)
123122
}
124123

125124
private fun updateBgColor() {
126125
mBgColor = mBgColorWithoutTransparency.adjustAlpha(mBgAlpha)
127126
config_date_time_wrapper.background.applyColorFilter(mBgColor)
128-
config_bg_color.setFillWithStroke(mBgColor, Color.BLACK)
129-
config_save.setBackgroundColor(mBgColor)
127+
config_bg_color.setFillWithStroke(mBgColor, mBgColor)
130128
}
131129

132130
private val bgSeekbarChangeListener = object : SeekBar.OnSeekBarChangeListener {

‎app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/WidgetListConfigureActivity.kt‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,15 +205,13 @@ class WidgetListConfigureActivity : SimpleActivity() {
205205
private fun updateColors() {
206206
mTextColor = mTextColorWithoutTransparency
207207
(config_events_list.adapter as? EventListAdapter)?.updateTextColor(mTextColor)
208-
config_text_color.setFillWithStroke(mTextColor, Color.BLACK)
209-
config_save.setTextColor(mTextColor)
208+
config_text_color.setFillWithStroke(mTextColor, mTextColor)
210209
}
211210

212211
private fun updateBgColor() {
213212
mBgColor = mBgColorWithoutTransparency.adjustAlpha(mBgAlpha)
214213
config_events_list.background.applyColorFilter(mBgColor)
215-
config_bg_color.setFillWithStroke(mBgColor, Color.BLACK)
216-
config_save.setBackgroundColor(mBgColor)
214+
config_bg_color.setFillWithStroke(mBgColor, mBgColor)
217215
}
218216

219217
private fun getListItems(): ArrayList<ListItem> {

‎app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/WidgetMonthlyConfigureActivity.kt‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,16 +139,14 @@ class WidgetMonthlyConfigureActivity : SimpleActivity(), MonthlyCalendar {
139139
top_left_arrow.applyColorFilter(mTextColor)
140140
top_right_arrow.applyColorFilter(mTextColor)
141141
top_value.setTextColor(mTextColor)
142-
config_text_color.setFillWithStroke(mTextColor, Color.BLACK)
143-
config_save.setTextColor(mTextColor)
142+
config_text_color.setFillWithStroke(mTextColor, mTextColor)
144143
updateLabels()
145144
}
146145

147146
private fun updateBgColor() {
148147
mBgColor = mBgColorWithoutTransparency.adjustAlpha(mBgAlpha)
149148
config_calendar.background.applyColorFilter(mBgColor)
150-
config_bg_color.setFillWithStroke(mBgColor, Color.BLACK)
151-
config_save.setBackgroundColor(mBgColor)
149+
config_bg_color.setFillWithStroke(mBgColor, mBgColor)
152150
}
153151

154152
private fun updateDays() {

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

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,44 +43,49 @@
4343
android:id="@+id/config_bg_color"
4444
android:layout_width="@dimen/widget_colorpicker_size"
4545
android:layout_height="@dimen/widget_colorpicker_size"
46-
android:layout_above="@+id/config_text_color" />
46+
android:layout_above="@+id/config_text_color"
47+
android:layout_margin="@dimen/tiny_margin" />
4748

4849
<RelativeLayout
4950
android:id="@+id/config_bg_seekbar_holder"
5051
android:layout_width="match_parent"
5152
android:layout_height="match_parent"
5253
android:layout_alignTop="@+id/config_bg_color"
5354
android:layout_alignBottom="@+id/config_bg_color"
55+
android:layout_marginStart="@dimen/medium_margin"
5456
android:layout_toEndOf="@+id/config_bg_color"
55-
android:background="@android:color/white">
57+
android:background="@drawable/widget_config_seekbar_background">
5658

5759
<com.simplemobiletools.commons.views.MySeekBar
5860
android:id="@+id/config_bg_seekbar"
5961
android:layout_width="match_parent"
6062
android:layout_height="wrap_content"
6163
android:layout_centerVertical="true"
62-
android:paddingLeft="@dimen/activity_margin"
63-
android:paddingRight="@dimen/activity_margin" />
64+
android:paddingStart="@dimen/activity_margin"
65+
android:paddingEnd="@dimen/activity_margin" />
6466

6567
</RelativeLayout>
6668

6769
<ImageView
6870
android:id="@+id/config_text_color"
6971
android:layout_width="@dimen/widget_colorpicker_size"
7072
android:layout_height="@dimen/widget_colorpicker_size"
71-
android:layout_alignParentBottom="true" />
73+
android:layout_alignParentBottom="true"
74+
android:layout_margin="@dimen/tiny_margin" />
7275

7376
<Button
7477
android:id="@+id/config_save"
7578
android:layout_width="wrap_content"
7679
android:layout_height="wrap_content"
7780
android:layout_alignParentEnd="true"
7881
android:layout_alignParentBottom="true"
82+
android:background="@drawable/widget_config_seekbar_background"
7983
android:fontFamily="sans-serif-light"
80-
android:paddingLeft="@dimen/activity_margin"
81-
android:paddingRight="@dimen/activity_margin"
84+
android:paddingStart="@dimen/activity_margin"
85+
android:paddingEnd="@dimen/activity_margin"
8286
android:text="@string/ok"
83-
android:textColor="@android:color/white"
87+
android:textColor="@color/dark_grey"
88+
android:textFontWeight="400"
8489
android:textSize="@dimen/big_text_size" />
8590

8691
</RelativeLayout>

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,18 @@
5050
android:id="@+id/config_bg_color"
5151
android:layout_width="@dimen/widget_colorpicker_size"
5252
android:layout_height="@dimen/widget_colorpicker_size"
53-
android:layout_above="@+id/config_text_color" />
53+
android:layout_above="@+id/config_text_color"
54+
android:layout_margin="@dimen/tiny_margin" />
5455

5556
<RelativeLayout
5657
android:id="@+id/config_bg_seekbar_holder"
5758
android:layout_width="match_parent"
5859
android:layout_height="match_parent"
5960
android:layout_alignTop="@+id/config_bg_color"
6061
android:layout_alignBottom="@+id/config_bg_color"
62+
android:layout_marginStart="@dimen/medium_margin"
6163
android:layout_toEndOf="@+id/config_bg_color"
62-
android:background="@android:color/white">
64+
android:background="@drawable/widget_config_seekbar_background">
6365

6466
<com.simplemobiletools.commons.views.MySeekBar
6567
android:id="@+id/config_bg_seekbar"
@@ -75,19 +77,22 @@
7577
android:id="@+id/config_text_color"
7678
android:layout_width="@dimen/widget_colorpicker_size"
7779
android:layout_height="@dimen/widget_colorpicker_size"
78-
android:layout_alignParentBottom="true" />
80+
android:layout_alignParentBottom="true"
81+
android:layout_margin="@dimen/tiny_margin" />
7982

8083
<Button
8184
android:id="@+id/config_save"
8285
android:layout_width="wrap_content"
8386
android:layout_height="wrap_content"
8487
android:layout_alignParentEnd="true"
8588
android:layout_alignParentBottom="true"
89+
android:background="@drawable/widget_config_seekbar_background"
8690
android:fontFamily="sans-serif-light"
8791
android:paddingStart="@dimen/activity_margin"
8892
android:paddingEnd="@dimen/activity_margin"
8993
android:text="@string/ok"
90-
android:textColor="@android:color/white"
94+
android:textColor="@color/dark_grey"
95+
android:textFontWeight="400"
9196
android:textSize="@dimen/big_text_size" />
9297

9398
</RelativeLayout>

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,18 @@
1818
android:id="@+id/config_bg_color"
1919
android:layout_width="@dimen/widget_colorpicker_size"
2020
android:layout_height="@dimen/widget_colorpicker_size"
21-
android:layout_above="@+id/config_text_color" />
21+
android:layout_above="@+id/config_text_color"
22+
android:layout_margin="@dimen/tiny_margin" />
2223

2324
<RelativeLayout
2425
android:id="@+id/config_bg_seekbar_holder"
2526
android:layout_width="match_parent"
2627
android:layout_height="match_parent"
2728
android:layout_alignTop="@+id/config_bg_color"
2829
android:layout_alignBottom="@+id/config_bg_color"
30+
android:layout_marginStart="@dimen/medium_margin"
2931
android:layout_toEndOf="@+id/config_bg_color"
30-
android:background="@android:color/white">
32+
android:background="@drawable/widget_config_seekbar_background">
3133

3234
<com.simplemobiletools.commons.views.MySeekBar
3335
android:id="@+id/config_bg_seekbar"
@@ -43,19 +45,22 @@
4345
android:id="@+id/config_text_color"
4446
android:layout_width="@dimen/widget_colorpicker_size"
4547
android:layout_height="@dimen/widget_colorpicker_size"
46-
android:layout_alignParentBottom="true" />
48+
android:layout_alignParentBottom="true"
49+
android:layout_margin="@dimen/tiny_margin" />
4750

4851
<Button
4952
android:id="@+id/config_save"
5053
android:layout_width="wrap_content"
5154
android:layout_height="wrap_content"
5255
android:layout_alignParentEnd="true"
5356
android:layout_alignParentBottom="true"
57+
android:background="@drawable/widget_config_seekbar_background"
5458
android:fontFamily="sans-serif-light"
5559
android:paddingStart="@dimen/activity_margin"
5660
android:paddingEnd="@dimen/activity_margin"
5761
android:text="@string/ok"
58-
android:textColor="@android:color/white"
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)