github/tachiyomi
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update social media icons

Browse source
This commit is contained in:
arkon 2023-10-05 09:33:34 -04:00
parent df332860b8
commit 7f0f67d752
10 changed files with 348 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/build.gradle.kts
View file

@ -240,7 +240,6 @@ dependencies {
implementation(libs.aboutLibraries.compose)
implementation(libs.bundles.voyager)
implementation(libs.compose.materialmotion)
implementation(libs.compose.simpleicons)
implementation(libs.swipe)
// Logging

26
app/src/main/java/eu/kanade/presentation/more/settings/screen/about/AboutScreen.kt
View file

@ -23,12 +23,6 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import cafe.adriel.voyager.navigator.LocalNavigator
import cafe.adriel.voyager.navigator.currentOrThrow
import compose.icons.SimpleIcons
import compose.icons.simpleicons.Discord
import compose.icons.simpleicons.Facebook
import compose.icons.simpleicons.Github
import compose.icons.simpleicons.Reddit
import compose.icons.simpleicons.Twitter
import eu.kanade.domain.ui.UiPreferences
import eu.kanade.presentation.components.AppBar
import eu.kanade.presentation.more.LogoHeader
@ -53,6 +47,12 @@ import tachiyomi.domain.release.interactor.GetApplicationRelease
import tachiyomi.presentation.core.components.LinkIcon
import tachiyomi.presentation.core.components.ScrollbarLazyColumn
import tachiyomi.presentation.core.components.material.Scaffold
import tachiyomi.presentation.core.icons.CustomIcons
import tachiyomi.presentation.core.icons.Discord
import tachiyomi.presentation.core.icons.Facebook
import tachiyomi.presentation.core.icons.Github
import tachiyomi.presentation.core.icons.Reddit
import tachiyomi.presentation.core.icons.X
import uy.kohesive.injekt.Injekt
import uy.kohesive.injekt.api.get
import java.text.DateFormat
@ -181,27 +181,27 @@ object AboutScreen : Screen() {
)
LinkIcon(
label = "Discord",
icon = SimpleIcons.Discord,
icon = CustomIcons.Discord,
url = "https://discord.gg/tachiyomi",
)
LinkIcon(
label = "Twitter",
icon = SimpleIcons.Twitter,
url = "https://twitter.com/tachiyomiorg",
label = "X",
icon = CustomIcons.X,
url = "https://x.com/tachiyomiorg",
)
LinkIcon(
label = "Facebook",
icon = SimpleIcons.Facebook,
icon = CustomIcons.Facebook,
url = "https://facebook.com/tachiyomiorg",
)
LinkIcon(
label = "Reddit",
icon = SimpleIcons.Reddit,
icon = CustomIcons.Reddit,
url = "https://www.reddit.com/r/Tachiyomi",
)
LinkIcon(
label = "GitHub",
icon = SimpleIcons.Github,
icon = CustomIcons.Github,
url = "https://github.com/tachiyomiorg",
)
}

2
app/src/main/java/eu/kanade/presentation/reader/PageIndicatorText.kt
View file

