diff --git a/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt b/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt index 820506ef..bd272b55 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/sync/SyncManager.kt @@ -5,7 +5,7 @@ import android.net.Uri import com.moez.QKSMS.data.model.Conversation import com.moez.QKSMS.data.model.Message import com.moez.QKSMS.data.repository.ContactRepository -import com.moez.QKSMS.util.asFlowable +import com.moez.QKSMS.util.extensions.asFlowable import io.reactivex.Flowable import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListActivity.kt b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListActivity.kt index 0115410f..5ba652f0 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/conversations/ConversationListActivity.kt @@ -12,7 +12,6 @@ import com.karumi.dexter.listener.PermissionRequest import com.karumi.dexter.listener.multi.MultiplePermissionsListener import com.moez.QKSMS.R import com.moez.QKSMS.ui.base.QkActivity -import com.moez.QKSMS.util.observe import kotlinx.android.synthetic.main.conversation_list_activity.* import timber.log.Timber @@ -26,7 +25,7 @@ class ConversationListActivity : QkActivity(), Observer { @@ -23,7 +22,7 @@ class MessageListActivity : QkActivity(), Observer { viewModel = ViewModelProviders.of(this)[MessageListViewModel::class.java] viewModel.threadId = intent.getLongExtra("thread_id", 0) - viewModel.state.observe(this) + viewModel.state.observe(this, this) messageList.layoutManager = LinearLayoutManager(this).apply { stackFromEnd = true } diff --git a/qksms/src/main/java/com/moez/QKSMS/util/DateFormatter.kt b/qksms/src/main/java/com/moez/QKSMS/util/DateFormatter.kt index cc020035..f99f135d 100644 --- a/qksms/src/main/java/com/moez/QKSMS/util/DateFormatter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/util/DateFormatter.kt @@ -4,6 +4,10 @@ import android.content.Context import android.text.format.DateFormat import android.text.format.DateUtils import com.moez.QKSMS.R +import com.moez.QKSMS.util.extensions.isDayAfter +import com.moez.QKSMS.util.extensions.isSameDay +import com.moez.QKSMS.util.extensions.isSameWeek +import com.moez.QKSMS.util.extensions.isSameYear import java.text.SimpleDateFormat import java.util.* diff --git a/qksms/src/main/java/com/moez/QKSMS/util/Extensions.kt b/qksms/src/main/java/com/moez/QKSMS/util/Extensions.kt deleted file mode 100644 index 500e2428..00000000 --- a/qksms/src/main/java/com/moez/QKSMS/util/Extensions.kt +++ /dev/null @@ -1,64 +0,0 @@ -package com.moez.QKSMS.util - -import android.arch.lifecycle.LifecycleOwner -import android.arch.lifecycle.LiveData -import android.arch.lifecycle.Observer -import android.content.res.ColorStateList -import android.database.Cursor -import android.widget.ImageView -import io.reactivex.Flowable -import java.util.* - -fun Calendar.isSameDay(other: Calendar): Boolean { - return get(Calendar.YEAR) == other.get(Calendar.YEAR) && get(Calendar.DAY_OF_YEAR) == other.get(Calendar.DAY_OF_YEAR) -} - -fun Calendar.isSameWeek(other: Calendar): Boolean { - return get(Calendar.YEAR) == other.get(Calendar.YEAR) && get(Calendar.WEEK_OF_YEAR) == other.get(Calendar.WEEK_OF_YEAR) -} - -fun Calendar.isSameYear(other: Calendar): Boolean { - return get(Calendar.YEAR) == other.get(Calendar.YEAR) -} - -fun Calendar.isDayAfter(other: Calendar): Boolean { - other.add(Calendar.DAY_OF_YEAR, 1) - return isSameDay(other) -} - -fun Cursor.forEach(closeOnComplete: Boolean = true, method: (Cursor) -> Unit = {}) { - moveToPosition(-1) - while (moveToNext()) { - method.invoke(this) - } - - if (closeOnComplete) { - close() - } -} - - -fun LiveData.observe(observer: O) where O : LifecycleOwner, O : Observer { - observe(observer, observer) -} - -/** - * We're using this simple implementation with .range() because of the - * complexities of dealing with Backpressure with a Cursor. We can't simply - * use a loop and call onNext() from a generator because we'll need to close - * the cursor at the end, and if any items are still in the buffer, then - * they will be made invalid - */ -fun Cursor.asFlowable(): Flowable { - return Flowable.range(0, count) - .map { - moveToPosition(it) - this - } - .doOnComplete { close() } -} - -fun ImageView.setTint(color: Int) { - imageTintList = ColorStateList.valueOf(color) -} - diff --git a/qksms/src/main/java/com/moez/QKSMS/util/extensions/CalendarExtensions.kt b/qksms/src/main/java/com/moez/QKSMS/util/extensions/CalendarExtensions.kt new file mode 100644 index 00000000..f19fc20d --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/util/extensions/CalendarExtensions.kt @@ -0,0 +1,20 @@ +package com.moez.QKSMS.util.extensions + +import java.util.* + +fun Calendar.isSameDay(other: Calendar): Boolean { + return get(Calendar.YEAR) == other.get(Calendar.YEAR) && get(Calendar.DAY_OF_YEAR) == other.get(Calendar.DAY_OF_YEAR) +} + +fun Calendar.isSameWeek(other: Calendar): Boolean { + return get(Calendar.YEAR) == other.get(Calendar.YEAR) && get(Calendar.WEEK_OF_YEAR) == other.get(Calendar.WEEK_OF_YEAR) +} + +fun Calendar.isSameYear(other: Calendar): Boolean { + return get(Calendar.YEAR) == other.get(Calendar.YEAR) +} + +fun Calendar.isDayAfter(other: Calendar): Boolean { + other.add(Calendar.DAY_OF_YEAR, 1) + return isSameDay(other) +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/util/extensions/CursorExtensions.kt b/qksms/src/main/java/com/moez/QKSMS/util/extensions/CursorExtensions.kt new file mode 100644 index 00000000..47e30ece --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/util/extensions/CursorExtensions.kt @@ -0,0 +1,32 @@ +package com.moez.QKSMS.util.extensions + +import android.database.Cursor +import io.reactivex.Flowable + +fun Cursor.forEach(closeOnComplete: Boolean = true, method: (Cursor) -> Unit = {}) { + moveToPosition(-1) + while (moveToNext()) { + method.invoke(this) + } + + if (closeOnComplete) { + close() + } +} + + +/** + * We're using this simple implementation with .range() because of the + * complexities of dealing with Backpressure with a Cursor. We can't simply + * use a loop and call onNext() from a generator because we'll need to close + * the cursor at the end, and if any items are still in the buffer, then + * they will be made invalid + */ +fun Cursor.asFlowable(): Flowable { + return Flowable.range(0, count) + .map { + moveToPosition(it) + this + } + .doOnComplete { close() } +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/util/extensions/ViewExtensions.kt b/qksms/src/main/java/com/moez/QKSMS/util/extensions/ViewExtensions.kt new file mode 100644 index 00000000..bf0ddb5b --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/util/extensions/ViewExtensions.kt @@ -0,0 +1,8 @@ +package com.moez.QKSMS.util.extensions + +import android.content.res.ColorStateList +import android.widget.ImageView + +fun ImageView.setTint(color: Int) { + imageTintList = ColorStateList.valueOf(color) +} \ No newline at end of file