From 60722d204fefefb0eb21d23489c30701a0cf9c28 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 21 Nov 2017 14:54:29 -0500 Subject: [PATCH] Compose contact selection (#7) * Create empty compose activity * Display all contacts in compose activity * Remove unused method * Updated design in MessagesActivity * Show detailed contacts in compose suggestions * Add observable EditText to Compose Toolbar * Allow querying the list of contacts in Compose * Add remaining fields from mms-sms contentprovider * Update gradle build tools * Added support for contact selection chips --- build.gradle | 2 +- qksms/build.gradle | 1 + qksms/src/main/AndroidManifest.xml | 1 + .../com/moez/QKSMS/common/di/AppComponent.kt | 8 +- .../java/com/moez/QKSMS/data/model/Contact.kt | 2 + .../data/repository/ContactRepository.kt | 23 ++-- .../com/moez/QKSMS/presentation/Navigator.kt | 11 ++ .../moez/QKSMS/presentation/base/QkAdapter.kt | 3 +- .../presentation/compose/ChipsAdapter.kt | 124 ++++++++++++++++++ .../presentation/compose/ComposeActivity.kt | 51 +++++++ .../presentation/compose/ComposeState.kt | 9 ++ .../QKSMS/presentation/compose/ComposeView.kt | 13 ++ .../presentation/compose/ComposeViewModel.kt | 67 ++++++++++ .../compose/ComposeWindowCallback.kt | 117 +++++++++++++++++ .../presentation/compose/ContactAdapter.kt | 38 ++++++ .../presentation/compose/DetailedChipView.kt | 59 +++++++++ .../QKSMS/presentation/main/MainViewModel.kt | 1 + .../src/main/res/drawable/chip_background.xml | 17 +++ .../res/drawable/ic_cancel_black_24dp.xml | 9 ++ .../res/drawable/rounded_rectangle_2dp.xml | 9 ++ .../src/main/res/layout/compose_activity.xml | 29 ++++ qksms/src/main/res/layout/contact_chip.xml | 35 +++++ .../main/res/layout/contact_chip_detailed.xml | 66 ++++++++++ .../src/main/res/layout/contact_list_item.xml | 39 ++++++ qksms/src/main/res/layout/toolbar.xml | 3 + qksms/src/main/res/layout/toolbar_chips.xml | 20 +++ qksms/src/main/res/layout/toolbar_search.xml | 24 ++++ qksms/src/main/res/values/strings.xml | 1 + 28 files changed, 766 insertions(+), 16 deletions(-) create mode 100755 qksms/src/main/java/com/moez/QKSMS/presentation/compose/ChipsAdapter.kt create mode 100644 qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt create mode 100644 qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeState.kt create mode 100644 qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeView.kt create mode 100644 qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt create mode 100755 qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeWindowCallback.kt create mode 100644 qksms/src/main/java/com/moez/QKSMS/presentation/compose/ContactAdapter.kt create mode 100755 qksms/src/main/java/com/moez/QKSMS/presentation/compose/DetailedChipView.kt create mode 100755 qksms/src/main/res/drawable/chip_background.xml create mode 100755 qksms/src/main/res/drawable/ic_cancel_black_24dp.xml create mode 100755 qksms/src/main/res/drawable/rounded_rectangle_2dp.xml create mode 100644 qksms/src/main/res/layout/compose_activity.xml create mode 100755 qksms/src/main/res/layout/contact_chip.xml create mode 100755 qksms/src/main/res/layout/contact_chip_detailed.xml create mode 100644 qksms/src/main/res/layout/contact_list_item.xml create mode 100644 qksms/src/main/res/layout/toolbar_chips.xml create mode 100644 qksms/src/main/res/layout/toolbar_search.xml diff --git a/build.gradle b/build.gradle index c70bdf1b..83471fee 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.0' + classpath 'com.android.tools.build:gradle:3.0.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "io.realm:realm-gradle-plugin:4.1.1" } diff --git a/qksms/build.gradle b/qksms/build.gradle index a8716f25..2765c184 100644 --- a/qksms/build.gradle +++ b/qksms/build.gradle @@ -41,6 +41,7 @@ dependencies { compile 'com.android.support:design:26.1.0' compile 'com.bugsnag:bugsnag-android:4.1.1' compile 'com.github.bumptech.glide:glide:4.3.0' + compile 'com.google.android:flexbox:0.3.1' compile "com.google.dagger:dagger:2.11" compile 'com.jakewharton.rxbinding2:rxbinding-kotlin:2.0.0' compile 'com.jakewharton.rxbinding2:rxbinding-support-v4-kotlin:2.0.0' diff --git a/qksms/src/main/AndroidManifest.xml b/qksms/src/main/AndroidManifest.xml index ad3696e1..2478e366 100644 --- a/qksms/src/main/AndroidManifest.xml +++ b/qksms/src/main/AndroidManifest.xml @@ -46,6 +46,7 @@ + Uri.withAppendedPath(ContactsContract.Contacts.CONTENT_URI, id) } } + fun getContacts(): List { + val realm = Realm.getDefaultInstance() + val results = realm.copyFromRealm(realm + .where(Contact::class.java) + .equalTo("inContactsTable", true) + .findAllSorted("name")) + realm.close() + + return results + } + fun getContact(recipientId: Long): Flowable { return Flowable.fromPublisher { emitter -> val contact = getContactFromRealm(recipientId) ?: getContactFromDb(recipientId) @@ -58,7 +69,8 @@ class ContactRepository @Inject constructor(val context: Context) { try { context.contentResolver.query(contactUri, projection, null, null, null).use { contactCursor -> if (contactCursor.moveToFirst()) { - contact.name = contactCursor.getString(contactCursor.getColumnIndex(ContactsContract.Data.DISPLAY_NAME)).orEmpty() + contact.inContactsTable = true + contact.name = contactCursor.getString(contactCursor.getColumnIndex(ContactsContract.PhoneLookup.DISPLAY_NAME)).orEmpty() } } } catch (e: Exception) { @@ -71,13 +83,4 @@ class ContactRepository @Inject constructor(val context: Context) { return null } - fun getContactFromCache(address: String): Contact? { - val realm = Realm.getDefaultInstance() - val contact = realm.where(Contact::class.java) - .equalTo("contactUri", address) - .findFirst() - realm.close() - return contact - } - } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/Navigator.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/Navigator.kt index 5e318dc0..fd26146f 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/Navigator.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/Navigator.kt @@ -4,6 +4,8 @@ import android.arch.lifecycle.ViewModel import android.arch.lifecycle.ViewModelProvider import android.content.Context import android.content.Intent +import com.moez.QKSMS.presentation.compose.ComposeActivity +import com.moez.QKSMS.presentation.compose.ComposeViewModel import com.moez.QKSMS.presentation.main.MainViewModel import com.moez.QKSMS.presentation.messages.MessagesActivity import com.moez.QKSMS.presentation.messages.MessagesViewModel @@ -20,6 +22,11 @@ class Navigator @Inject constructor(val context: Context) { context.startActivity(intent) } + fun showCompose() { + val intent = Intent(context, ComposeActivity::class.java) + startActivity(intent) + } + fun showConversation(threadId: Long) { val intent = Intent(context, MessagesActivity::class.java) intent.putExtra("threadId", threadId) @@ -41,6 +48,10 @@ class Navigator @Inject constructor(val context: Context) { MainViewModel() } + ComposeViewModel::class.java -> { + ComposeViewModel() + } + MessagesViewModel::class.java -> { val threadId = intent.getLongExtra("threadId", 0) MessagesViewModel(threadId) diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkAdapter.kt index 3d8a4d6f..7438b6c5 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/base/QkAdapter.kt @@ -29,7 +29,6 @@ abstract class QkAdapter(private val flowable: override fun onAttachedToRecyclerView(recyclerView: RecyclerView?) { super.onAttachedToRecyclerView(recyclerView) disposable = flowable.subscribe { data = it } - } override fun onDetachedFromRecyclerView(recyclerView: RecyclerView?) { @@ -37,7 +36,7 @@ abstract class QkAdapter(private val flowable: disposable?.dispose() } - override final fun getItemCount(): Int { + override fun getItemCount(): Int { return data.size } diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ChipsAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ChipsAdapter.kt new file mode 100755 index 00000000..fd46dc8f --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ChipsAdapter.kt @@ -0,0 +1,124 @@ +package com.moez.QKSMS.presentation.compose + +import android.content.Context +import android.support.v4.content.ContextCompat +import android.support.v7.widget.AppCompatEditText +import android.support.v7.widget.RecyclerView +import android.text.InputType +import android.view.KeyEvent +import android.view.LayoutInflater +import android.view.ViewGroup +import android.view.inputmethod.EditorInfo +import android.widget.EditText +import android.widget.RelativeLayout +import com.google.android.flexbox.FlexboxLayoutManager +import com.jakewharton.rxbinding2.view.keys +import com.jakewharton.rxbinding2.widget.textChanges +import com.moez.QKSMS.R +import com.moez.QKSMS.common.util.extensions.dpToPx +import com.moez.QKSMS.data.model.Contact +import com.moez.QKSMS.presentation.base.QkAdapter +import com.moez.QKSMS.presentation.base.QkViewHolder +import io.reactivex.Flowable +import io.reactivex.subjects.PublishSubject +import kotlinx.android.synthetic.main.contact_chip.view.* + +class ChipsAdapter( + private val context: Context, + private val view: RecyclerView, + data: Flowable>) : QkAdapter(data) { + + companion object { + private val TYPE_EDIT_TEXT = 0 + private val TYPE_ITEM = 1 + } + + private val hint: String = context.getString(R.string.title_compose) + private val editText: EditText = AppCompatEditText(context) + + val chipDeleted: PublishSubject = PublishSubject.create() + val textChanges = editText.textChanges() + + init { + val wrap = ViewGroup.LayoutParams.WRAP_CONTENT + editText.layoutParams = FlexboxLayoutManager.LayoutParams(wrap, wrap).apply { + minWidth = 56.dpToPx(context) + flexGrow = 8f + } + + editText.hint = hint + editText.textSize = 16f + editText.setTextColor(ContextCompat.getColor(context, R.color.textPrimary)) + editText.setHintTextColor(ContextCompat.getColor(context, R.color.textTertiary)) + editText.setBackgroundResource(android.R.color.transparent) + editText.inputType = InputType.TYPE_TEXT_VARIATION_FILTER or InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS + editText.imeOptions = EditorInfo.IME_FLAG_NO_EXTRACT_UI + editText.privateImeOptions = "nm" + + editText.keys() + .filter { event -> event.action == KeyEvent.ACTION_DOWN } + .filter { event -> event.keyCode == KeyEvent.KEYCODE_DEL } + .subscribe { + if (itemCount > 1 && editText.text.isEmpty()) { + chipDeleted.onNext(getItem(itemCount - 2)) + } + } + } + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = when (viewType) { + TYPE_EDIT_TEXT -> QkViewHolder(editText) + else -> QkViewHolder(LayoutInflater.from(context).inflate(R.layout.contact_chip, parent, false)) + } + + override fun onBindViewHolder(holder: QkViewHolder, position: Int) { + when (getItemViewType(position)) { + TYPE_EDIT_TEXT -> { + if (itemCount == 1) { + editText.hint = hint + } else { + editText.hint = null + editText.text = null + } + + editText.requestFocus() + } + + else -> { + val contact = getItem(position) + val view = holder.itemView + + view.avatar.contact = contact + view.name.text = contact.name + + view.setOnClickListener { showDetailedChip(contact) } + } + } + } + + override fun getItemCount() = super.getItemCount() + 1 + + override fun getItemViewType(position: Int) = if (position == itemCount - 1) TYPE_EDIT_TEXT else TYPE_ITEM + + private fun showDetailedChip(contact: Contact) { + val detailedChipView = DetailedChipView(context) + detailedChipView.setContact(contact) + + val rootView = view.rootView as ViewGroup + + val layoutParams = RelativeLayout.LayoutParams( + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.WRAP_CONTENT) + + layoutParams.topMargin = 24.dpToPx(context) + layoutParams.marginStart = 56.dpToPx(context) + + rootView.addView(detailedChipView, layoutParams) + detailedChipView.show() + + detailedChipView.setOnDeleteListener { + chipDeleted.onNext(contact) + detailedChipView.hide() + } + } + +} diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt new file mode 100644 index 00000000..c1dd2b17 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeActivity.kt @@ -0,0 +1,51 @@ +package com.moez.QKSMS.presentation.compose + +import android.os.Bundle +import android.support.v7.widget.LinearLayoutManager +import com.google.android.flexbox.FlexboxLayoutManager +import com.moez.QKSMS.R +import com.moez.QKSMS.data.model.Contact +import com.moez.QKSMS.presentation.base.QkActivity +import io.reactivex.subjects.PublishSubject +import io.reactivex.subjects.Subject +import kotlinx.android.synthetic.main.compose_activity.* +import kotlinx.android.synthetic.main.toolbar_chips.* + +class ComposeActivity : QkActivity(), ComposeView { + + override val viewModelClass = ComposeViewModel::class + + override val queryChangedIntent: Subject = PublishSubject.create() + override val chipSelectedIntent: Subject = PublishSubject.create() + override val chipDeletedIntent: Subject = PublishSubject.create() + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.compose_activity) + supportActionBar?.setDisplayHomeAsUpEnabled(true) + viewModel.setView(this) + + chips.layoutManager = FlexboxLayoutManager(this) + contacts.layoutManager = LinearLayoutManager(this) + + window.callback = ComposeWindowCallback(window.callback, this) + } + + override fun render(state: ComposeState) { + if (chips.adapter == null && state.selectedContacts != null) { + val adapter = ChipsAdapter(this, chips, state.selectedContacts) + adapter.chipDeleted.subscribe { chipDeletedIntent.onNext(it) } + adapter.textChanges.subscribe { queryChangedIntent.onNext(it) } + + chips.adapter = adapter + } + + if (contacts.adapter == null && state.contacts != null) { + val adapter = ContactAdapter(this, state.contacts) + adapter.contactSelected.subscribe { chipSelectedIntent.onNext(it) } + + contacts.adapter = adapter + } + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeState.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeState.kt new file mode 100644 index 00000000..749aab3d --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeState.kt @@ -0,0 +1,9 @@ +package com.moez.QKSMS.presentation.compose + +import com.moez.QKSMS.data.model.Contact +import io.reactivex.Flowable + +data class ComposeState( + val contacts: Flowable>? = null, + val selectedContacts: Flowable>? = null +) \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeView.kt new file mode 100644 index 00000000..26bdf342 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeView.kt @@ -0,0 +1,13 @@ +package com.moez.QKSMS.presentation.compose + +import com.moez.QKSMS.data.model.Contact +import com.moez.QKSMS.presentation.base.QkView +import io.reactivex.subjects.Subject + +interface ComposeView : QkView { + + val queryChangedIntent: Subject + val chipSelectedIntent: Subject + val chipDeletedIntent: Subject + +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt new file mode 100644 index 00000000..f576a6a2 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt @@ -0,0 +1,67 @@ +package com.moez.QKSMS.presentation.compose + +import android.content.Context +import android.telephony.PhoneNumberUtils +import com.moez.QKSMS.common.di.AppComponentManager +import com.moez.QKSMS.data.model.Contact +import com.moez.QKSMS.data.repository.ContactRepository +import com.moez.QKSMS.presentation.base.QkViewModel +import io.reactivex.BackpressureStrategy +import io.reactivex.Flowable +import io.reactivex.android.schedulers.AndroidSchedulers +import io.reactivex.rxkotlin.plusAssign +import io.reactivex.schedulers.Schedulers +import io.reactivex.subjects.BehaviorSubject +import io.reactivex.subjects.Subject +import javax.inject.Inject + + +class ComposeViewModel : QkViewModel(ComposeState()) { + + @Inject lateinit var context: Context + @Inject lateinit var contactsRepo: ContactRepository + + private val contactsSubject: Subject> = BehaviorSubject.create() + private val selectedContactsReducer: Subject<(List) -> List> = BehaviorSubject.create() + + private val contacts: List + + init { + AppComponentManager.appComponent.inject(this) + + contacts = contactsRepo.getContacts() + + val contactsFlowable = contactsSubject.toFlowable(BackpressureStrategy.BUFFER) + + val selectedContacts: Flowable> = selectedContactsReducer + .scan(listOf(), { previousState, reducer -> reducer(previousState) }) + .toFlowable(BackpressureStrategy.BUFFER) + + newState { it.copy(contacts = contactsFlowable, selectedContacts = selectedContacts) } + } + + override fun bindIntents(view: ComposeView) { + super.bindIntents(view) + + intents += view.queryChangedIntent + .toFlowable(BackpressureStrategy.LATEST) + .map { query -> query.toString() } + .map { query -> + contacts.filter { contact -> + contact.name.contains(query, true) || PhoneNumberUtils.compare(contact.address, query) + } + } + .subscribeOn(Schedulers.computation()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe { contacts -> contactsSubject.onNext(contacts) } + + intents += view.chipSelectedIntent.subscribe { contact -> + selectedContactsReducer.onNext { it.toMutableList().apply { add(contact) } } + } + + intents += view.chipDeletedIntent.subscribe { contact -> + selectedContactsReducer.onNext { it.filterNot { it == contact } } + } + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeWindowCallback.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeWindowCallback.kt new file mode 100755 index 00000000..b4339646 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeWindowCallback.kt @@ -0,0 +1,117 @@ +package com.moez.QKSMS.presentation.compose + +import android.app.Activity +import android.graphics.Rect +import android.os.Build +import android.support.annotation.RequiresApi +import android.view.* +import android.view.accessibility.AccessibilityEvent + +class ComposeWindowCallback(private val localCallback: Window.Callback, private val activity: Activity) : Window.Callback { + + override fun dispatchKeyEvent(keyEvent: KeyEvent): Boolean { + return localCallback.dispatchKeyEvent(keyEvent) + } + + override fun dispatchKeyShortcutEvent(keyEvent: KeyEvent): Boolean { + return localCallback.dispatchKeyShortcutEvent(keyEvent) + } + + override fun dispatchTouchEvent(motionEvent: MotionEvent): Boolean { + if (motionEvent.action == MotionEvent.ACTION_DOWN) { + val v = activity.currentFocus + when (v) { + is DetailedChipView -> { + val rect = Rect().apply { v.getGlobalVisibleRect(this) } + if (!rect.contains(motionEvent.rawX.toInt(), motionEvent.rawY.toInt())) { + v.hide() + return true + } + } + } + } + return localCallback.dispatchTouchEvent(motionEvent) + } + + override fun dispatchTrackballEvent(motionEvent: MotionEvent): Boolean { + return localCallback.dispatchTrackballEvent(motionEvent) + } + + override fun dispatchGenericMotionEvent(motionEvent: MotionEvent): Boolean { + return localCallback.dispatchGenericMotionEvent(motionEvent) + } + + override fun dispatchPopulateAccessibilityEvent(accessibilityEvent: AccessibilityEvent): Boolean { + return localCallback.dispatchPopulateAccessibilityEvent(accessibilityEvent) + } + + override fun onCreatePanelView(i: Int): View? { + return localCallback.onCreatePanelView(i) + } + + override fun onCreatePanelMenu(i: Int, menu: Menu): Boolean { + return localCallback.onCreatePanelMenu(i, menu) + } + + override fun onPreparePanel(i: Int, view: View, menu: Menu): Boolean { + return localCallback.onPreparePanel(i, view, menu) + } + + override fun onMenuOpened(i: Int, menu: Menu): Boolean { + return localCallback.onMenuOpened(i, menu) + } + + override fun onMenuItemSelected(i: Int, menuItem: MenuItem): Boolean { + return localCallback.onMenuItemSelected(i, menuItem) + } + + override fun onWindowAttributesChanged(layoutParams: WindowManager.LayoutParams) { + localCallback.onWindowAttributesChanged(layoutParams) + } + + override fun onContentChanged() { + localCallback.onContentChanged() + } + + override fun onWindowFocusChanged(b: Boolean) { + localCallback.onWindowFocusChanged(b) + } + + override fun onAttachedToWindow() { + localCallback.onAttachedToWindow() + } + + override fun onDetachedFromWindow() { + localCallback.onDetachedFromWindow() + } + + override fun onPanelClosed(i: Int, menu: Menu) { + localCallback.onPanelClosed(i, menu) + } + + override fun onSearchRequested(): Boolean { + return localCallback.onSearchRequested() + } + + @RequiresApi(api = Build.VERSION_CODES.M) + override fun onSearchRequested(searchEvent: SearchEvent): Boolean { + return localCallback.onSearchRequested(searchEvent) + } + + override fun onWindowStartingActionMode(callback: ActionMode.Callback): ActionMode? { + return localCallback.onWindowStartingActionMode(callback) + } + + @RequiresApi(api = Build.VERSION_CODES.M) + override fun onWindowStartingActionMode(callback: ActionMode.Callback, i: Int): ActionMode? { + return localCallback.onWindowStartingActionMode(callback, i) + } + + override fun onActionModeStarted(actionMode: ActionMode) { + localCallback.onActionModeStarted(actionMode) + } + + override fun onActionModeFinished(actionMode: ActionMode) { + localCallback.onActionModeFinished(actionMode) + } +} diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ContactAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ContactAdapter.kt new file mode 100644 index 00000000..494ba855 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ContactAdapter.kt @@ -0,0 +1,38 @@ +package com.moez.QKSMS.presentation.compose + +import android.content.Context +import android.view.LayoutInflater +import android.view.ViewGroup +import com.jakewharton.rxbinding2.view.clicks +import com.moez.QKSMS.R +import com.moez.QKSMS.data.model.Contact +import com.moez.QKSMS.presentation.base.QkAdapter +import com.moez.QKSMS.presentation.base.QkViewHolder +import io.reactivex.Flowable +import io.reactivex.subjects.PublishSubject +import io.reactivex.subjects.Subject +import kotlinx.android.synthetic.main.contact_list_item.view.* + +class ContactAdapter(private val context: Context, data: Flowable>) : QkAdapter(data) { + + val contactSelected: Subject = PublishSubject.create() + + override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): QkViewHolder { + val layoutRes = R.layout.contact_list_item + val layoutInflater = LayoutInflater.from(context) + val view = layoutInflater.inflate(layoutRes, parent, false) + return QkViewHolder(view) + } + + override fun onBindViewHolder(holder: QkViewHolder, position: Int) { + val contact = getItem(position) + val view = holder.itemView + + view.clicks().subscribe { contactSelected.onNext(contact) } + + view.avatar.contact = contact + view.name.text = contact.name + view.address.text = contact.address + } + +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/DetailedChipView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/DetailedChipView.kt new file mode 100755 index 00000000..60baf616 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/DetailedChipView.kt @@ -0,0 +1,59 @@ +package com.moez.QKSMS.presentation.compose + +import android.content.Context +import android.view.View +import android.view.animation.AlphaAnimation +import android.widget.RelativeLayout +import com.moez.QKSMS.R +import com.moez.QKSMS.common.di.AppComponentManager +import com.moez.QKSMS.common.util.ThemeManager +import com.moez.QKSMS.common.util.extensions.setBackgroundTint +import com.moez.QKSMS.data.model.Contact +import kotlinx.android.synthetic.main.contact_chip_detailed.view.* +import javax.inject.Inject + + +class DetailedChipView(context: Context) : RelativeLayout(context) { + + @Inject lateinit var themeManager: ThemeManager + + init { + View.inflate(context, R.layout.contact_chip_detailed, this) + AppComponentManager.appComponent.inject(this) + + card.setBackgroundTint(themeManager.color) + setOnClickListener { hide() } + + visibility = View.GONE + + isFocusable = true + isFocusableInTouchMode = true + } + + fun setContact(contact: Contact) { + avatar.contact = contact + name.text = contact.name + info.text = contact.address + } + + fun show() { + startAnimation(AlphaAnimation(0f, 1f).apply { duration = 200 }) + + visibility = View.VISIBLE + requestFocus() + isClickable = true + } + + fun hide() { + startAnimation(AlphaAnimation(1f, 0f).apply { duration = 200 }) + + visibility = View.GONE + clearFocus() + isClickable = false + } + + fun setOnDeleteListener(listener: (View) -> Unit) { + delete.setOnClickListener(listener) + } + +} diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt index fbec0f57..46cbc918 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/MainViewModel.kt @@ -30,6 +30,7 @@ class MainViewModel : QkViewModel(MainState()) { super.bindIntents(view) intents += view.composeIntent.subscribe { + navigator.showCompose() newState { it.copy(drawerOpen = false) } } diff --git a/qksms/src/main/res/drawable/chip_background.xml b/qksms/src/main/res/drawable/chip_background.xml new file mode 100755 index 00000000..3e19037a --- /dev/null +++ b/qksms/src/main/res/drawable/chip_background.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/qksms/src/main/res/drawable/ic_cancel_black_24dp.xml b/qksms/src/main/res/drawable/ic_cancel_black_24dp.xml new file mode 100755 index 00000000..7a71e053 --- /dev/null +++ b/qksms/src/main/res/drawable/ic_cancel_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/qksms/src/main/res/drawable/rounded_rectangle_2dp.xml b/qksms/src/main/res/drawable/rounded_rectangle_2dp.xml new file mode 100755 index 00000000..ba26f0ec --- /dev/null +++ b/qksms/src/main/res/drawable/rounded_rectangle_2dp.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/qksms/src/main/res/layout/compose_activity.xml b/qksms/src/main/res/layout/compose_activity.xml new file mode 100644 index 00000000..3977ac91 --- /dev/null +++ b/qksms/src/main/res/layout/compose_activity.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/qksms/src/main/res/layout/contact_chip.xml b/qksms/src/main/res/layout/contact_chip.xml new file mode 100755 index 00000000..a51f018d --- /dev/null +++ b/qksms/src/main/res/layout/contact_chip.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/qksms/src/main/res/layout/contact_chip_detailed.xml b/qksms/src/main/res/layout/contact_chip_detailed.xml new file mode 100755 index 00000000..622c9131 --- /dev/null +++ b/qksms/src/main/res/layout/contact_chip_detailed.xml @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/qksms/src/main/res/layout/contact_list_item.xml b/qksms/src/main/res/layout/contact_list_item.xml new file mode 100644 index 00000000..9eaf8317 --- /dev/null +++ b/qksms/src/main/res/layout/contact_list_item.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/qksms/src/main/res/layout/toolbar.xml b/qksms/src/main/res/layout/toolbar.xml index 1ce2c0f9..77b89c40 100644 --- a/qksms/src/main/res/layout/toolbar.xml +++ b/qksms/src/main/res/layout/toolbar.xml @@ -4,6 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="56dp" + android:background="@color/white" android:gravity="center_vertical" android:background="@color/white" android:minHeight="56dp"> @@ -12,10 +13,12 @@ android:id="@+id/toolbarTitle" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@null" android:gravity="left|center_vertical" android:maxLines="1" android:singleLine="true" android:textColor="@color/textPrimary" + android:textColorHint="@color/textTertiary" android:textSize="20sp" tools:text="Conversations" /> diff --git a/qksms/src/main/res/layout/toolbar_chips.xml b/qksms/src/main/res/layout/toolbar_chips.xml new file mode 100644 index 00000000..d06f7ac9 --- /dev/null +++ b/qksms/src/main/res/layout/toolbar_chips.xml @@ -0,0 +1,20 @@ + + + + + + + + \ No newline at end of file diff --git a/qksms/src/main/res/layout/toolbar_search.xml b/qksms/src/main/res/layout/toolbar_search.xml new file mode 100644 index 00000000..a1e3b722 --- /dev/null +++ b/qksms/src/main/res/layout/toolbar_search.xml @@ -0,0 +1,24 @@ + + + + + + \ No newline at end of file diff --git a/qksms/src/main/res/values/strings.xml b/qksms/src/main/res/values/strings.xml index 3b4d9c7f..7b8c3749 100644 --- a/qksms/src/main/res/values/strings.xml +++ b/qksms/src/main/res/values/strings.xml @@ -3,6 +3,7 @@ QKSMS Settings + Type a name or number Write a message