Compare commits
	
		
			16 Commits
		
	
	
		
			2.1.1+35
			...
			2375c46852
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 2375c46852 | |||
| fd2eb5cda6 | |||
| 1256f440bd | |||
| 5b05ca67b6 | |||
| 95af7140cd | |||
| 77e9994204 | |||
| 3f6c186c13 | |||
| 9ac4a940dd | |||
| ec050ab712 | |||
| 77e3ce8bcc | |||
| f5dcf71e10 | |||
| 7fc18b40db | |||
| 8c8ab24c9e | |||
| a319bd7f8c | |||
| 6427ec1f82 | |||
| 35dc7f4392 | 
| @@ -10,8 +10,9 @@ plugins { | ||||
| } | ||||
|  | ||||
| dependencies { | ||||
|     implementation "androidx.glance:glance:1.1.1" | ||||
|     implementation "androidx.glance:glance-appwidget:1.1.1" | ||||
|     implementation 'com.google.android.material:material:1.12.0' | ||||
|     implementation 'androidx.glance:glance:1.1.1' | ||||
|     implementation 'androidx.glance:glance-appwidget:1.1.1' | ||||
|     implementation 'androidx.compose.foundation:foundation-layout-android:1.7.6' | ||||
|     implementation 'com.google.code.gson:gson:2.10.1' | ||||
|     implementation 'com.squareup.okhttp3:okhttp:4.12.0' | ||||
| @@ -19,6 +20,12 @@ dependencies { | ||||
|     implementation 'io.coil-kt.coil3:coil-network-okhttp:3.0.4' | ||||
| } | ||||
|  | ||||
| def keystoreProperties = new Properties() | ||||
| def keystorePropertiesFile = rootProject.file('key.properties') | ||||
| if (keystorePropertiesFile.exists()) { | ||||
|     keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) | ||||
| } | ||||
|  | ||||
| android { | ||||
|     buildFeatures { | ||||
|         compose true | ||||
| @@ -49,6 +56,15 @@ android { | ||||
|         versionName = flutter.versionName | ||||
|     } | ||||
|  | ||||
|     signingConfigs { | ||||
|         release { | ||||
|             keyAlias = keystoreProperties['keyAlias'] | ||||
|             keyPassword = keystoreProperties['keyPassword'] | ||||
|             storeFile = keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null | ||||
|             storePassword = keystoreProperties['storePassword'] | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     buildTypes { | ||||
|         debug { | ||||
|             debuggable true | ||||
| @@ -56,9 +72,7 @@ android { | ||||
|             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' | ||||
|         } | ||||
|         release { | ||||
|             // TODO: Add your own signing config for the release build. | ||||
|             // Signing with the debug keys for now, so `flutter run --release` works. | ||||
|             signingConfig = signingConfigs.debug | ||||
|             signingConfig = signingConfigs.release | ||||
|  | ||||
|             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' | ||||
|         } | ||||
|   | ||||
| @@ -1,7 +1,6 @@ | ||||
| import android.content.Context | ||||
| import android.net.Uri | ||||
| import androidx.compose.runtime.Composable | ||||
| import androidx.compose.ui.graphics.Color | ||||
| import androidx.compose.ui.unit.dp | ||||
| import androidx.compose.ui.unit.sp | ||||
| import androidx.glance.GlanceId | ||||
| @@ -87,11 +86,18 @@ class CheckInWidget : GlanceAppWidget() { | ||||
|                     Column { | ||||
|                         Text( | ||||
|                             text = resultTierSymbols[checkIn.resultTier], | ||||
|                             style = TextStyle(fontSize = 17.sp) | ||||
|                             style = TextStyle( | ||||
|                                 fontSize = 17.sp, | ||||
|                                 color = GlanceTheme.colors.onSurface | ||||
|                             ) | ||||
|                         ) | ||||
|                         Text( | ||||
|                             text = "+${checkIn.resultExperience} EXP", | ||||
|                             style = TextStyle(fontSize = 13.sp, fontFamily = FontFamily.Monospace) | ||||
|                             style = TextStyle( | ||||
|                                 fontSize = 13.sp, | ||||
|                                 fontFamily = FontFamily.Monospace, | ||||
|                                 color = GlanceTheme.colors.onSurface | ||||
|                             ) | ||||
|                         ) | ||||
|                     } | ||||
|                     Spacer(modifier = GlanceModifier.height(8.dp)) | ||||
| @@ -102,7 +108,10 @@ class CheckInWidget : GlanceAppWidget() { | ||||
|                                 ZoneId.systemDefault() | ||||
|                             ) | ||||
|                                 .format(dateFormatter), | ||||
|                             style = TextStyle(fontSize = 11.sp) | ||||
|                             style = TextStyle( | ||||
|                                 fontSize = 11.sp, | ||||
|                                 color = GlanceTheme.colors.onSurface | ||||
|                             ) | ||||
|                         ) | ||||
|                     } | ||||
|  | ||||
| @@ -112,7 +121,7 @@ class CheckInWidget : GlanceAppWidget() { | ||||
|  | ||||
|             Text( | ||||
|                 text = "You haven't checked in today", | ||||
|                 style = TextStyle(fontSize = 15.sp) | ||||
|                 style = TextStyle(fontSize = 15.sp, color = GlanceTheme.colors.onSurface) | ||||
|             ) | ||||
|         } | ||||
|     } | ||||
|   | ||||
| @@ -87,12 +87,16 @@ class RandomPostWidget : GlanceAppWidget() { | ||||
|                 Row(verticalAlignment = Alignment.CenterVertically) { | ||||
|                     Text( | ||||
|                         text = data.publisher.nick, | ||||
|                         style = TextStyle(fontSize = 15.sp) | ||||
|                         style = TextStyle(fontSize = 15.sp, color = GlanceTheme.colors.onSurface) | ||||
|                     ) | ||||
|                     Spacer(modifier = GlanceModifier.width(8.dp)) | ||||
|                     Text( | ||||
|                         text = "@${data.publisher.name}", | ||||
|                         style = TextStyle(fontSize = 13.sp, fontFamily = FontFamily.Monospace) | ||||
|                         style = TextStyle( | ||||
|                             fontSize = 13.sp, | ||||
|                             fontFamily = FontFamily.Monospace, | ||||
|                             color = GlanceTheme.colors.onSurface | ||||
|                         ) | ||||
|                     ) | ||||
|                 } | ||||
|  | ||||
| @@ -101,13 +105,13 @@ class RandomPostWidget : GlanceAppWidget() { | ||||
|                 if (data.body.title != null) { | ||||
|                     Text( | ||||
|                         text = data.body.title, | ||||
|                         style = TextStyle(fontSize = 25.sp) | ||||
|                         style = TextStyle(fontSize = 19.sp, color = GlanceTheme.colors.onSurface) | ||||
|                     ) | ||||
|                 } | ||||
|                 if (data.body.description != null) { | ||||
|                     Text( | ||||
|                         text = data.body.description, | ||||
|                         style = TextStyle(fontSize = 19.sp) | ||||
|                         style = TextStyle(fontSize = 17.sp, color = GlanceTheme.colors.onSurface) | ||||
|                     ) | ||||
|                 } | ||||
|  | ||||
| @@ -117,7 +121,7 @@ class RandomPostWidget : GlanceAppWidget() { | ||||
|  | ||||
|                 Text( | ||||
|                     text = data.body.content ?: "No content", | ||||
|                     style = TextStyle(fontSize = 15.sp), | ||||
|                     style = TextStyle(fontSize = 15.sp, color = GlanceTheme.colors.onSurface), | ||||
|                 ) | ||||
|  | ||||
|                 Spacer(modifier = GlanceModifier.height(8.dp)) | ||||
| @@ -126,12 +130,16 @@ class RandomPostWidget : GlanceAppWidget() { | ||||
|                 Text( | ||||
|                     LocalDateTime.ofInstant(data.createdAt, ZoneId.systemDefault()) | ||||
|                         .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")), | ||||
|                     style = TextStyle(fontSize = 13.sp), | ||||
|                     style = TextStyle(fontSize = 13.sp, color = GlanceTheme.colors.onSurface), | ||||
|                 ) | ||||
|  | ||||
|                 Text( | ||||
|                     "#${data.id}", | ||||
|                     style = TextStyle(fontSize = 11.sp, fontWeight = FontWeight.Bold), | ||||
|                     style = TextStyle( | ||||
|                         fontSize = 11.sp, | ||||
|                         fontWeight = FontWeight.Bold, | ||||
|                         color = GlanceTheme.colors.onSurface | ||||
|                     ), | ||||
|                 ) | ||||
|  | ||||
|                 return@Column; | ||||
| @@ -143,12 +151,16 @@ class RandomPostWidget : GlanceAppWidget() { | ||||
|                 horizontalAlignment = Alignment.Horizontal.CenterHorizontally | ||||
|             ) { | ||||
|                 Text( | ||||
|                     text = "Unable to fetch post", | ||||
|                     style = TextStyle(fontSize = 17.sp, fontWeight = FontWeight.Bold) | ||||
|                     text = "No Recommendations", | ||||
|                     style = TextStyle( | ||||
|                         fontSize = 17.sp, | ||||
|                         fontWeight = FontWeight.Bold, | ||||
|                         color = GlanceTheme.colors.onSurface | ||||
|                     ) | ||||
|                 ) | ||||
|                 Text( | ||||
|                     text = "Check your internet connection", | ||||
|                     style = TextStyle(fontSize = 15.sp) | ||||
|                     text = "Open app to load some posts", | ||||
|                     style = TextStyle(fontSize = 15.sp, color = GlanceTheme.colors.onSurface) | ||||
|                 ) | ||||
|             } | ||||
|         } | ||||
|   | ||||
| Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 537 B | 
| Before Width: | Height: | Size: 717 B After Width: | Height: | Size: 372 B | 
| Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 736 B | 
| Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 1.1 KiB | 
| Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 1.5 KiB | 
| @@ -1,4 +1,5 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <resources> | ||||
|   <color name="ic_launcher_background">#FFFFFFFF</color> | ||||
|   <color name="ic_notification_background">#00000000</color> | ||||
| </resources> | ||||
| @@ -1,7 +1,7 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| <resources> | ||||
|     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off --> | ||||
|     <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar"> | ||||
|     <style name="LaunchTheme" parent="Theme.MaterialComponents.Light.NoActionBar"> | ||||
|         <!-- Show a splash screen on the activity. Automatically removed when | ||||
|              the Flutter engine draws its first frame --> | ||||
|         <item name="android:windowBackground">@drawable/launch_background</item> | ||||
| @@ -16,7 +16,7 @@ | ||||
|          running. | ||||
|  | ||||
|          This Theme is only used starting with V2 of Flutter's Android embedding. --> | ||||
|     <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar"> | ||||
|     <style name="NormalTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar"> | ||||
|         <item name="android:windowBackground">?android:colorBackground</item> | ||||
|     </style> | ||||
| </resources> | ||||
|   | ||||
| @@ -57,7 +57,7 @@ | ||||
|   "reply": "Reply", | ||||
|   "unset": "Unset", | ||||
|   "untitled": "Untitled", | ||||
|   "postDetail": "Post detail", | ||||
|   "postDetail": "Post Detail", | ||||
|   "postNoun": "Post", | ||||
|   "postReadMore": "Read more", | ||||
|   "postReadEstimate": "Est read time {}", | ||||
| @@ -139,6 +139,9 @@ | ||||
|   "fieldPostTitle": "Title", | ||||
|   "fieldPostDescription": "Description", | ||||
|   "fieldPostTags": "Tags", | ||||
|   "fieldPostCategories": "Categories", | ||||
|   "fieldPostAlias": "Alias", | ||||
|   "fieldPostAliasHint": "Optional, used to represent the post in URL, should follow URL-Safe.", | ||||
|   "postPublish": "Publish", | ||||
|   "postPosted": "Post has been posted.", | ||||
|   "postPublishedAt": "Published At", | ||||
| @@ -176,12 +179,18 @@ | ||||
|     "other": "{} comments" | ||||
|   }, | ||||
|   "settingsAppearance": "Appearance", | ||||
|   "settingsAppBarTransparent": "Transparent App Bar", | ||||
|   "settingsAppBarTransparentDescription": "Enable transparent effect for the app bar.", | ||||
|   "settingsBackgroundImage": "Background Image", | ||||
|   "settingsBackgroundImageDescription": "Set the background image that will be applied globally.", | ||||
|   "settingsBackgroundImageClear": "Clear Existing Background Image", | ||||
|   "settingsBackgroundImageClearDescription": "Reset the background image to blank.", | ||||
|   "settingsThemeMaterial3": "Use Material You Design", | ||||
|   "settingsThemeMaterial3Description": "Set the application theme to Material 3 Design.", | ||||
|   "settingsColorScheme": "Color Scheme", | ||||
|   "settingsColorSchemeDescription": "Set the application primary color.", | ||||
|   "settingsColorSeed": "Color Seed", | ||||
|   "settingsColorSeedDescription": "Select one of the present color schemes.", | ||||
|   "settingsNetwork": "Network", | ||||
|   "settingsNetworkServer": "HyperNet Server", | ||||
|   "settingsNetworkServerDescription": "Set the HyperNet server address, choose ours or build your own.", | ||||
| @@ -448,7 +457,7 @@ | ||||
|   "publisherBlockHintDescription": "You are going to block this publisher's maintainer, this will also block publishers that run by the same user.", | ||||
|   "userUnblocked": "{} has been unblocked.", | ||||
|   "userBlocked": "{} has been blocked.", | ||||
|   "postSharingViaPicture": "Capturing post as picture, please stand by...", | ||||
|   "postSharingViaPicture": "Capturing post as picture, please wait...", | ||||
|   "postImageShareReadMore": "Scan the QR code to read full post", | ||||
|   "postImageShareAds": "Explore posts on the Solar Network", | ||||
|   "postShare": "Share", | ||||
| @@ -459,5 +468,25 @@ | ||||
|   "shareIntentDescription":  "What do you want to do with the content you are sharing?", | ||||
|   "shareIntentPostStory": "Post a Story", | ||||
|   "updateAvailable": "Update Available", | ||||
|   "updateOngoing": "正在更新,请稍后..." | ||||
|   "updateOngoing": "Updating, please wait...", | ||||
|   "custom": "Custom", | ||||
|   "colorSchemeIndigo": "Indigo", | ||||
|   "colorSchemeBlue": "Blue", | ||||
|   "colorSchemeGreen": "Green", | ||||
|   "colorSchemeYellow": "Yellow", | ||||
|   "colorSchemeOrange": "Orange", | ||||
|   "colorSchemeRed": "Red", | ||||
|   "colorSchemeWhite": "White", | ||||
|   "colorSchemeBlack": "Black", | ||||
|   "colorSchemeApplied": "Color scheme has been applied, may need restart the app to take effect.", | ||||
|   "postCategoryTechnology": "Technology", | ||||
|   "postCategoryGaming": "Gaming", | ||||
|   "postCategoryLife": "Life", | ||||
|   "postCategoryArts": "Arts", | ||||
|   "postCategorySports": "Sports", | ||||
|   "postCategoryMusic": "Music", | ||||
|   "postCategoryNews": "News", | ||||
|   "postCategoryKnowledge": "Knowledge", | ||||
|   "postCategoryLiterature": "Literature", | ||||
|   "postCategoryUncategorized": "Uncategorized" | ||||
| } | ||||
|   | ||||
| @@ -123,6 +123,9 @@ | ||||
|   "fieldPostTitle": "标题", | ||||
|   "fieldPostDescription": "描述", | ||||
|   "fieldPostTags": "标签", | ||||
|   "fieldPostCategories": "分类", | ||||
|   "fieldPostAlias": "别名", | ||||
|   "fieldPostAliasHint": "可选项,用于在 URL 中表示该帖子,应遵循 URL-Safe 的原则。", | ||||
|   "postPublish": "发布", | ||||
|   "postPublishedAt": "发布于", | ||||
|   "postPublishedUntil": "取消发布于", | ||||
| @@ -180,6 +183,12 @@ | ||||
|   "settingsBackgroundImageClearDescription": "将应用背景图重置为空白。", | ||||
|   "settingsThemeMaterial3": "使用 Material You 设计范式", | ||||
|   "settingsThemeMaterial3Description": "将应用主题设置为 Material 3 设计范式的主题。", | ||||
|   "settingsAppBarTransparent": "透明顶栏", | ||||
|   "settingsAppBarTransparentDescription": "为顶栏启用透明效果。", | ||||
|   "settingsColorScheme": "主题色", | ||||
|   "settingsColorSchemeDescription": "设置应用主题色。", | ||||
|   "settingsColorSeed": "预设色彩主题", | ||||
|   "settingsColorSeedDescription": "选择一个预设色彩主题。", | ||||
|   "settingsNetwork": "网络", | ||||
|   "settingsNetworkServer": "HyperNet 服务器", | ||||
|   "settingsNetworkServerDescription": "设置 HyperNet 服务器地址,选择我们提供的,或者自己搭建。", | ||||
| @@ -408,7 +417,7 @@ | ||||
|   "accountStatus": "状态", | ||||
|   "accountStatusOnline": "在线", | ||||
|   "accountStatusOffline": "离线", | ||||
|   "accountStatusLastSeen": "最后一次在 {} 上线", | ||||
|   "accountStatusLastSeen": "最后一次上线于 {}", | ||||
|   "postArticle": "Solar Network 上的文章", | ||||
|   "postStory": "Solar Network 上的故事", | ||||
|   "articleWrittenAt": "发表于 {}", | ||||
| @@ -457,5 +466,25 @@ | ||||
|   "shareIntentDescription": "您想对您分享的内容做些什么?", | ||||
|   "shareIntentPostStory": "发布动态", | ||||
|   "updateAvailable": "检测到更新可用", | ||||
|   "updateOngoing": "正在更新,请稍后……" | ||||
|   "updateOngoing": "正在更新,请稍后……", | ||||
|   "custom": "自定义", | ||||
|   "colorSchemeIndigo": "靛蓝", | ||||
|   "colorSchemeBlue": "蓝色", | ||||
|   "colorSchemeGreen": "绿色", | ||||
|   "colorSchemeYellow": "黄色", | ||||
|   "colorSchemeOrange": "橙色", | ||||
|   "colorSchemeRed": "红色", | ||||
|   "colorSchemeWhite": "白色", | ||||
|   "colorSchemeBlack": "黑色", | ||||
|   "colorSchemeApplied": "主题色已应用,可能需要重启来生效。", | ||||
|   "postCategoryTechnology": "技术", | ||||
|   "postCategoryGaming": "游戏", | ||||
|   "postCategoryLife": "生活", | ||||
|   "postCategoryArts": "艺术", | ||||
|   "postCategorySports": "体育", | ||||
|   "postCategoryMusic": "音乐", | ||||
|   "postCategoryNews": "新闻", | ||||
|   "postCategoryKnowledge": "知识", | ||||
|   "postCategoryLiterature": "文学", | ||||
|   "postCategoryUncategorized": "未分类" | ||||
| } | ||||
|   | ||||
| @@ -123,6 +123,9 @@ | ||||
|   "fieldPostTitle": "標題", | ||||
|   "fieldPostDescription": "描述", | ||||
|   "fieldPostTags": "標籤", | ||||
|   "fieldPostCategories": "分類", | ||||
|   "fieldPostAlias": "別名", | ||||
|   "fieldPostAliasHint": "可選項,用於在 URL 中表示該帖子,應遵循 URL-Safe 的原則。", | ||||
|   "postPublish": "發佈", | ||||
|   "postPublishedAt": "發佈於", | ||||
|   "postPublishedUntil": "取消發佈於", | ||||
| @@ -180,6 +183,12 @@ | ||||
|   "settingsBackgroundImageClearDescription": "將應用背景圖重置為空白。", | ||||
|   "settingsThemeMaterial3": "使用 Material You 設計範式", | ||||
|   "settingsThemeMaterial3Description": "將應用主題設置為 Material 3 設計範式的主題。", | ||||
|   "settingsAppBarTransparent": "透明頂欄", | ||||
|   "settingsAppBarTransparentDescription": "為頂欄啓用透明效果。", | ||||
|   "settingsColorScheme": "主題色", | ||||
|   "settingsColorSchemeDescription": "設置應用主題色。", | ||||
|   "settingsColorSeed": "預設色彩主題", | ||||
|   "settingsColorSeedDescription": "選擇一個預設色彩主題。", | ||||
|   "settingsNetwork": "網絡", | ||||
|   "settingsNetworkServer": "HyperNet 服務器", | ||||
|   "settingsNetworkServerDescription": "設置 HyperNet 服務器地址,選擇我們提供的,或者自己搭建。", | ||||
| @@ -368,6 +377,8 @@ | ||||
|   "dailyCheckNegativeHint6": "出門", | ||||
|   "dailyCheckNegativeHint6Description": "忘帶傘遇上大雨", | ||||
|   "happyBirthday": "生日快樂,{}!", | ||||
|   "celebrateMerryXmas": "聖誕快樂,{}!", | ||||
|   "celebrateNewYear": "新年快樂,{}!", | ||||
|   "friendNew": "添加好友", | ||||
|   "friendRequests": "好友請求", | ||||
|   "friendRequestsDescription": { | ||||
| @@ -406,7 +417,7 @@ | ||||
|   "accountStatus": "狀態", | ||||
|   "accountStatusOnline": "在線", | ||||
|   "accountStatusOffline": "離線", | ||||
|   "accountStatusLastSeen": "最後一次在 {} 上線", | ||||
|   "accountStatusLastSeen": "最後一次上線於 {}", | ||||
|   "postArticle": "Solar Network 上的文章", | ||||
|   "postStory": "Solar Network 上的故事", | ||||
|   "articleWrittenAt": "發表於 {}", | ||||
| @@ -453,5 +464,27 @@ | ||||
|   "poweredBy": "由 {} 提供支持", | ||||
|   "shareIntent": "分享", | ||||
|   "shareIntentDescription": "您想對您分享的內容做些什麼?", | ||||
|   "shareIntentPostStory": "發佈動態" | ||||
|   "shareIntentPostStory": "發佈動態", | ||||
|   "updateAvailable": "檢測到更新可用", | ||||
|   "updateOngoing": "正在更新,請稍後……", | ||||
|   "custom": "自定義", | ||||
|   "colorSchemeIndigo": "靛藍", | ||||
|   "colorSchemeBlue": "藍色", | ||||
|   "colorSchemeGreen": "綠色", | ||||
|   "colorSchemeYellow": "黃色", | ||||
|   "colorSchemeOrange": "橙色", | ||||
|   "colorSchemeRed": "紅色", | ||||
|   "colorSchemeWhite": "白色", | ||||
|   "colorSchemeBlack": "黑色", | ||||
|   "colorSchemeApplied": "主題色已應用,可能需要重啓來生效。", | ||||
|   "postCategoryTechnology": "技術", | ||||
|   "postCategoryGaming": "遊戲", | ||||
|   "postCategoryLife": "生活", | ||||
|   "postCategoryArts": "藝術", | ||||
|   "postCategorySports": "體育", | ||||
|   "postCategoryMusic": "音樂", | ||||
|   "postCategoryNews": "新聞", | ||||
|   "postCategoryKnowledge": "知識", | ||||
|   "postCategoryLiterature": "文學", | ||||
|   "postCategoryUncategorized": "未分類" | ||||
| } | ||||
|   | ||||
| @@ -123,6 +123,9 @@ | ||||
|   "fieldPostTitle": "標題", | ||||
|   "fieldPostDescription": "描述", | ||||
|   "fieldPostTags": "標籤", | ||||
|   "fieldPostCategories": "分類", | ||||
|   "fieldPostAlias": "別名", | ||||
|   "fieldPostAliasHint": "可選項,用於在 URL 中表示該帖子,應遵循 URL-Safe 的原則。", | ||||
|   "postPublish": "釋出", | ||||
|   "postPublishedAt": "釋出於", | ||||
|   "postPublishedUntil": "取消釋出於", | ||||
| @@ -180,6 +183,12 @@ | ||||
|   "settingsBackgroundImageClearDescription": "將應用背景圖重置為空白。", | ||||
|   "settingsThemeMaterial3": "使用 Material You 設計正規化", | ||||
|   "settingsThemeMaterial3Description": "將應用主題設定為 Material 3 設計正規化的主題。", | ||||
|   "settingsAppBarTransparent": "透明頂欄", | ||||
|   "settingsAppBarTransparentDescription": "為頂欄啟用透明效果。", | ||||
|   "settingsColorScheme": "主題色", | ||||
|   "settingsColorSchemeDescription": "設定應用主題色。", | ||||
|   "settingsColorSeed": "預設色彩主題", | ||||
|   "settingsColorSeedDescription": "選擇一個預設色彩主題。", | ||||
|   "settingsNetwork": "網路", | ||||
|   "settingsNetworkServer": "HyperNet 伺服器", | ||||
|   "settingsNetworkServerDescription": "設定 HyperNet 伺服器地址,選擇我們提供的,或者自己搭建。", | ||||
| @@ -368,6 +377,8 @@ | ||||
|   "dailyCheckNegativeHint6": "出門", | ||||
|   "dailyCheckNegativeHint6Description": "忘帶傘遇上大雨", | ||||
|   "happyBirthday": "生日快樂,{}!", | ||||
|   "celebrateMerryXmas": "聖誕快樂,{}!", | ||||
|   "celebrateNewYear": "新年快樂,{}!", | ||||
|   "friendNew": "新增好友", | ||||
|   "friendRequests": "好友請求", | ||||
|   "friendRequestsDescription": { | ||||
| @@ -406,7 +417,7 @@ | ||||
|   "accountStatus": "狀態", | ||||
|   "accountStatusOnline": "線上", | ||||
|   "accountStatusOffline": "離線", | ||||
|   "accountStatusLastSeen": "最後一次在 {} 上線", | ||||
|   "accountStatusLastSeen": "最後一次上線於 {}", | ||||
|   "postArticle": "Solar Network 上的文章", | ||||
|   "postStory": "Solar Network 上的故事", | ||||
|   "articleWrittenAt": "發表於 {}", | ||||
| @@ -453,5 +464,27 @@ | ||||
|   "poweredBy": "由 {} 提供支援", | ||||
|   "shareIntent": "分享", | ||||
|   "shareIntentDescription": "您想對您分享的內容做些什麼?", | ||||
|   "shareIntentPostStory": "釋出動態" | ||||
|   "shareIntentPostStory": "釋出動態", | ||||
|   "updateAvailable": "檢測到更新可用", | ||||
|   "updateOngoing": "正在更新,請稍後……", | ||||
|   "custom": "自定義", | ||||
|   "colorSchemeIndigo": "靛藍", | ||||
|   "colorSchemeBlue": "藍色", | ||||
|   "colorSchemeGreen": "綠色", | ||||
|   "colorSchemeYellow": "黃色", | ||||
|   "colorSchemeOrange": "橙色", | ||||
|   "colorSchemeRed": "紅色", | ||||
|   "colorSchemeWhite": "白色", | ||||
|   "colorSchemeBlack": "黑色", | ||||
|   "colorSchemeApplied": "主題色已應用,可能需要重啟來生效。", | ||||
|   "postCategoryTechnology": "技術", | ||||
|   "postCategoryGaming": "遊戲", | ||||
|   "postCategoryLife": "生活", | ||||
|   "postCategoryArts": "藝術", | ||||
|   "postCategorySports": "體育", | ||||
|   "postCategoryMusic": "音樂", | ||||
|   "postCategoryNews": "新聞", | ||||
|   "postCategoryKnowledge": "知識", | ||||
|   "postCategoryLiterature": "文學", | ||||
|   "postCategoryUncategorized": "未分類" | ||||
| } | ||||
|   | ||||
| @@ -103,6 +103,8 @@ PODS: | ||||
|     - GoogleUtilities/UserDefaults (~> 8.0) | ||||
|     - nanopb (~> 3.30910.0) | ||||
|   - Flutter (1.0.0) | ||||
|   - flutter_app_update (0.0.1): | ||||
|     - Flutter | ||||
|   - flutter_native_splash (2.4.3): | ||||
|     - Flutter | ||||
|   - flutter_udid (0.0.1): | ||||
| @@ -168,6 +170,8 @@ PODS: | ||||
|     - Flutter | ||||
|   - image_picker_ios (0.0.1): | ||||
|     - Flutter | ||||
|   - in_app_review (2.0.0): | ||||
|     - Flutter | ||||
|   - Kingfisher (8.1.3) | ||||
|   - livekit_client (2.3.2): | ||||
|     - Flutter | ||||
| @@ -232,12 +236,14 @@ DEPENDENCIES: | ||||
|   - firebase_core (from `.symlinks/plugins/firebase_core/ios`) | ||||
|   - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`) | ||||
|   - Flutter (from `Flutter`) | ||||
|   - flutter_app_update (from `.symlinks/plugins/flutter_app_update/ios`) | ||||
|   - flutter_native_splash (from `.symlinks/plugins/flutter_native_splash/ios`) | ||||
|   - flutter_udid (from `.symlinks/plugins/flutter_udid/ios`) | ||||
|   - flutter_webrtc (from `.symlinks/plugins/flutter_webrtc/ios`) | ||||
|   - gal (from `.symlinks/plugins/gal/darwin`) | ||||
|   - home_widget (from `.symlinks/plugins/home_widget/ios`) | ||||
|   - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`) | ||||
|   - in_app_review (from `.symlinks/plugins/in_app_review/ios`) | ||||
|   - Kingfisher (~> 8.0) | ||||
|   - livekit_client (from `.symlinks/plugins/livekit_client/ios`) | ||||
|   - media_kit_libs_ios_video (from `.symlinks/plugins/media_kit_libs_ios_video/ios`) | ||||
| @@ -298,6 +304,8 @@ EXTERNAL SOURCES: | ||||
|     :path: ".symlinks/plugins/firebase_messaging/ios" | ||||
|   Flutter: | ||||
|     :path: Flutter | ||||
|   flutter_app_update: | ||||
|     :path: ".symlinks/plugins/flutter_app_update/ios" | ||||
|   flutter_native_splash: | ||||
|     :path: ".symlinks/plugins/flutter_native_splash/ios" | ||||
|   flutter_udid: | ||||
| @@ -310,6 +318,8 @@ EXTERNAL SOURCES: | ||||
|     :path: ".symlinks/plugins/home_widget/ios" | ||||
|   image_picker_ios: | ||||
|     :path: ".symlinks/plugins/image_picker_ios/ios" | ||||
|   in_app_review: | ||||
|     :path: ".symlinks/plugins/in_app_review/ios" | ||||
|   livekit_client: | ||||
|     :path: ".symlinks/plugins/livekit_client/ios" | ||||
|   media_kit_libs_ios_video: | ||||
| @@ -364,8 +374,9 @@ SPEC CHECKSUMS: | ||||
|   FirebaseInstallations: 6ef4a1c7eb2a61ee1f74727d7f6ce2e72acf1414 | ||||
|   FirebaseMessaging: f8a160d99c2c2e5babbbcc90c4a3e15db036aee2 | ||||
|   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 | ||||
|   flutter_app_update: 65f61da626cb111d1b24674abc4b01728d7723bc | ||||
|   flutter_native_splash: e8a1e01082d97a8099d973f919f57904c925008a | ||||
|   flutter_udid: a2482c67a61b9c806ef59dd82ed8d007f1b7ac04 | ||||
|   flutter_udid: b2417673f287ee62817a1de3d1643f47b9f508ab | ||||
|   flutter_webrtc: 1a53bd24f97bcfeff512f13699e721897f261563 | ||||
|   gal: 6a522c75909f1244732d4596d11d6a2f86ff37a5 | ||||
|   GoogleAppMeasurement: 987769c4ca6b968f2479fbcc9fe3ce34af454b8e | ||||
| @@ -373,6 +384,7 @@ SPEC CHECKSUMS: | ||||
|   GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d | ||||
|   home_widget: 0434835a4c9a75704264feff6be17ea40e0f0d57 | ||||
|   image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1 | ||||
|   in_app_review: a31b5257259646ea78e0e35fc914979b0031d011 | ||||
|   Kingfisher: f2af9028b16baf9dc6c07c570072bc41cbf009ef | ||||
|   livekit_client: 6108dad8b77db3142bafd4c630f471d0a54335cd | ||||
|   media_kit_libs_ios_video: a5fe24bc7875ccd6378a0978c13185e1344651c1 | ||||
|   | ||||
| @@ -1,4 +1,5 @@ | ||||
| import 'dart:io'; | ||||
| import 'dart:math' as math; | ||||
|  | ||||
| import 'package:dio/dio.dart'; | ||||
| import 'package:flutter/foundation.dart'; | ||||
| @@ -152,6 +153,7 @@ class PostWriteController extends ChangeNotifier { | ||||
|   final TextEditingController contentController = TextEditingController(); | ||||
|   final TextEditingController titleController = TextEditingController(); | ||||
|   final TextEditingController descriptionController = TextEditingController(); | ||||
|   final TextEditingController aliasController = TextEditingController(); | ||||
|  | ||||
|   PostWriteController() { | ||||
|     titleController.addListener(() => notifyListeners()); | ||||
| @@ -176,6 +178,7 @@ class PostWriteController extends ChangeNotifier { | ||||
|   List<int> visibleUsers = List.empty(); | ||||
|   List<int> invisibleUsers = List.empty(); | ||||
|   List<String> tags = List.empty(); | ||||
|   List<String> categories = List.empty(); | ||||
|   PostWriteMedia? thumbnail; | ||||
|   List<PostWriteMedia> attachments = List.empty(growable: true); | ||||
|   DateTime? publishedAt, publishedUntil; | ||||
| @@ -198,12 +201,14 @@ class PostWriteController extends ChangeNotifier { | ||||
|         titleController.text = post.body['title'] ?? ''; | ||||
|         descriptionController.text = post.body['description'] ?? ''; | ||||
|         contentController.text = post.body['content'] ?? ''; | ||||
|         aliasController.text = post.alias ?? ''; | ||||
|         publishedAt = post.publishedAt; | ||||
|         publishedUntil = post.publishedUntil; | ||||
|         visibleUsers = List.from(post.visibleUsersList ?? []); | ||||
|         invisibleUsers = List.from(post.invisibleUsersList ?? []); | ||||
|         visibility = post.visibility; | ||||
|         tags = List.from(post.tags.map((ele) => ele.alias)); | ||||
|         categories = List.from(post.categories.map((ele) => ele.alias)); | ||||
|         attachments.addAll(post.preload?.attachments?.map((ele) => PostWriteMedia(ele)) ?? []); | ||||
|  | ||||
|         if (post.preload?.thumbnail != null && (post.preload?.thumbnail?.rid.isNotEmpty ?? false)) { | ||||
| @@ -269,7 +274,7 @@ class PostWriteController extends ChangeNotifier { | ||||
|     notifyListeners(); | ||||
|   } | ||||
|  | ||||
|   Future<void> post(BuildContext context) async { | ||||
|   Future<void> sendPost(BuildContext context) async { | ||||
|     if (isBusy || publisher == null) return; | ||||
|  | ||||
|     final sn = context.read<SnNetworkProvider>(); | ||||
| @@ -305,12 +310,14 @@ class PostWriteController extends ChangeNotifier { | ||||
|           place.$2, | ||||
|           onProgress: (progress) { | ||||
|             // Calculate overall progress for attachments | ||||
|             progress = ((i + progress) / attachments.length) * kAttachmentProgressWeight; | ||||
|             progress = math.max(((i + progress) / attachments.length) * kAttachmentProgressWeight, progress); | ||||
|             notifyListeners(); | ||||
|           }, | ||||
|         ); | ||||
|  | ||||
|         progress = (i + 1) / attachments.length * kAttachmentProgressWeight; | ||||
|         attachments[i] = PostWriteMedia(item); | ||||
|         notifyListeners(); | ||||
|       } | ||||
|     } catch (err) { | ||||
|       isBusy = false; | ||||
| @@ -334,11 +341,13 @@ class PostWriteController extends ChangeNotifier { | ||||
|         data: { | ||||
|           'publisher': publisher!.id, | ||||
|           'content': contentController.text, | ||||
|           if (aliasController.text.isNotEmpty) 'alias': aliasController.text, | ||||
|           if (titleController.text.isNotEmpty) 'title': titleController.text, | ||||
|           if (descriptionController.text.isNotEmpty) 'description': descriptionController.text, | ||||
|           if (thumbnail != null && thumbnail!.attachment != null) 'thumbnail': thumbnail!.attachment!.rid, | ||||
|           'attachments': attachments.where((e) => e.attachment != null).map((e) => e.attachment!.rid).toList(), | ||||
|           'tags': tags.map((ele) => {'alias': ele}).toList(), | ||||
|           'categories': categories.map((ele) => {'alias': ele}).toList(), | ||||
|           'visibility': visibility, | ||||
|           'visible_users_list': visibleUsers, | ||||
|           'invisible_users_list': invisibleUsers, | ||||
| @@ -425,6 +434,11 @@ class PostWriteController extends ChangeNotifier { | ||||
|     notifyListeners(); | ||||
|   } | ||||
|  | ||||
|   void setCategories(List<String> value) { | ||||
|     categories = value; | ||||
|     notifyListeners(); | ||||
|   } | ||||
|  | ||||
|   void setVisibility(int value) { | ||||
|     visibility = value; | ||||
|     notifyListeners(); | ||||
| @@ -461,6 +475,9 @@ class PostWriteController extends ChangeNotifier { | ||||
|     titleController.clear(); | ||||
|     descriptionController.clear(); | ||||
|     contentController.clear(); | ||||
|     aliasController.clear(); | ||||
|     tags.clear(); | ||||
|     categories.clear(); | ||||
|     attachments.clear(); | ||||
|     editingPost = null; | ||||
|     replyingPost = null; | ||||
| @@ -474,6 +491,7 @@ class PostWriteController extends ChangeNotifier { | ||||
|     contentController.dispose(); | ||||
|     titleController.dispose(); | ||||
|     descriptionController.dispose(); | ||||
|     aliasController.dispose(); | ||||
|     super.dispose(); | ||||
|   } | ||||
| } | ||||
|   | ||||
| @@ -9,6 +9,10 @@ const kRtkStoreKey = 'nex_user_rtk'; | ||||
| const kNetworkServerDefault = 'https://api.sn.solsynth.dev'; | ||||
| const kNetworkServerStoreKey = 'app_server_url'; | ||||
|  | ||||
| const kAppbarTransparentStoreKey = 'app_bar_transparent'; | ||||
| const kAppBackgroundStoreKey = 'app_has_background'; | ||||
| const kAppColorSchemeStoreKey = 'app_color_scheme'; | ||||
|  | ||||
| const Map<String, FilterQuality> kImageQualityLevel = { | ||||
|   'settingsImageQualityLowest': FilterQuality.none, | ||||
|   'settingsImageQualityLow': FilterQuality.low, | ||||
|   | ||||
| @@ -118,12 +118,14 @@ class SnPostContentProvider { | ||||
|     int take = 10, | ||||
|     int offset = 0, | ||||
|     Iterable<String>? tags, | ||||
|     Iterable<String>? categories, | ||||
|   }) async { | ||||
|     final resp = await _sn.client.get('/cgi/co/posts/search', queryParameters: { | ||||
|       'take': take, | ||||
|       'offset': offset, | ||||
|       'probe': searchTerm, | ||||
|       if (tags?.isNotEmpty ?? false) 'tags': tags!.join(','), | ||||
|       if (categories?.isNotEmpty ?? false) 'categories': categories!.join(','), | ||||
|     }); | ||||
|     final List<SnPost> out = await _preloadRelatedDataInBatch( | ||||
|       List.from(resp.data['data']?.map((e) => SnPost.fromJson(e)) ?? []), | ||||
|   | ||||
| @@ -41,8 +41,7 @@ class SnAttachmentProvider { | ||||
|     return out; | ||||
|   } | ||||
|  | ||||
|   Future<List<SnAttachment?>> getMultiple(List<String> rids, | ||||
|       {noCache = false}) async { | ||||
|   Future<List<SnAttachment?>> getMultiple(List<String> rids, {noCache = false}) async { | ||||
|     final result = List<SnAttachment?>.filled(rids.length, null); | ||||
|     final Map<String, int> randomMapping = {}; | ||||
|     for (int i = 0; i < rids.length; i++) { | ||||
| @@ -63,9 +62,7 @@ class SnAttachmentProvider { | ||||
|           'id': pendingFetch.join(','), | ||||
|         }, | ||||
|       ); | ||||
|       final out = resp.data['data'] | ||||
|           .map((e) => e['id'] == 0 ? null : SnAttachment.fromJson(e)) | ||||
|           .toList(); | ||||
|       final out = resp.data['data'].map((e) => e['id'] == 0 ? null : SnAttachment.fromJson(e)).toList(); | ||||
|  | ||||
|       for (final item in out) { | ||||
|         if (item == null) continue; | ||||
| @@ -79,10 +76,7 @@ class SnAttachmentProvider { | ||||
|     return result; | ||||
|   } | ||||
|  | ||||
|   static Map<String, String> mimetypeOverrides = { | ||||
|     'mov': 'video/quicktime', | ||||
|     'mp4': 'video/mp4' | ||||
|   }; | ||||
|   static Map<String, String> mimetypeOverrides = {'mov': 'video/quicktime', 'mp4': 'video/mp4'}; | ||||
|  | ||||
|   Future<SnAttachment> directUploadOne( | ||||
|     Uint8List data, | ||||
| @@ -93,11 +87,8 @@ class SnAttachmentProvider { | ||||
|     Function(double progress)? onProgress, | ||||
|   }) async { | ||||
|     final filePayload = MultipartFile.fromBytes(data, filename: filename); | ||||
|     final fileAlt = filename.contains('.') | ||||
|         ? filename.substring(0, filename.lastIndexOf('.')) | ||||
|         : filename; | ||||
|     final fileExt = | ||||
|         filename.substring(filename.lastIndexOf('.') + 1).toLowerCase(); | ||||
|     final fileAlt = filename.contains('.') ? filename.substring(0, filename.lastIndexOf('.')) : filename; | ||||
|     final fileExt = filename.substring(filename.lastIndexOf('.') + 1).toLowerCase(); | ||||
|  | ||||
|     String? mimetypeOverride; | ||||
|     if (mimetype != null) { | ||||
| @@ -133,11 +124,8 @@ class SnAttachmentProvider { | ||||
|     Map<String, dynamic>? metadata, { | ||||
|     String? mimetype, | ||||
|   }) async { | ||||
|     final fileAlt = filename.contains('.') | ||||
|         ? filename.substring(0, filename.lastIndexOf('.')) | ||||
|         : filename; | ||||
|     final fileExt = | ||||
|         filename.substring(filename.lastIndexOf('.') + 1).toLowerCase(); | ||||
|     final fileAlt = filename.contains('.') ? filename.substring(0, filename.lastIndexOf('.')) : filename; | ||||
|     final fileExt = filename.substring(filename.lastIndexOf('.') + 1).toLowerCase(); | ||||
|  | ||||
|     String? mimetypeOverride; | ||||
|     if (mimetype == null && mimetypeOverrides.keys.contains(fileExt)) { | ||||
| @@ -155,10 +143,7 @@ class SnAttachmentProvider { | ||||
|       if (mimetypeOverride != null) 'mimetype': mimetypeOverride, | ||||
|     }); | ||||
|  | ||||
|     return ( | ||||
|       SnAttachment.fromJson(resp.data['meta']), | ||||
|       resp.data['chunk_size'] as int | ||||
|     ); | ||||
|     return (SnAttachment.fromJson(resp.data['meta']), resp.data['chunk_size'] as int); | ||||
|   } | ||||
|  | ||||
|   Future<SnAttachment> _chunkedUploadOnePart( | ||||
| @@ -200,24 +185,17 @@ class SnAttachmentProvider { | ||||
|           (entry.value + 1) * chunkSize, | ||||
|           await file.length(), | ||||
|         ); | ||||
|         final data = Uint8List.fromList(await file | ||||
|             .openRead(beginCursor, endCursor) | ||||
|             .expand((chunk) => chunk) | ||||
|             .toList()); | ||||
|         final data = Uint8List.fromList(await file.openRead(beginCursor, endCursor).expand((chunk) => chunk).toList()); | ||||
|  | ||||
|         place = await _chunkedUploadOnePart( | ||||
|           data, | ||||
|           place.rid, | ||||
|           entry.key, | ||||
|           onProgress: (chunkProgress) { | ||||
|             final overallProgress = | ||||
|                 (currentTask + chunkProgress) / chunks.length; | ||||
|             if (onProgress != null) { | ||||
|               onProgress(overallProgress); | ||||
|             } | ||||
|           }, | ||||
|         ); | ||||
|  | ||||
|         final overallProgress = currentTask / chunks.length; | ||||
|         onProgress?.call(overallProgress); | ||||
|  | ||||
|         currentTask++; | ||||
|       }()); | ||||
|     } | ||||
|   | ||||
| @@ -1,3 +1,5 @@ | ||||
| import 'dart:ui'; | ||||
|  | ||||
| import 'package:flutter/foundation.dart'; | ||||
| import 'package:surface/theme.dart'; | ||||
|  | ||||
| @@ -11,8 +13,8 @@ class ThemeProvider extends ChangeNotifier { | ||||
|     }); | ||||
|   } | ||||
|  | ||||
|   void reloadTheme({bool? useMaterial3}) { | ||||
|     createAppThemeSet().then((value) { | ||||
|   void reloadTheme({Color? seedColorOverride, bool? useMaterial3}) { | ||||
|     createAppThemeSet(seedColorOverride: seedColorOverride, useMaterial3: useMaterial3).then((value) { | ||||
|       theme = value; | ||||
|       notifyListeners(); | ||||
|     }); | ||||
|   | ||||
| @@ -1,7 +1,6 @@ | ||||
| import 'dart:developer'; | ||||
|  | ||||
| import 'package:flutter/material.dart'; | ||||
| import 'package:path/path.dart'; | ||||
| import 'package:provider/provider.dart'; | ||||
| import 'package:shared_preferences/shared_preferences.dart'; | ||||
| import 'package:surface/providers/config.dart'; | ||||
|   | ||||
| @@ -228,65 +228,72 @@ class _UserScreenState extends State<UserScreen> with SingleTickerProviderStateM | ||||
|       body: CustomScrollView( | ||||
|         controller: _scrollController, | ||||
|         slivers: [ | ||||
|           SliverAppBar( | ||||
|             expandedHeight: _appBarHeight, | ||||
|             title: _account == null | ||||
|                 ? Text('loading').tr() | ||||
|                 : RichText( | ||||
|                     textAlign: TextAlign.center, | ||||
|                     text: TextSpan(children: [ | ||||
|                       TextSpan( | ||||
|                         text: _account!.nick, | ||||
|                         style: Theme.of(context).textTheme.titleLarge!.copyWith( | ||||
|                               color: Theme.of(context).appBarTheme.foregroundColor!, | ||||
|                               shadows: labelShadows, | ||||
|                             ), | ||||
|                       ), | ||||
|                       const TextSpan(text: '\n'), | ||||
|                       TextSpan( | ||||
|                         text: '@${_account!.name}', | ||||
|                         style: Theme.of(context).textTheme.bodySmall!.copyWith( | ||||
|                               color: Theme.of(context).appBarTheme.foregroundColor!, | ||||
|                               shadows: labelShadows, | ||||
|                             ), | ||||
|                       ), | ||||
|                     ]), | ||||
|           Theme( | ||||
|             data: Theme.of(context).copyWith( | ||||
|               appBarTheme: Theme.of(context).appBarTheme.copyWith( | ||||
|                     foregroundColor: Colors.white, | ||||
|                   ), | ||||
|             pinned: true, | ||||
|             flexibleSpace: _account != null | ||||
|                 ? Stack( | ||||
|                     fit: StackFit.expand, | ||||
|                     children: [ | ||||
|                       UniversalImage( | ||||
|                         sn.getAttachmentUrl(_account!.banner), | ||||
|                         fit: BoxFit.cover, | ||||
|                         height: imageHeight, | ||||
|                         width: _appBarWidth, | ||||
|                         cacheHeight: imageHeight, | ||||
|                         cacheWidth: _appBarWidth, | ||||
|                       ), | ||||
|                       Positioned( | ||||
|                         top: 0, | ||||
|                         left: 0, | ||||
|                         right: 0, | ||||
|                         height: 56 + MediaQuery.of(context).padding.top, | ||||
|                         child: ClipRect( | ||||
|                           child: BackdropFilter( | ||||
|                             filter: ImageFilter.blur( | ||||
|                               sigmaX: _appBarBlur, | ||||
|                               sigmaY: _appBarBlur, | ||||
|                             ), | ||||
|                             child: Container( | ||||
|                               color: Colors.black.withOpacity( | ||||
|                                 clampDouble(_appBarBlur * 0.1, 0, 0.5), | ||||
|             ), | ||||
|             child: SliverAppBar( | ||||
|               expandedHeight: _appBarHeight, | ||||
|               title: _account == null | ||||
|                   ? Text('loading').tr() | ||||
|                   : RichText( | ||||
|                       textAlign: TextAlign.center, | ||||
|                       text: TextSpan(children: [ | ||||
|                         TextSpan( | ||||
|                           text: _account!.nick, | ||||
|                           style: Theme.of(context).textTheme.titleLarge!.copyWith( | ||||
|                                 color: Colors.white, | ||||
|                                 shadows: labelShadows, | ||||
|                               ), | ||||
|                         ), | ||||
|                         const TextSpan(text: '\n'), | ||||
|                         TextSpan( | ||||
|                           text: '@${_account!.name}', | ||||
|                           style: Theme.of(context).textTheme.bodySmall!.copyWith( | ||||
|                                 color: Colors.white, | ||||
|                                 shadows: labelShadows, | ||||
|                               ), | ||||
|                         ), | ||||
|                       ]), | ||||
|                     ), | ||||
|               pinned: true, | ||||
|               flexibleSpace: _account != null | ||||
|                   ? Stack( | ||||
|                       fit: StackFit.expand, | ||||
|                       children: [ | ||||
|                         UniversalImage( | ||||
|                           sn.getAttachmentUrl(_account!.banner), | ||||
|                           fit: BoxFit.cover, | ||||
|                           height: imageHeight, | ||||
|                           width: _appBarWidth, | ||||
|                           cacheHeight: imageHeight, | ||||
|                           cacheWidth: _appBarWidth, | ||||
|                         ), | ||||
|                         Positioned( | ||||
|                           top: 0, | ||||
|                           left: 0, | ||||
|                           right: 0, | ||||
|                           height: 56 + MediaQuery.of(context).padding.top, | ||||
|                           child: ClipRect( | ||||
|                             child: BackdropFilter( | ||||
|                               filter: ImageFilter.blur( | ||||
|                                 sigmaX: _appBarBlur, | ||||
|                                 sigmaY: _appBarBlur, | ||||
|                               ), | ||||
|                               child: Container( | ||||
|                                 color: Colors.black.withOpacity( | ||||
|                                   clampDouble(_appBarBlur * 0.1, 0, 0.5), | ||||
|                                 ), | ||||
|                               ), | ||||
|                             ), | ||||
|                           ), | ||||
|                         ), | ||||
|                       ), | ||||
|                     ], | ||||
|                   ) | ||||
|                 : null, | ||||
|                       ], | ||||
|                     ) | ||||
|                   : null, | ||||
|             ), | ||||
|           ), | ||||
|           if (_account != null) | ||||
|             SliverToBoxAdapter( | ||||
|   | ||||
| @@ -17,14 +17,13 @@ import 'package:surface/providers/config.dart'; | ||||
| import 'package:surface/providers/post.dart'; | ||||
| import 'package:surface/providers/sn_network.dart'; | ||||
| import 'package:surface/providers/userinfo.dart'; | ||||
| import 'package:surface/providers/widget.dart'; | ||||
| import 'package:surface/types/check_in.dart'; | ||||
| import 'package:surface/types/post.dart'; | ||||
| import 'package:surface/widgets/app_bar_leading.dart'; | ||||
| import 'package:surface/widgets/dialog.dart'; | ||||
| import 'package:surface/widgets/post/post_item.dart'; | ||||
|  | ||||
| import '../providers/widget.dart'; | ||||
|  | ||||
| class HomeScreenDashEntry { | ||||
|   final String name; | ||||
|   final Widget child; | ||||
| @@ -133,7 +132,7 @@ class _HomeDashUpdateWidget extends StatelessWidget { | ||||
|                           final model = UpdateModel( | ||||
|                             'https://files.solsynth.dev/d/production01/solian/app-arm64-v8a-release.apk', | ||||
|                             'solian-app-release-${config.updatableVersion!}.apk', | ||||
|                             'ic_notification', | ||||
|                             'ic_launcher', | ||||
|                             'https://apps.apple.com/us/app/solian/id6499032345', | ||||
|                           ); | ||||
|                           AzhonAppUpdate.update(model); | ||||
| @@ -212,7 +211,7 @@ class _HomeDashCheckInWidgetState extends State<_HomeDashCheckInWidget> { | ||||
|       final home = context.read<HomeWidgetProvider>(); | ||||
|       final resp = await sn.client.get('/cgi/id/check-in/today'); | ||||
|       _todayRecord = SnCheckInRecord.fromJson(resp.data); | ||||
|       home.saveWidgetData('pas_check_in_record', _todayRecord!.toJson()); | ||||
|       await home.saveWidgetData('pas_check_in_record', _todayRecord!.toJson()); | ||||
|     } finally { | ||||
|       setState(() => _isBusy = false); | ||||
|     } | ||||
| @@ -225,7 +224,7 @@ class _HomeDashCheckInWidgetState extends State<_HomeDashCheckInWidget> { | ||||
|       final home = context.read<HomeWidgetProvider>(); | ||||
|       final resp = await sn.client.post('/cgi/id/check-in'); | ||||
|       _todayRecord = SnCheckInRecord.fromJson(resp.data); | ||||
|       home.saveWidgetData('pas_check_in_record', _todayRecord!.toJson()); | ||||
|       await home.saveWidgetData('pas_check_in_record', _todayRecord!.toJson()); | ||||
|     } catch (err) { | ||||
|       if (!mounted) return; | ||||
|       context.showErrorDialog(err); | ||||
|   | ||||
| @@ -13,6 +13,7 @@ import 'package:material_symbols_icons/symbols.dart'; | ||||
| import 'package:pasteboard/pasteboard.dart'; | ||||
| import 'package:styled_widget/styled_widget.dart'; | ||||
| import 'package:surface/controllers/post_write_controller.dart'; | ||||
| import 'package:surface/providers/config.dart'; | ||||
| import 'package:surface/providers/sn_network.dart'; | ||||
| import 'package:surface/types/post.dart'; | ||||
| import 'package:surface/widgets/account/account_image.dart'; | ||||
| @@ -71,11 +72,14 @@ class _PostEditorScreenState extends State<PostEditorScreen> { | ||||
|  | ||||
|     try { | ||||
|       final sn = context.read<SnNetworkProvider>(); | ||||
|       final config = context.read<ConfigProvider>(); | ||||
|       final resp = await sn.client.get('/cgi/co/publishers/me'); | ||||
|       _publishers = List<SnPublisher>.from( | ||||
|         resp.data?.map((e) => SnPublisher.fromJson(e)) ?? [], | ||||
|       ); | ||||
|       _writeController.setPublisher(_publishers?.firstOrNull); | ||||
|       final beforeId = config.prefs.getInt('int_last_publisher_id'); | ||||
|       _writeController | ||||
|           .setPublisher(_publishers?.where((ele) => ele.id == beforeId).firstOrNull ?? _publishers?.firstOrNull); | ||||
|     } catch (err) { | ||||
|       if (!mounted) return; | ||||
|       context.showErrorDialog(err); | ||||
| @@ -265,6 +269,8 @@ class _PostEditorScreenState extends State<PostEditorScreen> { | ||||
|                       }); | ||||
|                     } else { | ||||
|                       _writeController.setPublisher(value); | ||||
|                       final config = context.read<ConfigProvider>(); | ||||
|                       config.prefs.setInt('int_last_publisher_id', value.id); | ||||
|                     } | ||||
|                   }, | ||||
|                   buttonStyleData: const ButtonStyleData( | ||||
| @@ -496,7 +502,7 @@ class _PostEditorScreenState extends State<PostEditorScreen> { | ||||
|                           onPressed: (_writeController.isBusy || _writeController.publisher == null) | ||||
|                               ? null | ||||
|                               : () { | ||||
|                                   _writeController.post(context).then((_) { | ||||
|                                   _writeController.sendPost(context).then((_) { | ||||
|                                     if (!context.mounted) return; | ||||
|                                     Navigator.pop(context, true); | ||||
|                                   }); | ||||
|   | ||||
| @@ -23,6 +23,7 @@ class _PostSearchScreenState extends State<PostSearchScreen> { | ||||
|   bool _isBusy = false; | ||||
|  | ||||
|   List<String> _searchTags = List.empty(growable: true); | ||||
|   List<String> _searchCategories = List.empty(growable: true); | ||||
|  | ||||
|   final List<SnPost> _posts = List.empty(growable: true); | ||||
|   int? _postCount; | ||||
| @@ -31,7 +32,7 @@ class _PostSearchScreenState extends State<PostSearchScreen> { | ||||
|   Duration? _lastTook; | ||||
|  | ||||
|   Future<void> _fetchPosts() async { | ||||
|     if (_searchTerm.isEmpty && _searchTags.isEmpty) return; | ||||
|     if (_searchTerm.isEmpty && _searchCategories.isEmpty && _searchTags.isEmpty) return; | ||||
|     if (_postCount != null && _posts.length >= _postCount!) return; | ||||
|  | ||||
|     setState(() => _isBusy = true); | ||||
| @@ -45,6 +46,7 @@ class _PostSearchScreenState extends State<PostSearchScreen> { | ||||
|         take: 10, | ||||
|         offset: _posts.length, | ||||
|         tags: _searchTags, | ||||
|         categories: _searchCategories, | ||||
|       ); | ||||
|       final List<SnPost> out = result.$1; | ||||
|       _postCount = result.$2; | ||||
| @@ -73,9 +75,20 @@ class _PostSearchScreenState extends State<PostSearchScreen> { | ||||
|               setState(() => _searchTags = value); | ||||
|             }, | ||||
|           ), | ||||
|           const Gap(4), | ||||
|           PostCategoriesField( | ||||
|             labelText: 'fieldPostCategories'.tr(), | ||||
|             initialCategories: _searchCategories, | ||||
|             onUpdate: (value) { | ||||
|               setState(() => _searchCategories = value); | ||||
|             }, | ||||
|           ), | ||||
|         ], | ||||
|       ).padding(horizontal: 24, vertical: 16), | ||||
|     ); | ||||
|     ).then((_) { | ||||
|       _posts.clear(); | ||||
|       _fetchPosts(); | ||||
|     }); | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   | ||||
| @@ -277,70 +277,77 @@ class _PostPublisherScreenState extends State<PostPublisherScreen> with SingleTi | ||||
|               handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context), | ||||
|               sliver: MultiSliver( | ||||
|                 children: [ | ||||
|                   SliverAppBar( | ||||
|                     expandedHeight: _appBarHeight, | ||||
|                     title: _publisher == null | ||||
|                         ? Text('loading').tr() | ||||
|                         : RichText( | ||||
|                             textAlign: TextAlign.center, | ||||
|                             text: TextSpan(children: [ | ||||
|                               TextSpan( | ||||
|                                 text: _publisher!.nick, | ||||
|                                 style: Theme.of(context).textTheme.titleLarge!.copyWith( | ||||
|                                       color: Theme.of(context).appBarTheme.foregroundColor!, | ||||
|                                       shadows: labelShadows, | ||||
|                                     ), | ||||
|                               ), | ||||
|                               const TextSpan(text: '\n'), | ||||
|                               TextSpan( | ||||
|                                 text: '@${_publisher!.name}', | ||||
|                                 style: Theme.of(context).textTheme.bodySmall!.copyWith( | ||||
|                                       color: Colors.white, | ||||
|                                       shadows: labelShadows, | ||||
|                                     ), | ||||
|                               ), | ||||
|                             ]), | ||||
|                           ), | ||||
|                     pinned: true, | ||||
|                     flexibleSpace: _publisher != null | ||||
|                         ? Stack( | ||||
|                             fit: StackFit.expand, | ||||
|                             children: [ | ||||
|                               if (_publisher!.banner.isNotEmpty) | ||||
|                                 UniversalImage( | ||||
|                                   sn.getAttachmentUrl(_publisher!.banner), | ||||
|                                   fit: BoxFit.cover, | ||||
|                                   height: imageHeight, | ||||
|                                   width: _appBarWidth, | ||||
|                                   cacheHeight: imageHeight, | ||||
|                                   cacheWidth: _appBarWidth, | ||||
|                                 ) | ||||
|                               else | ||||
|                                 Container( | ||||
|                                   color: Theme.of(context).colorScheme.surfaceContainer, | ||||
|                   Theme( | ||||
|                     data: Theme.of(context).copyWith( | ||||
|                       appBarTheme: Theme.of(context).appBarTheme.copyWith( | ||||
|                         foregroundColor: Colors.white, | ||||
|                       ), | ||||
|                     ), | ||||
|                     child: SliverAppBar( | ||||
|                       expandedHeight: _appBarHeight, | ||||
|                       title: _publisher == null | ||||
|                           ? Text('loading').tr() | ||||
|                           : RichText( | ||||
|                               textAlign: TextAlign.center, | ||||
|                               text: TextSpan(children: [ | ||||
|                                 TextSpan( | ||||
|                                   text: _publisher!.nick, | ||||
|                                   style: Theme.of(context).textTheme.titleLarge!.copyWith( | ||||
|                                         color: Colors.white, | ||||
|                                         shadows: labelShadows, | ||||
|                                       ), | ||||
|                                 ), | ||||
|                               Positioned( | ||||
|                                 top: 0, | ||||
|                                 left: 0, | ||||
|                                 right: 0, | ||||
|                                 height: 56 + MediaQuery.of(context).padding.top, | ||||
|                                 child: ClipRect( | ||||
|                                   child: BackdropFilter( | ||||
|                                     filter: ImageFilter.blur( | ||||
|                                       sigmaX: _appBarBlur, | ||||
|                                       sigmaY: _appBarBlur, | ||||
|                                     ), | ||||
|                                     child: Container( | ||||
|                                       color: Colors.black.withOpacity( | ||||
|                                         clampDouble(_appBarBlur * 0.1, 0, 0.5), | ||||
|                                 const TextSpan(text: '\n'), | ||||
|                                 TextSpan( | ||||
|                                   text: '@${_publisher!.name}', | ||||
|                                   style: Theme.of(context).textTheme.bodySmall!.copyWith( | ||||
|                                         color: Colors.white, | ||||
|                                         shadows: labelShadows, | ||||
|                                       ), | ||||
|                                 ), | ||||
|                               ]), | ||||
|                             ), | ||||
|                       pinned: true, | ||||
|                       flexibleSpace: _publisher != null | ||||
|                           ? Stack( | ||||
|                               fit: StackFit.expand, | ||||
|                               children: [ | ||||
|                                 if (_publisher!.banner.isNotEmpty) | ||||
|                                   UniversalImage( | ||||
|                                     sn.getAttachmentUrl(_publisher!.banner), | ||||
|                                     fit: BoxFit.cover, | ||||
|                                     height: imageHeight, | ||||
|                                     width: _appBarWidth, | ||||
|                                     cacheHeight: imageHeight, | ||||
|                                     cacheWidth: _appBarWidth, | ||||
|                                   ) | ||||
|                                 else | ||||
|                                   Container( | ||||
|                                     color: Theme.of(context).colorScheme.surfaceContainer, | ||||
|                                   ), | ||||
|                                 Positioned( | ||||
|                                   top: 0, | ||||
|                                   left: 0, | ||||
|                                   right: 0, | ||||
|                                   height: 56 + MediaQuery.of(context).padding.top, | ||||
|                                   child: ClipRect( | ||||
|                                     child: BackdropFilter( | ||||
|                                       filter: ImageFilter.blur( | ||||
|                                         sigmaX: _appBarBlur, | ||||
|                                         sigmaY: _appBarBlur, | ||||
|                                       ), | ||||
|                                       child: Container( | ||||
|                                         color: Colors.black.withOpacity( | ||||
|                                           clampDouble(_appBarBlur * 0.1, 0, 0.5), | ||||
|                                         ), | ||||
|                                       ), | ||||
|                                     ), | ||||
|                                   ), | ||||
|                                 ), | ||||
|                               ), | ||||
|                             ], | ||||
|                           ) | ||||
|                         : null, | ||||
|                               ], | ||||
|                             ) | ||||
|                           : null, | ||||
|                     ), | ||||
|                   ), | ||||
|                   if (_publisher != null) | ||||
|                     SliverToBoxAdapter( | ||||
|   | ||||
| @@ -5,6 +5,7 @@ import 'package:dropdown_button2/dropdown_button2.dart'; | ||||
| import 'package:easy_localization/easy_localization.dart'; | ||||
| import 'package:flutter/foundation.dart'; | ||||
| import 'package:flutter/material.dart'; | ||||
| import 'package:flutter_colorpicker/flutter_colorpicker.dart'; | ||||
| import 'package:go_router/go_router.dart'; | ||||
| import 'package:image_picker/image_picker.dart'; | ||||
| import 'package:material_symbols_icons/symbols.dart'; | ||||
| @@ -18,6 +19,17 @@ import 'package:surface/providers/theme.dart'; | ||||
| import 'package:surface/theme.dart'; | ||||
| import 'package:surface/widgets/dialog.dart'; | ||||
|  | ||||
| const Map<String, Color> kColorSchemes = { | ||||
|   'colorSchemeIndigo': Colors.indigo, | ||||
|   'colorSchemeBlue': Colors.blue, | ||||
|   'colorSchemeGreen': Colors.green, | ||||
|   'colorSchemeYellow': Colors.yellow, | ||||
|   'colorSchemeOrange': Colors.orange, | ||||
|   'colorSchemeRed': Colors.red, | ||||
|   'colorSchemeWhite': Colors.white, | ||||
|   'colorSchemeBlack': Colors.black, | ||||
| }; | ||||
|  | ||||
| class SettingsScreen extends StatefulWidget { | ||||
|   const SettingsScreen({super.key}); | ||||
|  | ||||
| @@ -77,7 +89,7 @@ class _SettingsScreenState extends State<SettingsScreen> { | ||||
|                       if (image == null) return; | ||||
|  | ||||
|                       await File(image.path).copy('$_docBasepath/app_background_image'); | ||||
|                       _prefs.setBool('has_background_image', true); | ||||
|                       _prefs.setBool(kAppBackgroundStoreKey, true); | ||||
|  | ||||
|                       setState(() {}); | ||||
|                     }, | ||||
| @@ -98,7 +110,7 @@ class _SettingsScreenState extends State<SettingsScreen> { | ||||
|                           trailing: const Icon(Symbols.chevron_right), | ||||
|                           onTap: () { | ||||
|                             File('$_docBasepath/app_background_image').deleteSync(); | ||||
|                             _prefs.remove('has_background_image'); | ||||
|                             _prefs.remove(kAppBackgroundStoreKey); | ||||
|                             setState(() {}); | ||||
|                           }, | ||||
|                         ); | ||||
| @@ -116,10 +128,118 @@ class _SettingsScreenState extends State<SettingsScreen> { | ||||
|                         value ?? false, | ||||
|                       ); | ||||
|                     }); | ||||
|                     final th = context.watch<ThemeProvider>(); | ||||
|                     final th = context.read<ThemeProvider>(); | ||||
|                     th.reloadTheme(useMaterial3: value ?? false); | ||||
|                   }, | ||||
|                 ), | ||||
|                 ListTile( | ||||
|                   leading: const Icon(Symbols.format_paint), | ||||
|                   title: Text('settingsColorScheme').tr(), | ||||
|                   subtitle: Text('settingsColorSchemeDescription').tr(), | ||||
|                   contentPadding: const EdgeInsets.symmetric(horizontal: 24), | ||||
|                   trailing: const Icon(Symbols.chevron_right), | ||||
|                   onTap: () async { | ||||
|                     Color pickerColor = Color(_prefs.getInt(kAppColorSchemeStoreKey) ?? Colors.indigo.value); | ||||
|                     final color = await showDialog<Color?>( | ||||
|                       context: context, | ||||
|                       builder: (context) => AlertDialog( | ||||
|                         content: SingleChildScrollView( | ||||
|                           child: ColorPicker( | ||||
|                             pickerColor: pickerColor, | ||||
|                             onColorChanged: (color) => pickerColor = color, | ||||
|                             enableAlpha: false, | ||||
|                             hexInputBar: true, | ||||
|                           ), | ||||
|                         ), | ||||
|                         actions: <Widget>[ | ||||
|                           TextButton( | ||||
|                             child: const Text('dialogDismiss').tr(), | ||||
|                             onPressed: () { | ||||
|                               Navigator.of(context).pop(); | ||||
|                             }, | ||||
|                           ), | ||||
|                           TextButton( | ||||
|                             child: const Text('dialogConfirm').tr(), | ||||
|                             onPressed: () { | ||||
|                               Navigator.of(context).pop(pickerColor); | ||||
|                             }, | ||||
|                           ), | ||||
|                         ], | ||||
|                       ), | ||||
|                     ); | ||||
|  | ||||
|                     if (color == null || !context.mounted) return; | ||||
|  | ||||
|                     _prefs.setInt(kAppColorSchemeStoreKey, color.value); | ||||
|                     final th = context.read<ThemeProvider>(); | ||||
|                     th.reloadTheme(seedColorOverride: color); | ||||
|                     setState(() {}); | ||||
|  | ||||
|                     context.showSnackbar('colorSchemeApplied'.tr()); | ||||
|                   }, | ||||
|                 ), | ||||
|                 ListTile( | ||||
|                   leading: const Icon(Symbols.palette), | ||||
|                   title: Text('settingsColorSeed').tr(), | ||||
|                   subtitle: Text('settingsColorSeedDescription').tr(), | ||||
|                   contentPadding: const EdgeInsets.only(left: 24, right: 17), | ||||
|                   trailing: DropdownButtonHideUnderline( | ||||
|                     child: DropdownButton2<int?>( | ||||
|                       isExpanded: true, | ||||
|                       items: [ | ||||
|                         ...kColorSchemes.entries.mapIndexed((idx, ele) { | ||||
|                           return DropdownMenuItem<int>( | ||||
|                             value: idx, | ||||
|                             child: Text(ele.key).tr(), | ||||
|                           ); | ||||
|                         }), | ||||
|                         DropdownMenuItem<int>( | ||||
|                           value: -1, | ||||
|                           child: Text('custom').tr(), | ||||
|                         ), | ||||
|                       ], | ||||
|                       value: _prefs.getInt(kAppColorSchemeStoreKey) == null | ||||
|                           ? 1 | ||||
|                           : kColorSchemes.values | ||||
|                               .toList() | ||||
|                               .indexWhere((ele) => ele.value == _prefs.getInt(kAppColorSchemeStoreKey)), | ||||
|                       onChanged: (int? value) { | ||||
|                         if (value != null && value != -1) { | ||||
|                           _prefs.setInt(kAppColorSchemeStoreKey, kColorSchemes.values.elementAt(value).value); | ||||
|                           final th = context.read<ThemeProvider>(); | ||||
|                           th.reloadTheme(seedColorOverride: kColorSchemes.values.elementAt(value)); | ||||
|                           setState(() {}); | ||||
|  | ||||
|                           context.showSnackbar('colorSchemeApplied'.tr()); | ||||
|                         } | ||||
|                       }, | ||||
|                       buttonStyleData: const ButtonStyleData( | ||||
|                         padding: EdgeInsets.symmetric( | ||||
|                           horizontal: 16, | ||||
|                           vertical: 5, | ||||
|                         ), | ||||
|                         height: 40, | ||||
|                         width: 160, | ||||
|                       ), | ||||
|                       menuItemStyleData: const MenuItemStyleData( | ||||
|                         height: 40, | ||||
|                       ), | ||||
|                     ), | ||||
|                   ), | ||||
|                 ), | ||||
|                 CheckboxListTile( | ||||
|                   secondary: const Icon(Symbols.blur_on), | ||||
|                   title: Text('settingsAppBarTransparent').tr(), | ||||
|                   subtitle: Text('settingsAppBarTransparentDescription').tr(), | ||||
|                   contentPadding: const EdgeInsets.only(left: 24, right: 17), | ||||
|                   value: _prefs.getBool(kAppbarTransparentStoreKey) ?? false, | ||||
|                   onChanged: (value) { | ||||
|                     _prefs.setBool(kAppbarTransparentStoreKey, value ?? false); | ||||
|                     final th = context.read<ThemeProvider>(); | ||||
|                     th.reloadTheme(); | ||||
|                     setState(() {}); | ||||
|                   }, | ||||
|                 ), | ||||
|               ], | ||||
|             ), | ||||
|             Column( | ||||
| @@ -189,7 +309,7 @@ class _SettingsScreenState extends State<SettingsScreen> { | ||||
|                           horizontal: 16, | ||||
|                           vertical: 5, | ||||
|                         ), | ||||
|                         height: 40, | ||||
|                         height: 56, | ||||
|                         width: 160, | ||||
|                       ), | ||||
|                       menuItemStyleData: const MenuItemStyleData( | ||||
|   | ||||
| @@ -1,5 +1,6 @@ | ||||
| import 'package:flutter/material.dart'; | ||||
| import 'package:shared_preferences/shared_preferences.dart'; | ||||
| import 'package:surface/providers/config.dart'; | ||||
|  | ||||
| const kMaterialYouToggleStoreKey = 'app_theme_material_you'; | ||||
|  | ||||
| @@ -10,7 +11,7 @@ class ThemeSet { | ||||
|   ThemeSet({required this.light, required this.dark}); | ||||
| } | ||||
|  | ||||
| Future<ThemeSet> createAppThemeSet({bool? useMaterial3}) async { | ||||
| Future<ThemeSet> createAppThemeSet({Color? seedColorOverride, bool? useMaterial3}) async { | ||||
|   return ThemeSet( | ||||
|     light: await createAppTheme(Brightness.light, useMaterial3: useMaterial3), | ||||
|     dark: await createAppTheme(Brightness.dark, useMaterial3: useMaterial3), | ||||
| @@ -19,16 +20,21 @@ Future<ThemeSet> createAppThemeSet({bool? useMaterial3}) async { | ||||
|  | ||||
| Future<ThemeData> createAppTheme( | ||||
|   Brightness brightness, { | ||||
|     Color? seedColorOverride, | ||||
|   bool? useMaterial3, | ||||
| }) async { | ||||
|   final prefs = await SharedPreferences.getInstance(); | ||||
|  | ||||
|   final seedColorString = prefs.getInt(kAppColorSchemeStoreKey); | ||||
|   final seedColor = seedColorString != null ? Color(seedColorString) : Colors.indigo; | ||||
|  | ||||
|   final colorScheme = ColorScheme.fromSeed( | ||||
|     seedColor: Colors.indigo, | ||||
|     seedColor: seedColorOverride ?? seedColor, | ||||
|     brightness: brightness, | ||||
|   ); | ||||
|  | ||||
|   final hasBackground = prefs.getBool('has_background_image') ?? false; | ||||
|   final hasBackground = prefs.getBool(kAppBackgroundStoreKey) ?? false; | ||||
|   final hasAppBarBlurry = prefs.getBool(kAppbarTransparentStoreKey) ?? false; | ||||
|  | ||||
|   return ThemeData( | ||||
|     useMaterial3: useMaterial3 ?? (prefs.getBool(kMaterialYouToggleStoreKey) ?? false), | ||||
| @@ -42,8 +48,9 @@ Future<ThemeData> createAppTheme( | ||||
|     ), | ||||
|     appBarTheme: AppBarTheme( | ||||
|       centerTitle: true, | ||||
|       backgroundColor: hasBackground ? colorScheme.primary.withOpacity(0.75) : colorScheme.primary, | ||||
|       foregroundColor: colorScheme.onPrimary, | ||||
|       elevation: hasAppBarBlurry ? 0 : null, | ||||
|       backgroundColor: hasAppBarBlurry ? colorScheme.surfaceContainer.withAlpha(200) : colorScheme.primary, | ||||
|       foregroundColor: hasAppBarBlurry ? colorScheme.onSurface : colorScheme.onPrimary, | ||||
|     ), | ||||
|     scaffoldBackgroundColor: Colors.transparent, | ||||
|   ); | ||||
|   | ||||
| @@ -19,7 +19,7 @@ class SnPost with _$SnPost { | ||||
|     required String? alias, | ||||
|     required String? aliasPrefix, | ||||
|     @Default([]) List<SnPostTag> tags, | ||||
|     @Default([]) List<dynamic> categories, | ||||
|     @Default([]) List<SnPostCategory> categories, | ||||
|     required List<SnPost>? replies, | ||||
|     required int? replyId, | ||||
|     required int? repostId, | ||||
| @@ -67,6 +67,23 @@ class SnPostTag with _$SnPostTag { | ||||
|       _$SnPostTagFromJson(json); | ||||
| } | ||||
|  | ||||
| @freezed | ||||
| class SnPostCategory with _$SnPostCategory { | ||||
|   const factory SnPostCategory({ | ||||
|     required int id, | ||||
|     required DateTime createdAt, | ||||
|     required DateTime updatedAt, | ||||
|     required dynamic deletedAt, | ||||
|     required String alias, | ||||
|     required String name, | ||||
|     required String description, | ||||
|     required dynamic posts, | ||||
|   }) = _SnPostCategory; | ||||
|  | ||||
|   factory SnPostCategory.fromJson(Map<String, Object?> json) => | ||||
|       _$SnPostCategoryFromJson(json); | ||||
| } | ||||
|  | ||||
| @freezed | ||||
| class SnPostPreload with _$SnPostPreload { | ||||
|   const factory SnPostPreload({ | ||||
|   | ||||
| @@ -30,7 +30,7 @@ mixin _$SnPost { | ||||
|   String? get alias => throw _privateConstructorUsedError; | ||||
|   String? get aliasPrefix => throw _privateConstructorUsedError; | ||||
|   List<SnPostTag> get tags => throw _privateConstructorUsedError; | ||||
|   List<dynamic> get categories => throw _privateConstructorUsedError; | ||||
|   List<SnPostCategory> get categories => throw _privateConstructorUsedError; | ||||
|   List<SnPost>? get replies => throw _privateConstructorUsedError; | ||||
|   int? get replyId => throw _privateConstructorUsedError; | ||||
|   int? get repostId => throw _privateConstructorUsedError; | ||||
| @@ -77,7 +77,7 @@ abstract class $SnPostCopyWith<$Res> { | ||||
|       String? alias, | ||||
|       String? aliasPrefix, | ||||
|       List<SnPostTag> tags, | ||||
|       List<dynamic> categories, | ||||
|       List<SnPostCategory> categories, | ||||
|       List<SnPost>? replies, | ||||
|       int? replyId, | ||||
|       int? repostId, | ||||
| @@ -197,7 +197,7 @@ class _$SnPostCopyWithImpl<$Res, $Val extends SnPost> | ||||
|       categories: null == categories | ||||
|           ? _value.categories | ||||
|           : categories // ignore: cast_nullable_to_non_nullable | ||||
|               as List<dynamic>, | ||||
|               as List<SnPostCategory>, | ||||
|       replies: freezed == replies | ||||
|           ? _value.replies | ||||
|           : replies // ignore: cast_nullable_to_non_nullable | ||||
| @@ -362,7 +362,7 @@ abstract class _$$SnPostImplCopyWith<$Res> implements $SnPostCopyWith<$Res> { | ||||
|       String? alias, | ||||
|       String? aliasPrefix, | ||||
|       List<SnPostTag> tags, | ||||
|       List<dynamic> categories, | ||||
|       List<SnPostCategory> categories, | ||||
|       List<SnPost>? replies, | ||||
|       int? replyId, | ||||
|       int? repostId, | ||||
| @@ -485,7 +485,7 @@ class __$$SnPostImplCopyWithImpl<$Res> | ||||
|       categories: null == categories | ||||
|           ? _value._categories | ||||
|           : categories // ignore: cast_nullable_to_non_nullable | ||||
|               as List<dynamic>, | ||||
|               as List<SnPostCategory>, | ||||
|       replies: freezed == replies | ||||
|           ? _value._replies | ||||
|           : replies // ignore: cast_nullable_to_non_nullable | ||||
| @@ -584,7 +584,7 @@ class _$SnPostImpl extends _SnPost { | ||||
|       required this.alias, | ||||
|       required this.aliasPrefix, | ||||
|       final List<SnPostTag> tags = const [], | ||||
|       final List<dynamic> categories = const [], | ||||
|       final List<SnPostCategory> categories = const [], | ||||
|       required final List<SnPost>? replies, | ||||
|       required this.replyId, | ||||
|       required this.repostId, | ||||
| @@ -649,10 +649,10 @@ class _$SnPostImpl extends _SnPost { | ||||
|     return EqualUnmodifiableListView(_tags); | ||||
|   } | ||||
|  | ||||
|   final List<dynamic> _categories; | ||||
|   final List<SnPostCategory> _categories; | ||||
|   @override | ||||
|   @JsonKey() | ||||
|   List<dynamic> get categories { | ||||
|   List<SnPostCategory> get categories { | ||||
|     if (_categories is EqualUnmodifiableListView) return _categories; | ||||
|     // ignore: implicit_dynamic_type | ||||
|     return EqualUnmodifiableListView(_categories); | ||||
| @@ -853,7 +853,7 @@ abstract class _SnPost extends SnPost { | ||||
|       required final String? alias, | ||||
|       required final String? aliasPrefix, | ||||
|       final List<SnPostTag> tags, | ||||
|       final List<dynamic> categories, | ||||
|       final List<SnPostCategory> categories, | ||||
|       required final List<SnPost>? replies, | ||||
|       required final int? replyId, | ||||
|       required final int? repostId, | ||||
| @@ -899,7 +899,7 @@ abstract class _SnPost extends SnPost { | ||||
|   @override | ||||
|   List<SnPostTag> get tags; | ||||
|   @override | ||||
|   List<dynamic> get categories; | ||||
|   List<SnPostCategory> get categories; | ||||
|   @override | ||||
|   List<SnPost>? get replies; | ||||
|   @override | ||||
| @@ -1253,6 +1253,312 @@ abstract class _SnPostTag implements SnPostTag { | ||||
|       throw _privateConstructorUsedError; | ||||
| } | ||||
|  | ||||
| SnPostCategory _$SnPostCategoryFromJson(Map<String, dynamic> json) { | ||||
|   return _SnPostCategory.fromJson(json); | ||||
| } | ||||
|  | ||||
| /// @nodoc | ||||
| mixin _$SnPostCategory { | ||||
|   int get id => throw _privateConstructorUsedError; | ||||
|   DateTime get createdAt => throw _privateConstructorUsedError; | ||||
|   DateTime get updatedAt => throw _privateConstructorUsedError; | ||||
|   dynamic get deletedAt => throw _privateConstructorUsedError; | ||||
|   String get alias => throw _privateConstructorUsedError; | ||||
|   String get name => throw _privateConstructorUsedError; | ||||
|   String get description => throw _privateConstructorUsedError; | ||||
|   dynamic get posts => throw _privateConstructorUsedError; | ||||
|  | ||||
|   /// Serializes this SnPostCategory to a JSON map. | ||||
|   Map<String, dynamic> toJson() => throw _privateConstructorUsedError; | ||||
|  | ||||
|   /// Create a copy of SnPostCategory | ||||
|   /// with the given fields replaced by the non-null parameter values. | ||||
|   @JsonKey(includeFromJson: false, includeToJson: false) | ||||
|   $SnPostCategoryCopyWith<SnPostCategory> get copyWith => | ||||
|       throw _privateConstructorUsedError; | ||||
| } | ||||
|  | ||||
| /// @nodoc | ||||
| abstract class $SnPostCategoryCopyWith<$Res> { | ||||
|   factory $SnPostCategoryCopyWith( | ||||
|           SnPostCategory value, $Res Function(SnPostCategory) then) = | ||||
|       _$SnPostCategoryCopyWithImpl<$Res, SnPostCategory>; | ||||
|   @useResult | ||||
|   $Res call( | ||||
|       {int id, | ||||
|       DateTime createdAt, | ||||
|       DateTime updatedAt, | ||||
|       dynamic deletedAt, | ||||
|       String alias, | ||||
|       String name, | ||||
|       String description, | ||||
|       dynamic posts}); | ||||
| } | ||||
|  | ||||
| /// @nodoc | ||||
| class _$SnPostCategoryCopyWithImpl<$Res, $Val extends SnPostCategory> | ||||
|     implements $SnPostCategoryCopyWith<$Res> { | ||||
|   _$SnPostCategoryCopyWithImpl(this._value, this._then); | ||||
|  | ||||
|   // ignore: unused_field | ||||
|   final $Val _value; | ||||
|   // ignore: unused_field | ||||
|   final $Res Function($Val) _then; | ||||
|  | ||||
|   /// Create a copy of SnPostCategory | ||||
|   /// with the given fields replaced by the non-null parameter values. | ||||
|   @pragma('vm:prefer-inline') | ||||
|   @override | ||||
|   $Res call({ | ||||
|     Object? id = null, | ||||
|     Object? createdAt = null, | ||||
|     Object? updatedAt = null, | ||||
|     Object? deletedAt = freezed, | ||||
|     Object? alias = null, | ||||
|     Object? name = null, | ||||
|     Object? description = null, | ||||
|     Object? posts = freezed, | ||||
|   }) { | ||||
|     return _then(_value.copyWith( | ||||
|       id: null == id | ||||
|           ? _value.id | ||||
|           : id // ignore: cast_nullable_to_non_nullable | ||||
|               as int, | ||||
|       createdAt: null == createdAt | ||||
|           ? _value.createdAt | ||||
|           : createdAt // ignore: cast_nullable_to_non_nullable | ||||
|               as DateTime, | ||||
|       updatedAt: null == updatedAt | ||||
|           ? _value.updatedAt | ||||
|           : updatedAt // ignore: cast_nullable_to_non_nullable | ||||
|               as DateTime, | ||||
|       deletedAt: freezed == deletedAt | ||||
|           ? _value.deletedAt | ||||
|           : deletedAt // ignore: cast_nullable_to_non_nullable | ||||
|               as dynamic, | ||||
|       alias: null == alias | ||||
|           ? _value.alias | ||||
|           : alias // ignore: cast_nullable_to_non_nullable | ||||
|               as String, | ||||
|       name: null == name | ||||
|           ? _value.name | ||||
|           : name // ignore: cast_nullable_to_non_nullable | ||||
|               as String, | ||||
|       description: null == description | ||||
|           ? _value.description | ||||
|           : description // ignore: cast_nullable_to_non_nullable | ||||
|               as String, | ||||
|       posts: freezed == posts | ||||
|           ? _value.posts | ||||
|           : posts // ignore: cast_nullable_to_non_nullable | ||||
|               as dynamic, | ||||
|     ) as $Val); | ||||
|   } | ||||
| } | ||||
|  | ||||
| /// @nodoc | ||||
| abstract class _$$SnPostCategoryImplCopyWith<$Res> | ||||
|     implements $SnPostCategoryCopyWith<$Res> { | ||||
|   factory _$$SnPostCategoryImplCopyWith(_$SnPostCategoryImpl value, | ||||
|           $Res Function(_$SnPostCategoryImpl) then) = | ||||
|       __$$SnPostCategoryImplCopyWithImpl<$Res>; | ||||
|   @override | ||||
|   @useResult | ||||
|   $Res call( | ||||
|       {int id, | ||||
|       DateTime createdAt, | ||||
|       DateTime updatedAt, | ||||
|       dynamic deletedAt, | ||||
|       String alias, | ||||
|       String name, | ||||
|       String description, | ||||
|       dynamic posts}); | ||||
| } | ||||
|  | ||||
| /// @nodoc | ||||
| class __$$SnPostCategoryImplCopyWithImpl<$Res> | ||||
|     extends _$SnPostCategoryCopyWithImpl<$Res, _$SnPostCategoryImpl> | ||||
|     implements _$$SnPostCategoryImplCopyWith<$Res> { | ||||
|   __$$SnPostCategoryImplCopyWithImpl( | ||||
|       _$SnPostCategoryImpl _value, $Res Function(_$SnPostCategoryImpl) _then) | ||||
|       : super(_value, _then); | ||||
|  | ||||
|   /// Create a copy of SnPostCategory | ||||
|   /// with the given fields replaced by the non-null parameter values. | ||||
|   @pragma('vm:prefer-inline') | ||||
|   @override | ||||
|   $Res call({ | ||||
|     Object? id = null, | ||||
|     Object? createdAt = null, | ||||
|     Object? updatedAt = null, | ||||
|     Object? deletedAt = freezed, | ||||
|     Object? alias = null, | ||||
|     Object? name = null, | ||||
|     Object? description = null, | ||||
|     Object? posts = freezed, | ||||
|   }) { | ||||
|     return _then(_$SnPostCategoryImpl( | ||||
|       id: null == id | ||||
|           ? _value.id | ||||
|           : id // ignore: cast_nullable_to_non_nullable | ||||
|               as int, | ||||
|       createdAt: null == createdAt | ||||
|           ? _value.createdAt | ||||
|           : createdAt // ignore: cast_nullable_to_non_nullable | ||||
|               as DateTime, | ||||
|       updatedAt: null == updatedAt | ||||
|           ? _value.updatedAt | ||||
|           : updatedAt // ignore: cast_nullable_to_non_nullable | ||||
|               as DateTime, | ||||
|       deletedAt: freezed == deletedAt | ||||
|           ? _value.deletedAt | ||||
|           : deletedAt // ignore: cast_nullable_to_non_nullable | ||||
|               as dynamic, | ||||
|       alias: null == alias | ||||
|           ? _value.alias | ||||
|           : alias // ignore: cast_nullable_to_non_nullable | ||||
|               as String, | ||||
|       name: null == name | ||||
|           ? _value.name | ||||
|           : name // ignore: cast_nullable_to_non_nullable | ||||
|               as String, | ||||
|       description: null == description | ||||
|           ? _value.description | ||||
|           : description // ignore: cast_nullable_to_non_nullable | ||||
|               as String, | ||||
|       posts: freezed == posts | ||||
|           ? _value.posts | ||||
|           : posts // ignore: cast_nullable_to_non_nullable | ||||
|               as dynamic, | ||||
|     )); | ||||
|   } | ||||
| } | ||||
|  | ||||
| /// @nodoc | ||||
| @JsonSerializable() | ||||
| class _$SnPostCategoryImpl implements _SnPostCategory { | ||||
|   const _$SnPostCategoryImpl( | ||||
|       {required this.id, | ||||
|       required this.createdAt, | ||||
|       required this.updatedAt, | ||||
|       required this.deletedAt, | ||||
|       required this.alias, | ||||
|       required this.name, | ||||
|       required this.description, | ||||
|       required this.posts}); | ||||
|  | ||||
|   factory _$SnPostCategoryImpl.fromJson(Map<String, dynamic> json) => | ||||
|       _$$SnPostCategoryImplFromJson(json); | ||||
|  | ||||
|   @override | ||||
|   final int id; | ||||
|   @override | ||||
|   final DateTime createdAt; | ||||
|   @override | ||||
|   final DateTime updatedAt; | ||||
|   @override | ||||
|   final dynamic deletedAt; | ||||
|   @override | ||||
|   final String alias; | ||||
|   @override | ||||
|   final String name; | ||||
|   @override | ||||
|   final String description; | ||||
|   @override | ||||
|   final dynamic posts; | ||||
|  | ||||
|   @override | ||||
|   String toString() { | ||||
|     return 'SnPostCategory(id: $id, createdAt: $createdAt, updatedAt: $updatedAt, deletedAt: $deletedAt, alias: $alias, name: $name, description: $description, posts: $posts)'; | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   bool operator ==(Object other) { | ||||
|     return identical(this, other) || | ||||
|         (other.runtimeType == runtimeType && | ||||
|             other is _$SnPostCategoryImpl && | ||||
|             (identical(other.id, id) || other.id == id) && | ||||
|             (identical(other.createdAt, createdAt) || | ||||
|                 other.createdAt == createdAt) && | ||||
|             (identical(other.updatedAt, updatedAt) || | ||||
|                 other.updatedAt == updatedAt) && | ||||
|             const DeepCollectionEquality().equals(other.deletedAt, deletedAt) && | ||||
|             (identical(other.alias, alias) || other.alias == alias) && | ||||
|             (identical(other.name, name) || other.name == name) && | ||||
|             (identical(other.description, description) || | ||||
|                 other.description == description) && | ||||
|             const DeepCollectionEquality().equals(other.posts, posts)); | ||||
|   } | ||||
|  | ||||
|   @JsonKey(includeFromJson: false, includeToJson: false) | ||||
|   @override | ||||
|   int get hashCode => Object.hash( | ||||
|       runtimeType, | ||||
|       id, | ||||
|       createdAt, | ||||
|       updatedAt, | ||||
|       const DeepCollectionEquality().hash(deletedAt), | ||||
|       alias, | ||||
|       name, | ||||
|       description, | ||||
|       const DeepCollectionEquality().hash(posts)); | ||||
|  | ||||
|   /// Create a copy of SnPostCategory | ||||
|   /// with the given fields replaced by the non-null parameter values. | ||||
|   @JsonKey(includeFromJson: false, includeToJson: false) | ||||
|   @override | ||||
|   @pragma('vm:prefer-inline') | ||||
|   _$$SnPostCategoryImplCopyWith<_$SnPostCategoryImpl> get copyWith => | ||||
|       __$$SnPostCategoryImplCopyWithImpl<_$SnPostCategoryImpl>( | ||||
|           this, _$identity); | ||||
|  | ||||
|   @override | ||||
|   Map<String, dynamic> toJson() { | ||||
|     return _$$SnPostCategoryImplToJson( | ||||
|       this, | ||||
|     ); | ||||
|   } | ||||
| } | ||||
|  | ||||
| abstract class _SnPostCategory implements SnPostCategory { | ||||
|   const factory _SnPostCategory( | ||||
|       {required final int id, | ||||
|       required final DateTime createdAt, | ||||
|       required final DateTime updatedAt, | ||||
|       required final dynamic deletedAt, | ||||
|       required final String alias, | ||||
|       required final String name, | ||||
|       required final String description, | ||||
|       required final dynamic posts}) = _$SnPostCategoryImpl; | ||||
|  | ||||
|   factory _SnPostCategory.fromJson(Map<String, dynamic> json) = | ||||
|       _$SnPostCategoryImpl.fromJson; | ||||
|  | ||||
|   @override | ||||
|   int get id; | ||||
|   @override | ||||
|   DateTime get createdAt; | ||||
|   @override | ||||
|   DateTime get updatedAt; | ||||
|   @override | ||||
|   dynamic get deletedAt; | ||||
|   @override | ||||
|   String get alias; | ||||
|   @override | ||||
|   String get name; | ||||
|   @override | ||||
|   String get description; | ||||
|   @override | ||||
|   dynamic get posts; | ||||
|  | ||||
|   /// Create a copy of SnPostCategory | ||||
|   /// with the given fields replaced by the non-null parameter values. | ||||
|   @override | ||||
|   @JsonKey(includeFromJson: false, includeToJson: false) | ||||
|   _$$SnPostCategoryImplCopyWith<_$SnPostCategoryImpl> get copyWith => | ||||
|       throw _privateConstructorUsedError; | ||||
| } | ||||
|  | ||||
| SnPostPreload _$SnPostPreloadFromJson(Map<String, dynamic> json) { | ||||
|   return _SnPostPreload.fromJson(json); | ||||
| } | ||||
|   | ||||
| @@ -22,7 +22,10 @@ _$SnPostImpl _$$SnPostImplFromJson(Map<String, dynamic> json) => _$SnPostImpl( | ||||
|               ?.map((e) => SnPostTag.fromJson(e as Map<String, dynamic>)) | ||||
|               .toList() ?? | ||||
|           const [], | ||||
|       categories: json['categories'] as List<dynamic>? ?? const [], | ||||
|       categories: (json['categories'] as List<dynamic>?) | ||||
|               ?.map((e) => SnPostCategory.fromJson(e as Map<String, dynamic>)) | ||||
|               .toList() ?? | ||||
|           const [], | ||||
|       replies: (json['replies'] as List<dynamic>?) | ||||
|           ?.map((e) => SnPost.fromJson(e as Map<String, dynamic>)) | ||||
|           .toList(), | ||||
| @@ -80,7 +83,7 @@ Map<String, dynamic> _$$SnPostImplToJson(_$SnPostImpl instance) => | ||||
|       'alias': instance.alias, | ||||
|       'alias_prefix': instance.aliasPrefix, | ||||
|       'tags': instance.tags.map((e) => e.toJson()).toList(), | ||||
|       'categories': instance.categories, | ||||
|       'categories': instance.categories.map((e) => e.toJson()).toList(), | ||||
|       'replies': instance.replies?.map((e) => e.toJson()).toList(), | ||||
|       'reply_id': instance.replyId, | ||||
|       'repost_id': instance.repostId, | ||||
| @@ -127,6 +130,31 @@ Map<String, dynamic> _$$SnPostTagImplToJson(_$SnPostTagImpl instance) => | ||||
|       'posts': instance.posts, | ||||
|     }; | ||||
|  | ||||
| _$SnPostCategoryImpl _$$SnPostCategoryImplFromJson(Map<String, dynamic> json) => | ||||
|     _$SnPostCategoryImpl( | ||||
|       id: (json['id'] as num).toInt(), | ||||
|       createdAt: DateTime.parse(json['created_at'] as String), | ||||
|       updatedAt: DateTime.parse(json['updated_at'] as String), | ||||
|       deletedAt: json['deleted_at'], | ||||
|       alias: json['alias'] as String, | ||||
|       name: json['name'] as String, | ||||
|       description: json['description'] as String, | ||||
|       posts: json['posts'], | ||||
|     ); | ||||
|  | ||||
| Map<String, dynamic> _$$SnPostCategoryImplToJson( | ||||
|         _$SnPostCategoryImpl instance) => | ||||
|     <String, dynamic>{ | ||||
|       'id': instance.id, | ||||
|       'created_at': instance.createdAt.toIso8601String(), | ||||
|       'updated_at': instance.updatedAt.toIso8601String(), | ||||
|       'deleted_at': instance.deletedAt, | ||||
|       'alias': instance.alias, | ||||
|       'name': instance.name, | ||||
|       'description': instance.description, | ||||
|       'posts': instance.posts, | ||||
|     }; | ||||
|  | ||||
| _$SnPostPreloadImpl _$$SnPostPreloadImplFromJson(Map<String, dynamic> json) => | ||||
|     _$SnPostPreloadImpl( | ||||
|       thumbnail: json['thumbnail'] == null | ||||
|   | ||||
| @@ -17,6 +17,8 @@ import 'package:responsive_framework/responsive_framework.dart'; | ||||
| import 'package:screenshot/screenshot.dart'; | ||||
| import 'package:share_plus/share_plus.dart'; | ||||
| import 'package:styled_widget/styled_widget.dart'; | ||||
| import 'package:surface/providers/config.dart'; | ||||
| import 'package:surface/providers/link_preview.dart'; | ||||
| import 'package:surface/providers/sn_network.dart'; | ||||
| import 'package:surface/providers/userinfo.dart'; | ||||
| import 'package:surface/types/post.dart'; | ||||
| @@ -83,6 +85,8 @@ class PostItem extends StatelessWidget { | ||||
|             child: MultiProvider( | ||||
|               providers: [ | ||||
|                 Provider<SnNetworkProvider>(create: (_) => context.read()), | ||||
|                 Provider<SnLinkPreviewProvider>(create: (_) => context.read()), | ||||
|                 ChangeNotifierProvider<ConfigProvider>(create: (_) => context.read()), | ||||
|               ], | ||||
|               child: ResponsiveBreakpoints.builder( | ||||
|                 breakpoints: ResponsiveBreakpoints.of(context).breakpoints, | ||||
| @@ -175,6 +179,7 @@ class PostItem extends StatelessWidget { | ||||
|                     children: [ | ||||
|                       if (data.visibility > 0) _PostVisibilityHint(data: data), | ||||
|                       _PostTruncatedHint(data: data), | ||||
|                       if (data.tags.isNotEmpty) _PostTagsList(data: data), | ||||
|                     ], | ||||
|                   ).padding(horizontal: 12), | ||||
|                   const Gap(8), | ||||
| @@ -182,7 +187,6 @@ class PostItem extends StatelessWidget { | ||||
|               ), | ||||
|             ), | ||||
|             Text('postArticle').tr().fontSize(13).opacity(0.75).padding(horizontal: 24, bottom: 8), | ||||
|             if (data.tags.isNotEmpty) _PostTagsList(data: data).padding(horizontal: 16, bottom: 6), | ||||
|             _PostBottomAction( | ||||
|               data: data, | ||||
|               showComments: showComments, | ||||
| @@ -410,7 +414,7 @@ class PostShareImageWidget extends StatelessWidget { | ||||
|                     size: Size(28, 28), | ||||
|                   ), | ||||
|                   eyeStyle: QrEyeStyle( | ||||
|                     eyeShape: QrEyeShape.square, | ||||
|                     eyeShape: QrEyeShape.circle, | ||||
|                     color: Theme.of(context).colorScheme.onSurface, | ||||
|                   ), | ||||
|                   dataModuleStyle: QrDataModuleStyle( | ||||
| @@ -962,23 +966,55 @@ class _PostTagsList extends StatelessWidget { | ||||
|  | ||||
|   @override | ||||
|   Widget build(BuildContext context) { | ||||
|     return Wrap( | ||||
|       spacing: 4, | ||||
|       runSpacing: 4, | ||||
|       children: data.tags | ||||
|           .map( | ||||
|             (ele) => InkWell( | ||||
|               child: Text( | ||||
|                 '#${ele.alias}', | ||||
|                 style: TextStyle( | ||||
|                   decoration: TextDecoration.underline, | ||||
|     return Column( | ||||
|       mainAxisSize: MainAxisSize.min, | ||||
|       crossAxisAlignment: CrossAxisAlignment.start, | ||||
|       children: [ | ||||
|         Wrap( | ||||
|           spacing: 4, | ||||
|           runSpacing: 4, | ||||
|           children: data.categories | ||||
|               .map( | ||||
|                 (ele) => InkWell( | ||||
|                   child: Row( | ||||
|                     mainAxisSize: MainAxisSize.min, | ||||
|                     children: [ | ||||
|                       const Icon(Symbols.category, size: 20), | ||||
|                       const Gap(4), | ||||
|                       Text( | ||||
|                         'postCategory${ele.alias.capitalize()}'.trExists() | ||||
|                             ? 'postCategory${ele.alias.capitalize()}'.tr() | ||||
|                             : ele.alias, | ||||
|                         style: GoogleFonts.robotoMono(), | ||||
|                       ), | ||||
|                     ], | ||||
|                   ), | ||||
|                   onTap: () {}, | ||||
|                 ), | ||||
|               ).fontSize(13), | ||||
|               onTap: () {}, | ||||
|             ), | ||||
|           ) | ||||
|           .toList(), | ||||
|     ).opacity(0.8); | ||||
|               ) | ||||
|               .toList(), | ||||
|         ).opacity(0.8), | ||||
|         Wrap( | ||||
|           spacing: 4, | ||||
|           runSpacing: 4, | ||||
|           children: data.tags | ||||
|               .map( | ||||
|                 (ele) => InkWell( | ||||
|                   child: Row( | ||||
|                     mainAxisSize: MainAxisSize.min, | ||||
|                     children: [ | ||||
|                       const Icon(Symbols.label, size: 20), | ||||
|                       const Gap(4), | ||||
|                       Text(ele.alias, style: GoogleFonts.robotoMono()), | ||||
|                     ], | ||||
|                   ), | ||||
|                   onTap: () {}, | ||||
|                 ), | ||||
|               ) | ||||
|               .toList(), | ||||
|         ).opacity(0.8), | ||||
|       ], | ||||
|     ); | ||||
|   } | ||||
| } | ||||
|  | ||||
| @@ -1019,6 +1055,7 @@ class _PostTruncatedHint extends StatelessWidget { | ||||
|     return SingleChildScrollView( | ||||
|       scrollDirection: Axis.horizontal, | ||||
|       child: Row( | ||||
|         spacing: 8, | ||||
|         children: [ | ||||
|           if (data.body['content_length'] != null) | ||||
|             Row( | ||||
| @@ -1031,7 +1068,7 @@ class _PostTruncatedHint extends StatelessWidget { | ||||
|                   ).inSeconds}s', | ||||
|                 ]), | ||||
|               ], | ||||
|             ).padding(right: 8), | ||||
|             ), | ||||
|           if (data.body['content_length'] != null) | ||||
|             Row( | ||||
|               children: [ | ||||
|   | ||||
| @@ -189,16 +189,19 @@ class PostMediaPendingList extends StatelessWidget { | ||||
|                   child: AspectRatio( | ||||
|                     aspectRatio: 1, | ||||
|                     child: switch (thumbnail!.type) { | ||||
|                       PostWriteMediaType.image => LayoutBuilder(builder: (context, constraints) { | ||||
|                           return Image( | ||||
|                             image: thumbnail!.getImageProvider( | ||||
|                               context, | ||||
|                               width: (constraints.maxWidth * devicePixelRatio).round(), | ||||
|                               height: (constraints.maxHeight * devicePixelRatio).round(), | ||||
|                             )!, | ||||
|                             fit: BoxFit.cover, | ||||
|                           ); | ||||
|                         }), | ||||
|                       PostWriteMediaType.image => Container( | ||||
|                         color: Theme.of(context).colorScheme.surfaceContainer, | ||||
|                         child: LayoutBuilder(builder: (context, constraints) { | ||||
|                             return Image( | ||||
|                               image: thumbnail!.getImageProvider( | ||||
|                                 context, | ||||
|                                 width: (constraints.maxWidth * devicePixelRatio).round(), | ||||
|                                 height: (constraints.maxHeight * devicePixelRatio).round(), | ||||
|                               )!, | ||||
|                               fit: BoxFit.contain, | ||||
|                             ); | ||||
|                           }), | ||||
|                       ), | ||||
|                       _ => Container( | ||||
|                           color: Theme.of(context).colorScheme.surface, | ||||
|                           child: const Icon(Symbols.docs).center(), | ||||
| @@ -236,18 +239,21 @@ class PostMediaPendingList extends StatelessWidget { | ||||
|                       child: AspectRatio( | ||||
|                         aspectRatio: 1, | ||||
|                         child: switch (media.type) { | ||||
|                           PostWriteMediaType.image => LayoutBuilder(builder: (context, constraints) { | ||||
|                               return Image( | ||||
|                                 image: media.getImageProvider( | ||||
|                                   context, | ||||
|                                   width: (constraints.maxWidth * devicePixelRatio).round(), | ||||
|                                   height: (constraints.maxHeight * devicePixelRatio).round(), | ||||
|                                 )!, | ||||
|                                 fit: BoxFit.cover, | ||||
|                               ); | ||||
|                             }), | ||||
|                           PostWriteMediaType.image => Container( | ||||
|                             color: Theme.of(context).colorScheme.surfaceContainer, | ||||
|                             child: LayoutBuilder(builder: (context, constraints) { | ||||
|                                 return Image( | ||||
|                                   image: media.getImageProvider( | ||||
|                                     context, | ||||
|                                     width: (constraints.maxWidth * devicePixelRatio).round(), | ||||
|                                     height: (constraints.maxHeight * devicePixelRatio).round(), | ||||
|                                   )!, | ||||
|                                   fit: BoxFit.contain, | ||||
|                                 ); | ||||
|                               }), | ||||
|                           ), | ||||
|                           _ => Container( | ||||
|                               color: Theme.of(context).colorScheme.surface, | ||||
|                               color: Theme.of(context).colorScheme.surfaceContainer, | ||||
|                               child: const Icon(Symbols.docs).center(), | ||||
|                             ), | ||||
|                         }, | ||||
|   | ||||
| @@ -83,155 +83,178 @@ class PostMetaEditor extends StatelessWidget { | ||||
|     return ListenableBuilder( | ||||
|       listenable: controller, | ||||
|       builder: (context, _) { | ||||
|         return Column( | ||||
|           children: [ | ||||
|             TextField( | ||||
|               controller: controller.titleController, | ||||
|               decoration: InputDecoration( | ||||
|                 labelText: 'fieldPostTitle'.tr(), | ||||
|                 border: UnderlineInputBorder(), | ||||
|               ), | ||||
|               onTapOutside: (_) => | ||||
|                   FocusManager.instance.primaryFocus?.unfocus(), | ||||
|             ).padding(horizontal: 24), | ||||
|             if (controller.mode == 'articles') const Gap(4), | ||||
|             if (controller.mode == 'articles') | ||||
|         return SingleChildScrollView( | ||||
|           padding: EdgeInsets.only(bottom: MediaQuery.of(context).padding.bottom + 8), | ||||
|           child: Column( | ||||
|             children: [ | ||||
|               TextField( | ||||
|                 controller: controller.descriptionController, | ||||
|                 maxLines: null, | ||||
|                 controller: controller.titleController, | ||||
|                 decoration: InputDecoration( | ||||
|                   labelText: 'fieldPostDescription'.tr(), | ||||
|                   labelText: 'fieldPostTitle'.tr(), | ||||
|                   border: UnderlineInputBorder(), | ||||
|                 ), | ||||
|                 onTapOutside: (_) => | ||||
|                     FocusManager.instance.primaryFocus?.unfocus(), | ||||
|               ).padding(horizontal: 24), | ||||
|             const Gap(4), | ||||
|             PostTagsField( | ||||
|               initialTags: controller.tags, | ||||
|               labelText: 'fieldPostTags'.tr(), | ||||
|               onUpdate: (value) { | ||||
|                 controller.setTags(value); | ||||
|               }, | ||||
|             ).padding(horizontal: 24), | ||||
|             const Gap(12), | ||||
|             ListTile( | ||||
|               contentPadding: const EdgeInsets.symmetric(horizontal: 24), | ||||
|               leading: const Icon(Symbols.visibility), | ||||
|               title: Text('postVisibility').tr(), | ||||
|               subtitle: Text('postVisibilityDescription').tr(), | ||||
|               trailing: SizedBox( | ||||
|                 width: 180, | ||||
|                 child: DropdownButtonHideUnderline( | ||||
|                   child: DropdownButton2<int>( | ||||
|                     isExpanded: true, | ||||
|                     items: kPostVisibilityLevel.entries | ||||
|                         .map( | ||||
|                           (entry) => DropdownMenuItem<int>( | ||||
|                             value: entry.key, | ||||
|                             child: Text( | ||||
|                               entry.value, | ||||
|                               style: const TextStyle(fontSize: 14), | ||||
|                             ).tr(), | ||||
|                           ), | ||||
|                         ) | ||||
|                         .toList(), | ||||
|                     value: controller.visibility, | ||||
|                     onChanged: (int? value) { | ||||
|                       if (value != null) { | ||||
|                         controller.setVisibility(value); | ||||
|                       } | ||||
|                     }, | ||||
|                     buttonStyleData: const ButtonStyleData( | ||||
|                       height: 40, | ||||
|                       padding: EdgeInsets.symmetric( | ||||
|                         horizontal: 4, | ||||
|                         vertical: 8, | ||||
|               if (controller.mode == 'articles') const Gap(4), | ||||
|               if (controller.mode == 'articles') | ||||
|                 TextField( | ||||
|                   controller: controller.descriptionController, | ||||
|                   maxLines: null, | ||||
|                   decoration: InputDecoration( | ||||
|                     labelText: 'fieldPostDescription'.tr(), | ||||
|                     border: UnderlineInputBorder(), | ||||
|                   ), | ||||
|                   onTapOutside: (_) => | ||||
|                       FocusManager.instance.primaryFocus?.unfocus(), | ||||
|                 ).padding(horizontal: 24), | ||||
|               const Gap(4), | ||||
|               PostTagsField( | ||||
|                 initialTags: controller.tags, | ||||
|                 labelText: 'fieldPostTags'.tr(), | ||||
|                 onUpdate: (value) { | ||||
|                   controller.setTags(value); | ||||
|                 }, | ||||
|               ).padding(horizontal: 24), | ||||
|               const Gap(4), | ||||
|               PostCategoriesField( | ||||
|                 initialCategories: controller.categories, | ||||
|                 labelText: 'fieldPostCategories'.tr(), | ||||
|                 onUpdate: (value) { | ||||
|                   controller.setCategories(value); | ||||
|                 }, | ||||
|               ).padding(horizontal: 24), | ||||
|               const Gap(4), | ||||
|               TextField( | ||||
|                 controller: controller.aliasController, | ||||
|                 decoration: InputDecoration( | ||||
|                   labelText: 'fieldPostAlias'.tr(), | ||||
|                   helperText: 'fieldPostAliasHint'.tr(), | ||||
|                   helperMaxLines: 2, | ||||
|                   border: UnderlineInputBorder(), | ||||
|                 ), | ||||
|                 onTapOutside: (_) => | ||||
|                     FocusManager.instance.primaryFocus?.unfocus(), | ||||
|               ).padding(horizontal: 24), | ||||
|               const Gap(12), | ||||
|               ListTile( | ||||
|                 contentPadding: const EdgeInsets.symmetric(horizontal: 24), | ||||
|                 leading: const Icon(Symbols.visibility), | ||||
|                 title: Text('postVisibility').tr(), | ||||
|                 subtitle: Text('postVisibilityDescription').tr(), | ||||
|                 trailing: SizedBox( | ||||
|                   width: 180, | ||||
|                   child: DropdownButtonHideUnderline( | ||||
|                     child: DropdownButton2<int>( | ||||
|                       isExpanded: true, | ||||
|                       items: kPostVisibilityLevel.entries | ||||
|                           .map( | ||||
|                             (entry) => DropdownMenuItem<int>( | ||||
|                               value: entry.key, | ||||
|                               child: Text( | ||||
|                                 entry.value, | ||||
|                                 style: const TextStyle(fontSize: 14), | ||||
|                               ).tr(), | ||||
|                             ), | ||||
|                           ) | ||||
|                           .toList(), | ||||
|                       value: controller.visibility, | ||||
|                       onChanged: (int? value) { | ||||
|                         if (value != null) { | ||||
|                           controller.setVisibility(value); | ||||
|                         } | ||||
|                       }, | ||||
|                       buttonStyleData: const ButtonStyleData( | ||||
|                         height: 40, | ||||
|                         padding: EdgeInsets.symmetric( | ||||
|                           horizontal: 4, | ||||
|                           vertical: 8, | ||||
|                         ), | ||||
|                       ), | ||||
|                       menuItemStyleData: const MenuItemStyleData(height: 40), | ||||
|                     ), | ||||
|                     menuItemStyleData: const MenuItemStyleData(height: 40), | ||||
|                   ), | ||||
|                 ), | ||||
|               ), | ||||
|             ), | ||||
|             if (controller.visibility == 2) | ||||
|               if (controller.visibility == 2) | ||||
|                 ListTile( | ||||
|                   contentPadding: const EdgeInsets.symmetric(horizontal: 24), | ||||
|                   leading: Icon(Symbols.person), | ||||
|                   trailing: Icon(Symbols.chevron_right), | ||||
|                   title: Text('postVisibleUsers').tr(), | ||||
|                   subtitle: Text('postSelectedUsers') | ||||
|                       .plural(controller.visibleUsers.length), | ||||
|                   onTap: () { | ||||
|                     _selectVisibleUser(context); | ||||
|                   }, | ||||
|                 ), | ||||
|               if (controller.visibility == 3) | ||||
|                 ListTile( | ||||
|                   contentPadding: const EdgeInsets.symmetric(horizontal: 24), | ||||
|                   leading: Icon(Symbols.person), | ||||
|                   trailing: Icon(Symbols.chevron_right), | ||||
|                   title: Text('postInvisibleUsers').tr(), | ||||
|                   subtitle: Text('postSelectedUsers') | ||||
|                       .plural(controller.invisibleUsers.length), | ||||
|                   onTap: () { | ||||
|                     _selectInvisibleUser(context); | ||||
|                   }, | ||||
|                 ), | ||||
|               ListTile( | ||||
|                 contentPadding: const EdgeInsets.symmetric(horizontal: 24), | ||||
|                 leading: Icon(Symbols.person), | ||||
|                 trailing: Icon(Symbols.chevron_right), | ||||
|                 title: Text('postVisibleUsers').tr(), | ||||
|                 subtitle: Text('postSelectedUsers') | ||||
|                     .plural(controller.visibleUsers.length), | ||||
|                 leading: const Icon(Symbols.event_available), | ||||
|                 title: Text('postPublishedAt').tr(), | ||||
|                 subtitle: Text( | ||||
|                   controller.publishedAt != null | ||||
|                       ? dateFormatter.format(controller.publishedAt!) | ||||
|                       : 'unset'.tr(), | ||||
|                 ), | ||||
|                 trailing: controller.publishedAt != null | ||||
|                     ? IconButton( | ||||
|                         icon: const Icon(Symbols.cancel), | ||||
|                         onPressed: () { | ||||
|                           controller.setPublishedAt(null); | ||||
|                         }, | ||||
|                       ) | ||||
|                     : null, | ||||
|                 contentPadding: const EdgeInsets.only(left: 24, right: 18), | ||||
|                 onTap: () { | ||||
|                   _selectVisibleUser(context); | ||||
|                   _selectDate( | ||||
|                     context, | ||||
|                     initialDateTime: controller.publishedAt, | ||||
|                   ).then((value) { | ||||
|                     controller.setPublishedAt(value); | ||||
|                   }); | ||||
|                 }, | ||||
|               ), | ||||
|             if (controller.visibility == 3) | ||||
|               ListTile( | ||||
|                 contentPadding: const EdgeInsets.symmetric(horizontal: 24), | ||||
|                 leading: Icon(Symbols.person), | ||||
|                 trailing: Icon(Symbols.chevron_right), | ||||
|                 title: Text('postInvisibleUsers').tr(), | ||||
|                 subtitle: Text('postSelectedUsers') | ||||
|                     .plural(controller.invisibleUsers.length), | ||||
|                 leading: const Icon(Symbols.event_busy), | ||||
|                 title: Text('postPublishedUntil').tr(), | ||||
|                 subtitle: Text( | ||||
|                   controller.publishedUntil != null | ||||
|                       ? dateFormatter.format(controller.publishedUntil!) | ||||
|                       : 'unset'.tr(), | ||||
|                 ), | ||||
|                 trailing: controller.publishedUntil != null | ||||
|                     ? IconButton( | ||||
|                         icon: const Icon(Symbols.cancel), | ||||
|                         onPressed: () { | ||||
|                           controller.setPublishedUntil(null); | ||||
|                         }, | ||||
|                       ) | ||||
|                     : null, | ||||
|                 contentPadding: const EdgeInsets.only(left: 24, right: 18), | ||||
|                 onTap: () { | ||||
|                   _selectInvisibleUser(context); | ||||
|                   _selectDate( | ||||
|                     context, | ||||
|                     initialDateTime: controller.publishedUntil, | ||||
|                   ).then((value) { | ||||
|                     controller.setPublishedUntil(value); | ||||
|                   }); | ||||
|                 }, | ||||
|               ), | ||||
|             ListTile( | ||||
|               leading: const Icon(Symbols.event_available), | ||||
|               title: Text('postPublishedAt').tr(), | ||||
|               subtitle: Text( | ||||
|                 controller.publishedAt != null | ||||
|                     ? dateFormatter.format(controller.publishedAt!) | ||||
|                     : 'unset'.tr(), | ||||
|               ), | ||||
|               trailing: controller.publishedAt != null | ||||
|                   ? IconButton( | ||||
|                       icon: const Icon(Symbols.cancel), | ||||
|                       onPressed: () { | ||||
|                         controller.setPublishedAt(null); | ||||
|                       }, | ||||
|                     ) | ||||
|                   : null, | ||||
|               contentPadding: const EdgeInsets.only(left: 24, right: 18), | ||||
|               onTap: () { | ||||
|                 _selectDate( | ||||
|                   context, | ||||
|                   initialDateTime: controller.publishedAt, | ||||
|                 ).then((value) { | ||||
|                   controller.setPublishedAt(value); | ||||
|                 }); | ||||
|               }, | ||||
|             ), | ||||
|             ListTile( | ||||
|               leading: const Icon(Symbols.event_busy), | ||||
|               title: Text('postPublishedUntil').tr(), | ||||
|               subtitle: Text( | ||||
|                 controller.publishedUntil != null | ||||
|                     ? dateFormatter.format(controller.publishedUntil!) | ||||
|                     : 'unset'.tr(), | ||||
|               ), | ||||
|               trailing: controller.publishedUntil != null | ||||
|                   ? IconButton( | ||||
|                       icon: const Icon(Symbols.cancel), | ||||
|                       onPressed: () { | ||||
|                         controller.setPublishedUntil(null); | ||||
|                       }, | ||||
|                     ) | ||||
|                   : null, | ||||
|               contentPadding: const EdgeInsets.only(left: 24, right: 18), | ||||
|               onTap: () { | ||||
|                 _selectDate( | ||||
|                   context, | ||||
|                   initialDateTime: controller.publishedUntil, | ||||
|                 ).then((value) { | ||||
|                   controller.setPublishedUntil(value); | ||||
|                 }); | ||||
|               }, | ||||
|             ), | ||||
|           ], | ||||
|         ).padding(vertical: 8); | ||||
|             ], | ||||
|           ).padding(vertical: 8), | ||||
|         ); | ||||
|       }, | ||||
|     ); | ||||
|   } | ||||
|   | ||||
| @@ -7,6 +7,7 @@ import 'package:material_symbols_icons/symbols.dart'; | ||||
| import 'package:provider/provider.dart'; | ||||
| import 'package:styled_widget/styled_widget.dart'; | ||||
| import 'package:surface/controllers/post_write_controller.dart'; | ||||
| import 'package:surface/providers/config.dart'; | ||||
| import 'package:surface/providers/sn_network.dart'; | ||||
| import 'package:surface/types/post.dart'; | ||||
| import 'package:surface/widgets/account/account_image.dart'; | ||||
| @@ -16,6 +17,7 @@ import 'package:surface/widgets/loading_indicator.dart'; | ||||
| class PostMiniEditor extends StatefulWidget { | ||||
|   final int? postReplyId; | ||||
|   final Function? onPost; | ||||
|  | ||||
|   const PostMiniEditor({super.key, this.postReplyId, this.onPost}); | ||||
|  | ||||
|   @override | ||||
| @@ -26,6 +28,7 @@ class _PostMiniEditorState extends State<PostMiniEditor> { | ||||
|   final PostWriteController _writeController = PostWriteController(); | ||||
|  | ||||
|   bool _isFetching = false; | ||||
|  | ||||
|   bool get _isLoading => _isFetching || _writeController.isLoading; | ||||
|  | ||||
|   List<SnPublisher>? _publishers; | ||||
| @@ -35,11 +38,14 @@ class _PostMiniEditorState extends State<PostMiniEditor> { | ||||
|  | ||||
|     try { | ||||
|       final sn = context.read<SnNetworkProvider>(); | ||||
|       final config = context.read<ConfigProvider>(); | ||||
|       final resp = await sn.client.get('/cgi/co/publishers/me'); | ||||
|       _publishers = List<SnPublisher>.from( | ||||
|         resp.data?.map((e) => SnPublisher.fromJson(e)) ?? [], | ||||
|       ); | ||||
|       _writeController.setPublisher(_publishers?.firstOrNull); | ||||
|       final beforeId = config.prefs.getInt('int_last_publisher_id'); | ||||
|       _writeController | ||||
|           .setPublisher(_publishers?.where((ele) => ele.id == beforeId).firstOrNull ?? _publishers?.firstOrNull); | ||||
|     } catch (err) { | ||||
|       if (!mounted) return; | ||||
|       context.showErrorDialog(err); | ||||
| @@ -93,17 +99,11 @@ class _PostMiniEditorState extends State<PostMiniEditor> { | ||||
|                                 Expanded( | ||||
|                                   child: Column( | ||||
|                                     mainAxisSize: MainAxisSize.min, | ||||
|                                     crossAxisAlignment: | ||||
|                                         CrossAxisAlignment.start, | ||||
|                                     crossAxisAlignment: CrossAxisAlignment.start, | ||||
|                                     children: [ | ||||
|                                       Text(item.nick).textStyle( | ||||
|                                           Theme.of(context) | ||||
|                                               .textTheme | ||||
|                                               .bodyMedium!), | ||||
|                                       Text(item.nick).textStyle(Theme.of(context).textTheme.bodyMedium!), | ||||
|                                       Text('@${item.name}') | ||||
|                                           .textStyle(Theme.of(context) | ||||
|                                               .textTheme | ||||
|                                               .bodySmall!) | ||||
|                                           .textStyle(Theme.of(context).textTheme.bodySmall!) | ||||
|                                           .fontSize(12), | ||||
|                                     ], | ||||
|                                   ), | ||||
| @@ -120,8 +120,7 @@ class _PostMiniEditorState extends State<PostMiniEditor> { | ||||
|                           CircleAvatar( | ||||
|                             radius: 16, | ||||
|                             backgroundColor: Colors.transparent, | ||||
|                             foregroundColor: | ||||
|                                 Theme.of(context).colorScheme.onSurface, | ||||
|                             foregroundColor: Theme.of(context).colorScheme.onSurface, | ||||
|                             child: const Icon(Symbols.add), | ||||
|                           ), | ||||
|                           const Gap(8), | ||||
| @@ -130,8 +129,7 @@ class _PostMiniEditorState extends State<PostMiniEditor> { | ||||
|                               mainAxisSize: MainAxisSize.min, | ||||
|                               crossAxisAlignment: CrossAxisAlignment.start, | ||||
|                               children: [ | ||||
|                                 Text('publishersNew').tr().textStyle( | ||||
|                                     Theme.of(context).textTheme.bodyMedium!), | ||||
|                                 Text('publishersNew').tr().textStyle(Theme.of(context).textTheme.bodyMedium!), | ||||
|                               ], | ||||
|                             ), | ||||
|                           ), | ||||
| @@ -142,9 +140,7 @@ class _PostMiniEditorState extends State<PostMiniEditor> { | ||||
|                   value: _writeController.publisher, | ||||
|                   onChanged: (SnPublisher? value) { | ||||
|                     if (value == null) { | ||||
|                       GoRouter.of(context) | ||||
|                           .pushNamed('accountPublisherNew') | ||||
|                           .then((value) { | ||||
|                       GoRouter.of(context).pushNamed('accountPublisherNew').then((value) { | ||||
|                         if (value == true) { | ||||
|                           _publishers = null; | ||||
|                           _fetchPublishers(); | ||||
| @@ -152,6 +148,8 @@ class _PostMiniEditorState extends State<PostMiniEditor> { | ||||
|                       }); | ||||
|                     } else { | ||||
|                       _writeController.setPublisher(value); | ||||
|                       final config = context.read<ConfigProvider>(); | ||||
|                       config.prefs.setInt('int_last_publisher_id', value.id); | ||||
|                     } | ||||
|                   }, | ||||
|                   buttonStyleData: const ButtonStyleData( | ||||
| @@ -178,8 +176,7 @@ class _PostMiniEditorState extends State<PostMiniEditor> { | ||||
|                     ), | ||||
|                     border: InputBorder.none, | ||||
|                   ), | ||||
|                   onTapOutside: (_) => | ||||
|                       FocusManager.instance.primaryFocus?.unfocus(), | ||||
|                   onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(), | ||||
|                 ), | ||||
|               ), | ||||
|               const Gap(8), | ||||
| @@ -188,8 +185,7 @@ class _PostMiniEditorState extends State<PostMiniEditor> { | ||||
|                 TweenAnimationBuilder<double>( | ||||
|                   tween: Tween(begin: 0, end: _writeController.progress), | ||||
|                   duration: Duration(milliseconds: 300), | ||||
|                   builder: (context, value, _) => | ||||
|                       LinearProgressIndicator(value: value, minHeight: 2), | ||||
|                   builder: (context, value, _) => LinearProgressIndicator(value: value, minHeight: 2), | ||||
|                 ) | ||||
|               else if (_writeController.isBusy) | ||||
|                 const LinearProgressIndicator(value: null, minHeight: 2), | ||||
| @@ -206,18 +202,16 @@ class _PostMiniEditorState extends State<PostMiniEditor> { | ||||
|                         'postEditor', | ||||
|                         pathParameters: {'mode': 'stories'}, | ||||
|                         queryParameters: { | ||||
|                           if (widget.postReplyId != null) | ||||
|                             'replying': widget.postReplyId.toString(), | ||||
|                           if (widget.postReplyId != null) 'replying': widget.postReplyId.toString(), | ||||
|                         }, | ||||
|                       ); | ||||
|                     }, | ||||
|                   ), | ||||
|                   TextButton.icon( | ||||
|                     onPressed: (_writeController.isBusy || | ||||
|                             _writeController.publisher == null) | ||||
|                     onPressed: (_writeController.isBusy || _writeController.publisher == null) | ||||
|                         ? null | ||||
|                         : () { | ||||
|                             _writeController.post(context).then((_) { | ||||
|                             _writeController.sendPost(context).then((_) { | ||||
|                               if (!context.mounted) return; | ||||
|                               if (widget.onPost != null) widget.onPost!(); | ||||
|                               context.showSnackbar('postPosted'.tr()); | ||||
|   | ||||
| @@ -1,9 +1,11 @@ | ||||
| import 'dart:async'; | ||||
|  | ||||
| import 'package:easy_localization/easy_localization.dart'; | ||||
| import 'package:flutter/material.dart'; | ||||
| import 'package:gap/gap.dart'; | ||||
| import 'package:provider/provider.dart'; | ||||
| import 'package:surface/providers/sn_network.dart'; | ||||
| import 'package:surface/widgets/dialog.dart'; | ||||
|  | ||||
| class PostTagsField extends StatefulWidget { | ||||
|   final List<String>? initialTags; | ||||
| @@ -21,9 +23,9 @@ class PostTagsField extends StatefulWidget { | ||||
|   State<PostTagsField> createState() => _PostTagsFieldState(); | ||||
| } | ||||
|  | ||||
| class _PostTagsFieldState extends State<PostTagsField> { | ||||
|   static const List<String> kTagsDividers = [' ', ',']; | ||||
| const List<String> kTagsDividers = [' ', ',']; | ||||
|  | ||||
| class _PostTagsFieldState extends State<PostTagsField> { | ||||
|   late final _Debounceable<List<String>?, String> _debouncedSearch; | ||||
|  | ||||
|   final List<String> _currentTags = List.empty(growable: true); | ||||
| @@ -100,8 +102,7 @@ class _PostTagsFieldState extends State<PostTagsField> { | ||||
|                             color: Theme.of(context).colorScheme.primary, | ||||
|                           ), | ||||
|                           margin: const EdgeInsets.only(right: 8), | ||||
|                           padding: const EdgeInsets.symmetric( | ||||
|                               horizontal: 10.0, vertical: 4.0), | ||||
|                           padding: const EdgeInsets.symmetric(horizontal: 10.0, vertical: 4.0), | ||||
|                           child: Row( | ||||
|                             mainAxisAlignment: MainAxisAlignment.spaceBetween, | ||||
|                             children: [ | ||||
| @@ -155,6 +156,155 @@ class _PostTagsFieldState extends State<PostTagsField> { | ||||
|   } | ||||
| } | ||||
|  | ||||
| class PostCategoriesField extends StatefulWidget { | ||||
|   final List<String>? initialCategories; | ||||
|   final String labelText; | ||||
|   final Function(List<String>) onUpdate; | ||||
|  | ||||
|   const PostCategoriesField({ | ||||
|     super.key, | ||||
|     this.initialCategories, | ||||
|     required this.labelText, | ||||
|     required this.onUpdate, | ||||
|   }); | ||||
|  | ||||
|   @override | ||||
|   State<PostCategoriesField> createState() => _PostCategoriesFieldState(); | ||||
| } | ||||
|  | ||||
| class _PostCategoriesFieldState extends State<PostCategoriesField> { | ||||
|   late final _Debounceable<List<String>?, String> _debouncedSearch; | ||||
|  | ||||
|   final List<String> _currentCategories = List.empty(growable: true); | ||||
|  | ||||
|   String? _currentSearchProbe; | ||||
|   List<String> _lastAutocompleteResult = List.empty(); | ||||
|   TextEditingController? _textEditingController; | ||||
|  | ||||
|   Future<List<String>?> _searchCategories(String probe) async { | ||||
|     _currentSearchProbe = probe; | ||||
|  | ||||
|     final sn = context.read<SnNetworkProvider>(); | ||||
|     final resp = await sn.client.get( | ||||
|       '/cgi/co/categories?take=10&probe=$_currentSearchProbe', | ||||
|     ); | ||||
|  | ||||
|     if (_currentSearchProbe != probe) { | ||||
|       return null; | ||||
|     } | ||||
|     _currentSearchProbe = null; | ||||
|  | ||||
|     return resp.data.map((x) => x['alias']).toList().cast<String>(); | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   void initState() { | ||||
|     super.initState(); | ||||
|     _debouncedSearch = _debounce<List<String>?, String>(_searchCategories); | ||||
|     if (widget.initialCategories != null) { | ||||
|       _currentCategories.addAll(widget.initialCategories!); | ||||
|     } | ||||
|   } | ||||
|  | ||||
|   @override | ||||
|   Widget build(BuildContext context) { | ||||
|     return Autocomplete<String>( | ||||
|       optionsBuilder: (TextEditingValue textEditingValue) async { | ||||
|         final result = await _debouncedSearch(textEditingValue.text); | ||||
|         if (result == null) { | ||||
|           return _lastAutocompleteResult; | ||||
|         } | ||||
|         _lastAutocompleteResult = result; | ||||
|         return result; | ||||
|       }, | ||||
|       onSelected: (String value) { | ||||
|         if (value.isEmpty) return; | ||||
|         if (!_currentCategories.contains(value)) { | ||||
|           setState(() => _currentCategories.add(value)); | ||||
|         } | ||||
|         _textEditingController?.clear(); | ||||
|         widget.onUpdate(_currentCategories); | ||||
|       }, | ||||
|       fieldViewBuilder: (context, controller, focusNode, onSubmitted) { | ||||
|         _textEditingController = controller; | ||||
|         return TextField( | ||||
|           controller: controller, | ||||
|           focusNode: focusNode, | ||||
|           decoration: InputDecoration( | ||||
|             label: Text(widget.labelText), | ||||
|             border: const UnderlineInputBorder(), | ||||
|             prefixIconConstraints: BoxConstraints( | ||||
|               maxWidth: MediaQuery.of(context).size.width * 0.75, | ||||
|             ), | ||||
|             prefixIcon: _currentCategories.isNotEmpty | ||||
|                 ? SingleChildScrollView( | ||||
|                     scrollDirection: Axis.horizontal, | ||||
|                     child: Row( | ||||
|                       children: _currentCategories.map((String category) { | ||||
|                         return Container( | ||||
|                           decoration: BoxDecoration( | ||||
|                             borderRadius: const BorderRadius.all( | ||||
|                               Radius.circular(20.0), | ||||
|                             ), | ||||
|                             color: Theme.of(context).colorScheme.primary, | ||||
|                           ), | ||||
|                           margin: const EdgeInsets.only(right: 8), | ||||
|                           padding: const EdgeInsets.symmetric(horizontal: 10.0, vertical: 4.0), | ||||
|                           child: Row( | ||||
|                             mainAxisAlignment: MainAxisAlignment.spaceBetween, | ||||
|                             children: [ | ||||
|                               InkWell( | ||||
|                                 child: Text( | ||||
|                                   'postCategory${category.capitalize()}'.trExists() | ||||
|                                       ? 'postCategory${category.capitalize()}'.tr() | ||||
|                                       : '#$category', | ||||
|                                   style: const TextStyle(color: Colors.white), | ||||
|                                 ), | ||||
|                               ), | ||||
|                               const Gap(4), | ||||
|                               InkWell( | ||||
|                                 child: const Icon( | ||||
|                                   Icons.cancel, | ||||
|                                   size: 14.0, | ||||
|                                   color: Color.fromARGB(255, 233, 233, 233), | ||||
|                                 ), | ||||
|                                 onTap: () { | ||||
|                                   setState(() => _currentCategories.remove(category)); | ||||
|                                   widget.onUpdate(_currentCategories); | ||||
|                                 }, | ||||
|                               ) | ||||
|                             ], | ||||
|                           ), | ||||
|                         ); | ||||
|                       }).toList(), | ||||
|                     ), | ||||
|                   ) | ||||
|                 : null, | ||||
|           ), | ||||
|           onTapOutside: (_) => FocusManager.instance.primaryFocus?.unfocus(), | ||||
|           onChanged: (value) { | ||||
|             for (final divider in kTagsDividers) { | ||||
|               if (value.endsWith(divider)) { | ||||
|                 final tagValue = value.substring(0, value.length - 1); | ||||
|                 if (tagValue.isEmpty) return; | ||||
|                 if (!_currentCategories.contains(tagValue)) { | ||||
|                   setState(() => _currentCategories.add(tagValue)); | ||||
|                 } | ||||
|                 controller.clear(); | ||||
|                 widget.onUpdate(_currentCategories); | ||||
|                 break; | ||||
|               } | ||||
|             } | ||||
|           }, | ||||
|           onSubmitted: (_) { | ||||
|             onSubmitted(); | ||||
|           }, | ||||
|         ); | ||||
|       }, | ||||
|     ); | ||||
|   } | ||||
| } | ||||
|  | ||||
| typedef _Debounceable<S, T> = Future<S?> Function(T parameter); | ||||
|  | ||||
| _Debounceable<S, T> _debounce<S, T>(_Debounceable<S?, T> function) { | ||||
|   | ||||
| @@ -132,6 +132,8 @@ PODS: | ||||
|   - GoogleUtilities/UserDefaults (8.0.2): | ||||
|     - GoogleUtilities/Logger | ||||
|     - GoogleUtilities/Privacy | ||||
|   - in_app_review (2.0.0): | ||||
|     - FlutterMacOS | ||||
|   - livekit_client (2.3.2): | ||||
|     - flutter_webrtc | ||||
|     - FlutterMacOS | ||||
| @@ -186,6 +188,7 @@ DEPENDENCIES: | ||||
|   - flutter_webrtc (from `Flutter/ephemeral/.symlinks/plugins/flutter_webrtc/macos`) | ||||
|   - FlutterMacOS (from `Flutter/ephemeral`) | ||||
|   - gal (from `Flutter/ephemeral/.symlinks/plugins/gal/darwin`) | ||||
|   - in_app_review (from `Flutter/ephemeral/.symlinks/plugins/in_app_review/macos`) | ||||
|   - livekit_client (from `Flutter/ephemeral/.symlinks/plugins/livekit_client/macos`) | ||||
|   - media_kit_libs_macos_video (from `Flutter/ephemeral/.symlinks/plugins/media_kit_libs_macos_video/macos`) | ||||
|   - media_kit_native_event_loop (from `Flutter/ephemeral/.symlinks/plugins/media_kit_native_event_loop/macos`) | ||||
| @@ -243,6 +246,8 @@ EXTERNAL SOURCES: | ||||
|     :path: Flutter/ephemeral | ||||
|   gal: | ||||
|     :path: Flutter/ephemeral/.symlinks/plugins/gal/darwin | ||||
|   in_app_review: | ||||
|     :path: Flutter/ephemeral/.symlinks/plugins/in_app_review/macos | ||||
|   livekit_client: | ||||
|     :path: Flutter/ephemeral/.symlinks/plugins/livekit_client/macos | ||||
|   media_kit_libs_macos_video: | ||||
| @@ -286,13 +291,14 @@ SPEC CHECKSUMS: | ||||
|   FirebaseCoreInternal: d98ab91e2d80a56d7b246856a8885443b302c0c2 | ||||
|   FirebaseInstallations: 6ef4a1c7eb2a61ee1f74727d7f6ce2e72acf1414 | ||||
|   FirebaseMessaging: f8a160d99c2c2e5babbbcc90c4a3e15db036aee2 | ||||
|   flutter_udid: 6b2b89780c3dfeecf0047bdf93f622d6416b1c07 | ||||
|   flutter_udid: 2e7b3da4b5fdfba86a396b97898f5fe8f4ec1a52 | ||||
|   flutter_webrtc: 53c9e1285ab32dfb58afb1e1471416a877e23d7a | ||||
|   FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24 | ||||
|   gal: 6a522c75909f1244732d4596d11d6a2f86ff37a5 | ||||
|   GoogleAppMeasurement: 987769c4ca6b968f2479fbcc9fe3ce34af454b8e | ||||
|   GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7 | ||||
|   GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d | ||||
|   in_app_review: a6a031b9acd03c7d103e341aa334adf2c493fb93 | ||||
|   livekit_client: 9fdcb22df3de55e6d4b24bdc3b5eb1c0269d774a | ||||
|   media_kit_libs_macos_video: b3e2bbec2eef97c285f2b1baa7963c67c753fb82 | ||||
|   media_kit_native_event_loop: 81fd5b45192b72f8b5b69eaf5b540f45777eb8d5 | ||||
|   | ||||
| @@ -643,6 +643,14 @@ packages: | ||||
|       url: "https://pub.dev" | ||||
|     source: hosted | ||||
|     version: "3.4.1" | ||||
|   flutter_colorpicker: | ||||
|     dependency: "direct main" | ||||
|     description: | ||||
|       name: flutter_colorpicker | ||||
|       sha256: "969de5f6f9e2a570ac660fb7b501551451ea2a1ab9e2097e89475f60e07816ea" | ||||
|       url: "https://pub.dev" | ||||
|     source: hosted | ||||
|     version: "1.1.0" | ||||
|   flutter_context_menu: | ||||
|     dependency: "direct main" | ||||
|     description: | ||||
|   | ||||
| @@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev | ||||
| # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html | ||||
| # In Windows, build-name is used as the major, minor, and patch parts | ||||
| # of the product and file versions while build-number is used as the build suffix. | ||||
| version: 2.1.1+35 | ||||
| version: 2.1.1+37 | ||||
|  | ||||
| environment: | ||||
|   sdk: ^3.5.4 | ||||
| @@ -111,6 +111,7 @@ dependencies: | ||||
|   flutter_app_update: ^3.2.2 | ||||
|   in_app_review: ^2.0.10 | ||||
|   version: ^3.0.2 | ||||
|   flutter_colorpicker: ^1.1.0 | ||||
|  | ||||
| dev_dependencies: | ||||
|   flutter_test: | ||||
|   | ||||