Added icons to main settings (23d0ab78) · Commits · e / os / Mail

app/ui/src/main/java/com/fsck/k9/ui/settings/SettingsActionItem.kt

+8 −3

Original line number	Diff line number	Diff line
		@@ -3,13 +3,18 @@ package com.fsck.k9.ui.settings
		import com.fsck.k9.ui.R
		import com.xwray.groupie.kotlinandroidextensions.Item
		import com.xwray.groupie.kotlinandroidextensions.ViewHolder
		import kotlinx.android.synthetic.main.text_list_item.*
		import kotlinx.android.synthetic.main.text_icon_list_item.*
		import android.util.TypedValue

		internal class SettingsActionItem(val text: String, val action: SettingsAction) : Item() {
		internal class SettingsActionItem(val text: String, val action: SettingsAction, val icon: Int) : Item() {

		override fun getLayout(): Int = R.layout.text_list_item
		override fun getLayout(): Int = R.layout.text_icon_list_item

		override fun bind(viewHolder: ViewHolder, position: Int) {
		viewHolder.text.text = text

		val outValue = TypedValue()
		viewHolder.icon.context.theme.resolveAttribute(icon, outValue, true)
		viewHolder.icon.setImageResource(outValue.resourceId)
		}
		}

+12 −8

Original line number	Diff line number	Diff line
		@@ -58,8 +58,16 @@ class SettingsActivity : K9Activity() {
		private fun populateSettingsList(accounts: List<Account>) {
		settingsAdapter.clear()

		val miscSection = Section().apply {
		val item = SettingsActionItem(getString(R.string.about_action), SettingsAction.ABOUT_SCREEN, R.attr.iconSettingsAbout)
		add(item)
		}
		settingsAdapter.add(miscSection)

		val generalSection = Section().apply {
		add(SettingsActionItem(getString(R.string.general_settings_title), SettingsAction.GENERAL_SETTINGS))
		val item = SettingsActionItem(getString(R.string.general_settings_title),
		SettingsAction.GENERAL_SETTINGS, R.attr.iconSettingsGeneral)
		add(item)
		}
		settingsAdapter.add(generalSection)

		@@ -67,15 +75,11 @@ class SettingsActivity : K9Activity() {
		for (account in accounts) {
		add(AccountItem(account))
		}
		add(SettingsActionItem(getString(R.string.add_account_action), SettingsAction.ADD_ACCOUNT))
		val item = SettingsActionItem(getString(R.string.add_account_action), SettingsAction.ADD_ACCOUNT, R.attr.iconSettingsAccountAdd)
		add(item)
		}
		accountSection.setHeader(SettingsDividerItem(getString(R.string.accounts_title)))
		settingsAdapter.add(accountSection)

		//TODO: add header and/or divider
		val miscSection = Section().apply {
		add(SettingsActionItem(getString(R.string.about_action), SettingsAction.ABOUT_SCREEN))
		}
		settingsAdapter.add(miscSection)
		}

		override fun onOptionsItemSelected(item: MenuItem): Boolean {

0 → 100644

+14 −0

Original line number	Diff line number	Diff line
		package com.fsck.k9.ui.settings

		import com.fsck.k9.ui.R
		import com.xwray.groupie.kotlinandroidextensions.Item
		import com.xwray.groupie.kotlinandroidextensions.ViewHolder
		import kotlinx.android.synthetic.main.text_divider_list_item.*

		internal class SettingsDividerItem(val text: String) : Item() {
		override fun getLayout(): Int = R.layout.text_divider_list_item

		override fun bind(viewHolder: ViewHolder, position: Int) {
		viewHolder.text.text = text
		}
		}

0 → 100644

+7 −0

Original line number	Diff line number	Diff line
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:height="24dp"
		android:width="24dp"
		android:viewportWidth="24"
		android:viewportHeight="24">
		<path android:fillColor="#FFFFFFFF" android:pathData="M20,8L12,13L4,8V6L12,11L20,6M20,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V6C22,4.89 21.1,4 20,4Z" />
		</vector>

0 → 100644

+8 −0

Original line number	Diff line number	Diff line
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:alpha="0.54"
		android:height="24dp"
		android:width="24dp"
		android:viewportWidth="24"
		android:viewportHeight="24">
		<path android:fillColor="#FF000000" android:pathData="M20,8L12,13L4,8V6L12,11L20,6M20,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V6C22,4.89 21.1,4 20,4Z" />
		</vector>