From d3bc9f52fd9383f0aed488931812f2212a67ed84 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoitm@matrix.org>
Date: Fri, 8 May 2020 15:47:34 +0200
Subject: [PATCH] Remove duplicated class

---
 .../discovery/DiscoverySettingsController.kt  | 13 +++---
 .../features/discovery/SettingsLoadingItem.kt | 44 -------------------
 2 files changed, 7 insertions(+), 50 deletions(-)
 delete mode 100644 vector/src/main/java/im/vector/riotx/features/discovery/SettingsLoadingItem.kt

diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsController.kt b/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsController.kt
index 45f165c916..991e730cad 100644
--- a/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsController.kt
+++ b/vector/src/main/java/im/vector/riotx/features/discovery/DiscoverySettingsController.kt
@@ -23,6 +23,7 @@ import com.airbnb.mvrx.Loading
 import com.airbnb.mvrx.Success
 import com.google.i18n.phonenumbers.PhoneNumberUtil
 import im.vector.riotx.R
+import im.vector.riotx.core.epoxy.loadingItem
 import im.vector.riotx.core.resources.ColorProvider
 import im.vector.riotx.core.resources.StringProvider
 import timber.log.Timber
@@ -38,7 +39,7 @@ class DiscoverySettingsController @Inject constructor(
     override fun buildModels(data: DiscoverySettingsState) {
         when (data.identityServer) {
             is Loading -> {
-                settingsLoadingItem {
+                loadingItem {
                     id("identityServerLoading")
                 }
             }
@@ -69,8 +70,8 @@ class DiscoverySettingsController @Inject constructor(
 
         when (data.phoneNumbersList) {
             is Incomplete -> {
-                settingsLoadingItem {
-                    id("phoneLoading")
+                loadingItem {
+                    id("msisdnLoading")
                 }
             }
             is Fail       -> {
@@ -165,17 +166,17 @@ class DiscoverySettingsController @Inject constructor(
         }
         when (data.emailList) {
             is Incomplete -> {
-                settingsLoadingItem {
+                loadingItem {
                     id("mailLoading")
                 }
             }
-            is Fail    -> {
+            is Fail       -> {
                 settingsInfoItem {
                     id("mailListError")
                     helperText(data.emailList.error.message)
                 }
             }
-            is Success -> {
+            is Success    -> {
                 val emails = data.emailList.invoke()
                 if (emails.isEmpty()) {
                     settingsInfoItem {
diff --git a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsLoadingItem.kt b/vector/src/main/java/im/vector/riotx/features/discovery/SettingsLoadingItem.kt
deleted file mode 100644
index 8b9ec9e244..0000000000
--- a/vector/src/main/java/im/vector/riotx/features/discovery/SettingsLoadingItem.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2020 New Vector Ltd
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package im.vector.riotx.features.discovery
-
-import android.widget.ProgressBar
-import android.widget.TextView
-import androidx.core.view.isVisible
-import com.airbnb.epoxy.EpoxyAttribute
-import com.airbnb.epoxy.EpoxyModelClass
-import com.airbnb.epoxy.EpoxyModelWithHolder
-import im.vector.riotx.R
-import im.vector.riotx.core.epoxy.VectorEpoxyHolder
-import im.vector.riotx.core.extensions.setTextOrHide
-
-@EpoxyModelClass(layout = R.layout.item_loading)
-abstract class SettingsLoadingItem : EpoxyModelWithHolder<SettingsLoadingItem.Holder>() {
-
-    @EpoxyAttribute var loadingText: String? = null
-
-    override fun bind(holder: Holder) {
-        super.bind(holder)
-        holder.textView.setTextOrHide(loadingText)
-        holder.progressBar.isVisible = true
-        holder.progressBar.animate()
-    }
-
-    class Holder : VectorEpoxyHolder() {
-        val textView by bind<TextView>(R.id.loadingText)
-        val progressBar by bind<ProgressBar>(R.id.loadingProgress)
-    }
-}