Merge pull request #1701 from RocketChat/develop

[RELEASE] Merge DEVELOP into BETA

app/build.gradle

@@ -93,6 +93,7 @@ dependencies {
     implementation project(':draw')
     implementation project(':util')
     implementation project(':core')
+    implementation project(':suggestions')
 
     implementation libraries.kotlin
     implementation libraries.coroutines
@@ -151,6 +152,8 @@ dependencies {
 
     implementation libraries.livedataKtx
 
+    implementation 'com.google.code.findbugs:jsr305:3.0.2'
+
     // Proprietary libraries
     playImplementation libraries.fcm
     playImplementation libraries.firebaseAnalytics

app/sender-id.txt

+673693445664
+673693445664

app/src/main/AndroidManifest.xml

@@ -9,24 +9,25 @@
 
     <application
         android:name=".app.RocketChatApplication"
-        tools:replace="android:name"
         android:allowBackup="true"
         android:fullBackupContent="@xml/backup_config"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true">
+        android:supportsRtl="true"
+        tools:replace="android:name">
 
         <activity
             android:name=".authentication.ui.AuthenticationActivity"
             android:configChanges="orientation"
             android:screenOrientation="portrait"
-            android:theme="@style/AuthenticationTheme"
+            android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
@@ -40,6 +41,7 @@
                 <data
                     android:host="auth"
                     android:scheme="rocketchat" />
+
                 <data
                     android:host="go.rocket.chat"
                     android:path="/auth"
@@ -49,7 +51,7 @@
 
         <activity
             android:name=".server.ui.ChangeServerActivity"
-            android:theme="@style/AuthenticationTheme" />
+            android:theme="@style/AppTheme" />
 
         <activity
             android:name=".main.ui.MainActivity"

app/src/main/java/chat/rocket/android/analytics/event/ScreenViewEvent.kt

@@ -2,13 +2,22 @@ package chat.rocket.android.analytics.event
 
 sealed class ScreenViewEvent(val screenName: String) {
 
+    // Authentication
+    object OnBoarding : ScreenViewEvent("OnBoardingFragment")
+    object Server : ScreenViewEvent("ServerFragment")
+    object LoginOptions : ScreenViewEvent("LoginOptionsFragment")
+    object Login : ScreenViewEvent("LoginFragment")
+    object TwoFa : ScreenViewEvent("TwoFAFragment")
+    object SignUp : ScreenViewEvent("SignupFragment")
+    object RegisterUsername : ScreenViewEvent("RegisterUsernameFragment")
+    object ResetPassword : ScreenViewEvent("ResetPasswordFragment")
+
     object About : ScreenViewEvent("AboutFragment")
     object ChatRoom : ScreenViewEvent("ChatRoomFragment")
     object ChatRooms : ScreenViewEvent("ChatRoomsFragment")
     object CreateChannel : ScreenViewEvent("CreateChannelFragment")
     object FavoriteMessages : ScreenViewEvent("FavoriteMessagesFragment")
     object Files : ScreenViewEvent("FilesFragment")
-    object Login : ScreenViewEvent("LoginFragment")
     object MemberBottomSheet : ScreenViewEvent("MemberBottomSheetFragment")
     object Members : ScreenViewEvent("MembersFragment")
     object Mentions : ScreenViewEvent("MentionsFragment")
@@ -17,10 +26,5 @@ sealed class ScreenViewEvent(val screenName: String) {
     object PinnedMessages : ScreenViewEvent("PinnedMessagesFragment")
     object Preferences : ScreenViewEvent("PreferencesFragment")
     object Profile : ScreenViewEvent("ProfileFragment")
-    object RegisterUsername : ScreenViewEvent("RegisterUsernameFragment")
-    object ResetPassword : ScreenViewEvent("ResetPasswordFragment")
-    object Server : ScreenViewEvent("ServerFragment")
     object Settings : ScreenViewEvent("SettingsFragment")
-    object SignUp : ScreenViewEvent("SignupFragment")
-    object TwoFa : ScreenViewEvent("TwoFAFragment")
 }

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

 package chat.rocket.android.authentication.di
 
+import androidx.lifecycle.LifecycleOwner
 import chat.rocket.android.authentication.presentation.AuthenticationNavigator
 import chat.rocket.android.authentication.ui.AuthenticationActivity
-import chat.rocket.android.dagger.qualifier.ForAuthentication
+import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.dagger.scope.PerActivity
 import dagger.Module
 import dagger.Provides
+import kotlinx.coroutines.experimental.Job
 
 @Module
 class AuthenticationModule {
 
     @Provides
     @PerActivity
-    fun provideAuthenticationNavigator(activity: AuthenticationActivity) = AuthenticationNavigator(activity)
+    fun provideAuthenticationNavigator(activity: AuthenticationActivity) =
+        AuthenticationNavigator(activity)
+
+    @Provides
+    @PerActivity
+    fun provideJob() = Job()
+
+    @Provides
+    @PerActivity
+    fun provideLifecycleOwner(activity: AuthenticationActivity): LifecycleOwner = activity
+
+    @Provides
+    @PerActivity
+    fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy =
+        CancelStrategy(owner, jobs)
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/authentication/login/di/LoginFragmentModule.kt

@@ -3,34 +3,18 @@ package chat.rocket.android.authentication.login.di
 import androidx.lifecycle.LifecycleOwner
 import chat.rocket.android.authentication.login.presentation.LoginView
 import chat.rocket.android.authentication.login.ui.LoginFragment
-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
 class LoginFragmentModule {
 
     @Provides
     @PerFragment
-    fun provideJob() = Job()
+    fun loginView(frag: LoginFragment): LoginView = frag
 
     @Provides
     @PerFragment
-    fun loginView(frag: LoginFragment): LoginView {
-        return frag
-    }
-
-    @Provides
-    @PerFragment
-    fun provideLifecycleOwner(frag: LoginFragment): LifecycleOwner {
-        return frag
-    }
-
-    @Provides
-    @PerFragment
-    fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy {
-        return CancelStrategy(owner, jobs)
-    }
+    fun provideLifecycleOwner(frag: LoginFragment): LifecycleOwner = frag
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/authentication/loginoptions/di/LoginOptionsFragmentModule.kt

+package chat.rocket.android.authentication.loginoptions.di
+
+import androidx.lifecycle.LifecycleOwner
+import chat.rocket.android.authentication.loginoptions.presentation.LoginOptionsView
+import chat.rocket.android.authentication.loginoptions.ui.LoginOptionsFragment
+import chat.rocket.android.dagger.scope.PerFragment
+import dagger.Module
+import dagger.Provides
+
+@Module
+class LoginOptionsFragmentModule {
+
+    @Provides
+    @PerFragment
+    fun loginOptionsView(frag: LoginOptionsFragment): LoginOptionsView = frag
+
+    @Provides
+    @PerFragment
+    fun provideLifecycleOwner(frag: LoginOptionsFragment): LifecycleOwner = frag
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/authentication/loginoptions/di/LoginOptionsFragmentProvider.kt

+package chat.rocket.android.authentication.loginoptions.di
+
+import chat.rocket.android.authentication.loginoptions.ui.LoginOptionsFragment
+import chat.rocket.android.dagger.scope.PerFragment
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+
+@Module abstract class LoginOptionsFragmentProvider {
+
+    @ContributesAndroidInjector(modules = [LoginOptionsFragmentModule::class])
+    @PerFragment
+    abstract fun providesLoginOptionFragment(): LoginOptionsFragment
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/authentication/onboarding/di/OnBoardingFragmentModule.kt

+package chat.rocket.android.authentication.onboarding.di
+
+import androidx.lifecycle.LifecycleOwner
+import chat.rocket.android.authentication.onboarding.presentation.OnBoardingView
+import chat.rocket.android.authentication.onboarding.ui.OnBoardingFragment
+import chat.rocket.android.dagger.scope.PerFragment
+import dagger.Module
+import dagger.Provides
+
+@Module
+class OnBoardingFragmentModule {
+
+    @Provides
+    @PerFragment
+    fun onBoardingView(frag: OnBoardingFragment): OnBoardingView = frag
+
+    @Provides
+    @PerFragment
+    fun provideLifecycleOwner(frag: OnBoardingFragment): LifecycleOwner = frag
+}
\ No newline at end of file

app/src/main/java/chat/rocket/android/authentication/onboarding/di/OnBoardingFragmentProvider.kt

+package chat.rocket.android.authentication.onboarding.di
+
+import chat.rocket.android.authentication.onboarding.ui.OnBoardingFragment
+import chat.rocket.android.dagger.scope.PerFragment
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+
+@Module
+abstract class OnBoardingFragmentProvider {
+
+    @ContributesAndroidInjector(modules = [OnBoardingFragmentModule::class])
+    @PerFragment
+    abstract fun provideOnBoardingFragment(): OnBoardingFragment
+}
\ No newline at end of file

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

+package chat.rocket.android.authentication.onboarding.presentation
+
+import chat.rocket.android.core.behaviours.LoadingView
+import chat.rocket.android.core.behaviours.MessageView
+
+interface OnBoardingView : LoadingView, MessageView
\ No newline at end of file

app/src/main/java/chat/rocket/android/authentication/registerusername/di/RegisterUsernameFragmentModule.kt

@@ -3,34 +3,18 @@ package chat.rocket.android.authentication.registerusername.di
 import androidx.lifecycle.LifecycleOwner
 import chat.rocket.android.authentication.registerusername.presentation.RegisterUsernameView
 import chat.rocket.android.authentication.registerusername.ui.RegisterUsernameFragment
-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
 class RegisterUsernameFragmentModule {
 
     @Provides
     @PerFragment
-    fun provideJob() = Job()
+    fun registerUsernameView(frag: RegisterUsernameFragment): RegisterUsernameView = frag
 
     @Provides
     @PerFragment
-    fun registerUsernameView(frag: RegisterUsernameFragment): RegisterUsernameView {
-        return frag
-    }
-
-    @Provides
-    @PerFragment
-    fun provideLifecycleOwner(frag: RegisterUsernameFragment): LifecycleOwner {
-        return frag
-    }
-
-    @Provides
-    @PerFragment
-    fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy {
-        return CancelStrategy(owner, jobs)
-    }
+    fun provideLifecycleOwner(frag: RegisterUsernameFragment): LifecycleOwner = frag
 }
\ No newline at end of file

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

@@ -6,7 +6,12 @@ import chat.rocket.android.core.behaviours.MessageView
 interface RegisterUsernameView : LoadingView, MessageView {
 
     /**
-     * Alerts the user about a blank username.
+     * Enables the button to set the username if the user entered at least one character.
      */
-    fun alertBlankUsername()
+    fun enableButtonUseThisUsername()
+
+    /**
+     * Disables the button to set the username when there is no character entered by the user.
+     */
+    fun disableButtonUseThisUsername()
 }
\ No newline at end of file

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

@@ -3,6 +3,7 @@ package chat.rocket.android.authentication.server.presentation
 import okhttp3.HttpUrl
 
 interface VersionCheckView {
+
     /**
      * Alerts the user about the server version not meeting the recommended server version.
      */