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

Merge pull request #33 from SimpleMobileTools/master

Browse Source 
upd
This commit is contained in:
solokot 2020-05-05 02:09:39 +03:00 committed by GitHub
commit 722a813ea8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
72 changed files with 777 additions and 379 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@ -1,6 +1,13 @@
Changelog
==========
Version 6.9.2 *(2020-04-17)*
----------------------------
* Fixed some .ics file importing related glitches
* Corrected and added some UK holidays
* Added many UI and translation improvements
Version 6.9.1 *(2020-03-25)*
----------------------------

6
app/build.gradle
View File

@ -18,8 +18,8 @@ android {
applicationId "com.simplemobiletools.calendar.pro"
minSdkVersion 21
targetSdkVersion 29
versionCode 174
versionName "6.9.1"
versionCode 175
versionName "6.9.2"
multiDexEnabled true
setProperty("archivesBaseName", "calendar")
vectorDrawables.useSupportLibrary = true
@ -64,7 +64,7 @@ android {
}
dependencies {
implementation 'com.simplemobiletools:commons:5.25.22'
implementation 'com.simplemobiletools:commons:5.27.5'
implementation 'joda-time:joda-time:2.10.1'
implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta4'

22
app/src/main/AndroidManifest.xml
View File

@ -94,6 +94,15 @@
</intent-filter>
</activity>
<activity
android:name=".activities.WidgetDateConfigureActivity"
android:screenOrientation="portrait"
android:theme="@style/MyWidgetConfigTheme">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>
</intent-filter>
</activity>
<activity
android:name="com.simplemobiletools.commons.activities.AboutActivity"
android:label="@string/about"
@ -188,6 +197,19 @@
android:resource="@xml/widget_list_info"/>
</receiver>
<receiver
android:name=".helpers.MyWidgetDateProvider"
android:icon="@drawable/img_widget_date_preview"
android:label="@string/widget_todays_date">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
</intent-filter>
<meta-data
android:name="android.appwidget.provider"
android:resource="@xml/widget_date_info"/>
</receiver>
<service
android:name=".services.WidgetService"
android:permission="android.permission.BIND_REMOTEVIEWS"/>

48
app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt
View File

@ -302,7 +302,7 @@ class EventActivity : SimpleActivity() {
mRepeatLimit = getLong(REPEAT_LIMIT)
mAttendees = Gson().fromJson<ArrayList<Attendee>>(getString(ATTENDEES), object : TypeToken<List<Attendee>>() {}.type)
?: ArrayList()
?: ArrayList()
mEventTypeId = getLong(EVENT_TYPE_ID)
mEventCalendarId = getInt(EVENT_CALENDAR_ID)
@ -732,8 +732,8 @@ class EventActivity : SimpleActivity() {
private fun showReminderTypePicker(currentValue: Int, callback: (Int) -> Unit) {
val items = arrayListOf(
RadioItem(REMINDER_NOTIFICATION, getString(R.string.notification)),
RadioItem(REMINDER_EMAIL, getString(R.string.email))
RadioItem(REMINDER_NOTIFICATION, getString(R.string.notification)),
RadioItem(REMINDER_EMAIL, getString(R.string.email))
)
RadioGroupDialog(this, items, currentValue) {
callback(it as Int)
@ -809,7 +809,7 @@ class EventActivity : SimpleActivity() {
private fun getCalendarId() = if (mEvent.source == SOURCE_SIMPLE_CALENDAR) config.lastUsedCaldavCalendarId else mEvent.getCalDAVCalendarId()
private fun getCalendarWithId(calendars: List<CalDAVCalendar>, calendarId: Int): CalDAVCalendar? =
calendars.firstOrNull { it.id == calendarId }
calendars.firstOrNull { it.id == calendarId }
private fun updateCurrentCalendarInfo(currentCalendar: CalDAVCalendar?) {
event_type_image.beVisibleIf(currentCalendar == null)
@ -852,8 +852,8 @@ class EventActivity : SimpleActivity() {
private fun resetTime() {
if (mEventEndDateTime.isBefore(mEventStartDateTime) &&
mEventStartDateTime.dayOfMonth() == mEventEndDateTime.dayOfMonth() &&
mEventStartDateTime.monthOfYear() == mEventEndDateTime.monthOfYear()) {
mEventStartDateTime.dayOfMonth() == mEventEndDateTime.dayOfMonth() &&
mEventStartDateTime.monthOfYear() == mEventEndDateTime.monthOfYear()) {
mEventEndDateTime = mEventEndDateTime.withTime(mEventStartDateTime.hourOfDay, mEventStartDateTime.minuteOfHour, mEventStartDateTime.secondOfMinute, 0)
updateEndTimeText()
@ -960,9 +960,9 @@ class EventActivity : SimpleActivity() {
}
var reminders = arrayListOf(
Reminder(mReminder1Minutes, mReminder1Type),
Reminder(mReminder2Minutes, mReminder2Type),
Reminder(mReminder3Minutes, mReminder3Type)
Reminder(mReminder1Minutes, mReminder1Type),
Reminder(mReminder2Minutes, mReminder2Type),
Reminder(mReminder3Minutes, mReminder3Type)
)
reminders = reminders.filter { it.minutes != REMINDER_OFF }.sortedBy { it.minutes }.toMutableList() as ArrayList<Reminder>
@ -1137,7 +1137,7 @@ class EventActivity : SimpleActivity() {
hideKeyboard()
config.backgroundColor.getContrastColor()
val datepicker = DatePickerDialog(this, mDialogTheme, startDateSetListener, mEventStartDateTime.year, mEventStartDateTime.monthOfYear - 1,
mEventStartDateTime.dayOfMonth)
mEventStartDateTime.dayOfMonth)
datepicker.datePicker.firstDayOfWeek = if (config.isSundayFirst) Calendar.SUNDAY else Calendar.MONDAY
datepicker.show()
@ -1151,7 +1151,7 @@ class EventActivity : SimpleActivity() {
private fun setupEndDate() {
hideKeyboard()
val datepicker = DatePickerDialog(this, mDialogTheme, endDateSetListener, mEventEndDateTime.year, mEventEndDateTime.monthOfYear - 1,
mEventEndDateTime.dayOfMonth)
mEventEndDateTime.dayOfMonth)
datepicker.datePicker.firstDayOfWeek = if (config.isSundayFirst) Calendar.SUNDAY else Calendar.MONDAY
datepicker.show()
@ -1373,9 +1373,9 @@ class EventActivity : SimpleActivity() {
if (attendee.isMe) {
event_contact_attendee.setOnClickListener {
val items = arrayListOf(
RadioItem(Attendees.ATTENDEE_STATUS_ACCEPTED, getString(R.string.going)),
RadioItem(Attendees.ATTENDEE_STATUS_DECLINED, getString(R.string.not_going)),
RadioItem(Attendees.ATTENDEE_STATUS_TENTATIVE, getString(R.string.maybe_going))
RadioItem(Attendees.ATTENDEE_STATUS_ACCEPTED, getString(R.string.going)),
RadioItem(Attendees.ATTENDEE_STATUS_DECLINED, getString(R.string.not_going)),
RadioItem(Attendees.ATTENDEE_STATUS_TENTATIVE, getString(R.string.maybe_going))
)
RadioGroupDialog(this@EventActivity, items, attendee.status) {
@ -1448,13 +1448,13 @@ class EventActivity : SimpleActivity() {
val contacts = ArrayList<Attendee>()
val uri = Data.CONTENT_URI
val projection = arrayOf(
Data.CONTACT_ID,
StructuredName.PREFIX,
StructuredName.GIVEN_NAME,
StructuredName.MIDDLE_NAME,
StructuredName.FAMILY_NAME,
StructuredName.SUFFIX,
StructuredName.PHOTO_THUMBNAIL_URI)
Data.CONTACT_ID,
StructuredName.PREFIX,
StructuredName.GIVEN_NAME,
StructuredName.MIDDLE_NAME,
StructuredName.FAMILY_NAME,
StructuredName.SUFFIX,
StructuredName.PHOTO_THUMBNAIL_URI)
val selection = "${Data.MIMETYPE} = ?"
val selectionArgs = arrayOf(StructuredName.CONTENT_ITEM_TYPE)
@ -1482,8 +1482,8 @@ class EventActivity : SimpleActivity() {
val contacts = ArrayList<Attendee>()
val uri = CommonDataKinds.Email.CONTENT_URI
val projection = arrayOf(
Data.CONTACT_ID,
CommonDataKinds.Email.DATA
Data.CONTACT_ID,
CommonDataKinds.Email.DATA
)
queryCursor(uri, projection) { cursor ->
@ -1500,7 +1500,7 @@ class EventActivity : SimpleActivity() {
event_show_on_map.applyColorFilter(getAdjustedPrimaryColor())
val textColor = config.textColor
arrayOf(event_time_image, event_time_zone_image, event_repetition_image, event_reminder_image, event_type_image, event_caldav_calendar_image,
event_reminder_1_type, event_reminder_2_type, event_reminder_3_type, event_attendees_image).forEach {
event_reminder_1_type, event_reminder_2_type, event_reminder_3_type, event_attendees_image).forEach {
it.applyColorFilter(textColor)
}
}

50
app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/MainActivity.kt
View File

@ -126,7 +126,7 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
override fun onResume() {
super.onResume()
if (mStoredTextColor != config.textColor || mStoredBackgroundColor != config.backgroundColor || mStoredPrimaryColor != config.primaryColor
|| mStoredDayCode != Formatter.getTodayCode() || mStoredDimPastEvents != config.dimPastEvents) {
|| mStoredDayCode != Formatter.getTodayCode() || mStoredDimPastEvents != config.dimPastEvents) {
updateViewPager()
}
@ -329,11 +329,11 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
val intent = Intent(this, SplashActivity::class.java)
intent.action = SHORTCUT_NEW_EVENT
val shortcut = ShortcutInfo.Builder(this, "new_event")
.setShortLabel(newEvent)
.setLongLabel(newEvent)
.setIcon(Icon.createWithBitmap(bmp))
.setIntent(intent)
.build()
.setShortLabel(newEvent)
.setLongLabel(newEvent)
.setIcon(Icon.createWithBitmap(bmp))
.setIntent(intent)
.build()
try {
manager.dynamicShortcuts = Arrays.asList(shortcut)
@ -407,11 +407,11 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
private fun showViewDialog() {
val items = arrayListOf(
RadioItem(DAILY_VIEW, getString(R.string.daily_view)),
RadioItem(WEEKLY_VIEW, getString(R.string.weekly_view)),
RadioItem(MONTHLY_VIEW, getString(R.string.monthly_view)),
RadioItem(YEARLY_VIEW, getString(R.string.yearly_view)),
RadioItem(EVENTS_LIST_VIEW, getString(R.string.simple_event_list)))
RadioItem(DAILY_VIEW, getString(R.string.daily_view)),
RadioItem(WEEKLY_VIEW, getString(R.string.weekly_view)),
RadioItem(MONTHLY_VIEW, getString(R.string.monthly_view)),
RadioItem(YEARLY_VIEW, getString(R.string.yearly_view)),
RadioItem(EVENTS_LIST_VIEW, getString(R.string.simple_event_list)))
RadioGroupDialog(this, items, config.storedView) {
calendar_fab.beVisibleIf(it as Int != YEARLY_VIEW)
@ -558,9 +558,9 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
var eventsFound = 0
val uri = Data.CONTENT_URI
val projection = arrayOf(Contacts.DISPLAY_NAME,
CommonDataKinds.Event.CONTACT_ID,
CommonDataKinds.Event.CONTACT_LAST_UPDATED_TIMESTAMP,
CommonDataKinds.Event.START_DATE)
CommonDataKinds.Event.CONTACT_ID,
CommonDataKinds.Event.CONTACT_LAST_UPDATED_TIMESTAMP,
CommonDataKinds.Event.START_DATE)
val selection = "${Data.MIMETYPE} = ? AND ${CommonDataKinds.Event.TYPE} = ?"
val type = if (birthdays) CommonDataKinds.Event.TYPE_BIRTHDAY else CommonDataKinds.Event.TYPE_ANNIVERSARY
@ -592,8 +592,8 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
val source = if (birthdays) SOURCE_CONTACT_BIRTHDAY else SOURCE_CONTACT_ANNIVERSARY
val lastUpdated = cursor.getLongValue(CommonDataKinds.Event.CONTACT_LAST_UPDATED_TIMESTAMP)
val event = Event(null, timestamp, timestamp, name, reminder1Minutes = reminders[0], reminder2Minutes = reminders[1],
reminder3Minutes = reminders[2], importId = contactId, timeZone = DateTimeZone.getDefault().id, flags = FLAG_ALL_DAY,
repeatInterval = YEAR, repeatRule = REPEAT_SAME_DAY, eventType = eventTypeId, source = source, lastUpdated = lastUpdated)
reminder3Minutes = reminders[2], importId = contactId, timeZone = DateTimeZone.getDefault().id, flags = FLAG_ALL_DAY,
repeatInterval = YEAR, repeatRule = REPEAT_SAME_DAY, eventType = eventTypeId, source = source, lastUpdated = lastUpdated)
val importIDsToDelete = ArrayList<String>()
for ((key, value) in importIDs) {
@ -846,15 +846,15 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener {
val licenses = LICENSE_JODA
val faqItems = arrayListOf(
FAQItem(R.string.faq_1_title_commons, R.string.faq_1_text_commons),
FAQItem(R.string.faq_4_title_commons, R.string.faq_4_text_commons),
FAQItem(R.string.faq_1_title, R.string.faq_1_text),
FAQItem(R.string.faq_2_title, R.string.faq_2_text),
FAQItem(R.string.faq_3_title, R.string.faq_3_text),
FAQItem(R.string.faq_4_title, R.string.faq_4_text),
FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons),
FAQItem(R.string.faq_6_title_commons, R.string.faq_6_text_commons),
FAQItem(R.string.faq_7_title_commons, R.string.faq_7_text_commons))
FAQItem(R.string.faq_1_title_commons, R.string.faq_1_text_commons),
FAQItem(R.string.faq_4_title_commons, R.string.faq_4_text_commons),
FAQItem(R.string.faq_1_title, R.string.faq_1_text),
FAQItem(R.string.faq_2_title, R.string.faq_2_text),
FAQItem(R.string.faq_3_title, R.string.faq_3_text),
FAQItem(R.string.faq_4_title, R.string.faq_4_text),
FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons),
FAQItem(R.string.faq_6_title_commons, R.string.faq_6_text_commons),
FAQItem(R.string.faq_7_title_commons, R.string.faq_7_text_commons))
startAboutActivity(R.string.app_name, licenses, BuildConfig.VERSION_NAME, faqItems, true)
}

50
app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SettingsActivity.kt
View File

@ -126,7 +126,7 @@ class SettingsActivity : SimpleActivity() {
private fun setupSectionColors() {
val adjustedPrimaryColor = getAdjustedPrimaryColor()
arrayListOf(reminders_label, caldav_label, weekly_view_label, monthly_view_label, simple_event_list_label, widgets_label, events_label,
new_events_label, migrating_label).forEach {
new_events_label, migrating_label).forEach {
it.setTextColor(adjustedPrimaryColor)
}
}
@ -325,16 +325,16 @@ class SettingsActivity : SimpleActivity() {
settings_reminder_sound_holder.setOnClickListener {
SelectAlarmSoundDialog(this, config.reminderSoundUri, config.reminderAudioStream, GET_RINGTONE_URI, ALARM_SOUND_TYPE_NOTIFICATION, false,
onAlarmPicked = {
if (it != null) {
updateReminderSound(it)
}
}, onAlarmSoundDeleted = {
if (it.uri == config.reminderSoundUri) {
val defaultAlarm = getDefaultAlarmSound(ALARM_SOUND_TYPE_NOTIFICATION)
updateReminderSound(defaultAlarm)
}
})
onAlarmPicked = {
if (it != null) {
updateReminderSound(it)
}
}, onAlarmSoundDeleted = {
if (it.uri == config.reminderSoundUri) {
val defaultAlarm = getDefaultAlarmSound(ALARM_SOUND_TYPE_NOTIFICATION)
updateReminderSound(defaultAlarm)
}
})
}
}
@ -348,10 +348,10 @@ class SettingsActivity : SimpleActivity() {
settings_reminder_audio_stream.text = getAudioStreamText()
settings_reminder_audio_stream_holder.setOnClickListener {
val items = arrayListOf(
RadioItem(AudioManager.STREAM_ALARM, getString(R.string.alarm_stream)),
RadioItem(AudioManager.STREAM_SYSTEM, getString(R.string.system_stream)),
RadioItem(AudioManager.STREAM_NOTIFICATION, getString(R.string.notification_stream)),
RadioItem(AudioManager.STREAM_RING, getString(R.string.ring_stream)))
RadioItem(AudioManager.STREAM_ALARM, getString(R.string.alarm_stream)),
RadioItem(AudioManager.STREAM_SYSTEM, getString(R.string.system_stream)),
RadioItem(AudioManager.STREAM_NOTIFICATION, getString(R.string.notification_stream)),
RadioItem(AudioManager.STREAM_RING, getString(R.string.ring_stream)))
RadioGroupDialog(this@SettingsActivity, items, config.reminderAudioStream) {
config.reminderAudioStream = it as Int
@ -484,10 +484,10 @@ class SettingsActivity : SimpleActivity() {
settings_font_size.text = getFontSizeText()
settings_font_size_holder.setOnClickListener {
val items = arrayListOf(
RadioItem(FONT_SIZE_SMALL, getString(R.string.small)),
RadioItem(FONT_SIZE_MEDIUM, getString(R.string.medium)),
RadioItem(FONT_SIZE_LARGE, getString(R.string.large)),
RadioItem(FONT_SIZE_EXTRA_LARGE, getString(R.string.extra_large)))
RadioItem(FONT_SIZE_SMALL, getString(R.string.small)),
RadioItem(FONT_SIZE_MEDIUM, getString(R.string.medium)),
RadioItem(FONT_SIZE_LARGE, getString(R.string.large)),
RadioItem(FONT_SIZE_EXTRA_LARGE, getString(R.string.extra_large)))
RadioGroupDialog(this@SettingsActivity, items, config.fontSize) {
config.fontSize = it as Int
@ -510,12 +510,12 @@ class SettingsActivity : SimpleActivity() {
settings_list_widget_view_to_open.text = getDefaultViewText()
settings_list_widget_view_to_open_holder.setOnClickListener {
val items = arrayListOf(
RadioItem(DAILY_VIEW, getString(R.string.daily_view)),
RadioItem(WEEKLY_VIEW, getString(R.string.weekly_view)),
RadioItem(MONTHLY_VIEW, getString(R.string.monthly_view)),
RadioItem(YEARLY_VIEW, getString(R.string.yearly_view)),
RadioItem(EVENTS_LIST_VIEW, getString(R.string.simple_event_list)),
RadioItem(LAST_VIEW, getString(R.string.last_view)))
RadioItem(DAILY_VIEW, getString(R.string.daily_view)),
RadioItem(WEEKLY_VIEW, getString(R.string.weekly_view)),
RadioItem(MONTHLY_VIEW, getString(R.string.monthly_view)),
RadioItem(YEARLY_VIEW, getString(R.string.yearly_view)),
RadioItem(EVENTS_LIST_VIEW, getString(R.string.simple_event_list)),
RadioItem(LAST_VIEW, getString(R.string.last_view)))
RadioGroupDialog(this@SettingsActivity, items, config.listWidgetViewToOpen) {
config.listWidgetViewToOpen = it as Int

38
app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/SimpleActivity.kt
View File

@ -16,25 +16,25 @@ open class SimpleActivity : BaseSimpleActivity() {
var calDAVRefreshCallback: (() -> Unit)? = null
override fun getAppIconIDs() = arrayListOf(
R.mipmap.ic_launcher_red,
R.mipmap.ic_launcher_pink,
R.mipmap.ic_launcher_purple,
R.mipmap.ic_launcher_deep_purple,
R.mipmap.ic_launcher_indigo,
R.mipmap.ic_launcher_blue,
R.mipmap.ic_launcher_light_blue,
R.mipmap.ic_launcher_cyan,
R.mipmap.ic_launcher_teal,
R.mipmap.ic_launcher_green,
R.mipmap.ic_launcher_light_green,
R.mipmap.ic_launcher_lime,
R.mipmap.ic_launcher_yellow,
R.mipmap.ic_launcher_amber,
R.mipmap.ic_launcher,
R.mipmap.ic_launcher_deep_orange,
R.mipmap.ic_launcher_brown,
R.mipmap.ic_launcher_blue_grey,
R.mipmap.ic_launcher_grey_black
R.mipmap.ic_launcher_red,
R.mipmap.ic_launcher_pink,
R.mipmap.ic_launcher_purple,
R.mipmap.ic_launcher_deep_purple,
R.mipmap.ic_launcher_indigo,
R.mipmap.ic_launcher_blue,
R.mipmap.ic_launcher_light_blue,
R.mipmap.ic_launcher_cyan,
R.mipmap.ic_launcher_teal,
R.mipmap.ic_launcher_green,
R.mipmap.ic_launcher_light_green,
R.mipmap.ic_launcher_lime,
R.mipmap.ic_launcher_yellow,
R.mipmap.ic_launcher_amber,
R.mipmap.ic_launcher,
R.mipmap.ic_launcher_deep_orange,
R.mipmap.ic_launcher_brown,
R.mipmap.ic_launcher_blue_grey,
R.mipmap.ic_launcher_grey_black
)
override fun getAppLauncherName() = getString(R.string.app_launcher_name)

141
app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/WidgetDateConfigureActivity.kt Normal file
View File

@ -0,0 +1,141 @@
package com.simplemobiletools.calendar.pro.activities
import android.app.Activity
import android.appwidget.AppWidgetManager
import android.content.Intent
import android.graphics.Color
import android.os.Bundle
import android.widget.SeekBar
import com.simplemobiletools.calendar.pro.R
import com.simplemobiletools.calendar.pro.extensions.config
import com.simplemobiletools.calendar.pro.helpers.Formatter
import com.simplemobiletools.calendar.pro.helpers.LOW_ALPHA
import com.simplemobiletools.calendar.pro.helpers.MyWidgetDateProvider
import com.simplemobiletools.commons.dialogs.ColorPickerDialog
import com.simplemobiletools.commons.extensions.adjustAlpha
import com.simplemobiletools.commons.extensions.applyColorFilter
import com.simplemobiletools.commons.extensions.setFillWithStroke
import kotlinx.android.synthetic.main.widget_config_date.*
class WidgetDateConfigureActivity : SimpleActivity() {
private var mBgAlpha = 0f
private var mWidgetId = 0
private var mBgColorWithoutTransparency = 0
private var mBgColor = 0
private var mTextColorWithoutTransparency = 0
private var mTextColor = 0
private var mWeakTextColor = 0
private var mPrimaryColor = 0
public override fun onCreate(savedInstanceState: Bundle?) {
useDynamicTheme = false
super.onCreate(savedInstanceState)
setResult(Activity.RESULT_CANCELED)
setContentView(R.layout.widget_config_date)
initVariables()
val extras = intent.extras
if (extras != null)
mWidgetId = extras.getInt(AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID)
if (mWidgetId == AppWidgetManager.INVALID_APPWIDGET_ID)
finish()
config_save.setOnClickListener { saveConfig() }
config_bg_color.setOnClickListener { pickBackgroundColor() }
config_text_color.setOnClickListener { pickTextColor() }
config_bg_seekbar.setColors(mTextColor, mPrimaryColor, mPrimaryColor)
widget_date_label.text = Formatter.getTodayDayNumber()
widget_month_label.text = Formatter.getCurrentMonthShort()
}
override fun onResume() {
super.onResume()
window.decorView.setBackgroundColor(0)
}
private fun initVariables() {
mTextColorWithoutTransparency = config.widgetTextColor
updateColors()
mBgColor = config.widgetBgColor
mBgAlpha = Color.alpha(mBgColor) / 255.toFloat()
mBgColorWithoutTransparency = Color.rgb(Color.red(mBgColor), Color.green(mBgColor), Color.blue(mBgColor))
config_bg_seekbar.setOnSeekBarChangeListener(bgSeekbarChangeListener)
config_bg_seekbar.progress = (mBgAlpha * 100).toInt()
updateBgColor()
}
private fun saveConfig() {
storeWidgetColors()
requestWidgetUpdate()
Intent().apply {
putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, mWidgetId)
setResult(Activity.RESULT_OK, this)
}
finish()
}
private fun storeWidgetColors() {
config.apply {
widgetBgColor = mBgColor
widgetTextColor = mTextColorWithoutTransparency
}
}
private fun pickBackgroundColor() {
ColorPickerDialog(this, mBgColorWithoutTransparency) { wasPositivePressed, color ->
if (wasPositivePressed) {
mBgColorWithoutTransparency = color
updateBgColor()
}
}
}
private fun pickTextColor() {
ColorPickerDialog(this, mTextColor) { wasPositivePressed, color ->
if (wasPositivePressed) {
mTextColorWithoutTransparency = color
updateColors()
}
}
}
private fun requestWidgetUpdate() {
Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE, null, this, MyWidgetDateProvider::class.java).apply {
putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, intArrayOf(mWidgetId))
sendBroadcast(this)
}
}
private fun updateColors() {
mTextColor = mTextColorWithoutTransparency
mWeakTextColor = mTextColorWithoutTransparency.adjustAlpha(LOW_ALPHA)
mPrimaryColor = config.primaryColor
config_text_color.setFillWithStroke(mTextColor, Color.BLACK)
config_save.setTextColor(mTextColor)
widget_date_label.setTextColor(mTextColor)
widget_month_label.setTextColor(mTextColor)
}
private fun updateBgColor() {
mBgColor = mBgColorWithoutTransparency.adjustAlpha(mBgAlpha)
config_date_time_wrapper.background.applyColorFilter(mBgColor)
config_bg_color.setFillWithStroke(mBgColor, Color.BLACK)
config_save.setBackgroundColor(mBgColor)
}
private val bgSeekbarChangeListener = object : SeekBar.OnSeekBarChangeListener {
override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
mBgAlpha = progress.toFloat() / 100.toFloat()
updateBgColor()
}
override fun onStartTrackingTouch(seekBar: SeekBar) {}
override fun onStopTrackingTouch(seekBar: SeekBar) {}
}
}

3
app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/WidgetListConfigureActivity.kt
View File

@ -17,6 +17,7 @@ import com.simplemobiletools.calendar.pro.models.ListItem
import com.simplemobiletools.calendar.pro.models.ListSection
import com.simplemobiletools.commons.dialogs.ColorPickerDialog
import com.simplemobiletools.commons.extensions.adjustAlpha
import com.simplemobiletools.commons.extensions.applyColorFilter
import com.simplemobiletools.commons.extensions.setFillWithStroke
import com.simplemobiletools.commons.helpers.IS_CUSTOMIZING_COLORS
import kotlinx.android.synthetic.main.widget_config_list.*
@ -128,7 +129,7 @@ class WidgetListConfigureActivity : SimpleActivity() {
private fun updateBgColor() {
mBgColor = mBgColorWithoutTransparency.adjustAlpha(mBgAlpha)
config_events_list.setBackgroundColor(mBgColor)
config_events_list.background.applyColorFilter(mBgColor)
config_bg_color.setFillWithStroke(mBgColor, Color.BLACK)
config_save.setBackgroundColor(mBgColor)
}

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

@ -4,7 +4,6 @@ import android.app.Activity
import android.appwidget.AppWidgetManager
import android.content.Context
import android.content.Intent
import android.content.res.Resources
import android.graphics.Color
import android.os.Bundle
import android.widget.LinearLayout
@ -30,9 +29,7 @@ import kotlinx.android.synthetic.main.widget_config_monthly.*
import org.joda.time.DateTime
class WidgetMonthlyConfigureActivity : SimpleActivity(), MonthlyCalendar {
lateinit var mRes: Resources
private var mDays: List<DayMonthly>? = null
private var mPackageName = ""
private var dayLabelHeight = 0
private var mBgAlpha = 0f
@ -70,9 +67,6 @@ class WidgetMonthlyConfigureActivity : SimpleActivity(), MonthlyCalendar {
}
private fun initVariables() {
mPackageName = packageName
mRes = resources
mTextColorWithoutTransparency = config.widgetTextColor
updateColors()
@ -146,7 +140,7 @@ class WidgetMonthlyConfigureActivity : SimpleActivity(), MonthlyCalendar {
private fun updateBgColor() {
mBgColor = mBgColorWithoutTransparency.adjustAlpha(mBgAlpha)
config_calendar.setBackgroundColor(mBgColor)
config_calendar.background.applyColorFilter(mBgColor)
config_bg_color.setFillWithStroke(mBgColor, Color.BLACK)
config_save.setBackgroundColor(mBgColor)
}
@ -159,7 +153,7 @@ class WidgetMonthlyConfigureActivity : SimpleActivity(), MonthlyCalendar {
week_num.beVisible()
for (i in 0..5) {
findViewById<TextView>(mRes.getIdentifier("week_num_$i", "id", mPackageName)).apply {
findViewById<TextView>(resources.getIdentifier("week_num_$i", "id", packageName)).apply {
text = "${mDays!![i * 7 + 3].weekOfYear}:"
setTextColor(mTextColor)
beVisible()
@ -167,14 +161,14 @@ class WidgetMonthlyConfigureActivity : SimpleActivity(), MonthlyCalendar {
}
}
val dividerMargin = mRes.displayMetrics.density.toInt()
val dividerMargin = resources.displayMetrics.density.toInt()
for (i in 0 until len) {
findViewById<LinearLayout>(mRes.getIdentifier("day_$i", "id", mPackageName)).apply {
findViewById<LinearLayout>(resources.getIdentifier("day_$i", "id", packageName)).apply {
val day = mDays!![i]
removeAllViews()
context.addDayNumber(mTextColor, day, this, dayLabelHeight) { dayLabelHeight = it }
context.addDayEvents(day, this, mRes, dividerMargin)
context.addDayEvents(day, this, resources, dividerMargin)
}
}
}
@ -185,13 +179,9 @@ class WidgetMonthlyConfigureActivity : SimpleActivity(), MonthlyCalendar {
updateBgColor()
}
override fun onStartTrackingTouch(seekBar: SeekBar) {
override fun onStartTrackingTouch(seekBar: SeekBar) {}
}
override fun onStopTrackingTouch(seekBar: SeekBar) {
}
override fun onStopTrackingTouch(seekBar: SeekBar) {}
}
override fun updateMonthlyCalendar(context: Context, month: String, days: ArrayList<DayMonthly>, checkedEvents: Boolean, currTargetDate: DateTime) {
@ -204,7 +194,7 @@ class WidgetMonthlyConfigureActivity : SimpleActivity(), MonthlyCalendar {
private fun updateLabels() {
for (i in 0..6) {
findViewById<TextView>(mRes.getIdentifier("label_$i", "id", mPackageName)).apply {
findViewById<TextView>(resources.getIdentifier("label_$i", "id", packageName)).apply {
setTextColor(mTextColor)
}
}

2
app/src/main/kotlin/com/simplemobiletools/calendar/pro/adapters/EventListWidgetAdapter.kt
View File

@ -142,7 +142,7 @@ class EventListWidgetAdapter(val context: Context) : RemoteViewsService.RemoteVi
}
}
private fun getItemViewType(position: Int) = if (events[position] is ListEvent) ITEM_EVENT else ITEM_HEADER
private fun getItemViewType(position: Int) = if (events.getOrNull(position) is ListEvent) ITEM_EVENT else ITEM_HEADER
override fun getLoadingView() = null

45
app/src/main/kotlin/com/simplemobiletools/calendar/pro/extensions/Context.kt
View File

@ -56,6 +56,7 @@ fun Context.updateWidgets() {
}
updateListWidget()
updateDateWidget()
}
fun Context.updateListWidget() {
@ -69,6 +70,17 @@ fun Context.updateListWidget() {
}
}
fun Context.updateDateWidget() {
val widgetIDs = AppWidgetManager.getInstance(applicationContext).getAppWidgetIds(ComponentName(applicationContext, MyWidgetDateProvider::class.java))
if (widgetIDs.isNotEmpty()) {
Intent(applicationContext, MyWidgetDateProvider::class.java).apply {
action = AppWidgetManager.ACTION_APPWIDGET_UPDATE
putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, widgetIDs)
sendBroadcast(this)
}
}
}
fun Context.scheduleAllEvents() {
val events = eventsDB.getEventsAtReboot(getNowSeconds())
events.forEach {
@ -234,10 +246,10 @@ fun Context.getNotification(pendingIntent: PendingIntent, event: Event, content:
val channelId = "simple_calendar_${config.lastReminderChannel}_${config.reminderAudioStream}_${event.eventType}"
if (isOreoPlus()) {
val audioAttributes = AudioAttributes.Builder()
.setUsage(AudioAttributes.USAGE_ALARM)
.setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
.setLegacyStreamType(config.reminderAudioStream)
.build()
.setUsage(AudioAttributes.USAGE_ALARM)
.setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
.setLegacyStreamType(config.reminderAudioStream)
.build()
val name = eventTypesDB.getEventTypeWithId(event.eventType)?.getDisplayTitle()
val importance = NotificationManager.IMPORTANCE_HIGH
@ -260,17 +272,17 @@ fun Context.getNotification(pendingIntent: PendingIntent, event: Event, content:
val contentText = if (publicVersion) resources.getString(R.string.public_event_notification_text) else content
val builder = NotificationCompat.Builder(this, channelId)
.setContentTitle(contentTitle)
.setContentText(contentText)
.setSmallIcon(R.drawable.ic_calendar_vector)
.setContentIntent(pendingIntent)
.setPriority(NotificationCompat.PRIORITY_MAX)
.setDefaults(Notification.DEFAULT_LIGHTS)
.setCategory(Notification.CATEGORY_EVENT)
.setAutoCancel(true)
.setSound(Uri.parse(soundUri), config.reminderAudioStream)
.setChannelId(channelId)
.addAction(R.drawable.ic_snooze_vector, getString(R.string.snooze), getSnoozePendingIntent(this, event))
.setContentTitle(contentTitle)
.setContentText(contentText)
.setSmallIcon(R.drawable.ic_calendar_vector)
.setContentIntent(pendingIntent)
.setPriority(NotificationCompat.PRIORITY_MAX)
.setDefaults(Notification.DEFAULT_LIGHTS)
.setCategory(Notification.CATEGORY_EVENT)
.setAutoCancel(true)
.setSound(Uri.parse(soundUri), config.reminderAudioStream)
.setChannelId(channelId)
.addAction(R.drawable.ic_snooze_vector, getString(R.string.snooze), getSnoozePendingIntent(this, event))
if (config.vibrateOnReminder) {
val vibrateArray = LongArray(2) { 500 }
@ -401,7 +413,7 @@ fun Context.addDayNumber(rawTextColor: Int, day: DayMonthly, linearLayout: Linea
}
private fun addTodaysBackground(textView: TextView, res: Resources, dayLabelHeight: Int, primaryColor: Int) =
textView.addResizedBackgroundDrawable(res, dayLabelHeight, primaryColor, R.drawable.ic_circle_filled)
textView.addResizedBackgroundDrawable(res, dayLabelHeight, primaryColor, R.drawable.ic_circle_filled)
fun Context.addDayEvents(day: DayMonthly, linearLayout: LinearLayout, res: Resources, dividerMargin: Int) {
val eventLayoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
@ -513,7 +525,6 @@ fun Context.refreshCalDAVCalendars(ids: String, showToasts: Boolean) {
}
}
fun Context.getWidgetFontSize() = when (config.fontSize) {
FONT_SIZE_SMALL -> getWidgetSmallFontSize()
FONT_SIZE_MEDIUM -> getWidgetMediumFontSize()

5
app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/Formatter.kt
View File

@ -13,6 +13,7 @@ object Formatter {
const val DAYCODE_PATTERN = "YYYYMMdd"
const val YEAR_PATTERN = "YYYY"
const val TIME_PATTERN = "HHmmss"
private const val MONTH_PATTERN = "MMM"
private const val DAY_PATTERN = "d"
private const val DAY_OF_WEEK_PATTERN = "EEE"
private const val LONGEST_PATTERN = "MMMM d YYYY (EEEE)"
@ -60,6 +61,10 @@ object Formatter {
fun getTodayCode() = getDayCodeFromTS(getNowSeconds())
fun getTodayDayNumber() = getDateTimeFromTS(getNowSeconds()).toString(DAY_PATTERN)
fun getCurrentMonthShort() = getDateTimeFromTS(getNowSeconds()).toString(MONTH_PATTERN)
fun getHours(context: Context, dateTime: DateTime) = dateTime.toString(getHourPattern(context))
fun getTime(context: Context, dateTime: DateTime) = dateTime.toString(getTimePattern(context))

46
app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/MyWidgetDateProvider.kt Normal file
View File

@ -0,0 +1,46 @@
package com.simplemobiletools.calendar.pro.helpers
import android.app.PendingIntent
import android.appwidget.AppWidgetManager
import android.appwidget.AppWidgetProvider
import android.content.ComponentName
import android.content.Context
import android.content.Intent
import android.widget.RemoteViews
import com.simplemobiletools.calendar.pro.R
import com.simplemobiletools.calendar.pro.activities.SplashActivity
import com.simplemobiletools.calendar.pro.extensions.config
import com.simplemobiletools.commons.extensions.applyColorFilter
import com.simplemobiletools.commons.extensions.getLaunchIntent
import com.simplemobiletools.commons.extensions.setText
class MyWidgetDateProvider : AppWidgetProvider() {
private val OPEN_APP_INTENT_ID = 1
override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray) {
appWidgetManager.getAppWidgetIds(getComponentName(context)).forEach {
val views = RemoteViews(context.packageName, R.layout.widget_date).apply {
applyColorFilter(R.id.widget_date_background, context.config.widgetBgColor)
setText(R.id.widget_date_label, Formatter.getTodayDayNumber())
setText(R.id.widget_month_label, Formatter.getCurrentMonthShort())
setTextColor(R.id.widget_date_label, context.config.widgetTextColor)
setTextColor(R.id.widget_month_label, context.config.widgetTextColor)
setupAppOpenIntent(context, this)
appWidgetManager.updateAppWidget(it, this)
}
appWidgetManager.notifyAppWidgetViewDataChanged(it, R.id.widget_date_holder)
}
}
private fun getComponentName(context: Context) = ComponentName(context, MyWidgetDateProvider::class.java)
private fun setupAppOpenIntent(context: Context, views: RemoteViews) {
(context.getLaunchIntent() ?: Intent(context, SplashActivity::class.java)).apply {
val pendingIntent = PendingIntent.getActivity(context, OPEN_APP_INTENT_ID, this, PendingIntent.FLAG_UPDATE_CURRENT)
views.setOnClickPendingIntent(R.id.widget_date_holder, pendingIntent)
}
}
}

2
app/src/main/kotlin/com/simplemobiletools/calendar/pro/helpers/MyWidgetListProvider.kt
View File

@ -34,7 +34,7 @@ class MyWidgetListProvider : AppWidgetProvider() {
val appWidgetManager = AppWidgetManager.getInstance(context)
appWidgetManager.getAppWidgetIds(getComponentName(context)).forEach {
val views = RemoteViews(context.packageName, R.layout.widget_event_list).apply {
setBackgroundColor(R.id.widget_event_list_holder, context.config.widgetBgColor)
applyColorFilter(R.id.widget_event_list_background, context.config.widgetBgColor)
setTextColor(R.id.widget_event_list_empty, textColor)
setTextSize(R.id.widget_event_list_empty, fontSize)

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

@ -124,7 +124,7 @@ class MyWidgetMonthlyProvider : AppWidgetProvider() {
setupDayOpenIntent(context, views, id, day.code)
day.dayEvents = day.dayEvents.asSequence().sortedWith(compareBy({ it.flags and FLAG_ALL_DAY == 0 }, { it.startTS }, { it.title }))
.toMutableList() as ArrayList<Event>
.toMutableList() as ArrayList<Event>
day.dayEvents.forEach {
var backgroundColor = it.color
@ -172,7 +172,7 @@ class MyWidgetMonthlyProvider : AppWidgetProvider() {
val views = RemoteViews(context.packageName, R.layout.fragment_month_widget)
views.setText(R.id.top_value, month)
views.setBackgroundColor(R.id.calendar_holder, context.config.widgetBgColor)
views.applyColorFilter(R.id.widget_month_background, context.config.widgetBgColor)
views.setTextColor(R.id.top_value, textColor)
views.setTextSize(R.id.top_value, largerFontSize)

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

165
app/src/main/res/layout/activity_settings.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/settings_scrollview"
android:layout_width="match_parent"
@ -29,7 +28,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:paddingStart="@dimen/medium_margin"
android:text="@string/customize_colors"/>
android:text="@string/customize_colors" />
</RelativeLayout>
@ -50,7 +49,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:paddingStart="@dimen/medium_margin"
android:text="@string/manage_event_types"/>
android:text="@string/manage_event_types" />
</RelativeLayout>
@ -72,7 +71,7 @@
android:background="@null"
android:clickable="false"
android:paddingStart="@dimen/medium_margin"
android:text="@string/use_english_language"/>
android:text="@string/use_english_language" />
</RelativeLayout>
@ -94,7 +93,7 @@
android:background="@null"
android:clickable="false"
android:paddingStart="@dimen/medium_margin"
android:text="@string/use_24_hour_time_format"/>
android:text="@string/use_24_hour_time_format" />
</RelativeLayout>
@ -116,7 +115,7 @@
android:background="@null"
android:clickable="false"
android:paddingStart="@dimen/medium_margin"
android:text="@string/sunday_first"/>
android:text="@string/sunday_first" />
</RelativeLayout>
@ -125,10 +124,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/bigger_margin"
android:layout_marginTop="@dimen/activity_margin"
android:layout_marginTop="@dimen/section_margin"
android:text="@string/event_reminders"
android:textAllCaps="true"
android:textSize="@dimen/smaller_text_size"/>
android:textSize="@dimen/smaller_text_size" />
<RelativeLayout
android:id="@+id/settings_vibrate_holder"
@ -148,7 +147,7 @@
android:background="@null"
android:clickable="false"
android:paddingStart="@dimen/medium_margin"
android:text="@string/vibrate"/>
android:text="@string/vibrate" />
</RelativeLayout>
@ -170,7 +169,7 @@
android:background="@null"
android:clickable="false"
android:paddingStart="@dimen/medium_margin"
android:text="@string/loop_reminders"/>
android:text="@string/loop_reminders" />
</RelativeLayout>
@ -193,7 +192,7 @@
android:layout_toStartOf="@+id/settings_reminder_sound"
android:paddingStart="@dimen/medium_margin"
android:paddingEnd="@dimen/medium_margin"
android:text="@string/reminder_sound"/>
android:text="@string/reminder_sound" />
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_reminder_sound"
@ -202,7 +201,7 @@
android:layout_alignParentEnd="true"
android:layout_marginEnd="@dimen/small_margin"
android:background="@null"
android:clickable="false"/>
android:clickable="false" />
</RelativeLayout>
@ -224,7 +223,7 @@
android:layout_toStartOf="@+id/settings_reminder_audio_stream"
android:paddingStart="@dimen/medium_margin"
android:paddingEnd="@dimen/medium_margin"
android:text="@string/reminder_stream"/>
android:text="@string/reminder_stream" />
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_reminder_audio_stream"
@ -233,7 +232,7 @@
android:layout_alignParentEnd="true"
android:layout_marginEnd="@dimen/small_margin"
android:background="@null"
android:clickable="false"/>
android:clickable="false" />
</RelativeLayout>
@ -255,7 +254,7 @@
android:background="@null"
android:clickable="false"
android:paddingStart="@dimen/medium_margin"
android:text="@string/use_same_snooze"/>
android:text="@string/use_same_snooze" />
</RelativeLayout>
@ -278,7 +277,7 @@
android:layout_toStartOf="@+id/settings_snooze_time"
android:paddingStart="@dimen/medium_margin"
android:paddingEnd="@dimen/medium_margin"
android:text="@string/snooze_time"/>
android:text="@string/snooze_time" />
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_snooze_time"
@ -287,7 +286,7 @@
android:layout_alignParentEnd="true"
android:layout_marginEnd="@dimen/small_margin"
android:background="@null"
android:clickable="false"/>
android:clickable="false" />
</RelativeLayout>
@ -296,10 +295,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/bigger_margin"
android:layout_marginTop="@dimen/activity_margin"
android:layout_marginTop="@dimen/section_margin"
android:text="@string/caldav"
android:textAllCaps="true"
android:textSize="@dimen/smaller_text_size"/>
android:textSize="@dimen/smaller_text_size" />
<RelativeLayout
android:id="@+id/settings_caldav_sync_holder"
@ -319,7 +318,7 @@
android:background="@null"
android:clickable="false"
android:paddingStart="@dimen/medium_margin"
android:text="@string/caldav_sync"/>
android:text="@string/caldav_sync" />
</RelativeLayout>
@ -341,7 +340,7 @@
android:background="@null"
android:clickable="false"
android:paddingStart="@dimen/medium_margin"
android:text="@string/enable_pull_to_refresh"/>
android:text="@string/enable_pull_to_refresh" />
</RelativeLayout>
@ -363,7 +362,7 @@
android:layout_centerVertical="true"
android:paddingStart="@dimen/medium_margin"
android:paddingEnd="@dimen/medium_margin"
android:text="@string/manage_synced_calendars"/>
android:text="@string/manage_synced_calendars" />
</RelativeLayout>
@ -372,19 +371,19 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/bigger_margin"
android:layout_marginTop="@dimen/activity_margin"
android:layout_marginTop="@dimen/section_margin"
android:text="@string/new_events"
android:textAllCaps="true"
android:textSize="@dimen/smaller_text_size"/>
android:textSize="@dimen/smaller_text_size" />
<RelativeLayout
android:id="@+id/settings_default_start_time_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:paddingLeft="@dimen/normal_margin"
android:paddingStart="@dimen/normal_margin"
android:paddingTop="@dimen/bigger_margin"
android:paddingRight="@dimen/normal_margin"
android:paddingEnd="@dimen/normal_margin"
android:paddingBottom="@dimen/bigger_margin">
<com.simplemobiletools.commons.views.MyTextView
@ -393,9 +392,9 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toStartOf="@+id/settings_default_start_time"
android:paddingLeft="@dimen/medium_margin"
android:paddingRight="@dimen/medium_margin"
android:text="@string/default_start_time"/>
android:paddingStart="@dimen/medium_margin"
android:paddingEnd="@dimen/medium_margin"
android:text="@string/default_start_time" />
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_default_start_time"
@ -405,7 +404,7 @@
android:layout_marginEnd="@dimen/small_margin"
android:background="@null"
android:clickable="false"
tools:text="@string/next_full_hour"/>
tools:text="@string/next_full_hour" />
</RelativeLayout>
@ -414,9 +413,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:paddingLeft="@dimen/normal_margin"
android:paddingStart="@dimen/normal_margin"
android:paddingTop="@dimen/bigger_margin"
android:paddingRight="@dimen/normal_margin"
android:paddingEnd="@dimen/normal_margin"
android:paddingBottom="@dimen/bigger_margin">
<com.simplemobiletools.commons.views.MyTextView
@ -425,9 +424,9 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toStartOf="@+id/settings_default_duration"
android:paddingLeft="@dimen/medium_margin"
android:paddingRight="@dimen/medium_margin"
android:text="@string/default_duration"/>
android:paddingStart="@dimen/medium_margin"
android:paddingEnd="@dimen/medium_margin"
android:text="@string/default_duration" />
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_default_duration"
@ -437,7 +436,7 @@
android:layout_marginEnd="@dimen/small_margin"
android:background="@null"
android:clickable="false"
tools:text="0 minutes"/>
tools:text="0 minutes" />
</RelativeLayout>
@ -446,9 +445,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:paddingLeft="@dimen/normal_margin"
android:paddingStart="@dimen/normal_margin"
android:paddingTop="@dimen/bigger_margin"
android:paddingRight="@dimen/normal_margin"
android:paddingEnd="@dimen/normal_margin"
android:paddingBottom="@dimen/bigger_margin">
<com.simplemobiletools.commons.views.MyTextView
@ -457,9 +456,9 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toStartOf="@+id/settings_default_event_type"
android:paddingLeft="@dimen/medium_margin"
android:paddingRight="@dimen/medium_margin"
android:text="@string/default_event_type"/>
android:paddingStart="@dimen/medium_margin"
android:paddingEnd="@dimen/medium_margin"
android:text="@string/default_event_type" />
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_default_event_type"
@ -469,7 +468,7 @@
android:layout_marginEnd="@dimen/small_margin"
android:background="@null"
android:clickable="false"
tools:text="@string/last_used_one"/>
tools:text="@string/last_used_one" />
</RelativeLayout>
@ -491,7 +490,7 @@
android:background="@null"
android:clickable="false"
android:paddingStart="@dimen/medium_margin"
android:text="@string/use_last_event_reminders"/>
android:text="@string/use_last_event_reminders" />
</RelativeLayout>
@ -514,7 +513,7 @@
android:layout_toStartOf="@+id/settings_default_reminder_1"
android:paddingStart="@dimen/medium_margin"
android:paddingEnd="@dimen/medium_margin"
android:text="@string/default_reminder_1"/>
android:text="@string/default_reminder_1" />
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_default_reminder_1"
@ -523,7 +522,7 @@
android:layout_alignParentEnd="true"
android:layout_marginEnd="@dimen/small_margin"
android:background="@null"
android:clickable="false"/>
android:clickable="false" />
</RelativeLayout>
@ -546,7 +545,7 @@
android:layout_toStartOf="@+id/settings_default_reminder_2"
android:paddingStart="@dimen/medium_margin"
android:paddingEnd="@dimen/medium_margin"
android:text="@string/default_reminder_2"/>
android:text="@string/default_reminder_2" />
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_default_reminder_2"
@ -555,7 +554,7 @@
android:layout_alignParentEnd="true"
android:layout_marginEnd="@dimen/small_margin"
android:background="@null"
android:clickable="false"/>
android:clickable="false" />
</RelativeLayout>
@ -578,7 +577,7 @@
android:layout_toStartOf="@+id/settings_default_reminder_3"
android:paddingStart="@dimen/medium_margin"
android:paddingEnd="@dimen/medium_margin"
android:text="@string/default_reminder_3"/>
android:text="@string/default_reminder_3" />
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_default_reminder_3"
@ -587,7 +586,7 @@
android:layout_alignParentEnd="true"
android:layout_marginEnd="@dimen/small_margin"
android:background="@null"
android:clickable="false"/>
android:clickable="false" />
</RelativeLayout>
@ -596,10 +595,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/bigger_margin"
android:layout_marginTop="@dimen/activity_margin"
android:layout_marginTop="@dimen/section_margin"
android:text="@string/weekly_view"
android:textAllCaps="true"
android:textSize="@dimen/smaller_text_size"/>
android:textSize="@dimen/smaller_text_size" />
<RelativeLayout
android:id="@+id/settings_start_weekly_at_holder"
@ -620,7 +619,7 @@
android:layout_toStartOf="@+id/settings_start_weekly_at"
android:paddingStart="@dimen/medium_margin"
android:paddingEnd="@dimen/medium_margin"
android:text="@string/start_day_at"/>
android:text="@string/start_day_at" />
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_start_weekly_at"
@ -629,7 +628,7 @@
android:layout_alignParentEnd="true"
android:layout_marginEnd="@dimen/small_margin"
android:background="@null"
android:clickable="false"/>
android:clickable="false" />
</RelativeLayout>
@ -638,10 +637,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/bigger_margin"
android:layout_marginTop="@dimen/activity_margin"
android:layout_marginTop="@dimen/section_margin"
android:text="@string/monthly_view"
android:textAllCaps="true"
android:textSize="@dimen/smaller_text_size"/>
android:textSize="@dimen/smaller_text_size" />
<RelativeLayout
android:id="@+id/settings_week_numbers_holder"
@ -661,7 +660,7 @@
android:background="@null"
android:clickable="false"
android:paddingStart="@dimen/medium_margin"
android:text="@string/week_numbers"/>
android:text="@string/week_numbers" />
</RelativeLayout>
@ -682,7 +681,7 @@
android:background="@null"
android:clickable="false"
android:paddingStart="@dimen/medium_margin"
android:text="@string/show_a_grid"/>
android:text="@string/show_a_grid" />
</RelativeLayout>
@ -691,10 +690,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/bigger_margin"
android:layout_marginTop="@dimen/activity_margin"
android:layout_marginTop="@dimen/section_margin"
android:text="@string/event_lists"
android:textAllCaps="true"
android:textSize="@dimen/smaller_text_size"/>
android:textSize="@dimen/smaller_text_size" />
<RelativeLayout
android:id="@+id/settings_replace_description_holder"
@ -714,7 +713,7 @@
android:background="@null"
android:clickable="false"
android:paddingStart="@dimen/medium_margin"
android:text="@string/replace_description_with_location"/>
android:text="@string/replace_description_with_location" />
</RelativeLayout>
@ -736,7 +735,7 @@
android:layout_toStartOf="@+id/settings_display_past_events"
android:paddingStart="@dimen/medium_margin"
android:paddingEnd="@dimen/medium_margin"
android:text="@string/display_past_events"/>
android:text="@string/display_past_events" />
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_display_past_events"
@ -745,7 +744,7 @@
android:layout_alignParentEnd="true"
android:layout_marginEnd="@dimen/small_margin"
android:background="@null"
android:clickable="false"/>
android:clickable="false" />
</RelativeLayout>
@ -754,10 +753,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/bigger_margin"
android:layout_marginTop="@dimen/activity_margin"
android:layout_marginTop="@dimen/section_margin"
android:text="@string/widgets"
android:textAllCaps="true"
android:textSize="@dimen/smaller_text_size"/>
android:textSize="@dimen/smaller_text_size" />
<RelativeLayout
android:id="@+id/settings_font_size_holder"
@ -777,7 +776,7 @@
android:layout_toStartOf="@+id/settings_font_size"
android:paddingStart="@dimen/medium_margin"
android:paddingEnd="@dimen/medium_margin"
android:text="@string/font_size"/>
android:text="@string/font_size" />
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_font_size"
@ -786,7 +785,7 @@
android:layout_alignParentEnd="true"
android:layout_marginEnd="@dimen/small_margin"
android:background="@null"
android:clickable="false"/>
android:clickable="false" />
</RelativeLayout>
@ -808,7 +807,7 @@
android:layout_toStartOf="@+id/settings_list_widget_view_to_open"
android:paddingStart="@dimen/medium_margin"
android:paddingEnd="@dimen/medium_margin"
android:text="@string/view_to_open_from_widget"/>
android:text="@string/view_to_open_from_widget" />
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/settings_list_widget_view_to_open"
@ -817,7 +816,7 @@
android:layout_alignParentEnd="true"
android:layout_marginEnd="@dimen/small_margin"
android:background="@null"
android:clickable="false"/>
android:clickable="false" />
</RelativeLayout>
@ -837,7 +836,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:paddingStart="@dimen/medium_margin"
android:text="@string/customize_widget_colors"/>
android:text="@string/customize_widget_colors" />
</RelativeLayout>
@ -846,10 +845,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/bigger_margin"
android:layout_marginTop="@dimen/activity_margin"
android:layout_marginTop="@dimen/section_margin"
android:text="@string/events"
android:textAllCaps="true"
android:textSize="@dimen/smaller_text_size"/>
android:textSize="@dimen/smaller_text_size" />
<RelativeLayout
android:id="@+id/settings_dim_past_events_holder"
@ -869,7 +868,7 @@
android:background="@null"
android:clickable="false"
android:paddingStart="@dimen/medium_margin"
android:text="@string/dim_past_events"/>
android:text="@string/dim_past_events" />
</RelativeLayout>
@ -890,7 +889,7 @@
android:background="@null"
android:clickable="false"
android:paddingStart="@dimen/medium_margin"
android:text="@string/allow_changing_time_zones"/>
android:text="@string/allow_changing_time_zones" />
</RelativeLayout>
@ -911,7 +910,7 @@
android:layout_centerVertical="true"
android:paddingStart="@dimen/medium_margin"
android:paddingEnd="@dimen/medium_margin"
android:text="@string/delete_all_events"/>
android:text="@string/delete_all_events" />
</RelativeLayout>
@ -920,10 +919,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/bigger_margin"
android:layout_marginTop="@dimen/activity_margin"
android:layout_marginTop="@dimen/section_margin"
android:text="@string/migrating"
android:textAllCaps="true"
android:textSize="@dimen/smaller_text_size"/>
android:textSize="@dimen/smaller_text_size" />
<RelativeLayout
android:id="@+id/settings_export_holder"
@ -931,9 +930,9 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin"
android:background="?attr/selectableItemBackground"
android:paddingLeft="@dimen/normal_margin"
android:paddingStart="@dimen/normal_margin"
android:paddingTop="@dimen/activity_margin"
android:paddingRight="@dimen/normal_margin"
android:paddingEnd="@dimen/normal_margin"
android:paddingBottom="@dimen/activity_margin">
<com.simplemobiletools.commons.views.MyTextView
@ -942,7 +941,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:paddingStart="@dimen/medium_margin"
android:text="@string/export_settings"/>
android:text="@string/export_settings" />
</RelativeLayout>
@ -952,9 +951,9 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/medium_margin"
android:background="?attr/selectableItemBackground"
android:paddingLeft="@dimen/normal_margin"
android:paddingStart="@dimen/normal_margin"
android:paddingTop="@dimen/activity_margin"
android:paddingRight="@dimen/normal_margin"
android:paddingEnd="@dimen/normal_margin"
android:paddingBottom="@dimen/activity_margin">
<com.simplemobiletools.commons.views.MyTextView
@ -963,7 +962,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:paddingStart="@dimen/medium_margin"
android:text="@string/import_settings"/>
android:text="@string/import_settings" />
</RelativeLayout>
</LinearLayout>

16
app/src/main/res/layout/event_list_widget.xml
View File

@ -1,16 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/calendar_events_list_holder"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ListView
android:id="@+id/calendar_events_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipToPadding="false"
android:paddingStart="@dimen/activity_margin"
android:paddingTop="@dimen/medium_margin"/>
</RelativeLayout>

121
app/src/main/res/layout/fragment_month_widget.xml
View File

@ -1,12 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/calendar_holder"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="@dimen/medium_margin">
<ImageView
android:id="@+id/widget_month_background"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:src="@drawable/widget_round_background" />
<ImageView
android:id="@+id/top_left_arrow"
style="@style/ArrowStyle"
@ -16,7 +25,7 @@
android:layout_alignBottom="@+id/top_value"
android:paddingStart="@dimen/medium_margin"
android:paddingEnd="@dimen/medium_margin"
android:src="@drawable/ic_chevron_left_vector"/>
android:src="@drawable/ic_chevron_left_vector" />
<TextView
android:id="@+id/top_value"
@ -30,7 +39,7 @@
android:paddingTop="@dimen/medium_margin"
android:paddingBottom="@dimen/medium_margin"
android:textSize="@dimen/month_text_size"
tools:text="January"/>
tools:text="January" />
<ImageView
android:id="@+id/top_go_to_today"
@ -42,7 +51,7 @@
android:layout_toStartOf="@+id/top_right_arrow"
android:paddingStart="@dimen/medium_margin"
android:paddingEnd="@dimen/medium_margin"
android:src="@drawable/ic_today_vector"/>
android:src="@drawable/ic_today_vector" />
<ImageView
android:id="@+id/top_right_arrow"
@ -54,7 +63,7 @@
android:layout_toStartOf="@+id/top_new_event"
android:paddingStart="@dimen/medium_margin"
android:paddingEnd="@dimen/medium_margin"
android:src="@drawable/ic_chevron_right_vector"/>
android:src="@drawable/ic_chevron_right_vector" />
<ImageView
android:id="@+id/top_new_event"
@ -66,7 +75,7 @@
android:layout_alignParentEnd="true"
android:paddingStart="@dimen/medium_margin"
android:paddingEnd="@dimen/medium_margin"
android:src="@drawable/ic_plus_vector"/>
android:src="@drawable/ic_plus_vector" />
<include
android:id="@+id/first_row_widget"
@ -74,7 +83,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/top_value"
tools:ignore="UnknownIdInLayout"/>
tools:ignore="UnknownIdInLayout" />
<LinearLayout
android:id="@+id/table_holder"
@ -97,7 +106,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:visibility="gone"/>
android:visibility="gone" />
<LinearLayout
android:id="@+id/day_0"
@ -105,7 +114,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_1"
@ -113,7 +122,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_2"
@ -121,7 +130,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_3"
@ -129,7 +138,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_4"
@ -137,7 +146,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_5"
@ -145,7 +154,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_6"
@ -153,7 +162,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
</LinearLayout>
<LinearLayout
@ -169,7 +178,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:visibility="gone"/>
android:visibility="gone" />
<LinearLayout
android:id="@+id/day_7"
@ -177,7 +186,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_8"
@ -185,7 +194,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_9"
@ -193,7 +202,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_10"
@ -201,7 +210,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_11"
@ -209,7 +218,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_12"
@ -217,7 +226,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_13"
@ -225,7 +234,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
</LinearLayout>
<LinearLayout
@ -241,7 +250,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:visibility="gone"/>
android:visibility="gone" />
<LinearLayout
android:id="@+id/day_14"
@ -249,7 +258,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_15"
@ -257,7 +266,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_16"
@ -265,7 +274,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_17"
@ -273,7 +282,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_18"
@ -281,7 +290,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_19"
@ -289,7 +298,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_20"
@ -297,7 +306,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
</LinearLayout>
<LinearLayout
@ -313,7 +322,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:visibility="gone"/>
android:visibility="gone" />
<LinearLayout
android:id="@+id/day_21"
@ -321,7 +330,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_22"
@ -329,7 +338,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_23"
@ -337,7 +346,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_24"
@ -345,7 +354,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_25"
@ -353,7 +362,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_26"
@ -361,7 +370,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_27"
@ -369,7 +378,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
</LinearLayout>
<LinearLayout
@ -385,7 +394,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:visibility="gone"/>
android:visibility="gone" />
<LinearLayout
android:id="@+id/day_28"
@ -393,7 +402,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_29"
@ -401,7 +410,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_30"
@ -409,7 +418,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_31"
@ -417,7 +426,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_32"
@ -425,7 +434,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_33"
@ -433,7 +442,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_34"
@ -441,7 +450,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
</LinearLayout>
<LinearLayout
@ -457,7 +466,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:visibility="gone"/>
android:visibility="gone" />
<LinearLayout
android:id="@+id/day_35"
@ -465,7 +474,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_36"
@ -473,7 +482,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_37"
@ -481,7 +490,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_38"
@ -489,7 +498,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_39"
@ -497,7 +506,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_40"
@ -505,7 +514,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_41"
@ -513,7 +522,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
</LinearLayout>
</LinearLayout>
</RelativeLayout>

104
app/src/main/res/layout/fragment_month_widget_config.xml
View File

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/month_calendar_holder"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/widget_round_background"
android:paddingTop="@dimen/medium_margin">
<include layout="@layout/top_navigation"/>
<include layout="@layout/top_navigation" />
<include
android:id="@+id/first_row"
@ -15,7 +15,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/top_value"
tools:ignore="UnknownIdInLayout"/>
tools:ignore="UnknownIdInLayout" />
<LinearLayout
android:id="@+id/table_holder"
@ -38,7 +38,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:visibility="gone"/>
android:visibility="gone" />
<LinearLayout
android:id="@+id/day_0"
@ -47,7 +47,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_1"
@ -56,7 +56,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_2"
@ -65,7 +65,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_3"
@ -74,7 +74,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_4"
@ -83,7 +83,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_5"
@ -92,7 +92,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_6"
@ -101,7 +101,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
</LinearLayout>
<LinearLayout
@ -118,7 +118,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:visibility="gone"/>
android:visibility="gone" />
<LinearLayout
android:id="@+id/day_7"
@ -127,7 +127,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_8"
@ -136,7 +136,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_9"
@ -145,7 +145,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_10"
@ -154,7 +154,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_11"
@ -163,7 +163,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_12"
@ -172,7 +172,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_13"
@ -181,7 +181,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
</LinearLayout>
<LinearLayout
@ -197,7 +197,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:visibility="gone"/>
android:visibility="gone" />
<LinearLayout
android:id="@+id/day_14"
@ -206,7 +206,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_15"
@ -215,7 +215,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_16"
@ -224,7 +224,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_17"
@ -233,7 +233,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_18"
@ -242,7 +242,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_19"
@ -251,7 +251,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_20"
@ -260,7 +260,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
</LinearLayout>
<LinearLayout
@ -277,7 +277,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:visibility="gone"/>
android:visibility="gone" />
<LinearLayout
android:id="@+id/day_21"
@ -286,7 +286,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_22"
@ -295,7 +295,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_23"
@ -304,7 +304,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_24"
@ -313,7 +313,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_25"
@ -322,7 +322,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_26"
@ -331,7 +331,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_27"
@ -340,7 +340,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
</LinearLayout>
<LinearLayout
@ -357,7 +357,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:visibility="gone"/>
android:visibility="gone" />
<LinearLayout
android:id="@+id/day_28"
@ -366,7 +366,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_29"
@ -375,7 +375,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_30"
@ -384,7 +384,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_31"
@ -393,7 +393,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_32"
@ -402,7 +402,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_33"
@ -411,7 +411,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_34"
@ -420,7 +420,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
</LinearLayout>
<LinearLayout
@ -436,7 +436,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:visibility="gone"/>
android:visibility="gone" />
<LinearLayout
android:id="@+id/day_35"
@ -445,7 +445,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_36"
@ -454,7 +454,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_37"
@ -463,7 +463,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_38"
@ -472,7 +472,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_39"
@ -481,7 +481,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_40"
@ -490,7 +490,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
<LinearLayout
android:id="@+id/day_41"
@ -499,7 +499,7 @@
android:layout_weight="1"
android:background="?attr/selectableItemBackground"
android:gravity="center_horizontal"
android:orientation="vertical"/>
android:orientation="vertical" />
</LinearLayout>
</LinearLayout>
</RelativeLayout>

84
app/src/main/res/layout/widget_config_date.xml Normal file
View File

@ -0,0 +1,84 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/config_date_time_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_margin="@dimen/activity_margin">
<RelativeLayout
android:id="@+id/config_date_time_wrapper"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/widget_round_background"
android:paddingBottom="@dimen/small_margin">
<TextView
android:id="@+id/widget_date_label"
android:layout_width="60dp"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingTop="@dimen/normal_margin"
android:textColor="@color/md_grey_white"
android:textSize="28sp"
tools:text="13" />
<TextView
android:id="@+id/widget_month_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/widget_date_label"
android:layout_alignStart="@+id/widget_date_label"
android:layout_alignEnd="@+id/widget_date_label"
android:gravity="center"
android:paddingBottom="@dimen/medium_margin"
android:textColor="@color/md_grey_white"
android:textSize="@dimen/bigger_text_size"
tools:text="Jan" />
</RelativeLayout>
<ImageView
android:id="@+id/config_bg_color"
android:layout_width="@dimen/widget_colorpicker_size"
android:layout_height="@dimen/widget_colorpicker_size"
android:layout_above="@+id/config_text_color" />
<RelativeLayout
android:id="@+id/config_bg_seekbar_holder"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignTop="@+id/config_bg_color"
android:layout_alignBottom="@+id/config_bg_color"
android:layout_toRightOf="@+id/config_bg_color"
android:background="@android:color/white">
<com.simplemobiletools.commons.views.MySeekBar
android:id="@+id/config_bg_seekbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:paddingLeft="@dimen/activity_margin"
android:paddingRight="@dimen/activity_margin" />
</RelativeLayout>
<ImageView
android:id="@+id/config_text_color"
android:layout_width="@dimen/widget_colorpicker_size"
android:layout_height="@dimen/widget_colorpicker_size"
android:layout_alignParentBottom="true" />
<Button
android:id="@+id/config_save"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:fontFamily="sans-serif-light"
android:paddingLeft="@dimen/activity_margin"
android:paddingRight="@dimen/activity_margin"
android:text="@string/ok"
android:textColor="@android:color/white"
android:textSize="@dimen/big_text_size" />
</RelativeLayout>

18
app/src/main/res/layout/widget_config_list.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/config_list_holder"
android:layout_width="match_parent"
@ -14,24 +13,25 @@
android:layout_height="match_parent"
android:layout_above="@+id/config_bg_color"
android:layout_marginBottom="@dimen/activity_margin"
android:background="@drawable/widget_round_background"
android:clipToPadding="false"
android:divider="@null"
android:paddingStart="@dimen/activity_margin"
android:paddingTop="@dimen/medium_margin"
app:layoutManager="com.simplemobiletools.commons.views.MyLinearLayoutManager"/>
app:layoutManager="com.simplemobiletools.commons.views.MyLinearLayoutManager" />
<ImageView
android:id="@+id/config_bg_color"
android:layout_width="@dimen/widget_colorpicker_size"
android:layout_height="@dimen/widget_colorpicker_size"
android:layout_above="@+id/config_text_color"/>
android:layout_above="@+id/config_text_color" />
<RelativeLayout
android:id="@+id/config_bg_seekbar_holder"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignBottom="@+id/config_bg_color"
android:layout_alignTop="@+id/config_bg_color"
android:layout_alignBottom="@+id/config_bg_color"
android:layout_toEndOf="@+id/config_bg_color"
android:background="@android:color/white">
@ -41,26 +41,26 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:paddingStart="@dimen/activity_margin"
android:paddingEnd="@dimen/activity_margin"/>
android:paddingEnd="@dimen/activity_margin" />
</RelativeLayout>
<ImageView
android:id="@+id/config_text_color"
android:layout_width="@dimen/widget_colorpicker_size"
android:layout_height="@dimen/widget_colorpicker_size"
android:layout_alignParentBottom="true"/>
android:layout_alignParentBottom="true" />
<Button
android:id="@+id/config_save"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:fontFamily="sans-serif-light"
android:paddingStart="@dimen/activity_margin"
android:paddingEnd="@dimen/activity_margin"
android:text="@string/ok"
android:textColor="@android:color/white"
android:textSize="@dimen/big_text_size"/>
android:textSize="@dimen/big_text_size" />
</RelativeLayout>

41
app/src/main/res/layout/widget_date.xml Normal file
View File

@ -0,0 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/widget_date_holder"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:id="@+id/widget_date_background"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignStart="@+id/widget_date_label"
android:layout_alignTop="@+id/widget_date_label"
android:layout_alignEnd="@+id/widget_date_label"
android:layout_alignBottom="@+id/widget_month_label"
android:src="@drawable/widget_round_background" />
<TextView
android:id="@+id/widget_date_label"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingTop="@dimen/normal_margin"
android:textColor="@color/md_grey_white"
android:textSize="26sp"
tools:text="1" />
<TextView
android:id="@+id/widget_month_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/widget_date_label"
android:layout_alignStart="@+id/widget_date_label"
android:layout_alignEnd="@+id/widget_date_label"
android:gravity="center"
android:paddingBottom="@dimen/medium_margin"
android:textColor="@color/md_grey_white"
android:textSize="@dimen/bigger_text_size"
tools:text="Jan" />
</RelativeLayout>

23
app/src/main/res/layout/widget_event_list.xml
View File

@ -1,11 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/widget_event_list_holder"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:id="@+id/widget_event_list_background"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/widget_event_list"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_alignParentEnd="true"
android:src="@drawable/widget_round_background" />
<TextView
android:id="@+id/widget_event_list_today"
android:layout_width="match_parent"
@ -19,7 +28,7 @@
android:paddingStart="@dimen/medium_margin"
android:paddingEnd="@dimen/medium_margin"
android:textSize="@dimen/normal_text_size"
tools:text="July 18"/>
tools:text="July 18" />
<ImageView
android:id="@+id/widget_event_go_to_today"
@ -33,7 +42,7 @@
android:paddingEnd="@dimen/medium_margin"
android:paddingBottom="@dimen/small_margin"
android:scaleType="fitCenter"
android:src="@drawable/ic_today_vector"/>
android:src="@drawable/ic_today_vector" />
<ImageView
android:id="@+id/widget_event_new_event"
@ -47,7 +56,7 @@
android:paddingEnd="@dimen/medium_margin"
android:paddingBottom="@dimen/small_margin"
android:scaleType="fitCenter"
android:src="@drawable/ic_plus_vector"/>
android:src="@drawable/ic_plus_vector" />
<ListView
android:id="@+id/widget_event_list"
@ -57,7 +66,7 @@
android:clipToPadding="false"
android:divider="@null"
android:paddingStart="@dimen/medium_margin"
android:paddingBottom="@dimen/small_margin"/>
android:paddingBottom="@dimen/small_margin" />
<TextView
android:id="@+id/widget_event_list_empty"
@ -68,6 +77,6 @@
android:paddingStart="@dimen/big_margin"
android:paddingEnd="@dimen/big_margin"
android:text="@string/no_upcoming_events"
android:textSize="@dimen/bigger_text_size"/>
android:textSize="@dimen/bigger_text_size" />
</RelativeLayout>

1
app/src/main/res/values-ar/strings.xml
View File

@ -16,6 +16,7 @@
<!-- Widget titles -->
<string name="widget_monthly">تقويم شهري</string>
<string name="widget_list">لائحة أحداث التقويم</string>
<string name="widget_todays_date">Calendar today\'s date</string>
<!-- Event -->
<string name="event">حدث</string>

1
app/src/main/res/values-az/strings.xml
View File

@ -16,6 +16,7 @@
<!-- Widget titles -->
<string name="widget_monthly">Aylıq Təqvim</string>
<string name="widget_list">Təqvim hadisə siyahısı</string>
<string name="widget_todays_date">Calendar today\'s date</string>
<!-- Event -->
<string name="event">Hadisə</string>

1
app/src/main/res/values-bn/strings.xml
View File

@ -20,6 +20,7 @@
<!-- Widget titles -->
<string name="widget_monthly">মাসিক ক্যালেন্ডার</string>
<string name="widget_list">ক্যালেন্ডারের ইভেন্ট তালিকা</string>
<string name="widget_todays_date">Calendar today\'s date</string>
<!-- Event -->
<string name="event">ইভেন্ট</string>

1
app/src/main/res/values-br/strings.xml
View File

@ -16,6 +16,7 @@
<!-- Widget titles -->
<string name="widget_monthly">Deiziataer miziek</string>
<string name="widget_list">Roll darvoudoù</string>
<string name="widget_todays_date">Calendar today\'s date</string>
<!-- Event -->
<string name="event">Darvoud</string>

1
app/src/main/res/values-cs/strings.xml
View File

@ -16,6 +16,7 @@
<!-- Widget titles -->
<string name="widget_monthly">Kalendář - měsíční</string>
<string name="widget_list">Kalendář - seznam událostí</string>
<string name="widget_todays_date">Kalendář - dnešní datum</string>
<!-- Event -->
<string name="event">Událost</string>

3
app/src/main/res/values-da/strings.xml
View File

@ -16,6 +16,7 @@
<!-- Widget titles -->
<string name="widget_monthly">Månedlig kalender</string>
<string name="widget_list">Begivenhedsliste</string>
<string name="widget_todays_date">Calendar today\'s date</string>
<!-- Event -->
<string name="event">Begivenhed</string>
@ -207,7 +208,7 @@
<string name="select_a_different_caldav_color">Vælg en anden farve (den kan være tilføjet lokalt)</string>
<string name="insufficient_permissions">Du har ikke tilladelse til at skrive i den valgte kalender</string>
<string name="caldav_event_not_found">Begivenheden blev ikke fundet. Aktiver CalDAV-synkronisering med den relevante kalender i app-indstillingerne.</string>
<string name="no_synchronized_calendars">No synchronizable calendars have been found</string>
<string name="no_synchronized_calendars">Der er ikke fundet nogen kalendere der kan synkroniseres</string>
<!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
<!-- used in repetition, like "Every last Sunday" -->

1
app/src/main/res/values-de/strings.xml
View File

@ -16,6 +16,7 @@
<!-- Widget titles -->
<string name="widget_monthly">Monatskalender</string>
<string name="widget_list">Termin-Liste</string>
<string name="widget_todays_date">Calendar today\'s date</string>
<!-- Event -->
<string name="event">Termin</string>

1
app/src/main/res/values-el/strings.xml
View File

@ -16,6 +16,7 @@
<!-- Widget titles -->
<string name="widget_monthly">Μηνιαίο ημερολόγιο</string>
<string name="widget_list">Λίστα εκδηλώσεων ημερολογίου</string>
<string name="widget_todays_date">Calendar today\'s date</string>
<!-- Event -->
<string name="event">Εκδηλώσεις</string>

1
app/src/main/res/values-es/strings.xml
View File

@ -16,6 +16,7 @@
<!-- Widget titles -->
<string name="widget_monthly">Calendario mensual</string>
<string name="widget_list">Lista de eventos del calendario</string>
<string name="widget_todays_date">Calendar today\'s date</string>
<!-- Event -->
<string name="event">Evento</string>

1
app/src/main/res/values-fr/strings.xml
View File

@ -17,6 +17,7 @@
<!-- Widget titles -->
<string name="widget_monthly">agenda mensuel</string>
<string name="widget_list">Liste d\’événements de l\’agenda</string>
<string name="widget_todays_date">Calendar today\'s date</string>
<!-- Event -->
<string name="event">Événement</string>

1
app/src/main/res/values-gl/strings.xml
View File

@ -16,6 +16,7 @@
<!-- Widget titles -->
<string name="widget_monthly">Calendario mensual</string>
<string name="widget_list">Lista de eventos do calendario</string>
<string name="widget_todays_date">Calendar today\'s date</string>
<!-- Event -->
<string name="event">Evento</string>

1
app/src/main/res/values-he/strings.xml
View File

@ -16,6 +16,7 @@
<!-- Widget titles -->
<string name="widget_monthly">יומן חודשי</string>
<string name="widget_list">רשימת אירועי יומן</string>
<string name="widget_todays_date">Calendar today\'s date</string>
<!-- Event -->
<string name="event">אירוע</string>

1
app/src/main/res/values-hi-rIN/strings.xml
View File

@ -16,6 +16,7 @@
<!-- Widget titles -->
<string name="widget_monthly">Calendar monthly</string>
<string name="widget_list">Calendar event list</string>
<string name="widget_todays_date">Calendar today\'s date</string>
<!-- Event -->
<string name="event">इवेंट</string>

1
app/src/main/res/values-hr/strings.xml
View File

@ -16,6 +16,7 @@
<!-- Widget titles -->
<string name="widget_monthly">Mjesečni raspored</string>
<string name="widget_list">Popis događaja kalendara</string>
<string name="widget_todays_date">Calendar today\'s date</string>
<!-- Event -->
<string name="event">Događaj</string>

1
app/src/main/res/values-hu/strings.xml
View File

@ -16,6 +16,7 @@
<!-- Widget titles -->
<string name="widget_monthly">Havi naptár</string>
<string name="widget_list">Bejegyzésnaptár</string>
<string name="widget_todays_date">Calendar today\'s date</string>
<!-- Event -->
<string name="event">Bejegyzés</string>

1
app/src/main/res/values-id/strings.xml
View File

@ -16,6 +16,7 @@
<!-- Widget titles -->
<string name="widget_monthly">Bulan</string>
<string name="widget_list">Daftar acara</string>
<string name="widget_todays_date">Calendar today\'s date</string>
<!-- Event -->
<string name="event">Acara</string>

1
app/src/main/res/values-in/strings.xml
View File

@ -16,6 +16,7 @@
<!-- Widget titles -->
<string name="widget_monthly">Bulan</string>
<string name="widget_list">Daftar acara</string>
<string name="widget_todays_date">Calendar today\'s date</string>
<!-- Event -->
<string name="event">Acara</string>

1
app/src/main/res/values-it/strings.xml
View File

@ -16,6 +16,7 @@
<!-- Widget titles -->
<string name="widget_monthly">Calendario mensile</string>
<string name="widget_list">Lista degli eventi del calendario</string>
<string name="widget_todays_date">Calendar today\'s date</string>
<!-- Event -->
<string name="event">Evento</string>

1
app/src/main/res/values-iw/strings.xml
View File

@ -16,6 +16,7 @@
<!-- Widget titles -->
<string name="widget_monthly">יומן חודשי</string>
<string name="widget_list">רשימת אירועי יומן</string>
<string name="widget_todays_date">Calendar today\'s date</string>
<!-- Event -->
<string name="event">אירוע</string>

1
app/src/main/res/values-ja/strings.xml
View File

@ -16,6 +16,7 @@
<!-- Widget titles -->
<string name="widget_monthly">カレンダー月</string>
<string name="widget_list">カレンダー 予定 リスト</string>
<string name="widget_todays_date">Calendar today\'s date</string>
<!-- Event -->
<string name="event">予定</string>

1
app/src/main/res/values-ko/strings.xml
View File

@ -16,6 +16,7 @@
<!-- Widget titles -->
<string name="widget_monthly">월별 달력</string>
<string name="widget_list">일정 목록 달력</string>
<string name="widget_todays_date">Calendar today\'s date</string>
<!-- Event -->
<string name="event">일정</string>

1
app/src/main/res/values-lt/strings.xml
View File

@ -16,6 +16,7 @@
<!-- Widget titles -->
<string name="widget_monthly">Mėnesio kalendorius</string>
<string name="widget_list">Kalendoriaus įvykių sąrašas</string>
<string name="widget_todays_date">Calendar today\'s date</string>
<!-- Event -->
<string name="event">Įvykis</string>

1
app/src/main/res/values-lv/strings.xml
View File

@ -16,6 +16,7 @@
<!-- Widget titles -->
<string name="widget_monthly">Mēneša kalendārs</string>
<string name="widget_list">Kalendāra notikumu saraksts</string>
<string name="widget_todays_date">Calendar today\'s date</string>
<!-- Event -->
<string name="event">Notikums</string>

1
app/src/main/res/values-nb/strings.xml
View File

@ -16,6 +16,7 @@
<!-- Widget titles -->
<string name="widget_monthly">Månedskalender</string>
<string name="widget_list">Hendelsesliste</string>
<string name="widget_todays_date">Calendar today\'s date</string>
<!-- Event -->
<string name="event">Hendelse</string>

5
app/src/main/res/values-nl/strings.xml
View File

@ -16,6 +16,7 @@
<!-- Widget titles -->
<string name="widget_monthly">Maandweergave</string>
<string name="widget_list">Afsprakenlijst</string>
<string name="widget_todays_date">Calendar today\'s date</string>
<!-- Event -->
<string name="event">Afspraak</string>
@ -207,7 +208,7 @@
<string name="select_a_different_caldav_color">Kies een andere kleur (mogelijk alleen voor dit apparaat)</string>
<string name="insufficient_permissions">Kan geen wijzigingen aanbrengen in deze agenda</string>
<string name="caldav_event_not_found">Afspraak niet gevonden. Schakel via Instellingen de CalDAV-synchronisatie in voor deze agenda.</string>
<string name="no_synchronized_calendars">No synchronizable calendars have been found</string>
<string name="no_synchronized_calendars">Er zijn geen gesynchroniseerde agenda\'s gevonden.</string>
<!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
<!-- used in repetition, like "Every last Sunday" -->
@ -247,7 +248,7 @@
<!-- App title has to have less than 50 characters. If you cannot squeeze it, just remove a part of it -->
<string name="app_title">Eenvoudige Agenda Pro - Afspraken &amp; Herinneringen</string>
<!-- Short description has to have less than 80 chars -->
<string name="app_short_description">Simple mobile 2020 calendar. Schedule planner &amp; appointment reminder for any day</string>
<string name="app_short_description">Eenvoudige mobiele agenda. Plannen &amp; afspraken maken voor iedere dag</string>
<string name="app_long_description">
Eenvoudige Agenda Pro is een volledig aan te passen offline agenda, ontwikkeld om precies te doen waar een agenda voor bedoeld is. <b>Geen ingewikkelde poespas of onnodige machtigingen, en zonder advertenties!</b>

1
app/src/main/res/values-no/strings.xml
View File

@ -16,6 +16,7 @@
<!-- Widget titles -->
<string name="widget_monthly">Månedskalender</string>
<string name="widget_list">Hendelsesliste</string>
<string name="widget_todays_date">Calendar today\'s date</string>
<!-- Event -->
<string name="event">Hendelse</string>

1
app/src/main/res/values-pl/strings.xml
View File

@ -16,6 +16,7 @@
<!-- Widget titles -->
<string name="widget_monthly">Prosty kalendarz - widok miesięczny</string>
<string name="widget_list">Prosty kalendarz - lista wydarzeń</string>
<string name="widget_todays_date">Calendar today\'s date</string>
<!-- Event -->
<string name="event">Wydarzenie</string>

1
app/src/main/res/values-pt-rBR/strings.xml
View File

@ -16,6 +16,7 @@
<!-- Widget titles -->
<string name="widget_monthly">Calendário mensal</string>
<string name="widget_list">Lista de eventos</string>
<string name="widget_todays_date">Calendar today\'s date</string>
<!-- Event -->
<string name="event">Evento</string>

1
app/src/main/res/values-pt/strings.xml
View File

@ -16,6 +16,7 @@
<!-- Widget titles -->
<string name="widget_monthly">Calendário mensal</string>
<string name="widget_list">Lista de eventos</string>
<string name="widget_todays_date">Calendar today\'s date</string>
<!-- Event -->
<string name="event">Evento</string>

1
app/src/main/res/values-ru/strings.xml
View File

@ -16,6 +16,7 @@
<!-- Widget titles -->
<string name="widget_monthly">Календарь на месяц</string>
<string name="widget_list">Календарь событий</string>
<string name="widget_todays_date">Calendar today\'s date</string>
<!-- Event -->
<string name="event">Событие</string>

1
app/src/main/res/values-sk/strings.xml
View File

@ -16,6 +16,7 @@
<!-- Widget titles -->
<string name="widget_monthly">Kalendár mesačný</string>
<string name="widget_list">Kalendár so zoznamom</string>
<string name="widget_todays_date">Kalendár s dnešným dátumom</string>
<!-- Event -->
<string name="event">Udalosť</string>

1
app/src/main/res/values-sv/strings.xml
View File

@ -16,6 +16,7 @@
<!-- Widget titles -->
<string name="widget_monthly">Kalender månadsvis</string>
<string name="widget_list">Kalender händelselista</string>
<string name="widget_todays_date">Calendar today\'s date</string>
<!-- Event -->
<string name="event">Händelse</string>

3
app/src/main/res/values-tr/strings.xml
View File

@ -16,6 +16,7 @@
<!-- Widget titles -->
<string name="widget_monthly">Aylık takvim</string>
<string name="widget_list">Takvim etkinlik listesi</string>
<string name="widget_todays_date">Takvim bugünün tarihi</string>
<!-- Event -->
<string name="event">Durum</string>
@ -207,7 +208,7 @@
<string name="select_a_different_caldav_color">Farklı bir renk seçin (yalnızca yerel olarak uygulanabilir)</string>
<string name="insufficient_permissions">Seçili takvime yazmanıza izin verilmiyor</string>
<string name="caldav_event_not_found">Etkinlik bulunamadı. Lütfen uygulama ayarlarından uygun takvim için CalDAV senkronizasyonunu etkinleştirin.</string>
<string name="no_synchronized_calendars">No synchronizable calendars have been found</string>
<string name="no_synchronized_calendars">Senkronize edilebilir takvim bulunamadı</string>
<!-- alternative versions for some languages, use the same translations if you are not sure what this means -->
<!-- used in repetition, like "Every last Sunday" -->

1
app/src/main/res/values-uk/strings.xml
View File

@ -16,6 +16,7 @@
<!-- Widget titles -->
<string name="widget_monthly">Календар на місяць</string>
<string name="widget_list">Календар списку подій</string>
<string name="widget_todays_date">Calendar today\'s date</string>
<!-- Event -->
<string name="event">Подія</string>

1
app/src/main/res/values-zh-rCN/strings.xml
View File

@ -16,6 +16,7 @@
    <!-- Widget titles -->
    <string name="widget_monthly">月历</string>
    <string name="widget_list">行事历活动列表</string>
<string name="widget_todays_date">Calendar today\'s date</string>
    <!-- Event -->
    <string name="event">活动</string>

1
app/src/main/res/values-zh-rHK/strings.xml
View File

@ -16,6 +16,7 @@
<!-- Widget titles -->
<string name="widget_monthly">月曆</string>
<string name="widget_list">行事曆活動列表</string>
<string name="widget_todays_date">Calendar today\'s date</string>
<!-- Event -->
<string name="event">活動</string>

1
app/src/main/res/values-zh-rTW/strings.xml
View File

@ -16,6 +16,7 @@
<!-- Widget titles -->
<string name="widget_monthly">月曆</string>
<string name="widget_list">行事曆活動列表</string>
<string name="widget_todays_date">Calendar today\'s date</string>
<!-- Event -->
<string name="event">活動</string>

1
app/src/main/res/values/strings.xml
View File

@ -16,6 +16,7 @@
<!-- Widget titles -->
<string name="widget_monthly">Calendar monthly</string>
<string name="widget_list">Calendar event list</string>
<string name="widget_todays_date">Calendar today\'s date</string>
<!-- Event -->
<string name="event">Event</string>

5
app/src/main/res/xml/searchable.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<searchable
xmlns:android="http://schemas.android.com/apk/res/android"
<searchable xmlns:android="http://schemas.android.com/apk/res/android"
android:hint="@string/search"
android:label="@string/app_name"/>
android:label="@string/app_name" />

11
app/src/main/res/xml/widget_date_info.xml Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
android:configure="com.simplemobiletools.calendar.pro.activities.WidgetDateConfigureActivity"
android:initialLayout="@layout/widget_date"
android:minWidth="40dp"
android:minHeight="40dp"
android:minResizeWidth="40dp"
android:minResizeHeight="40dp"
android:previewImage="@drawable/img_widget_date_preview"
android:resizeMode="horizontal|vertical"
android:updatePeriodMillis="600000" />

11
app/src/main/res/xml/widget_list_info.xml
View File

@ -1,12 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<appwidget-provider
xmlns:android="http://schemas.android.com/apk/res/android"
<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
android:configure="com.simplemobiletools.calendar.pro.activities.WidgetListConfigureActivity"
android:initialLayout="@layout/widget_event_list"
android:minHeight="@dimen/min_widget_height"
android:minResizeHeight="110dp"
android:minResizeWidth="110dp"
android:minWidth="@dimen/min_widget_width"
android:minHeight="@dimen/min_widget_height"
android:minResizeWidth="110dp"
android:minResizeHeight="110dp"
android:previewImage="@drawable/img_widget_list_preview"
android:resizeMode="horizontal|vertical"
android:updatePeriodMillis="600000"/>
android:updatePeriodMillis="600000" />

11
app/src/main/res/xml/widget_monthly_info.xml
View File

@ -1,12 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<appwidget-provider
xmlns:android="http://schemas.android.com/apk/res/android"
<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
android:configure="com.simplemobiletools.calendar.pro.activities.WidgetMonthlyConfigureActivity"
android:initialLayout="@layout/fragment_month"
android:minHeight="@dimen/min_widget_height"
android:minResizeHeight="110dp"
android:minResizeWidth="110dp"
android:minWidth="@dimen/min_widget_width"
android:minHeight="@dimen/min_widget_height"
android:minResizeWidth="110dp"
android:minResizeHeight="110dp"
android:previewImage="@drawable/img_widget_monthly_preview"
android:resizeMode="horizontal|vertical"
android:updatePeriodMillis="3600000"/>
android:updatePeriodMillis="3600000" />

2
build.gradle
View File

@ -10,7 +10,7 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:3.6.2'
classpath 'com.android.tools.build:gradle:3.6.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "de.timfreiheit.resourceplaceholders:placeholders:0.3"

3
fastlane/metadata/android/en-US/changelogs/175.txt Normal file
View File

@ -0,0 +1,3 @@
* Fixed some .ics file importing related glitches
* Corrected and added some UK holidays
* Added many UI and translation improvements