Skip to content

add follow list #1206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Tlaster merged 1 commit into from
Sep 2, 2025
Merged

add follow list #1206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
137 changes: 81 additions & 56 deletions desktopApp/src/main/composeResources/drawable/flare_logo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,100 +1,125 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
android:viewportWidth="174"
android:viewportHeight="261">
<group android:scaleX="0.32"
android:scaleY="0.48"
android:translateX="59.16"
android:translateY="67.86">
android:width="341dp"
android:height="341dp"
android:viewportWidth="341"
android:viewportHeight="341">
<group>
<clip-path
android:pathData="M86,0L254.16,0A86,86 0,0 1,340.16 86L340.16,254.16A86,86 0,0 1,254.16 340.16L86,340.16A86,86 0,0 1,0 254.16L0,86A86,86 0,0 1,86 0z"/>
<path
android:pathData="M108.62,195.05C78.23,212.82 84.54,245.13 88.91,260.79C91.15,260.79 93.42,260.72 95.72,260.56C130.07,258.16 163.46,230.23 171.89,192.57C175.02,178.56 174.3,163.44 170.54,147.78C165.77,174.12 141.87,175.6 108.63,195.04L108.62,195.05Z">
android:pathData="M340.16,0H0V340.16H340.16V0Z">
<aapt:attr name="android:fillColor">
<gradient
android:startX="129.53"
android:startY="201.76"
android:endX="129.53"
android:endY="264.96"
android:startX="170.08"
android:startY="0"
android:endX="170.08"
android:endY="340.16"
android:type="linear">
<item android:offset="0" android:color="#FF02EBD2"/>
<item android:offset="0.39" android:color="#FF01DBC4"/>
<item android:offset="1" android:color="#FF00BBA9"/>
<item android:offset="0" android:color="#FF35E7D2"/>
<item android:offset="1" android:color="#FF1EA69A"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="M8.68,135.94C3.58,147.23 2.46,153.04 1.08,161.45C-6.34,206.36 25.02,254.29 77.51,260.19C48.7,225.8 33.5,182.24 83.98,122.57C115.83,84.93 116.98,48.5 90.13,0C92.42,68.24 13.05,89.05 25.14,160.82C15.55,156.14 8.69,135.94 8.69,135.94H8.68Z">
android:pathData="M192.77,237.7C160.98,256.29 167.58,290.08 172.15,306.46C174.49,306.46 176.87,306.39 179.27,306.22C215.2,303.71 250.13,274.49 258.94,235.1C262.22,220.45 261.46,204.64 257.53,188.26C252.54,215.81 227.54,217.36 192.78,237.69L192.77,237.7Z">
<aapt:attr name="android:fillColor">
<gradient
android:startX="42.3"
android:startY="199.44"
android:endX="97.39"
android:endY="104.03"
android:startX="214.64"
android:startY="244.72"
android:endX="214.64"
android:endY="310.82"
android:type="linear">
<item android:offset="0" android:color="#FF02EBD2"/>
<item android:offset="0.39" android:color="#FF01DBC4"/>
<item android:offset="1" android:color="#FF00BBA9"/>
<item android:offset="0" android:color="#FFFFFFFF"/>
<item android:offset="0.16" android:color="#FFEFFDFC"/>
<item android:offset="0.49" android:color="#FFC5FAF4"/>
<item android:offset="0.93" android:color="#FF83F4E9"/>
<item android:offset="1" android:color="#FF78F4E7"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="M88.92,260.79C84.55,245.13 78.23,212.83 108.63,195.03C141.88,175.6 165.79,174.13 170.56,147.78C174.19,202.22 99.2,197.85 88.92,260.79Z">
android:pathData="M88.24,175.88C82.9,187.68 81.73,193.76 80.29,202.56C72.53,249.53 105.33,299.66 160.23,305.83C130.09,269.86 114.2,224.3 166.99,161.89C200.31,122.52 201.51,84.42 173.43,33.69C175.82,105.07 92.81,126.83 105.45,201.9C95.42,197 88.25,175.88 88.25,175.88H88.24Z">
<aapt:attr name="android:fillColor">
<gradient
android:startX="127.95"
android:startY="215.04"
android:endX="127.95"
android:endY="183.86"
android:startX="123.4"
android:startY="242.29"
android:endX="181.02"
android:endY="142.5"
android:type="linear">
<item android:offset="0" android:color="#FF02EBD2"/>
<item android:offset="0.39" android:color="#FF01DBC4"/>
<item android:offset="1" android:color="#FF00BBA9"/>
<item android:offset="0" android:color="#FFFFFFFF"/>
<item android:offset="0.16" android:color="#FFEFFDFC"/>
<item android:offset="0.49" android:color="#FFC5FAF4"/>
<item android:offset="0.93" android:color="#FF83F4E9"/>
<item android:offset="1" android:color="#FF78F4E7"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="M71.92,209.93C82.57,170.54 146.68,161.88 156.83,131.1C163.88,109.74 151.35,83.78 138.99,71.91C151.97,129.75 53.85,144.53 71.93,209.93H71.92Z">
android:pathData="M172.16,306.46C167.59,290.08 160.98,256.3 192.78,237.68C227.55,217.36 252.56,215.82 257.55,188.26C261.35,245.2 182.91,240.63 172.16,306.46Z">
<aapt:attr name="android:fillColor">
<gradient
android:startX="114.28"
android:startY="124.22"
android:endX="114.28"
android:endY="194.44"
android:startX="212.99"
android:startY="258.61"
android:endX="212.99"
android:endY="226"
android:type="linear">
<item android:offset="0" android:color="#FF02EBD2"/>
<item android:offset="0.39" android:color="#FF01DBC4"/>
<item android:offset="1" android:color="#FF00BBA9"/>
<item android:offset="0" android:color="#FFFFFFFF"/>
<item android:offset="0.16" android:color="#FFEFFDFC"/>
<item android:offset="0.49" android:color="#FFC5FAF4"/>
<item android:offset="0.93" android:color="#FF83F4E9"/>
<item android:offset="1" android:color="#FF78F4E7"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="M25.13,160.76C25.13,160.76 25.15,160.8 25.16,160.82C35.01,107.98 115.73,101.45 107.48,44.71C104.83,30.81 99.03,16.08 90.14,0.01C92.43,68.23 13.11,89.05 25.14,160.76H25.13Z">
android:pathData="M154.38,253.26C165.52,212.06 232.57,203.01 243.19,170.81C250.56,148.47 237.46,121.32 224.53,108.9C238.11,169.4 135.48,184.86 154.39,253.26H154.38Z">
<aapt:attr name="android:fillColor">
<gradient
android:startX="65.97"
android:startY="65.35"
android:endX="65.97"
android:endY="247.63"
android:startX="198.69"
android:startY="163.62"
android:endX="198.69"
android:endY="237.06"
android:type="linear">
<item android:offset="0" android:color="#FF02EBD2"/>
<item android:offset="0.39" android:color="#FF01DBC4"/>
<item android:offset="1" android:color="#FF00BBA9"/>
<item android:offset="0" android:color="#FFFFFFFF"/>
<item android:offset="0.16" android:color="#FFEFFDFC"/>
<item android:offset="0.49" android:color="#FFC5FAF4"/>
<item android:offset="0.93" android:color="#FF83F4E9"/>
<item android:offset="1" android:color="#FF78F4E7"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="M77.5,260.2C25.03,254.28 -6.34,206.36 1.09,161.45C2.48,153.03 3.61,147.22 8.7,135.94C8.7,135.94 15.57,156.13 25.16,160.82C20.18,187.48 27.69,233.78 77.5,260.2Z">
android:pathData="M105.44,201.84C105.44,201.84 105.46,201.88 105.47,201.9C115.78,146.63 200.2,139.8 191.57,80.45C188.8,65.92 182.74,50.51 173.44,33.7C175.83,105.06 92.87,126.83 105.45,201.84H105.44Z">
<aapt:attr name="android:fillColor">
<gradient
android:startX="38.75"
android:startY="69.62"
android:endX="38.75"
android:endY="243.75"
android:startX="148.16"
android:startY="102.04"
android:endX="148.16"
android:endY="292.69"
android:type="linear">
<item android:offset="0" android:color="#FF02EBD2"/>
<item android:offset="0.39" android:color="#FF01DBC4"/>
<item android:offset="1" android:color="#FF00BBA9"/>
<item android:offset="0" android:color="#FFFFFFFF"/>
<item android:offset="0.16" android:color="#FFEFFDFC"/>
<item android:offset="0.49" android:color="#FFC5FAF4"/>
<item android:offset="0.93" android:color="#FF83F4E9"/>
<item android:offset="1" android:color="#FF78F4E7"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="M160.22,305.84C105.34,299.65 72.53,249.53 80.3,202.56C81.75,193.75 82.93,187.67 88.26,175.88C88.26,175.88 95.44,196.99 105.47,201.9C100.27,229.78 108.12,278.21 160.22,305.84Z">
<aapt:attr name="android:fillColor">
<gradient
android:startX="119.69"
android:startY="106.51"
android:endX="119.69"
android:endY="288.64"
android:type="linear">
<item android:offset="0" android:color="#FFFFFFFF"/>
<item android:offset="0.16" android:color="#FFEFFDFC"/>
<item android:offset="0.49" android:color="#FFC5FAF4"/>
<item android:offset="0.93" android:color="#FF83F4E9"/>
<item android:offset="1" android:color="#FF78F4E7"/>
</gradient>
</aapt:attr>
</path>
Expand Down
12 changes: 12 additions & 0 deletions desktopApp/src/main/kotlin/dev/dimension/flare/ui/route/Route.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,18 @@ internal sealed interface Route {
@Serializable
data object StorageUsage : ScreenRoute

@Serializable
data class Following(
val accountType: AccountType,
val userKey: MicroBlogKey,
) : ScreenRoute

@Serializable
data class Fans(
val accountType: AccountType,
val userKey: MicroBlogKey,
) : ScreenRoute

companion object {
public fun parse(url: String): Route? {
val data = Url(url)
Expand Down
66 changes: 62 additions & 4 deletions desktopApp/src/main/kotlin/dev/dimension/flare/ui/route/Router.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ import dev.dimension.flare.ui.screen.dm.DmListScreen
import dev.dimension.flare.ui.screen.dm.UserDMConversationScreen
import dev.dimension.flare.ui.screen.feeds.FeedListScreen
import dev.dimension.flare.ui.screen.home.DiscoverScreen
import dev.dimension.flare.ui.screen.home.FansScreen
import dev.dimension.flare.ui.screen.home.FollowingScreen
import dev.dimension.flare.ui.screen.home.HomeTimelineScreen
import dev.dimension.flare.ui.screen.home.NotificationScreen
import dev.dimension.flare.ui.screen.home.ProfileScreen
Expand Down Expand Up @@ -339,8 +341,22 @@ internal fun WindowScope.RouteContent(
),
)
},
onFollowListClick = {},
onFansListClick = {},
onFollowListClick = {
navigate(
Route.Following(
accountType = route.accountType,
userKey = it,
),
)
},
onFansListClick = {
navigate(
Route.Fans(
accountType = route.accountType,
userKey = it,
),
)
},
)
}

Expand Down Expand Up @@ -435,8 +451,22 @@ internal fun WindowScope.RouteContent(
),
)
},
onFollowListClick = {},
onFansListClick = {},
onFollowListClick = {
navigate(
Route.Following(
accountType = route.accountType,
userKey = it,
),
)
},
onFansListClick = {
navigate(
Route.Fans(
accountType = route.accountType,
userKey = it,
),
)
},
)
}

Expand Down Expand Up @@ -550,5 +580,33 @@ internal fun WindowScope.RouteContent(

Route.StorageUsage ->
StorageScreen()

is Route.Following ->
FollowingScreen(
accountType = route.accountType,
userKey = route.userKey,
onUserClick = {
navigate(
Profile(
accountType = route.accountType,
userKey = it,
),
)
},
)

is Route.Fans ->
FansScreen(
accountType = route.accountType,
userKey = route.userKey,
onUserClick = {
navigate(
Profile(
accountType = route.accountType,
userKey = it,
),
)
},
)
}
}
Loading
Loading