First version of channel and user info screen

app/src/main/res/values/strings.xml

@@ -17,6 +17,7 @@
   <string name="label_crashes">Crashes</string>
   <string name="label_delete">Delete</string>
   <string name="label_delete_all">Delete All</string>
+  <string name="label_details">Details</string>
   <string name="label_disconnect">Disconnect</string>
   <string name="label_filter_messages">Filter Messages</string>
   <string name="label_github">GitHub</string>

lib/src/main/java/de/kuschku/libquassel/quassel/BufferInfo.kt

@@ -6,9 +6,13 @@ import de.kuschku.libquassel.util.Flags
 import de.kuschku.libquassel.util.ShortFlag
 import de.kuschku.libquassel.util.ShortFlags
 
-data class BufferInfo(var bufferId: Int, var networkId: Int, var type: Buffer_Types,
+data class BufferInfo(
+  var bufferId: Int,
+  var networkId: Int,
+  var type: Buffer_Types,
   var groupId: Int,
-                      var bufferName: String?) {
+  var bufferName: String?
+) {
   enum class Type(override val bit: Short) : ShortFlag<Type> {
     InvalidBuffer(0x00),
     StatusBuffer(0x01),

lib/src/main/java/de/kuschku/libquassel/quassel/syncables/IrcChannel.kt

@@ -124,6 +124,7 @@ class IrcChannel(
     _userModes.getOr(ircUser, "")
   }
 
+  fun userModes(): Map<IrcUser, String> = _userModes
   fun userModes(nick: String) = network().ircUser(nick)?.let { userModes(it) } ?: ""
   fun liveUserModes(nick: String) = network().ircUser(nick)?.let { userModes(it) } ?: ""
 
@@ -370,10 +371,10 @@ class IrcChannel(
   private var _codecForEncoding: Charset? = null
   private var _codecForDecoding: Charset? = null
 
-  private var _A_channelModes: MutableMap<Char, MutableSet<String>> = mutableMapOf()
-  private var _B_channelModes: MutableMap<Char, String> = mutableMapOf()
-  private var _C_channelModes: MutableMap<Char, String> = mutableMapOf()
-  private var _D_channelModes: MutableSet<Char> = mutableSetOf()
+  var _A_channelModes: MutableMap<Char, MutableSet<String>> = mutableMapOf()
+  var _B_channelModes: MutableMap<Char, String> = mutableMapOf()
+  var _C_channelModes: MutableMap<Char, String> = mutableMapOf()
+  var _D_channelModes: MutableSet<Char> = mutableSetOf()
 
   companion object {
     val NULL = IrcChannel("", Network.NULL, SignalProxy.NULL)

lib/src/main/java/de/kuschku/libquassel/quassel/syncables/Network.kt

@@ -262,6 +262,9 @@ class Network constructor(
     }
   }
 
+  fun channelModes(): Map<ChannelModeType, Set<Char>>? = _channelModes
+
+  fun supports(): Map<String, String> = _supports
   fun supports(param: String) = _supports.contains(param.toUpperCase(Locale.US))
   fun support(param: String) = _supports.getOr(param, "")
   /**
@@ -431,7 +434,7 @@ class Network constructor(
     if (_connectionState == actualConnectionState)
       return
     _connectionState = actualConnectionState
-    liveConnectionState.onNext(_connectionState)
+    live_connectionState.onNext(_connectionState)
     super.setConnectionState(state)
   }
 
@@ -884,7 +887,7 @@ class Network constructor(
   private var _currentServer: String = ""
   private var _connected: Boolean = false
   private var _connectionState: ConnectionState = ConnectionState.Disconnected
-  val liveConnectionState = BehaviorSubject.createDefault(ConnectionState.Disconnected)
+  val live_connectionState = BehaviorSubject.createDefault(ConnectionState.Disconnected)
   private var _prefixes: List<Char>? = null
   private var _prefixModes: List<Char>? = null
   private var _channelModes: Map<ChannelModeType, Set<Char>>? = null

viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/QuasselViewModel.kt

@@ -110,7 +110,7 @@ class QuasselViewModel : ViewModel() {
                 it.updates().map { user ->
                   BufferData(
                     info = info,
-                    network = network.networkInfo(),
+                    network = network,
                     description = user.realName()
                   )
                 }
@@ -123,17 +123,17 @@ class QuasselViewModel : ViewModel() {
                 channel.liveTopic().map { topic ->
                   BufferData(
                     info = info,
-                    network = network.networkInfo(),
+                    network = network,
                     description = topic
                   )
                 }
               }
             }
             BufferInfo.Type.StatusBuffer.toInt()  -> {
-              network.liveConnectionState.map {
+              network.live_connectionState.map {
                 BufferData(
                   info = info,
-                  network = network.networkInfo()
+                  network = network
                 )
               }
             }
@@ -315,7 +315,7 @@ class QuasselViewModel : ViewModel() {
           val network = session.networks[info.networkId]
           when (info.type.enabledValues().firstOrNull()) {
             Buffer_Type.StatusBuffer  -> {
-              network?.liveConnectionState?.map {
+              network?.live_connectionState?.map {
                 SelectedBufferItem(
                   info,
                   connectionState = it,
@@ -422,7 +422,7 @@ class QuasselViewModel : ViewModel() {
                           }
                         }
                         BufferInfo.Type.StatusBuffer.toInt()  -> {
-                          network.liveConnectionState.map {
+                          network.live_connectionState.map {
                             BufferProps(
                               info = info,
                               network = network.networkInfo(),

viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferData.kt

 package de.kuschku.quasseldroid.viewmodel.data
 
 import de.kuschku.libquassel.quassel.BufferInfo
+import de.kuschku.libquassel.quassel.syncables.Network
 import de.kuschku.libquassel.quassel.syncables.interfaces.INetwork
 
 data class BufferData(
   val info: BufferInfo? = null,
-  val network: INetwork.NetworkInfo? = null,
+  val network: Network? = null,
   val description: String? = null
 )
\ No newline at end of file

viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/InfoGroup.kt

+package de.kuschku.quasseldroid.viewmodel.data
+
+data class InfoGroup(
+  val name: String? = null,
+  val properties: List<InfoProperty>
+)
\ No newline at end of file

viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/InfoProperty.kt

+package de.kuschku.quasseldroid.viewmodel.data
+
+import android.support.annotation.DrawableRes
+
+data class InfoProperty(
+  val name: CharSequence? = null,
+  @DrawableRes val icon: Int? = null,
+  val value: CharSequence
+)
\ No newline at end of file