remove the custom DayMonthlyView, use basic view types instead

This commit is contained in:
tibbi
2017-10-07 22:40:42 +02:00
parent 5f1d76e0d9
commit 095062f7d5
3 changed files with 239 additions and 187 deletions

View File

@@ -2,14 +2,18 @@ package com.simplemobiletools.calendar.fragments
import android.content.Intent import android.content.Intent
import android.content.res.Resources import android.content.res.Resources
import android.graphics.Bitmap
import android.graphics.PorterDuff import android.graphics.PorterDuff
import android.graphics.drawable.BitmapDrawable
import android.os.Bundle import android.os.Bundle
import android.support.v4.app.Fragment import android.support.v4.app.Fragment
import android.support.v7.app.AlertDialog import android.support.v7.app.AlertDialog
import android.view.Gravity
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.DatePicker import android.widget.DatePicker
import android.widget.LinearLayout
import android.widget.RelativeLayout import android.widget.RelativeLayout
import android.widget.TextView import android.widget.TextView
import com.simplemobiletools.calendar.R import com.simplemobiletools.calendar.R
@@ -20,22 +24,19 @@ import com.simplemobiletools.calendar.helpers.*
import com.simplemobiletools.calendar.interfaces.MonthlyCalendar import com.simplemobiletools.calendar.interfaces.MonthlyCalendar
import com.simplemobiletools.calendar.interfaces.NavigationListener import com.simplemobiletools.calendar.interfaces.NavigationListener
import com.simplemobiletools.calendar.models.DayMonthly import com.simplemobiletools.calendar.models.DayMonthly
import com.simplemobiletools.calendar.views.DayMonthlyView import com.simplemobiletools.calendar.models.Event
import com.simplemobiletools.commons.extensions.adjustAlpha import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.extensions.beGone
import com.simplemobiletools.commons.extensions.beVisibleIf
import com.simplemobiletools.commons.extensions.setupDialogStuff
import kotlinx.android.synthetic.main.first_row.* import kotlinx.android.synthetic.main.first_row.*
import kotlinx.android.synthetic.main.fragment_month.view.* import kotlinx.android.synthetic.main.fragment_month.view.*
import kotlinx.android.synthetic.main.top_navigation.view.* import kotlinx.android.synthetic.main.top_navigation.view.*
import org.joda.time.DateTime import org.joda.time.DateTime
class MonthFragment : Fragment(), MonthlyCalendar { class MonthFragment : Fragment(), MonthlyCalendar {
private var mPackageName = ""
private var mTextColor = 0 private var mTextColor = 0
private var mWeakTextColor = 0 private var mWeakTextColor = 0
private var mSundayFirst = false private var mSundayFirst = false
private var mDayCode = "" private var mDayCode = ""
private var dividerMargin = 0
var listener: NavigationListener? = null var listener: NavigationListener? = null
@@ -47,6 +48,7 @@ class MonthFragment : Fragment(), MonthlyCalendar {
override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? { override fun onCreateView(inflater: LayoutInflater?, container: ViewGroup?, savedInstanceState: Bundle?): View? {
val view = inflater!!.inflate(R.layout.fragment_month, container, false) val view = inflater!!.inflate(R.layout.fragment_month, container, false)
mRes = resources mRes = resources
dividerMargin = mRes.displayMetrics.density.toInt()
mHolder = view.calendar_holder mHolder = view.calendar_holder
mDayCode = arguments.getString(DAY_CODE) mDayCode = arguments.getString(DAY_CODE)
@@ -55,7 +57,6 @@ class MonthFragment : Fragment(), MonthlyCalendar {
setupButtons() setupButtons()
mPackageName = activity.packageName
setupLabels() setupLabels()
mCalendar = MonthlyCalendarImpl(this, context) mCalendar = MonthlyCalendarImpl(this, context)
@@ -146,7 +147,7 @@ class MonthFragment : Fragment(), MonthlyCalendar {
if (!mSundayFirst) if (!mSundayFirst)
index = (index + 1) % letters.size index = (index + 1) % letters.size
(mHolder.findViewById(mRes.getIdentifier("label_$i", "id", mPackageName)) as TextView).apply { (mHolder.findViewById(mRes.getIdentifier("label_$i", "id", activity.packageName)) as TextView).apply {
setTextColor(mTextColor) setTextColor(mTextColor)
text = getString(letters[index]) text = getString(letters[index])
} }
@@ -154,6 +155,7 @@ class MonthFragment : Fragment(), MonthlyCalendar {
} }
private fun updateDays(days: List<DayMonthly>) { private fun updateDays(days: List<DayMonthly>) {
val packageName = activity.packageName
val displayWeekNumbers = mConfig.displayWeekNumbers val displayWeekNumbers = mConfig.displayWeekNumbers
val len = days.size val len = days.size
@@ -164,7 +166,7 @@ class MonthFragment : Fragment(), MonthlyCalendar {
week_num.beVisibleIf(displayWeekNumbers) week_num.beVisibleIf(displayWeekNumbers)
for (i in 0..5) { for (i in 0..5) {
(mHolder.findViewById(mRes.getIdentifier("week_num_$i", "id", mPackageName)) as TextView).apply { (mHolder.findViewById(mRes.getIdentifier("week_num_$i", "id", packageName)) as TextView).apply {
text = "${days[i * 7 + 3].weekOfYear}:" text = "${days[i * 7 + 3].weekOfYear}:"
setTextColor(mTextColor) setTextColor(mTextColor)
beVisibleIf(displayWeekNumbers) beVisibleIf(displayWeekNumbers)
@@ -172,21 +174,68 @@ class MonthFragment : Fragment(), MonthlyCalendar {
} }
for (i in 0 until len) { for (i in 0 until len) {
(mHolder.findViewById(mRes.getIdentifier("day_$i", "id", mPackageName)) as DayMonthlyView).apply { (mHolder.findViewById(mRes.getIdentifier("day_$i", "id", packageName)) as LinearLayout).apply {
val day = days[i] val day = days[i]
setDay(day)
setOnClickListener { openDay(day.code) } setOnClickListener { openDay(day.code) }
removeAllViews()
addDayNumber(day, this)
day.dayEvents.forEach {
addDayEvent(it, this)
}
} }
} }
} }
private fun openDay(code: String) { private fun openDay(code: String) {
if (code.isEmpty()) if (code.isNotEmpty()) {
return
Intent(context, DayActivity::class.java).apply { Intent(context, DayActivity::class.java).apply {
putExtra(DAY_CODE, code) putExtra(DAY_CODE, code)
startActivity(this) startActivity(this)
} }
} }
}
private fun addDayNumber(day: DayMonthly, linearLayout: LinearLayout) {
(View.inflate(context, R.layout.day_monthly_item_view, null) as TextView).apply {
setTextColor(if (day.isThisMonth) mTextColor else mWeakTextColor)
text = day.value.toString()
gravity = Gravity.TOP or Gravity.CENTER_HORIZONTAL
layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT)
linearLayout.addView(this)
if (day.isToday) {
val primaryColor = context.config.primaryColor
setTextColor(primaryColor.getContrastColor().adjustAlpha(MEDIUM_ALPHA))
onGlobalLayout {
val height = this@apply.height
if (height > 0) {
val baseDrawable = mRes.getDrawable(R.drawable.monthly_today_circle)
val bitmap = (baseDrawable as BitmapDrawable).bitmap
val scaledDrawable = BitmapDrawable(mRes, Bitmap.createScaledBitmap(bitmap, height, height, true))
scaledDrawable.mutate().setColorFilter(primaryColor, PorterDuff.Mode.SRC_IN)
background = scaledDrawable
}
}
}
}
}
private fun addDayEvent(event: Event, linearLayout: LinearLayout) {
val backgroundDrawable = mRes.getDrawable(R.drawable.day_monthly_event_background)
backgroundDrawable.mutate().setColorFilter(event.color, PorterDuff.Mode.SRC_IN)
val eventLayoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
eventLayoutParams.setMargins(dividerMargin, dividerMargin, dividerMargin, dividerMargin)
(View.inflate(context, R.layout.day_monthly_item_view, null) as TextView).apply {
setTextColor(event.color.getContrastColor().adjustAlpha(MEDIUM_ALPHA))
text = event.title
gravity = Gravity.START
background = backgroundDrawable
layoutParams = eventLayoutParams
linearLayout.addView(this)
}
}
} }

View File

@@ -1,86 +0,0 @@
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.helpers.MEDIUM_ALPHA
import com.simplemobiletools.calendar.models.DayMonthly
import com.simplemobiletools.calendar.models.Event
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)
private var res = context.resources
private var dividerMargin = res.displayMetrics.density.toInt()
init {
orientation = LinearLayout.VERTICAL
gravity = Gravity.CENTER_HORIZONTAL
}
fun setDay(day: DayMonthly) {
removeAllViews()
addDayNumber(day)
day.dayEvents.forEach {
addDayEvent(it)
}
}
private fun addDayNumber(day: DayMonthly) {
(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().adjustAlpha(MEDIUM_ALPHA))
onGlobalLayout {
val height = this@apply.height
if (height > 0) {
val baseDrawable = res.getDrawable(R.drawable.monthly_today_circle)
val bitmap = (baseDrawable as BitmapDrawable).bitmap
val scaledDrawable = BitmapDrawable(res, Bitmap.createScaledBitmap(bitmap, height, height, true))
scaledDrawable.mutate().setColorFilter(primaryColor, PorterDuff.Mode.SRC_IN)
background = scaledDrawable
}
}
}
}
}
private fun addDayEvent(event: Event) {
val backgroundDrawable = res.getDrawable(R.drawable.day_monthly_event_background)
backgroundDrawable.mutate().setColorFilter(event.color, PorterDuff.Mode.SRC_IN)
val eventLayoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
eventLayoutParams.setMargins(dividerMargin, dividerMargin, dividerMargin, dividerMargin)
(View.inflate(context, R.layout.day_monthly_item_view, null) as TextView).apply {
setTextColor(event.color.getContrastColor().adjustAlpha(MEDIUM_ALPHA))
text = event.title
gravity = Gravity.START
background = backgroundDrawable
layoutParams = eventLayoutParams
addView(this)
}
}
}

View File

@@ -22,6 +22,7 @@
android:layout_weight="2"/> android:layout_weight="2"/>
<LinearLayout <LinearLayout
android:id="@+id/month_line_holder_1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="2" android:layout_weight="2"
@@ -36,50 +37,65 @@
android:background="#2200ff00" android:background="#2200ff00"
android:visibility="gone"/> android:visibility="gone"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_0" android:id="@+id/day_0"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_1" android:id="@+id/day_1"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_2" android:id="@+id/day_2"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_3" android:id="@+id/day_3"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_4" android:id="@+id/day_4"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_5" android:id="@+id/day_5"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_6" android:id="@+id/day_6"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/month_line_holder_2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="2" android:layout_weight="2"
@@ -91,53 +107,67 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:background="#220000ff"
android:visibility="gone"/> android:visibility="gone"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_7" android:id="@+id/day_7"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_8" android:id="@+id/day_8"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_9" android:id="@+id/day_9"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_10" android:id="@+id/day_10"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_11" android:id="@+id/day_11"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_12" android:id="@+id/day_12"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_13" android:id="@+id/day_13"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/month_line_holder_3"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="2" android:layout_weight="2"
@@ -152,50 +182,65 @@
android:background="#22ff0000" android:background="#22ff0000"
android:visibility="gone"/> android:visibility="gone"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_14" android:id="@+id/day_14"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_15" android:id="@+id/day_15"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_16" android:id="@+id/day_16"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_17" android:id="@+id/day_17"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_18" android:id="@+id/day_18"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_19" android:id="@+id/day_19"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_20" android:id="@+id/day_20"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/month_line_holder_4"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="2" android:layout_weight="2"
@@ -209,50 +254,65 @@
android:layout_weight="1" android:layout_weight="1"
android:visibility="gone"/> android:visibility="gone"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_21" android:id="@+id/day_21"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_22" android:id="@+id/day_22"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_23" android:id="@+id/day_23"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_24" android:id="@+id/day_24"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_25" android:id="@+id/day_25"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_26" android:id="@+id/day_26"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_27" android:id="@+id/day_27"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/month_line_holder_5"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="2" android:layout_weight="2"
@@ -266,50 +326,65 @@
android:layout_weight="1" android:layout_weight="1"
android:visibility="gone"/> android:visibility="gone"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_28" android:id="@+id/day_28"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_29" android:id="@+id/day_29"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_30" android:id="@+id/day_30"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_31" android:id="@+id/day_31"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_32" android:id="@+id/day_32"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_33" android:id="@+id/day_33"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_34" android:id="@+id/day_34"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/month_line_holder_6"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="2" android:layout_weight="2"
@@ -323,47 +398,61 @@
android:layout_weight="1" android:layout_weight="1"
android:visibility="gone"/> android:visibility="gone"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_35" android:id="@+id/day_35"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_36" android:id="@+id/day_36"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_37" android:id="@+id/day_37"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_38" android:id="@+id/day_38"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_39" android:id="@+id/day_39"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_40" android:id="@+id/day_40"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
<com.simplemobiletools.calendar.views.DayMonthlyView <LinearLayout
android:id="@+id/day_41" android:id="@+id/day_41"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>