From d498d954f96e05bc2a20c1ea30f5b71485b0a8f9 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Mon, 21 Jan 2019 18:42:04 +0100
Subject: [PATCH] Reformatted source
---
.gitlab-ci.yml | 30 ++---
app/sampledata/features.json | 122 +++++++++---------
.../ui/chat/messages/MessageListFragment.kt | 2 +-
.../coresettings/chatlist/NetworkAdapter.kt | 6 +-
settings.gradle | 20 +--
5 files changed, 91 insertions(+), 89 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b0ed122c1..e0be7a433 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,36 +6,36 @@ variables:
cache:
key: "$CI_PROJECT_NAME"
paths:
- - ".gradle/wrapper"
- - ".gradle/caches"
+ - ".gradle/wrapper"
+ - ".gradle/caches"
before_script:
- - "export GRADLE_USER_HOME=$(pwd)/.gradle"
- - "export ANDROID_HOME=/android-sdk-linux"
- - "export PATH=$PATH:/android-sdk-linux/platform-tools/"
- - "chmod +x ./gradlew"
+- "export GRADLE_USER_HOME=$(pwd)/.gradle"
+- "export ANDROID_HOME=/android-sdk-linux"
+- "export PATH=$PATH:/android-sdk-linux/platform-tools/"
+- "chmod +x ./gradlew"
- - "echo $SIGNING_KEYSTORE | base64 -d > /root/signing.keystore"
- - "echo $SIGNING_PROPERTIES | base64 -d > signing.properties"
+- "echo $SIGNING_KEYSTORE | base64 -d > /root/signing.keystore"
+- "echo $SIGNING_PROPERTIES | base64 -d > signing.properties"
stages:
- - "build"
- - "test"
- - "deploy"
+- "build"
+- "test"
+- "deploy"
build:
stage: "build"
script:
- - "./gradlew assembleRelease -x lintRelease -x lintVitalRelease"
- - "cp app/build/outputs/apk/release/*.apk ."
+ - "./gradlew assembleRelease -x lintRelease -x lintVitalRelease"
+ - "cp app/build/outputs/apk/release/*.apk ."
artifacts:
paths:
- - "*.apk"
+ - "*.apk"
test:
stage: "test"
script:
- - "./gradlew check"
+ - "./gradlew check"
artifacts:
reports:
junit: "*/build/test-results/*/TEST-*.xml"
diff --git a/app/sampledata/features.json b/app/sampledata/features.json
index 9b813e3c8..d49f8a321 100644
--- a/app/sampledata/features.json
+++ b/app/sampledata/features.json
@@ -1,64 +1,64 @@
{
"data": [
- {
- "name": "SynchronizedMarkerLine",
- "description": "Required for synchronizing the last position in channels"
- },
- {
- "name": "SaslAuthentication",
- "description": "Required for SASL"
- },
- {
- "name": "SaslExternal",
- "description": "Required for SASL with certificates"
- },
- {
- "name": "HideInactiveNetworks",
- "description": "Required for hiding inactive networks from chat lists"
- },
- {
- "name": "PasswordChange",
- "description": "Required for changing passwords from the client"
- },
- {
- "name": "CapNegotiation",
- "description": "Required for IRCv3 capabilities"
- },
- {
- "name": "VerifyServerSSL",
- "description": "Required for verifying the SSL certificate of IRC networks you connect to"
- },
- {
- "name": "CustomRateLimits",
- "description": "Required for custom rate limits for IRC networks"
- },
- {
- "name": "AwayFormatTimestamp",
- "description": "Required for custom formatted timestamps in away messages"
- },
- {
- "name": "BufferActivitySync",
- "description": "Required for seeing activity of chats in the chat list"
- },
- {
- "name": "CoreSideHighlights",
- "description": "Required for highlights"
- },
- {
- "name": "SenderPrefixes",
- "description": "Required for seeing prefix modes (+, @) of users in channels"
- },
- {
- "name": "RemoteDisconnect",
- "description": "Required for remote disconnects of your own clients"
- },
- {
- "name": "RichMessages",
- "description": "Required for seeing real names or IRCv3 or Gravatar avatars in messages"
- },
- {
- "name": "BacklogFilterType",
- "description": "Required for receiving past notifications after connecting"
- }
-]
+ {
+ "name": "SynchronizedMarkerLine",
+ "description": "Required for synchronizing the last position in channels"
+ },
+ {
+ "name": "SaslAuthentication",
+ "description": "Required for SASL"
+ },
+ {
+ "name": "SaslExternal",
+ "description": "Required for SASL with certificates"
+ },
+ {
+ "name": "HideInactiveNetworks",
+ "description": "Required for hiding inactive networks from chat lists"
+ },
+ {
+ "name": "PasswordChange",
+ "description": "Required for changing passwords from the client"
+ },
+ {
+ "name": "CapNegotiation",
+ "description": "Required for IRCv3 capabilities"
+ },
+ {
+ "name": "VerifyServerSSL",
+ "description": "Required for verifying the SSL certificate of IRC networks you connect to"
+ },
+ {
+ "name": "CustomRateLimits",
+ "description": "Required for custom rate limits for IRC networks"
+ },
+ {
+ "name": "AwayFormatTimestamp",
+ "description": "Required for custom formatted timestamps in away messages"
+ },
+ {
+ "name": "BufferActivitySync",
+ "description": "Required for seeing activity of chats in the chat list"
+ },
+ {
+ "name": "CoreSideHighlights",
+ "description": "Required for highlights"
+ },
+ {
+ "name": "SenderPrefixes",
+ "description": "Required for seeing prefix modes (+, @) of users in channels"
+ },
+ {
+ "name": "RemoteDisconnect",
+ "description": "Required for remote disconnects of your own clients"
+ },
+ {
+ "name": "RichMessages",
+ "description": "Required for seeing real names or IRCv3 or Gravatar avatars in messages"
+ },
+ {
+ "name": "BacklogFilterType",
+ "description": "Required for receiving past notifications after connecting"
+ }
+ ]
}
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageListFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageListFragment.kt
index 360084482..dbb243414 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageListFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/MessageListFragment.kt
@@ -141,7 +141,7 @@ class MessageListFragment : ServiceBoundFragment() {
true
} ?: false
}
- R.id.action_copy -> {
+ R.id.action_copy -> {
val builder = SpannableStringBuilder()
viewModel.selectedMessages.value.values.asSequence().sortedBy {
it.original.messageId
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/NetworkAdapter.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/NetworkAdapter.kt
index 2c3a3b408..aedf2d7c6 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/NetworkAdapter.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/chatlist/NetworkAdapter.kt
@@ -34,7 +34,8 @@ import de.kuschku.quasseldroid.R
import de.kuschku.quasseldroid.util.ui.ContextThemeWrapper
import de.kuschku.quasseldroid.util.ui.RecyclerSpinnerAdapter
-class NetworkAdapter(@StringRes private val fallbackName: Int) : RecyclerSpinnerAdapter<NetworkAdapter.NetworkViewHolder>(),
+class NetworkAdapter(@StringRes private val fallbackName: Int) :
+ RecyclerSpinnerAdapter<NetworkAdapter.NetworkViewHolder>(),
ThemedSpinnerAdapter {
var data = listOf<INetwork.NetworkInfo?>(null)
@@ -73,7 +74,8 @@ class NetworkAdapter(@StringRes private val fallbackName: Int) : RecyclerSpinner
override fun getItemId(position: Int) = getItem(position)?.networkId?.toLong() ?: -1
override fun hasStableIds() = true
override fun getCount() = data.size
- class NetworkViewHolder(@StringRes private val fallbackName: Int, itemView: View) : RecyclerView.ViewHolder(itemView) {
+ class NetworkViewHolder(@StringRes private val fallbackName: Int, itemView: View) :
+ RecyclerView.ViewHolder(itemView) {
@BindView(android.R.id.text1)
lateinit var text: TextView
diff --git a/settings.gradle b/settings.gradle
index ee35cd847..da7acbdfd 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -17,14 +17,14 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-include ':invokerannotations',
- ':invokergenerator',
- ':lib',
- ':lifecycle-ktx',
- ':desktop',
- ":viewmodel",
- ":persistence",
- ':malheur',
- ':app'
-
rootProject.buildFileName = 'build.gradle.kts'
+
+include ':app',
+ ':desktop',
+ ':invokerannotations',
+ ':invokergenerator',
+ ':lib',
+ ':lifecycle-ktx',
+ ':malheur',
+ ":persistence",
+ ":viewmodel"
--
GitLab