diff --git a/qksms/src/main/java/com/moez/QKSMS/dagger/AppComponent.kt b/qksms/src/main/java/com/moez/QKSMS/dagger/AppComponent.kt index 026c16ed..bdf7dc7b 100644 --- a/qksms/src/main/java/com/moez/QKSMS/dagger/AppComponent.kt +++ b/qksms/src/main/java/com/moez/QKSMS/dagger/AppComponent.kt @@ -5,7 +5,9 @@ import com.moez.QKSMS.receiver.SmsReceiver import com.moez.QKSMS.ui.conversations.ConversationAdapter import com.moez.QKSMS.ui.conversations.ConversationListViewModel import com.moez.QKSMS.ui.messages.MessageAdapter +import com.moez.QKSMS.ui.messages.MessageListActivity import com.moez.QKSMS.ui.messages.MessageListViewModel +import com.moez.QKSMS.util.NotificationManager import dagger.Component import javax.inject.Singleton @@ -16,10 +18,14 @@ interface AppComponent { fun inject(receiver: SmsReceiver) fun inject(receiver: MessageSentReceiver) + fun inject(activity: MessageListActivity) + fun inject(viewModel: ConversationListViewModel) fun inject(viewModel: MessageListViewModel) fun inject(adapter: MessageAdapter) fun inject(adapter: ConversationAdapter) + fun inject(manager: NotificationManager) + } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/dagger/AppModule.kt b/qksms/src/main/java/com/moez/QKSMS/dagger/AppModule.kt index 6a11691e..9b6df6de 100644 --- a/qksms/src/main/java/com/moez/QKSMS/dagger/AppModule.kt +++ b/qksms/src/main/java/com/moez/QKSMS/dagger/AppModule.kt @@ -7,6 +7,7 @@ import com.moez.QKSMS.data.repository.MessageRepository import com.moez.QKSMS.data.sync.SyncManager import com.moez.QKSMS.util.DateFormatter import com.moez.QKSMS.util.NotificationManager +import com.moez.QKSMS.util.ThemeManager import dagger.Module import dagger.Provides import javax.inject.Singleton @@ -32,6 +33,12 @@ class AppModule(var application: Application) { return SyncManager(context, contacts) } + @Provides + @Singleton + fun provideThemeMaager(): ThemeManager { + return ThemeManager() + } + @Provides @Singleton fun provideNotificationHelper(context: Context, messageRepository: MessageRepository): NotificationManager { diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageAdapter.kt index 1b6b586e..68490578 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageAdapter.kt @@ -9,7 +9,9 @@ import com.moez.QKSMS.dagger.AppComponentManager import com.moez.QKSMS.data.model.Contact import com.moez.QKSMS.data.model.Message import com.moez.QKSMS.util.DateFormatter +import com.moez.QKSMS.util.ThemeManager import com.moez.QKSMS.util.extensions.dpToPx +import com.moez.QKSMS.util.extensions.setBackgroundTint import com.moez.QKSMS.util.extensions.setMargins import io.realm.OrderedRealmCollection import io.realm.RealmRecyclerViewAdapter @@ -27,6 +29,7 @@ class MessageAdapter(data: OrderedRealmCollection?) : RealmRecyclerView } @Inject lateinit var context: Context + @Inject lateinit var themeManager: ThemeManager @Inject lateinit var dateFormatter: DateFormatter init { @@ -34,12 +37,23 @@ class MessageAdapter(data: OrderedRealmCollection?) : RealmRecyclerView } override fun onCreateViewHolder(parent: ViewGroup?, viewType: Int): MessageViewHolder { - val layoutInflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater - val layoutRes = when (viewType) { - VIEWTYPE_IN -> R.layout.message_list_item_in - else -> R.layout.message_list_item_out + val layoutRes: Int + val bubbleColor: Int + when (viewType) { + VIEWTYPE_IN -> { + layoutRes = R.layout.message_list_item_in + bubbleColor = themeManager.bubbleColor + } + else -> { + layoutRes = R.layout.message_list_item_out + bubbleColor = themeManager.color + } } - return MessageViewHolder(layoutInflater.inflate(layoutRes, parent, false)) + + val layoutInflater = context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater + val viewHolder = MessageViewHolder(layoutInflater.inflate(layoutRes, parent, false)) + viewHolder.body.setBackgroundTint(bubbleColor) + return viewHolder } override fun onBindViewHolder(viewHolder: MessageViewHolder, position: Int) { diff --git a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListActivity.kt b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListActivity.kt index a297bc78..5e298dea 100644 --- a/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/ui/messages/MessageListActivity.kt @@ -8,20 +8,25 @@ import android.support.v7.widget.RecyclerView import com.jakewharton.rxbinding2.view.RxView import com.jakewharton.rxbinding2.widget.RxTextView import com.moez.QKSMS.R +import com.moez.QKSMS.dagger.AppComponentManager import com.moez.QKSMS.data.model.Message import com.moez.QKSMS.ui.base.QkActivity +import com.moez.QKSMS.util.ThemeManager import com.moez.QKSMS.util.extensions.setTint import io.realm.RealmResults import kotlinx.android.synthetic.main.message_list_activity.* +import javax.inject.Inject class MessageListActivity : QkActivity(), Observer { - private lateinit var viewModel: MessageListViewModel + @Inject lateinit var themeManager: ThemeManager + private lateinit var viewModel: MessageListViewModel private lateinit var layoutManager: LinearLayoutManager override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + AppComponentManager.appComponent.inject(this) setContentView(R.layout.message_list_activity) supportActionBar?.setDisplayHomeAsUpEnabled(true) @@ -29,6 +34,8 @@ class MessageListActivity : QkActivity(), Observer { viewModel.threadId = intent.getLongExtra("threadId", 0) viewModel.state.observe(this, this) + attach.setTint(themeManager.color) + layoutManager = LinearLayoutManager(this) layoutManager.stackFromEnd = true messageList.layoutManager = layoutManager @@ -45,7 +52,7 @@ class MessageListActivity : QkActivity(), Observer { if (message.text.toString() != state.draft) message.setText(state.draft) if (state.hasError) finish() - val color = if (state.canSend) R.color.colorPrimary else R.color.textTertiary + val color = if (state.canSend) themeManager.color else R.color.textTertiary send.setTint(resources.getColor(color)) send.isEnabled = state.canSend } diff --git a/qksms/src/main/java/com/moez/QKSMS/util/NotificationManager.kt b/qksms/src/main/java/com/moez/QKSMS/util/NotificationManager.kt index ab346091..0b9e5cdd 100644 --- a/qksms/src/main/java/com/moez/QKSMS/util/NotificationManager.kt +++ b/qksms/src/main/java/com/moez/QKSMS/util/NotificationManager.kt @@ -8,14 +8,20 @@ import android.os.Build import android.support.v4.app.NotificationCompat import android.support.v4.app.NotificationManagerCompat import com.moez.QKSMS.R +import com.moez.QKSMS.dagger.AppComponentManager import com.moez.QKSMS.data.repository.MessageRepository +import javax.inject.Inject class NotificationManager(val context: Context, val messageRepo: MessageRepository) { + @Inject lateinit var themeManager: ThemeManager + private val notificationManager = NotificationManagerCompat.from(context) init { + AppComponentManager.appComponent.inject(this) + if (Build.VERSION.SDK_INT >= 26) { val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager @@ -46,7 +52,7 @@ class NotificationManager(val context: Context, val messageRepo: MessageReposito } val notification = NotificationCompat.Builder(context, "channel_1") - .setColor(context.resources.getColor(R.color.colorPrimary)) + .setColor(themeManager.color) .setSmallIcon(R.mipmap.ic_launcher) .setStyle(style) diff --git a/qksms/src/main/java/com/moez/QKSMS/util/ThemeManager.kt b/qksms/src/main/java/com/moez/QKSMS/util/ThemeManager.kt new file mode 100644 index 00000000..682984d3 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/util/ThemeManager.kt @@ -0,0 +1,8 @@ +package com.moez.QKSMS.util + +class ThemeManager { + + val color = 0xFF0BAE9F.toInt() + val bubbleColor = 0xFFF4F4F4.toInt() + +} \ 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 index f5ef6b36..ba1eff79 100644 --- a/qksms/src/main/java/com/moez/QKSMS/util/extensions/ViewExtensions.kt +++ b/qksms/src/main/java/com/moez/QKSMS/util/extensions/ViewExtensions.kt @@ -9,6 +9,10 @@ fun ImageView.setTint(color: Int) { imageTintList = ColorStateList.valueOf(color) } +fun View.setBackgroundTint(color: Int) { + backgroundTintList = ColorStateList.valueOf(color) +} + fun View.setMargins(left: Int? = null, top: Int? = null, right: Int? = null, bottom: Int? = null) { val lp = layoutParams as? ViewGroup.MarginLayoutParams ?: return diff --git a/qksms/src/main/res/layout/message_list_activity.xml b/qksms/src/main/res/layout/message_list_activity.xml index 7a9f8d2b..6ee54535 100644 --- a/qksms/src/main/res/layout/message_list_activity.xml +++ b/qksms/src/main/res/layout/message_list_activity.xml @@ -31,8 +31,7 @@ android:layout_height="56dp" android:background="?selectableItemBackgroundBorderless" android:padding="16dp" - android:src="@drawable/ic_add_black_24dp" - android:tint="@color/colorPrimary" /> + android:src="@drawable/ic_add_black_24dp" /> @@ -57,8 +57,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="right" - android:textColor="@color/textTertiary" android:layout_marginRight="24dp" + android:textColor="@color/textTertiary" tools:text="Sending" /> \ No newline at end of file diff --git a/qksms/src/main/res/values-v23/styles.xml b/qksms/src/main/res/values-v23/styles.xml new file mode 100644 index 00000000..c74d9e55 --- /dev/null +++ b/qksms/src/main/res/values-v23/styles.xml @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/qksms/src/main/res/values/colors.xml b/qksms/src/main/res/values/colors.xml index 80942695..5ababeeb 100644 --- a/qksms/src/main/res/values/colors.xml +++ b/qksms/src/main/res/values/colors.xml @@ -1,9 +1,5 @@ - #0CB8A8 - #0AA596 - #FF4081 - #FFFFFF #49555F @@ -17,6 +13,7 @@ #F4F4F4 #f8f8f8 + #F1F1F1 #F2F2F2 diff --git a/qksms/src/main/res/values/styles.xml b/qksms/src/main/res/values/styles.xml index e91059fc..3efef4a0 100644 --- a/qksms/src/main/res/values/styles.xml +++ b/qksms/src/main/res/values/styles.xml @@ -1,11 +1,12 @@ -