From 9527def54048a6425527d19ea4f68bcf499fa371 Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 6 Apr 2018 17:54:43 +0200 Subject: [PATCH] update commons to 3.18.9 --- app/build.gradle | 3 +-- .../contacts/activities/GroupContactsActivity.kt | 1 - .../contacts/activities/MainActivity.kt | 9 +-------- .../contacts/activities/SettingsActivity.kt | 3 +-- .../contacts/adapters/ContactsAdapter.kt | 1 + .../simplemobiletools/contacts/adapters/GroupsAdapter.kt | 7 +++++-- .../contacts/fragments/MyViewPagerFragment.kt | 2 -- build.gradle | 4 ++-- 8 files changed, 11 insertions(+), 19 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index abf62b29..600cd58d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -45,10 +45,9 @@ ext { } dependencies { - implementation 'com.simplemobiletools:commons:3.16.12' + implementation 'com.simplemobiletools:commons:3.18.9' implementation 'joda-time:joda-time:2.9.9' implementation 'com.facebook.stetho:stetho:1.5.0' - implementation 'com.google.code.gson:gson:2.8.2' debugImplementation "com.squareup.leakcanary:leakcanary-android:$leakCanaryVersion" releaseImplementation "com.squareup.leakcanary:leakcanary-android-no-op:$leakCanaryVersion" diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/GroupContactsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/GroupContactsActivity.kt index 03136965..077880de 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/GroupContactsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/GroupContactsActivity.kt @@ -90,7 +90,6 @@ class GroupContactsActivity : SimpleActivity(), RemoveFromGroupListener, Refresh ON_CLICK_EDIT_CONTACT -> editContact(it as Contact) } }.apply { - setupDragListener(true) addVerticalDividers(true) group_contacts_list.adapter = this } diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt index 3997c5b0..f05fcdf5 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt @@ -40,7 +40,6 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { private var isSearchOpen = false private var searchMenuItem: MenuItem? = null - private var storedUseEnglish = false private var storedTextColor = 0 private var storedBackgroundColor = 0 private var storedPrimaryColor = 0 @@ -79,13 +78,8 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { override fun onResume() { super.onResume() - if (storedUseEnglish != config.useEnglish) { - restartActivity() - return - } - if (storedShowPhoneNumbers != config.showPhoneNumbers) { - restartActivity() + System.exit(0) return } @@ -179,7 +173,6 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { private fun storeStateVariables() { config.apply { - storedUseEnglish = useEnglish storedTextColor = textColor storedBackgroundColor = backgroundColor storedPrimaryColor = primaryColor diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/SettingsActivity.kt index bfc35114..eb41f275 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/SettingsActivity.kt @@ -4,7 +4,6 @@ import android.os.Bundle import com.simplemobiletools.commons.dialogs.RadioGroupDialog import com.simplemobiletools.commons.extensions.beVisibleIf import com.simplemobiletools.commons.extensions.updateTextColors -import com.simplemobiletools.commons.extensions.useEnglishToggled import com.simplemobiletools.commons.models.RadioItem import com.simplemobiletools.contacts.R import com.simplemobiletools.contacts.extensions.config @@ -46,7 +45,7 @@ class SettingsActivity : SimpleActivity() { settings_use_english_holder.setOnClickListener { settings_use_english.toggle() config.useEnglish = settings_use_english.isChecked - useEnglishToggled() + System.exit(0) } } diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt index 7cc74c73..8273860d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt @@ -47,6 +47,7 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: ArrayList, val refreshListener: RefreshContactsListener?, recyclerView: MyRecyclerView, fastScroller: FastScroller, itemClick: (Any) -> Unit) : MyRecyclerViewAdapter(activity, recyclerView, fastScroller, itemClick) { - private var config = activity.config private var smallPadding = activity.resources.getDimension(R.dimen.small_margin).toInt() private var bigPadding = activity.resources.getDimension(R.dimen.normal_margin).toInt() - var showContactThumbnails = config.showContactThumbnails + var showContactThumbnails = activity.config.showContactThumbnails + + init { + setupDragListener(true) + } override fun getActionMenuId() = R.menu.cab_groups diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/MyViewPagerFragment.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/MyViewPagerFragment.kt index 1adc2d25..7d6fccb4 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/MyViewPagerFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/MyViewPagerFragment.kt @@ -149,7 +149,6 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet) activity!!.startActivity(this) } }.apply { - setupDragListener(true) addVerticalDividers(true) fragment_list.adapter = this } @@ -190,7 +189,6 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet) ON_CLICK_EDIT_CONTACT -> context!!.editContact(it as Contact) } }.apply { - setupDragListener(true) addVerticalDividers(true) fragment_list.adapter = this } diff --git a/build.gradle b/build.gradle index 73d77ca8..3437621a 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.2.30' + ext.kotlin_version = '1.2.31' repositories { google() @@ -9,7 +9,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.1.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong