Skip to content

Commit a2d2e7e

Browse files
JonathandelaSenJonathandelaSen
committed
Added some details on tasks
1 parent e4dffe2 commit a2d2e7e

39 files changed

+370
-357
lines changed

‎CleanUI/src/main/java/devjdelasen/com/cleanui/buttons/AccentButton.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import android.widget.FrameLayout
77
import androidx.core.content.ContextCompat
88
import androidx.core.graphics.ColorUtils
99
import devjdelasen.com.cleanui.R
10-
import devjdelasen.com.cleanui.TextStyle
10+
import devjdelasen.com.cleanui.utils.TextStyle
1111
import devjdelasen.com.cleanui.extensions.set
1212
import devjdelasen.com.cleanui.tasks.models.AccentButtonModel
1313
import kotlinx.android.synthetic.main.clean_ui_accent_button.view.*

‎CleanUI/src/main/java/devjdelasen/com/cleanui/calendar/models/MonthCalendar.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package devjdelasen.com.cleanui.calendar.models
22

3-
import devjdelasen.com.cleanui.UtilsDate
3+
import devjdelasen.com.cleanui.utils.UtilsDate
44
import devjdelasen.com.cleanui.calendar.top.list.DayCalendar
55
import devjdelasen.com.cleanui.extensions.getDayOfMonthNumber
66
import devjdelasen.com.cleanui.tasks.models.TaskAbstract

‎CleanUI/src/main/java/devjdelasen/com/cleanui/calendar/top/TopExpandedCalendar.kt‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@ import android.view.View
66
import android.widget.LinearLayout
77
import android.widget.TextView
88
import devjdelasen.com.cleanui.R
9-
import devjdelasen.com.cleanui.UtilsDate
9+
import devjdelasen.com.cleanui.utils.UtilsDate
1010
import devjdelasen.com.cleanui.calendar.setSelectedTopCalendarDay
1111
import devjdelasen.com.cleanui.calendar.top.list.DayCalendar
1212
import kotlinx.android.synthetic.main.clean_ui_top_explanded_calendar.view.*
13-
import kotlinx.android.synthetic.main.clean_ui_item_week_day_month_day_horizontal_calendar.view.*
1413
import kotlin.collections.ArrayList
1514

1615

