From 9047e9921b0324054e9f12398e71af8c6c5cb42f Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Sat, 13 Feb 2021 02:21:03 +0100
Subject: [PATCH] Adapt code style
---
.../quasseldroid/app/MainActivity.kt | 21 ++++++++++++++++---
.../libquassel/client/EndToEndTest.kt | 17 +++++++++++++--
.../handshake/ClientInitAckSerializer.kt | 6 +++++-
.../primitive/DateTimeSerializer.kt | 6 +++++-
.../primitive/HandshakeMapSerializer.kt | 6 +++++-
.../primitive/DateSerializerTest.kt | 6 ++----
.../primitive/DateTimeSerializerTest.kt | 6 +++++-
.../DccIpDetectionModeSerializerTest.kt | 1 -
.../primitive/MessageSerializerTest.kt | 9 +++++++-
.../testutil/matchers/TemporalMatcher.kt | 7 ++++++-
.../protocol/testutil/qtSerializerTest.kt | 1 -
.../libquassel/protocol/types/SignedIdTest.kt | 4 +++-
12 files changed, 72 insertions(+), 18 deletions(-)
diff --git a/app/src/main/java/de/justjanne/quasseldroid/app/MainActivity.kt b/app/src/main/java/de/justjanne/quasseldroid/app/MainActivity.kt
index 9f00473ac..4f2b03210 100644
--- a/app/src/main/java/de/justjanne/quasseldroid/app/MainActivity.kt
+++ b/app/src/main/java/de/justjanne/quasseldroid/app/MainActivity.kt
@@ -22,12 +22,27 @@ package de.justjanne.quasseldroid.app
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import androidx.compose.foundation.border
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.*
+import androidx.compose.material.Icon
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Scaffold
+import androidx.compose.material.Surface
+import androidx.compose.material.Text
+import androidx.compose.material.TextField
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.MoreVert
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
diff --git a/libquassel/src/test/kotlin/de/justjanne/libquassel/client/EndToEndTest.kt b/libquassel/src/test/kotlin/de/justjanne/libquassel/client/EndToEndTest.kt
index d4831f1ed..0f797ed92 100644
--- a/libquassel/src/test/kotlin/de/justjanne/libquassel/client/EndToEndTest.kt
+++ b/libquassel/src/test/kotlin/de/justjanne/libquassel/client/EndToEndTest.kt
@@ -23,10 +23,23 @@ import de.justjanne.bitflags.of
import de.justjanne.libquassel.client.io.CoroutineChannel
import de.justjanne.libquassel.client.testutil.QuasselCoreContainer
import de.justjanne.libquassel.client.testutil.TestX509TrustManager
-import de.justjanne.libquassel.protocol.connection.*
+import de.justjanne.libquassel.protocol.connection.ConnectionHeader
+import de.justjanne.libquassel.protocol.connection.ConnectionHeaderSerializer
+import de.justjanne.libquassel.protocol.connection.ProtocolFeature
+import de.justjanne.libquassel.protocol.connection.ProtocolInfoSerializer
+import de.justjanne.libquassel.protocol.connection.ProtocolMeta
+import de.justjanne.libquassel.protocol.connection.ProtocolVersion
import de.justjanne.libquassel.protocol.features.FeatureSet
import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
-import de.justjanne.libquassel.protocol.messages.handshake.*
+import de.justjanne.libquassel.protocol.messages.handshake.ClientInit
+import de.justjanne.libquassel.protocol.messages.handshake.ClientInitAck
+import de.justjanne.libquassel.protocol.messages.handshake.ClientLogin
+import de.justjanne.libquassel.protocol.messages.handshake.ClientLoginAck
+import de.justjanne.libquassel.protocol.messages.handshake.ClientLoginReject
+import de.justjanne.libquassel.protocol.messages.handshake.CoreSetupAck
+import de.justjanne.libquassel.protocol.messages.handshake.CoreSetupData
+import de.justjanne.libquassel.protocol.messages.handshake.CoreSetupReject
+import de.justjanne.libquassel.protocol.messages.handshake.SessionInit
import de.justjanne.libquassel.protocol.serializers.HandshakeSerializers
import de.justjanne.libquassel.protocol.serializers.handshake.ClientInitSerializer
import de.justjanne.libquassel.protocol.serializers.handshake.ClientLoginSerializer
diff --git a/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientInitAckSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientInitAckSerializer.kt
index eaf57b7d4..85ba491e5 100644
--- a/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientInitAckSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/handshake/ClientInitAckSerializer.kt
@@ -24,7 +24,11 @@ import de.justjanne.bitflags.toBits
import de.justjanne.libquassel.protocol.features.LegacyFeature
import de.justjanne.libquassel.protocol.features.QuasselFeatureName
import de.justjanne.libquassel.protocol.messages.handshake.ClientInitAck
-import de.justjanne.libquassel.protocol.variant.*
+import de.justjanne.libquassel.protocol.variant.QStringList
+import de.justjanne.libquassel.protocol.variant.QVariantMap
+import de.justjanne.libquassel.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.variant.into
+import de.justjanne.libquassel.protocol.variant.qVariant
object ClientInitAckSerializer : HandshakeSerializer<ClientInitAck> {
override val type: String = "ClientInitAck"
diff --git a/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/DateTimeSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/DateTimeSerializer.kt
index 139ae6f47..72e71c7bd 100644
--- a/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/DateTimeSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/DateTimeSerializer.kt
@@ -23,7 +23,11 @@ import de.justjanne.libquassel.protocol.features.FeatureSet
import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
import de.justjanne.libquassel.protocol.types.TimeSpec
import de.justjanne.libquassel.protocol.variant.QtType
-import org.threeten.bp.*
+import org.threeten.bp.Instant
+import org.threeten.bp.LocalDateTime
+import org.threeten.bp.OffsetDateTime
+import org.threeten.bp.ZoneOffset
+import org.threeten.bp.ZonedDateTime
import org.threeten.bp.temporal.Temporal
import java.nio.ByteBuffer
diff --git a/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/HandshakeMapSerializer.kt b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/HandshakeMapSerializer.kt
index b427b8368..b0543e506 100644
--- a/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/HandshakeMapSerializer.kt
+++ b/protocol/src/main/java/de/justjanne/libquassel/protocol/serializers/primitive/HandshakeMapSerializer.kt
@@ -21,7 +21,11 @@ package de.justjanne.libquassel.protocol.serializers.primitive
import de.justjanne.libquassel.protocol.features.FeatureSet
import de.justjanne.libquassel.protocol.io.ChainedByteBuffer
-import de.justjanne.libquassel.protocol.variant.*
+import de.justjanne.libquassel.protocol.variant.QVariantList
+import de.justjanne.libquassel.protocol.variant.QVariantMap
+import de.justjanne.libquassel.protocol.variant.QtType
+import de.justjanne.libquassel.protocol.variant.into
+import de.justjanne.libquassel.protocol.variant.qVariant
import java.nio.ByteBuffer
object HandshakeMapSerializer : QtSerializer<QVariantMap> {
diff --git a/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DateSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DateSerializerTest.kt
index 9555fc2c6..769fc7c80 100644
--- a/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DateSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DateSerializerTest.kt
@@ -25,10 +25,8 @@ import de.justjanne.libquassel.protocol.testutil.qtSerializerTest
import de.justjanne.libquassel.protocol.variant.QtType
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.assertThrows
-import org.threeten.bp.*
-import org.threeten.bp.chrono.JapaneseDate
-import org.threeten.bp.temporal.Temporal
+import org.threeten.bp.LocalDate
+import org.threeten.bp.Month
class DateSerializerTest {
@Test
diff --git a/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DateTimeSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DateTimeSerializerTest.kt
index bc4478086..0899fe88c 100644
--- a/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DateTimeSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DateTimeSerializerTest.kt
@@ -26,7 +26,11 @@ import de.justjanne.libquassel.protocol.variant.QtType
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.assertThrows
-import org.threeten.bp.*
+import org.threeten.bp.Instant
+import org.threeten.bp.LocalDateTime
+import org.threeten.bp.Month
+import org.threeten.bp.ZoneId
+import org.threeten.bp.ZoneOffset
import org.threeten.bp.chrono.JapaneseDate
import org.threeten.bp.temporal.Temporal
diff --git a/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DccIpDetectionModeSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DccIpDetectionModeSerializerTest.kt
index 4c1ea014b..77abc6331 100644
--- a/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DccIpDetectionModeSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/DccIpDetectionModeSerializerTest.kt
@@ -18,7 +18,6 @@
*/
package de.justjanne.libquassel.protocol.serializers.primitive
-import de.justjanne.libquassel.protocol.features.FeatureSet
import de.justjanne.libquassel.protocol.serializers.QuasselSerializers
import de.justjanne.libquassel.protocol.testutil.byteBufferOf
import de.justjanne.libquassel.protocol.testutil.quasselSerializerTest
diff --git a/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/MessageSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/MessageSerializerTest.kt
index ab3aa1cb0..8b1132170 100644
--- a/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/MessageSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/primitive/MessageSerializerTest.kt
@@ -25,7 +25,14 @@ import de.justjanne.libquassel.protocol.features.FeatureSet
import de.justjanne.libquassel.protocol.serializers.QuasselSerializers
import de.justjanne.libquassel.protocol.testutil.byteBufferOf
import de.justjanne.libquassel.protocol.testutil.quasselSerializerTest
-import de.justjanne.libquassel.protocol.types.*
+import de.justjanne.libquassel.protocol.types.BufferId
+import de.justjanne.libquassel.protocol.types.BufferInfo
+import de.justjanne.libquassel.protocol.types.BufferType
+import de.justjanne.libquassel.protocol.types.Message
+import de.justjanne.libquassel.protocol.types.MessageFlag
+import de.justjanne.libquassel.protocol.types.MessageType
+import de.justjanne.libquassel.protocol.types.MsgId
+import de.justjanne.libquassel.protocol.types.NetworkId
import de.justjanne.libquassel.protocol.variant.QuasselType
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
diff --git a/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/matchers/TemporalMatcher.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/matchers/TemporalMatcher.kt
index 6732f87c9..32bf0c034 100644
--- a/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/matchers/TemporalMatcher.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/matchers/TemporalMatcher.kt
@@ -20,7 +20,12 @@ package de.justjanne.libquassel.protocol.testutil.matchers
import org.hamcrest.BaseMatcher
import org.hamcrest.Description
-import org.threeten.bp.*
+import org.threeten.bp.Instant
+import org.threeten.bp.LocalDate
+import org.threeten.bp.LocalDateTime
+import org.threeten.bp.LocalTime
+import org.threeten.bp.OffsetDateTime
+import org.threeten.bp.ZonedDateTime
import org.threeten.bp.temporal.Temporal
class TemporalMatcher<T: Temporal>(
diff --git a/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/qtSerializerTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/qtSerializerTest.kt
index 545c9d66a..1878dd2cb 100644
--- a/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/qtSerializerTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/qtSerializerTest.kt
@@ -19,7 +19,6 @@
package de.justjanne.libquassel.protocol.testutil
import de.justjanne.libquassel.protocol.features.FeatureSet
-import de.justjanne.libquassel.protocol.io.contentToString
import de.justjanne.libquassel.protocol.serializers.primitive.QtSerializer
import org.hamcrest.Matcher
import java.nio.ByteBuffer
diff --git a/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/types/SignedIdTest.kt b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/types/SignedIdTest.kt
index 7c7cea2b4..867b60575 100644
--- a/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/types/SignedIdTest.kt
+++ b/protocol/src/test/kotlin/de/justjanne/libquassel/protocol/types/SignedIdTest.kt
@@ -19,7 +19,9 @@
package de.justjanne.libquassel.protocol.types
-import org.junit.jupiter.api.Assertions.*
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertFalse
+import org.junit.jupiter.api.Assertions.assertTrue
import org.junit.jupiter.api.Test
class SignedIdTest {
--
GitLab