Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Android into...

Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Android into new/analytics-for-password-reset

app/src/main/java/chat/rocket/android/authentication/server/ui/ServerFragment.kt

@@ -245,7 +245,7 @@ class ServerFragment : Fragment(), ServerView {
         serverUrlDisposable = text_server_url.asObservable()
             .filter { it.isNotBlank() }
             .subscribe {
-                if (it.toString().isValidUrl()) {
+                if ("$protocol${it.toString()}".isValidUrl()) {
                     enableButtonConnect()
                 } else {
                     disableButtonConnect()

app/src/main/java/chat/rocket/android/chatroom/adapter/BaseViewHolder.kt

@@ -18,7 +18,9 @@ import chat.rocket.android.util.extensions.toList
 import chat.rocket.core.model.Message
 import chat.rocket.core.model.isSystemMessage
 import com.google.android.flexbox.FlexDirection
+import com.google.android.flexbox.FlexWrap
 import com.google.android.flexbox.FlexboxLayoutManager
+import com.google.android.flexbox.JustifyContent
 
 abstract class BaseViewHolder<T : BaseUiModel<*>>(
     itemView: View,
@@ -41,13 +43,12 @@ abstract class BaseViewHolder<T : BaseUiModel<*>>(
     private fun bindReactions() {
         data?.let {
             val recyclerView = itemView.findViewById(R.id.recycler_view_reactions) as RecyclerView
-            val adapter: MessageReactionsAdapter
-            if (recyclerView.adapter == null) {
-                adapter = MessageReactionsAdapter()
+            val adapter: MessageReactionsAdapter = if (recyclerView.adapter == null) {
+                MessageReactionsAdapter()
             } else {
-                adapter = recyclerView.adapter as MessageReactionsAdapter
-                adapter.clear()
+                recyclerView.adapter as MessageReactionsAdapter
             }
+            adapter.clear()
 
             if (it.nextDownStreamMessage == null) {
                 adapter.listener = object : EmojiReactionListener {
@@ -61,13 +62,16 @@ abstract class BaseViewHolder<T : BaseUiModel<*>>(
                         }
                     }
                 }
+
                 val context = itemView.context
                 val manager = FlexboxLayoutManager(context, FlexDirection.ROW)
+                manager.justifyContent = JustifyContent.FLEX_START
                 recyclerView.layoutManager = manager
                 recyclerView.adapter = adapter
-                adapter.addReactions(it.reactions.filterNot { reactionUiModel ->
-                    reactionUiModel.unicode.startsWith(":") && reactionUiModel.url.isNullOrEmpty()
-                })
+
+                if (it.reactions.isNotEmpty()) {
+                    itemView.post { adapter.addReactions(it.reactions) }
+                }
             }
         }
     }
@@ -129,4 +133,4 @@ abstract class BaseViewHolder<T : BaseUiModel<*>>(
         }
         return true
     }
-}
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatroom/adapter/MessageReactionsAdapter.kt

@@ -4,7 +4,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
-import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import chat.rocket.android.R
@@ -35,17 +34,17 @@ class MessageReactionsAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>()
             }
             else -> {
                 view = inflater.inflate(R.layout.item_reaction, parent, false)
-                SingleReactionViewHolder(view, listener)
+                ReactionViewHolder(view, listener)
             }
         }
     }
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        if (holder is SingleReactionViewHolder) {
+        if (holder is ReactionViewHolder) {
             holder.bind(reactions[position])
         } else {
             holder as AddReactionViewHolder
-            holder.bind(reactions[0].messageId)
+            holder.bind(reactions.first().messageId)
         }
     }
 
@@ -73,7 +72,7 @@ class MessageReactionsAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>()
     fun contains(reactionShortname: String) =
         reactions.firstOrNull { it.shortname == reactionShortname } != null
 
-    class SingleReactionViewHolder(
+    class ReactionViewHolder(
         view: View,
         private val listener: EmojiReactionListener?
     ) : RecyclerView.ViewHolder(view), View.OnClickListener {
@@ -97,9 +96,11 @@ class MessageReactionsAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>()
             this.reaction = reaction
             with(itemView) {
                 if (reaction.url.isNullOrEmpty()) {
-                    text_emoji.text = reaction.unicode
+                    // The view at index 0 corresponds to the one to display unicode text emoji.
                     view_flipper_reaction.displayedChild = 0
+                    text_emoji.text = reaction.unicode
                 } else {
+                    // The view at index 1 corresponds to the one to display custom emojis which are images.
                     view_flipper_reaction.displayedChild = 1
                     val glideRequest = if (reaction.url!!.endsWith("gif", true)) {
                         GlideApp.with(context).asGif()
@@ -110,15 +111,16 @@ class MessageReactionsAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>()
                     glideRequest.load(reaction.url).into(image_emoji)
                 }
 
-                text_count.text = reaction.count.toString()
                 val myself = localRepository.get(LocalRepository.CURRENT_USERNAME_KEY)
                 if (reaction.usernames.contains(myself)) {
                     val context = itemView.context
                     text_count.setTextColor(ContextCompat.getColor(context, R.color.colorAccent))
                 }
 
-                view_flipper_reaction.setOnClickListener(this@SingleReactionViewHolder)
-                text_count.setOnClickListener(this@SingleReactionViewHolder)
+                text_count.text = reaction.count.toString()
+
+                view_flipper_reaction.setOnClickListener(this@ReactionViewHolder)
+                text_count.setOnClickListener(this@ReactionViewHolder)
             }
         }
 

app/src/main/java/chat/rocket/android/dagger/LocalComponent.kt

@@ -19,7 +19,7 @@ interface LocalComponent {
         fun build(): LocalComponent
     }
 
-    fun inject(adapter: MessageReactionsAdapter.SingleReactionViewHolder)
+    fun inject(adapter: MessageReactionsAdapter.ReactionViewHolder)
     fun inject(adapter: MessageReactionsAdapter.AddReactionViewHolder)
 
     /*@Component.Builder

app/src/main/java/chat/rocket/android/dagger/module/AppModule.kt

@@ -40,6 +40,10 @@ import chat.rocket.android.server.domain.PermissionsRepository
 import chat.rocket.android.server.domain.SettingsRepository
 import chat.rocket.android.server.domain.TokenRepository
 import chat.rocket.android.server.domain.UsersRepository
+import chat.rocket.android.server.domain.BasicAuthRepository
+import chat.rocket.android.server.domain.GetBasicAuthInteractor
+import chat.rocket.android.server.domain.SaveBasicAuthInteractor
+import chat.rocket.android.server.infraestructure.SharedPrefsBasicAuthRepository
 import chat.rocket.android.server.infraestructure.DatabaseMessageMapper
 import chat.rocket.android.server.infraestructure.DatabaseMessagesRepository
 import chat.rocket.android.server.infraestructure.JobSchedulerInteractorImpl
@@ -53,6 +57,7 @@ import chat.rocket.android.server.infraestructure.SharedPrefsConnectingServerRep
 import chat.rocket.android.server.infraestructure.SharedPrefsCurrentServerRepository
 import chat.rocket.android.util.AppJsonAdapterFactory
 import chat.rocket.android.util.HttpLoggingInterceptor
+import chat.rocket.android.util.BasicAuthenticatorInterceptor
 import chat.rocket.android.util.TimberLogger
 import chat.rocket.common.internal.FallbackSealedClassJsonAdapter
 import chat.rocket.common.internal.ISO8601Date
@@ -106,9 +111,22 @@ class AppModule {
 
     @Provides
     @Singleton
-    fun provideOkHttpClient(logger: HttpLoggingInterceptor): OkHttpClient {
+    fun provideBasicAuthenticatorInterceptor(
+        getBasicAuthInteractor: GetBasicAuthInteractor,
+        saveBasicAuthInteractor: SaveBasicAuthInteractor
+    ): BasicAuthenticatorInterceptor {
+        return BasicAuthenticatorInterceptor(
+            getBasicAuthInteractor,
+            saveBasicAuthInteractor
+        )
+    }
+
+    @Provides
+    @Singleton
+    fun provideOkHttpClient(logger: HttpLoggingInterceptor, basicAuthenticator: BasicAuthenticatorInterceptor): OkHttpClient {
         return OkHttpClient.Builder()
             .addInterceptor(logger)
+            .addInterceptor(basicAuthenticator)
             .connectTimeout(15, TimeUnit.SECONDS)
             .readTimeout(20, TimeUnit.SECONDS)
             .writeTimeout(15, TimeUnit.SECONDS)
@@ -273,6 +291,14 @@ class AppModule {
         return MessageParser(context, configuration, settingsInteractor.get(url))
     }
 
+    @Provides
+    @Singleton
+    fun provideBasicAuthRepository (
+        preferences: SharedPreferences,
+        moshi: Moshi
+    ): BasicAuthRepository = 
+        SharedPrefsBasicAuthRepository(preferences, moshi)
+
     @Provides
     @Singleton
     fun provideAccountsRepository(

app/src/main/java/chat/rocket/android/db/MessageDao.kt

@@ -40,7 +40,7 @@ abstract class  MessageDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     abstract fun insert(field: AttachmentFieldEntity)
 
-    @Insert(onConflict = OnConflictStrategy.IGNORE)
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
     abstract fun insert(reaction: ReactionEntity)
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)

app/src/main/java/chat/rocket/android/main/presentation/MainPresenter.kt

 package chat.rocket.android.main.presentation
 
 import android.content.Context
+import chat.rocket.android.R
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.db.DatabaseManagerFactory
 import chat.rocket.android.emoji.Emoji

app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt

@@ -232,6 +232,15 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
         toolbar.setNavigationOnClickListener { openDrawer() }
     }
 
+    fun showLogoutDialog() {
+        val builder = AlertDialog.Builder(this)
+        builder.setTitle(R.string.action_logout)
+        builder.setMessage(R.string.title_confirmation)
+        builder.setPositiveButton(R.string.action_logout) { _, _ -> presenter.logout()}
+            .setNegativeButton(R.string.action_stay) { dialog, _ -> dialog.cancel() }
+        builder.create().show()
+    }
+
     fun setAvatar(avatarUrl: String) {
         headerLayout.image_avatar.setImageURI(avatarUrl)
     }

app/src/main/java/chat/rocket/android/main/ui/Menu.kt

@@ -64,6 +64,6 @@ internal fun MainActivity.onNavDrawerItemSelected(menuItem: MenuItem) {
         R.id.menu_action_profile -> presenter.toUserProfile()
         R.id.menu_action_settings -> presenter.toSettings()
         R.id.menu_action_admin_panel -> presenter.toAdminPanel()
-        R.id.menu_action_logout -> presenter.logout()
+        R.id.menu_action_logout -> showLogoutDialog()
     }
 }

app/src/main/java/chat/rocket/android/server/domain/BasicAuthRepository.kt

+package chat.rocket.android.server.domain
+
+import chat.rocket.android.server.domain.model.BasicAuth
+
+interface BasicAuthRepository {
+    fun save(basicAuth: BasicAuth)
+    fun load(): List<BasicAuth>
+}

app/src/main/java/chat/rocket/android/server/domain/GetBasicAuthInteractor.kt

+package chat.rocket.android.server.domain
+
+import javax.inject.Inject
+
+class GetBasicAuthInteractor @Inject constructor(val repository: BasicAuthRepository) {
+    fun getAll() = repository.load().listIterator()
+}

app/src/main/java/chat/rocket/android/server/domain/SaveBasicAuthInteractor.kt

+package chat.rocket.android.server.domain
+
+import chat.rocket.android.server.domain.model.BasicAuth
+import javax.inject.Inject
+
+class SaveBasicAuthInteractor @Inject constructor(val repository: BasicAuthRepository) {
+    fun save(basicAuth: BasicAuth) = repository.save(basicAuth)
+}

app/src/main/java/chat/rocket/android/server/domain/model/BasicAuth.kt

+package chat.rocket.android.server.domain.model
+
+import se.ansman.kotshi.JsonSerializable
+
+@JsonSerializable
+data class BasicAuth(
+    val host: String,
+    val credentials: String
+)

app/src/main/java/chat/rocket/android/server/infraestructure/SharedPrefsBasicAuthRepository.kt

+package chat.rocket.android.server.infraestructure
+
+import android.content.SharedPreferences
+import androidx.core.content.edit
+import chat.rocket.android.server.domain.BasicAuthRepository
+import chat.rocket.android.server.domain.model.BasicAuth
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.Types
+
+private const val BASICAUTHS_KEY = "BASICAUTHS_KEY"
+
+class SharedPrefsBasicAuthRepository(
+    private val preferences: SharedPreferences,
+    private val moshi: Moshi
+) : BasicAuthRepository {
+
+    override fun save(basicAuth: BasicAuth) {
+        val newList = load().filter { basicAuth -> basicAuth.host != basicAuth.host }
+            .toMutableList()
+        newList.add(0, basicAuth)
+        save(newList)
+    }
+
+    override fun load(): List<BasicAuth> {
+        val json = preferences.getString(BASICAUTHS_KEY, "[]")
+        val type = Types.newParameterizedType(List::class.java, BasicAuth::class.java)
+        val adapter = moshi.adapter<List<BasicAuth>>(type)
+
+        return adapter.fromJson(json) ?: emptyList()
+    }
+
+    private fun save(basicAuths: List<BasicAuth>) {
+        val type = Types.newParameterizedType(List::class.java, BasicAuth::class.java)
+        val adapter = moshi.adapter<List<BasicAuth>>(type)
+        preferences.edit {
+            putString(BASICAUTHS_KEY, adapter.toJson(basicAuths))
+        }
+    }
+}

app/src/main/java/chat/rocket/android/util/BasicAuthenticatorInterceptor.kt

+package chat.rocket.android.util
+
+import okhttp3.Interceptor
+import okhttp3.OkHttpClient
+import okhttp3.Response
+import okhttp3.Credentials
+import java.io.IOException
+import chat.rocket.android.server.domain.model.BasicAuth
+import chat.rocket.android.server.domain.GetBasicAuthInteractor
+import chat.rocket.android.server.domain.SaveBasicAuthInteractor
+
+import javax.inject.Inject
+
+/**
+ * An OkHttp interceptor which adds Authorization header based on URI userInfo
+ * part. Can be applied as an
+ * [application interceptor][OkHttpClient.interceptors]
+ * or as a [ ][OkHttpClient.networkInterceptors].
+ */
+class BasicAuthenticatorInterceptor @Inject constructor (
+    private val getBasicAuthInteractor: GetBasicAuthInteractor,
+    private val saveBasicAuthInteractor: SaveBasicAuthInteractor
+): Interceptor {
+    private val credentials = HashMap<String, String>()
+
+    init {
+        val basicAuths = getBasicAuthInteractor.getAll()
+        for (basicAuth in basicAuths){
+            credentials[basicAuth.host] = basicAuth.credentials
+        }
+    }
+
+    private fun saveCredentials(host: String, basicCredentials: String) {
+        saveBasicAuthInteractor.save(
+            BasicAuth(
+                host,
+                basicCredentials
+            )
+        )
+        credentials[host] = basicCredentials
+    }
+
+    @Throws(IOException::class)
+    override fun intercept(chain: Interceptor.Chain): Response {
+        var request = chain.request()
+        val url = request.url()
+        val host = url.host()
+        val username = url.username()
+
+        if (!username.isNullOrEmpty()) {
+            saveCredentials(host, Credentials.basic(username, url.password()))
+            request = request.newBuilder().url(
+                url.newBuilder().username("").password("").build()
+            ).build()
+        }
+
+        credentials[host]?.let {
+            request = request.newBuilder().header("Authorization", it).build()
+        }
+
+        return chain.proceed(request)
+    }
+}

app/src/main/res/layout/item_reaction.xml

 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="horizontal"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginEnd="2dp"
@@ -10,7 +11,7 @@
     <ViewFlipper
         android:id="@+id/view_flipper_reaction"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/text_count"
         app:layout_constraintStart_toStartOf="parent"
@@ -19,12 +20,13 @@
         <TextView
             android:id="@+id/text_emoji"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:ellipsize="end"
+            android:gravity="center"
             android:maxLines="1"
             android:paddingStart="4dp"
             android:paddingLeft="4dp"
-            android:textColor="#868585"
+            android:textColor="@color/reaction_text"
             android:textSize="16sp"
             tools:text=":)" />
 
@@ -48,13 +50,12 @@
         android:paddingEnd="4dp"
         android:paddingRight="4dp"
         android:paddingBottom="4dp"
-        android:textColor="#868585"
+        android:textColor="@color/reaction_text"
         android:textSize="16sp"
         android:textStyle="bold"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/view_flipper_reaction"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="12" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>

app/src/main/res/layout/layout_reactions.xml

@@ -2,4 +2,4 @@
 <androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/recycler_view_reactions"
     android:layout_width="wrap_content"
-    android:layout_height="wrap_content" />
+    android:layout_height="wrap_content" />
\ No newline at end of file

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

@@ -20,6 +20,7 @@
     <string name="title_update_profile">Update Profil</string>
     <string name="title_about">Über</string>
     <string name="title_create_channel">Erstelle Raum</string>
+    <string name="title_confirmation">Are You Sure you want to logout?</string><!-- TODO Add translation -->
 
     <!-- Actions -->
     <string name="action_connect">Verbinde</string>
@@ -33,6 +34,7 @@
     <string name="action_create_channel">Erstelle Raum</string>
     <string name="action_create">Erstelle</string>
     <string name="action_logout">Abmelden</string>
+    <string name="action_stay">Stay</string> <!-- TODO Add translation -->
     <string name="action_files">Dateien</string>
     <string name="action_confirm_password">Bestätige Passwort Änderung</string>
     <string name="action_join_chat">Trete Chat bei</string>

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

@@ -19,7 +19,7 @@
     <string name="title_update_profile">Actualización del perfil</string>
     <string name="title_about">Acerca de</string>
     <string name="title_create_channel">Crear canal</string>
-
+    <string name="title_confirmation">Are You Sure you want to logout?</string> <!-- TODO Add translation -->
     <!-- Actions -->
     <string name="action_connect">Conectar</string>
     <string name="action_use_this_username">Usa este nombre de usuario</string>
@@ -32,6 +32,7 @@
     <string name="action_create_channel">Crear canal</string>
     <string name="action_create">Create</string>
     <string name="action_logout">Cerrar sesión</string>
+    <string name="action_stay">Stay</string> <!-- TODO Add translation -->
     <string name="action_files">Archivos</string>
     <string name="action_confirm_password">Confirmar cambio de contraseña</string>
     <string name="action_join_chat">Unirse al chat</string>

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

@@ -20,6 +20,8 @@
     <string name="title_update_profile">Mettre à jour le profil</string>
     <string name="title_about">À propos</string>
     <string name="title_create_channel">Créer salon</string>
+    <string name="title_confirmation">Are You Sure you want to logout?</string> <!-- TODO Add translation -->
+
 
 
     <!-- Actions -->
@@ -34,6 +36,7 @@
     <string name="action_create_channel">Créer salon</string>
     <string name="action_create">Créer</string>
     <string name="action_logout">Se déconnecter</string>
+    <string name="action_stay">Stay</string> <!-- TODO Add translation -->
     <string name="action_files">Fichiers</string>
     <string name="action_confirm_password">Confirmer le mot de passe</string>
     <string name="action_join_chat">Rejoignez le chat</string>

app/src/main/res/values-hi-rIN/strings.xml

@@ -20,6 +20,8 @@
     <string name="title_update_profile">प्रोफ़ाइल अपडेट करें</string>
     <string name="title_about">परिचय</string>
     <string name="title_create_channel">चैनल बनाएं</string>
+    <string name="title_confirmation">Are You Sure you want to logout?</string> <!-- TODO Add translation -->
+
 
     <!-- Actions -->
     <string name="action_connect">जुडिये</string>
@@ -33,6 +35,7 @@
     <string name="action_create_channel">चैनल बनाएं</string>
     <string name="action_create">बनाएं</string>
     <string name="action_logout">लोग आउट करें</string>
+    <string name="action_stay">Stay</string> <!-- TODO Add translation -->
     <string name="action_files">फ़ाइलें</string>
     <string name="action_confirm_password">पासवर्ड परिवर्तन की पुष्टि करें</string>
     <string name="action_join_chat">चैट में शामिल हों</string>

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

@@ -22,6 +22,8 @@
     <string name="title_update_profile">プロフィールの更新</string>
     <string name="title_about">About</string>
     <string name="title_create_channel">新しいチャネルを作成します</string>
+    <string name="title_confirmation">Are You Sure you want to logout?</string> <!-- TODO Add translation -->
+
 
     <!-- Actions -->
     <string name="action_connect">接続</string>
@@ -35,6 +37,7 @@
     <string name="action_create_channel">チャンネル作成</string>
     <string name="action_create">作ります</string>
     <string name="action_logout">ログアウト</string>
+    <string name="action_stay">Stay</string> <!-- TODO Add translation -->
     <string name="action_files">ファイル</string>
     <string name="action_confirm_password">変更したパスワードの確認</string>
     <string name="action_join_chat">チャットに参加</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -20,6 +20,8 @@
     <string name="title_update_profile">Editar perfil</string>
     <string name="title_about">Sobre</string>
     <string name="title_create_channel">Criar chat</string>
+    <string name="title_confirmation">Are You Sure you want to logout?</string> <!-- TODO Add translation -->
+
 
     <!-- Actions -->
     <string name="action_connect">Conectar</string>
@@ -33,6 +35,7 @@
     <string name="action_create_channel">Criar chat</string>
     <string name="action_create">Criar</string>
     <string name="action_logout">Sair</string>
+    <string name="action_stay">Stay</string> <!-- TODO Add translation -->
     <string name="action_files">Arquivos</string>
     <string name="action_confirm_password">Confirme a nova senha</string>
     <string name="action_join_chat">Entrar no Chat</string>

app/src/main/res/values-ru-rRU/strings.xml

@@ -20,6 +20,8 @@
     <string name="title_update_profile">Обновить профиль</string>
     <string name="title_about">О программе</string>
     <string name="title_create_channel">Создать новый канал</string>
+    <string name="title_confirmation">Are You Sure you want to logout?</string> <!-- TODO Add translation -->
+
 
     <!-- Actions -->
     <string name="action_connect">Подключиться</string>
@@ -33,6 +35,7 @@
     <string name="action_create_channel">Создать канал</string>
     <string name="action_create">Создать</string>
     <string name="action_logout">Выйти</string>
+    <string name="action_stay">Stay</string> <!-- TODO Add translation -->
     <string name="action_files">Файлы</string>
     <string name="action_confirm_password">Подтверждение изменения пароля</string>
     <string name="action_join_chat">Присоединиться к чату</string>

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

@@ -20,6 +20,8 @@
     <string name="title_update_profile">Profilinizi Düzenleyin</string>
     <string name="title_about">Hakkında</string>
     <string name="title_create_channel">Yeni Kanal Oluştur</string>
+    <string name="title_confirmation">Are You Sure you want to logout?</string> <!-- TODO Add translation -->
+
 
     <!-- Actions -->
     <string name="action_connect">Bağlan</string>
@@ -33,6 +35,7 @@
     <string name="action_create_channel">Yeni Kanal Oluştur</string>
     <string name="action_create">Oluştur</string>
     <string name="action_logout">Çıkış Yap</string>
+    <string name="action_stay">Stay</string> <!-- TODO Add translation -->
     <string name="action_files">Dosyalar</string>
     <string name="action_confirm_password">Şifre Değişikliğini Onaylayın</string>
     <string name="action_join_chat">Sohbete Bağlan</string>

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

@@ -20,6 +20,8 @@
     <string name="title_update_profile">Оновити профіль</string>
     <string name="title_about">"Про програму"</string>
     <string name="title_create_channel">Створити новий канал</string>
+    <string name="title_confirmation">Are You Sure you want to logout?</string> <!-- TODO Add translation -->
+
 
     <!-- Actions -->
     <string name="action_connect">Підключитися</string>
@@ -33,6 +35,7 @@
     <string name="action_create_channel">Створити канал</string>
     <string name="action_create">Створити</string>
     <string name="action_logout">Вийти</string>
+    <string name="action_stay">Stay</string> <!-- TODO Add translation -->
     <string name="action_files">Файли</string>
     <string name="action_confirm_password">Підтвердження зміни пароля</string>
     <string name="action_join_chat">Приєднатися до чату</string>

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

@@ -59,4 +59,6 @@
 
     <!-- Default Background Color -->
     <color name="default_background">#FAFAFA</color>
+
+    <color name="reaction_text">#868585</color>
 </resources>

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

@@ -32,6 +32,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="title_update_profile">Update profile</string>
     <string name="title_about">About</string>
     <string name="title_create_channel">Create Channel</string>
+    <string name="title_confirmation">Are You Sure you want to logout?</string>
 
     <!-- Actions -->
     <string name="action_connect">Connect</string>
@@ -45,6 +46,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="action_create_channel">Create channel</string>
     <string name="action_create">Create</string>
     <string name="action_logout">Logout</string>
+    <string name="action_stay">Stay</string>
     <string name="action_files">Files</string>
     <string name="action_confirm_password">Confirm Password Change</string>
     <string name="action_join_chat">Join Chat</string>

dependencies.gradle

@@ -25,7 +25,7 @@ ext {
             firebaseAnalytics     : '16.0.3',
             playServices          : '16.0.0',
             exoPlayer             : '2.8.2',
-            flexbox               : '1.0.0',
+            flexbox               : '1.1.0',
             material              : '1.0.0-beta01',
 
             room                  : '2.0.0',