@ -6,12 +6,10 @@ import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.drawscope.Stroke
import androidx.compose.ui.text.ExperimentalTextApi
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.sp
@OptIn(ExperimentalTextApi::class)
@Composable
fun PageIndicatorText(
currentPage: Int,

1
gradle/libs.versions.toml
View file

@ -58,7 +58,6 @@ photoview = "com.github.chrisbanes:PhotoView:2.3.0"
directionalviewpager = "com.github.tachiyomiorg:DirectionalViewPager:1.0.0"
insetter = "dev.chrisbanes.insetter:insetter:0.6.1"
compose-materialmotion = "io.github.fornewid:material-motion-compose-core:1.1.0"
compose-simpleicons = "br.com.devsrsouza.compose.icons.android:simple-icons:1.0.0"
swipe = "me.saket.swipe:swipe:1.2.0"

7
presentation-core/src/main/java/tachiyomi/presentation/core/icons/CustomIcons.kt Normal file
View file

@ -0,0 +1,7 @@
package tachiyomi.presentation.core.icons
/**
* Icons imported from https://simpleicons.org using
* https://github.com/DevSrSouza/svg-to-compose
*/
object CustomIcons

77
presentation-core/src/main/java/tachiyomi/presentation/core/icons/Discord.kt Normal file
View file

@ -0,0 +1,77 @@
package tachiyomi.presentation.core.icons
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.PathFillType.Companion.NonZero
import androidx.compose.ui.graphics.SolidColor
import androidx.compose.ui.graphics.StrokeCap.Companion.Butt
import androidx.compose.ui.graphics.StrokeJoin.Companion.Miter
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.graphics.vector.ImageVector.Builder
import androidx.compose.ui.graphics.vector.path
import androidx.compose.ui.unit.dp
val CustomIcons.Discord: ImageVector
get() {
if (_discord != null) {
return _discord!!
}
_discord = Builder(
name = "Discord", defaultWidth = 24.0.dp, defaultHeight = 24.0.dp,
viewportWidth = 24.0f, viewportHeight = 24.0f,
).apply {
path(
fill = SolidColor(Color(0xFF000000)), stroke = null, strokeLineWidth = 0.0f,
strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = 4.0f,
pathFillType = NonZero,
) {
moveTo(20.317f, 4.3698f)
arcToRelative(19.7913f, 19.7913f, 0.0f, false, false, -4.8851f, -1.5152f)
arcToRelative(0.0741f, 0.0741f, 0.0f, false, false, -0.0785f, 0.0371f)
curveToRelative(-0.211f, 0.3753f, -0.4447f, 0.8648f, -0.6083f, 1.2495f)
curveToRelative(-1.8447f, -0.2762f, -3.68f, -0.2762f, -5.4868f, 0.0f)
curveToRelative(-0.1636f, -0.3933f, -0.4058f, -0.8742f, -0.6177f, -1.2495f)
arcToRelative(0.077f, 0.077f, 0.0f, false, false, -0.0785f, -0.037f)
arcToRelative(19.7363f, 19.7363f, 0.0f, false, false, -4.8852f, 1.515f)
arcToRelative(0.0699f, 0.0699f, 0.0f, false, false, -0.0321f, 0.0277f)
curveTo(0.5334f, 9.0458f, -0.319f, 13.5799f, 0.0992f, 18.0578f)
arcToRelative(0.0824f, 0.0824f, 0.0f, false, false, 0.0312f, 0.0561f)
curveToRelative(2.0528f, 1.5076f, 4.0413f, 2.4228f, 5.9929f, 3.0294f)
arcToRelative(0.0777f, 0.0777f, 0.0f, false, false, 0.0842f, -0.0276f)
curveToRelative(0.4616f, -0.6304f, 0.8731f, -1.2952f, 1.226f, -1.9942f)
arcToRelative(0.076f, 0.076f, 0.0f, false, false, -0.0416f, -0.1057f)
curveToRelative(-0.6528f, -0.2476f, -1.2743f, -0.5495f, -1.8722f, -0.8923f)
arcToRelative(0.077f, 0.077f, 0.0f, false, true, -0.0076f, -0.1277f)
curveToRelative(0.1258f, -0.0943f, 0.2517f, -0.1923f, 0.3718f, -0.2914f)
arcToRelative(0.0743f, 0.0743f, 0.0f, false, true, 0.0776f, -0.0105f)
curveToRelative(3.9278f, 1.7933f, 8.18f, 1.7933f, 12.0614f, 0.0f)
arcToRelative(0.0739f, 0.0739f, 0.0f, false, true, 0.0785f, 0.0095f)
curveToRelative(0.1202f, 0.099f, 0.246f, 0.1981f, 0.3728f, 0.2924f)
arcToRelative(0.077f, 0.077f, 0.0f, false, true, -0.0066f, 0.1276f)
arcToRelative(12.2986f, 12.2986f, 0.0f, false, true, -1.873f, 0.8914f)
arcToRelative(0.0766f, 0.0766f, 0.0f, false, false, -0.0407f, 0.1067f)
curveToRelative(0.3604f, 0.698f, 0.7719f, 1.3628f, 1.225f, 1.9932f)
arcToRelative(0.076f, 0.076f, 0.0f, false, false, 0.0842f, 0.0286f)
curveToRelative(1.961f, -0.6067f, 3.9495f, -1.5219f, 6.0023f, -3.0294f)
arcToRelative(0.077f, 0.077f, 0.0f, false, false, 0.0313f, -0.0552f)
curveToRelative(0.5004f, -5.177f, -0.8382f, -9.6739f, -3.5485f, -13.6604f)
arcToRelative(0.061f, 0.061f, 0.0f, false, false, -0.0312f, -0.0286f)
close()
moveTo(8.02f, 15.3312f)
curveToRelative(-1.1825f, 0.0f, -2.1569f, -1.0857f, -2.1569f, -2.419f)
curveToRelative(0.0f, -1.3332f, 0.9555f, -2.4189f, 2.157f, -2.4189f)
curveToRelative(1.2108f, 0.0f, 2.1757f, 1.0952f, 2.1568f, 2.419f)
curveToRelative(0.0f, 1.3332f, -0.9555f, 2.4189f, -2.1569f, 2.4189f)
close()
moveTo(15.9948f, 15.3312f)
curveToRelative(-1.1825f, 0.0f, -2.1569f, -1.0857f, -2.1569f, -2.419f)
curveToRelative(0.0f, -1.3332f, 0.9554f, -2.4189f, 2.1569f, -2.4189f)
curveToRelative(1.2108f, 0.0f, 2.1757f, 1.0952f, 2.1568f, 2.419f)
curveToRelative(0.0f, 1.3332f, -0.946f, 2.4189f, -2.1568f, 2.4189f)
close()
}
}
.build()
return _discord!!
}
private var _discord: ImageVector? = null

54
presentation-core/src/main/java/tachiyomi/presentation/core/icons/Facebook.kt Normal file
View file

@ -0,0 +1,54 @@
package tachiyomi.presentation.core.icons
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.PathFillType.Companion.NonZero
import androidx.compose.ui.graphics.SolidColor
import androidx.compose.ui.graphics.StrokeCap.Companion.Butt
import androidx.compose.ui.graphics.StrokeJoin.Companion.Miter
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.graphics.vector.ImageVector.Builder
import androidx.compose.ui.graphics.vector.path
import androidx.compose.ui.unit.dp
val CustomIcons.Facebook: ImageVector
get() {
if (_facebook != null) {
return _facebook!!
}
_facebook = Builder(
name = "Facebook", defaultWidth = 24.0.dp, defaultHeight = 24.0.dp,
viewportWidth = 24.0f, viewportHeight = 24.0f,
).apply {
path(
fill = SolidColor(Color(0xFF000000)), stroke = null, strokeLineWidth = 0.0f,
strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = 4.0f,
pathFillType = NonZero,
) {
moveTo(24.0f, 12.073f)
curveToRelative(0.0f, -6.627f, -5.373f, -12.0f, -12.0f, -12.0f)
reflectiveCurveToRelative(-12.0f, 5.373f, -12.0f, 12.0f)
curveToRelative(0.0f, 5.99f, 4.388f, 10.954f, 10.125f, 11.854f)
verticalLineToRelative(-8.385f)
horizontalLineTo(7.078f)
verticalLineToRelative(-3.47f)
horizontalLineToRelative(3.047f)
verticalLineTo(9.43f)
curveToRelative(0.0f, -3.007f, 1.792f, -4.669f, 4.533f, -4.669f)
curveToRelative(1.312f, 0.0f, 2.686f, 0.235f, 2.686f, 0.235f)
verticalLineToRelative(2.953f)
horizontalLineTo(15.83f)
curveToRelative(-1.491f, 0.0f, -1.956f, 0.925f, -1.956f, 1.874f)
verticalLineToRelative(2.25f)
horizontalLineToRelative(3.328f)
lineToRelative(-0.532f, 3.47f)
horizontalLineToRelative(-2.796f)
verticalLineToRelative(8.385f)
curveTo(19.612f, 23.027f, 24.0f, 18.062f, 24.0f, 12.073f)
close()
}
}
.build()
return _facebook!!
}
private var _facebook: ImageVector? = null

59
presentation-core/src/main/java/tachiyomi/presentation/core/icons/Github.kt Normal file
View file

@ -0,0 +1,59 @@
package tachiyomi.presentation.core.icons
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.PathFillType.Companion.NonZero
import androidx.compose.ui.graphics.SolidColor
import androidx.compose.ui.graphics.StrokeCap.Companion.Butt
import androidx.compose.ui.graphics.StrokeJoin.Companion.Miter
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.graphics.vector.ImageVector.Builder
import androidx.compose.ui.graphics.vector.path
import androidx.compose.ui.unit.dp
val CustomIcons.Github: ImageVector
get() {
if (_github != null) {
return _github!!
}
_github = Builder(
name = "Github", defaultWidth = 24.0.dp, defaultHeight = 24.0.dp,
viewportWidth = 24.0f, viewportHeight = 24.0f,
).apply {
path(
fill = SolidColor(Color(0xFF000000)), stroke = null, strokeLineWidth = 0.0f,
strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = 4.0f,
pathFillType = NonZero,
) {
moveTo(12.0f, 0.297f)
curveToRelative(-6.63f, 0.0f, -12.0f, 5.373f, -12.0f, 12.0f)
curveToRelative(0.0f, 5.303f, 3.438f, 9.8f, 8.205f, 11.385f)
curveToRelative(0.6f, 0.113f, 0.82f, -0.258f, 0.82f, -0.577f)
curveToRelative(0.0f, -0.285f, -0.01f, -1.04f, -0.015f, -2.04f)
curveToRelative(-3.338f, 0.724f, -4.042f, -1.61f, -4.042f, -1.61f)
curveTo(4.422f, 18.07f, 3.633f, 17.7f, 3.633f, 17.7f)
curveToRelative(-1.087f, -0.744f, 0.084f, -0.729f, 0.084f, -0.729f)
curveToRelative(1.205f, 0.084f, 1.838f, 1.236f, 1.838f, 1.236f)
curveToRelative(1.07f, 1.835f, 2.809f, 1.305f, 3.495f, 0.998f)
curveToRelative(0.108f, -0.776f, 0.417f, -1.305f, 0.76f, -1.605f)
curveToRelative(-2.665f, -0.3f, -5.466f, -1.332f, -5.466f, -5.93f)
curveToRelative(0.0f, -1.31f, 0.465f, -2.38f, 1.235f, -3.22f)
curveToRelative(-0.135f, -0.303f, -0.54f, -1.523f, 0.105f, -3.176f)
curveToRelative(0.0f, 0.0f, 1.005f, -0.322f, 3.3f, 1.23f)
curveToRelative(0.96f, -0.267f, 1.98f, -0.399f, 3.0f, -0.405f)
curveToRelative(1.02f, 0.006f, 2.04f, 0.138f, 3.0f, 0.405f)
curveToRelative(2.28f, -1.552f, 3.285f, -1.23f, 3.285f, -1.23f)
curveToRelative(0.645f, 1.653f, 0.24f, 2.873f, 0.12f, 3.176f)
curveToRelative(0.765f, 0.84f, 1.23f, 1.91f, 1.23f, 3.22f)
curveToRelative(0.0f, 4.61f, -2.805f, 5.625f, -5.475f, 5.92f)
curveToRelative(0.42f, 0.36f, 0.81f, 1.096f, 0.81f, 2.22f)
curveToRelative(0.0f, 1.606f, -0.015f, 2.896f, -0.015f, 3.286f)
curveToRelative(0.0f, 0.315f, 0.21f, 0.69f, 0.825f, 0.57f)
curveTo(20.565f, 22.092f, 24.0f, 17.592f, 24.0f, 12.297f)
curveToRelative(0.0f, -6.627f, -5.373f, -12.0f, -12.0f, -12.0f)
}
}
.build()
return _github!!
}
private var _github: ImageVector? = null

85
presentation-core/src/main/java/tachiyomi/presentation/core/icons/Reddit.kt Normal file
View file

@ -0,0 +1,85 @@
package tachiyomi.presentation.core.icons
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.PathFillType.Companion.NonZero
import androidx.compose.ui.graphics.SolidColor
import androidx.compose.ui.graphics.StrokeCap.Companion.Butt
import androidx.compose.ui.graphics.StrokeJoin.Companion.Miter
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.graphics.vector.ImageVector.Builder
import androidx.compose.ui.graphics.vector.path
import androidx.compose.ui.unit.dp
val CustomIcons.Reddit: ImageVector
get() {
if (_reddit != null) {
return _reddit!!
}
_reddit = Builder(
name = "Reddit", defaultWidth = 24.0.dp, defaultHeight = 24.0.dp,
viewportWidth = 24.0f, viewportHeight = 24.0f,
).apply {
path(
fill = SolidColor(Color(0xFF000000)), stroke = null, strokeLineWidth = 0.0f,
strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = 4.0f,
pathFillType = NonZero,
) {
moveTo(12.0f, 0.0f)
arcTo(12.0f, 12.0f, 0.0f, false, false, 0.0f, 12.0f)
arcToRelative(12.0f, 12.0f, 0.0f, false, false, 12.0f, 12.0f)
arcToRelative(12.0f, 12.0f, 0.0f, false, false, 12.0f, -12.0f)
arcTo(12.0f, 12.0f, 0.0f, false, false, 12.0f, 0.0f)
close()
moveTo(17.01f, 4.744f)
curveToRelative(0.688f, 0.0f, 1.25f, 0.561f, 1.25f, 1.249f)
arcToRelative(1.25f, 1.25f, 0.0f, false, true, -2.498f, 0.056f)
lineToRelative(-2.597f, -0.547f)
lineToRelative(-0.8f, 3.747f)
curveToRelative(1.824f, 0.07f, 3.48f, 0.632f, 4.674f, 1.488f)
curveToRelative(0.308f, -0.309f, 0.73f, -0.491f, 1.207f, -0.491f)
curveToRelative(0.968f, 0.0f, 1.754f, 0.786f, 1.754f, 1.754f)
curveToRelative(0.0f, 0.716f, -0.435f, 1.333f, -1.01f, 1.614f)
arcToRelative(3.111f, 3.111f, 0.0f, false, true, 0.042f, 0.52f)
curveToRelative(0.0f, 2.694f, -3.13f, 4.87f, -7.004f, 4.87f)
curveToRelative(-3.874f, 0.0f, -7.004f, -2.176f, -7.004f, -4.87f)
curveToRelative(0.0f, -0.183f, 0.015f, -0.366f, 0.043f, -0.534f)
arcTo(1.748f, 1.748f, 0.0f, false, true, 4.028f, 12.0f)
curveToRelative(0.0f, -0.968f, 0.786f, -1.754f, 1.754f, -1.754f)
curveToRelative(0.463f, 0.0f, 0.898f, 0.196f, 1.207f, 0.49f)
curveToRelative(1.207f, -0.883f, 2.878f, -1.43f, 4.744f, -1.487f)
lineToRelative(0.885f, -4.182f)
arcToRelative(0.342f, 0.342f, 0.0f, false, true, 0.14f, -0.197f)
arcToRelative(0.35f, 0.35f, 0.0f, false, true, 0.238f, -0.042f)
lineToRelative(2.906f, 0.617f)
arcToRelative(1.214f, 1.214f, 0.0f, false, true, 1.108f, -0.701f)
close()
moveTo(9.25f, 12.0f)
curveTo(8.561f, 12.0f, 8.0f, 12.562f, 8.0f, 13.25f)
curveToRelative(0.0f, 0.687f, 0.561f, 1.248f, 1.25f, 1.248f)
curveToRelative(0.687f, 0.0f, 1.248f, -0.561f, 1.248f, -1.249f)
curveToRelative(0.0f, -0.688f, -0.561f, -1.249f, -1.249f, -1.249f)
close()
moveTo(14.75f, 12.0f)
curveToRelative(-0.687f, 0.0f, -1.248f, 0.561f, -1.248f, 1.25f)
curveToRelative(0.0f, 0.687f, 0.561f, 1.248f, 1.249f, 1.248f)
curveToRelative(0.688f, 0.0f, 1.249f, -0.561f, 1.249f, -1.249f)
curveToRelative(0.0f, -0.687f, -0.562f, -1.249f, -1.25f, -1.249f)
close()
moveTo(9.284f, 15.99f)
arcToRelative(0.327f, 0.327f, 0.0f, false, false, -0.231f, 0.094f)
arcToRelative(0.33f, 0.33f, 0.0f, false, false, 0.0f, 0.463f)
curveToRelative(0.842f, 0.842f, 2.484f, 0.913f, 2.961f, 0.913f)
curveToRelative(0.477f, 0.0f, 2.105f, -0.056f, 2.961f, -0.913f)
arcToRelative(0.361f, 0.361f, 0.0f, false, false, 0.029f, -0.463f)
arcToRelative(0.33f, 0.33f, 0.0f, false, false, -0.464f, 0.0f)
curveToRelative(-0.547f, 0.533f, -1.684f, 0.73f, -2.512f, 0.73f)
curveToRelative(-0.828f, 0.0f, -1.979f, -0.196f, -2.512f, -0.73f)
arcToRelative(0.326f, 0.326f, 0.0f, false, false, -0.232f, -0.095f)
close()
}
}
.build()
return _reddit!!
}
private var _reddit: ImageVector? = null

53
presentation-core/src/main/java/tachiyomi/presentation/core/icons/X.kt Normal file
View file

@ -0,0 +1,53 @@
package tachiyomi.presentation.core.icons
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.PathFillType.Companion.NonZero
import androidx.compose.ui.graphics.SolidColor
import androidx.compose.ui.graphics.StrokeCap.Companion.Butt
import androidx.compose.ui.graphics.StrokeJoin.Companion.Miter
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.graphics.vector.ImageVector.Builder
import androidx.compose.ui.graphics.vector.path
import androidx.compose.ui.unit.dp
val CustomIcons.X: ImageVector
get() {
if (_x != null) {
return _x!!
}
_x = Builder(
name = "X", defaultWidth = 24.0.dp, defaultHeight = 24.0.dp,
viewportWidth =
24.0f,
viewportHeight = 24.0f,
).apply {
path(
fill = SolidColor(Color(0xFF000000)), stroke = null, strokeLineWidth = 0.0f,
strokeLineCap = Butt, strokeLineJoin = Miter, strokeLineMiter = 4.0f,
pathFillType = NonZero,
) {
moveTo(18.901f, 1.153f)
horizontalLineToRelative(3.68f)
lineToRelative(-8.04f, 9.19f)
lineTo(24.0f, 22.846f)
horizontalLineToRelative(-7.406f)
lineToRelative(-5.8f, -7.584f)
lineToRelative(-6.638f, 7.584f)
horizontalLineTo(0.474f)
lineToRelative(8.6f, -9.83f)
lineTo(0.0f, 1.154f)
horizontalLineToRelative(7.594f)
lineToRelative(5.243f, 6.932f)
close()
moveTo(17.61f, 20.644f)
horizontalLineToRelative(2.039f)
lineTo(6.486f, 3.24f)
horizontalLineTo(4.298f)
close()
}
}
.build()
return _x!!
}
private var _x: ImageVector? = null