fenix/Simple-Contacts
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Contacts.git synced 2025-02-03 09:17:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

rename ContactActivity to EditContactActivity

Browse Source
This commit is contained in:
tibbi 2018-01-29 19:16:58 +01:00
parent d1152fb657
commit db019572a4
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@ -75,7 +75,7 @@
android:parentActivityName=".activities.MainActivity"/> android:parentActivityName=".activities.MainActivity"/>
<activity <activity
android:name=".activities.ContactActivity" android:name=".activities.EditContactActivity"
android:parentActivityName=".activities.MainActivity"> android:parentActivityName=".activities.MainActivity">
<intent-filter> <intent-filter>

10
app/src/main/kotlin/com/simplemobiletools/contacts/activities/ContactActivity.kt → app/src/main/kotlin/com/simplemobiletools/contacts/activities/EditContactActivity.kt
View File

@ -38,7 +38,7 @@ import com.simplemobiletools.contacts.models.Contact
import com.simplemobiletools.contacts.models.Email import com.simplemobiletools.contacts.models.Email
import com.simplemobiletools.contacts.models.Event import com.simplemobiletools.contacts.models.Event
import com.simplemobiletools.contacts.models.PhoneNumber import com.simplemobiletools.contacts.models.PhoneNumber
import kotlinx.android.synthetic.main.activity_contact.* import kotlinx.android.synthetic.main.activity_edit_contact.*
import kotlinx.android.synthetic.main.item_email.view.* import kotlinx.android.synthetic.main.item_email.view.*
import kotlinx.android.synthetic.main.item_event.view.* import kotlinx.android.synthetic.main.item_event.view.*
import kotlinx.android.synthetic.main.item_phone_number.view.* import kotlinx.android.synthetic.main.item_phone_number.view.*
@ -48,7 +48,7 @@ import java.text.DateFormat
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import java.util.* import java.util.*
class ContactActivity : SimpleActivity() { class EditContactActivity : SimpleActivity() {
private val INTENT_TAKE_PHOTO = 1 private val INTENT_TAKE_PHOTO = 1
private val INTENT_CHOOSE_PHOTO = 2 private val INTENT_CHOOSE_PHOTO = 2
private val INTENT_CROP_PHOTO = 3 private val INTENT_CROP_PHOTO = 3
@ -67,7 +67,7 @@ class ContactActivity : SimpleActivity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.activity_contact) setContentView(R.layout.activity_edit_contact)
supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_cross) supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_cross)
handlePermission(PERMISSION_READ_CONTACTS) { handlePermission(PERMISSION_READ_CONTACTS) {
@ -584,7 +584,7 @@ class ContactActivity : SimpleActivity() {
private fun insertNewContact() { private fun insertNewContact() {
isSaving = true isSaving = true
toast(R.string.inserting) toast(R.string.inserting)
if (ContactsHelper(this@ContactActivity).insertContact(contact!!)) { if (ContactsHelper(this@EditContactActivity).insertContact(contact!!)) {
finish() finish()
} else { } else {
toast(R.string.unknown_error_occurred) toast(R.string.unknown_error_occurred)
@ -593,7 +593,7 @@ class ContactActivity : SimpleActivity() {
private fun updateContact(photoUpdateStatus: Int) { private fun updateContact(photoUpdateStatus: Int) {
isSaving = true isSaving = true
if (ContactsHelper(this@ContactActivity).updateContact(contact!!, photoUpdateStatus)) { if (ContactsHelper(this@EditContactActivity).updateContact(contact!!, photoUpdateStatus)) {
finish() finish()
} else { } else {
toast(R.string.unknown_error_occurred) toast(R.string.unknown_error_occurred)

4
app/src/main/kotlin/com/simplemobiletools/contacts/extensions/Context.kt
View File

@ -13,7 +13,7 @@ import com.simplemobiletools.commons.extensions.getIntValue
import com.simplemobiletools.commons.extensions.isLollipopPlus import com.simplemobiletools.commons.extensions.isLollipopPlus
import com.simplemobiletools.commons.extensions.toast import com.simplemobiletools.commons.extensions.toast
import com.simplemobiletools.contacts.BuildConfig import com.simplemobiletools.contacts.BuildConfig
import com.simplemobiletools.contacts.activities.ContactActivity import com.simplemobiletools.contacts.activities.EditContactActivity
import com.simplemobiletools.contacts.helpers.CONTACT_ID import com.simplemobiletools.contacts.helpers.CONTACT_ID
import com.simplemobiletools.contacts.helpers.Config import com.simplemobiletools.contacts.helpers.Config
import com.simplemobiletools.contacts.models.Contact import com.simplemobiletools.contacts.models.Contact
@ -22,7 +22,7 @@ import java.io.File
val Context.config: Config get() = Config.newInstance(applicationContext) val Context.config: Config get() = Config.newInstance(applicationContext)
fun Context.openContact(contact: Contact) { fun Context.openContact(contact: Contact) {
Intent(applicationContext, ContactActivity::class.java).apply { Intent(applicationContext, EditContactActivity::class.java).apply {
putExtra(CONTACT_ID, contact.id) putExtra(CONTACT_ID, contact.id)
startActivity(this) startActivity(this)
} }

4
app/src/main/kotlin/com/simplemobiletools/contacts/fragments/ContactsFragment.kt
View File

@ -3,11 +3,11 @@ package com.simplemobiletools.contacts.fragments
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.util.AttributeSet import android.util.AttributeSet
import com.simplemobiletools.contacts.activities.ContactActivity import com.simplemobiletools.contacts.activities.EditContactActivity
class ContactsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerFragment(context, attributeSet) { class ContactsFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerFragment(context, attributeSet) {
override fun fabClicked() { override fun fabClicked() {
Intent(context, ContactActivity::class.java).apply { Intent(context, EditContactActivity::class.java).apply {
context.startActivity(this) context.startActivity(this)
} }
} }

0
app/src/main/res/layout/activity_contact.xml → app/src/main/res/layout/activity_edit_contact.xml
View File