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

split timezone into time zone

This commit is contained in:
tibbi 2019-12-09 23:25:03 +01:00
parent 0c88eacd6c
commit 00cda045e8
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -162,7 +162,7 @@ class EventActivity : SimpleActivity() {
event_start_time.setOnClickListener { setupStartTime() } event_start_time.setOnClickListener { setupStartTime() }
event_end_date.setOnClickListener { setupEndDate() } event_end_date.setOnClickListener { setupEndDate() }
event_end_time.setOnClickListener { setupEndTime() } event_end_time.setOnClickListener { setupEndTime() }
event_timezone.setOnClickListener { setupTimezone() } event_time_zone.setOnClickListener { setupTimeZone() }
event_all_day.setOnCheckedChangeListener { compoundButton, isChecked -> toggleAllDay(isChecked) } event_all_day.setOnCheckedChangeListener { compoundButton, isChecked -> toggleAllDay(isChecked) }
event_repetition.setOnClickListener { showRepeatIntervalDialog() } event_repetition.setOnClickListener { showRepeatIntervalDialog() }
@ -214,6 +214,7 @@ class EventActivity : SimpleActivity() {
updateTextColors(event_scrollview) updateTextColors(event_scrollview)
updateIconColors() updateIconColors()
mWasActivityInitialized = true mWasActivityInitialized = true
} }
@ -1056,7 +1057,7 @@ class EventActivity : SimpleActivity() {
} }
private fun updateTimeZoneText() { private fun updateTimeZoneText() {
event_timezone.text = mEvent.getTimeZoneString() event_time_zone.text = mEvent.getTimeZoneString()
} }
private fun checkStartEndValidity() { private fun checkStartEndValidity() {
@ -1169,7 +1170,7 @@ class EventActivity : SimpleActivity() {
} }
} }
private fun setupTimezone() { private fun setupTimeZone() {
} }
@ -1471,7 +1472,7 @@ class EventActivity : SimpleActivity() {
private fun updateIconColors() { private fun updateIconColors() {
val textColor = config.textColor val textColor = config.textColor
event_time_image.applyColorFilter(textColor) event_time_image.applyColorFilter(textColor)
event_timezone_image.applyColorFilter(textColor) event_time_zone_image.applyColorFilter(textColor)
event_repetition_image.applyColorFilter(textColor) event_repetition_image.applyColorFilter(textColor)
event_reminder_image.applyColorFilter(textColor) event_reminder_image.applyColorFilter(textColor)
event_type_image.applyColorFilter(textColor) event_type_image.applyColorFilter(textColor)

12
app/src/main/res/layout/activity_event.xml
View File

@ -158,23 +158,23 @@
tools:text="00:00"/> tools:text="00:00"/>
<ImageView <ImageView
android:id="@+id/event_timezone_image" android:id="@+id/event_time_zone_image"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_below="@+id/event_end_date" android:layout_below="@+id/event_end_date"
android:layout_marginStart="@dimen/normal_margin" android:layout_marginStart="@dimen/normal_margin"
android:layout_alignTop="@+id/event_timezone" android:layout_alignTop="@+id/event_time_zone"
android:layout_alignBottom="@+id/event_timezone" android:layout_alignBottom="@+id/event_time_zone"
android:padding="@dimen/medium_margin" android:padding="@dimen/medium_margin"
android:src="@drawable/ic_globe_vector"/> android:src="@drawable/ic_globe_vector"/>
<com.simplemobiletools.commons.views.MyTextView <com.simplemobiletools.commons.views.MyTextView
android:id="@+id/event_timezone" android:id="@+id/event_time_zone"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/event_end_date" android:layout_below="@+id/event_end_date"
android:layout_marginStart="@dimen/small_margin" android:layout_marginStart="@dimen/small_margin"
android:layout_toEndOf="@+id/event_timezone_image" android:layout_toEndOf="@+id/event_time_zone_image"
android:background="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:ellipsize="end" android:ellipsize="end"
@ -188,7 +188,7 @@
android:id="@+id/event_date_time_divider" android:id="@+id/event_date_time_divider"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1px" android:layout_height="1px"
android:layout_below="@+id/event_timezone" android:layout_below="@+id/event_time_zone"
android:layout_marginTop="@dimen/medium_margin" android:layout_marginTop="@dimen/medium_margin"
android:layout_marginBottom="@dimen/medium_margin" android:layout_marginBottom="@dimen/medium_margin"
android:background="@color/divider_grey" android:background="@color/divider_grey"