From a38e5ac68bd96c13bc69d0309ea4ff277c2edea0 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 23 May 2020 20:19:47 +0200 Subject: [PATCH] removing Speed Dial related things --- app/src/main/AndroidManifest.xml | 5 -- .../pro/activities/ManageSpeedDialActivity.kt | 68 ---------------- .../pro/activities/SettingsActivity.kt | 7 -- .../contacts/pro/adapters/SpeedDialAdapter.kt | 80 ------------------- .../res/layout/activity_manage_speed_dial.xml | 34 -------- app/src/main/res/layout/activity_settings.xml | 21 ----- app/src/main/res/layout/item_speed_dial.xml | 15 ---- 7 files changed, 230 deletions(-) delete mode 100644 app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ManageSpeedDialActivity.kt delete mode 100644 app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SpeedDialAdapter.kt delete mode 100644 app/src/main/res/layout/activity_manage_speed_dial.xml delete mode 100644 app/src/main/res/layout/item_speed_dial.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5e6d20a1..01f03f52 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -230,11 +230,6 @@ android:label="@string/blocked_numbers" android:parentActivityName=".activities.SettingsActivity"/> - - () - private var speedDialValues = ArrayList() - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_manage_speed_dial) - - speedDialValues = config.getSpeedDialValues() - updateAdapter() - ContactsHelper(this).getContacts { contacts -> - allContacts = contacts - } - - updateTextColors(manage_speed_dial_scrollview) - } - - override fun onStop() { - super.onStop() - config.speedDial = Gson().toJson(speedDialValues) - } - - private fun updateAdapter() { - SpeedDialAdapter(this, speedDialValues, this, speed_dial_list) { - val clickedContact = it as SpeedDial - if (allContacts.isEmpty()) { - return@SpeedDialAdapter - } - - SelectContactsDialog(this, allContacts, false, true) { addedContacts, removedContacts -> - val selectedContact = addedContacts.first() - speedDialValues.first { it.id == clickedContact.id }.apply { - displayName = selectedContact.getNameToDisplay() - number = selectedContact.phoneNumbers.first().value - } - updateAdapter() - } - }.apply { - speed_dial_list.adapter = this - } - } - - override fun removeSpeedDial(ids: ArrayList) { - ids.forEach { - val dialId = it - speedDialValues.first { it.id == dialId }.apply { - displayName = "" - number = "" - } - } - updateAdapter() - } -} diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SettingsActivity.kt index e5c86ad4..c934225e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SettingsActivity.kt @@ -35,7 +35,6 @@ class SettingsActivity : SimpleActivity() { setupManageShownContactFields() setupManageShownTabs() setupManageBlockedNumbers() - setupManageSpeedDial() setupFontSize() setupUseEnglish() setupShowContactThumbnails() @@ -83,12 +82,6 @@ class SettingsActivity : SimpleActivity() { } } - private fun setupManageSpeedDial() { - settings_manage_speed_dial_holder.setOnClickListener { - startActivity(Intent(this, ManageSpeedDialActivity::class.java)) - } - } - private fun setupFontSize() { settings_font_size.text = getFontSizeText() settings_font_size_holder.setOnClickListener { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SpeedDialAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SpeedDialAdapter.kt deleted file mode 100644 index b2cc64d3..00000000 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/adapters/SpeedDialAdapter.kt +++ /dev/null @@ -1,80 +0,0 @@ -package com.simplemobiletools.contacts.pro.adapters - -import android.view.Menu -import android.view.View -import android.view.ViewGroup -import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter -import com.simplemobiletools.commons.views.MyRecyclerView -import com.simplemobiletools.contacts.pro.R -import com.simplemobiletools.contacts.pro.activities.SimpleActivity -import com.simplemobiletools.contacts.pro.interfaces.RemoveSpeedDialListener -import com.simplemobiletools.contacts.pro.models.SpeedDial -import kotlinx.android.synthetic.main.item_speed_dial.view.* -import java.util.* - -class SpeedDialAdapter(activity: SimpleActivity, var speedDialValues: ArrayList, private val removeListener: RemoveSpeedDialListener, - recyclerView: MyRecyclerView, itemClick: (Any) -> Unit) : MyRecyclerViewAdapter(activity, recyclerView, null, itemClick) { - - init { - setupDragListener(true) - } - - override fun getActionMenuId() = R.menu.cab_delete_only - - override fun prepareActionMode(menu: Menu) {} - - override fun actionItemPressed(id: Int) { - if (selectedKeys.isEmpty()) { - return - } - - when (id) { - R.id.cab_delete -> deleteSpeedDial() - } - } - - override fun getSelectableItemCount() = speedDialValues.size - - override fun getIsItemSelectable(position: Int) = speedDialValues[position].isValid() - - override fun getItemSelectionKey(position: Int) = speedDialValues.getOrNull(position)?.hashCode() - - override fun getItemKeyPosition(key: Int) = speedDialValues.indexOfFirst { it.hashCode() == key } - - override fun onActionModeCreated() {} - - override fun onActionModeDestroyed() {} - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = createViewHolder(R.layout.item_speed_dial, parent) - - override fun onBindViewHolder(holder: ViewHolder, position: Int) { - val speedDial = speedDialValues[position] - holder.bindView(speedDial, true, true) { itemView, layoutPosition -> - setupView(itemView, speedDial) - } - bindViewHolder(holder) - } - - override fun getItemCount() = speedDialValues.size - - private fun getSelectedItems() = speedDialValues.filter { selectedKeys.contains(it.hashCode()) } as ArrayList - - private fun deleteSpeedDial() { - val ids = getSelectedItems().map { it.id }.toMutableList() as ArrayList - removeListener.removeSpeedDial(ids) - finishActMode() - } - - private fun setupView(view: View, speedDial: SpeedDial) { - view.apply { - var displayName = "${speedDial.id}. " - displayName += if (speedDial.isValid()) speedDial.displayName else "" - - speed_dial_label.apply { - text = displayName - isSelected = selectedKeys.contains(speedDial.hashCode()) - setTextColor(textColor) - } - } - } -} diff --git a/app/src/main/res/layout/activity_manage_speed_dial.xml b/app/src/main/res/layout/activity_manage_speed_dial.xml deleted file mode 100644 index 8f87e71a..00000000 --- a/app/src/main/res/layout/activity_manage_speed_dial.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 86855c88..225ddc55 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -118,27 +118,6 @@ - - - - - - -