Skip to content

Commit 81e8a41

Browse files
authored
Further untangle from ChromeTabSwitcher library. (#4516)
1 parent ef42725 commit 81e8a41

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

app/src/main/java/org/wikipedia/descriptions/DescriptionEditView.kt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@ import android.view.LayoutInflater
1010
import android.view.inputmethod.EditorInfo
1111
import android.widget.LinearLayout
1212
import androidx.appcompat.content.res.AppCompatResources
13+
import androidx.core.graphics.BlendModeColorFilterCompat
14+
import androidx.core.graphics.BlendModeCompat
1315
import androidx.core.view.isVisible
1416
import androidx.core.widget.ImageViewCompat
1517
import androidx.core.widget.addTextChangedListener
16-
import de.mrapp.android.view.drawable.CircularProgressDrawable
18+
import androidx.swiperefreshlayout.widget.CircularProgressDrawable
1719
import org.wikipedia.R
1820
import org.wikipedia.WikipediaApp
1921
import org.wikipedia.analytics.eventplatform.MachineGeneratedArticleDescriptionsAnalyticsHelper
@@ -417,7 +419,11 @@ class DescriptionEditView : LinearLayout, MlKitLanguageDetector.Callback {
417419
fun showSuggestedDescriptionsLoadingProgress() {
418420
binding.suggestedDescButton.isVisible = true
419421
binding.suggestedDescButton.isEnabled = false
420-
binding.suggestedDescButton.chipIcon = CircularProgressDrawable(ResourceUtil.getThemedColor(context, R.attr.primary_color), 1).also { it.start() }
422+
val drawable = CircularProgressDrawable(context)
423+
drawable.strokeWidth = DimenUtil.dpToPx(1.5f)
424+
drawable.colorFilter = BlendModeColorFilterCompat.createBlendModeColorFilterCompat(ResourceUtil.getThemedColor(context, R.attr.primary_color), BlendModeCompat.SRC_IN)
425+
binding.suggestedDescButton.chipIcon = drawable
426+
drawable.start()
421427
}
422428

423429
fun updateSuggestedDescriptionsButtonVisibility() {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@
177177
android:visibility="gone"
178178
app:chipIcon="@drawable/ic_robot_24"
179179
app:chipIconSize="20dp"
180+
app:chipIconTint="?attr/primary_color"
180181
tools:visibility="visible" />
181182

182183
<org.wikipedia.views.PlainPasteEditText

0 commit comments

Comments
 (0)