@@ -102,7 +101,13 @@ internal class TopExpandedCalendar : LinearLayout {
102101

103102

104103
private fun setHasNotification(day: DayCalendar, vNotification: View) {
105-
vNotification.visibility = if (day.tasks.isEmpty()) View.INVISIBLE else View.VISIBLE
104+
vNotification.visibility = if (day.tasks.isEmpty()) {
105+
View.INVISIBLE
106+
}
107+
else {
108+
vNotification.background.setTint(accentColor)
109+
View.VISIBLE
110+
}
106111
}
107112

108113
private fun setListeners() {

‎CleanUI/src/main/java/devjdelasen/com/cleanui/calendar/top/TopHorizontalCalendarWithHeader.kt‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@ import android.view.animation.Animation
88
import android.view.animation.LinearInterpolator
99
import android.widget.LinearLayout
1010
import androidx.core.content.ContextCompat
11-
import androidx.core.content.res.ResourcesCompat
1211
import androidx.recyclerview.widget.LinearLayoutManager
1312
import devjdelasen.com.cleanui.*
14-
import devjdelasen.com.cleanui.DividerType
13+
import devjdelasen.com.cleanui.utils.DividerType
1514
import devjdelasen.com.cleanui.calendar.models.YearCalendar
1615
import devjdelasen.com.cleanui.calendar.top.list.RvAdapterTopHorizontalCalendar
1716
import devjdelasen.com.cleanui.tasks.models.TaskAbstract
17+
import devjdelasen.com.cleanui.utils.UtilsDate
18+
import devjdelasen.com.cleanui.utils.setDividerType
1819
import kotlinx.android.synthetic.main.clean_ui_calendar_with_header_view.view.*
1920

2021

@@ -103,9 +104,14 @@ class TopHorizontalCalendarWithHeader : LinearLayout {
103104
setStyles()
104105
showHideViews()
105106
setType()
106-
setDividerType(dividerType, clean_ui_calendar_vDivider, this,
107+
setDividerType(
108+
dividerType,
109+
clean_ui_calendar_vDivider,
110+
this,
107111
context.resources.getDimensionPixelOffset(R.dimen.clean_ui_dialog_button_radius),
108-
shadowColor = resources.getColor(R.color.clean_ui_divider_shadow, null), dividerColor = dividerColor)
112+
shadowColor = resources.getColor(R.color.clean_ui_divider_shadow, null),
113+
dividerColor = dividerColor
114+
)
109115
selectCurrentDayMonth()
110116
setDayListIfVisible()
111117
updateExpandedIfVisible()

‎CleanUI/src/main/java/devjdelasen/com/cleanui/calendar/top/list/DayCalendar.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package devjdelasen.com.cleanui.calendar.top.list
22

3-
import devjdelasen.com.cleanui.UtilsDate
43
import devjdelasen.com.cleanui.calendar.GenericHolderInterface
54
import devjdelasen.com.cleanui.tasks.models.TaskAbstract
65
import java.util.*

‎CleanUI/src/main/java/devjdelasen/com/cleanui/calendar/top/list/DayHorizontalTopHorizontalCalendarViewHolder.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ package devjdelasen.com.cleanui.calendar.top.list
22

33
import android.view.View
44
import androidx.recyclerview.widget.RecyclerView
5-
import devjdelasen.com.cleanui.R
6-
import devjdelasen.com.cleanui.UtilsDate
5+
import devjdelasen.com.cleanui.utils.UtilsDate
76
import devjdelasen.com.cleanui.calendar.setSelectedTopCalendarDay
87
import kotlinx.android.synthetic.main.clean_ui_item_week_day_month_day_horizontal_calendar.view.*
98

‎CleanUI/src/main/java/devjdelasen/com/cleanui/extensions/DateExtension.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package devjdelasen.com.cleanui.extensions
22

3-
import devjdelasen.com.cleanui.UtilsDate
43
import java.util.*
54

65
private const val HOUR_MS = 60*60*1000

‎CleanUI/src/main/java/devjdelasen/com/cleanui/extensions/TextViewExtension.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package devjdelasen.com.cleanui.extensions
33
import android.graphics.Typeface
44
import android.util.TypedValue
55
import android.widget.TextView
6-
import devjdelasen.com.cleanui.TextStyle
6+
import devjdelasen.com.cleanui.utils.TextStyle
77

88

99
internal fun TextView.set(text: String?, titleColor: Int, textSize: Float, textStyle: Int) {

CleanUI/src/main/java/devjdelasen/com/cleanui/TitleSection.kt renamed to CleanUI/src/main/java/devjdelasen/com/cleanui/sections/TitleSection.kt

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
package devjdelasen.com.cleanui
1+
package devjdelasen.com.cleanui.sections
22

33
import android.content.Context
44
import android.util.AttributeSet
55
import android.view.View
66
import android.widget.LinearLayout
77
import android.widget.TextView
88
import androidx.core.content.ContextCompat
9+
import devjdelasen.com.cleanui.R
10+
import devjdelasen.com.cleanui.utils.TextStyle
911
import devjdelasen.com.cleanui.extensions.set
1012
import kotlinx.android.synthetic.main.clean_ui_title_section_clean_ui.view.*
1113

@@ -26,10 +28,14 @@ class TitleSection : LinearLayout {
2628
}
2729

2830
constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) {
29-
val ta = context.obtainStyledAttributes(attrs, R.styleable.TitleSection, 0, 0)
31+
val ta = context.obtainStyledAttributes(attrs,
32+
R.styleable.TitleSection, 0, 0)
3033
try {
3134
title = ta.getString(R.styleable.TitleSection_title_section_title)
32-
titleColor = ta.getColor(R.styleable.TitleSection_title_section_title_color, ContextCompat.getColor(context, R.color.clean_ui_title_default))
35+
titleColor = ta.getColor(
36+
R.styleable.TitleSection_title_section_title_color, ContextCompat.getColor(context,
37+
R.color.clean_ui_title_default
38+
))
3339
titleTextStyle = ta.getInt(R.styleable.TitleSection_title_section_title_style, TextStyle.BOLD.value)
3440
titleTextSize = ta.getFloat(R.styleable.TitleSection_title_section_title_size, TITLE_TEXT_SIZE_DEFAULT_PD)
3541
} finally {
@@ -43,7 +49,8 @@ class TitleSection : LinearLayout {
4349
}
4450

4551
private fun init() {
46-
View.inflate(context, R.layout.clean_ui_title_section_clean_ui, this)
52+
View.inflate(context,
53+
R.layout.clean_ui_title_section_clean_ui, this)
4754
setView()
4855
}
4956

‎CleanUI/src/main/java/devjdelasen/com/cleanui/settingsRow/SettingsRow.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import android.widget.LinearLayout
66
import android.widget.TextView
77
import androidx.core.content.ContextCompat
88
import devjdelasen.com.cleanui.R
9-
import devjdelasen.com.cleanui.TextStyle
9+
import devjdelasen.com.cleanui.utils.TextStyle
1010
import devjdelasen.com.cleanui.extensions.set
1111
import kotlinx.android.synthetic.main.clean_ui_title_section_clean_ui.view.*
1212

0 commit comments

Comments
 (0)