[NEW FEATURE] Theme Engine for Changing and Adding Custom Themes.

app/build.gradle

@@ -105,6 +105,7 @@ dependencies {
     implementation project(':util')
     implementation project(':core')
     implementation project(':suggestions')
+    implementation project(':themelibrary')
 
     implementation libraries.kotlin
     implementation libraries.coroutinesCore
@@ -121,6 +122,9 @@ dependencies {
 
     implementation libraries.dagger
     implementation libraries.daggerSupport
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     kapt libraries.daggerProcessor
     kapt libraries.daggerAndroidApt
 
@@ -180,6 +184,7 @@ dependencies {
     testImplementation libraries.truth
     androidTestImplementation libraries.espressoCore
     androidTestImplementation libraries.espressoIntents
+    implementation 'com.google.code.gson:gson:2.8.5'
 }
 
 androidExtensions {
@@ -200,4 +205,4 @@ task compileSdk(type: Exec) {
 preBuild.dependsOn compileSdk
 if (isPlay) {
     apply plugin: 'com.google.gms.google-services'
-}
+}

app/src/main/AndroidManifest.xml

@@ -19,23 +19,21 @@
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
+        android:theme="@style/AppTheme"
         tools:replace="android:name">
-
+        <activity android:name=".thememanager.ui.CreateThemesActivity"></activity>
         <activity
             android:name=".authentication.ui.AuthenticationActivity"
             android:configChanges="orientation"
             android:launchMode="singleTask"
             android:screenOrientation="portrait"
-            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>
-
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -45,7 +43,6 @@
                 <data
                     android:host="auth"
                     android:scheme="rocketchat" />
-
                 <data
                     android:host="go.rocket.chat"
                     android:path="/auth"
@@ -64,50 +61,35 @@
 
             </intent-filter>
         </activity>
-
         <activity
             android:name=".server.ui.ChangeServerActivity"
-            android:theme="@style/AppTheme" />
-
+            />
         <activity
             android:name=".main.ui.MainActivity"
-            android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
-
         <activity
             android:name=".webview.ui.WebViewActivity"
-            android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
-
         <activity
             android:name=".webview.sso.ui.SsoWebViewActivity"
-            android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
-
         <activity
             android:name=".webview.oauth.ui.OauthWebViewActivity"
-            android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
-
         <activity
             android:name=".videoconference.ui.VideoConferenceActivity"
-            android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
-
         <activity
             android:name=".chatroom.ui.ChatRoomActivity"
-            android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
-
         <activity
             android:name=".chatinformation.ui.MessageInfoActivity"
-            android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
-
-        <!-- TODO: Change to fragment -->
         <activity
-            android:name=".settings.password.ui.PasswordActivity"
-            android:theme="@style/AppTheme" />
+            android:name=".thememanager.ui.ThemesActivity"
+            android:windowSoftInputMode="adjustResize|stateAlwaysHidden" /> <!-- TODO: Change to fragment -->
+        <activity android:name=".settings.password.ui.PasswordActivity" />
+        <activity android:name=".thememanager.BaseActivity" />
 
         <receiver
             android:name=".push.DirectReplyReceiver"
@@ -137,4 +119,5 @@
                 android:resource="@xml/file_paths" />
         </provider>
     </application>
-</manifest>
+
+</manifest>

app/src/main/java/chat/rocket/android/app/DrawableHelper.kt

@@ -142,6 +142,16 @@ object DrawableHelper {
             textView.setCompoundDrawablesWithIntrinsicBounds(startDrawable, null, endDrawable, null)
         }
 
+    /**
+     * Compounds a Drawable (to appear on top of a text) into a TextView.
+     *
+     * @param textView The TextView.
+     * @param drawable The Drawable.
+     * @see compoundDrawables
+     */
+    fun compoundTopDrawable(textView: TextView, drawable: Drawable) =
+            textView.setCompoundDrawablesWithIntrinsicBounds(null, drawable, null, null)
+
     /**
      * Returns the user status drawable.
      *

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

@@ -20,17 +20,15 @@ import chat.rocket.android.helper.getCredentials
 import chat.rocket.android.helper.hasCredentialsSupport
 import chat.rocket.android.helper.requestStoredCredentials
 import chat.rocket.android.helper.saveCredentials
+import chat.rocket.android.thememanager.util.ThemeUtil
 import chat.rocket.android.util.extension.asObservable
-import chat.rocket.android.util.extensions.clearLightStatusBar
-import chat.rocket.android.util.extensions.inflate
-import chat.rocket.android.util.extensions.showToast
-import chat.rocket.android.util.extensions.textContent
-import chat.rocket.android.util.extensions.ui
+import chat.rocket.android.util.extensions.*
 import dagger.android.support.AndroidSupportInjection
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.rxkotlin.Observables
 import kotlinx.android.synthetic.main.app_bar.*
 import kotlinx.android.synthetic.main.fragment_authentication_log_in.*
+import kotlinx.android.synthetic.main.fragment_authentication_log_in.view_loading
 import javax.inject.Inject
 
 private const val SERVER_NAME = "server_name"
@@ -73,6 +71,11 @@ class LoginFragment : Fragment(), LoginView {
         setupToolbar()
         presenter.setupView()
         subscribeEditTexts()
+
+//        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) {
+            tintEditTextDrawableStart()
+//        }
+
         setupOnClickListener()
         analyticsManager.logScreenView(ScreenViewEvent.Login)
     }
@@ -111,7 +114,7 @@ class LoginFragment : Fragment(), LoginView {
 
     private fun setupToolbar() {
         with(activity as AuthenticationActivity) {
-            this.clearLightStatusBar()
+            view?.let {this.clearInvisibleStatusBar(it)}
             toolbar.isVisible = true
             toolbar.title = serverName?.replace(getString(R.string.default_protocol), "")
         }
@@ -167,7 +170,7 @@ class LoginFragment : Fragment(), LoginView {
     override fun enableButtonLogin() {
         context?.let {
             ViewCompat.setBackgroundTintList(
-                button_log_in, ContextCompat.getColorStateList(it, R.color.colorAccent)
+                button_log_in, ContextCompat.getColorStateList(it, ThemeUtil.getThemeColorResource(R.attr.colorAccent))
             )
             button_log_in.isEnabled = true
         }
@@ -178,7 +181,7 @@ class LoginFragment : Fragment(), LoginView {
         context?.let {
             ViewCompat.setBackgroundTintList(
                 button_log_in,
-                ContextCompat.getColorStateList(it, R.color.colorAuthenticationButtonDisabled)
+                ContextCompat.getColorStateList(it, ThemeUtil.getThemeColorResource(R.attr.colorButtonDisabled))
             )
             button_log_in.isEnabled = false
         }
@@ -187,17 +190,15 @@ class LoginFragment : Fragment(), LoginView {
     override fun enableButtonForgetPassword() {
         context?.let {
             button_forgot_your_password.isEnabled = true
-            button_forgot_your_password.setTextColor(
-                ContextCompat.getColorStateList(it, R.color.colorAccent)
-            )
+            button_forgot_your_password.setTextColor(ThemeUtil.getThemeColor(R.attr.colorAccent))
         }
     }
 
     override fun disableButtonForgetPassword() {
         context?.let {
             button_forgot_your_password.isEnabled = false
             button_forgot_your_password.setTextColor(
-                ContextCompat.getColorStateList(it, R.color.colorAuthenticationButtonDisabled)
+                ContextCompat.getColorStateList(it, ThemeUtil.getThemeColorResource(R.attr.colorButtonDisabled))
             )
         }
     }
@@ -253,4 +254,15 @@ class LoginFragment : Fragment(), LoginView {
             text_password.isEnabled = false
         }
     }
+
+    private fun tintEditTextDrawableStart() {
+        ui {
+            val atDrawable = DrawableHelper.getDrawableFromId(R.drawable.ic_at_black_20dp, it)
+            val keyDrawable = DrawableHelper.getDrawableFromId(R.drawable.ic_key_black_20dp, it)
+            val drawables = arrayOf(atDrawable, keyDrawable)
+            DrawableHelper.wrapDrawables(drawables)
+            DrawableHelper.tintDrawables(drawables, it, ThemeUtil.getThemeColorResource(R.attr.colorDrawableStrongTint))
+            DrawableHelper.compoundDrawables( arrayOf(text_username_or_email, text_password), drawables)
+        }
+    }
 }

app/src/main/java/chat/rocket/android/authentication/loginoptions/ui/LoginOptionsFragment.kt

@@ -213,9 +213,14 @@ class LoginOptionsFragment : Fragment(), LoginOptionsView {
 
     private fun setupToolbar() {
         with(activity as AuthenticationActivity) {
-            this.clearLightStatusBar()
+            view?.let {this.clearInvisibleStatusBar(it)}
             toolbar.isVisible = true
             toolbar.title = serverName?.replace(getString(R.string.default_protocol), "")
+            val overflowIcon = toolbar.overflowIcon
+            overflowIcon?.let{
+                val wrappedDrawable = DrawableHelper.wrapDrawable(it)
+                DrawableHelper.tintDrawable(wrappedDrawable, this, R.color.colorWhite)
+            }
         }
     }
 

app/src/main/java/chat/rocket/android/authentication/onboarding/ui/OnBoardingFragment.kt

@@ -12,10 +12,7 @@ import chat.rocket.android.analytics.event.ScreenViewEvent
 import chat.rocket.android.authentication.onboarding.presentation.OnBoardingPresenter
 import chat.rocket.android.authentication.onboarding.presentation.OnBoardingView
 import chat.rocket.android.authentication.ui.AuthenticationActivity
-import chat.rocket.android.util.extensions.inflate
-import chat.rocket.android.util.extensions.setLightStatusBar
-import chat.rocket.android.util.extensions.showToast
-import chat.rocket.android.util.extensions.ui
+import chat.rocket.android.util.extensions.*
 import dagger.android.support.AndroidSupportInjection
 import kotlinx.android.synthetic.main.app_bar.*
 import kotlinx.android.synthetic.main.fragment_authentication_on_boarding.*
@@ -48,7 +45,7 @@ class OnBoardingFragment : Fragment(), OnBoardingView {
 
     private fun setupToolbar() {
         with(activity as AuthenticationActivity) {
-            view?.let { this.setLightStatusBar(it) }
+            view?.let { this.setInvisibleStatusBar(it) }
             toolbar.isVisible = false
         }
     }

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

@@ -1,7 +1,6 @@
 package chat.rocket.android.authentication.registerusername.ui
 
 import DrawableHelper
-import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -15,6 +14,7 @@ import chat.rocket.android.analytics.AnalyticsManager
 import chat.rocket.android.analytics.event.ScreenViewEvent
 import chat.rocket.android.authentication.registerusername.presentation.RegisterUsernamePresenter
 import chat.rocket.android.authentication.registerusername.presentation.RegisterUsernameView
+import chat.rocket.android.thememanager.util.ThemeUtil
 import chat.rocket.android.util.extension.asObservable
 import chat.rocket.android.util.extensions.inflate
 import chat.rocket.android.util.extensions.showKeyboard
@@ -71,9 +71,9 @@ class RegisterUsernameFragment : Fragment(), RegisterUsernameView {
             showKeyboard(text_username)
         }
 
-        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) {
+//        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) {
             tintEditTextDrawableStart()
-        }
+//        }
 
         setupOnClickListener()
         subscribeEditText()
@@ -89,7 +89,7 @@ class RegisterUsernameFragment : Fragment(), RegisterUsernameView {
     override fun enableButtonUseThisUsername() {
         context?.let {
             ViewCompat.setBackgroundTintList(
-                button_use_this_username, ContextCompat.getColorStateList(it, R.color.colorAccent)
+                button_use_this_username, ContextCompat.getColorStateList(it, ThemeUtil.getThemeColorResource(R.attr.colorAccent))
             )
             button_use_this_username.isEnabled = true
         }
@@ -99,7 +99,7 @@ class RegisterUsernameFragment : Fragment(), RegisterUsernameView {
         context?.let {
             ViewCompat.setBackgroundTintList(
                 button_use_this_username,
-                ContextCompat.getColorStateList(it, R.color.colorAuthenticationButtonDisabled)
+                ContextCompat.getColorStateList(it, ThemeUtil.getThemeColorResource(R.attr.colorButtonDisabled))
             )
             button_use_this_username.isEnabled = false
         }
@@ -139,7 +139,7 @@ class RegisterUsernameFragment : Fragment(), RegisterUsernameView {
         ui {
             val atDrawable = DrawableHelper.getDrawableFromId(R.drawable.ic_at_black_20dp, it)
             DrawableHelper.wrapDrawable(atDrawable)
-            DrawableHelper.tintDrawable(atDrawable, it, R.color.colorDrawableTintGrey)
+            DrawableHelper.tintDrawable(atDrawable, it, ThemeUtil.getThemeColorResource(R.attr.colorDrawableStrongTint))
             DrawableHelper.compoundStartDrawable(text_username, atDrawable)
         }
     }

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

@@ -13,6 +13,7 @@ import chat.rocket.android.analytics.AnalyticsManager
 import chat.rocket.android.analytics.event.ScreenViewEvent
 import chat.rocket.android.authentication.resetpassword.presentation.ResetPasswordPresenter
 import chat.rocket.android.authentication.resetpassword.presentation.ResetPasswordView
+import chat.rocket.android.thememanager.util.ThemeUtil
 import chat.rocket.android.util.extension.asObservable
 import chat.rocket.android.util.extensions.inflate
 import chat.rocket.android.util.extensions.isEmail
@@ -55,6 +56,10 @@ class ResetPasswordFragment : Fragment(), ResetPasswordView {
             showKeyboard(text_email)
         }
 
+//        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) {
+        tintEditTextDrawableStart()
+//        }
+
         setupOnClickListener()
         subscribeEditText()
 
@@ -74,7 +79,7 @@ class ResetPasswordFragment : Fragment(), ResetPasswordView {
     override fun enableButtonConnect() {
         context?.let {
             ViewCompat.setBackgroundTintList(
-                button_reset_password, ContextCompat.getColorStateList(it, R.color.colorAccent)
+                button_reset_password, ContextCompat.getColorStateList(it, ThemeUtil.getThemeColorResource(R.attr.colorAccent))
             )
             button_reset_password.isEnabled = true
         }
@@ -84,7 +89,7 @@ class ResetPasswordFragment : Fragment(), ResetPasswordView {
         context?.let {
             ViewCompat.setBackgroundTintList(
                 button_reset_password,
-                ContextCompat.getColorStateList(it, R.color.colorAuthenticationButtonDisabled)
+                ContextCompat.getColorStateList(it, ThemeUtil.getThemeColorResource(R.attr.colorButtonDisabled))
             )
             button_reset_password.isEnabled = false
         }
@@ -147,4 +152,13 @@ class ResetPasswordFragment : Fragment(), ResetPasswordView {
     }
 
     private fun unsubscribeEditText() = emailAddressDisposable.dispose()
+
+    private fun tintEditTextDrawableStart() {
+        ui {
+            val atDrawable = DrawableHelper.getDrawableFromId(R.drawable.ic_email_black_20dp, it)
+            DrawableHelper.wrapDrawable(atDrawable)
+            DrawableHelper.tintDrawable(atDrawable, it, ThemeUtil.getThemeColorResource(R.attr.colorDrawableStrongTint))
+            DrawableHelper.compoundStartDrawable(text_email, atDrawable)
+        }
+    }
 }