fenix/Simple-Calendar
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Calendar.git synced 2025-06-05 21:59:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

update commons to 3.14.17

Browse Source
This commit is contained in:
tibbi
2018-03-05 16:14:15 +01:00
parent 2994334062
commit 85e7cbd13f
4 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@@ -46,7 +46,7 @@ ext {
} }
dependencies { dependencies {
implementation 'com.simplemobiletools:commons:3.14.15' implementation 'com.simplemobiletools:commons:3.14.17'
implementation 'joda-time:joda-time:2.9.9' implementation 'joda-time:joda-time:2.9.9'
implementation 'com.facebook.stetho:stetho:1.5.0' implementation 'com.facebook.stetho:stetho:1.5.0'
implementation 'com.android.support:multidex:1.0.3' implementation 'com.android.support:multidex:1.0.3'

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

@@ -17,7 +17,10 @@ import com.simplemobiletools.calendar.activities.MainActivity
import com.simplemobiletools.calendar.extensions.addDayEvents import com.simplemobiletools.calendar.extensions.addDayEvents
import com.simplemobiletools.calendar.extensions.addDayNumber import com.simplemobiletools.calendar.extensions.addDayNumber
import com.simplemobiletools.calendar.extensions.config import com.simplemobiletools.calendar.extensions.config
import com.simplemobiletools.calendar.helpers.* import com.simplemobiletools.calendar.helpers.Config
import com.simplemobiletools.calendar.helpers.DAY_CODE
import com.simplemobiletools.calendar.helpers.Formatter
import com.simplemobiletools.calendar.helpers.MonthlyCalendarImpl
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
@@ -139,8 +142,8 @@ class MonthFragment : Fragment(), MonthlyCalendar {
.setNegativeButton(R.string.cancel, null) .setNegativeButton(R.string.cancel, null)
.setPositiveButton(R.string.ok) { dialog, which -> positivePressed(dateTime, datePicker) } .setPositiveButton(R.string.ok) { dialog, which -> positivePressed(dateTime, datePicker) }
.create().apply { .create().apply {
activity?.setupDialogStuff(view, this) activity?.setupDialogStuff(view, this)
} }
} }
private fun positivePressed(dateTime: DateTime, datePicker: DatePicker) { private fun positivePressed(dateTime: DateTime, datePicker: DatePicker) {
@@ -151,16 +154,16 @@ class MonthFragment : Fragment(), MonthlyCalendar {
} }
private fun setupLabels() { private fun setupLabels() {
val letters = letterIDs val letters = context!!.resources.getStringArray(R.array.week_day_letters)
for (i in 0..6) { for (i in 0..6) {
var index = i var index = i
if (!mSundayFirst) if (mSundayFirst) {
index = (index + 1) % letters.size index = (index + 6) % letters.size
}
mHolder.findViewById<TextView>(mRes.getIdentifier("label_$i", "id", mPackageName)).apply { mHolder.findViewById<TextView>(mRes.getIdentifier("label_$i", "id", mPackageName)).apply {
setTextColor(mTextColor) setTextColor(mTextColor)
text = getString(letters[index]) text = letters[index]
} }
} }
} }

6
app/src/main/kotlin/com/simplemobiletools/calendar/helpers/Constants.kt
View File

@@ -1,7 +1,5 @@
package com.simplemobiletools.calendar.helpers package com.simplemobiletools.calendar.helpers
import com.simplemobiletools.calendar.R
const val LOW_ALPHA = .3f const val LOW_ALPHA = .3f
const val MEDIUM_ALPHA = .6f const val MEDIUM_ALPHA = .6f
const val STORED_LOCALLY_ONLY = 0 const val STORED_LOCALLY_ONLY = 0
@@ -54,10 +52,6 @@ const val DISPLAY_PAST_EVENTS = "display_past_events"
const val REPLACE_DESCRIPTION = "replace_description" const val REPLACE_DESCRIPTION = "replace_description"
const val USE_SAME_SNOOZE = "use_same_snooze" const val USE_SAME_SNOOZE = "use_same_snooze"
val letterIDs = intArrayOf(R.string.sunday_letter, R.string.monday_letter, R.string.tuesday_letter, R.string.wednesday_letter,
R.string.thursday_letter, R.string.friday_letter, R.string.saturday_letter)
// repeat_rule for monthly repetition // repeat_rule for monthly repetition
const val REPEAT_MONTH_SAME_DAY = 1 // ie 25th every month const val REPEAT_MONTH_SAME_DAY = 1 // ie 25th every month
const val REPEAT_MONTH_ORDER_WEEKDAY_USE_LAST = 2 // ie every xth sunday. 4th if a month has 4 sundays, 5th if 5 const val REPEAT_MONTH_ORDER_WEEKDAY_USE_LAST = 2 // ie every xth sunday. 4th if a month has 4 sundays, 5th if 5

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

@@ -191,18 +191,18 @@ class MyWidgetMonthlyProvider : AppWidgetProvider() {
val sundayFirst = context.config.isSundayFirst val sundayFirst = context.config.isSundayFirst
val smallerFontSize = context.config.getFontSize() val smallerFontSize = context.config.getFontSize()
val packageName = context.packageName val packageName = context.packageName
val letters = letterIDs val letters = context.resources.getStringArray(R.array.week_day_letters)
for (i in 0..6) { for (i in 0..6) {
val id = resources.getIdentifier("label_$i", "id", packageName) val id = resources.getIdentifier("label_$i", "id", packageName)
views.setTextColor(id, textColor) views.setTextColor(id, textColor)
views.setTextSize(id, smallerFontSize) views.setTextSize(id, smallerFontSize)
var index = i var index = i
if (!sundayFirst) { if (sundayFirst) {
index = (index + 1) % letters.size index = (index + 6) % letters.size
} }
views.setText(id, resources.getString(letters[index])) views.setText(id, letters[index])
} }
} }
} }