From e048bcd5d557efa732fc7eec20e8f6272e98bdc3 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Wed, 17 Apr 2019 15:37:47 +0200
Subject: [PATCH] Reformatted sources
---
.../quasseldroid/dagger/ActivityModule.kt | 2 +-
.../service/QuasselNotificationBackend.kt | 1 -
.../chat/add/create/ChannelCreateFragment.kt | 8 +--
.../chat/buffers/BufferViewConfigFragment.kt | 68 +++++++++----------
.../ui/chat/input/AutoCompleteHelper.kt | 1 -
.../aliasitem/AliasItemFragment.kt | 1 -
.../aliaslist/AliasListFragment.kt | 1 -
.../network/NetworkBaseFragment.kt | 14 ++--
.../ui/info/core/CoreInfoFragment.kt | 2 +-
.../ui/info/user/UserInfoFragment.kt | 9 +--
.../ui/setup/ServiceBoundSlideFragment.kt | 2 -
.../kuschku/quasseldroid/util/ColorContext.kt | 1 -
.../util/ShortcutCreationHelper.kt | 1 -
app/src/main/res/drawable/bg_banner.xml | 5 ++
app/src/main/res/layout/widget_banner.xml | 3 +-
.../de/kuschku/libquassel/protocol/QTypes.kt | 1 +
.../kuschku/libquassel/protocol/SignedId.kt | 1 +
.../primitive/serializer/StringSerializer.kt | 1 +
.../quassel/syncables/IrcChannel.kt | 22 +++---
.../libquassel/quassel/syncables/IrcUser.kt | 1 +
.../quassel/syncables/RpcHandler.kt | 1 +
.../quassel/syncables/interfaces/INetwork.kt | 2 +
.../syncables/interfaces/ISyncableObject.kt | 1 +
.../de/kuschku/libquassel/session/ISession.kt | 1 +
.../util/compatibility/LoggingHandler.kt | 1 +
.../libquassel/util/helpers/MathHelper.kt | 1 +
.../kuschku/malheur/collectors/Collector.kt | 1 +
.../collectors/ConfigurationCollector.kt | 5 +-
.../de/kuschku/ui/color/MaterialColors.kt | 7 +-
.../ui/internal/CollapsingTextHelper.java | 4 +-
.../ui/shape/ShapeAppearancePathProvider.java | 1 +
.../de/kuschku/ui/spinner/CutoutDrawable.java | 5 +-
.../ui/spinner/MaterialSpinnerLayout.java | 1 -
.../res/color/md_design_box_stroke_color.xml | 11 ++-
.../src/main/res/color/md_design_error.xml | 7 +-
.../src/main/res/color/md_mtrl_error.xml | 7 +-
.../color/md_mtrl_filled_background_color.xml | 9 ++-
.../res/color/md_mtrl_filled_stroke_color.xml | 11 ++-
.../color/md_mtrl_indicator_text_color.xml | 7 +-
.../color/md_mtrl_outlined_stroke_color.xml | 11 ++-
.../src/main/res/values/color_attrs.xml | 39 ++++++-----
.../src/main/res/values/internal_attrs.xml | 23 +++----
.../src/main/res/values/internal_dimens.xml | 3 +-
.../src/main/res/values/shape_attrs.xml | 43 ++++++------
.../src/main/res/values/shape_dimens.xml | 3 +-
.../src/main/res/values/spinner_attrs.xml | 57 ++++++++--------
.../src/main/res/values/spinner_colors.xml | 3 +-
.../src/main/res/values/spinner_dimens.xml | 3 +-
.../src/main/res/values/spinner_ids.xml | 9 ++-
.../src/main/res/values/typography_attrs.xml | 29 ++++----
.../util/helper/LiveDataHelper.kt | 1 +
.../util/helper/ObservableHelper.kt | 1 +
.../quasseldroid/viewmodel/ChatViewModel.kt | 3 +-
53 files changed, 222 insertions(+), 234 deletions(-)
create mode 100644 app/src/main/res/drawable/bg_banner.xml
diff --git a/app/src/main/java/de/kuschku/quasseldroid/dagger/ActivityModule.kt b/app/src/main/java/de/kuschku/quasseldroid/dagger/ActivityModule.kt
index 5a0572b9b..769b951bf 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/dagger/ActivityModule.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/dagger/ActivityModule.kt
@@ -32,6 +32,7 @@ import de.kuschku.quasseldroid.ui.chat.add.join.ChannelJoinActivity
import de.kuschku.quasseldroid.ui.chat.add.join.ChannelJoinFragmentProvider
import de.kuschku.quasseldroid.ui.chat.add.query.QueryCreateActivity
import de.kuschku.quasseldroid.ui.chat.add.query.QueryCreateFragmentProvider
+import de.kuschku.quasseldroid.ui.chat.topic.TopicActivity
import de.kuschku.quasseldroid.ui.chat.topic.TopicFragmentProvider
import de.kuschku.quasseldroid.ui.clientsettings.about.AboutActivity
import de.kuschku.quasseldroid.ui.clientsettings.about.AboutFragmentProvider
@@ -83,7 +84,6 @@ import de.kuschku.quasseldroid.ui.info.channellist.ChannelListActivity
import de.kuschku.quasseldroid.ui.info.channellist.ChannelListFragmentProvider
import de.kuschku.quasseldroid.ui.info.core.CoreInfoActivity
import de.kuschku.quasseldroid.ui.info.core.CoreInfoFragmentProvider
-import de.kuschku.quasseldroid.ui.chat.topic.TopicActivity
import de.kuschku.quasseldroid.ui.info.user.UserInfoActivity
import de.kuschku.quasseldroid.ui.info.user.UserInfoFragmentProvider
import de.kuschku.quasseldroid.ui.setup.accounts.edit.AccountEditActivity
diff --git a/app/src/main/java/de/kuschku/quasseldroid/service/QuasselNotificationBackend.kt b/app/src/main/java/de/kuschku/quasseldroid/service/QuasselNotificationBackend.kt
index 9f35585b1..dba7e5d4f 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/service/QuasselNotificationBackend.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/service/QuasselNotificationBackend.kt
@@ -55,7 +55,6 @@ import de.kuschku.quasseldroid.util.helper.loadWithFallbacks
import de.kuschku.quasseldroid.util.helper.styledAttributes
import de.kuschku.quasseldroid.util.irc.format.ContentFormatter
import de.kuschku.quasseldroid.util.ui.drawable.TextDrawable
-import de.kuschku.quasseldroid.viewmodel.EditorViewModel
import de.kuschku.quasseldroid.viewmodel.helper.EditorViewModelHelper.Companion.IGNORED_CHARS
import org.threeten.bp.Instant
import java.util.concurrent.Executors
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/add/create/ChannelCreateFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/add/create/ChannelCreateFragment.kt
index 4de526216..b07ef1f86 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/add/create/ChannelCreateFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/add/create/ChannelCreateFragment.kt
@@ -134,7 +134,7 @@ class ChannelCreateFragment : ServiceBoundSettingsFragment() {
activity?.let {
it.finish()
ChatActivity.launch(it,
- bufferId = existingBuffer.bufferId
+ bufferId = existingBuffer.bufferId
)
}
} else {
@@ -146,7 +146,7 @@ class ChannelCreateFragment : ServiceBoundSettingsFragment() {
sendInput(statusBuffer, "/join $channelName")
modelHelper.networks.switchMap {
it[networkId]?.liveIrcChannel(channelName)
- ?: Observable.empty()
+ ?: Observable.empty()
}.subscribe {
if (it.ircUsers().size <= 1) {
if (isInviteOnly) {
@@ -165,8 +165,8 @@ class ChannelCreateFragment : ServiceBoundSettingsFragment() {
activity?.let {
it.finish()
ChatActivity.launch(it,
- networkId = networkId,
- channel = channelName
+ networkId = networkId,
+ channel = channelName
)
}
}
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferViewConfigFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferViewConfigFragment.kt
index 7d48ca42d..7292f2878 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferViewConfigFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/buffers/BufferViewConfigFragment.kt
@@ -141,34 +141,34 @@ class BufferViewConfigFragment : ServiceBoundFragment() {
actionMode?.finish()
true
}
- R.id.action_configure -> {
+ R.id.action_configure -> {
network?.let {
NetworkEditActivity.launch(requireContext(), network = it.networkId())
}
actionMode?.finish()
true
}
- R.id.action_connect -> {
+ R.id.action_connect -> {
network?.requestConnect()
actionMode?.finish()
true
}
- R.id.action_disconnect -> {
+ R.id.action_disconnect -> {
network?.requestDisconnect()
actionMode?.finish()
true
}
- R.id.action_join -> {
+ R.id.action_join -> {
session.rpcHandler.sendInput(info, "/join ${info.bufferName}")
actionMode?.finish()
true
}
- R.id.action_part -> {
+ R.id.action_part -> {
session.rpcHandler.sendInput(info, "/part ${info.bufferName}")
actionMode?.finish()
true
}
- R.id.action_delete -> {
+ R.id.action_delete -> {
MaterialDialog.Builder(activity!!)
.content(R.string.buffer_delete_confirmation)
.positiveText(R.string.label_yes)
@@ -188,7 +188,7 @@ class BufferViewConfigFragment : ServiceBoundFragment() {
.show()
true
}
- R.id.action_rename -> {
+ R.id.action_rename -> {
MaterialDialog.Builder(activity!!)
.input(
getString(R.string.label_buffer_name),
@@ -211,24 +211,24 @@ class BufferViewConfigFragment : ServiceBoundFragment() {
.show()
true
}
- R.id.action_unhide -> {
+ R.id.action_unhide -> {
bufferSyncer?.let {
bufferViewConfig?.orNull()?.insertBufferSorted(info, bufferSyncer)
}
actionMode?.finish()
true
}
- R.id.action_hide_temp -> {
+ R.id.action_hide_temp -> {
bufferViewConfig?.orNull()?.requestRemoveBuffer(info.bufferId)
actionMode?.finish()
true
}
- R.id.action_hide_perm -> {
+ R.id.action_hide_perm -> {
bufferViewConfig?.orNull()?.requestRemoveBufferPermanently(info.bufferId)
actionMode?.finish()
true
}
- else -> false
+ else -> false
}
} else {
false
@@ -347,8 +347,8 @@ class BufferViewConfigFragment : ServiceBoundFragment() {
props.network.networkName
}).map { props ->
val activity = props.activity - (activities[props.info.bufferId]
- ?: defaultFiltered?.toUInt()
- ?: 0u)
+ ?: defaultFiltered?.toUInt()
+ ?: 0u)
BufferListItem(
props.copy(
activity = activity,
@@ -358,22 +358,22 @@ class BufferViewConfigFragment : ServiceBoundFragment() {
),
bufferActivity = Buffer_Activity.of(
when {
- props.highlights > 0 -> Buffer_Activity.Highlight
+ props.highlights > 0 -> Buffer_Activity.Highlight
activity.hasFlag(Message_Type.Plain) ||
- activity.hasFlag(Message_Type.Notice) ||
- activity.hasFlag(Message_Type.Action) -> Buffer_Activity.NewMessage
- activity.isNotEmpty() -> Buffer_Activity.OtherActivity
- else -> Buffer_Activity.NoActivity
+ activity.hasFlag(Message_Type.Notice) ||
+ activity.hasFlag(Message_Type.Action) -> Buffer_Activity.NewMessage
+ activity.isNotEmpty() -> Buffer_Activity.OtherActivity
+ else -> Buffer_Activity.NoActivity
}
),
fallbackDrawable = if (props.info.type.hasFlag(Buffer_Type.QueryBuffer)) {
props.ircUser?.let {
val nickName = it.nick()
val useSelfColor = when (messageSettings.colorizeNicknames) {
- MessageSettings.ColorizeNicknamesMode.ALL -> false
+ MessageSettings.ColorizeNicknamesMode.ALL -> false
MessageSettings.ColorizeNicknamesMode.ALL_BUT_MINE ->
props.ircUser?.network()?.isMyNick(nickName) == true
- MessageSettings.ColorizeNicknamesMode.NONE -> true
+ MessageSettings.ColorizeNicknamesMode.NONE -> true
}
colorContext.buildTextDrawable(it.nick(), useSelfColor)
@@ -390,14 +390,14 @@ class BufferViewConfigFragment : ServiceBoundFragment() {
),
BufferState(
networkExpanded = expandedNetworks[props.network.networkId]
- ?: (props.networkConnectionState == INetwork.ConnectionState.Initialized),
+ ?: (props.networkConnectionState == INetwork.ConnectionState.Initialized),
selected = selected.info?.bufferId == props.info.bufferId
)
)
}.filter { (props, state) ->
(props.info.type.hasFlag(BufferInfo.Type.StatusBuffer) || state.networkExpanded) &&
- (minimumActivity.toInt() <= props.bufferActivity.toInt() ||
- props.info.type.hasFlag(Buffer_Type.StatusBuffer))
+ (minimumActivity.toInt() <= props.bufferActivity.toInt() ||
+ props.info.type.hasFlag(Buffer_Type.StatusBuffer))
}.toList()
activity?.runOnUiThread {
@@ -429,7 +429,7 @@ class BufferViewConfigFragment : ServiceBoundFragment() {
)
val visibilityActions = when (buffer.hiddenState) {
- BufferHiddenState.VISIBLE -> setOf(
+ BufferHiddenState.VISIBLE -> setOf(
R.id.action_hide_temp,
R.id.action_hide_perm
)
@@ -444,15 +444,15 @@ class BufferViewConfigFragment : ServiceBoundFragment() {
}
val availableActions = when (buffer.info?.type?.enabledValues()?.firstOrNull()) {
- Buffer_Type.StatusBuffer -> {
+ Buffer_Type.StatusBuffer -> {
when (buffer.connectionState) {
INetwork.ConnectionState.Disconnected -> setOf(
R.id.action_configure, R.id.action_connect
)
- INetwork.ConnectionState.Initialized -> setOf(
+ INetwork.ConnectionState.Initialized -> setOf(
R.id.action_channellist, R.id.action_configure, R.id.action_disconnect
)
- else -> setOf(
+ else -> setOf(
R.id.action_configure, R.id.action_connect, R.id.action_disconnect
)
}
@@ -464,10 +464,10 @@ class BufferViewConfigFragment : ServiceBoundFragment() {
setOf(R.id.action_join, R.id.action_delete)
} + visibilityActions
}
- Buffer_Type.QueryBuffer -> {
+ Buffer_Type.QueryBuffer -> {
setOf(R.id.action_delete, R.id.action_rename) + visibilityActions
}
- else -> visibilityActions
+ else -> visibilityActions
}
val unavailableActions = allActions - availableActions
@@ -488,7 +488,7 @@ class BufferViewConfigFragment : ServiceBoundFragment() {
chatListToolbar.menu.findItem(R.id.action_search).isChecked = modelHelper.chat.bufferSearchTemporarilyVisible.value
chatListToolbar.setOnMenuItemClickListener { item ->
when (item.itemId) {
- R.id.action_search -> {
+ R.id.action_search -> {
item.isChecked = !item.isChecked
modelHelper.chat.bufferSearchTemporarilyVisible.onNext(item.isChecked)
true
@@ -498,7 +498,7 @@ class BufferViewConfigFragment : ServiceBoundFragment() {
modelHelper.chat.showHidden.onNext(item.isChecked)
true
}
- else -> false
+ else -> false
}
}
chatList.layoutManager = object : LinearLayoutManager(context) {
@@ -598,12 +598,12 @@ class BufferViewConfigFragment : ServiceBoundFragment() {
fab.setOnActionSelectedListener {
when (it.id) {
- R.id.fab_query -> {
+ R.id.fab_query -> {
context?.let(QueryCreateActivity.Companion::launch)
fab.close(false)
true
}
- R.id.fab_join -> {
+ R.id.fab_join -> {
context?.let(ChannelJoinActivity.Companion::launch)
fab.close(false)
true
@@ -613,7 +613,7 @@ class BufferViewConfigFragment : ServiceBoundFragment() {
fab.close(false)
true
}
- else -> false
+ else -> false
}
}
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/AutoCompleteHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/AutoCompleteHelper.kt
index 1d139eadf..6d2853800 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/AutoCompleteHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/input/AutoCompleteHelper.kt
@@ -44,7 +44,6 @@ import de.kuschku.quasseldroid.util.avatars.AvatarHelper
import de.kuschku.quasseldroid.util.helper.styledAttributes
import de.kuschku.quasseldroid.util.helper.toLiveData
import de.kuschku.quasseldroid.util.irc.format.IrcFormatDeserializer
-import de.kuschku.quasseldroid.viewmodel.EditorViewModel
import de.kuschku.quasseldroid.viewmodel.data.AutoCompleteItem
import de.kuschku.quasseldroid.viewmodel.data.BufferStatus
import de.kuschku.quasseldroid.viewmodel.helper.EditorViewModelHelper
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliasitem/AliasItemFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliasitem/AliasItemFragment.kt
index bb55abfda..8d3b2d1c6 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliasitem/AliasItemFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliasitem/AliasItemFragment.kt
@@ -43,7 +43,6 @@ import de.kuschku.quasseldroid.util.irc.format.IrcFormatSerializer
import de.kuschku.quasseldroid.util.ui.settings.fragment.Changeable
import de.kuschku.quasseldroid.util.ui.settings.fragment.Savable
import de.kuschku.quasseldroid.util.ui.settings.fragment.ServiceBoundSettingsFragment
-import de.kuschku.quasseldroid.viewmodel.EditorViewModel
import de.kuschku.quasseldroid.viewmodel.helper.EditorViewModelHelper
import javax.inject.Inject
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliaslist/AliasListFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliaslist/AliasListFragment.kt
index 1ea45ff8d..7d4ff8de6 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliaslist/AliasListFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/aliaslist/AliasListFragment.kt
@@ -39,7 +39,6 @@ import de.kuschku.quasseldroid.util.helper.toLiveData
import de.kuschku.quasseldroid.util.ui.settings.fragment.Changeable
import de.kuschku.quasseldroid.util.ui.settings.fragment.Savable
import de.kuschku.quasseldroid.util.ui.settings.fragment.ServiceBoundSettingsFragment
-import de.kuschku.quasseldroid.viewmodel.helper.EditorViewModelHelper
import de.kuschku.quasseldroid.viewmodel.helper.QuasselViewModelHelper
import javax.inject.Inject
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkBaseFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkBaseFragment.kt
index 3bbf7e6a6..921fc5397 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkBaseFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkBaseFragment.kt
@@ -333,9 +333,9 @@ abstract class NetworkBaseFragment(private val initDefault: Boolean) :
data.setUseAutoReconnect(autoreconnectEnabled.isChecked)
data.setAutoReconnectInterval(autoreconnectInterval.text.toString().toUIntOrNull()
- ?: data.autoReconnectInterval())
+ ?: data.autoReconnectInterval())
data.setAutoReconnectRetries(autoreconnectRetries.text.toString().toUShortOrNull()
- ?: data.autoReconnectRetries())
+ ?: data.autoReconnectRetries())
data.setUnlimitedReconnectRetries(autoreconnectUnlimited.isChecked)
data.setPerform(perform.text.lines())
@@ -343,13 +343,13 @@ abstract class NetworkBaseFragment(private val initDefault: Boolean) :
data.setUseCustomMessageRate(customratelimitsEnabled.isChecked)
data.setMessageRateBurstSize(customratelimitsBurstSize.text.toString().toUIntOrNull()
- ?: data.messageRateBurstSize())
+ ?: data.messageRateBurstSize())
data.setUnlimitedMessageRate(customratelimitsUnlimited.isChecked)
data.setMessageRateDelay(customratelimitsDelay.toString().toFloatOrNull()
- ?.let { (it * 1000).roundToInt() }
- ?.nullIf { it < 0 }
- ?.toUInt()
- ?: data.messageRateDelay())
+ ?.let { (it * 1000).roundToInt() }
+ ?.nullIf { it < 0 }
+ ?.toUInt()
+ ?: data.messageRateDelay())
}
companion object {
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/info/core/CoreInfoFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/info/core/CoreInfoFragment.kt
index 94f3185b2..c1a471845 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/info/core/CoreInfoFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/info/core/CoreInfoFragment.kt
@@ -134,7 +134,7 @@ class CoreInfoFragment : ServiceBoundFragment() {
uptime.text = requireContext().getString(R.string.label_core_online_since,
startTime.toString())
uptimeContainer.visibleIf(startTime != null)
- })
+ })
missingFeatures.setOnClickListener {
MissingFeaturesDialog.Builder(requireActivity())
.missingFeatures(missingFeatureList)
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/info/user/UserInfoFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/info/user/UserInfoFragment.kt
index 91a7a4070..6bb05c0a9 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/info/user/UserInfoFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/info/user/UserInfoFragment.kt
@@ -179,7 +179,8 @@ class UserInfoFragment : ServiceBoundFragment() {
getColor(0, 0)
}
- combineLatest(modelHelper.session, modelHelper.networks).switchMap { (sessionOptional, networks) ->
+ combineLatest(modelHelper.session,
+ modelHelper.networks).switchMap { (sessionOptional, networks) ->
fun processUser(user: IrcUser, bufferSyncer: BufferSyncer? = null, info: BufferInfo? = null,
ignoreItems: List<IgnoreListManager.IgnoreListItem>? = null): Observable<Optional<IrcUserInfo>> {
actionShortcut.post(::updateShortcutVisibility)
@@ -405,7 +406,7 @@ class UserInfoFragment : ServiceBoundFragment() {
ignoreMenu = null
true
}
- it.itemId == R.id.action_show -> {
+ it.itemId == R.id.action_show -> {
IgnoreListActivity.launch(
view.context
)
@@ -413,11 +414,11 @@ class UserInfoFragment : ServiceBoundFragment() {
ignoreMenu = null
true
}
- it.isCheckable -> {
+ it.isCheckable -> {
modelHelper.ignoreListManager.value?.orNull()?.requestToggleIgnoreRule(it.title.toString())
true
}
- else -> false
+ else -> false
}
}
menu.setOnDismissListener {
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/ServiceBoundSlideFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/ServiceBoundSlideFragment.kt
index 6c6874e72..6d065af8e 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/setup/ServiceBoundSlideFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/setup/ServiceBoundSlideFragment.kt
@@ -25,9 +25,7 @@ import de.kuschku.libquassel.session.Backend
import de.kuschku.libquassel.util.Optional
import de.kuschku.quasseldroid.Keys
import de.kuschku.quasseldroid.util.service.BackendServiceConnection
-import de.kuschku.quasseldroid.viewmodel.QuasselViewModel
import io.reactivex.subjects.BehaviorSubject
-import javax.inject.Inject
abstract class ServiceBoundSlideFragment : SlideFragment() {
private val connection = BackendServiceConnection()
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/ColorContext.kt b/app/src/main/java/de/kuschku/quasseldroid/util/ColorContext.kt
index 098682f52..17e53bd83 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/ColorContext.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/ColorContext.kt
@@ -27,7 +27,6 @@ import de.kuschku.quasseldroid.R
import de.kuschku.quasseldroid.settings.MessageSettings
import de.kuschku.quasseldroid.util.helper.styledAttributes
import de.kuschku.quasseldroid.util.ui.drawable.TextDrawable
-import de.kuschku.quasseldroid.viewmodel.EditorViewModel
import de.kuschku.quasseldroid.viewmodel.helper.EditorViewModelHelper.Companion.IGNORED_CHARS
import javax.inject.Inject
diff --git a/app/src/main/java/de/kuschku/quasseldroid/util/ShortcutCreationHelper.kt b/app/src/main/java/de/kuschku/quasseldroid/util/ShortcutCreationHelper.kt
index 742e1d141..c02d57474 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/util/ShortcutCreationHelper.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/util/ShortcutCreationHelper.kt
@@ -41,7 +41,6 @@ import de.kuschku.quasseldroid.ui.chat.ChatActivity
import de.kuschku.quasseldroid.util.avatars.AvatarHelper
import de.kuschku.quasseldroid.util.helper.loadWithFallbacks
import de.kuschku.quasseldroid.util.helper.styledAttributes
-import de.kuschku.quasseldroid.viewmodel.EditorViewModel
import de.kuschku.quasseldroid.viewmodel.helper.EditorViewModelHelper.Companion.IGNORED_CHARS
object ShortcutCreationHelper {
diff --git a/app/src/main/res/drawable/bg_banner.xml b/app/src/main/res/drawable/bg_banner.xml
new file mode 100644
index 000000000..c4ef68b1e
--- /dev/null
+++ b/app/src/main/res/drawable/bg_banner.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="?colorBackgroundSnackbar" />
+ <item android:drawable="?selectableItemBackground" />
+</layer-list>
diff --git a/app/src/main/res/layout/widget_banner.xml b/app/src/main/res/layout/widget_banner.xml
index 920ad35b0..dd024f255 100644
--- a/app/src/main/res/layout/widget_banner.xml
+++ b/app/src/main/res/layout/widget_banner.xml
@@ -22,11 +22,10 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="?colorBackgroundSnackbar"
+ android:background="@drawable/bg_banner"
android:baselineAligned="false"
android:clipToPadding="false"
android:focusable="true"
- android:foreground="?selectableItemBackground"
android:orientation="vertical"
android:paddingStart="?android:attr/listPreferredItemPaddingLeft"
android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/QTypes.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/QTypes.kt
index ed4e1012c..6dc8b5585 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/QTypes.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/QTypes.kt
@@ -17,6 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@file:Suppress("NOTHING_TO_INLINE")
+
package de.kuschku.libquassel.protocol
import de.kuschku.libquassel.protocol.primitive.serializer.StringSerializer
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/SignedId.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/SignedId.kt
index 861466bd4..30cb16334 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/SignedId.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/SignedId.kt
@@ -17,6 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@file:Suppress("NOTHING_TO_INLINE")
+
package de.kuschku.libquassel.protocol
import java.io.Serializable
diff --git a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/StringSerializer.kt b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/StringSerializer.kt
index 86334a1ea..3c61e8d6b 100644
--- a/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/StringSerializer.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/protocol/primitive/serializer/StringSerializer.kt
@@ -17,6 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@file:Suppress("NOTHING_TO_INLINE")
+
package de.kuschku.libquassel.protocol.primitive.serializer
import de.kuschku.libquassel.quassel.QuasselFeatures
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/IrcChannel.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/IrcChannel.kt
index ce3b5b66c..7b9d44b01 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/IrcChannel.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/IrcChannel.kt
@@ -170,7 +170,7 @@ class IrcChannel(
_C_channelModes.contains(mode)
INetwork.ChannelModeType.D_CHANMODE ->
_D_channelModes.contains(mode)
- else ->
+ else ->
false
}
@@ -179,14 +179,14 @@ class IrcChannel(
_B_channelModes.getOr(mode, "")
INetwork.ChannelModeType.C_CHANMODE ->
_C_channelModes.getOr(mode, "")
- else ->
+ else ->
""
}
fun modeValueList(mode: Char): Set<String> = when (network().channelModeType(mode)) {
INetwork.ChannelModeType.A_CHANMODE ->
_A_channelModes.getOrElse(mode, ::emptySet)
- else ->
+ else ->
emptySet()
}
@@ -356,13 +356,13 @@ class IrcChannel(
override fun addChannelMode(mode: Char, value: String?) {
when (network().channelModeType(mode)) {
- INetwork.ChannelModeType.A_CHANMODE ->
+ INetwork.ChannelModeType.A_CHANMODE ->
_A_channelModes.getOrPut(mode, ::mutableSetOf).add(value!!)
- INetwork.ChannelModeType.B_CHANMODE ->
+ INetwork.ChannelModeType.B_CHANMODE ->
_B_channelModes[mode] = value!!
- INetwork.ChannelModeType.C_CHANMODE ->
+ INetwork.ChannelModeType.C_CHANMODE ->
_C_channelModes[mode] = value!!
- INetwork.ChannelModeType.D_CHANMODE ->
+ INetwork.ChannelModeType.D_CHANMODE ->
_D_channelModes.add(mode)
INetwork.ChannelModeType.NOT_A_CHANMODE ->
throw IllegalArgumentException("Received invalid channel mode: $mode $value")
@@ -371,13 +371,13 @@ class IrcChannel(
override fun removeChannelMode(mode: Char, value: String?) {
when (network().channelModeType(mode)) {
- INetwork.ChannelModeType.A_CHANMODE ->
+ INetwork.ChannelModeType.A_CHANMODE ->
_A_channelModes.getOrPut(mode, ::mutableSetOf).remove(value)
- INetwork.ChannelModeType.B_CHANMODE ->
+ INetwork.ChannelModeType.B_CHANMODE ->
_B_channelModes.remove(mode)
- INetwork.ChannelModeType.C_CHANMODE ->
+ INetwork.ChannelModeType.C_CHANMODE ->
_C_channelModes.remove(mode)
- INetwork.ChannelModeType.D_CHANMODE ->
+ INetwork.ChannelModeType.D_CHANMODE ->
_D_channelModes.remove(mode)
INetwork.ChannelModeType.NOT_A_CHANMODE ->
throw IllegalArgumentException("Received invalid channel mode: $mode $value")
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/IrcUser.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/IrcUser.kt
index cc1eb058a..f1f7a68d4 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/IrcUser.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/IrcUser.kt
@@ -17,6 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@file:Suppress("NOTHING_TO_INLINE")
+
package de.kuschku.libquassel.quassel.syncables
import de.kuschku.libquassel.protocol.*
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/RpcHandler.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/RpcHandler.kt
index 02baf36bc..524a0f263 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/RpcHandler.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/RpcHandler.kt
@@ -17,6 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@file:Suppress("NOTHING_TO_INLINE")
+
package de.kuschku.libquassel.quassel.syncables
import de.kuschku.libquassel.protocol.*
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/INetwork.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/INetwork.kt
index dd091bbd1..ead6bc2cd 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/INetwork.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/INetwork.kt
@@ -116,6 +116,7 @@ interface INetwork : ISyncableObject {
@Slot
fun setConnectionState(state: Int) = setConnectionState(ConnectionState.of(state))
+
fun setConnectionState(state: ConnectionState)
@Slot
@@ -160,6 +161,7 @@ interface INetwork : ISyncableObject {
it.valueOrThrow<QVariantMap>()
}.map(Server.Companion::fromVariantMap))
}
+
fun setActualServerList(serverList: List<INetwork.Server>)
@Slot
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/ISyncableObject.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/ISyncableObject.kt
index 2520d4634..6a9d831f0 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/ISyncableObject.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/ISyncableObject.kt
@@ -17,6 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@file:Suppress("NOTHING_TO_INLINE")
+
package de.kuschku.libquassel.quassel.syncables.interfaces
import de.kuschku.libquassel.protocol.ARG
diff --git a/lib/src/main/java/de/kuschku/libquassel/session/ISession.kt b/lib/src/main/java/de/kuschku/libquassel/session/ISession.kt
index 1fda5229c..84fd10247 100644
--- a/lib/src/main/java/de/kuschku/libquassel/session/ISession.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/session/ISession.kt
@@ -70,6 +70,7 @@ interface ISession : Closeable {
fun setupCore(setupData: HandshakeMessage.CoreSetupData) {
proxy.dispatch(setupData)
}
+
fun disconnectFromCore()
fun addNetwork(networkId: NetworkId)
fun removeNetwork(networkId: NetworkId)
diff --git a/lib/src/main/java/de/kuschku/libquassel/util/compatibility/LoggingHandler.kt b/lib/src/main/java/de/kuschku/libquassel/util/compatibility/LoggingHandler.kt
index 11a8228d8..806e4d76d 100644
--- a/lib/src/main/java/de/kuschku/libquassel/util/compatibility/LoggingHandler.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/util/compatibility/LoggingHandler.kt
@@ -17,6 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@file:Suppress("NOTHING_TO_INLINE")
+
package de.kuschku.libquassel.util.compatibility
import de.kuschku.libquassel.util.compatibility.reference.JavaLoggingHandler
diff --git a/lib/src/main/java/de/kuschku/libquassel/util/helpers/MathHelper.kt b/lib/src/main/java/de/kuschku/libquassel/util/helpers/MathHelper.kt
index 7abbf85c6..be6b40224 100644
--- a/lib/src/main/java/de/kuschku/libquassel/util/helpers/MathHelper.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/util/helpers/MathHelper.kt
@@ -17,6 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@file:Suppress("NOTHING_TO_INLINE")
+
package de.kuschku.libquassel.util.helpers
inline fun clampOf(value: Int, lowerBound: Int, upperBound: Int): Int =
diff --git a/malheur/src/main/java/de/kuschku/malheur/collectors/Collector.kt b/malheur/src/main/java/de/kuschku/malheur/collectors/Collector.kt
index b71347d88..1be839b58 100644
--- a/malheur/src/main/java/de/kuschku/malheur/collectors/Collector.kt
+++ b/malheur/src/main/java/de/kuschku/malheur/collectors/Collector.kt
@@ -17,6 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@file:Suppress("NOTHING_TO_INLINE")
+
package de.kuschku.malheur.collectors
import de.kuschku.malheur.CrashContext
diff --git a/malheur/src/main/java/de/kuschku/malheur/collectors/ConfigurationCollector.kt b/malheur/src/main/java/de/kuschku/malheur/collectors/ConfigurationCollector.kt
index b0c22147d..24c560ea2 100644
--- a/malheur/src/main/java/de/kuschku/malheur/collectors/ConfigurationCollector.kt
+++ b/malheur/src/main/java/de/kuschku/malheur/collectors/ConfigurationCollector.kt
@@ -86,8 +86,9 @@ class ConfigurationCollector(private val application: Application) :
}
}
- override fun collect(context: CrashContext, config: Boolean) = configurationFields.mapNotNull { info ->
- val field : Field? = Configuration::class.java.getDeclaredField(info.fieldName)
+ override fun collect(context: CrashContext,
+ config: Boolean) = configurationFields.mapNotNull { info ->
+ val field: Field? = Configuration::class.java.getDeclaredField(info.fieldName)
field?.let {
Pair(info, it)
}
diff --git a/ui_spinner/src/main/java/de/kuschku/ui/color/MaterialColors.kt b/ui_spinner/src/main/java/de/kuschku/ui/color/MaterialColors.kt
index cfeeabbd6..d8f3e8f5a 100644
--- a/ui_spinner/src/main/java/de/kuschku/ui/color/MaterialColors.kt
+++ b/ui_spinner/src/main/java/de/kuschku/ui/color/MaterialColors.kt
@@ -16,16 +16,11 @@
package de.kuschku.ui.color
import android.content.Context
-import android.graphics.Color
-import android.util.TypedValue
import android.view.View
-
-import de.kuschku.ui.resources.MaterialAttributes
-
import androidx.annotation.AttrRes
import androidx.annotation.ColorInt
-import androidx.annotation.FloatRange
import androidx.core.graphics.ColorUtils
+import de.kuschku.ui.resources.MaterialAttributes
/**
* A utility class for common color variants used in Material themes.
diff --git a/ui_spinner/src/main/java/de/kuschku/ui/internal/CollapsingTextHelper.java b/ui_spinner/src/main/java/de/kuschku/ui/internal/CollapsingTextHelper.java
index 5396abea6..d8e06282e 100644
--- a/ui_spinner/src/main/java/de/kuschku/ui/internal/CollapsingTextHelper.java
+++ b/ui_spinner/src/main/java/de/kuschku/ui/internal/CollapsingTextHelper.java
@@ -30,14 +30,12 @@ import android.text.TextUtils;
import android.view.Gravity;
import android.view.View;
-import de.kuschku.ui.resources.MaterialResources;
-
import androidx.annotation.ColorInt;
import androidx.annotation.Nullable;
-import androidx.core.math.MathUtils;
import androidx.core.text.TextDirectionHeuristicsCompat;
import androidx.core.view.GravityCompat;
import androidx.core.view.ViewCompat;
+import de.kuschku.ui.resources.MaterialResources;
import de.kuschku.ui.spinner.R;
/**
diff --git a/ui_spinner/src/main/java/de/kuschku/ui/shape/ShapeAppearancePathProvider.java b/ui_spinner/src/main/java/de/kuschku/ui/shape/ShapeAppearancePathProvider.java
index 5154bc820..3574c24b2 100644
--- a/ui_spinner/src/main/java/de/kuschku/ui/shape/ShapeAppearancePathProvider.java
+++ b/ui_spinner/src/main/java/de/kuschku/ui/shape/ShapeAppearancePathProvider.java
@@ -40,6 +40,7 @@ class ShapeAppearancePathProvider {
private final ShapePath shapePath = new ShapePath();
private final float[] scratch = new float[2];
private final float[] scratch2 = new float[2];
+
public ShapeAppearancePathProvider() {
for (int i = 0; i < 4; i++) {
cornerPaths[i] = new ShapePath();
diff --git a/ui_spinner/src/main/java/de/kuschku/ui/spinner/CutoutDrawable.java b/ui_spinner/src/main/java/de/kuschku/ui/spinner/CutoutDrawable.java
index 821e33868..db107f2e5 100644
--- a/ui_spinner/src/main/java/de/kuschku/ui/spinner/CutoutDrawable.java
+++ b/ui_spinner/src/main/java/de/kuschku/ui/spinner/CutoutDrawable.java
@@ -27,11 +27,10 @@ import android.os.Build.VERSION;
import android.os.Build.VERSION_CODES;
import android.view.View;
-import de.kuschku.ui.shape.MaterialShapeDrawable;
-import de.kuschku.ui.shape.ShapeAppearanceModel;
-
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import de.kuschku.ui.shape.MaterialShapeDrawable;
+import de.kuschku.ui.shape.ShapeAppearanceModel;
/**
* A {@link MaterialShapeDrawable} that can draw a cutout for the label in {@link MaterialSpinnerLayout}'s
diff --git a/ui_spinner/src/main/java/de/kuschku/ui/spinner/MaterialSpinnerLayout.java b/ui_spinner/src/main/java/de/kuschku/ui/spinner/MaterialSpinnerLayout.java
index 1d0f6c250..a0d31e754 100644
--- a/ui_spinner/src/main/java/de/kuschku/ui/spinner/MaterialSpinnerLayout.java
+++ b/ui_spinner/src/main/java/de/kuschku/ui/spinner/MaterialSpinnerLayout.java
@@ -28,7 +28,6 @@ import android.graphics.RectF;
import android.graphics.Typeface;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.LayerDrawable;
-import android.graphics.drawable.NinePatchDrawable;
import android.os.Build.VERSION;
import android.os.Build.VERSION_CODES;
import android.os.Parcel;
diff --git a/ui_spinner/src/main/res/color/md_design_box_stroke_color.xml b/ui_spinner/src/main/res/color/md_design_box_stroke_color.xml
index b1a9a1b95..0050bc02f 100644
--- a/ui_spinner/src/main/res/color/md_design_box_stroke_color.xml
+++ b/ui_spinner/src/main/res/color/md_design_box_stroke_color.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
Copyright (C) 2018 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -12,8 +11,8 @@
limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:color="@color/md_mtrl_spinner_focused_box_stroke_color" android:state_focused="true"/>
- <item android:color="@color/md_mtrl_spinner_hovered_box_stroke_color" android:state_hovered="true"/>
- <item android:color="@color/md_mtrl_spinner_disabled_color" android:state_enabled="false"/>
- <item android:color="@color/md_mtrl_spinner_default_box_stroke_color"/>
+ <item android:color="@color/md_mtrl_spinner_focused_box_stroke_color" android:state_focused="true" />
+ <item android:color="@color/md_mtrl_spinner_hovered_box_stroke_color" android:state_hovered="true" />
+ <item android:color="@color/md_mtrl_spinner_disabled_color" android:state_enabled="false" />
+ <item android:color="@color/md_mtrl_spinner_default_box_stroke_color" />
</selector>
diff --git a/ui_spinner/src/main/res/color/md_design_error.xml b/ui_spinner/src/main/res/color/md_design_error.xml
index 0a505fc72..691420f39 100644
--- a/ui_spinner/src/main/res/color/md_design_error.xml
+++ b/ui_spinner/src/main/res/color/md_design_error.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
Copyright (C) 2016 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -12,6 +11,6 @@
limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:color="?android:attr/textColorTertiary" android:state_enabled="false"/>
- <item android:color="?attr/colorError"/>
+ <item android:color="?android:attr/textColorTertiary" android:state_enabled="false" />
+ <item android:color="?attr/colorError" />
</selector>
diff --git a/ui_spinner/src/main/res/color/md_mtrl_error.xml b/ui_spinner/src/main/res/color/md_mtrl_error.xml
index d06940918..d333a0177 100644
--- a/ui_spinner/src/main/res/color/md_mtrl_error.xml
+++ b/ui_spinner/src/main/res/color/md_mtrl_error.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
Copyright (C) 2018 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -12,6 +11,6 @@
limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:color="?attr/colorOnError" android:state_enabled="false"/>
- <item android:color="?attr/colorError"/>
+ <item android:color="?attr/colorOnError" android:state_enabled="false" />
+ <item android:color="?attr/colorError" />
</selector>
diff --git a/ui_spinner/src/main/res/color/md_mtrl_filled_background_color.xml b/ui_spinner/src/main/res/color/md_mtrl_filled_background_color.xml
index 903a1aada..e5c770185 100644
--- a/ui_spinner/src/main/res/color/md_mtrl_filled_background_color.xml
+++ b/ui_spinner/src/main/res/color/md_mtrl_filled_background_color.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
Copyright (C) 2018 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,7 +14,7 @@
limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:alpha="0.16" android:color="?attr/colorOnSurface" android:state_hovered="true"/>
- <item android:alpha="0.04" android:color="?attr/colorOnSurface" android:state_enabled="false"/>
- <item android:alpha="0.12" android:color="?attr/colorOnSurface"/>
+ <item android:alpha="0.16" android:color="?attr/colorOnSurface" android:state_hovered="true" />
+ <item android:alpha="0.04" android:color="?attr/colorOnSurface" android:state_enabled="false" />
+ <item android:alpha="0.12" android:color="?attr/colorOnSurface" />
</selector>
diff --git a/ui_spinner/src/main/res/color/md_mtrl_filled_stroke_color.xml b/ui_spinner/src/main/res/color/md_mtrl_filled_stroke_color.xml
index 802d8328f..5eb07775c 100644
--- a/ui_spinner/src/main/res/color/md_mtrl_filled_stroke_color.xml
+++ b/ui_spinner/src/main/res/color/md_mtrl_filled_stroke_color.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2018 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,9 +14,9 @@
~ limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:color="?attr/colorPrimary" android:state_focused="true"/>
+ <item android:color="?attr/colorPrimary" android:state_focused="true" />
<!-- 4% overlay over 42% colorOnSurface -->
- <item android:alpha="0.46" android:color="?attr/colorOnSurface" android:state_hovered="true"/>
- <item android:alpha="0.38" android:color="?attr/colorOnSurface" android:state_enabled="false"/>
- <item android:alpha="0.42" android:color="?attr/colorOnSurface"/>
+ <item android:alpha="0.46" android:color="?attr/colorOnSurface" android:state_hovered="true" />
+ <item android:alpha="0.38" android:color="?attr/colorOnSurface" android:state_enabled="false" />
+ <item android:alpha="0.42" android:color="?attr/colorOnSurface" />
</selector>
diff --git a/ui_spinner/src/main/res/color/md_mtrl_indicator_text_color.xml b/ui_spinner/src/main/res/color/md_mtrl_indicator_text_color.xml
index 566e09455..60d9539a4 100644
--- a/ui_spinner/src/main/res/color/md_mtrl_indicator_text_color.xml
+++ b/ui_spinner/src/main/res/color/md_mtrl_indicator_text_color.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
Copyright (C) 2018 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -12,6 +11,6 @@
limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:alpha="0.38" android:color="?attr/colorOnSurface" android:state_enabled="false"/>
- <item android:alpha="0.6" android:color="?attr/colorOnSurface"/>
+ <item android:alpha="0.38" android:color="?attr/colorOnSurface" android:state_enabled="false" />
+ <item android:alpha="0.6" android:color="?attr/colorOnSurface" />
</selector>
diff --git a/ui_spinner/src/main/res/color/md_mtrl_outlined_stroke_color.xml b/ui_spinner/src/main/res/color/md_mtrl_outlined_stroke_color.xml
index b687332a0..91e5612fc 100644
--- a/ui_spinner/src/main/res/color/md_mtrl_outlined_stroke_color.xml
+++ b/ui_spinner/src/main/res/color/md_mtrl_outlined_stroke_color.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
Copyright (C) 2018 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,8 @@
limitations under the License.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:color="?attr/colorPrimary" android:state_focused="true"/>
- <item android:alpha="0.87" android:color="?attr/colorOnSurface" android:state_hovered="true"/>
- <item android:alpha="0.12" android:color="?attr/colorOnSurface" android:state_enabled="false"/>
- <item android:alpha="0.38" android:color="?attr/colorOnSurface"/>
+ <item android:color="?attr/colorPrimary" android:state_focused="true" />
+ <item android:alpha="0.87" android:color="?attr/colorOnSurface" android:state_hovered="true" />
+ <item android:alpha="0.12" android:color="?attr/colorOnSurface" android:state_enabled="false" />
+ <item android:alpha="0.38" android:color="?attr/colorOnSurface" />
</selector>
diff --git a/ui_spinner/src/main/res/values/color_attrs.xml b/ui_spinner/src/main/res/values/color_attrs.xml
index abb45ca87..c7f8ada1a 100644
--- a/ui_spinner/src/main/res/values/color_attrs.xml
+++ b/ui_spinner/src/main/res/values/color_attrs.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (C) 2017 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,52 +15,52 @@
-->
<resources>
<!-- A tonal variation of the primary color. -->
- <attr name="colorPrimaryVariant" format="color"/>
+ <attr name="colorPrimaryVariant" format="color" />
<!-- The secondary branding color for the app, usually a bright complement to the primary
branding color. -->
- <attr name="colorSecondary" format="color"/>
+ <attr name="colorSecondary" format="color" />
<!-- A tonal variation of the secondary color. -->
- <attr name="colorSecondaryVariant" format="color"/>
+ <attr name="colorSecondaryVariant" format="color" />
<!-- The color of surfaces such as cards, sheets, menus. -->
- <attr name="colorSurface" format="color"/>
+ <attr name="colorSurface" format="color" />
<!-- A color that passes accessibility guidelines for text/iconography when drawn on top of
primary. -->
- <attr name="colorOnPrimary" format="color"/>
+ <attr name="colorOnPrimary" format="color" />
<!-- A color that passes accessibility guidelines for text/iconography when drawn on top of
secondary. -->
- <attr name="colorOnSecondary" format="color"/>
+ <attr name="colorOnSecondary" format="color" />
<!-- A color that passes accessibility guidelines for text/iconography when drawn on top of
background. -->
- <attr name="colorOnBackground"/>
+ <attr name="colorOnBackground" />
<!-- A color that passes accessibility guidelines for text/iconography when drawn on top of
error. -->
- <attr name="colorOnError" format="color"/>
+ <attr name="colorOnError" format="color" />
<!-- A color that passes accessibility guidelines for text/iconography when drawn on top of
surface. -->
- <attr name="colorOnSurface" format="color"/>
+ <attr name="colorOnSurface" format="color" />
<!-- Private color attributes that help facilitate switching these pre-23 compatibility
values for the light and dark themes. -->
- <attr name="colorOnPrimaryDisabled" format="color"/>
- <attr name="colorOnPrimaryEmphasisHighType" format="color"/>
- <attr name="colorOnPrimaryEmphasisMedium" format="color"/>
- <attr name="colorOnSurfaceDisabled" format="color"/>
- <attr name="colorOnSurfaceEmphasisHighType" format="color"/>
- <attr name="colorOnSurfaceEmphasisMedium" format="color"/>
+ <attr name="colorOnPrimaryDisabled" format="color" />
+ <attr name="colorOnPrimaryEmphasisHighType" format="color" />
+ <attr name="colorOnPrimaryEmphasisMedium" format="color" />
+ <attr name="colorOnSurfaceDisabled" format="color" />
+ <attr name="colorOnSurfaceEmphasisHighType" format="color" />
+ <attr name="colorOnSurfaceEmphasisMedium" format="color" />
<!-- The scrim background that appears below modals and expanded navigation menus.
The background can either be a color or a bitmap drawable with tileMode set to repeat. -->
- <attr name="scrimBackground" format="color|reference"/>
+ <attr name="scrimBackground" format="color|reference" />
<!-- Internal flag used to denote that a theme is a Theme.MaterialComponents theme or a
Theme.MaterialComponents.Bridge theme. -->
- <attr name="isMaterialTheme" format="boolean"/>
+ <attr name="isMaterialTheme" format="boolean" />
<!-- When set to true, the material selection controls will tint themselves according to
Material Theme colors. When set to false, Material Theme colors will
be ignored. This value should be set to false when using custom drawables
that should not be tinted. This value is ignored if a buttonTint is set.
Set this attribute on your styles for each selection control.-->
- <attr name="useMaterialThemeColors" format="boolean"/>
+ <attr name="useMaterialThemeColors" format="boolean" />
</resources>
diff --git a/ui_spinner/src/main/res/values/internal_attrs.xml b/ui_spinner/src/main/res/values/internal_attrs.xml
index a93bbc03b..0f5a7e687 100644
--- a/ui_spinner/src/main/res/values/internal_attrs.xml
+++ b/ui_spinner/src/main/res/values/internal_attrs.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (C) 2017 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +15,7 @@
-->
<resources>
- <attr name="materialThemeOverlay" format="reference"/>
+ <attr name="materialThemeOverlay" format="reference" />
<declare-styleable name="ThemeEnforcement">
<!-- Internal flag used to denote that a style uses new attributes defined by
@@ -27,29 +26,29 @@
should only use this flag if a particular usage is known to cause a visual glitch or crash.
For example, tinting a vector drawable with a non-existent theme attribute is known to
crash on pre-21 devices. -->
- <attr name="md_enforceMaterialTheme" format="boolean"/>
+ <attr name="md_enforceMaterialTheme" format="boolean" />
<!-- Internal flag used to denote that a style requires that the textAppearance attribute is
specified and evaluates to a valid text appearance. -->
- <attr name="md_enforceTextAppearance" format="boolean"/>
+ <attr name="md_enforceTextAppearance" format="boolean" />
<!-- Attribute used to check that a component has a TextAppearance specified on it. -->
- <attr name="android:textAppearance"/>
+ <attr name="android:textAppearance" />
</declare-styleable>
<declare-styleable name="ForegroundLinearLayout">
- <attr name="android:foreground"/>
- <attr name="android:foregroundGravity"/>
- <attr name="md_foregroundInsidePadding" format="boolean"/>
+ <attr name="android:foreground" />
+ <attr name="android:foregroundGravity" />
+ <attr name="md_foregroundInsidePadding" format="boolean" />
</declare-styleable>
<declare-styleable name="ScrimInsetsFrameLayout">
- <attr name="md_insetForeground" format="color|reference"/>
+ <attr name="md_insetForeground" format="color|reference" />
</declare-styleable>
<declare-styleable name="FlowLayout">
<!-- Horizontal spacing between two items being laid out. -->
- <attr name="md_itemSpacing" format="dimension"/>
+ <attr name="md_itemSpacing" format="dimension" />
<!-- Vertical Spacing between two lines of items being laid out. -->
- <attr name="md_lineSpacing" format="dimension"/>
+ <attr name="md_lineSpacing" format="dimension" />
</declare-styleable>
</resources>
diff --git a/ui_spinner/src/main/res/values/internal_dimens.xml b/ui_spinner/src/main/res/values/internal_dimens.xml
index 1934c28e0..633cfac3d 100644
--- a/ui_spinner/src/main/res/values/internal_dimens.xml
+++ b/ui_spinner/src/main/res/values/internal_dimens.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (C) 2017 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui_spinner/src/main/res/values/shape_attrs.xml b/ui_spinner/src/main/res/values/shape_attrs.xml
index 25e0903df..d503d5fe8 100644
--- a/ui_spinner/src/main/res/values/shape_attrs.xml
+++ b/ui_spinner/src/main/res/values/shape_attrs.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2018 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,55 +18,55 @@
<declare-styleable name="MaterialShape">
<!-- Shape appearance style reference to be used to construct a ShapeAppearanceModel. -->
- <attr name="md_shapeAppearance" format="reference"/>
+ <attr name="md_shapeAppearance" format="reference" />
<!-- Shape appearance overlay style reference to be used to modify the shapeAppearance. -->
- <attr name="md_shapeAppearanceOverlay" format="reference"/>
+ <attr name="md_shapeAppearanceOverlay" format="reference" />
</declare-styleable>
<declare-styleable name="ShapeAppearance">
<!-- Corner size to be used in the ShapeAppearance. All corners default to this value -->
- <attr name="md_cornerSize" format="dimension"/>
+ <attr name="md_cornerSize" format="dimension" />
<!-- Top left corner size to be used in the ShapeAppearance. -->
- <attr name="md_cornerSizeTopLeft" format="dimension"/>
+ <attr name="md_cornerSizeTopLeft" format="dimension" />
<!-- Top right corner size to be used in the ShapeAppearance. -->
- <attr name="md_cornerSizeTopRight" format="dimension"/>
+ <attr name="md_cornerSizeTopRight" format="dimension" />
<!-- Bottom right corner size to be used in the ShapeAppearance. -->
- <attr name="md_cornerSizeBottomRight" format="dimension"/>
+ <attr name="md_cornerSizeBottomRight" format="dimension" />
<!-- Bottom left corner size to be used in the ShapeAppearance. -->
- <attr name="md_cornerSizeBottomLeft" format="dimension"/>
+ <attr name="md_cornerSizeBottomLeft" format="dimension" />
<!-- Corner family to be used in the ShapeAppearance. All corners default to this value -->
<attr name="md_cornerFamily" format="enum">
- <enum name="md_rounded" value="0"/>
- <enum name="md_cut" value="1"/>
+ <enum name="md_rounded" value="0" />
+ <enum name="md_cut" value="1" />
</attr>
<!-- Top left corner family to be used in the ShapeAppearance. -->
<attr name="md_cornerFamilyTopLeft" format="enum">
- <enum name="md_rounded" value="0"/>
- <enum name="md_cut" value="1"/>
+ <enum name="md_rounded" value="0" />
+ <enum name="md_cut" value="1" />
</attr>
<!-- Top right corner family to be used in the ShapeAppearance. -->
<attr name="md_cornerFamilyTopRight" format="enum">
- <enum name="md_rounded" value="0"/>
- <enum name="md_cut" value="1"/>
+ <enum name="md_rounded" value="0" />
+ <enum name="md_cut" value="1" />
</attr>
<!-- Bottom right corner family to be used in the ShapeAppearance. -->
<attr name="md_cornerFamilyBottomRight" format="enum">
- <enum name="md_rounded" value="0"/>
- <enum name="md_cut" value="1"/>
+ <enum name="md_rounded" value="0" />
+ <enum name="md_cut" value="1" />
</attr>
<!-- Bottom left corner family to be used in the ShapeAppearance. -->
<attr name="md_cornerFamilyBottomLeft" format="enum">
- <enum name="md_rounded" value="0"/>
- <enum name="md_cut" value="1"/>
+ <enum name="md_rounded" value="0" />
+ <enum name="md_cut" value="1" />
</attr>
</declare-styleable>
<!-- Shape appearance style reference for small components. -->
- <attr name="md_shapeAppearanceSmallComponent" format="reference"/>
+ <attr name="md_shapeAppearanceSmallComponent" format="reference" />
<!-- Shape appearance style reference for medium components. -->
- <attr name="md_shapeAppearanceMediumComponent" format="reference"/>
+ <attr name="md_shapeAppearanceMediumComponent" format="reference" />
<!-- Shape appearance style reference for large components. -->
- <attr name="md_shapeAppearanceLargeComponent" format="reference"/>
+ <attr name="md_shapeAppearanceLargeComponent" format="reference" />
</resources>
diff --git a/ui_spinner/src/main/res/values/shape_dimens.xml b/ui_spinner/src/main/res/values/shape_dimens.xml
index 87e0d2ba1..94eeefad1 100644
--- a/ui_spinner/src/main/res/values/shape_dimens.xml
+++ b/ui_spinner/src/main/res/values/shape_dimens.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2018 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui_spinner/src/main/res/values/spinner_attrs.xml b/ui_spinner/src/main/res/values/spinner_attrs.xml
index 789eee705..481685362 100644
--- a/ui_spinner/src/main/res/values/spinner_attrs.xml
+++ b/ui_spinner/src/main/res/values/spinner_attrs.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2018 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,75 +16,75 @@
<resources>
<!-- Style to use for spinnerLayout in the theme. -->
- <attr name="md_materialSpinnerStyle" format="reference"/>
+ <attr name="md_materialSpinnerStyle" format="reference" />
<declare-styleable name="MaterialSpinnerLayout">
<!-- The text color for input text. -->
- <attr name="android:textColorHint"/>
+ <attr name="android:textColorHint" />
<!-- The hint to display in the floating label. -->
- <attr name="android:hint"/>
+ <attr name="android:hint" />
<!-- Whether the layout's floating label functionality is enabled. -->
- <attr name="md_hintEnabled" format="boolean"/>
+ <attr name="md_hintEnabled" format="boolean" />
<!-- Whether to animate hint state changes. -->
- <attr name="md_hintAnimationEnabled" format="boolean"/>
+ <attr name="md_hintAnimationEnabled" format="boolean" />
<!-- TextAppearance of the hint in the collapsed floating label. -->
- <attr name="md_hintTextAppearance" format="reference"/>
+ <attr name="md_hintTextAppearance" format="reference" />
<!-- Text color of the hint in the collapsed floating label.
If set, this takes precedence over hintTextAppearance. -->
- <attr name="md_hintTextColor" format="color"/>
+ <attr name="md_hintTextColor" format="color" />
<!-- The text to display as helper text underneath the text input area. -->
- <attr name="md_helperText" format="string"/>
+ <attr name="md_helperText" format="string" />
<!-- Whether the layout's helper text functionality is enabled. -->
- <attr name="md_helperTextEnabled" format="boolean"/>
+ <attr name="md_helperTextEnabled" format="boolean" />
<!-- TextAppearance of the helper text displayed underneath the text input area. -->
- <attr name="md_helperTextTextAppearance" format="reference"/>
+ <attr name="md_helperTextTextAppearance" format="reference" />
<!-- Text color of the helper text displayed underneath the text input area.
If set, this takes precedence over helperTextTextAppearance. -->
- <attr name="md_helperTextTextColor" format="color"/>
+ <attr name="md_helperTextTextColor" format="color" />
<!-- Whether the layout is laid out as if an error will be displayed. -->
- <attr name="md_errorEnabled" format="boolean"/>
+ <attr name="md_errorEnabled" format="boolean" />
<!-- TextAppearance of any error message displayed. -->
- <attr name="md_errorTextAppearance" format="reference"/>
+ <attr name="md_errorTextAppearance" format="reference" />
<!-- Text color for any error message displayed.
If set, this takes precedence over errorTextAppearance. -->
- <attr name="md_errorTextColor" format="color"/>
+ <attr name="md_errorTextColor" format="color" />
<!-- Whether the text input area should be drawn as a filled box, an outline box, or not as a box.-->
<attr name="md_boxBackgroundMode">
<!-- Specifies that there should be no box set on the text input area. -->
- <enum name="md_none" value="0"/>
+ <enum name="md_none" value="0" />
<!-- Filled box mode for the text input box. -->
- <enum name="md_filled" value="1"/>
+ <enum name="md_filled" value="1" />
<!-- Outline box mode for the text input box. -->
- <enum name="md_outline" value="2"/>
+ <enum name="md_outline" value="2" />
</attr>
<!-- Value to use for the EditText's collapsed top padding in box mode. -->
- <attr name="md_boxCollapsedPaddingTop" format="dimension"/>
+ <attr name="md_boxCollapsedPaddingTop" format="dimension" />
<!-- The value to use for the box's top start corner radius when in box mode. -->
- <attr name="md_boxCornerRadiusTopStart" format="dimension"/>
+ <attr name="md_boxCornerRadiusTopStart" format="dimension" />
<!-- The value to use for the box's top end corner radius when in box mode. -->
- <attr name="md_boxCornerRadiusTopEnd" format="dimension"/>
+ <attr name="md_boxCornerRadiusTopEnd" format="dimension" />
<!-- The value to use for the box's bottom start corner radius when in box mode. -->
- <attr name="md_boxCornerRadiusBottomStart" format="dimension"/>
+ <attr name="md_boxCornerRadiusBottomStart" format="dimension" />
<!-- The value to use for the box's bottom end corner radius when in box mode. -->
- <attr name="md_boxCornerRadiusBottomEnd" format="dimension"/>
+ <attr name="md_boxCornerRadiusBottomEnd" format="dimension" />
<!-- The color to use for the box's stroke when in outline box mode. -->
- <attr name="md_boxStrokeColor" format="color"/>
+ <attr name="md_boxStrokeColor" format="color" />
<!-- The color to use for the box's background color when in filled box mode. -->
- <attr name="md_boxBackgroundColor" format="color"/>
+ <attr name="md_boxBackgroundColor" format="color" />
<!-- The value to use for the box's stroke when in outline box mode. -->
- <attr name="md_boxStrokeWidth" format="dimension"/>
+ <attr name="md_boxStrokeWidth" format="dimension" />
<!-- Shape appearance style reference for MaterialSpinnerLayout. Attribute declaration is in the Shape
package. -->
- <attr name="md_shapeAppearance"/>
+ <attr name="md_shapeAppearance" />
<!-- Shape appearance overlay style reference for MaterialSpinnerLayout. To be used to augment
attributes declared in the shapeAppearance. Attribute declaration is in the Shape
package. -->
- <attr name="md_shapeAppearanceOverlay"/>
+ <attr name="md_shapeAppearanceOverlay" />
</declare-styleable>
</resources>
diff --git a/ui_spinner/src/main/res/values/spinner_colors.xml b/ui_spinner/src/main/res/values/spinner_colors.xml
index d8b7ffab1..9278eb23e 100644
--- a/ui_spinner/src/main/res/values/spinner_colors.xml
+++ b/ui_spinner/src/main/res/values/spinner_colors.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2018 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui_spinner/src/main/res/values/spinner_dimens.xml b/ui_spinner/src/main/res/values/spinner_dimens.xml
index a99ece13d..3052d9798 100644
--- a/ui_spinner/src/main/res/values/spinner_dimens.xml
+++ b/ui_spinner/src/main/res/values/spinner_dimens.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2018 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/ui_spinner/src/main/res/values/spinner_ids.xml b/ui_spinner/src/main/res/values/spinner_ids.xml
index 7d99f9c65..53d5dae8a 100644
--- a/ui_spinner/src/main/res/values/spinner_ids.xml
+++ b/ui_spinner/src/main/res/values/spinner_ids.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright 2018 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,9 +15,9 @@
-->
<resources>
- <item name="md_spinner_error" type="id"/>
- <item name="md_spinner_helper_text" type="id"/>
+ <item name="md_spinner_error" type="id" />
+ <item name="md_spinner_helper_text" type="id" />
- <item name="md_spinner_background" type="id"/>
+ <item name="md_spinner_background" type="id" />
</resources>
diff --git a/ui_spinner/src/main/res/values/typography_attrs.xml b/ui_spinner/src/main/res/values/typography_attrs.xml
index 764b78851..d6197b320 100644
--- a/ui_spinner/src/main/res/values/typography_attrs.xml
+++ b/ui_spinner/src/main/res/values/typography_attrs.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (C) 2018 The Android Open Source Project
~
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,29 +15,29 @@
-->
<resources>
<!-- Text appearance for the Headline 1 style. -->
- <attr name="textAppearanceHeadline1" format="reference"/>
+ <attr name="textAppearanceHeadline1" format="reference" />
<!-- Text appearance for the Headline 2 style. -->
- <attr name="textAppearanceHeadline2" format="reference"/>
+ <attr name="textAppearanceHeadline2" format="reference" />
<!-- Text appearance for the Headline 3 style. -->
- <attr name="textAppearanceHeadline3" format="reference"/>
+ <attr name="textAppearanceHeadline3" format="reference" />
<!-- Text appearance for the Headline 4 style. -->
- <attr name="textAppearanceHeadline4" format="reference"/>
+ <attr name="textAppearanceHeadline4" format="reference" />
<!-- Text appearance for the Headline 5 style. -->
- <attr name="textAppearanceHeadline5" format="reference"/>
+ <attr name="textAppearanceHeadline5" format="reference" />
<!-- Text appearance for the Headline 6 style. -->
- <attr name="textAppearanceHeadline6" format="reference"/>
+ <attr name="textAppearanceHeadline6" format="reference" />
<!-- Text appearance for the Subtitle 1 style. -->
- <attr name="textAppearanceSubtitle1" format="reference"/>
+ <attr name="textAppearanceSubtitle1" format="reference" />
<!-- Text appearance for the Subtitle 2 style. -->
- <attr name="textAppearanceSubtitle2" format="reference"/>
+ <attr name="textAppearanceSubtitle2" format="reference" />
<!-- Text appearance for the Body 1 style. -->
- <attr name="textAppearanceBody1" format="reference"/>
+ <attr name="textAppearanceBody1" format="reference" />
<!-- Text appearance for the Body 2 style. -->
- <attr name="textAppearanceBody2" format="reference"/>
+ <attr name="textAppearanceBody2" format="reference" />
<!-- Text appearance for the Caption style. -->
- <attr name="textAppearanceCaption" format="reference"/>
+ <attr name="textAppearanceCaption" format="reference" />
<!-- Text appearance for the Button style. -->
- <attr name="textAppearanceButton" format="reference"/>
+ <attr name="textAppearanceButton" format="reference" />
<!-- Text appearance for the Overline style. -->
- <attr name="textAppearanceOverline" format="reference"/>
+ <attr name="textAppearanceOverline" format="reference" />
</resources>
diff --git a/viewmodel/src/main/java/de/kuschku/quasseldroid/util/helper/LiveDataHelper.kt b/viewmodel/src/main/java/de/kuschku/quasseldroid/util/helper/LiveDataHelper.kt
index ee55e7c1d..e7fdfd6f0 100644
--- a/viewmodel/src/main/java/de/kuschku/quasseldroid/util/helper/LiveDataHelper.kt
+++ b/viewmodel/src/main/java/de/kuschku/quasseldroid/util/helper/LiveDataHelper.kt
@@ -17,6 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@file:Suppress("NOTHING_TO_INLINE")
+
package de.kuschku.quasseldroid.util.helper
import androidx.annotation.MainThread
diff --git a/viewmodel/src/main/java/de/kuschku/quasseldroid/util/helper/ObservableHelper.kt b/viewmodel/src/main/java/de/kuschku/quasseldroid/util/helper/ObservableHelper.kt
index 92edd739a..461f5fe6f 100644
--- a/viewmodel/src/main/java/de/kuschku/quasseldroid/util/helper/ObservableHelper.kt
+++ b/viewmodel/src/main/java/de/kuschku/quasseldroid/util/helper/ObservableHelper.kt
@@ -17,6 +17,7 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@file:Suppress("NOTHING_TO_INLINE")
+
package de.kuschku.quasseldroid.util.helper
import androidx.lifecycle.LiveData
diff --git a/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/ChatViewModel.kt b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/ChatViewModel.kt
index 00dcdc85e..d79208a54 100644
--- a/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/ChatViewModel.kt
+++ b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/ChatViewModel.kt
@@ -102,7 +102,8 @@ open class ChatViewModel : QuasselViewModel() {
showHidden.onNext(savedInstanceState.getBoolean(KEY_SHOW_HIDDEN))
if (savedInstanceState.containsKey(KEY_BUFFER_SEARCH_TEMPORARILY_VISIBLE))
- bufferSearchTemporarilyVisible.onNext(savedInstanceState.getBoolean(KEY_BUFFER_SEARCH_TEMPORARILY_VISIBLE))
+ bufferSearchTemporarilyVisible.onNext(savedInstanceState.getBoolean(
+ KEY_BUFFER_SEARCH_TEMPORARILY_VISIBLE))
if (savedInstanceState.containsKey(KEY_EXPANDED_NETWORKS)) {
expandedNetworks.onNext(
--
GitLab