fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-04-18 12:07:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

change the monthly view layout

Browse Source
This commit is contained in:
tibbi 2017-10-07 17:17:47 +02:00
parent 6781860a92
commit efd77aed41
16 changed files with 207 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -44,7 +44,7 @@ ext {
}
dependencies {
compile 'com.simplemobiletools:commons:2.29.11'
compile 'com.simplemobiletools:commons:2.29.13'
compile 'joda-time:joda-time:2.9.1'
compile 'com.facebook.stetho:stetho:1.4.1'
compile 'com.bignerdranch.android:recyclerview-multiselect:0.2'

10
app/src/main/kotlin/com/simplemobiletools/calendar/activities/WidgetMonthlyConfigureActivity.kt
View File

@ -81,7 +81,7 @@ class WidgetMonthlyConfigureActivity : AppCompatActivity(), MonthlyCalendar {
MonthlyCalendarImpl(this, applicationContext).updateMonthlyCalendar(DateTime(), false)
}
fun saveConfig() {
private fun saveConfig() {
storeWidgetColors()
requestWidgetUpdate()
@ -99,14 +99,14 @@ class WidgetMonthlyConfigureActivity : AppCompatActivity(), MonthlyCalendar {
}
}
fun pickBackgroundColor() {
private fun pickBackgroundColor() {
ColorPickerDialog(this, mBgColorWithoutTransparency) {
mBgColorWithoutTransparency = it
updateBgColor()
}
}
fun pickTextColor() {
private fun pickTextColor() {
ColorPickerDialog(this, mTextColor) {
mTextColorWithoutTransparency = it
updateTextColors()
@ -159,7 +159,7 @@ class WidgetMonthlyConfigureActivity : AppCompatActivity(), MonthlyCalendar {
val todayCircle = resources.getDrawable(R.drawable.circle_empty)
todayCircle.setColorFilter(mTextColor, PorterDuff.Mode.SRC_IN)
for (i in 0..len - 1) {
for (i in 0 until len) {
val day = mDays!![i]
var curTextColor = mWeakTextColor
@ -171,7 +171,7 @@ class WidgetMonthlyConfigureActivity : AppCompatActivity(), MonthlyCalendar {
text = day.value.toString()
setTextColor(curTextColor)
paintFlags = if (day.hasEvent) (paintFlags or Paint.UNDERLINE_TEXT_FLAG) else (paintFlags.removeFlag(Paint.UNDERLINE_TEXT_FLAG))
paintFlags = if (day.hasEvent()) (paintFlags or Paint.UNDERLINE_TEXT_FLAG) else (paintFlags.removeFlag(Paint.UNDERLINE_TEXT_FLAG))
background = if (day.isToday) todayCircle else null
}
}

43
app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MonthFragment.kt
View File

@ -20,6 +20,7 @@ import com.simplemobiletools.calendar.helpers.*
import com.simplemobiletools.calendar.interfaces.MonthlyCalendar
import com.simplemobiletools.calendar.interfaces.NavigationListener
import com.simplemobiletools.calendar.models.DayMonthly
import com.simplemobiletools.calendar.views.DayMonthlyView
import com.simplemobiletools.commons.extensions.adjustAlpha
import com.simplemobiletools.commons.extensions.beGone
import com.simplemobiletools.commons.extensions.beVisibleIf
@ -117,7 +118,7 @@ class MonthFragment : Fragment(), MonthlyCalendar {
}
}
fun showMonthDialog() {
private fun showMonthDialog() {
activity.setTheme(context.getAppropriateTheme())
val view = getLayoutInflater(arguments).inflate(R.layout.date_picker, null)
val datePicker = view.findViewById(R.id.date_picker) as DatePicker
@ -174,50 +175,16 @@ class MonthFragment : Fragment(), MonthlyCalendar {
}
}
val weakerText = mTextColor.adjustAlpha(MEDIUM_ALPHA)
for (i in 0..len - 1) {
for (i in 0 until len) {
val day = days[i]
var curTextColor = mWeakTextColor
if (day.isThisMonth) {
curTextColor = mTextColor
}
(mHolder.findViewById(mRes.getIdentifier("day_$i", "id", mPackageName)) as TextView).apply {
text = day.value.toString()
setTextColor(curTextColor)
(mHolder.findViewById(mRes.getIdentifier("day_$i", "id", mPackageName)) as DayMonthlyView).apply {
setDay(day)
setOnClickListener { openDay(day.code) }
background = if (!day.isThisMonth) {
null
} else if (day.isToday && day.hasEvent) {
val drawable = mRes.getDrawable(R.drawable.monthly_day_with_event_today).mutate()
drawable.setColorFilter(getDayDotColor(day, weakerText), PorterDuff.Mode.SRC_IN)
drawable
} else if (day.isToday) {
val todayCircle = mRes.getDrawable(R.drawable.circle_empty)
todayCircle.setColorFilter(weakerText, PorterDuff.Mode.SRC_IN)
todayCircle
} else if (day.hasEvent) {
val drawable = mRes.getDrawable(R.drawable.monthly_day_dot).mutate()
drawable.setColorFilter(getDayDotColor(day, weakerText), PorterDuff.Mode.SRC_IN)
drawable
} else {
null
}
}
}
}
private fun getDayDotColor(day: DayMonthly, defaultColor: Int): Int {
val colors = day.eventColors.distinct()
return if (colors.size == 1)
colors[0]
else
defaultColor
}
private fun openDay(code: String) {
if (code.isEmpty())
return

41
app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MonthlyCalendarImpl.kt
View File

@ -10,13 +10,14 @@ import com.simplemobiletools.calendar.models.DayMonthly
import com.simplemobiletools.calendar.models.Event
import org.joda.time.DateTime
import java.util.*
import kotlin.collections.ArrayList
class MonthlyCalendarImpl(val mCallback: MonthlyCalendar, val mContext: Context) {
private val DAYS_CNT = 42
private val YEAR_PATTERN = "YYYY"
private val mToday: String = DateTime().toString(Formatter.DAYCODE_PATTERN)
var mEvents = ArrayList<Event>()
private var mEvents = ArrayList<Event>()
var mFilterEventTypes = true
lateinit var mTargetDate: DateTime
@ -49,25 +50,29 @@ class MonthlyCalendarImpl(val mCallback: MonthlyCalendar, val mContext: Context)
var value = prevMonthDays - firstDayIndex + 1
var curDay: DateTime = mTargetDate
for (i in 0..DAYS_CNT - 1) {
if (i < firstDayIndex) {
isThisMonth = false
curDay = mTargetDate.withDayOfMonth(1).minusMonths(1)
} else if (i == firstDayIndex) {
value = 1
isThisMonth = true
curDay = mTargetDate
} else if (value == currMonthDays + 1) {
value = 1
isThisMonth = false
curDay = mTargetDate.withDayOfMonth(1).plusMonths(1)
for (i in 0 until DAYS_CNT) {
when {
i < firstDayIndex -> {
isThisMonth = false
curDay = mTargetDate.withDayOfMonth(1).minusMonths(1)
}
i == firstDayIndex -> {
value = 1
isThisMonth = true
curDay = mTargetDate
}
value == currMonthDays + 1 -> {
value = 1
isThisMonth = false
curDay = mTargetDate.withDayOfMonth(1).plusMonths(1)
}
}
isToday = isThisMonth && isToday(mTargetDate, value)
val newDay = curDay.withDayOfMonth(value)
val dayCode = Formatter.getDayCodeFromDateTime(newDay)
val day = DayMonthly(value, isThisMonth, isToday, dayCode, false, newDay.weekOfWeekyear, ArrayList())
val day = DayMonthly(value, isThisMonth, isToday, dayCode, newDay.weekOfWeekyear, ArrayList())
days.add(day)
value++
}
@ -98,13 +103,7 @@ class MonthlyCalendarImpl(val mCallback: MonthlyCalendar, val mContext: Context)
}
days.filter { dayEvents.keys.contains(it.code) }.forEach {
val day = it
day.hasEvent = true
val events = dayEvents[it.code]
events!!.forEach {
day.eventColors.add(it.color)
}
it.dayEvents = dayEvents[it.code]!!
}
mCallback.updateMonthlyCalendar(monthName, days)
}

4
app/src/main/kotlin/com/simplemobiletools/calendar/helpers/MyWidgetMonthlyProvider.kt
View File

@ -157,7 +157,7 @@ class MyWidgetMonthlyProvider : AppWidgetProvider(), MonthlyCalendar {
}
}
for (i in 0..len - 1) {
for (i in 0 until len) {
val day = days[i]
val id = mRes.getIdentifier("day_$i", "id", packageName)
var curTextColor = mWeakTextColor
@ -167,7 +167,7 @@ class MyWidgetMonthlyProvider : AppWidgetProvider(), MonthlyCalendar {
}
val text = day.value.toString()
if (day.hasEvent) {
if (day.hasEvent()) {
val underlinedText = SpannableString(text)
underlinedText.setSpan(UnderlineSpan(), 0, text.length, 0)
mRemoteViews?.setTextViewText(id, underlinedText)

6
app/src/main/kotlin/com/simplemobiletools/calendar/models/DayMonthly.kt
View File

@ -1,4 +1,6 @@
package com.simplemobiletools.calendar.models
data class DayMonthly(val value: Int, val isThisMonth: Boolean, val isToday: Boolean, val code: String, var hasEvent: Boolean, val weekOfYear: Int,
var eventColors: ArrayList<Int>)
data class DayMonthly(val value: Int, val isThisMonth: Boolean, val isToday: Boolean, val code: String, val weekOfYear: Int, var dayEvents: ArrayList<Event>) {
fun hasEvent() = dayEvents.isNotEmpty()
}

58
app/src/main/kotlin/com/simplemobiletools/calendar/views/DayMonthlyView.kt Normal file
View File

@ -0,0 +1,58 @@
package com.simplemobiletools.calendar.views
import android.content.Context
import android.graphics.Bitmap
import android.graphics.PorterDuff
import android.graphics.drawable.BitmapDrawable
import android.util.AttributeSet
import android.view.Gravity
import android.view.View
import android.view.ViewGroup
import android.widget.LinearLayout
import android.widget.TextView
import com.simplemobiletools.calendar.R
import com.simplemobiletools.calendar.extensions.config
import com.simplemobiletools.calendar.helpers.LOW_ALPHA
import com.simplemobiletools.calendar.models.DayMonthly
import com.simplemobiletools.commons.extensions.adjustAlpha
import com.simplemobiletools.commons.extensions.getContrastColor
import com.simplemobiletools.commons.extensions.onGlobalLayout
class DayMonthlyView(context: Context, attrs: AttributeSet, defStyle: Int) : LinearLayout(context, attrs, defStyle) {
constructor(context: Context, attrs: AttributeSet) : this(context, attrs, 0)
private var textColor = context.config.textColor
private var weakTextColor = textColor.adjustAlpha(LOW_ALPHA)
init {
orientation = LinearLayout.VERTICAL
gravity = Gravity.CENTER_HORIZONTAL
}
fun setDay(day: DayMonthly) {
removeAllViews()
(View.inflate(context, R.layout.day_monthly_item_view, null) as TextView).apply {
setTextColor(if (day.isThisMonth) textColor else weakTextColor)
text = day.value.toString()
gravity = Gravity.TOP or Gravity.CENTER_HORIZONTAL
layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT)
addView(this)
if (day.isToday) {
val primaryColor = context.config.primaryColor
setTextColor(primaryColor.getContrastColor())
onGlobalLayout {
val height = this@apply.height
if (height > 0) {
val baseDrawable = context.resources.getDrawable(R.drawable.monthly_today_circle)
val bitmap = (baseDrawable as BitmapDrawable).bitmap
val scaledDrawable = BitmapDrawable(resources, Bitmap.createScaledBitmap(bitmap, height, height, true))
scaledDrawable.setColorFilter(primaryColor, PorterDuff.Mode.SRC_IN)
background = scaledDrawable
}
}
}
}
}
}

2
app/src/main/kotlin/com/simplemobiletools/calendar/views/MyScrollView.kt
View File

@ -11,7 +11,7 @@ class MyScrollView : ScrollView {
constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(context, attrs, defStyle)
var scrollViewListener: ScrollViewListener? = null
private var scrollViewListener: ScrollViewListener? = null
fun setOnScrollviewListener(scrollViewListener: ScrollViewListener) {
this.scrollViewListener = scrollViewListener

BIN
app/src/main/res/drawable-hdpi/monthly_today_circle.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 465 B

BIN
app/src/main/res/drawable-xhdpi/monthly_today_circle.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 695 B

BIN
app/src/main/res/drawable-xxhdpi/monthly_today_circle.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 960 B

BIN
app/src/main/res/drawable-xxxhdpi/monthly_today_circle.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 922 B

9
app/src/main/res/layout/day_monthly_item_view.xml Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<com.simplemobiletools.commons.views.MyTextView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/day_monthly_number_id"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/smaller_text_size"
tools:text="1"/>

4
app/src/main/res/layout/first_row.xml
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools"
android:layout_weight="1"
android:orientation="horizontal">
@ -13,8 +13,8 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
tools:text="#"
android:visibility="gone"
tools:text="#"
tools:visibility="visible"/>
<com.simplemobiletools.commons.views.MyTextView

227
app/src/main/res/layout/fragment_month.xml
View File

@ -19,12 +19,12 @@
layout="@layout/first_row"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"/>
android:layout_weight="2"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_weight="2"
android:orientation="horizontal">
<com.simplemobiletools.commons.views.MyTextView
@ -33,62 +33,56 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="#2200ff00"
android:visibility="gone"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_0"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_1"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_2"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_3"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_4"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_5"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_6"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_weight="2"
android:orientation="horizontal">
<com.simplemobiletools.commons.views.MyTextView
@ -97,62 +91,56 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="#220000ff"
android:visibility="gone"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_7"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_8"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_9"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_10"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_11"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_12"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_13"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_weight="2"
android:orientation="horizontal">
<com.simplemobiletools.commons.views.MyTextView
@ -161,62 +149,56 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="#22ff0000"
android:visibility="gone"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_14"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_15"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_16"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_17"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_18"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_19"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_20"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_weight="2"
android:orientation="horizontal">
<com.simplemobiletools.commons.views.MyTextView
@ -227,60 +209,53 @@
android:layout_weight="1"
android:visibility="gone"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_21"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_22"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_23"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_24"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_25"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_26"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_27"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_weight="2"
android:orientation="horizontal">
<com.simplemobiletools.commons.views.MyTextView
@ -291,60 +266,53 @@
android:layout_weight="1"
android:visibility="gone"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_28"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_29"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_30"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_31"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_32"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_33"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_34"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_weight="2"
android:orientation="horizontal">
<com.simplemobiletools.commons.views.MyTextView
@ -355,53 +323,46 @@
android:layout_weight="1"
android:visibility="gone"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_35"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_36"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_37"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_38"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_39"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_40"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
<com.simplemobiletools.commons.views.MyTextView
<com.simplemobiletools.calendar.views.DayMonthlyView
android:id="@+id/day_41"
style="@style/DayView"
android:layout_width="0dp"
android:layout_height="@dimen/monthly_day_height"
android:layout_height="match_parent"
android:layout_weight="1"/>
</LinearLayout>
</LinearLayout>

10
app/src/main/res/layout/top_navigation.xml
View File

@ -10,7 +10,8 @@
android:layout_height="match_parent"
android:layout_alignBottom="@+id/top_value"
android:layout_alignTop="@+id/top_value"
android:padding="@dimen/activity_margin"
android:paddingLeft="@dimen/activity_margin"
android:paddingRight="@dimen/activity_margin"
android:src="@drawable/ic_pointer_left"/>
<com.simplemobiletools.commons.views.MyTextView
@ -21,8 +22,8 @@
android:layout_toLeftOf="@+id/top_right_arrow"
android:layout_toRightOf="@+id/top_left_arrow"
android:gravity="center"
android:paddingBottom="@dimen/activity_margin"
android:paddingTop="@dimen/activity_margin"
android:paddingBottom="@dimen/normal_margin"
android:paddingTop="@dimen/normal_margin"
android:textSize="@dimen/month_text_size"/>
<ImageView
@ -33,7 +34,8 @@
android:layout_alignBottom="@+id/top_value"
android:layout_alignParentRight="true"
android:layout_alignTop="@+id/top_value"
android:padding="@dimen/activity_margin"
android:paddingLeft="@dimen/activity_margin"
android:paddingRight="@dimen/activity_margin"
android:src="@drawable/ic_pointer_right"/>
</merge>