chore(sponsor): change to GitHub Sponsor (#981)

* chore(sponsor): change to GitHub Sponsor

* Fix button style

* Font style

* Small fix

* spotless

.github/FUNDING.yml

@@ -1,6 +1,6 @@
 # These are supported funding model platforms
 
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+github: [cuong-tran]
 patreon: # Replace with a single Patreon username
 open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username
@@ -10,6 +10,6 @@ liberapay: # Replace with a single Liberapay username
 issuehunt: # Replace with a single IssueHunt username
 lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
 polar: # Replace with a single Polar username
-buy_me_a_coffee: cuongtrantm
+buy_me_a_coffee: #
 thanks_dev: # Replace with a single thanks.dev username
 custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

README.md

@@ -24,7 +24,7 @@
 
 *Requires Android 8.0 or higher.*
 
-[![Buy me a coffee](https://img.buymeacoffee.com/button-api/?text=Buy%20me%20a%20coffee&emoji=☕&slug=cuongtrantm&button_colour=FFDD00&font_colour=000000&font_family=Cookie&outline_colour=000000&coffee_colour=ffffff)](https://buymeacoffee.com/cuongtrantm)
+[![Sponsor me on GitHub](https://custom-icon-badges.demolab.com/badge/-Sponsor-ea4aaa?style=for-the-badge&logo=heart&logoColor=white)](https://github.com/sponsors/cuong-tran "Sponsor me on GitHub")
 
 <div align="left">
 A free and open source manga reader which is based off TachiyomiSY & Mihon/Tachiyomi. This fork is meant to provide new & useful features while regularly take features/updates from Mihon or other forks like SY, J2K and Neko...

app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt

@@ -4,15 +4,17 @@ import androidx.compose.animation.graphics.res.animatedVectorResource
 import androidx.compose.animation.graphics.res.rememberAnimatedVectorPainter
 import androidx.compose.animation.graphics.vector.AnimatedImageVector
 import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.outlined.HelpOutline
 import androidx.compose.material.icons.automirrored.outlined.Label
 import androidx.compose.material.icons.automirrored.outlined.PlaylistAdd
+import androidx.compose.material.icons.filled.Favorite
 import androidx.compose.material.icons.outlined.CloudOff
 import androidx.compose.material.icons.outlined.GetApp
 import androidx.compose.material.icons.outlined.History
@@ -25,17 +27,13 @@ import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalUriHandler
-import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.tooling.preview.PreviewLightDark
 import androidx.compose.ui.unit.dp
 import eu.kanade.presentation.more.settings.widget.SwitchPreferenceWidget
@@ -52,6 +50,7 @@ import tachiyomi.i18n.kmk.KMR
 import tachiyomi.i18n.sy.SYMR
 import tachiyomi.presentation.core.components.ScrollbarLazyColumn
 import tachiyomi.presentation.core.components.material.Scaffold
+import tachiyomi.presentation.core.components.material.TextButton
 import tachiyomi.presentation.core.components.material.padding
 import tachiyomi.presentation.core.i18n.pluralStringResource
 import tachiyomi.presentation.core.i18n.stringResource
@@ -250,29 +249,36 @@ fun MoreScreen(
 @Composable
 fun Sponsor() {
     val context = LocalContext.current
-    Column(
+    Row(
         modifier = Modifier
             .fillMaxWidth()
             .padding(bottom = MaterialTheme.padding.medium),
-        horizontalAlignment = Alignment.CenterHorizontally,
+        horizontalArrangement = Arrangement.Center,
     ) {
-        val painter = rememberVectorPainter(ImageVector.vectorResource(R.drawable.ic_bmc_button))
+        TextButton(
-        Box(
+            onClick = { context.openInBrowser(Constants.SPONSOR) },
             modifier = Modifier
                 .border(
                     width = 2.dp,
                     color = MaterialTheme.colorScheme.primary,
                     shape = MaterialTheme.shapes.small,
                 ),
+        ) {
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
             ) {
                 Icon(
-                painter = painter,
+                    imageVector = Icons.Filled.Favorite,
-                contentDescription = "Buy me a coffee",
+                    contentDescription = stringResource(KMR.strings.sponsor_me),
-                tint = Color.Unspecified,
+                    tint = MaterialTheme.colorScheme.primary,
-                modifier = Modifier
-                    .clip(MaterialTheme.shapes.small)
-                    .clickable { context.openInBrowser(Constants.URL_BUY_ME_A_COFFEE) },
                 )
+                Spacer(Modifier.width(4.dp))
+                Text(
+                    text = stringResource(KMR.strings.sponsor_me),
+                    color = MaterialTheme.colorScheme.primary,
+                    style = MaterialTheme.typography.labelLarge,
+                )
+            }
         }
     }
 }
@@ -281,7 +287,12 @@ fun Sponsor() {
 @Composable
 private fun SponsorPreview() {
     TachiyomiPreviewTheme {
-        Surface {
+        Surface(
+            modifier = Modifier
+                .fillMaxWidth(),
+            color = MaterialTheme.colorScheme.surface,
+            shadowElevation = 0.dp,
+        ) {
             Sponsor()
         }
     }

core/common/src/main/kotlin/tachiyomi/core/common/Constants.kt

@@ -1,7 +1,7 @@
 package tachiyomi.core.common
 
 object Constants {
-    const val URL_BUY_ME_A_COFFEE = "https://buymeacoffee.com/cuongtrantm"
+    const val SPONSOR = "https://github.com/sponsors/cuong-tran"
 
     const val URL_HELP = "https://komikku-app.github.io/docs/guides/troubleshooting/"
     const val URL_HELP_UPCOMING = "https://komikku-app.github.io/docs/faq/updates/upcoming"

i18n-kmk/src/commonMain/moko-resources/base/strings.xml

@@ -154,5 +154,6 @@
     <string name="migrating_all_entries">Migrating all entries from source</string>
     <!-- Misc -->
     <string name="label_to_be_updated">To be updated</string>
+    <string name="sponsor_me">Sponsor Me</string>
     <string name="batch_add_description">Support: MangaDex, E-H, ExH, nH, 8Muses, Tsumino</string>
 </resources>