From 00cda045e8e072bde3d4596c66564d76abeaa48d Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Mon, 9 Dec 2019 23:25:03 +0100
Subject: [PATCH] split timezone into time zone

---
 .../calendar/pro/activities/EventActivity.kt         |  9 +++++----
 app/src/main/res/layout/activity_event.xml           | 12 ++++++------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt
index f05e7fcf7..e707df876 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/pro/activities/EventActivity.kt
@@ -162,7 +162,7 @@ class EventActivity : SimpleActivity() {
         event_start_time.setOnClickListener { setupStartTime() }
         event_end_date.setOnClickListener { setupEndDate() }
         event_end_time.setOnClickListener { setupEndTime() }
-        event_timezone.setOnClickListener { setupTimezone() }
+        event_time_zone.setOnClickListener { setupTimeZone() }
 
         event_all_day.setOnCheckedChangeListener { compoundButton, isChecked -> toggleAllDay(isChecked) }
         event_repetition.setOnClickListener { showRepeatIntervalDialog() }
@@ -214,6 +214,7 @@ class EventActivity : SimpleActivity() {
 
         updateTextColors(event_scrollview)
         updateIconColors()
+
         mWasActivityInitialized = true
     }
 
@@ -1056,7 +1057,7 @@ class EventActivity : SimpleActivity() {
     }
 
     private fun updateTimeZoneText() {
-        event_timezone.text = mEvent.getTimeZoneString()
+        event_time_zone.text = mEvent.getTimeZoneString()
     }
 
     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() {
         val textColor = config.textColor
         event_time_image.applyColorFilter(textColor)
-        event_timezone_image.applyColorFilter(textColor)
+        event_time_zone_image.applyColorFilter(textColor)
         event_repetition_image.applyColorFilter(textColor)
         event_reminder_image.applyColorFilter(textColor)
         event_type_image.applyColorFilter(textColor)
diff --git a/app/src/main/res/layout/activity_event.xml b/app/src/main/res/layout/activity_event.xml
index c1eb397cc..cf59d9d0f 100644
--- a/app/src/main/res/layout/activity_event.xml
+++ b/app/src/main/res/layout/activity_event.xml
@@ -158,23 +158,23 @@
             tools:text="00:00"/>
 
         <ImageView
-            android:id="@+id/event_timezone_image"
+            android:id="@+id/event_time_zone_image"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_below="@+id/event_end_date"
             android:layout_marginStart="@dimen/normal_margin"
-            android:layout_alignTop="@+id/event_timezone"
-            android:layout_alignBottom="@+id/event_timezone"
+            android:layout_alignTop="@+id/event_time_zone"
+            android:layout_alignBottom="@+id/event_time_zone"
             android:padding="@dimen/medium_margin"
             android:src="@drawable/ic_globe_vector"/>
 
         <com.simplemobiletools.commons.views.MyTextView
-            android:id="@+id/event_timezone"
+            android:id="@+id/event_time_zone"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@+id/event_end_date"
             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:layout_centerVertical="true"
             android:ellipsize="end"
@@ -188,7 +188,7 @@
             android:id="@+id/event_date_time_divider"
             android:layout_width="match_parent"
             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_marginBottom="@dimen/medium_margin"
             android:background="@color/divider_grey"