From 80b8d5b4d172ee522e7532953956c1633dcc6833 Mon Sep 17 00:00:00 2001 From: tibbi Date: Fri, 26 Oct 2018 12:01:22 +0200 Subject: [PATCH] updating commons to 5.2.10 --- .gitignore | 15 ---- app/build.gradle | 2 +- .../contacts/adapters/GroupsAdapter.kt | 2 +- .../contacts/fragments/MyViewPagerFragment.kt | 4 +- app/src/main/res/layout/activity_dialpad.xml | 4 +- .../main/res/layout/activity_edit_contact.xml | 90 +++++++++---------- .../main/res/layout/activity_view_contact.xml | 80 ++++++++--------- .../res/layout/dialog_call_confirmation.xml | 2 +- gradle.properties | 2 + 9 files changed, 94 insertions(+), 107 deletions(-) create mode 100644 gradle.properties diff --git a/.gitignore b/.gitignore index b3460d57..32512494 100644 --- a/.gitignore +++ b/.gitignore @@ -1,21 +1,6 @@ -# Temp files -*~ -*.bak -*.backup -\#* -.\#* -*\# -*.swp -*.swap -*.sav -*.save -*.autosav -*.autosave - *.iml .gradle /local.properties -/gradle.properties /.idea/ .DS_Store /build diff --git a/app/build.gradle b/app/build.gradle index 489d5d99..80193a08 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -41,7 +41,7 @@ android { } dependencies { - implementation 'com.simplemobiletools:commons:5.1.0' + implementation 'com.simplemobiletools:commons:5.2.10' implementation 'joda-time:joda-time:2.9.9' implementation 'com.facebook.stetho:stetho:1.5.0' implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2' diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/GroupsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/GroupsAdapter.kt index 8f5ccf4b..9b83b358 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/GroupsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/GroupsAdapter.kt @@ -122,7 +122,7 @@ class GroupsAdapter(activity: SimpleActivity, var groups: ArrayList, val private fun setupView(view: View, group: Group) { view.apply { - group_frame?.isSelected = isKeySelected(group.id.toInt()) + group_frame?.isSelected = selectedKeys.contains(group.id.toInt()) group_name.apply { setTextColor(textColor) text = String.format(activity.getString(R.string.groups_placeholder), group.title, group.contactsCount.toString()) 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 1be5b977..2f483619 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/MyViewPagerFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/fragments/MyViewPagerFragment.kt @@ -2,9 +2,9 @@ package com.simplemobiletools.contacts.fragments import android.content.Context import android.content.Intent -import androidx.coordinatorlayout.widget.CoordinatorLayout import android.util.AttributeSet import android.view.ViewGroup +import androidx.coordinatorlayout.widget.CoordinatorLayout import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.SORT_BY_FIRST_NAME @@ -88,7 +88,7 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet) fun startNameWithSurnameChanged(startNameWithSurname: Boolean) { if (this !is GroupsFragment && this !is RecentsFragment) { - (fragment_list.adapter as ContactsAdapter).apply { + (fragment_list.adapter as? ContactsAdapter)?.apply { config.sorting = if (startNameWithSurname) SORT_BY_SURNAME else SORT_BY_FIRST_NAME this@MyViewPagerFragment.activity!!.refreshContacts(CONTACTS_TAB_MASK or FAVORITES_TAB_MASK) } diff --git a/app/src/main/res/layout/activity_dialpad.xml b/app/src/main/res/layout/activity_dialpad.xml index 7435e5c2..96aa5f19 100644 --- a/app/src/main/res/layout/activity_dialpad.xml +++ b/app/src/main/res/layout/activity_dialpad.xml @@ -56,10 +56,10 @@ + android:paddingBottom="@dimen/medium_margin"> @@ -38,16 +38,16 @@ android:id="@+id/contact_actions_holder" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignBottom="@id/contact_photo" android:layout_alignTop="@+id/contact_photo" + android:layout_alignBottom="@id/contact_photo" android:gravity="center_vertical|right"> diff --git a/app/src/main/res/layout/activity_view_contact.xml b/app/src/main/res/layout/activity_view_contact.xml index 74ce627d..ec4ec89c 100644 --- a/app/src/main/res/layout/activity_view_contact.xml +++ b/app/src/main/res/layout/activity_view_contact.xml @@ -10,10 +10,10 @@ android:id="@+id/contact_holder" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingBottom="@dimen/medium_margin" android:paddingLeft="@dimen/normal_margin" + android:paddingTop="@dimen/activity_margin" android:paddingRight="@dimen/normal_margin" - android:paddingTop="@dimen/activity_margin"> + android:paddingBottom="@dimen/medium_margin"> @@ -39,16 +39,16 @@ android:id="@+id/contact_actions_holder" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignBottom="@id/contact_photo" android:layout_alignTop="@+id/contact_photo" + android:layout_alignBottom="@id/contact_photo" android:gravity="center_vertical|right"> @@ -115,9 +115,9 @@ android:layout_toRightOf="@+id/contact_name_image" android:lines="1" android:maxLines="1" - android:paddingBottom="@dimen/normal_margin" android:paddingLeft="@dimen/small_margin" android:paddingTop="@dimen/normal_margin" + android:paddingBottom="@dimen/normal_margin" android:singleLine="true" android:textSize="@dimen/bigger_text_size"/> @@ -130,9 +130,9 @@ android:layout_toRightOf="@+id/contact_name_image" android:lines="1" android:maxLines="1" - android:paddingBottom="@dimen/normal_margin" android:paddingLeft="@dimen/small_margin" android:paddingTop="@dimen/normal_margin" + android:paddingBottom="@dimen/normal_margin" android:singleLine="true" android:textSize="@dimen/bigger_text_size"/> @@ -145,9 +145,9 @@ android:layout_toRightOf="@+id/contact_name_image" android:lines="1" android:maxLines="1" - android:paddingBottom="@dimen/normal_margin" android:paddingLeft="@dimen/small_margin" android:paddingTop="@dimen/normal_margin" + android:paddingBottom="@dimen/normal_margin" android:singleLine="true" android:textSize="@dimen/bigger_text_size"/> @@ -160,9 +160,9 @@ android:layout_toRightOf="@+id/contact_name_image" android:lines="1" android:maxLines="1" - android:paddingBottom="@dimen/normal_margin" android:paddingLeft="@dimen/small_margin" android:paddingTop="@dimen/normal_margin" + android:paddingBottom="@dimen/normal_margin" android:singleLine="true" android:textSize="@dimen/bigger_text_size"/> @@ -175,9 +175,9 @@ android:layout_toRightOf="@+id/contact_name_image" android:lines="1" android:maxLines="1" - android:paddingBottom="@dimen/normal_margin" android:paddingLeft="@dimen/small_margin" android:paddingTop="@dimen/normal_margin" + android:paddingBottom="@dimen/normal_margin" android:singleLine="true" android:textSize="@dimen/bigger_text_size"/> @@ -186,10 +186,10 @@ android:layout_width="@dimen/contact_icons_size" android:layout_height="@dimen/contact_icons_size" android:layout_alignTop="@+id/contact_numbers_holder" - android:paddingBottom="@dimen/small_margin" + android:paddingTop="@dimen/medium_margin" android:paddingEnd="@dimen/small_margin" android:paddingRight="@dimen/small_margin" - android:paddingTop="@dimen/medium_margin" + android:paddingBottom="@dimen/small_margin" android:src="@drawable/ic_phone"/> diff --git a/app/src/main/res/layout/dialog_call_confirmation.xml b/app/src/main/res/layout/dialog_call_confirmation.xml index 9d406f6b..44971313 100644 --- a/app/src/main/res/layout/dialog_call_confirmation.xml +++ b/app/src/main/res/layout/dialog_call_confirmation.xml @@ -8,10 +8,10 @@ diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..dbb7bf70 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,2 @@ +android.enableJetifier=true +android.useAndroidX=true