Merge pull request #12 from RocketChat/develop

merge

app/src/main/AndroidManifest.xml

@@ -6,6 +6,7 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <permission
         android:name="${applicationId}.permission.C2D_MESSAGE"

app/src/main/java/chat/rocket/android/authentication/login/presentation/LoginPresenter.kt

@@ -59,6 +59,7 @@ class LoginPresenter @Inject constructor(
         setupConnectionInfo(currentServer)
         setupLoginView()
         setupUserRegistrationView()
+        setupForgotPasswordView()
         setupCasView()
         setupOauthServicesView()
     }
@@ -107,6 +108,8 @@ class LoginPresenter @Inject constructor(
 
     fun signup() = navigator.toSignUp()
 
+    fun forgotPassword() = navigator.toForgotPassword()
+
     private fun setupLoginView() {
         if (settings.isLoginFormEnabled()) {
             view.showFormView()
@@ -127,8 +130,15 @@ class LoginPresenter @Inject constructor(
 
     private fun setupUserRegistrationView() {
         if (settings.isRegistrationEnabledForNewUsers() && settings.isLoginFormEnabled()) {
-            view.showSignUpView()
             view.setupSignUpView()
+            view.showSignUpView()
+        }
+    }
+
+    private fun setupForgotPasswordView() {
+        if (settings.isPasswordResetEnabled()) {
+            view.setupForgotPasswordView()
+            view.showForgotPasswordView()
         }
     }
 

app/src/main/java/chat/rocket/android/authentication/login/presentation/LoginView.kt

@@ -65,6 +65,18 @@ interface LoginView : LoadingView, MessageView {
      */
     fun setupSignUpView()
 
+    /**
+     * Shows the forgot password view if enabled by the server settings.
+     *
+     * REMARK: We must set up the forgot password view listener [setupForgotPasswordView].
+     */
+    fun showForgotPasswordView()
+
+    /**
+     * Setups the forgot password view when tapped.
+     */
+    fun setupForgotPasswordView()
+
     /**
      * Hides the sign up view.
      */

app/src/main/java/chat/rocket/android/authentication/login/ui/LoginFragment.kt

@@ -240,6 +240,27 @@ class LoginFragment : Fragment(), LoginView {
         }
     }
 
+    override fun showForgotPasswordView() {
+        ui {
+            text_forgot_your_password.isVisible = true
+        }
+    }
+
+    override fun setupForgotPasswordView() {
+        ui {
+            val reset = getString(R.string.msg_reset)
+            val forgotPassword = String.format(getString(R.string.msg_forgot_password), reset)
+
+            text_forgot_your_password.text = forgotPassword
+
+            val resetListener = object : ClickableSpan() {
+                override fun onClick(view: View) = presenter.forgotPassword()
+            }
+
+            TextHelper.addLink(text_forgot_your_password, arrayOf(reset), arrayOf(resetListener))
+        }
+    }
+
     override fun hideSignUpView() {
         ui {
             text_new_to_rocket_chat.isVisible = false

app/src/main/java/chat/rocket/android/authentication/presentation/AuthenticationNavigator.kt

@@ -5,6 +5,7 @@ import chat.rocket.android.R
 import chat.rocket.android.authentication.domain.model.LoginDeepLinkInfo
 import chat.rocket.android.authentication.login.ui.LoginFragment
 import chat.rocket.android.authentication.registerusername.ui.RegisterUsernameFragment
+import chat.rocket.android.authentication.resetpassword.ui.ResetPasswordFragment
 import chat.rocket.android.authentication.signup.ui.SignupFragment
 import chat.rocket.android.authentication.twofactor.ui.TwoFAFragment
 import chat.rocket.android.authentication.ui.AuthenticationActivity
@@ -12,6 +13,7 @@ import chat.rocket.android.authentication.ui.newServerIntent
 import chat.rocket.android.main.ui.MainActivity
 import chat.rocket.android.server.ui.changeServerIntent
 import chat.rocket.android.util.extensions.addFragmentBackStack
+import chat.rocket.android.util.extensions.toPreviousView
 import chat.rocket.android.webview.ui.webViewIntent
 
 class AuthenticationNavigator(internal val activity: AuthenticationActivity) {
@@ -28,6 +30,10 @@ class AuthenticationNavigator(internal val activity: AuthenticationActivity) {
         }
     }
 
+    fun toPreviousView() {
+        activity.toPreviousView()
+    }
+
     fun toTwoFA(username: String, password: String) {
         activity.addFragmentBackStack("TwoFAFragment", R.id.fragment_container) {
             TwoFAFragment.newInstance(username, password)
@@ -40,6 +46,12 @@ class AuthenticationNavigator(internal val activity: AuthenticationActivity) {
         }
     }
 
+    fun toForgotPassword() {
+        activity.addFragmentBackStack("ResetPasswordFragment", R.id.fragment_container) {
+            ResetPasswordFragment.newInstance()
+        }
+    }
+
     fun toWebPage(url: String) {
         activity.startActivity(activity.webViewIntent(url))
         activity.overridePendingTransition(R.anim.slide_up, R.anim.hold)

app/src/main/java/chat/rocket/android/authentication/registerusername/ui/RegisterUsernameFragment.kt

@@ -16,7 +16,8 @@ import kotlinx.android.synthetic.main.fragment_authentication_register_username.
 import javax.inject.Inject
 
 class RegisterUsernameFragment : Fragment(), RegisterUsernameView {
-    @Inject lateinit var presenter: RegisterUsernamePresenter
+    @Inject
+    lateinit var presenter: RegisterUsernamePresenter
     private lateinit var userId: String
     private lateinit var authToken: String
 
@@ -41,7 +42,11 @@ class RegisterUsernameFragment : Fragment(), RegisterUsernameView {
         authToken = arguments?.getString(AUTH_TOKEN) ?: ""
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? = container?.inflate(R.layout.fragment_authentication_register_username)
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? = container?.inflate(R.layout.fragment_authentication_register_username)
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)

app/src/main/java/chat/rocket/android/authentication/resetpassword/di/ResetPasswordFragmentModule.kt

+package chat.rocket.android.authentication.resetpassword.di
+
+import android.arch.lifecycle.LifecycleOwner
+import chat.rocket.android.authentication.resetpassword.presentation.ResetPasswordView
+import chat.rocket.android.authentication.resetpassword.ui.ResetPasswordFragment
+import chat.rocket.android.core.lifecycle.CancelStrategy
+import chat.rocket.android.dagger.scope.PerFragment
+import dagger.Module
+import dagger.Provides
+import kotlinx.coroutines.experimental.Job
+
+@Module
+@PerFragment
+class ResetPasswordFragmentModule {
+
+    @Provides
+    fun resetPasswordView(frag: ResetPasswordFragment): ResetPasswordView {
+        return frag
+    }
+
+    @Provides
+    fun provideLifecycleOwner(frag: ResetPasswordFragment): LifecycleOwner {
+        return frag
+    }
+
+    @Provides
+    fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy {
+        return CancelStrategy(owner, jobs)
+    }
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/authentication/resetpassword/di/ResetPasswordFragmentProvider.kt

+package chat.rocket.android.authentication.resetpassword.di
+
+import chat.rocket.android.authentication.resetpassword.ui.ResetPasswordFragment
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+
+@Module
+abstract class ResetPasswordFragmentProvider {
+
+    @ContributesAndroidInjector(modules = [ResetPasswordFragmentModule::class])
+    abstract fun provideResetPasswordFragment(): ResetPasswordFragment
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/authentication/resetpassword/presentation/ResetPasswordPresenter.kt

+package chat.rocket.android.authentication.resetpassword.presentation
+
+import chat.rocket.android.authentication.presentation.AuthenticationNavigator
+import chat.rocket.android.core.lifecycle.CancelStrategy
+import chat.rocket.android.server.domain.GetCurrentServerInteractor
+import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.util.extensions.isEmail
+import chat.rocket.android.util.extensions.launchUI
+import chat.rocket.android.util.retryIO
+import chat.rocket.common.RocketChatException
+import chat.rocket.common.RocketChatInvalidResponseException
+import chat.rocket.common.util.ifNull
+import chat.rocket.core.RocketChatClient
+import chat.rocket.core.internal.rest.forgotPassword
+import javax.inject.Inject
+
+class ResetPasswordPresenter @Inject constructor(
+    private val view: ResetPasswordView,
+    private val strategy: CancelStrategy,
+    private val navigator: AuthenticationNavigator,
+    factory: RocketChatClientFactory,
+    serverInteractor: GetCurrentServerInteractor
+) {
+    private val currentServer = serverInteractor.get()!!
+    private val client: RocketChatClient = factory.create(currentServer)
+
+    fun resetPassword(email: String) {
+        when {
+            email.isBlank() -> view.alertBlankEmail()
+            !email.isEmail() -> view.alertInvalidEmail()
+            else -> launchUI(strategy) {
+                view.showLoading()
+                try {
+                    retryIO("forgotPassword(email = $email)") {
+                        client.forgotPassword(email)
+                    }
+                    navigator.toPreviousView()
+                    view.emailSent()
+                } catch (exception: RocketChatException) {
+                    if (exception is RocketChatInvalidResponseException) {
+                        view.updateYourServerVersion()
+                    } else {
+                        exception.message?.let {
+                            view.showMessage(it)
+                        }.ifNull {
+                            view.showGenericErrorMessage()
+                        }
+                    }
+                } finally {
+                    view.hideLoading()
+                }
+            }
+        }
+    }
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/authentication/resetpassword/presentation/ResetPasswordView.kt

+package chat.rocket.android.authentication.resetpassword.presentation
+
+import chat.rocket.android.core.behaviours.LoadingView
+import chat.rocket.android.core.behaviours.MessageView
+
+interface ResetPasswordView : LoadingView, MessageView {
+
+    /**
+     * Alerts the user about a blank email.
+     */
+    fun alertBlankEmail()
+
+    /**
+     * Alerts the user about a invalid email.
+     */
+    fun alertInvalidEmail()
+
+    /**
+     * Shows a successful email sent message.
+     */
+    fun emailSent()
+
+    /**
+     * Shows a message to update the server version in order to use an app feature.
+     */
+    fun updateYourServerVersion()
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/authentication/resetpassword/ui/ResetPasswordFragment.kt

+package chat.rocket.android.authentication.resetpassword.ui
+
+import DrawableHelper
+import android.os.Build
+import android.os.Bundle
+import android.support.v4.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Toast
+import chat.rocket.android.R
+import chat.rocket.android.authentication.resetpassword.presentation.ResetPasswordPresenter
+import chat.rocket.android.authentication.resetpassword.presentation.ResetPasswordView
+import chat.rocket.android.util.extensions.*
+import dagger.android.support.AndroidSupportInjection
+import kotlinx.android.synthetic.main.fragment_authentication_reset_password.*
+import javax.inject.Inject
+
+class ResetPasswordFragment : Fragment(), ResetPasswordView {
+    @Inject
+    lateinit var presenter: ResetPasswordPresenter
+
+    companion object {
+        fun newInstance() = ResetPasswordFragment()
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        AndroidSupportInjection.inject(this)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? = container?.inflate(R.layout.fragment_authentication_reset_password)
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        activity?.apply {
+            text_email.requestFocus()
+            showKeyboard(text_email)
+        }
+
+        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) {
+            tintEditTextDrawableStart()
+        }
+
+        setupOnClickListener()
+    }
+
+    override fun alertBlankEmail() {
+        ui {
+            vibrateShakeAndRequestFocusForTextEmail()
+        }
+    }
+
+    override fun alertInvalidEmail() {
+        ui {
+            vibrateShakeAndRequestFocusForTextEmail()
+            showMessage(R.string.msg_invalid_email)
+        }
+    }
+
+    override fun emailSent() {
+        showToast(R.string.msg_check_your_email_to_reset_your_password, Toast.LENGTH_LONG)
+    }
+
+    override fun updateYourServerVersion() {
+        showMessage(R.string.msg_update_app_version_in_order_to_continue)
+    }
+
+    override fun showLoading() {
+        ui {
+            disableUserInput()
+            view_loading.setVisible(true)
+        }
+    }
+
+    override fun hideLoading() {
+        ui {
+            view_loading.setVisible(false)
+            enableUserInput()
+        }
+    }
+
+    override fun showMessage(resId: Int) {
+        ui {
+            showToast(resId)
+        }
+    }
+
+    override fun showMessage(message: String) {
+        ui {
+            showToast(message)
+        }
+    }
+
+    override fun showGenericErrorMessage() {
+        showMessage(getString(R.string.msg_generic_error))
+    }
+
+    private fun tintEditTextDrawableStart() {
+        ui {
+            val emailDrawable = DrawableHelper.getDrawableFromId(R.drawable.ic_email_black_24dp, it)
+            DrawableHelper.wrapDrawable(emailDrawable)
+            DrawableHelper.tintDrawable(emailDrawable, it, R.color.colorDrawableTintGrey)
+            DrawableHelper.compoundDrawable(text_email, emailDrawable)
+        }
+    }
+
+    private fun enableUserInput() {
+        button_reset_password.isEnabled = true
+        text_email.isEnabled = true
+    }
+
+    private fun disableUserInput() {
+        button_reset_password.isEnabled = false
+        text_email.isEnabled = true
+    }
+
+    private fun vibrateShakeAndRequestFocusForTextEmail() {
+        vibrateSmartPhone()
+        text_email.shake()
+        text_email.requestFocus()
+    }
+
+    private fun setupOnClickListener() {
+        button_reset_password.setOnClickListener {
+            presenter.resetPassword(text_email.textContent)
+        }
+    }
+}
\ No newline at end of file

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

 package chat.rocket.android.chatroom.adapter
 
+import android.Manifest
+import android.app.Activity
+import android.graphics.Color
+import android.graphics.Typeface
+import android.media.MediaScannerConnection
+import android.net.Uri
+import android.os.Environment
+import android.support.design.widget.AppBarLayout
+import android.support.v7.widget.Toolbar
+import android.text.TextUtils
+import android.util.TypedValue
+import android.view.ContextThemeWrapper
+import android.view.Gravity
 import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import android.widget.Toast
+import androidx.core.view.setPadding
+import chat.rocket.android.R
 import chat.rocket.android.chatroom.viewmodel.ImageAttachmentViewModel
-import com.facebook.drawee.backends.pipeline.Fresco
-import com.facebook.drawee.interfaces.DraweeController
+import chat.rocket.android.helper.AndroidPermissionsHelper
 import chat.rocket.android.widget.emoji.EmojiReactionListener
+import com.facebook.binaryresource.FileBinaryResource
+import com.facebook.cache.common.CacheKey
+import com.facebook.drawee.backends.pipeline.Fresco
+import com.facebook.imageformat.ImageFormatChecker
+import com.facebook.imagepipeline.cache.DefaultCacheKeyFactory
+import com.facebook.imagepipeline.core.ImagePipelineFactory
+import com.facebook.imagepipeline.request.ImageRequest
+import com.facebook.imagepipeline.request.ImageRequestBuilder
 import com.stfalcon.frescoimageviewer.ImageViewer
 import kotlinx.android.synthetic.main.message_attachment.view.*
+import timber.log.Timber
+import java.io.File
+
 
 class ImageAttachmentViewHolder(itemView: View,
                                 listener: ActionsListener,
                                 reactionListener: EmojiReactionListener? = null)
     : BaseViewHolder<ImageAttachmentViewModel>(itemView, listener, reactionListener) {
 
+    private var cacheKey: CacheKey? = null
+
     init {
         with(itemView) {
             setupActionMenu(attachment_container)
@@ -31,15 +62,121 @@ class ImageAttachmentViewHolder(itemView: View,
             file_name.text = data.attachmentTitle
             image_attachment.setOnClickListener { view ->
                 // TODO - implement a proper image viewer with a proper Transition
+                // TODO - We should definitely write our own ImageViewer
+                var imageViewer: ImageViewer? = null
+                val request = ImageRequestBuilder.newBuilderWithSource(Uri.parse(data.attachmentUrl))
+                    .setLowestPermittedRequestLevel(ImageRequest.RequestLevel.DISK_CACHE)
+                    .build()
+
+                cacheKey = DefaultCacheKeyFactory.getInstance()
+                    .getEncodedCacheKey(request, null)
+                val pad = context.resources
+                    .getDimensionPixelSize(R.dimen.viewer_toolbar_padding)
+                val lparams = AppBarLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+                    ViewGroup.LayoutParams.WRAP_CONTENT)
+                val toolbar = Toolbar(context).also {
+                    it.inflateMenu(R.menu.image_actions)
+                    it.overflowIcon?.setTint(Color.WHITE)
+                    it.setOnMenuItemClickListener {
+                        return@setOnMenuItemClickListener when (it.itemId) {
+                            R.id.action_save_image -> saveImage()
+                            else -> super.onMenuItemClick(it)
+                        }
+                    }
+
+                    val titleSize = context.resources
+                        .getDimensionPixelSize(R.dimen.viewer_toolbar_title)
+                    val titleTextView = TextView(context).also {
+                        it.text = data.attachmentTitle
+                        it.setTextColor(Color.WHITE)
+                        it.setTextSize(TypedValue.COMPLEX_UNIT_PX, titleSize.toFloat())
+                        it.ellipsize = TextUtils.TruncateAt.END
+                        it.setSingleLine()
+                        it.typeface = Typeface.DEFAULT_BOLD
+                        it.setPadding(pad)
+                    }
+
+                    val backArrowView = ImageView(context).also {
+                        it.setImageResource(R.drawable.ic_arrow_back_white_24dp)
+                        it.setOnClickListener { imageViewer?.onDismiss() }
+                        it.setPadding(0, pad ,pad, pad)
+                    }
+
+                    val layoutParams = AppBarLayout.LayoutParams(
+                        AppBarLayout.LayoutParams.WRAP_CONTENT,
+                        AppBarLayout.LayoutParams.WRAP_CONTENT
+                    )
+
+                    it.addView(backArrowView, layoutParams)
+                    it.addView(titleTextView, layoutParams)
+                }
+
+                val appBarLayout = AppBarLayout(context).also {
+                    it.layoutParams = lparams
+                    it.setBackgroundColor(Color.BLACK)
+                    it.addView(toolbar, AppBarLayout.LayoutParams(
+                        AppBarLayout.LayoutParams.MATCH_PARENT,
+                        ViewGroup.LayoutParams.WRAP_CONTENT
+                    ))
+                }
+
                 val builder = ImageViewer.createPipelineDraweeControllerBuilder()
-                        .setAutoPlayAnimations(true)
-                ImageViewer.Builder(view.context, listOf(data.attachmentUrl))
-                        .setStartPosition(0)
-                        .hideStatusBar(false)
-                        .setCustomDraweeControllerBuilder(builder)
-                        .show()
+                    .setImageRequest(request)
+                    .setAutoPlayAnimations(true)
+                imageViewer = ImageViewer.Builder(view.context, listOf(data.attachmentUrl))
+                    .setOverlayView(appBarLayout)
+                    .setStartPosition(0)
+                    .hideStatusBar(false)
+                    .setCustomDraweeControllerBuilder(builder)
+                    .show()
+            }
+        }
+    }
+
+    private fun saveImage(): Boolean {
+        if (!canWriteToExternalStorage()) {
+            checkWritingPermission()
+            return false
+        }
+        if (ImagePipelineFactory.getInstance().mainFileCache.hasKey(cacheKey)) {
+            val context = itemView.context
+            val resource = ImagePipelineFactory.getInstance().mainFileCache.getResource(cacheKey)
+            val cachedFile = (resource as FileBinaryResource).file
+            val imageFormat = ImageFormatChecker.getImageFormat(resource.openStream())
+            val imageDir = "${Environment.DIRECTORY_PICTURES}/Rocket.Chat Images/"
+            val imagePath = Environment.getExternalStoragePublicDirectory(imageDir)
+            val imageFile = File(imagePath, "${cachedFile.nameWithoutExtension}.${imageFormat.fileExtension}")
+            imagePath.mkdirs()
+            imageFile.createNewFile()
+            try {
+                cachedFile.copyTo(imageFile, true)
+                MediaScannerConnection.scanFile(context, arrayOf(imageFile.absolutePath), null) { path, uri ->
+                    Timber.i("Scanned $path:")
+                    Timber.i("-> uri=$uri")
+                }
+            } catch (ex: Exception) {
+                Timber.e(ex)
+                val message = context.getString(R.string.msg_image_saved_failed)
+                Toast.makeText(context, message, Toast.LENGTH_SHORT).show()
+            } finally {
+                val message = context.getString(R.string.msg_image_saved_successfully)
+                Toast.makeText(context, message, Toast.LENGTH_SHORT).show()
             }
         }
+        return true
+    }
+
+    private fun canWriteToExternalStorage(): Boolean {
+        return AndroidPermissionsHelper.checkPermission(itemView.context, Manifest.permission.WRITE_EXTERNAL_STORAGE)
     }
 
+    private fun checkWritingPermission() {
+        val context = itemView.context
+        if (context is ContextThemeWrapper && context.baseContext is Activity) {
+            val activity = context.baseContext as Activity
+            AndroidPermissionsHelper.requestPermission(activity,
+                Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                AndroidPermissionsHelper.WRITE_EXTERNAL_STORAGE_CODE)
+        }
+    }
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/chatroom/viewmodel/ViewModelMapper.kt

@@ -308,7 +308,7 @@ class ViewModelMapper @Inject constructor(
     private fun getContent(message: Message): CharSequence {
         return when (message.isSystemMessage()) {
             true -> getSystemMessage(message)
-            false -> parser.renderMarkdown(message, currentUsername)
+            false -> parser.render(message, currentUsername)
         }
     }
 

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

@@ -3,6 +3,7 @@ package chat.rocket.android.dagger.module
 import chat.rocket.android.authentication.di.AuthenticationModule
 import chat.rocket.android.authentication.login.di.LoginFragmentProvider
 import chat.rocket.android.authentication.registerusername.di.RegisterUsernameFragmentProvider
+import chat.rocket.android.authentication.resetpassword.di.ResetPasswordFragmentProvider
 import chat.rocket.android.authentication.server.di.ServerFragmentProvider
 import chat.rocket.android.authentication.signup.di.SignupFragmentProvider
 import chat.rocket.android.authentication.twofactor.di.TwoFAFragmentProvider
@@ -33,6 +34,7 @@ abstract class ActivityBuilder {
         ServerFragmentProvider::class,
         LoginFragmentProvider::class,
         RegisterUsernameFragmentProvider::class,
+        ResetPasswordFragmentProvider::class,
         SignupFragmentProvider::class,
         TwoFAFragmentProvider::class
     ])

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

@@ -270,7 +270,6 @@ class AppModule {
     }
 
     @Provides
-    @Singleton
     fun provideMessageParser(context: Application, configuration: SpannableConfiguration, serverInteractor: GetCurrentServerInteractor, settingsInteractor: GetSettingsInteractor): MessageParser {
         val url = serverInteractor.get()!!
         return MessageParser(context, configuration, settingsInteractor.get(url))

app/src/main/java/chat/rocket/android/helper/AndroidPermissionsHelper.kt

+package chat.rocket.android.helper
+
+import android.app.Activity
+import android.content.Context
+import android.content.pm.PackageManager
+import android.support.v4.app.ActivityCompat
+import android.support.v4.content.ContextCompat
+
+object AndroidPermissionsHelper {
+
+    const val WRITE_EXTERNAL_STORAGE_CODE = 1
+
+    fun checkPermission(context: Context, permission: String): Boolean {
+        return ContextCompat.checkSelfPermission(context, permission) ==
+            PackageManager.PERMISSION_GRANTED
+    }
+
+    fun requestPermission(context: Activity, permission: String, requestCode: Int) {
+        ActivityCompat.requestPermissions(context, arrayOf(permission), requestCode)
+    }
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/helper/MessageParser.kt

@@ -39,15 +39,23 @@ class MessageParser @Inject constructor(
     private val parser = Markwon.createParser()
 
     /**
-     * Render a markdown text message to Spannable.
+     * Render markdown and other rules on message to rich text with spans.
      *
      * @param message The [Message] object we're interested on rendering.
      * @param selfUsername This user username.
      *
      * @return A Spannable with the parsed markdown.
      */
-    fun renderMarkdown(message: Message, selfUsername: String? = null): CharSequence {
-        val text = message.message
+    fun render(message: Message, selfUsername: String? = null): CharSequence {
+        var text: String = message.message
+        val mentions = mutableListOf<String>()
+        message.mentions?.forEach {
+            val mention = getMention(it)
+            mentions.add(mention)
+            if (it.username != null) {
+                text = text.replace("@${it.username}", mention)
+            }
+        }
         val builder = SpannableBuilder()
         val content = EmojiRepository.shortnameToUnicode(text, true)
         val parentNode = parser.parse(toLenientMarkdown(content))
@@ -55,7 +63,7 @@ class MessageParser @Inject constructor(
         parentNode.accept(LinkVisitor(builder))
         parentNode.accept(EmojiVisitor(configuration, builder))
         message.mentions?.let {
-            parentNode.accept(MentionVisitor(context, builder, it, selfUsername, settings))
+            parentNode.accept(MentionVisitor(context, builder, mentions, selfUsername))
         }
 
         return builder.text()
@@ -68,12 +76,19 @@ class MessageParser @Inject constructor(
             .replace("\\_(.+)\\_".toRegex()) { "_${it.groupValues[1].trim()}_" }
     }
 
+    private fun getMention(user: SimpleUser): String {
+        return if (settings.useRealName()) {
+            user.name ?: "@${user.username}"
+        } else {
+            "@${user.username}"
+        }
+    }
+
     class MentionVisitor(
         context: Context,
         private val builder: SpannableBuilder,
-        private val mentions: List<SimpleUser>,
-        private val currentUser: String?,
-        private val settings: PublicSettings
+        private val mentions: List<String>,
+        private val currentUser: String?
     ) : AbstractVisitor() {
 
         private val othersTextColor = ResourcesCompat.getColor(context.resources, R.color.colorAccent, context.theme)
@@ -85,27 +100,23 @@ class MessageParser @Inject constructor(
 
         override fun visit(t: Text) {
             val text = t.literal
-            val mentionsList = mentions.map {
-                if (settings.useRealName()) it.name else it.username ?: ""
-            }.toMutableList()
-
-            mentionsList.add("all")
-            mentionsList.add("here")
-
-            mentionsList.toList().forEach {
-                if (it != null) {
-                    val mentionMe = it == currentUser || it == "all" || it == "here"
-                    var offset = text.indexOf("@$it", 0, true)
-                    while (offset > -1) {
-                        val textColor = if (mentionMe) myselfTextColor else othersTextColor
-                        val backgroundColor = if (mentionMe) myselfBackgroundColor else othersBackgroundColor
-                        val usernameSpan = MentionSpan(backgroundColor, textColor, mentionRadius, mentionPadding,
-                            mentionMe)
-                        // Add 1 to end offset to include the @.
-                        val end = offset + it.length + 1
-                        builder.setSpan(usernameSpan, offset, end, 0)
-                        offset = text.indexOf("@$it", end, true)
-                    }
+            val mentionsList = mentions.toMutableList().also {
+                it.add("@all")
+                it.add("@here")
+            }.toList()
+
+            mentionsList.forEach {
+                val mentionMe = it == currentUser || it == "@all" || it == "@here"
+                var offset = text.indexOf(it, 0, true)
+                while (offset > -1) {
+                    val textColor = if (mentionMe) myselfTextColor else othersTextColor
+                    val backgroundColor = if (mentionMe) myselfBackgroundColor else othersBackgroundColor
+                    val usernameSpan = MentionSpan(backgroundColor, textColor, mentionRadius, mentionPadding,
+                        mentionMe)
+                    // Add 1 to end offset to include the @.
+                    val end = offset + it.length + 1
+                    builder.setSpan(usernameSpan, offset, end, 0)
+                    offset = text.indexOf("@$it", end, true)
                 }
             }
         }

app/src/main/java/chat/rocket/android/util/extensions/Ui.kt

@@ -29,30 +29,42 @@ fun View.isVisible(): Boolean {
 }
 
 fun ViewGroup.inflate(@LayoutRes resource: Int, attachToRoot: Boolean = false): View =
-        LayoutInflater.from(context).inflate(resource, this, attachToRoot)
+    LayoutInflater.from(context).inflate(resource, this, attachToRoot)
 
 fun AppCompatActivity.addFragment(tag: String, layoutId: Int, newInstance: () -> Fragment) {
     val fragment = supportFragmentManager.findFragmentByTag(tag) ?: newInstance()
     supportFragmentManager.beginTransaction()
-            .replace(layoutId, fragment, tag)
-            .commit()
+        .replace(layoutId, fragment, tag)
+        .commit()
 }
 
-fun AppCompatActivity.addFragmentBackStack(tag: String, layoutId: Int,
-                                           newInstance: () -> Fragment) {
+fun AppCompatActivity.addFragmentBackStack(
+    tag: String,
+    layoutId: Int,
+    newInstance: () -> Fragment
+) {
     val fragment = supportFragmentManager.findFragmentByTag(tag) ?: newInstance()
     supportFragmentManager.beginTransaction()
-            .setCustomAnimations(R.anim.enter_from_right, R.anim.exit_to_left,
-                    R.anim.enter_from_left, R.anim.exit_to_right)
-            .replace(layoutId, fragment, tag)
-            .addToBackStack(tag)
-            .commit()
+        .setCustomAnimations(
+            R.anim.enter_from_right, R.anim.exit_to_left,
+            R.anim.enter_from_left, R.anim.exit_to_right
+        )
+        .replace(layoutId, fragment, tag)
+        .addToBackStack(tag)
+        .commit()
+}
+
+fun AppCompatActivity.toPreviousView() {
+    supportFragmentManager.popBackStack()
 }
 
 fun Activity.hideKeyboard() {
     if (currentFocus != null) {
         val imm = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-        imm.hideSoftInputFromWindow(currentFocus.windowToken, InputMethodManager.RESULT_UNCHANGED_SHOWN)
+        imm.hideSoftInputFromWindow(
+            currentFocus.windowToken,
+            InputMethodManager.RESULT_UNCHANGED_SHOWN
+        )
     }
 }
 
@@ -62,16 +74,16 @@ fun Activity.showKeyboard(view: View) {
 }
 
 fun Activity.showToast(@StringRes resource: Int, duration: Int = Toast.LENGTH_SHORT) =
-        showToast(getString(resource), duration)
+    showToast(getString(resource), duration)
 
 fun Activity.showToast(message: String, duration: Int = Toast.LENGTH_SHORT) =
-        Toast.makeText(this, message, duration).show()
+    Toast.makeText(this, message, duration).show()
 
 fun Fragment.showToast(@StringRes resource: Int, duration: Int = Toast.LENGTH_SHORT) =
-        showToast(getString(resource), duration)
+    showToast(getString(resource), duration)
 
 fun Fragment.showToast(message: String, duration: Int = Toast.LENGTH_SHORT) =
-        activity?.showToast(message, duration)
+    activity?.showToast(message, duration)
 
 fun RecyclerView.isAtBottom(): Boolean {
     val manager: RecyclerView.LayoutManager? = layoutManager

app/src/main/res/drawable/ic_arrow_back_white_24dp.xml

+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="#FFFFFF" android:viewportHeight="24.0"
+    android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+</vector>

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

@@ -72,6 +72,21 @@
             app:layout_constraintTop_toBottomOf="@+id/button_cas"
             tools:visibility="visible" />
 
+        <TextView
+            android:id="@+id/text_forgot_your_password"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/screen_edge_left_and_right_margins"
+            android:layout_marginStart="@dimen/screen_edge_left_and_right_margins"
+            android:layout_marginTop="8dp"
+            android:gravity="center"
+            android:textColorLink="@color/colorAccent"
+            android:visibility="gone"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/text_new_to_rocket_chat"
+            tools:visibility="visible" />
+
         <com.wang.avi.AVLoadingIndicatorView
             android:id="@+id/view_loading"
             android:layout_width="wrap_content"
@@ -99,7 +114,7 @@
             android:visibility="gone"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/text_new_to_rocket_chat"
+            app:layout_constraintTop_toBottomOf="@+id/text_forgot_your_password"
             tools:visibility="visible">
 
             <TextView

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

+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout 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:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".authentication.resetpassword.ui.ResetPasswordFragment">
+
+    <TextView
+        android:id="@+id/text_headline"
+        style="@style/Authentication.Headline.TextView"
+        android:layout_centerHorizontal="true"
+        android:text="@string/title_reset_password" />
+
+    <EditText
+        android:id="@+id/text_email"
+        style="@style/Authentication.EditText"
+        android:layout_below="@id/text_headline"
+        android:layout_marginTop="32dp"
+        android:drawableStart="@drawable/ic_email_black_24dp"
+        android:hint="@string/msg_email"
+        android:imeOptions="actionDone"
+        android:inputType="textEmailAddress" />
+
+    <com.wang.avi.AVLoadingIndicatorView
+        android:id="@+id/view_loading"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:visibility="gone"
+        app:indicatorName="BallPulseIndicator"
+        tools:visibility="visible" />
+
+    <Button
+        android:id="@+id/button_reset_password"
+        style="@style/Authentication.Button"
+        android:layout_alignParentBottom="true"
+        android:text="@string/title_reset_password" />
+
+</RelativeLayout>
\ No newline at end of file

app/src/main/res/menu/image_actions.xml

+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/action_save_image"
+        android:title="Save to Gallery"
+        app:showAsAction="never" />
+</menu>
\ No newline at end of file

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

@@ -3,6 +3,8 @@
     <string name="title_sign_in_your_server">Inicia sesión en tu servidor</string>
     <string name="title_log_in">Iniciar sesión</string>
     <string name="title_register_username">Registrar nombre de usuario</string>
+    // TODO: Add proper translation.
+    <string name="title_reset_password">Reset Password</string>
     <string name="title_sign_up">Regístrate</string>
     <string name="title_authentication">Autenticación</string>
     <string name="title_legal_terms">Términos legales</string>
@@ -51,6 +53,14 @@
     <string name="msg_avatar_url">URL del avatar</string>
     <string name="msg_or_continue_using_social_accounts">O continuar usando cuentas sociales</string>
     <string name="msg_new_user">Nuevo usuario? %1$s</string>
+    // TODO: Add proper translation.
+    <string name="msg_forgot_password">Forgot password? %1$s</string>
+    // TODO: Add proper translation.
+    <string name="msg_reset">Reset</string>
+    // TODO: Add proper translation.
+    <string name="msg_check_your_email_to_reset_your_password">Email sent! Check your inbox to reset your password.</string>
+    // TODO: Add proper translation.
+    <string name="msg_invalid_email">Please type a valid e-mail</string>
     <string name="msg_new_user_agreement">Al continuar estás aceptando nuestra\n%1$s y %2$s</string>
     <string name="msg_2fa_code">Código 2FA</string>
     <string name="msg_yesterday">Ayer</string>
@@ -83,17 +93,22 @@
     <string name="msg_version">Versión %1$s</string>
     <string name="msg_build">Build %1$d</string>
     <string name="msg_ok">OK</string>
+    // TODO: Add proper translation.
+    <string name="msg_update_app_version_in_order_to_continue">Out to date server version. Please contact the server admin to update the server version in order to continue.</string>
     <string name="msg_ver_not_recommended">
         Parece que la versión de tu servidor está por debajo de la versión recomendada %1$s.\nAún puede iniciar sesión, pero puede experimentar comportamientos inesperados.</string>
     <string name="msg_ver_not_minimum">
         Parece que la versión del servidor está por debajo de la versión mínima requerida %1$s.\nActualice su servidor para iniciar sesión!
     </string>
+
     <string name="msg_proceed">PROCEDER</string>
     <string name="msg_cancel">CANCELAR</string>
     <string name="msg_warning">ADVERTENCIA</string>
     <string name="msg_http_insecure">Al usar HTTP, te estás conectando a un servidor inseguro. No te recomendamos que hagas eso.</string>
     <string name="msg_error_checking_server_version">Se ha producido un error al verificar la versión de su servidor, intente de nuevo</string>
     <string name="msg_invalid_server_protocol">El protocolo seleccionado no es aceptado por este servidor, intente usar HTTPS</string>
+    <string name="msg_image_saved_successfully">La imagen se ha guardado en la galería</string>
+    <string name="msg_image_saved_failed">Error al guardar la imagen</string>
     <string name="msg_no_chat_title">Sin mensajes de chat</string>
     <string name="msg_no_chat_description">Comience a conversar para ver\nsus mensajes aquí.</string>
 

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

@@ -3,6 +3,8 @@
     <string name="title_sign_in_your_server">Connectez-vous sur votre serveur</string>
     <string name="title_log_in">S\'identifier</string>
     <string name="title_register_username">Enregistrer le nom d\'utilisateur</string>
+    // TODO: Add proper translation.
+    <string name="title_reset_password">Reset password</string>
     <string name="title_sign_up">S\'inscrire</string>
     <string name="title_authentication">Authentification</string>
     <string name="title_legal_terms">Termes légaux</string>
@@ -51,6 +53,14 @@
     <string name="msg_avatar_url">URL de l\'avatar</string>
     <string name="msg_or_continue_using_social_accounts">Ou continuer en utilisant les comptes sociaux</string>
     <string name="msg_new_user">Nouvel utilisateur? %1$s</string>
+    // TODO: Add proper translation.
+    <string name="msg_forgot_password">Forgot password? %1$s</string>
+    // TODO: Add proper translation.
+    <string name="msg_reset">Reset</string>
+    // TODO: Add proper translation.
+    <string name="msg_check_your_email_to_reset_your_password">Email sent! Check your inbox to reset your password.</string>
+    // TODO: Add proper translation.
+    <string name="msg_invalid_email">Please type a valid e-mail</string>
     <string name="msg_new_user_agreement">En procédant, vous acceptez notre\n%1$s et %2$s</string>
     <string name="msg_2fa_code">Code 2FA</string>
     <string name="msg_yesterday">Hier</string>
@@ -83,6 +93,8 @@
     <string name="msg_version">Version %1$s</string>
     <string name="msg_build">Build %1$d</string>
     <string name="msg_ok">OK</string>
+    // TODO: Add proper translation.
+    <string name="msg_update_app_version_in_order_to_continue">Out to date server version. Please contact the server admin to update the server version in order to continue.</string>
     <string name="msg_ver_not_recommended">
         On dirait que la version de votre serveur est en dessous de la version recommandée %1$s.\nVous pouvez toujours vous connecter mais vous pouvez rencontrer des comportements inattendus.</string>
     <string name="msg_ver_not_minimum">
@@ -94,6 +106,8 @@
     <string name="msg_http_insecure">Lorsque vous utilisez HTTP, vous vous connectez à un serveur non sécurisé. Nous ne vous recommandons pas de le faire.</string>
     <string name="msg_error_checking_server_version">Une erreur est survenue lors de la vérification de la version de votre serveur, veuillez réessayer</string>
     <string name="msg_invalid_server_protocol">Le protocole sélectionné n\'est pas accepté par ce serveur, essayez d\'utiliser HTTPS</string>
+    <string name="msg_image_saved_successfully">L\'image a été enregistrée dans la galerie</string>
+    <string name="msg_image_saved_failed">Échec de l\'enregistrement de l\'image</string>
     <string name="msg_no_chat_title">Aucun message de discussion</string>
     <string name="msg_no_chat_description">Commencez à converser pour voir\nvos messages ici.</string>
 

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

@@ -4,6 +4,8 @@
     <string name="title_sign_in_your_server">अपने सर्वर में साइन इन करें</string>
     <string name="title_log_in">लॉग इन करें</string>
     <string name="title_register_username">रजिस्टर उपयोगकर्ता नाम</string>
+    // TODO: Add proper translation.
+    <string name="title_reset_password">Reset password</string>
     <string name="title_sign_up">साइन अप करें</string>
     <string name="title_authentication">प्रमाणीकरण</string>
     <string name="title_legal_terms">कानूनी शर्तें</string>
@@ -52,6 +54,14 @@
     <string name="msg_avatar_url">अवतार यूआरएल</string>
     <string name="msg_or_continue_using_social_accounts">या सामाजिक खाते का उपयोग करना जारी रखें</string>
     <string name="msg_new_user">नया उपयोगकर्ता? %1$s</string>
+    // TODO: Add proper translation.
+    <string name="msg_forgot_password">Forgot password? %1$s</string>
+    // TODO: Add proper translation.
+    <string name="msg_reset">Reset</string>
+    // TODO: Add proper translation.
+    <string name="msg_check_your_email_to_reset_your_password">Email sent! Check your inbox to reset your password.</string>
+    // TODO: Add proper translation.
+    <string name="msg_invalid_email">Please type a valid e-mail</string>
     <string name="msg_new_user_agreement">आगे बढ़कर आप हमारे %1$s और %2$s से सहमत हो रहे हैं</string>
     <string name="msg_2fa_code">कोड 2FA</string>
     <string name="msg_yesterday">कल</string>
@@ -83,6 +93,8 @@
     <string name="msg_no_messages_yet">अभी तक कोई पोस्ट नहीं</string>
     <string name="msg_version">वर्शन %1$s</string>
     <string name="msg_build">बिल्ड %1$d</string>
+    // TODO: Add proper translation.
+    <string name="msg_update_app_version_in_order_to_continue">Out to date server version. Please contact the server admin to update the server version in order to continue.</string>
     <string name="msg_ok">OK</string>
     <string name="msg_ver_not_recommended">
         ऐसा लगता है कि आपका सर्वर संस्करण अनुशंसित संस्करण %1$s के नीचे है।\nआप अभी भी लॉगिन कर सकते हैं लेकिन आप अप्रत्याशित व्यवहार का अनुभव कर सकते हैं
@@ -96,6 +108,8 @@
     <string name="msg_http_insecure">HTTP का उपयोग करते समय, आप एक असुरक्षित सर्वर से कनेक्ट हो रहे हैं। हम आपको ऐसा करने की सलाह नहीं देते हैं।</string>
     <string name="msg_error_checking_server_version">आपके सर्वर संस्करण की जांच करते समय एक त्रुटि आई है, कृपया पुनः प्रयास करें</string>
     <string name="msg_invalid_server_protocol">चयनित प्रोटोकॉल इस सर्वर द्वारा स्वीकार नहीं किया गया है, HTTPS का उपयोग करने का प्रयास करें</string>
+    <string name="msg_image_saved_successfully">छवि गैलरी में सहेजा गया है</string>
+    <string name="msg_image_saved_failed">छवि को सहेजने में विफल</string>
     <string name="msg_no_chat_title">कोई चैट संदेश नहीं</string>
     <string name="msg_no_chat_description">यहां अपने संदेश देखने के लिए\nबातचीत शुरू करें।</string>
 

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

@@ -4,6 +4,7 @@
     <string name="title_sign_in_your_server">Faça login no seu servidor</string>
     <string name="title_log_in">Entrar</string>
     <string name="title_register_username">Registre o nome de usuário</string>
+    <string name="title_reset_password">Redefinir senha</string>
     <string name="title_sign_up">Inscreva-se</string>
     <string name="title_authentication">Autenticação</string>
     <string name="title_legal_terms">Termos Legais</string>
@@ -52,6 +53,10 @@
     <string name="msg_avatar_url">URL do avatar</string>
     <string name="msg_or_continue_using_social_accounts">Ou continue através de contas sociais</string>
     <string name="msg_new_user">Novo usuário? %1$s</string>
+    <string name="msg_forgot_password">Esqueceu a senha? %1$s</string>
+    <string name="msg_reset">Redefinir</string>
+    <string name="msg_check_your_email_to_reset_your_password">Email enviado! Verifique sua caixa de entrada para redefinir sua senha.</string>
+    <string name="msg_invalid_email">Por favor informe um e-mail válido</string>
     <string name="msg_new_user_agreement">Ao proceder você concorda com nossos %1$s e %2$s</string>
     <string name="msg_2fa_code">Código 2FA</string>
     <string name="msg_yesterday">ontem</string>
@@ -84,6 +89,7 @@
     <string name="msg_version">Versão %1$s</string>
     <string name="msg_build">Build %1$d</string>
     <string name="msg_ok">OK</string>
+    <string name="msg_update_app_version_in_order_to_continue">Versão do servidor desatualizada. Por favor, entre em contato com o administrador do sistema para continuar.</string>
     <string name="msg_ver_not_recommended">
         Parece que a versão do seu servidor está abaixo da recomendada %1$s.\nVocê ainda assim pode logar e continuar mas podem ocorrer alguns problemas inesperados.
     </string>
@@ -98,7 +104,9 @@
     <string name="msg_http_insecure">Usando HTTP, você estará conectando a um servidor não seguro, não recomendamos sua utilização.</string>
     <string name="msg_error_checking_server_version">Ocorreu um erro verificando a versão do servidor, por favor tente novamente</string>
     <string name="msg_invalid_server_protocol">O protocolo selecionado não é suportado pelo servidor, por favor utilize HTTPS e tente novamente</string>
-
+    <string name="msg_image_saved_successfully">Imagem salva na galeria</string>
+    <string name="msg_image_saved_failed">Falha ao salvar a imagem</string>
+    
     <!-- System messages -->
     <string name="message_room_name_changed">Nome da sala alterado para: %1$s por %2$s</string>
     <string name="message_user_added_by">Usuário %1$s adicionado por %2$s</string>

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

@@ -41,4 +41,7 @@
     <dimen name="popup_max_height">150dp</dimen>
     <dimen name="suggestions_box_max_height">250dp</dimen>
 
+    <dimen name="viewer_toolbar_padding">16dp</dimen>
+    <dimen name="viewer_toolbar_title">16sp</dimen>
+
 </resources>
\ No newline at end of file

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

@@ -5,6 +5,7 @@
     <string name="title_sign_in_your_server">Sign in your server</string>
     <string name="title_log_in">Log in</string>
     <string name="title_register_username">Register username</string>
+    <string name="title_reset_password">Reset password</string>
     <string name="title_sign_up">Sign up</string>
     <string name="title_authentication">Authentication</string>
     <string name="title_legal_terms">Legal Terms</string>
@@ -53,6 +54,10 @@
     <string name="msg_avatar_url">avatar URL</string>
     <string name="msg_or_continue_using_social_accounts">Or continue using social accounts</string>
     <string name="msg_new_user">New user? %1$s</string>
+    <string name="msg_forgot_password">Forgot password? %1$s</string>
+    <string name="msg_reset">Reset</string>
+    <string name="msg_check_your_email_to_reset_your_password">Email sent! Check your inbox to reset your password.</string>
+    <string name="msg_invalid_email">Please type a valid e-mail</string>
     <string name="msg_new_user_agreement">By proceeding you are agreeing to our\n%1$s and %2$s</string>
     <string name="msg_2fa_code">2FA Code</string>
     <string name="msg_more_than_ninety_nine_unread_messages" translatable="false">99+</string>
@@ -86,6 +91,7 @@
     <string name="msg_version">Version %1$s</string>
     <string name="msg_build">Build %1$d</string>
     <string name="msg_ok">OK</string>
+    <string name="msg_update_app_version_in_order_to_continue">Out to date server version. Please contact the server admin to update the server version in order to continue.</string>
     <string name="msg_ver_not_recommended">
         Looks like your server version is below the recommended version %1$s.\nYou can still login but you may experience unexpected behaviors.</string>
     <string name="msg_ver_not_minimum">
@@ -99,6 +105,8 @@
     <string name="msg_http_insecure">When using HTTP, you\'re connecting to an insecure server. We don\'t recommend you doing that.</string>
     <string name="msg_error_checking_server_version">An error has occurred while checking your server version, please try again</string>
     <string name="msg_invalid_server_protocol">The selected protocol is not accepted by this server, try using HTTPS</string>
+    <string name="msg_image_saved_successfully">Image has been saved to gallery</string>
+    <string name="msg_image_saved_failed">Failed to save image</string>
 
     <!-- System messages -->
     <string name="message_room_name_changed">Room name changed to: %1$s by %2$s</string>