textDrawable #136

davidoskky · 2023-03-25T15:45:56Z

davidoskky commented

2023-03-25 15:45:56 +00:00

Types of changes

I have read the CONTRIBUTING document.
My code follows the code style of this project.
I have updated the documentation accordingly.
I have added tests to cover my changes.
All new and existing tests passed.
This is NOT translation related.

This closes issue #120

Removed the dependency com.amulyakhare.textdrawable and slightly simplified the logic required to set circular images.

## Types of changes - [x] I have read the **CONTRIBUTING** document. - [x] My code follows the code style of this project. - [ ] I have updated the documentation accordingly. - [ ] I have added tests to cover my changes. - [x] All new and existing tests passed. - [x] This is **NOT** translation related. This closes issue #120 Removed the dependency `com.amulyakhare.textdrawable` and slightly simplified the logic required to set circular images.

davidoskky added 7 commits 2023-03-25 15:45:57 +00:00

Add a new layout to handle text on top of a round background a5af4f8880

Operate glide on the circular image view 452d13c48c

Use the circular image view in the card adapter 6ef6743527

Use the circular image view in the Source list 9536e6e465

Use the circular image view in the item list f01e616369

Remove unused dependency 554b25698f

Remove unused function

continuous-integration/drone/pr Build is failing

Details

1ad529067d

AmineB requested changes 2023-03-25 20:49:27 +00:00

AmineB left a comment

Just a little cleaning, and this can be merged.

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/ItemCardAdapter.kt Outdated

						
				@ -91,3 +83,1 @@

				                        .round()

				                        .build(itm.title.getHtmlDecoded().toTextDrawableString(), color)

				                binding.sourceImage.setImageDrawable(drawable)

				                binding.sourceImage.setBackgroundAndText(itm.title.getHtmlDecoded(), itm.title.getHtmlDecoded().toTextDrawableString())

AmineB commented

2023-03-25 20:34:11 +00:00

You could call setBackgroundAndText with a single parameter, and call toTextDrawableString inside.

Also, here, there is an issue, it should be itm.sourcetitle that should be used.

                binding.sourceImage.setBackgroundAndText(itm.sourcetitle.getHtmlDecoded())

You could call `setBackgroundAndText` with a single parameter, and call `toTextDrawableString` inside. Also, here, there is an issue, it should be `itm.sourcetitle` that should be used. ``` binding.sourceImage.setBackgroundAndText(itm.sourcetitle.getHtmlDecoded()) ```

AmineB marked this conversation as resolved

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/ItemListAdapter.kt Outdated

						
				@ -65,3 +55,1 @@

				                                    .build(itm.title.getHtmlDecoded().toTextDrawableString(), color)

				                    binding.itemImage.setImageDrawable(drawable)

				                    binding.itemImage.setBackgroundAndText(itm.title.getHtmlDecoded(), itm.title.getHtmlDecoded().toTextDrawableString())

AmineB commented

2023-03-25 20:38:01 +00:00

Same as before:

                binding.itemImage.setBackgroundAndText(itm.sourcetitle.getHtmlDecoded())

Same as before: ``` binding.itemImage.setBackgroundAndText(itm.sourcetitle.getHtmlDecoded()) ```

AmineB marked this conversation as resolved

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/utils/CircleImageView.kt

						
				@ -0,0 +20,4 @@

				    val imageView: ShapeableImageView

				    val textView: TextView

				    private val colorScheme = listOf(

AmineB commented

2023-03-25 20:44:40 +00:00

Why introduce a new way to handle colors, instead of using the color generator that was used previously ?

davidoskky commented

2023-03-25 20:53:53 +00:00

The color generator was provided by the library we're removing. I simply copied the relevant part of the code from there.

AmineB marked this conversation as resolved

davidoskky force-pushed textDrawable from ea6261c975 to 10ab67d071

2023-03-25 21:02:53 +00:00

Compare

davidoskky commented

2023-03-25 21:04:42 +00:00

Alright, this should do.

AmineB approved these changes 2023-03-26 11:11:23 +00:00

AmineB merged commit 8d7d3174aa into master

2023-03-26 11:12:03 +00:00

AmineB referenced this issue from a commit

2023-03-26 11:12:04 +00:00

chore: replace textDrawable library (#136)

davidoskky deleted branch textDrawable

2023-03-26 12:59:36 +00:00

Sign in to join this conversation.

No reviewers

No Milestone

No project

No Assignees

2 Participants

Notifications

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: Louvorg/ReaderForSelfoss-multiplatform#136