From 7a2638832e7fbee10cb614fa35d035b6fc729a06 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Wed, 29 Nov 2017 21:13:38 +0100
Subject: [PATCH] update commons to 2.42.8 with misc improvements

---
 app/build.gradle                                         | 2 +-
 app/src/main/AndroidManifest.xml                         | 3 ++-
 .../simplemobiletools/calendar/activities/DayActivity.kt | 1 -
 .../calendar/activities/EventActivity.kt                 | 1 -
 .../calendar/activities/MainActivity.kt                  | 1 -
 .../calendar/activities/SplashActivity.kt                | 9 +++------
 app/src/main/res/values/styles.xml                       | 2 +-
 build.gradle                                             | 2 +-
 8 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2566f2584..e28d8fecb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -47,7 +47,7 @@ ext {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:2.41.8'
+    implementation 'com.simplemobiletools:commons:2.42.8'
     implementation 'joda-time:joda-time:2.9.9'
     implementation 'com.facebook.stetho:stetho:1.5.0'
     implementation 'com.android.support:multidex:1.0.2'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 797773674..2846c16f7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,7 +2,8 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.simplemobiletools.calendar">
+    package="com.simplemobiletools.calendar"
+    android:installLocation="auto">
 
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/DayActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/DayActivity.kt
index 8676a819e..420069f61 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/DayActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/DayActivity.kt
@@ -54,7 +54,6 @@ class DayActivity : SimpleActivity(), NavigationListener, ViewPager.OnPageChange
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.menu_day, menu)
-        updateMenuTextSize(resources, menu)
         menu.findItem(R.id.filter).isVisible = eventTypeColors.size() > 1 || config.displayEventTypes.isEmpty()
         return true
     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
index ccabc96c2..79349f3c9 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/EventActivity.kt
@@ -480,7 +480,6 @@ class EventActivity : SimpleActivity(), DBHelper.EventUpdateListener {
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.menu_event, menu)
-        updateMenuTextSize(resources, menu)
         if (wasActivityInitialized) {
             menu.findItem(R.id.delete).isVisible = mDialogTheme != 0 && mEvent.id != 0
             menu.findItem(R.id.share).isVisible = mDialogTheme != 0 && mEvent.id != 0
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt
index 98a3ee7c7..ee69337ae 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt
@@ -159,7 +159,6 @@ class MainActivity : SimpleActivity(), NavigationListener {
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.menu_main, menu)
-        updateMenuTextSize(resources, menu)
         menu.apply {
             findItem(R.id.filter).isVisible = mShouldFilterBeVisible
             findItem(R.id.go_to_today).isVisible = shouldGoToTodayBeVisible()
diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SplashActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SplashActivity.kt
index a19afcbc4..684fda084 100644
--- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SplashActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/SplashActivity.kt
@@ -1,16 +1,13 @@
 package com.simplemobiletools.calendar.activities
 
 import android.content.Intent
-import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
 import com.simplemobiletools.calendar.helpers.DAY_CODE
 import com.simplemobiletools.calendar.helpers.EVENT_ID
 import com.simplemobiletools.calendar.helpers.EVENT_OCCURRENCE_TS
+import com.simplemobiletools.commons.activities.BaseSplashActivity
 
-class SplashActivity : AppCompatActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
+class SplashActivity : BaseSplashActivity() {
+    override fun initActivity() {
         when {
             intent.extras?.containsKey(DAY_CODE) == true -> Intent(this, MainActivity::class.java).apply {
                 putExtra(DAY_CODE, intent.getStringExtra(DAY_CODE))
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index e5dac7ff5..987325f52 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AppTheme" parent="AppTheme.Base.NoTextSize"/>
+    <style name="AppTheme" parent="AppTheme.Base"/>
 
     <style name="DayView">
         <item name="android:gravity">center</item>
diff --git a/build.gradle b/build.gradle
index 60b648170..89e92a15c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.1.60'
+    ext.kotlin_version = '1.2.0'
 
     repositories {
         jcenter()