fenix
/
Simple-Calendar
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fill up the month views with days

This commit is contained in:
tibbi 2016-10-18 23:23:07 +02:00
parent fc1a16e48d
commit b5e5233a9f
4 changed files with 140 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/simplemobiletools/calendar/Constants.java
View File

@ -2,6 +2,7 @@ package com.simplemobiletools.calendar;
public class Constants { public class Constants {
public static final float LOW_ALPHA = .2f; public static final float LOW_ALPHA = .2f;
public static final float MEDIUM_ALPHA = .4f;
public static final float HIGH_ALPHA = .8f; public static final float HIGH_ALPHA = .8f;
public static final String DAY_CODE = "day_code"; public static final String DAY_CODE = "day_code";

46
app/src/main/kotlin/com/simplemobiletools/calendar/views/SmallMonthView.kt Normal file
View File

@ -0,0 +1,46 @@
package com.simplemobiletools.calendar.views
import android.content.Context
import android.graphics.Canvas
import android.graphics.Color
import android.graphics.Paint
import android.util.AttributeSet
import android.view.View
import com.simplemobiletools.calendar.Config
import com.simplemobiletools.calendar.Constants
import com.simplemobiletools.calendar.R
import com.simplemobiletools.calendar.Utils
class SmallMonthView(context: Context, attrs: AttributeSet, defStyle: Int) : View(context, attrs, defStyle) {
var mPaint: Paint
var mDayWidth = 0f
var mTextColor = 0
constructor(context: Context, attrs: AttributeSet) : this(context, attrs, 0) {
}
init {
val baseColor = if (Config.newInstance(context).isDarkTheme) Color.WHITE else Color.BLACK
mTextColor = Utils.adjustAlpha(baseColor, Constants.MEDIUM_ALPHA)
mPaint = Paint(Paint.ANTI_ALIAS_FLAG)
mPaint.color = mTextColor
mPaint.textSize = resources.getDimensionPixelSize(R.dimen.tiny_text_size).toFloat()
mPaint.textAlign = Paint.Align.RIGHT
}
override fun onDraw(canvas: Canvas) {
super.onDraw(canvas)
if (mDayWidth == 0f) {
mDayWidth = (canvas.width / 7).toFloat()
}
var curId = 1
for (y in 1..6) {
for (x in 1..7) {
canvas.drawText(curId.toString(), x * mDayWidth, y * mDayWidth, mPaint)
curId++
}
}
}
}

90
app/src/main/res/layout/year_fragment.xml
View File

@ -4,7 +4,7 @@
android:id="@+id/calendar_holder" android:id="@+id/calendar_holder"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:padding="@dimen/yearly_padding"> android:padding="@dimen/yearly_padding_side">
<TableRow android:layout_weight="1"> <TableRow android:layout_weight="1">
@ -12,6 +12,7 @@
android:id="@+id/month_1" android:id="@+id/month_1"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginRight="@dimen/yearly_padding_full"
android:layout_weight="1"> android:layout_weight="1">
<TextView <TextView
@ -23,12 +24,20 @@
android:textAllCaps="true" android:textAllCaps="true"
android:textSize="@dimen/normal_text_size"/> android:textSize="@dimen/normal_text_size"/>
<com.simplemobiletools.calendar.views.SmallMonthView
android:id="@+id/january_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/january_label"/>
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/month_2" android:id="@+id/month_2"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="@dimen/yearly_padding_half"
android:layout_marginRight="@dimen/yearly_padding_half"
android:layout_weight="1"> android:layout_weight="1">
<TextView <TextView
@ -40,12 +49,19 @@
android:textAllCaps="true" android:textAllCaps="true"
android:textSize="@dimen/normal_text_size"/> android:textSize="@dimen/normal_text_size"/>
<com.simplemobiletools.calendar.views.SmallMonthView
android:id="@+id/february_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/february_label"/>
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/month_3" android:id="@+id/month_3"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="@dimen/yearly_padding_full"
android:layout_weight="1"> android:layout_weight="1">
<TextView <TextView
@ -56,6 +72,12 @@
android:text="@string/march" android:text="@string/march"
android:textAllCaps="true" android:textAllCaps="true"
android:textSize="@dimen/normal_text_size"/> android:textSize="@dimen/normal_text_size"/>
<com.simplemobiletools.calendar.views.SmallMonthView
android:id="@+id/march_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/march_label"/>
</RelativeLayout> </RelativeLayout>
</TableRow> </TableRow>
@ -65,6 +87,7 @@
android:id="@+id/month_4" android:id="@+id/month_4"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginRight="@dimen/yearly_padding_full"
android:layout_weight="1"> android:layout_weight="1">
<TextView <TextView
@ -75,12 +98,20 @@
android:text="@string/april" android:text="@string/april"
android:textAllCaps="true" android:textAllCaps="true"
android:textSize="@dimen/normal_text_size"/> android:textSize="@dimen/normal_text_size"/>
<com.simplemobiletools.calendar.views.SmallMonthView
android:id="@+id/april_value"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/april_label"/>
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/month_5" android:id="@+id/month_5"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="@dimen/yearly_padding_half"
android:layout_marginRight="@dimen/yearly_padding_half"
android:layout_weight="1"> android:layout_weight="1">
<TextView <TextView
@ -92,12 +123,19 @@
android:textAllCaps="true" android:textAllCaps="true"
android:textSize="@dimen/normal_text_size"/> android:textSize="@dimen/normal_text_size"/>
<com.simplemobiletools.calendar.views.SmallMonthView
android:id="@+id/may_value"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/may_label"/>
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/month_6" android:id="@+id/month_6"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="@dimen/yearly_padding_full"
android:layout_weight="1"> android:layout_weight="1">
<TextView <TextView
@ -108,6 +146,12 @@
android:text="@string/june" android:text="@string/june"
android:textAllCaps="true" android:textAllCaps="true"
android:textSize="@dimen/normal_text_size"/> android:textSize="@dimen/normal_text_size"/>
<com.simplemobiletools.calendar.views.SmallMonthView
android:id="@+id/june_value"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/june_label"/>
</RelativeLayout> </RelativeLayout>
</TableRow> </TableRow>
@ -117,6 +161,7 @@
android:id="@+id/month_7" android:id="@+id/month_7"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginRight="@dimen/yearly_padding_full"
android:layout_weight="1"> android:layout_weight="1">
<TextView <TextView
@ -127,12 +172,20 @@
android:text="@string/july" android:text="@string/july"
android:textAllCaps="true" android:textAllCaps="true"
android:textSize="@dimen/normal_text_size"/> android:textSize="@dimen/normal_text_size"/>
<com.simplemobiletools.calendar.views.SmallMonthView
android:id="@+id/july_value"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/july_label"/>
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/month_8" android:id="@+id/month_8"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="@dimen/yearly_padding_half"
android:layout_marginRight="@dimen/yearly_padding_half"
android:layout_weight="1"> android:layout_weight="1">
<TextView <TextView
@ -143,12 +196,19 @@
android:text="@string/august" android:text="@string/august"
android:textAllCaps="true" android:textAllCaps="true"
android:textSize="@dimen/normal_text_size"/> android:textSize="@dimen/normal_text_size"/>
<com.simplemobiletools.calendar.views.SmallMonthView
android:id="@+id/august_value"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/august_label"/>
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/month_9" android:id="@+id/month_9"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="@dimen/yearly_padding_full"
android:layout_weight="1"> android:layout_weight="1">
<TextView <TextView
@ -159,6 +219,12 @@
android:text="@string/september" android:text="@string/september"
android:textAllCaps="true" android:textAllCaps="true"
android:textSize="@dimen/normal_text_size"/> android:textSize="@dimen/normal_text_size"/>
<com.simplemobiletools.calendar.views.SmallMonthView
android:id="@+id/september_value"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/september_label"/>
</RelativeLayout> </RelativeLayout>
</TableRow> </TableRow>
@ -168,6 +234,7 @@
android:id="@+id/month_10" android:id="@+id/month_10"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginRight="@dimen/yearly_padding_full"
android:layout_weight="1"> android:layout_weight="1">
<TextView <TextView
@ -178,12 +245,20 @@
android:text="@string/october" android:text="@string/october"
android:textAllCaps="true" android:textAllCaps="true"
android:textSize="@dimen/normal_text_size"/> android:textSize="@dimen/normal_text_size"/>
<com.simplemobiletools.calendar.views.SmallMonthView
android:id="@+id/october_value"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/october_label"/>
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/month_11" android:id="@+id/month_11"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="@dimen/yearly_padding_half"
android:layout_marginRight="@dimen/yearly_padding_half"
android:layout_weight="1"> android:layout_weight="1">
<TextView <TextView
@ -194,12 +269,19 @@
android:text="@string/november" android:text="@string/november"
android:textAllCaps="true" android:textAllCaps="true"
android:textSize="@dimen/normal_text_size"/> android:textSize="@dimen/normal_text_size"/>
<com.simplemobiletools.calendar.views.SmallMonthView
android:id="@+id/november_value"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/november_label"/>
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/month_12" android:id="@+id/month_12"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="@dimen/yearly_padding_full"
android:layout_weight="1"> android:layout_weight="1">
<TextView <TextView
@ -210,6 +292,12 @@
android:text="@string/december" android:text="@string/december"
android:textAllCaps="true" android:textAllCaps="true"
android:textSize="@dimen/normal_text_size"/> android:textSize="@dimen/normal_text_size"/>
<com.simplemobiletools.calendar.views.SmallMonthView
android:id="@+id/december_value"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/december_label"/>
</RelativeLayout> </RelativeLayout>
</TableRow> </TableRow>
</TableLayout> </TableLayout>

5
app/src/main/res/values/dimens.xml
View File

@ -5,11 +5,14 @@
<dimen name="event_padding">8dp</dimen> <dimen name="event_padding">8dp</dimen>
<dimen name="top_padding">8dp</dimen> <dimen name="top_padding">8dp</dimen>
<dimen name="settings_padding">8dp</dimen> <dimen name="settings_padding">8dp</dimen>
<dimen name="yearly_padding">10dp</dimen> <dimen name="yearly_padding_side">10dp</dimen>
<dimen name="yearly_padding_half">3dp</dimen>
<dimen name="yearly_padding_full">6dp</dimen>
<dimen name="min_widget_width">250dp</dimen> <dimen name="min_widget_width">250dp</dimen>
<dimen name="min_widget_height">250dp</dimen> <dimen name="min_widget_height">250dp</dimen>
<dimen name="tiny_text_size">8sp</dimen>
<dimen name="normal_text_size">14sp</dimen> <dimen name="normal_text_size">14sp</dimen>
<dimen name="day_text_size">16sp</dimen> <dimen name="day_text_size">16sp</dimen>
<dimen name="month_text_size">22sp</dimen> <dimen name="month_text_size">22sp</dimen>