fix: undo unnecessary formatting changes.
This commit is contained in:
parent
25daf4de8f
commit
cb639fabeb
4 changed files with 11 additions and 35 deletions
|
@ -219,25 +219,15 @@ class EditContactActivity : ContactActivity() {
|
|||
|
||||
val properPrimaryColor = getProperPrimaryColor()
|
||||
arrayOf(
|
||||
contact_numbers_add_new,
|
||||
contact_emails_add_new,
|
||||
contact_addresses_add_new,
|
||||
contact_ims_add_new,
|
||||
contact_events_add_new,
|
||||
contact_websites_add_new,
|
||||
contact_groups_add_new
|
||||
contact_numbers_add_new, contact_emails_add_new, contact_addresses_add_new, contact_ims_add_new, contact_events_add_new,
|
||||
contact_websites_add_new, contact_groups_add_new
|
||||
).forEach {
|
||||
it.applyColorFilter(properPrimaryColor)
|
||||
}
|
||||
|
||||
arrayOf(
|
||||
contact_numbers_add_new.background,
|
||||
contact_emails_add_new.background,
|
||||
contact_addresses_add_new.background,
|
||||
contact_ims_add_new.background,
|
||||
contact_events_add_new.background,
|
||||
contact_websites_add_new.background,
|
||||
contact_groups_add_new.background
|
||||
contact_numbers_add_new.background, contact_emails_add_new.background, contact_addresses_add_new.background, contact_ims_add_new.background,
|
||||
contact_events_add_new.background, contact_websites_add_new.background, contact_groups_add_new.background
|
||||
).forEach {
|
||||
it.applyColorFilter(textColor)
|
||||
}
|
||||
|
@ -609,18 +599,11 @@ class EditContactActivity : ContactActivity() {
|
|||
startActivityForResult(ringtonePickerIntent, INTENT_SELECT_RINGTONE)
|
||||
} catch (e: Exception) {
|
||||
val currentRingtone = contact!!.ringtone ?: getDefaultAlarmSound(RingtoneManager.TYPE_RINGTONE).uri
|
||||
SelectAlarmSoundDialog(
|
||||
this,
|
||||
currentRingtone,
|
||||
AudioManager.STREAM_RING,
|
||||
PICK_RINGTONE_INTENT_ID,
|
||||
RingtoneManager.TYPE_RINGTONE,
|
||||
true,
|
||||
SelectAlarmSoundDialog(this, currentRingtone, AudioManager.STREAM_RING, PICK_RINGTONE_INTENT_ID, RingtoneManager.TYPE_RINGTONE, true,
|
||||
onAlarmPicked = {
|
||||
contact!!.ringtone = it?.uri
|
||||
contact_ringtone.text = it?.title
|
||||
},
|
||||
onAlarmSoundDeleted = {}
|
||||
}, onAlarmSoundDeleted = {}
|
||||
)
|
||||
}
|
||||
}
|
||||
|
@ -1084,7 +1067,7 @@ class EditContactActivity : ContactActivity() {
|
|||
events = filledEvents,
|
||||
starred = if (isContactStarred()) 1 else 0,
|
||||
notes = contact_notes.value,
|
||||
websites = filledWebsites
|
||||
websites = filledWebsites,
|
||||
)
|
||||
|
||||
val company = contact_organization_company.value
|
||||
|
|
|
@ -20,12 +20,8 @@ import com.simplemobiletools.contacts.pro.extensions.config
|
|||
import kotlinx.android.synthetic.main.item_add_favorite_with_number.view.*
|
||||
|
||||
class SelectContactsAdapter(
|
||||
val activity: SimpleActivity,
|
||||
var contacts: ArrayList<Contact>,
|
||||
private val selectedContacts: ArrayList<Contact>,
|
||||
private val allowPickMultiple: Boolean,
|
||||
recyclerView: MyRecyclerView,
|
||||
private val itemClick: ((Contact) -> Unit)? = null
|
||||
val activity: SimpleActivity, var contacts: ArrayList<Contact>, private val selectedContacts: ArrayList<Contact>, private val allowPickMultiple: Boolean,
|
||||
recyclerView: MyRecyclerView, private val itemClick: ((Contact) -> Unit)? = null
|
||||
) :
|
||||
RecyclerView.Adapter<SelectContactsAdapter.ViewHolder>() {
|
||||
private val itemViews = SparseArray<View>()
|
||||
|
|
|
@ -16,9 +16,7 @@ import kotlinx.android.synthetic.main.dialog_export_contacts.view.*
|
|||
import java.io.File
|
||||
|
||||
class ExportContactsDialog(
|
||||
val activity: SimpleActivity,
|
||||
val path: String,
|
||||
val hidePath: Boolean,
|
||||
val activity: SimpleActivity, val path: String, val hidePath: Boolean,
|
||||
private val callback: (file: File, ignoredContactSources: HashSet<String>) -> Unit
|
||||
) {
|
||||
private var ignoreClicks = false
|
||||
|
|
|
@ -26,7 +26,6 @@ fun Context.getPackageDrawable(packageName: String): Drawable {
|
|||
WHATSAPP_PACKAGE -> R.drawable.ic_whatsapp_rect_vector
|
||||
VIBER_PACKAGE -> R.drawable.ic_viber_rect_vector
|
||||
else -> R.drawable.ic_threema_rect_vector
|
||||
},
|
||||
theme
|
||||
}, theme
|
||||
)
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue