From 0689cbbe58e53d6600ea60056b68027072d121ef Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 13 Dec 2017 19:48:50 -0500 Subject: [PATCH] Use FlexLayoutManager for themes --- .../presentation/settings/SettingsActivity.kt | 19 ++++++++++++++----- qksms/src/main/res/layout/theme_list_item.xml | 10 ++++++---- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsActivity.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsActivity.kt index a890a190..fe4b6ca7 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsActivity.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/settings/SettingsActivity.kt @@ -3,13 +3,15 @@ package com.moez.QKSMS.presentation.settings import android.app.AlertDialog import android.app.ProgressDialog import android.os.Bundle -import android.support.v7.widget.LinearLayoutManager import android.support.v7.widget.RecyclerView +import com.google.android.flexbox.FlexboxLayoutManager import com.jakewharton.rxbinding2.view.clicks import com.moez.QKSMS.R import com.moez.QKSMS.common.di.appComponent +import com.moez.QKSMS.common.util.extensions.dpToPx import com.moez.QKSMS.presentation.common.base.QkActivity import com.moez.QKSMS.presentation.common.widget.PreferenceView +import io.reactivex.Observable import io.reactivex.rxkotlin.plusAssign import io.reactivex.subjects.PublishSubject import io.reactivex.subjects.Subject @@ -20,10 +22,10 @@ class SettingsActivity : QkActivity(), SettingsView { override val viewModelClass = SettingsViewModel::class override val preferenceClickIntent: Subject = PublishSubject.create() - override val themeSelectedIntent by lazy { themeAdapter.colorSelected } + override val themeSelectedIntent: Observable by lazy { themeAdapter.colorSelected } + // TODO remove this private val progressDialog by lazy { - // TODO remove this ProgressDialog(this).apply { isIndeterminate = true setCancelable(false) @@ -41,14 +43,21 @@ class SettingsActivity : QkActivity(), SettingsView { private val themeRecyclerView by lazy { RecyclerView(this).apply { - layoutManager = LinearLayoutManager(this@SettingsActivity, LinearLayoutManager.HORIZONTAL, false) + val padding = 8.dpToPx(context) + setPadding(padding, padding, padding, padding) adapter = themeAdapter + clipToPadding = false + clipChildren = false + layoutManager = FlexboxLayoutManager(this@SettingsActivity) } } private val themeAdapter by lazy { ThemeAdapter(this@SettingsActivity).apply { - data = listOf(0xFF008389, 0xFF04CBC9, 0xFF00D99B, 0xFF00A3F3, 0xFFF8BBD0).map { it.toInt() } + data = listOf( + -0x1f0d0f, -0x4d2025, -0x7f343c, -0xb24954, + -0xd95966, -0xff6978, -0xff7685, -0xff8695, + -0xff96a4, -0xffb2c0) } } diff --git a/qksms/src/main/res/layout/theme_list_item.xml b/qksms/src/main/res/layout/theme_list_item.xml index 09f81d16..57a7c041 100644 --- a/qksms/src/main/res/layout/theme_list_item.xml +++ b/qksms/src/main/res/layout/theme_list_item.xml @@ -1,13 +1,15 @@ + android:layout_width="wrap_content" + android:layout_height="wrap_content">