Compare commits
129 Commits
e91b4b0947
...
1.2.1+9
| Author | SHA1 | Date | |
|---|---|---|---|
| 8ec33ccbf4 | |||
| d267316a35 | |||
| 138da60e55 | |||
| 4562c2f991 | |||
| 8009f4ca9b | |||
| 54dee9702b | |||
| 94385564bd | |||
| 0b2309816f | |||
| 8283272a3b | |||
| eb02a47e9a | |||
| 7c0c1ec94f | |||
| 272044a77e | |||
| 39c22b1cf6 | |||
| 98c3bb912d | |||
| 035b92d9b8 | |||
| 0bfc0bd61b | |||
| de00a20eee | |||
| 73982f48d6 | |||
| 1d36b30361 | |||
| dea743a307 | |||
| c48bd3e758 | |||
| 56bbf73b5e | |||
| 4f6c5aa053 | |||
| d8e79fb4f9 | |||
| 06e0fa465b | |||
| 895a257f50 | |||
| d9804ba00b | |||
| 62ff1c2f1c | |||
| a157596a2e | |||
| 12102bf527 | |||
| c00a018380 | |||
| 53b3cac4ca | |||
| 19eabfaba1 | |||
| ec2eadad6d | |||
| 54e176e75d | |||
| 0a7ccaeefa | |||
| a5f093e185 | |||
| a4f68dd175 | |||
| 8067c35c70 | |||
| ebe381053e | |||
| 03f2470dae | |||
| ea434815cf | |||
| bbea4b4359 | |||
| e0b485cc81 | |||
| 87bb37ac01 | |||
| 989b5babd9 | |||
| 9ea364640d | |||
| a9f55a489d | |||
| 4616f3a3e2 | |||
| 425bae9d13 | |||
| 07771e8979 | |||
| 0ad4854443 | |||
| 4238ea6fdc | |||
| 7d45c06302 | |||
| 7e8993fbd2 | |||
| c88fcc84da | |||
| 11fb79623e | |||
| 98cc313a91 | |||
| bc3401a897 | |||
| 5b6a5d9046 | |||
| 6cbd78e836 | |||
| aefcbad02f | |||
| 70617be687 | |||
| cccb3d5c16 | |||
| a0a3a8d182 | |||
| c6b2ef8459 | |||
| 34a2fe3988 | |||
| 0a5604d0ff | |||
| 5e754ad233 | |||
| 5b9c92e4d3 | |||
| b2a6ca7244 | |||
| 27c60fc8cb | |||
| 8b3c45ab29 | |||
| adb415700a | |||
| 1e4b44a78b | |||
| 9765b200b9 | |||
| 47d03ce1e5 | |||
| c41a71388d | |||
| 7655dfdf37 | |||
| 190bb34958 | |||
| d02ed68afa | |||
| 2bc4513bb6 | |||
| f10393f6d0 | |||
| ecef8dab0c | |||
| 52e58fce3d | |||
| 31d50bfb1f | |||
| ca8ad12d93 | |||
| f799900450 | |||
| dfdf7b23c8 | |||
| 771b2029b0 | |||
| cc9c99f375 | |||
| b70d3795d1 | |||
| a16ff1b9a1 | |||
| 19751617cb | |||
| bb77b74356 | |||
| fc77c8693f | |||
| 58bb549217 | |||
| 6590062dcb | |||
| 6ace977bf6 | |||
| 387f0d14ac | |||
| 18bb0d3db2 | |||
| 8ab3ca5633 | |||
| 3db6850d89 | |||
| 3ca98fa58c | |||
| 425c79d6fc | |||
| 7e98edfbc9 | |||
| 056b98db07 | |||
| 7bfbd37b76 | |||
| 7800a70ef2 | |||
| 74b6ccd5c7 | |||
| 6ca4aad1c4 | |||
| 102df2ef1c | |||
| f08c9903b4 | |||
| 0d279842cf | |||
| 33d69908a6 | |||
| 4552dfd3f3 | |||
| ae87e9ad31 | |||
| 277ba69513 | |||
| 6e3d0f9787 | |||
| 0237409d27 | |||
| a5b6ace79b | |||
| 42c3e5ff0a | |||
| 7dc198f0a7 | |||
| fa3ba0e188 | |||
| 02c28533db | |||
| 6d92a16a62 | |||
| ef58430060 | |||
| 8366bda846 | |||
| 39c8597428 |
23
.github/workflows/nightly.yml
vendored
@@ -16,33 +16,12 @@ jobs:
|
|||||||
channel: stable
|
channel: stable
|
||||||
cache: true
|
cache: true
|
||||||
- run: flutter pub get
|
- run: flutter pub get
|
||||||
- run: flutter build web
|
- run: flutter build web --release --base-href=/
|
||||||
- name: Archive production artifacts
|
- name: Archive production artifacts
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: build-output-web
|
name: build-output-web
|
||||||
path: build/web
|
path: build/web
|
||||||
build-apk:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Clone repository
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
- name: Set up Flutter
|
|
||||||
uses: subosito/flutter-action@v2
|
|
||||||
with:
|
|
||||||
channel: stable
|
|
||||||
cache: true
|
|
||||||
- uses: actions/setup-java@v4
|
|
||||||
with:
|
|
||||||
distribution: "zulu"
|
|
||||||
java-version: "17"
|
|
||||||
- run: flutter pub get
|
|
||||||
- run: flutter build apk --split-per-abi
|
|
||||||
- name: Archive production artifacts
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: build-output-android
|
|
||||||
path: build/app/outputs/flutter-apk/*.apk
|
|
||||||
build-exe:
|
build-exe:
|
||||||
runs-on: windows-latest
|
runs-on: windows-latest
|
||||||
steps:
|
steps:
|
||||||
|
|||||||
@@ -7,6 +7,9 @@
|
|||||||
|
|
||||||
# The following line activates a set of recommended lints for Flutter apps,
|
# The following line activates a set of recommended lints for Flutter apps,
|
||||||
# packages, and plugins designed to encourage good coding practices.
|
# packages, and plugins designed to encourage good coding practices.
|
||||||
|
analyzer:
|
||||||
|
errors:
|
||||||
|
use_build_context_synchronously: ignore
|
||||||
include: package:flutter_lints/flutter.yaml
|
include: package:flutter_lints/flutter.yaml
|
||||||
|
|
||||||
linter:
|
linter:
|
||||||
|
|||||||
@@ -23,11 +23,26 @@ if (flutterVersionName == null) {
|
|||||||
flutterVersionName = "1.0"
|
flutterVersionName = "1.0"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
def keystoreProperties = new Properties()
|
||||||
|
def keystorePropertiesFile = rootProject.file('key.properties')
|
||||||
|
if (keystorePropertiesFile.exists()) {
|
||||||
|
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
|
||||||
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
namespace = "dev.solsynth.solian"
|
namespace = "dev.solsynth.solian"
|
||||||
compileSdk = flutter.compileSdkVersion
|
compileSdk = flutter.compileSdkVersion
|
||||||
ndkVersion = "26.1.10909125"
|
ndkVersion = "26.1.10909125"
|
||||||
|
|
||||||
|
signingConfigs {
|
||||||
|
release {
|
||||||
|
keyAlias keystoreProperties['keyAlias']
|
||||||
|
keyPassword keystoreProperties['keyPassword']
|
||||||
|
storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
|
||||||
|
storePassword keystoreProperties['storePassword']
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
compileOptions {
|
compileOptions {
|
||||||
coreLibraryDesugaringEnabled true
|
coreLibraryDesugaringEnabled true
|
||||||
sourceCompatibility JavaVersion.VERSION_17
|
sourceCompatibility JavaVersion.VERSION_17
|
||||||
@@ -45,7 +60,8 @@ android {
|
|||||||
|
|
||||||
buildTypes {
|
buildTypes {
|
||||||
release {
|
release {
|
||||||
signingConfig = signingConfigs.debug
|
// signingConfig = signingConfigs.debug
|
||||||
|
signingConfig = signingConfigs.release
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,7 +21,7 @@
|
|||||||
<application
|
<application
|
||||||
android:label="Solian"
|
android:label="Solian"
|
||||||
android:name="${applicationName}"
|
android:name="${applicationName}"
|
||||||
android:icon="@mipmap/launcher_icon"
|
android:icon="@mipmap/ic_launcher"
|
||||||
android:supportsRtl="true">
|
android:supportsRtl="true">
|
||||||
<receiver android:exported="false"
|
<receiver android:exported="false"
|
||||||
android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationReceiver"/>
|
android:name="com.dexterous.flutterlocalnotifications.ScheduledNotificationReceiver"/>
|
||||||
@@ -54,7 +54,9 @@
|
|||||||
<action android:name="android.intent.action.VIEW" />
|
<action android:name="android.intent.action.VIEW" />
|
||||||
<category android:name="android.intent.category.DEFAULT" />
|
<category android:name="android.intent.category.DEFAULT" />
|
||||||
<category android:name="android.intent.category.BROWSABLE" />
|
<category android:name="android.intent.category.BROWSABLE" />
|
||||||
<data android:scheme="http" android:host="solsynth.dev" />
|
<data android:host="solsynth.dev" />
|
||||||
|
<data android:host="sn.solsynth.dev" />
|
||||||
|
<data android:scheme="https" />
|
||||||
<data android:scheme="https" />
|
<data android:scheme="https" />
|
||||||
<data android:scheme="solink" />
|
<data android:scheme="solink" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
@@ -68,6 +70,12 @@
|
|||||||
<category android:name="android.intent.category.LAUNCHER"/>
|
<category android:name="android.intent.category.LAUNCHER"/>
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
</activity>
|
</activity>
|
||||||
|
|
||||||
|
<activity
|
||||||
|
android:name="com.yalantis.ucrop.UCropActivity"
|
||||||
|
android:screenOrientation="portrait"
|
||||||
|
android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
|
||||||
|
|
||||||
<!-- Don't delete the meta-data below.
|
<!-- Don't delete the meta-data below.
|
||||||
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
|
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
|
||||||
<meta-data
|
<meta-data
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 544 B After Width: | Height: | Size: 5.7 KiB |
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.7 KiB |
|
Before Width: | Height: | Size: 442 B After Width: | Height: | Size: 3.1 KiB |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 721 B After Width: | Height: | Size: 8.7 KiB |
|
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.7 KiB |
|
Before Width: | Height: | Size: 1.0 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 5.0 KiB After Width: | Height: | Size: 5.6 KiB |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 24 KiB |
|
Before Width: | Height: | Size: 6.8 KiB After Width: | Height: | Size: 7.7 KiB |
BIN
assets/fonts/Comfortaa-Bold.ttf
Executable file
BIN
assets/fonts/Comfortaa-Regular.ttf
Executable file
BIN
assets/fonts/NotoColorEmoji-Regular.ttf
Executable file
BIN
assets/fonts/NotoSansHK-Bold.ttf
Executable file
BIN
assets/fonts/NotoSansHK-Regular.ttf
Executable file
BIN
assets/fonts/NotoSansJP-Bold.ttf
Executable file
BIN
assets/fonts/NotoSansJP-Regular.ttf
Executable file
BIN
assets/fonts/NotoSansSC-Bold.ttf
Executable file
BIN
assets/fonts/NotoSansSC-Regular.ttf
Executable file
|
Before Width: | Height: | Size: 537 KiB |
BIN
assets/icon-w-shadow.png
Normal file
|
After Width: | Height: | Size: 406 KiB |
BIN
assets/icon.png
|
Before Width: | Height: | Size: 53 KiB After Width: | Height: | Size: 360 KiB |
BIN
assets/logo.png
|
Before Width: | Height: | Size: 61 KiB After Width: | Height: | Size: 360 KiB |
@@ -1,3 +1,4 @@
|
|||||||
description: This file stores settings for Dart & Flutter DevTools.
|
description: This file stores settings for Dart & Flutter DevTools.
|
||||||
documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
|
documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
|
||||||
extensions:
|
extensions:
|
||||||
|
- provider: true
|
||||||
@@ -38,19 +38,19 @@ PODS:
|
|||||||
- file_picker (0.0.1):
|
- file_picker (0.0.1):
|
||||||
- DKImagePickerController/PhotoGallery
|
- DKImagePickerController/PhotoGallery
|
||||||
- Flutter
|
- Flutter
|
||||||
- Firebase/CoreOnly (10.28.0):
|
- Firebase/CoreOnly (10.29.0):
|
||||||
- FirebaseCore (= 10.28.0)
|
- FirebaseCore (= 10.29.0)
|
||||||
- Firebase/Messaging (10.28.0):
|
- Firebase/Messaging (10.29.0):
|
||||||
- Firebase/CoreOnly
|
- Firebase/CoreOnly
|
||||||
- FirebaseMessaging (~> 10.28.0)
|
- FirebaseMessaging (~> 10.29.0)
|
||||||
- firebase_core (3.2.0):
|
- firebase_core (3.3.0):
|
||||||
- Firebase/CoreOnly (= 10.28.0)
|
- Firebase/CoreOnly (= 10.29.0)
|
||||||
- Flutter
|
- Flutter
|
||||||
- firebase_messaging (15.0.3):
|
- firebase_messaging (15.0.4):
|
||||||
- Firebase/Messaging (= 10.28.0)
|
- Firebase/Messaging (= 10.29.0)
|
||||||
- firebase_core
|
- firebase_core
|
||||||
- Flutter
|
- Flutter
|
||||||
- FirebaseCore (10.28.0):
|
- FirebaseCore (10.29.0):
|
||||||
- FirebaseCoreInternal (~> 10.0)
|
- FirebaseCoreInternal (~> 10.0)
|
||||||
- GoogleUtilities/Environment (~> 7.12)
|
- GoogleUtilities/Environment (~> 7.12)
|
||||||
- GoogleUtilities/Logger (~> 7.12)
|
- GoogleUtilities/Logger (~> 7.12)
|
||||||
@@ -61,7 +61,7 @@ PODS:
|
|||||||
- GoogleUtilities/Environment (~> 7.8)
|
- GoogleUtilities/Environment (~> 7.8)
|
||||||
- GoogleUtilities/UserDefaults (~> 7.8)
|
- GoogleUtilities/UserDefaults (~> 7.8)
|
||||||
- PromisesObjC (~> 2.1)
|
- PromisesObjC (~> 2.1)
|
||||||
- FirebaseMessaging (10.28.0):
|
- FirebaseMessaging (10.29.0):
|
||||||
- FirebaseCore (~> 10.0)
|
- FirebaseCore (~> 10.0)
|
||||||
- FirebaseInstallations (~> 10.0)
|
- FirebaseInstallations (~> 10.0)
|
||||||
- GoogleDataTransport (~> 9.3)
|
- GoogleDataTransport (~> 9.3)
|
||||||
@@ -71,11 +71,16 @@ PODS:
|
|||||||
- GoogleUtilities/UserDefaults (~> 7.8)
|
- GoogleUtilities/UserDefaults (~> 7.8)
|
||||||
- nanopb (< 2.30911.0, >= 2.30908.0)
|
- nanopb (< 2.30911.0, >= 2.30908.0)
|
||||||
- Flutter (1.0.0)
|
- Flutter (1.0.0)
|
||||||
|
- flutter_keyboard_visibility (0.0.1):
|
||||||
|
- Flutter
|
||||||
- flutter_secure_storage (6.0.0):
|
- flutter_secure_storage (6.0.0):
|
||||||
- Flutter
|
- Flutter
|
||||||
- flutter_webrtc (0.11.3):
|
- flutter_webrtc (0.11.3):
|
||||||
- Flutter
|
- Flutter
|
||||||
- WebRTC-SDK (= 125.6422.04)
|
- WebRTC-SDK (= 125.6422.04)
|
||||||
|
- gal (1.0.0):
|
||||||
|
- Flutter
|
||||||
|
- FlutterMacOS
|
||||||
- GoogleDataTransport (9.4.1):
|
- GoogleDataTransport (9.4.1):
|
||||||
- GoogleUtilities/Environment (~> 7.7)
|
- GoogleUtilities/Environment (~> 7.7)
|
||||||
- nanopb (< 2.30911.0, >= 2.30908.0)
|
- nanopb (< 2.30911.0, >= 2.30908.0)
|
||||||
@@ -105,9 +110,12 @@ PODS:
|
|||||||
- GoogleUtilities/UserDefaults (7.13.3):
|
- GoogleUtilities/UserDefaults (7.13.3):
|
||||||
- GoogleUtilities/Logger
|
- GoogleUtilities/Logger
|
||||||
- GoogleUtilities/Privacy
|
- GoogleUtilities/Privacy
|
||||||
|
- image_cropper (0.0.4):
|
||||||
|
- Flutter
|
||||||
|
- TOCropViewController (~> 2.7.4)
|
||||||
- image_picker_ios (0.0.1):
|
- image_picker_ios (0.0.1):
|
||||||
- Flutter
|
- Flutter
|
||||||
- livekit_client (2.2.1):
|
- livekit_client (2.2.3):
|
||||||
- Flutter
|
- Flutter
|
||||||
- WebRTC-SDK (= 125.6422.04)
|
- WebRTC-SDK (= 125.6422.04)
|
||||||
- media_kit_libs_ios_video (1.0.4):
|
- media_kit_libs_ios_video (1.0.4):
|
||||||
@@ -130,6 +138,8 @@ PODS:
|
|||||||
- FlutterMacOS
|
- FlutterMacOS
|
||||||
- permission_handler_apple (9.3.0):
|
- permission_handler_apple (9.3.0):
|
||||||
- Flutter
|
- Flutter
|
||||||
|
- pointer_interceptor_ios (0.0.1):
|
||||||
|
- Flutter
|
||||||
- PromisesObjC (2.4.0)
|
- PromisesObjC (2.4.0)
|
||||||
- protocol_handler_ios (0.0.1):
|
- protocol_handler_ios (0.0.1):
|
||||||
- Flutter
|
- Flutter
|
||||||
@@ -138,15 +148,21 @@ PODS:
|
|||||||
- SDWebImage (5.19.4):
|
- SDWebImage (5.19.4):
|
||||||
- SDWebImage/Core (= 5.19.4)
|
- SDWebImage/Core (= 5.19.4)
|
||||||
- SDWebImage/Core (5.19.4)
|
- SDWebImage/Core (5.19.4)
|
||||||
- Sentry/HybridSDK (8.30.1)
|
- Sentry/HybridSDK (8.32.0)
|
||||||
- sentry_flutter (8.4.0):
|
- sentry_flutter (8.6.0):
|
||||||
|
- Flutter
|
||||||
|
- FlutterMacOS
|
||||||
|
- Sentry/HybridSDK (= 8.32.0)
|
||||||
|
- share_plus (0.0.1):
|
||||||
|
- Flutter
|
||||||
|
- shared_preferences_foundation (0.0.1):
|
||||||
- Flutter
|
- Flutter
|
||||||
- FlutterMacOS
|
- FlutterMacOS
|
||||||
- Sentry/HybridSDK (= 8.30.1)
|
|
||||||
- sqflite (0.0.3):
|
- sqflite (0.0.3):
|
||||||
- Flutter
|
- Flutter
|
||||||
- FlutterMacOS
|
- FlutterMacOS
|
||||||
- SwiftyGif (5.4.5)
|
- SwiftyGif (5.4.5)
|
||||||
|
- TOCropViewController (2.7.4)
|
||||||
- url_launcher_ios (0.0.1):
|
- url_launcher_ios (0.0.1):
|
||||||
- Flutter
|
- Flutter
|
||||||
- volume_controller (0.0.1):
|
- volume_controller (0.0.1):
|
||||||
@@ -162,8 +178,11 @@ DEPENDENCIES:
|
|||||||
- firebase_core (from `.symlinks/plugins/firebase_core/ios`)
|
- firebase_core (from `.symlinks/plugins/firebase_core/ios`)
|
||||||
- firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`)
|
- firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`)
|
||||||
- Flutter (from `Flutter`)
|
- Flutter (from `Flutter`)
|
||||||
|
- flutter_keyboard_visibility (from `.symlinks/plugins/flutter_keyboard_visibility/ios`)
|
||||||
- flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
|
- flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
|
||||||
- flutter_webrtc (from `.symlinks/plugins/flutter_webrtc/ios`)
|
- flutter_webrtc (from `.symlinks/plugins/flutter_webrtc/ios`)
|
||||||
|
- gal (from `.symlinks/plugins/gal/darwin`)
|
||||||
|
- image_cropper (from `.symlinks/plugins/image_cropper/ios`)
|
||||||
- image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
|
- image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
|
||||||
- livekit_client (from `.symlinks/plugins/livekit_client/ios`)
|
- livekit_client (from `.symlinks/plugins/livekit_client/ios`)
|
||||||
- media_kit_libs_ios_video (from `.symlinks/plugins/media_kit_libs_ios_video/ios`)
|
- media_kit_libs_ios_video (from `.symlinks/plugins/media_kit_libs_ios_video/ios`)
|
||||||
@@ -173,9 +192,12 @@ DEPENDENCIES:
|
|||||||
- pasteboard (from `.symlinks/plugins/pasteboard/ios`)
|
- pasteboard (from `.symlinks/plugins/pasteboard/ios`)
|
||||||
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
|
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
|
||||||
- permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
|
- permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
|
||||||
|
- pointer_interceptor_ios (from `.symlinks/plugins/pointer_interceptor_ios/ios`)
|
||||||
- protocol_handler_ios (from `.symlinks/plugins/protocol_handler_ios/ios`)
|
- protocol_handler_ios (from `.symlinks/plugins/protocol_handler_ios/ios`)
|
||||||
- screen_brightness_ios (from `.symlinks/plugins/screen_brightness_ios/ios`)
|
- screen_brightness_ios (from `.symlinks/plugins/screen_brightness_ios/ios`)
|
||||||
- sentry_flutter (from `.symlinks/plugins/sentry_flutter/ios`)
|
- sentry_flutter (from `.symlinks/plugins/sentry_flutter/ios`)
|
||||||
|
- share_plus (from `.symlinks/plugins/share_plus/ios`)
|
||||||
|
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
|
||||||
- sqflite (from `.symlinks/plugins/sqflite/darwin`)
|
- sqflite (from `.symlinks/plugins/sqflite/darwin`)
|
||||||
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
|
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
|
||||||
- volume_controller (from `.symlinks/plugins/volume_controller/ios`)
|
- volume_controller (from `.symlinks/plugins/volume_controller/ios`)
|
||||||
@@ -197,6 +219,7 @@ SPEC REPOS:
|
|||||||
- SDWebImage
|
- SDWebImage
|
||||||
- Sentry
|
- Sentry
|
||||||
- SwiftyGif
|
- SwiftyGif
|
||||||
|
- TOCropViewController
|
||||||
- WebRTC-SDK
|
- WebRTC-SDK
|
||||||
|
|
||||||
EXTERNAL SOURCES:
|
EXTERNAL SOURCES:
|
||||||
@@ -212,10 +235,16 @@ EXTERNAL SOURCES:
|
|||||||
:path: ".symlinks/plugins/firebase_messaging/ios"
|
:path: ".symlinks/plugins/firebase_messaging/ios"
|
||||||
Flutter:
|
Flutter:
|
||||||
:path: Flutter
|
:path: Flutter
|
||||||
|
flutter_keyboard_visibility:
|
||||||
|
:path: ".symlinks/plugins/flutter_keyboard_visibility/ios"
|
||||||
flutter_secure_storage:
|
flutter_secure_storage:
|
||||||
:path: ".symlinks/plugins/flutter_secure_storage/ios"
|
:path: ".symlinks/plugins/flutter_secure_storage/ios"
|
||||||
flutter_webrtc:
|
flutter_webrtc:
|
||||||
:path: ".symlinks/plugins/flutter_webrtc/ios"
|
:path: ".symlinks/plugins/flutter_webrtc/ios"
|
||||||
|
gal:
|
||||||
|
:path: ".symlinks/plugins/gal/darwin"
|
||||||
|
image_cropper:
|
||||||
|
:path: ".symlinks/plugins/image_cropper/ios"
|
||||||
image_picker_ios:
|
image_picker_ios:
|
||||||
:path: ".symlinks/plugins/image_picker_ios/ios"
|
:path: ".symlinks/plugins/image_picker_ios/ios"
|
||||||
livekit_client:
|
livekit_client:
|
||||||
@@ -234,12 +263,18 @@ EXTERNAL SOURCES:
|
|||||||
:path: ".symlinks/plugins/path_provider_foundation/darwin"
|
:path: ".symlinks/plugins/path_provider_foundation/darwin"
|
||||||
permission_handler_apple:
|
permission_handler_apple:
|
||||||
:path: ".symlinks/plugins/permission_handler_apple/ios"
|
:path: ".symlinks/plugins/permission_handler_apple/ios"
|
||||||
|
pointer_interceptor_ios:
|
||||||
|
:path: ".symlinks/plugins/pointer_interceptor_ios/ios"
|
||||||
protocol_handler_ios:
|
protocol_handler_ios:
|
||||||
:path: ".symlinks/plugins/protocol_handler_ios/ios"
|
:path: ".symlinks/plugins/protocol_handler_ios/ios"
|
||||||
screen_brightness_ios:
|
screen_brightness_ios:
|
||||||
:path: ".symlinks/plugins/screen_brightness_ios/ios"
|
:path: ".symlinks/plugins/screen_brightness_ios/ios"
|
||||||
sentry_flutter:
|
sentry_flutter:
|
||||||
:path: ".symlinks/plugins/sentry_flutter/ios"
|
:path: ".symlinks/plugins/sentry_flutter/ios"
|
||||||
|
share_plus:
|
||||||
|
:path: ".symlinks/plugins/share_plus/ios"
|
||||||
|
shared_preferences_foundation:
|
||||||
|
:path: ".symlinks/plugins/shared_preferences_foundation/darwin"
|
||||||
sqflite:
|
sqflite:
|
||||||
:path: ".symlinks/plugins/sqflite/darwin"
|
:path: ".symlinks/plugins/sqflite/darwin"
|
||||||
url_launcher_ios:
|
url_launcher_ios:
|
||||||
@@ -255,20 +290,23 @@ SPEC CHECKSUMS:
|
|||||||
DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
|
DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
|
||||||
DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
|
DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
|
||||||
file_picker: 09aa5ec1ab24135ccd7a1621c46c84134bfd6655
|
file_picker: 09aa5ec1ab24135ccd7a1621c46c84134bfd6655
|
||||||
Firebase: 5121c624121af81cbc81df3bda414b3c28c4f3c3
|
Firebase: cec914dab6fd7b1bd8ab56ea07ce4e03dd251c2d
|
||||||
firebase_core: a9d0180d5285527884d07a41eb4a9ec9ed12cdb6
|
firebase_core: 57aeb91680e5d5e6df6b888064be7c785f146efb
|
||||||
firebase_messaging: ccc82a143a74de75f440a4e413dbbb37ec3fddbc
|
firebase_messaging: c862b3d2b973ecc769194dc8de09bd22c77ae757
|
||||||
FirebaseCore: 857dc1c6dd1255675047404d8466f7dfaac5d779
|
FirebaseCore: 30e9c1cbe3d38f5f5e75f48bfcea87d7c358ec16
|
||||||
FirebaseCoreInternal: df84dd300b561c27d5571684f389bf60b0a5c934
|
FirebaseCoreInternal: df84dd300b561c27d5571684f389bf60b0a5c934
|
||||||
FirebaseInstallations: 913cf60d0400ebd5d6b63a28b290372ab44590dd
|
FirebaseInstallations: 913cf60d0400ebd5d6b63a28b290372ab44590dd
|
||||||
FirebaseMessaging: 087a7c7cadef7b9239f005bc4db823894844f323
|
FirebaseMessaging: 7b5d8033e183ab59eb5b852a53201559e976d366
|
||||||
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
|
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
|
||||||
|
flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069
|
||||||
flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12
|
flutter_secure_storage: d33dac7ae2ea08509be337e775f6b59f1ff45f12
|
||||||
flutter_webrtc: 75b868e4f9e817c7a9a42ca4b6169063de4eec9f
|
flutter_webrtc: 75b868e4f9e817c7a9a42ca4b6169063de4eec9f
|
||||||
|
gal: 61e868295d28fe67ffa297fae6dacebf56fd53e1
|
||||||
GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
|
GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
|
||||||
GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
|
GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
|
||||||
|
image_cropper: 37d40f62177c101ff4c164906d259ea2c3aa70cf
|
||||||
image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1
|
image_picker_ios: c560581cceedb403a6ff17f2f816d7fea1421fc1
|
||||||
livekit_client: 411d387fd6f993851081069afbe7f04a8e974f1b
|
livekit_client: bad83a7776a41abc42e1f26d903eeac9164c8a9f
|
||||||
media_kit_libs_ios_video: a5fe24bc7875ccd6378a0978c13185e1344651c1
|
media_kit_libs_ios_video: a5fe24bc7875ccd6378a0978c13185e1344651c1
|
||||||
media_kit_native_event_loop: e6b2ab20cf0746eb1c33be961fcf79667304fa2a
|
media_kit_native_event_loop: e6b2ab20cf0746eb1c33be961fcf79667304fa2a
|
||||||
media_kit_video: 5da63f157170e5bf303bf85453b7ef6971218a2e
|
media_kit_video: 5da63f157170e5bf303bf85453b7ef6971218a2e
|
||||||
@@ -277,14 +315,18 @@ SPEC CHECKSUMS:
|
|||||||
pasteboard: 982969ebaa7c78af3e6cc7761e8f5e77565d9ce0
|
pasteboard: 982969ebaa7c78af3e6cc7761e8f5e77565d9ce0
|
||||||
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
|
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
|
||||||
permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
|
permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
|
||||||
|
pointer_interceptor_ios: 508241697ff0947f853c061945a8b822463947c1
|
||||||
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
|
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
|
||||||
protocol_handler_ios: a5db8abc38526ee326988b808be621e5fd568990
|
protocol_handler_ios: a5db8abc38526ee326988b808be621e5fd568990
|
||||||
screen_brightness_ios: 715ca807df953bf676d339f11464e438143ee625
|
screen_brightness_ios: 715ca807df953bf676d339f11464e438143ee625
|
||||||
SDWebImage: 066c47b573f408f18caa467d71deace7c0f8280d
|
SDWebImage: 066c47b573f408f18caa467d71deace7c0f8280d
|
||||||
Sentry: 514a3ea653886e9a48c6287d8b7bf05ec24bf3be
|
Sentry: 96ae1dcdf01a644bc3a3b1dc279cecaf48a833fb
|
||||||
sentry_flutter: edc037f7af0dc1512d6c33a5c2c7c838bd0d6806
|
sentry_flutter: 090351ce1ff5f96a4b33ef9455b7e3b28185387d
|
||||||
|
share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad
|
||||||
|
shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
|
||||||
sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
|
sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
|
||||||
SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
|
SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
|
||||||
|
TOCropViewController: 80b8985ad794298fb69d3341de183f33d1853654
|
||||||
url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
|
url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
|
||||||
volume_controller: 531ddf792994285c9b17f9d8a7e4dcdd29b3eae9
|
volume_controller: 531ddf792994285c9b17f9d8a7e4dcdd29b3eae9
|
||||||
wakelock_plus: 78ec7c5b202cab7761af8e2b2b3d0671be6c4ae1
|
wakelock_plus: 78ec7c5b202cab7761af8e2b2b3d0671be6c4ae1
|
||||||
|
|||||||
@@ -654,7 +654,7 @@
|
|||||||
730D64942C4AC4D0005A1975 /* Debug */ = {
|
730D64942C4AC4D0005A1975 /* Debug */ = {
|
||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
|
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
|
||||||
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
|
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
|
||||||
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
|
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
|
||||||
CLANG_ENABLE_OBJC_WEAK = YES;
|
CLANG_ENABLE_OBJC_WEAK = YES;
|
||||||
@@ -694,7 +694,7 @@
|
|||||||
730D64952C4AC4D0005A1975 /* Release */ = {
|
730D64952C4AC4D0005A1975 /* Release */ = {
|
||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
|
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
|
||||||
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
|
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
|
||||||
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
|
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
|
||||||
CLANG_ENABLE_OBJC_WEAK = YES;
|
CLANG_ENABLE_OBJC_WEAK = YES;
|
||||||
@@ -731,7 +731,7 @@
|
|||||||
730D64962C4AC4D0005A1975 /* Profile */ = {
|
730D64962C4AC4D0005A1975 /* Profile */ = {
|
||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
|
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = AppIcon;
|
||||||
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
|
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
|
||||||
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
|
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
|
||||||
CLANG_ENABLE_OBJC_WEAK = YES;
|
CLANG_ENABLE_OBJC_WEAK = YES;
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 42 KiB After Width: | Height: | Size: 320 KiB |
|
Before Width: | Height: | Size: 575 B After Width: | Height: | Size: 822 B |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 2.0 KiB After Width: | Height: | Size: 4.3 KiB |
|
Before Width: | Height: | Size: 868 B After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 4.1 KiB |
|
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 7.6 KiB |
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 2.7 KiB After Width: | Height: | Size: 6.6 KiB |
|
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 3.3 KiB |
|
Before Width: | Height: | Size: 3.5 KiB After Width: | Height: | Size: 9.2 KiB |
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 4.0 KiB |
|
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 6.4 KiB After Width: | Height: | Size: 22 KiB |
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 5.7 KiB |
|
Before Width: | Height: | Size: 5.0 KiB After Width: | Height: | Size: 16 KiB |
|
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 6.1 KiB |
|
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 17 KiB |
|
Before Width: | Height: | Size: 5.9 KiB After Width: | Height: | Size: 20 KiB |
@@ -8,6 +8,8 @@
|
|||||||
<array>
|
<array>
|
||||||
<string>webcredentials:solsynth.dev</string>
|
<string>webcredentials:solsynth.dev</string>
|
||||||
<string>applinks:solsynth.dev</string>
|
<string>applinks:solsynth.dev</string>
|
||||||
|
<string>webcredentials:sn.solsynth.dev</string>
|
||||||
|
<string>applinks:sn.solsynth.dev</string>
|
||||||
</array>
|
</array>
|
||||||
<key>com.apple.developer.usernotifications.communication</key>
|
<key>com.apple.developer.usernotifications.communication</key>
|
||||||
<true/>
|
<true/>
|
||||||
|
|||||||
265
lib/bootstrapper.dart
Normal file
@@ -0,0 +1,265 @@
|
|||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:get/get.dart';
|
||||||
|
import 'package:package_info_plus/package_info_plus.dart';
|
||||||
|
import 'package:provider/provider.dart';
|
||||||
|
import 'package:solian/exts.dart';
|
||||||
|
import 'package:solian/platform.dart';
|
||||||
|
import 'package:solian/providers/auth.dart';
|
||||||
|
import 'package:solian/providers/content/channel.dart';
|
||||||
|
import 'package:solian/providers/content/realm.dart';
|
||||||
|
import 'package:solian/providers/relation.dart';
|
||||||
|
import 'package:solian/providers/stickers.dart';
|
||||||
|
import 'package:solian/providers/theme_switcher.dart';
|
||||||
|
import 'package:solian/providers/websocket.dart';
|
||||||
|
import 'package:solian/services.dart';
|
||||||
|
import 'package:solian/widgets/sized_container.dart';
|
||||||
|
|
||||||
|
class BootstrapperShell extends StatefulWidget {
|
||||||
|
final Widget child;
|
||||||
|
|
||||||
|
const BootstrapperShell({super.key, required this.child});
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<BootstrapperShell> createState() => _BootstrapperShellState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _BootstrapperShellState extends State<BootstrapperShell> {
|
||||||
|
bool _isBusy = true;
|
||||||
|
bool _isErrored = false;
|
||||||
|
bool _isDismissable = true;
|
||||||
|
String? _subtitle;
|
||||||
|
|
||||||
|
Color get _unFocusColor =>
|
||||||
|
Theme.of(context).colorScheme.onSurface.withOpacity(0.75);
|
||||||
|
|
||||||
|
int _periodCursor = 0;
|
||||||
|
|
||||||
|
late final List<({String label, Future<void> Function() action})> _periods = [
|
||||||
|
(
|
||||||
|
label: 'bsLoadingTheme',
|
||||||
|
action: () async {
|
||||||
|
await context.read<ThemeSwitcher>().restoreTheme();
|
||||||
|
},
|
||||||
|
),
|
||||||
|
(
|
||||||
|
label: 'bsCheckForUpdate',
|
||||||
|
action: () async {
|
||||||
|
if (PlatformInfo.isWeb) return;
|
||||||
|
try {
|
||||||
|
final info = await PackageInfo.fromPlatform();
|
||||||
|
final localVersionString = '${info.version}+${info.buildNumber}';
|
||||||
|
final resp = await GetConnect().get(
|
||||||
|
'https://git.solsynth.dev/api/v1/repos/hydrogen/solian/tags?limit=1',
|
||||||
|
);
|
||||||
|
if (resp.body[0]['name'] != localVersionString) {
|
||||||
|
setState(() {
|
||||||
|
_isErrored = true;
|
||||||
|
_subtitle = PlatformInfo.isIOS || PlatformInfo.isMacOS
|
||||||
|
? 'bsCheckForUpdateDescApple'.tr
|
||||||
|
: 'bsCheckForUpdateDescCommon'.tr;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
setState(() {
|
||||||
|
_isErrored = true;
|
||||||
|
_subtitle = 'bsCheckForUpdateFailed'.tr;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
},
|
||||||
|
),
|
||||||
|
(
|
||||||
|
label: 'bsCheckingServer',
|
||||||
|
action: () async {
|
||||||
|
final client = ServiceFinder.configureClient('dealer');
|
||||||
|
final resp = await client.get('/.well-known');
|
||||||
|
if (resp.statusCode != null && resp.statusCode != 200) {
|
||||||
|
setState(() {
|
||||||
|
_isErrored = true;
|
||||||
|
_subtitle = 'bsCheckingServerDown'.tr;
|
||||||
|
_isDismissable = false;
|
||||||
|
});
|
||||||
|
throw Exception('unable connect to server');
|
||||||
|
} else if (resp.statusCode == null) {
|
||||||
|
setState(() {
|
||||||
|
_isErrored = true;
|
||||||
|
_subtitle = 'bsCheckingServerFail'.tr;
|
||||||
|
_isDismissable = false;
|
||||||
|
});
|
||||||
|
throw Exception('unable connect to server');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
),
|
||||||
|
(
|
||||||
|
label: 'bsAuthorizing',
|
||||||
|
action: () async {
|
||||||
|
final AuthProvider auth = Get.find();
|
||||||
|
await auth.refreshAuthorizeStatus();
|
||||||
|
if (auth.isAuthorized.isTrue) {
|
||||||
|
await auth.refreshUserProfile();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
),
|
||||||
|
(
|
||||||
|
label: 'bsEstablishingConn',
|
||||||
|
action: () async {
|
||||||
|
final AuthProvider auth = Get.find();
|
||||||
|
if (auth.isAuthorized.isTrue) {
|
||||||
|
await Get.find<WebSocketProvider>().connect();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
),
|
||||||
|
(
|
||||||
|
label: 'bsPreparingData',
|
||||||
|
action: () async {
|
||||||
|
final AuthProvider auth = Get.find();
|
||||||
|
await Future.wait([
|
||||||
|
Get.find<StickerProvider>().refreshAvailableStickers(),
|
||||||
|
if (auth.isAuthorized.isTrue)
|
||||||
|
Get.find<ChannelProvider>().refreshAvailableChannel(),
|
||||||
|
if (auth.isAuthorized.isTrue)
|
||||||
|
Get.find<RelationshipProvider>().refreshRelativeList(),
|
||||||
|
if (auth.isAuthorized.isTrue)
|
||||||
|
Get.find<RealmProvider>().refreshAvailableRealms(),
|
||||||
|
]);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
(
|
||||||
|
label: 'bsRegisteringPushNotify',
|
||||||
|
action: () async {
|
||||||
|
final AuthProvider auth = Get.find();
|
||||||
|
if (auth.isAuthorized.isTrue) {
|
||||||
|
try {
|
||||||
|
Get.find<WebSocketProvider>().registerPushNotifications();
|
||||||
|
} catch (err) {
|
||||||
|
context.showSnackbar(
|
||||||
|
'pushNotifyRegisterFailed'.trParams({'reason': err.toString()}),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
),
|
||||||
|
];
|
||||||
|
|
||||||
|
Future<void> _runPeriods() async {
|
||||||
|
try {
|
||||||
|
for (var idx = 0; idx < _periods.length; idx++) {
|
||||||
|
await _periods[idx].action();
|
||||||
|
if (_isErrored && !_isDismissable) break;
|
||||||
|
if (_periodCursor < _periods.length - 1) {
|
||||||
|
setState(() => _periodCursor++);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
setState(() => _isBusy = false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
super.initState();
|
||||||
|
_runPeriods();
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
if (_isBusy || _isErrored) {
|
||||||
|
return GestureDetector(
|
||||||
|
child: Material(
|
||||||
|
color: Theme.of(context).colorScheme.surface,
|
||||||
|
child: Column(
|
||||||
|
mainAxisSize: MainAxisSize.max,
|
||||||
|
mainAxisAlignment: MainAxisAlignment.spaceAround,
|
||||||
|
children: [
|
||||||
|
SizedBox(
|
||||||
|
height: 280,
|
||||||
|
child: Align(
|
||||||
|
alignment: Alignment.bottomCenter,
|
||||||
|
child: ClipRRect(
|
||||||
|
borderRadius: const BorderRadius.all(Radius.circular(16)),
|
||||||
|
child:
|
||||||
|
Image.asset('assets/logo.png', width: 80, height: 80),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Column(
|
||||||
|
children: [
|
||||||
|
if (_isErrored && !_isDismissable && !_isBusy)
|
||||||
|
const Icon(Icons.cancel, size: 24),
|
||||||
|
if (_isErrored && _isDismissable && !_isBusy)
|
||||||
|
const Icon(Icons.warning, size: 24),
|
||||||
|
if ((_isErrored && _isDismissable && _isBusy) || _isBusy)
|
||||||
|
const SizedBox(
|
||||||
|
width: 24,
|
||||||
|
height: 24,
|
||||||
|
child: CircularProgressIndicator(strokeWidth: 3),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 12),
|
||||||
|
CenteredContainer(
|
||||||
|
maxWidth: 280,
|
||||||
|
child: Column(
|
||||||
|
children: [
|
||||||
|
if (_subtitle == null)
|
||||||
|
Text(
|
||||||
|
'${_periods[_periodCursor].label.tr} (${_periodCursor + 1}/${_periods.length})',
|
||||||
|
textAlign: TextAlign.center,
|
||||||
|
style: TextStyle(
|
||||||
|
fontSize: 13,
|
||||||
|
color: _unFocusColor,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
if (_subtitle != null)
|
||||||
|
Text(
|
||||||
|
_subtitle!,
|
||||||
|
textAlign: TextAlign.center,
|
||||||
|
style: TextStyle(
|
||||||
|
fontSize: 13,
|
||||||
|
color: _unFocusColor,
|
||||||
|
),
|
||||||
|
).paddingOnly(bottom: 4),
|
||||||
|
if (!_isBusy && _isErrored && _isDismissable)
|
||||||
|
Text(
|
||||||
|
'bsDismissibleErrorHint'.tr,
|
||||||
|
textAlign: TextAlign.center,
|
||||||
|
style: TextStyle(
|
||||||
|
fontSize: 13,
|
||||||
|
color: _unFocusColor,
|
||||||
|
),
|
||||||
|
).paddingOnly(bottom: 5),
|
||||||
|
Text(
|
||||||
|
'2024 © Solsynth LLC',
|
||||||
|
textAlign: TextAlign.center,
|
||||||
|
style: TextStyle(
|
||||||
|
fontSize: 11,
|
||||||
|
color: _unFocusColor,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
onTap: () {
|
||||||
|
if (_isBusy) return;
|
||||||
|
if (_isDismissable) {
|
||||||
|
setState(() {
|
||||||
|
_isBusy = false;
|
||||||
|
_isErrored = false;
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
setState(() {
|
||||||
|
_isBusy = true;
|
||||||
|
_isErrored = false;
|
||||||
|
_periodCursor = 0;
|
||||||
|
});
|
||||||
|
_runPeriods();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return widget.child;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -16,7 +16,7 @@ class ChatEventController {
|
|||||||
Channel? channel;
|
Channel? channel;
|
||||||
String? scope;
|
String? scope;
|
||||||
|
|
||||||
initialize() async {
|
Future<void> initialize() async {
|
||||||
if (!PlatformInfo.isWeb) {
|
if (!PlatformInfo.isWeb) {
|
||||||
database = await createHistoryDb();
|
database = await createHistoryDb();
|
||||||
}
|
}
|
||||||
@@ -131,6 +131,8 @@ class ChatEventController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
insertEvent(LocalEvent entry) {
|
insertEvent(LocalEvent entry) {
|
||||||
|
if (entry.channelId != channel?.id) return;
|
||||||
|
|
||||||
final idx = currentEvents.indexWhere((x) => x.data.uuid == entry.data.uuid);
|
final idx = currentEvents.indexWhere((x) => x.data.uuid == entry.data.uuid);
|
||||||
if (idx != -1) {
|
if (idx != -1) {
|
||||||
currentEvents[idx] = entry;
|
currentEvents[idx] = entry;
|
||||||
|
|||||||
324
lib/controllers/post_editor_controller.dart
Normal file
@@ -0,0 +1,324 @@
|
|||||||
|
import 'dart:async';
|
||||||
|
import 'dart:convert';
|
||||||
|
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:get/get.dart';
|
||||||
|
import 'package:solian/models/post.dart';
|
||||||
|
import 'package:solian/models/realm.dart';
|
||||||
|
import 'package:solian/widgets/attachments/attachment_editor.dart';
|
||||||
|
import 'package:solian/widgets/posts/editor/post_editor_categories_tags.dart';
|
||||||
|
import 'package:solian/widgets/posts/editor/post_editor_date.dart';
|
||||||
|
import 'package:solian/widgets/posts/editor/post_editor_overview.dart';
|
||||||
|
import 'package:solian/widgets/posts/editor/post_editor_publish_zone.dart';
|
||||||
|
import 'package:solian/widgets/posts/editor/post_editor_visibility.dart';
|
||||||
|
import 'package:shared_preferences/shared_preferences.dart';
|
||||||
|
|
||||||
|
class PostEditorController extends GetxController {
|
||||||
|
late final SharedPreferences _prefs;
|
||||||
|
|
||||||
|
final titleController = TextEditingController();
|
||||||
|
final descriptionController = TextEditingController();
|
||||||
|
final contentController = TextEditingController();
|
||||||
|
|
||||||
|
RxInt mode = 0.obs;
|
||||||
|
RxInt contentLength = 0.obs;
|
||||||
|
|
||||||
|
Rx<Post?> editTo = Rx(null);
|
||||||
|
Rx<Post?> replyTo = Rx(null);
|
||||||
|
Rx<Post?> repostTo = Rx(null);
|
||||||
|
Rx<Realm?> realmZone = Rx(null);
|
||||||
|
Rx<DateTime?> publishedAt = Rx(null);
|
||||||
|
Rx<DateTime?> publishedUntil = Rx(null);
|
||||||
|
RxList<int> attachments = RxList<int>.empty(growable: true);
|
||||||
|
RxList<String> tags = RxList<String>.empty(growable: true);
|
||||||
|
|
||||||
|
RxList<int> visibleUsers = RxList.empty(growable: true);
|
||||||
|
RxList<int> invisibleUsers = RxList.empty(growable: true);
|
||||||
|
|
||||||
|
RxInt visibility = 0.obs;
|
||||||
|
RxBool isDraft = false.obs;
|
||||||
|
|
||||||
|
RxBool isRestoreFromLocal = false.obs;
|
||||||
|
Rx<DateTime?> lastSaveTime = Rx(null);
|
||||||
|
Timer? _saveTimer;
|
||||||
|
|
||||||
|
PostEditorController() {
|
||||||
|
SharedPreferences.getInstance().then((inst) {
|
||||||
|
_prefs = inst;
|
||||||
|
_saveTimer = Timer.periodic(
|
||||||
|
const Duration(seconds: 3),
|
||||||
|
(Timer t) {
|
||||||
|
if (isNotEmpty) {
|
||||||
|
localSave();
|
||||||
|
lastSaveTime.value = DateTime.now();
|
||||||
|
lastSaveTime.refresh();
|
||||||
|
} else if (_prefs.containsKey('post_editor_local_save')) {
|
||||||
|
localClear();
|
||||||
|
lastSaveTime.value = null;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
);
|
||||||
|
});
|
||||||
|
contentController.addListener(() {
|
||||||
|
contentLength.value = contentController.text.length;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> editOverview(BuildContext context) {
|
||||||
|
return showDialog(
|
||||||
|
context: context,
|
||||||
|
builder: (context) => PostEditorOverviewDialog(
|
||||||
|
controller: this,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> editVisibility(BuildContext context) {
|
||||||
|
return showDialog(
|
||||||
|
context: context,
|
||||||
|
builder: (context) => PostEditorVisibilityDialog(
|
||||||
|
controller: this,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> editCategoriesAndTags(BuildContext context) {
|
||||||
|
return showDialog(
|
||||||
|
context: context,
|
||||||
|
builder: (context) => PostEditorCategoriesDialog(
|
||||||
|
controller: this,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> editPublishZone(BuildContext context) {
|
||||||
|
return showDialog(
|
||||||
|
context: context,
|
||||||
|
builder: (context) => PostEditorPublishZoneDialog(
|
||||||
|
controller: this,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> editPublishDate(BuildContext context) {
|
||||||
|
return showDialog(
|
||||||
|
context: context,
|
||||||
|
builder: (context) => PostEditorDateDialog(
|
||||||
|
controller: this,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> editAttachment(BuildContext context) {
|
||||||
|
return showModalBottomSheet(
|
||||||
|
context: context,
|
||||||
|
builder: (context) => AttachmentEditorPopup(
|
||||||
|
usage: 'i.attachment',
|
||||||
|
initialAttachments: attachments,
|
||||||
|
onAdd: (int value) {
|
||||||
|
attachments.add(value);
|
||||||
|
},
|
||||||
|
onRemove: (int value) {
|
||||||
|
attachments.remove(value);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
void toggleDraftMode() {
|
||||||
|
isDraft.value = !isDraft.value;
|
||||||
|
}
|
||||||
|
|
||||||
|
void localSave() {
|
||||||
|
_prefs.setString(
|
||||||
|
'post_editor_local_save',
|
||||||
|
jsonEncode({
|
||||||
|
...payload,
|
||||||
|
'reply_to': replyTo.value?.toJson(),
|
||||||
|
'repost_to': repostTo.value?.toJson(),
|
||||||
|
'edit_to': editTo.value?.toJson(),
|
||||||
|
'realm': realmZone.value?.toJson(),
|
||||||
|
'type': type,
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
void localRead() {
|
||||||
|
SharedPreferences.getInstance().then((inst) {
|
||||||
|
if (inst.containsKey('post_editor_local_save')) {
|
||||||
|
isRestoreFromLocal.value = true;
|
||||||
|
payload = jsonDecode(inst.getString('post_editor_local_save')!);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
void localClear() {
|
||||||
|
_prefs.remove('post_editor_local_save');
|
||||||
|
}
|
||||||
|
|
||||||
|
void currentClear() {
|
||||||
|
titleController.clear();
|
||||||
|
descriptionController.clear();
|
||||||
|
contentController.clear();
|
||||||
|
attachments.clear();
|
||||||
|
tags.clear();
|
||||||
|
visibleUsers.clear();
|
||||||
|
invisibleUsers.clear();
|
||||||
|
visibility.value = 0;
|
||||||
|
publishedAt.value = null;
|
||||||
|
publishedUntil.value = null;
|
||||||
|
isDraft.value = false;
|
||||||
|
isRestoreFromLocal.value = false;
|
||||||
|
lastSaveTime.value = null;
|
||||||
|
contentLength.value = 0;
|
||||||
|
editTo.value = null;
|
||||||
|
replyTo.value = null;
|
||||||
|
repostTo.value = null;
|
||||||
|
realmZone.value = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
set editTarget(Post? value) {
|
||||||
|
if (value == null) {
|
||||||
|
editTo.value = null;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
type = value.type;
|
||||||
|
editTo.value = value;
|
||||||
|
isDraft.value = value.isDraft ?? false;
|
||||||
|
titleController.text = value.body['title'] ?? '';
|
||||||
|
descriptionController.text = value.body['description'] ?? '';
|
||||||
|
contentController.text = value.body['content'] ?? '';
|
||||||
|
publishedAt.value = value.publishedAt;
|
||||||
|
publishedUntil.value = value.publishedUntil;
|
||||||
|
tags.value =
|
||||||
|
value.body['tags']?.map((x) => x['alias']).toList() ?? List.empty();
|
||||||
|
tags.refresh();
|
||||||
|
attachments.value = value.body['attachments']?.cast<int>() ?? List.empty();
|
||||||
|
attachments.refresh();
|
||||||
|
|
||||||
|
contentLength.value = contentController.text.length;
|
||||||
|
}
|
||||||
|
|
||||||
|
String get typeEndpoint {
|
||||||
|
switch (mode.value) {
|
||||||
|
case 0:
|
||||||
|
return 'stories';
|
||||||
|
case 1:
|
||||||
|
return 'articles';
|
||||||
|
default:
|
||||||
|
return 'stories';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
String get type {
|
||||||
|
switch (mode.value) {
|
||||||
|
case 0:
|
||||||
|
return 'story';
|
||||||
|
case 1:
|
||||||
|
return 'article';
|
||||||
|
default:
|
||||||
|
return 'story';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
set type(String value) {
|
||||||
|
switch (value) {
|
||||||
|
case 'story':
|
||||||
|
mode.value = 0;
|
||||||
|
case 'article':
|
||||||
|
mode.value = 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
String? get title {
|
||||||
|
if (titleController.text.isEmpty) return null;
|
||||||
|
return titleController.text;
|
||||||
|
}
|
||||||
|
|
||||||
|
String? get description {
|
||||||
|
if (descriptionController.text.isEmpty) return null;
|
||||||
|
return descriptionController.text;
|
||||||
|
}
|
||||||
|
|
||||||
|
Map<String, dynamic> get payload {
|
||||||
|
return {
|
||||||
|
'title': title,
|
||||||
|
'description': description,
|
||||||
|
'content': contentController.text,
|
||||||
|
'tags': tags.map((x) => {'alias': x}).toList(),
|
||||||
|
'attachments': attachments,
|
||||||
|
'visible_users': visibleUsers,
|
||||||
|
'invisible_users': invisibleUsers,
|
||||||
|
'visibility': visibility.value,
|
||||||
|
'published_at': publishedAt.value?.toUtc().toIso8601String() ??
|
||||||
|
DateTime.now().toUtc().toIso8601String(),
|
||||||
|
'published_until': publishedUntil.value?.toUtc().toIso8601String(),
|
||||||
|
'is_draft': isDraft.value,
|
||||||
|
if (replyTo.value != null) 'reply_to': replyTo.value!.id,
|
||||||
|
if (repostTo.value != null) 'repost_to': repostTo.value!.id,
|
||||||
|
if (realmZone.value != null) 'realm': realmZone.value!.alias,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
set payload(Map<String, dynamic> value) {
|
||||||
|
type = value['type'];
|
||||||
|
tags.value = value['tags'].map((x) => x['alias']).toList().cast<String>();
|
||||||
|
titleController.text = value['title'] ?? '';
|
||||||
|
descriptionController.text = value['description'] ?? '';
|
||||||
|
contentController.text = value['content'] ?? '';
|
||||||
|
attachments.value = value['attachments'].cast<int>() ?? List.empty();
|
||||||
|
attachments.refresh();
|
||||||
|
visibility.value = value['visibility'];
|
||||||
|
isDraft.value = value['is_draft'];
|
||||||
|
if (value['visible_users'] != null) {
|
||||||
|
visibleUsers.value = value['visible_users'].cast<int>();
|
||||||
|
}
|
||||||
|
if (value['invisible_users'] != null) {
|
||||||
|
invisibleUsers.value = value['invisible_users'].cast<int>();
|
||||||
|
}
|
||||||
|
if (value['published_at'] != null) {
|
||||||
|
publishedAt.value = DateTime.parse(value['published_at']).toLocal();
|
||||||
|
}
|
||||||
|
if (value['published_until'] != null) {
|
||||||
|
publishedAt.value = DateTime.parse(value['published_until']).toLocal();
|
||||||
|
}
|
||||||
|
if (value['reply_to'] != null) {
|
||||||
|
replyTo.value = Post.fromJson(value['reply_to']);
|
||||||
|
}
|
||||||
|
if (value['repost_to'] != null) {
|
||||||
|
repostTo.value = Post.fromJson(value['repost_to']);
|
||||||
|
}
|
||||||
|
if (value['edit_to'] != null) {
|
||||||
|
editTo.value = Post.fromJson(value['edit_to']);
|
||||||
|
}
|
||||||
|
if (value['realm'] != null) {
|
||||||
|
realmZone.value = Realm.fromJson(value['realm']);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool get isEmpty {
|
||||||
|
if (contentController.text.isEmpty) return true;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool get isNotEmpty {
|
||||||
|
return [
|
||||||
|
titleController.text.isNotEmpty,
|
||||||
|
descriptionController.text.isNotEmpty,
|
||||||
|
contentController.text.isNotEmpty,
|
||||||
|
attachments.isNotEmpty,
|
||||||
|
tags.isNotEmpty
|
||||||
|
].any((x) => x);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void dispose() {
|
||||||
|
_saveTimer?.cancel();
|
||||||
|
|
||||||
|
titleController.dispose();
|
||||||
|
descriptionController.dispose();
|
||||||
|
contentController.dispose();
|
||||||
|
super.dispose();
|
||||||
|
}
|
||||||
|
}
|
||||||
138
lib/controllers/post_list_controller.dart
Normal file
@@ -0,0 +1,138 @@
|
|||||||
|
import 'package:get/get.dart';
|
||||||
|
import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
|
||||||
|
import 'package:solian/models/pagination.dart';
|
||||||
|
import 'package:solian/models/post.dart';
|
||||||
|
import 'package:solian/providers/content/posts.dart';
|
||||||
|
|
||||||
|
class PostListController extends GetxController {
|
||||||
|
String? author;
|
||||||
|
|
||||||
|
/// The polling source modifier.
|
||||||
|
/// - `0`: default recommendations
|
||||||
|
/// - `1`: shuffle mode
|
||||||
|
RxInt mode = 0.obs;
|
||||||
|
|
||||||
|
/// The paging controller for infinite loading.
|
||||||
|
/// Only available when mode is `0`.
|
||||||
|
PagingController<int, Post> pagingController =
|
||||||
|
PagingController(firstPageKey: 0);
|
||||||
|
|
||||||
|
PostListController({this.author}) {
|
||||||
|
_initPagingController();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Initialize a compatibility layer to paging controller
|
||||||
|
void _initPagingController() {
|
||||||
|
pagingController.addPageRequestListener(_onPagingControllerRequest);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> _onPagingControllerRequest(int pageKey) async {
|
||||||
|
try {
|
||||||
|
final result = await loadMore();
|
||||||
|
|
||||||
|
if (result != null && hasMore.value) {
|
||||||
|
pagingController.appendPage(result, nextPageKey.value);
|
||||||
|
} else if (result != null) {
|
||||||
|
pagingController.appendLastPage(result);
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
pagingController.error = e;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void _resetPagingController() {
|
||||||
|
pagingController.removePageRequestListener(_onPagingControllerRequest);
|
||||||
|
pagingController.nextPageKey = nextPageKey.value;
|
||||||
|
pagingController.itemList?.clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
RxBool isBusy = false.obs;
|
||||||
|
RxBool isPreparing = false.obs;
|
||||||
|
|
||||||
|
RxInt focusCursor = 0.obs;
|
||||||
|
|
||||||
|
Post get focusPost => postList[focusCursor.value];
|
||||||
|
|
||||||
|
RxInt postTotal = 0.obs;
|
||||||
|
RxList<Post> postList = RxList.empty(growable: true);
|
||||||
|
|
||||||
|
RxInt nextPageKey = 0.obs;
|
||||||
|
RxBool hasMore = true.obs;
|
||||||
|
|
||||||
|
Future<void> reloadAllOver() async {
|
||||||
|
isPreparing.value = true;
|
||||||
|
|
||||||
|
focusCursor.value = 0;
|
||||||
|
nextPageKey.value = 0;
|
||||||
|
postList.clear();
|
||||||
|
hasMore.value = true;
|
||||||
|
|
||||||
|
_resetPagingController();
|
||||||
|
final result = await loadMore();
|
||||||
|
if (result != null && hasMore.value) {
|
||||||
|
pagingController.appendPage(result, nextPageKey.value);
|
||||||
|
} else if (result != null) {
|
||||||
|
pagingController.appendLastPage(result);
|
||||||
|
}
|
||||||
|
_initPagingController();
|
||||||
|
|
||||||
|
isPreparing.value = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<List<Post>?> loadMore() async {
|
||||||
|
final result = await _loadPosts(nextPageKey.value);
|
||||||
|
|
||||||
|
if (result != null && result.length >= 10) {
|
||||||
|
postList.addAll(result);
|
||||||
|
nextPageKey.value += result.length;
|
||||||
|
hasMore.value = true;
|
||||||
|
} else if (result != null) {
|
||||||
|
postList.addAll(result);
|
||||||
|
nextPageKey.value += result.length;
|
||||||
|
hasMore.value = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
final idx = <dynamic>{};
|
||||||
|
postList.retainWhere((x) => idx.add(x.id));
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<List<Post>?> _loadPosts(int pageKey) async {
|
||||||
|
isBusy.value = true;
|
||||||
|
|
||||||
|
final PostProvider provider = Get.find();
|
||||||
|
|
||||||
|
Response resp;
|
||||||
|
try {
|
||||||
|
if (author != null) {
|
||||||
|
resp = await provider.listPost(
|
||||||
|
pageKey,
|
||||||
|
author: author,
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
resp = await provider.listRecommendations(
|
||||||
|
pageKey,
|
||||||
|
channel: mode.value == 0 ? null : 'shuffle',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
rethrow;
|
||||||
|
} finally {
|
||||||
|
isBusy.value = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
final result = PaginationResult.fromJson(resp.body);
|
||||||
|
final out = result.data?.map((e) => Post.fromJson(e)).toList();
|
||||||
|
|
||||||
|
postTotal.value = result.count;
|
||||||
|
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void dispose() {
|
||||||
|
pagingController.dispose();
|
||||||
|
super.dispose();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,9 +2,10 @@ import 'package:flutter/material.dart';
|
|||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
|
|
||||||
extension SolianExtenions on BuildContext {
|
extension SolianExtenions on BuildContext {
|
||||||
void showSnackbar(String content) {
|
void showSnackbar(String content, {SnackBarAction? action}) {
|
||||||
ScaffoldMessenger.of(this).showSnackBar(SnackBar(
|
ScaffoldMessenger.of(this).showSnackBar(SnackBar(
|
||||||
content: Text(content),
|
content: Text(content),
|
||||||
|
action: action,
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -29,6 +30,23 @@ extension SolianExtenions on BuildContext {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Future<void> showInfoDialog(String title, body) {
|
||||||
|
return showDialog<void>(
|
||||||
|
useRootNavigator: true,
|
||||||
|
context: this,
|
||||||
|
builder: (ctx) => AlertDialog(
|
||||||
|
title: Text(title),
|
||||||
|
content: Text(body),
|
||||||
|
actions: [
|
||||||
|
TextButton(
|
||||||
|
onPressed: () => Navigator.pop(ctx),
|
||||||
|
child: Text('okay'.tr),
|
||||||
|
)
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
Future<void> showErrorDialog(dynamic exception) {
|
Future<void> showErrorDialog(dynamic exception) {
|
||||||
var stack = StackTrace.current;
|
var stack = StackTrace.current;
|
||||||
var stackTrace = '$stack';
|
var stackTrace = '$stack';
|
||||||
|
|||||||
@@ -2,25 +2,31 @@ import 'package:firebase_core/firebase_core.dart';
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_acrylic/flutter_acrylic.dart';
|
import 'package:flutter_acrylic/flutter_acrylic.dart';
|
||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
|
import 'package:go_router/go_router.dart';
|
||||||
import 'package:media_kit/media_kit.dart';
|
import 'package:media_kit/media_kit.dart';
|
||||||
import 'package:protocol_handler/protocol_handler.dart';
|
import 'package:protocol_handler/protocol_handler.dart';
|
||||||
|
import 'package:provider/provider.dart';
|
||||||
import 'package:sentry_flutter/sentry_flutter.dart';
|
import 'package:sentry_flutter/sentry_flutter.dart';
|
||||||
import 'package:solian/exts.dart';
|
import 'package:solian/bootstrapper.dart';
|
||||||
import 'package:solian/firebase_options.dart';
|
import 'package:solian/firebase_options.dart';
|
||||||
import 'package:solian/platform.dart';
|
import 'package:solian/platform.dart';
|
||||||
|
import 'package:solian/providers/attachment_uploader.dart';
|
||||||
|
import 'package:solian/providers/stickers.dart';
|
||||||
|
import 'package:solian/providers/theme_switcher.dart';
|
||||||
import 'package:solian/providers/websocket.dart';
|
import 'package:solian/providers/websocket.dart';
|
||||||
import 'package:solian/providers/auth.dart';
|
import 'package:solian/providers/auth.dart';
|
||||||
import 'package:solian/providers/content/attachment.dart';
|
import 'package:solian/providers/content/attachment.dart';
|
||||||
import 'package:solian/providers/content/call.dart';
|
import 'package:solian/providers/call.dart';
|
||||||
import 'package:solian/providers/content/channel.dart';
|
import 'package:solian/providers/content/channel.dart';
|
||||||
import 'package:solian/providers/content/posts.dart';
|
import 'package:solian/providers/content/posts.dart';
|
||||||
import 'package:solian/providers/content/realm.dart';
|
import 'package:solian/providers/content/realm.dart';
|
||||||
import 'package:solian/providers/friend.dart';
|
import 'package:solian/providers/relation.dart';
|
||||||
import 'package:solian/providers/account_status.dart';
|
import 'package:solian/providers/account_status.dart';
|
||||||
import 'package:solian/router.dart';
|
import 'package:solian/router.dart';
|
||||||
import 'package:solian/shells/system_shell.dart';
|
import 'package:solian/shells/system_shell.dart';
|
||||||
import 'package:solian/theme.dart';
|
import 'package:solian/theme.dart';
|
||||||
import 'package:solian/translations.dart';
|
import 'package:solian/translations.dart';
|
||||||
|
import 'package:flutter_web_plugins/url_strategy.dart' show usePathUrlStrategy;
|
||||||
|
|
||||||
void main() async {
|
void main() async {
|
||||||
await SentryFlutter.init(
|
await SentryFlutter.init(
|
||||||
@@ -39,6 +45,9 @@ void main() async {
|
|||||||
_initializePlatformComponents(),
|
_initializePlatformComponents(),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
GoRouter.optionURLReflectsImperativeAPIs = true;
|
||||||
|
|
||||||
|
usePathUrlStrategy();
|
||||||
runApp(const SolianApp());
|
runApp(const SolianApp());
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
@@ -66,58 +75,59 @@ Future<void> _initializePlatformComponents() async {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
final themeSwitcher = ThemeSwitcher(
|
||||||
|
lightThemeData: SolianTheme.build(Brightness.light),
|
||||||
|
darkThemeData: SolianTheme.build(Brightness.dark),
|
||||||
|
);
|
||||||
|
|
||||||
class SolianApp extends StatelessWidget {
|
class SolianApp extends StatelessWidget {
|
||||||
const SolianApp({super.key});
|
const SolianApp({super.key});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return GetMaterialApp.router(
|
return ChangeNotifierProvider.value(
|
||||||
title: 'Solian',
|
value: themeSwitcher,
|
||||||
theme: SolianTheme.build(Brightness.light),
|
child: Builder(builder: (context) {
|
||||||
darkTheme: SolianTheme.build(Brightness.dark),
|
final theme = Provider.of<ThemeSwitcher>(context);
|
||||||
themeMode: ThemeMode.system,
|
|
||||||
routerDelegate: AppRouter.instance.routerDelegate,
|
return GetMaterialApp.router(
|
||||||
routeInformationParser: AppRouter.instance.routeInformationParser,
|
title: 'Solian',
|
||||||
routeInformationProvider: AppRouter.instance.routeInformationProvider,
|
theme: theme.lightThemeData,
|
||||||
backButtonDispatcher: AppRouter.instance.backButtonDispatcher,
|
darkTheme: theme.darkThemeData,
|
||||||
translations: SolianMessages(),
|
themeMode: ThemeMode.system,
|
||||||
locale: Get.deviceLocale,
|
routerDelegate: AppRouter.instance.routerDelegate,
|
||||||
fallbackLocale: const Locale('en', 'US'),
|
routeInformationParser: AppRouter.instance.routeInformationParser,
|
||||||
onInit: () => _initializeProviders(context),
|
routeInformationProvider: AppRouter.instance.routeInformationProvider,
|
||||||
builder: (context, child) {
|
backButtonDispatcher: AppRouter.instance.backButtonDispatcher,
|
||||||
return SystemShell(
|
translations: SolianMessages(),
|
||||||
child: ScaffoldMessenger(
|
locale: Get.deviceLocale,
|
||||||
child: child ?? const SizedBox(),
|
fallbackLocale: const Locale('en', 'US'),
|
||||||
),
|
onInit: () => _initializeProviders(context),
|
||||||
|
builder: (context, child) {
|
||||||
|
return SystemShell(
|
||||||
|
child: ScaffoldMessenger(
|
||||||
|
child: BootstrapperShell(
|
||||||
|
child: child ?? const SizedBox(),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
);
|
);
|
||||||
},
|
}),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
void _initializeProviders(BuildContext context) async {
|
void _initializeProviders(BuildContext context) async {
|
||||||
Get.lazyPut(() => AuthProvider());
|
Get.lazyPut(() => AuthProvider());
|
||||||
Get.lazyPut(() => FriendProvider());
|
Get.lazyPut(() => RelationshipProvider());
|
||||||
Get.lazyPut(() => PostProvider());
|
Get.lazyPut(() => PostProvider());
|
||||||
|
Get.lazyPut(() => StickerProvider());
|
||||||
Get.lazyPut(() => AttachmentProvider());
|
Get.lazyPut(() => AttachmentProvider());
|
||||||
Get.lazyPut(() => WebSocketProvider());
|
Get.lazyPut(() => WebSocketProvider());
|
||||||
Get.lazyPut(() => StatusProvider());
|
Get.lazyPut(() => StatusProvider());
|
||||||
Get.lazyPut(() => ChannelProvider());
|
Get.lazyPut(() => ChannelProvider());
|
||||||
Get.lazyPut(() => RealmProvider());
|
Get.lazyPut(() => RealmProvider());
|
||||||
Get.lazyPut(() => ChatCallProvider());
|
Get.lazyPut(() => ChatCallProvider());
|
||||||
|
Get.lazyPut(() => AttachmentUploaderController());
|
||||||
final AuthProvider auth = Get.find();
|
|
||||||
if (await auth.isAuthorized) {
|
|
||||||
Get.find<WebSocketProvider>().connect();
|
|
||||||
|
|
||||||
Get.find<ChannelProvider>().refreshAvailableChannel();
|
|
||||||
|
|
||||||
try {
|
|
||||||
Get.find<WebSocketProvider>().registerPushNotifications();
|
|
||||||
} catch (err) {
|
|
||||||
context.showSnackbar(
|
|
||||||
'pushNotifyRegisterFailed'.trParams({'reason': err.toString()}),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ class Attachment {
|
|||||||
int id;
|
int id;
|
||||||
DateTime createdAt;
|
DateTime createdAt;
|
||||||
DateTime updatedAt;
|
DateTime updatedAt;
|
||||||
dynamic deletedAt;
|
DateTime? deletedAt;
|
||||||
String uuid;
|
String uuid;
|
||||||
int size;
|
int size;
|
||||||
String name;
|
String name;
|
||||||
@@ -12,11 +12,12 @@ class Attachment {
|
|||||||
String usage;
|
String usage;
|
||||||
String mimetype;
|
String mimetype;
|
||||||
String hash;
|
String hash;
|
||||||
String destination;
|
int destination;
|
||||||
|
bool isAnalyzed;
|
||||||
Map<String, dynamic>? metadata;
|
Map<String, dynamic>? metadata;
|
||||||
bool isMature;
|
bool isMature;
|
||||||
Account account;
|
Account? account;
|
||||||
int accountId;
|
int? accountId;
|
||||||
|
|
||||||
Attachment({
|
Attachment({
|
||||||
required this.id,
|
required this.id,
|
||||||
@@ -31,6 +32,7 @@ class Attachment {
|
|||||||
required this.mimetype,
|
required this.mimetype,
|
||||||
required this.hash,
|
required this.hash,
|
||||||
required this.destination,
|
required this.destination,
|
||||||
|
required this.isAnalyzed,
|
||||||
required this.metadata,
|
required this.metadata,
|
||||||
required this.isMature,
|
required this.isMature,
|
||||||
required this.account,
|
required this.account,
|
||||||
@@ -41,7 +43,7 @@ class Attachment {
|
|||||||
id: json['id'],
|
id: json['id'],
|
||||||
createdAt: DateTime.parse(json['created_at']),
|
createdAt: DateTime.parse(json['created_at']),
|
||||||
updatedAt: DateTime.parse(json['updated_at']),
|
updatedAt: DateTime.parse(json['updated_at']),
|
||||||
deletedAt: json['deleted_at'],
|
deletedAt: json['deleted_at'] != null ? DateTime.parse(json['deleted_at']) : null,
|
||||||
uuid: json['uuid'],
|
uuid: json['uuid'],
|
||||||
size: json['size'],
|
size: json['size'],
|
||||||
name: json['name'],
|
name: json['name'],
|
||||||
@@ -50,9 +52,10 @@ class Attachment {
|
|||||||
mimetype: json['mimetype'],
|
mimetype: json['mimetype'],
|
||||||
hash: json['hash'],
|
hash: json['hash'],
|
||||||
destination: json['destination'],
|
destination: json['destination'],
|
||||||
|
isAnalyzed: json['is_analyzed'],
|
||||||
metadata: json['metadata'],
|
metadata: json['metadata'],
|
||||||
isMature: json['is_mature'],
|
isMature: json['is_mature'],
|
||||||
account: Account.fromJson(json['account']),
|
account: json['account'] != null ? Account.fromJson(json['account']) : null,
|
||||||
accountId: json['account_id'],
|
accountId: json['account_id'],
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -60,7 +63,7 @@ class Attachment {
|
|||||||
'id': id,
|
'id': id,
|
||||||
'created_at': createdAt.toIso8601String(),
|
'created_at': createdAt.toIso8601String(),
|
||||||
'updated_at': updatedAt.toIso8601String(),
|
'updated_at': updatedAt.toIso8601String(),
|
||||||
'deleted_at': deletedAt,
|
'deleted_at': deletedAt?.toIso8601String(),
|
||||||
'uuid': uuid,
|
'uuid': uuid,
|
||||||
'size': size,
|
'size': size,
|
||||||
'name': name,
|
'name': name,
|
||||||
@@ -69,9 +72,10 @@ class Attachment {
|
|||||||
'mimetype': mimetype,
|
'mimetype': mimetype,
|
||||||
'hash': hash,
|
'hash': hash,
|
||||||
'destination': destination,
|
'destination': destination,
|
||||||
|
'is_analyzed': isAnalyzed,
|
||||||
'metadata': metadata,
|
'metadata': metadata,
|
||||||
'is_mature': isMature,
|
'is_mature': isMature,
|
||||||
'account': account.toJson(),
|
'account': account?.toJson(),
|
||||||
'account_id': accountId,
|
'account_id': accountId,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -10,6 +10,7 @@ class Call {
|
|||||||
String externalId;
|
String externalId;
|
||||||
int founderId;
|
int founderId;
|
||||||
int channelId;
|
int channelId;
|
||||||
|
List<dynamic> participants;
|
||||||
Channel channel;
|
Channel channel;
|
||||||
|
|
||||||
Call({
|
Call({
|
||||||
@@ -21,6 +22,7 @@ class Call {
|
|||||||
required this.externalId,
|
required this.externalId,
|
||||||
required this.founderId,
|
required this.founderId,
|
||||||
required this.channelId,
|
required this.channelId,
|
||||||
|
required this.participants,
|
||||||
required this.channel,
|
required this.channel,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -34,6 +36,7 @@ class Call {
|
|||||||
externalId: json['external_id'],
|
externalId: json['external_id'],
|
||||||
founderId: json['founder_id'],
|
founderId: json['founder_id'],
|
||||||
channelId: json['channel_id'],
|
channelId: json['channel_id'],
|
||||||
|
participants: json['participants'] ?? List.empty(),
|
||||||
channel: Channel.fromJson(json['channel']),
|
channel: Channel.fromJson(json['channel']),
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -46,6 +49,7 @@ class Call {
|
|||||||
'external_id': externalId,
|
'external_id': externalId,
|
||||||
'founder_id': founderId,
|
'founder_id': founderId,
|
||||||
'channel_id': channelId,
|
'channel_id': channelId,
|
||||||
|
'participants': participants,
|
||||||
'channel': channel.toJson(),
|
'channel': channel.toJson(),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -63,6 +67,7 @@ class ParticipantTrack {
|
|||||||
{required this.participant,
|
{required this.participant,
|
||||||
required this.videoTrack,
|
required this.videoTrack,
|
||||||
required this.isScreenShare});
|
required this.isScreenShare});
|
||||||
|
|
||||||
VideoTrack? videoTrack;
|
VideoTrack? videoTrack;
|
||||||
Participant participant;
|
Participant participant;
|
||||||
bool isScreenShare;
|
bool isScreenShare;
|
||||||
|
|||||||
@@ -6,11 +6,13 @@ class Post {
|
|||||||
int id;
|
int id;
|
||||||
DateTime createdAt;
|
DateTime createdAt;
|
||||||
DateTime updatedAt;
|
DateTime updatedAt;
|
||||||
|
DateTime? editedAt;
|
||||||
DateTime? deletedAt;
|
DateTime? deletedAt;
|
||||||
dynamic body;
|
dynamic body;
|
||||||
List<Tag>? tags;
|
List<Tag>? tags;
|
||||||
List<Category>? categories;
|
List<Category>? categories;
|
||||||
List<Post>? replies;
|
List<Post>? replies;
|
||||||
|
String type;
|
||||||
int? replyId;
|
int? replyId;
|
||||||
int? repostId;
|
int? repostId;
|
||||||
int? realmId;
|
int? realmId;
|
||||||
@@ -18,6 +20,8 @@ class Post {
|
|||||||
Post? repostTo;
|
Post? repostTo;
|
||||||
Realm? realm;
|
Realm? realm;
|
||||||
DateTime? publishedAt;
|
DateTime? publishedAt;
|
||||||
|
DateTime? publishedUntil;
|
||||||
|
DateTime? pinnedAt;
|
||||||
bool? isDraft;
|
bool? isDraft;
|
||||||
int authorId;
|
int authorId;
|
||||||
Account author;
|
Account author;
|
||||||
@@ -27,7 +31,9 @@ class Post {
|
|||||||
required this.id,
|
required this.id,
|
||||||
required this.createdAt,
|
required this.createdAt,
|
||||||
required this.updatedAt,
|
required this.updatedAt,
|
||||||
|
required this.editedAt,
|
||||||
required this.deletedAt,
|
required this.deletedAt,
|
||||||
|
required this.type,
|
||||||
required this.body,
|
required this.body,
|
||||||
required this.tags,
|
required this.tags,
|
||||||
required this.categories,
|
required this.categories,
|
||||||
@@ -39,6 +45,8 @@ class Post {
|
|||||||
required this.repostTo,
|
required this.repostTo,
|
||||||
required this.realm,
|
required this.realm,
|
||||||
required this.publishedAt,
|
required this.publishedAt,
|
||||||
|
required this.publishedUntil,
|
||||||
|
required this.pinnedAt,
|
||||||
required this.isDraft,
|
required this.isDraft,
|
||||||
required this.authorId,
|
required this.authorId,
|
||||||
required this.author,
|
required this.author,
|
||||||
@@ -52,6 +60,7 @@ class Post {
|
|||||||
deletedAt: json['deleted_at'] != null
|
deletedAt: json['deleted_at'] != null
|
||||||
? DateTime.parse(json['deleted_at'])
|
? DateTime.parse(json['deleted_at'])
|
||||||
: null,
|
: null,
|
||||||
|
type: json['type'],
|
||||||
body: json['body'],
|
body: json['body'],
|
||||||
tags: json['tags']?.map((x) => Tag.fromJson(x)).toList().cast<Tag>(),
|
tags: json['tags']?.map((x) => Tag.fromJson(x)).toList().cast<Tag>(),
|
||||||
categories: json['categories']
|
categories: json['categories']
|
||||||
@@ -67,9 +76,18 @@ class Post {
|
|||||||
repostTo:
|
repostTo:
|
||||||
json['repost_to'] != null ? Post.fromJson(json['repost_to']) : null,
|
json['repost_to'] != null ? Post.fromJson(json['repost_to']) : null,
|
||||||
realm: json['realm'] != null ? Realm.fromJson(json['realm']) : null,
|
realm: json['realm'] != null ? Realm.fromJson(json['realm']) : null,
|
||||||
|
editedAt: json['edited_at'] != null
|
||||||
|
? DateTime.parse(json['edited_at'])
|
||||||
|
: null,
|
||||||
publishedAt: json['published_at'] != null
|
publishedAt: json['published_at'] != null
|
||||||
? DateTime.parse(json['published_at'])
|
? DateTime.parse(json['published_at'])
|
||||||
: null,
|
: null,
|
||||||
|
publishedUntil: json['published_until'] != null
|
||||||
|
? DateTime.parse(json['published_until'])
|
||||||
|
: null,
|
||||||
|
pinnedAt: json['pinned_at'] != null
|
||||||
|
? DateTime.parse(json['pinned_at'])
|
||||||
|
: null,
|
||||||
isDraft: json['is_draft'],
|
isDraft: json['is_draft'],
|
||||||
authorId: json['author_id'],
|
authorId: json['author_id'],
|
||||||
author: Account.fromJson(json['author']),
|
author: Account.fromJson(json['author']),
|
||||||
@@ -81,7 +99,9 @@ class Post {
|
|||||||
'id': id,
|
'id': id,
|
||||||
'created_at': createdAt.toIso8601String(),
|
'created_at': createdAt.toIso8601String(),
|
||||||
'updated_at': updatedAt.toIso8601String(),
|
'updated_at': updatedAt.toIso8601String(),
|
||||||
'deleted_at': deletedAt,
|
'edited_at': editedAt?.toIso8601String(),
|
||||||
|
'deleted_at': deletedAt?.toIso8601String(),
|
||||||
|
'type': type,
|
||||||
'body': body,
|
'body': body,
|
||||||
'tags': tags,
|
'tags': tags,
|
||||||
'categories': categories,
|
'categories': categories,
|
||||||
@@ -93,6 +113,8 @@ class Post {
|
|||||||
'repost_to': repostTo?.toJson(),
|
'repost_to': repostTo?.toJson(),
|
||||||
'realm': realm?.toJson(),
|
'realm': realm?.toJson(),
|
||||||
'published_at': publishedAt?.toIso8601String(),
|
'published_at': publishedAt?.toIso8601String(),
|
||||||
|
'published_until': publishedUntil?.toIso8601String(),
|
||||||
|
'pinned_at': pinnedAt?.toIso8601String(),
|
||||||
'is_draft': isDraft,
|
'is_draft': isDraft,
|
||||||
'author_id': authorId,
|
'author_id': authorId,
|
||||||
'author': author.toJson(),
|
'author': author.toJson(),
|
||||||
|
|||||||
@@ -52,6 +52,17 @@ class Realm {
|
|||||||
'is_community': isCommunity,
|
'is_community': isCommunity,
|
||||||
'account_id': accountId,
|
'account_id': accountId,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@override
|
||||||
|
bool operator ==(Object other) {
|
||||||
|
if (other is Realm) {
|
||||||
|
return other.id == id;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
int get hashCode => id;
|
||||||
}
|
}
|
||||||
|
|
||||||
class RealmMember {
|
class RealmMember {
|
||||||
|
|||||||
@@ -1,38 +1,35 @@
|
|||||||
import 'package:solian/models/account.dart';
|
import 'package:solian/models/account.dart';
|
||||||
|
|
||||||
class Friendship {
|
class Relationship {
|
||||||
int id;
|
int id;
|
||||||
DateTime createdAt;
|
DateTime createdAt;
|
||||||
DateTime updatedAt;
|
DateTime updatedAt;
|
||||||
DateTime? deletedAt;
|
DateTime? deletedAt;
|
||||||
int accountId;
|
int accountId;
|
||||||
int relatedId;
|
int relatedId;
|
||||||
int? blockedBy;
|
|
||||||
Account account;
|
Account account;
|
||||||
Account related;
|
Account related;
|
||||||
int status;
|
int status;
|
||||||
|
|
||||||
Friendship({
|
Relationship({
|
||||||
required this.id,
|
required this.id,
|
||||||
required this.createdAt,
|
required this.createdAt,
|
||||||
required this.updatedAt,
|
required this.updatedAt,
|
||||||
required this.deletedAt,
|
required this.deletedAt,
|
||||||
required this.accountId,
|
required this.accountId,
|
||||||
required this.relatedId,
|
required this.relatedId,
|
||||||
required this.blockedBy,
|
|
||||||
required this.account,
|
required this.account,
|
||||||
required this.related,
|
required this.related,
|
||||||
required this.status,
|
required this.status,
|
||||||
});
|
});
|
||||||
|
|
||||||
factory Friendship.fromJson(Map<String, dynamic> json) => Friendship(
|
factory Relationship.fromJson(Map<String, dynamic> json) => Relationship(
|
||||||
id: json['id'],
|
id: json['id'],
|
||||||
createdAt: DateTime.parse(json['created_at']),
|
createdAt: DateTime.parse(json['created_at']),
|
||||||
updatedAt: DateTime.parse(json['updated_at']),
|
updatedAt: DateTime.parse(json['updated_at']),
|
||||||
deletedAt: json['deleted_at'],
|
deletedAt: json['deleted_at'],
|
||||||
accountId: json['account_id'],
|
accountId: json['account_id'],
|
||||||
relatedId: json['related_id'],
|
relatedId: json['related_id'],
|
||||||
blockedBy: json['blocked_by'],
|
|
||||||
account: Account.fromJson(json['account']),
|
account: Account.fromJson(json['account']),
|
||||||
related: Account.fromJson(json['related']),
|
related: Account.fromJson(json['related']),
|
||||||
status: json['status'],
|
status: json['status'],
|
||||||
@@ -45,17 +42,8 @@ class Friendship {
|
|||||||
'deleted_at': deletedAt,
|
'deleted_at': deletedAt,
|
||||||
'account_id': accountId,
|
'account_id': accountId,
|
||||||
'related_id': relatedId,
|
'related_id': relatedId,
|
||||||
'blocked_by': blockedBy,
|
|
||||||
'account': account.toJson(),
|
'account': account.toJson(),
|
||||||
'related': related.toJson(),
|
'related': related.toJson(),
|
||||||
'status': status,
|
'status': status,
|
||||||
};
|
};
|
||||||
|
|
||||||
Account getOtherside(int selfId) {
|
|
||||||
if (accountId != selfId) {
|
|
||||||
return account;
|
|
||||||
} else {
|
|
||||||
return related;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
131
lib/models/stickers.dart
Normal file
@@ -0,0 +1,131 @@
|
|||||||
|
import 'package:solian/models/account.dart';
|
||||||
|
import 'package:solian/models/attachment.dart';
|
||||||
|
import 'package:solian/services.dart';
|
||||||
|
|
||||||
|
class Sticker {
|
||||||
|
int id;
|
||||||
|
DateTime createdAt;
|
||||||
|
DateTime updatedAt;
|
||||||
|
DateTime? deletedAt;
|
||||||
|
String alias;
|
||||||
|
String name;
|
||||||
|
int attachmentId;
|
||||||
|
Attachment attachment;
|
||||||
|
int packId;
|
||||||
|
StickerPack? pack;
|
||||||
|
int accountId;
|
||||||
|
Account account;
|
||||||
|
|
||||||
|
Sticker({
|
||||||
|
required this.id,
|
||||||
|
required this.createdAt,
|
||||||
|
required this.updatedAt,
|
||||||
|
required this.deletedAt,
|
||||||
|
required this.alias,
|
||||||
|
required this.name,
|
||||||
|
required this.attachmentId,
|
||||||
|
required this.attachment,
|
||||||
|
required this.packId,
|
||||||
|
required this.pack,
|
||||||
|
required this.accountId,
|
||||||
|
required this.account,
|
||||||
|
});
|
||||||
|
|
||||||
|
String get textPlaceholder => '${pack?.prefix}$alias';
|
||||||
|
String get textWarpedPlaceholder => ':$textPlaceholder:';
|
||||||
|
|
||||||
|
String get imageUrl => ServiceFinder.buildUrl(
|
||||||
|
'files',
|
||||||
|
'/attachments/$attachmentId',
|
||||||
|
);
|
||||||
|
|
||||||
|
factory Sticker.fromJson(Map<String, dynamic> json) => Sticker(
|
||||||
|
id: json['id'],
|
||||||
|
createdAt: DateTime.parse(json['created_at']),
|
||||||
|
updatedAt: DateTime.parse(json['updated_at']),
|
||||||
|
deletedAt: json['deleted_at'] != null
|
||||||
|
? DateTime.parse(json['deleted_at'])
|
||||||
|
: json['deleted_at'],
|
||||||
|
alias: json['alias'],
|
||||||
|
name: json['name'],
|
||||||
|
attachmentId: json['attachment_id'],
|
||||||
|
attachment: Attachment.fromJson(json['attachment']),
|
||||||
|
packId: json['pack_id'],
|
||||||
|
pack: json['pack'] != null ? StickerPack.fromJson(json['pack']) : null,
|
||||||
|
accountId: json['account_id'],
|
||||||
|
account: Account.fromJson(json['account']),
|
||||||
|
);
|
||||||
|
|
||||||
|
Map<String, dynamic> toJson() => {
|
||||||
|
'id': id,
|
||||||
|
'created_at': createdAt.toIso8601String(),
|
||||||
|
'updated_at': updatedAt.toIso8601String(),
|
||||||
|
'deleted_at': deletedAt?.toIso8601String(),
|
||||||
|
'alias': alias,
|
||||||
|
'name': name,
|
||||||
|
'attachment_id': attachmentId,
|
||||||
|
'attachment': attachment.toJson(),
|
||||||
|
'pack_id': packId,
|
||||||
|
'account_id': accountId,
|
||||||
|
'account': account.toJson(),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
class StickerPack {
|
||||||
|
int id;
|
||||||
|
DateTime createdAt;
|
||||||
|
DateTime updatedAt;
|
||||||
|
DateTime? deletedAt;
|
||||||
|
String prefix;
|
||||||
|
String name;
|
||||||
|
String description;
|
||||||
|
List<Sticker>? stickers;
|
||||||
|
int accountId;
|
||||||
|
Account account;
|
||||||
|
|
||||||
|
StickerPack({
|
||||||
|
required this.id,
|
||||||
|
required this.createdAt,
|
||||||
|
required this.updatedAt,
|
||||||
|
required this.deletedAt,
|
||||||
|
required this.prefix,
|
||||||
|
required this.name,
|
||||||
|
required this.description,
|
||||||
|
required this.stickers,
|
||||||
|
required this.accountId,
|
||||||
|
required this.account,
|
||||||
|
});
|
||||||
|
|
||||||
|
factory StickerPack.fromJson(Map<String, dynamic> json) => StickerPack(
|
||||||
|
id: json['id'],
|
||||||
|
createdAt: DateTime.parse(json['created_at']),
|
||||||
|
updatedAt: DateTime.parse(json['updated_at']),
|
||||||
|
deletedAt: json['deleted_at'] != null
|
||||||
|
? DateTime.parse(json['deleted_at'])
|
||||||
|
: json['deleted_at'],
|
||||||
|
prefix: json['prefix'],
|
||||||
|
name: json['name'],
|
||||||
|
description: json['description'],
|
||||||
|
stickers: json['stickers'] == null
|
||||||
|
? []
|
||||||
|
: List<Sticker>.from(
|
||||||
|
json['stickers']!.map((x) => Sticker.fromJson(x))),
|
||||||
|
accountId: json['account_id'],
|
||||||
|
account: Account.fromJson(json['account']),
|
||||||
|
);
|
||||||
|
|
||||||
|
Map<String, dynamic> toJson() => {
|
||||||
|
'id': id,
|
||||||
|
'created_at': createdAt.toIso8601String(),
|
||||||
|
'updated_at': updatedAt.toIso8601String(),
|
||||||
|
'deleted_at': deletedAt?.toIso8601String(),
|
||||||
|
'prefix': prefix,
|
||||||
|
'name': name,
|
||||||
|
'description': description,
|
||||||
|
'stickers': stickers == null
|
||||||
|
? []
|
||||||
|
: List<dynamic>.from(stickers!.map((x) => x.toJson())),
|
||||||
|
'account_id': accountId,
|
||||||
|
'account': account.toJson(),
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -33,7 +33,7 @@ class StatusProvider extends GetConnect {
|
|||||||
|
|
||||||
Future<Response> getCurrentStatus() async {
|
Future<Response> getCurrentStatus() async {
|
||||||
final AuthProvider auth = Get.find();
|
final AuthProvider auth = Get.find();
|
||||||
if (!await auth.isAuthorized) throw Exception('unauthorized');
|
if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
|
||||||
|
|
||||||
final client = auth.configureClient('auth');
|
final client = auth.configureClient('auth');
|
||||||
|
|
||||||
@@ -53,7 +53,7 @@ class StatusProvider extends GetConnect {
|
|||||||
DateTime? clearAt,
|
DateTime? clearAt,
|
||||||
}) async {
|
}) async {
|
||||||
final AuthProvider auth = Get.find();
|
final AuthProvider auth = Get.find();
|
||||||
if (!await auth.isAuthorized) throw Exception('unauthorized');
|
if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
|
||||||
|
|
||||||
final client = auth.configureClient('auth');
|
final client = auth.configureClient('auth');
|
||||||
|
|
||||||
@@ -82,7 +82,7 @@ class StatusProvider extends GetConnect {
|
|||||||
|
|
||||||
Future<Response> clearStatus() async {
|
Future<Response> clearStatus() async {
|
||||||
final AuthProvider auth = Get.find();
|
final AuthProvider auth = Get.find();
|
||||||
if (!await auth.isAuthorized) throw Exception('unauthorized');
|
if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
|
||||||
|
|
||||||
final client = auth.configureClient('auth');
|
final client = auth.configureClient('auth');
|
||||||
|
|
||||||
|
|||||||
215
lib/providers/attachment_uploader.dart
Normal file
@@ -0,0 +1,215 @@
|
|||||||
|
import 'dart:async';
|
||||||
|
import 'dart:io';
|
||||||
|
import 'dart:typed_data';
|
||||||
|
|
||||||
|
import 'package:get/get.dart';
|
||||||
|
import 'package:solian/models/attachment.dart';
|
||||||
|
import 'package:solian/providers/content/attachment.dart';
|
||||||
|
|
||||||
|
class AttachmentUploadTask {
|
||||||
|
File file;
|
||||||
|
String usage;
|
||||||
|
Map<String, dynamic>? metadata;
|
||||||
|
|
||||||
|
double progress = 0;
|
||||||
|
bool isUploading = false;
|
||||||
|
bool isCompleted = false;
|
||||||
|
dynamic error;
|
||||||
|
|
||||||
|
AttachmentUploadTask({
|
||||||
|
required this.file,
|
||||||
|
required this.usage,
|
||||||
|
this.metadata,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
class AttachmentUploaderController extends GetxController {
|
||||||
|
RxBool isUploading = false.obs;
|
||||||
|
RxDouble progressOfUpload = 0.0.obs;
|
||||||
|
RxList<AttachmentUploadTask> queueOfUpload = RxList.empty(growable: true);
|
||||||
|
|
||||||
|
Timer? _progressSyncTimer;
|
||||||
|
double _progressOfUpload = 0.0;
|
||||||
|
|
||||||
|
void _syncProgress() {
|
||||||
|
progressOfUpload.value = _progressOfUpload;
|
||||||
|
queueOfUpload.refresh();
|
||||||
|
}
|
||||||
|
|
||||||
|
void _startProgressSyncTimer() {
|
||||||
|
if (_progressSyncTimer != null) {
|
||||||
|
_progressSyncTimer!.cancel();
|
||||||
|
}
|
||||||
|
_progressSyncTimer = Timer.periodic(
|
||||||
|
const Duration(milliseconds: 500),
|
||||||
|
(_) => _syncProgress(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
void _stopProgressSyncTimer() {
|
||||||
|
if (_progressSyncTimer == null) return;
|
||||||
|
_progressSyncTimer!.cancel();
|
||||||
|
_progressSyncTimer = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
void enqueueTask(AttachmentUploadTask task) {
|
||||||
|
if (isUploading.value) throw Exception('uploading blocked');
|
||||||
|
queueOfUpload.add(task);
|
||||||
|
}
|
||||||
|
|
||||||
|
void enqueueTaskBatch(Iterable<AttachmentUploadTask> tasks) {
|
||||||
|
if (isUploading.value) throw Exception('uploading blocked');
|
||||||
|
queueOfUpload.addAll(tasks);
|
||||||
|
}
|
||||||
|
|
||||||
|
void dequeueTask(AttachmentUploadTask task) {
|
||||||
|
if (isUploading.value) throw Exception('uploading blocked');
|
||||||
|
queueOfUpload.remove(task);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<Attachment?> performSingleTask(int queueIndex) async {
|
||||||
|
isUploading.value = true;
|
||||||
|
progressOfUpload.value = 0;
|
||||||
|
|
||||||
|
_startProgressSyncTimer();
|
||||||
|
queueOfUpload[queueIndex].isUploading = true;
|
||||||
|
|
||||||
|
final task = queueOfUpload[queueIndex];
|
||||||
|
final result = await _rawUploadAttachment(
|
||||||
|
await task.file.readAsBytes(),
|
||||||
|
task.file.path,
|
||||||
|
task.usage,
|
||||||
|
null,
|
||||||
|
onProgress: (value) {
|
||||||
|
queueOfUpload[queueIndex].progress = value;
|
||||||
|
_progressOfUpload = value;
|
||||||
|
},
|
||||||
|
onError: (err) {
|
||||||
|
queueOfUpload[queueIndex].error = err;
|
||||||
|
queueOfUpload[queueIndex].isUploading = false;
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
if (queueOfUpload[queueIndex].error == null) {
|
||||||
|
queueOfUpload.removeAt(queueIndex);
|
||||||
|
}
|
||||||
|
_stopProgressSyncTimer();
|
||||||
|
_syncProgress();
|
||||||
|
|
||||||
|
isUploading.value = false;
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> performUploadQueue({
|
||||||
|
required Function(Attachment item) onData,
|
||||||
|
}) async {
|
||||||
|
isUploading.value = true;
|
||||||
|
progressOfUpload.value = 0;
|
||||||
|
|
||||||
|
_startProgressSyncTimer();
|
||||||
|
|
||||||
|
for (var idx = 0; idx < queueOfUpload.length; idx++) {
|
||||||
|
if (queueOfUpload[idx].isUploading || queueOfUpload[idx].error != null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
queueOfUpload[idx].isUploading = true;
|
||||||
|
|
||||||
|
final task = queueOfUpload[idx];
|
||||||
|
final result = await _rawUploadAttachment(
|
||||||
|
await task.file.readAsBytes(),
|
||||||
|
task.file.path,
|
||||||
|
task.usage,
|
||||||
|
null,
|
||||||
|
onProgress: (value) {
|
||||||
|
queueOfUpload[idx].progress = value;
|
||||||
|
_progressOfUpload = (idx + value) / queueOfUpload.length;
|
||||||
|
},
|
||||||
|
onError: (err) {
|
||||||
|
queueOfUpload[idx].error = err;
|
||||||
|
queueOfUpload[idx].isUploading = false;
|
||||||
|
},
|
||||||
|
);
|
||||||
|
_progressOfUpload = (idx + 1) / queueOfUpload.length;
|
||||||
|
if (result != null) onData(result);
|
||||||
|
|
||||||
|
queueOfUpload[idx].isUploading = false;
|
||||||
|
queueOfUpload[idx].isCompleted = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
queueOfUpload.value = queueOfUpload
|
||||||
|
.where((x) => x.error == null && x.isCompleted)
|
||||||
|
.toList(growable: true);
|
||||||
|
_stopProgressSyncTimer();
|
||||||
|
_syncProgress();
|
||||||
|
|
||||||
|
isUploading.value = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> uploadAttachmentWithCallback(
|
||||||
|
Uint8List data,
|
||||||
|
String path,
|
||||||
|
String usage,
|
||||||
|
Map<String, dynamic>? metadata,
|
||||||
|
Function(Attachment?) callback,
|
||||||
|
) async {
|
||||||
|
if (isUploading.value) throw Exception('uploading blocked');
|
||||||
|
|
||||||
|
isUploading.value = true;
|
||||||
|
final result = await _rawUploadAttachment(
|
||||||
|
data,
|
||||||
|
path,
|
||||||
|
usage,
|
||||||
|
metadata,
|
||||||
|
onProgress: (progress) {
|
||||||
|
progressOfUpload.value = progress;
|
||||||
|
},
|
||||||
|
);
|
||||||
|
isUploading.value = false;
|
||||||
|
callback(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<Attachment?> uploadAttachment(
|
||||||
|
Uint8List data,
|
||||||
|
String path,
|
||||||
|
String usage,
|
||||||
|
Map<String, dynamic>? metadata,
|
||||||
|
) async {
|
||||||
|
if (isUploading.value) throw Exception('uploading blocked');
|
||||||
|
|
||||||
|
isUploading.value = true;
|
||||||
|
final result = await _rawUploadAttachment(
|
||||||
|
data,
|
||||||
|
path,
|
||||||
|
usage,
|
||||||
|
metadata,
|
||||||
|
onProgress: (progress) {
|
||||||
|
progressOfUpload.value = progress;
|
||||||
|
},
|
||||||
|
);
|
||||||
|
isUploading.value = false;
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<Attachment?> _rawUploadAttachment(
|
||||||
|
Uint8List data, String path, String usage, Map<String, dynamic>? metadata,
|
||||||
|
{Function(double)? onProgress, Function(dynamic err)? onError}) async {
|
||||||
|
final AttachmentProvider provider = Get.find();
|
||||||
|
try {
|
||||||
|
final result = await provider.createAttachment(
|
||||||
|
data,
|
||||||
|
path,
|
||||||
|
usage,
|
||||||
|
metadata,
|
||||||
|
onProgress: onProgress,
|
||||||
|
);
|
||||||
|
return result;
|
||||||
|
} catch (err) {
|
||||||
|
if (onError != null) {
|
||||||
|
onError(err);
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -6,7 +6,6 @@ import 'package:flutter/material.dart';
|
|||||||
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
|
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
|
||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
import 'package:get/get_connect/http/src/request/request.dart';
|
import 'package:get/get_connect/http/src/request/request.dart';
|
||||||
import 'package:mutex/mutex.dart';
|
|
||||||
import 'package:solian/controllers/chat_events_controller.dart';
|
import 'package:solian/controllers/chat_events_controller.dart';
|
||||||
import 'package:solian/providers/websocket.dart';
|
import 'package:solian/providers/websocket.dart';
|
||||||
import 'package:solian/services.dart';
|
import 'package:solian/services.dart';
|
||||||
@@ -55,17 +54,27 @@ class AuthProvider extends GetConnect {
|
|||||||
static const storage = FlutterSecureStorage();
|
static const storage = FlutterSecureStorage();
|
||||||
|
|
||||||
TokenSet? credentials;
|
TokenSet? credentials;
|
||||||
Mutex credentialsRefreshMutex = Mutex();
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void onInit() {
|
void onInit() {
|
||||||
httpClient.baseUrl = ServiceFinder.buildUrl('auth', null);
|
httpClient.baseUrl = ServiceFinder.buildUrl('auth', null);
|
||||||
loadCredentials();
|
refreshAuthorizeStatus().then((_) {
|
||||||
|
loadCredentials();
|
||||||
|
refreshUserProfile();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Completer<void>? _refreshCompleter;
|
||||||
|
|
||||||
Future<void> refreshCredentials() async {
|
Future<void> refreshCredentials() async {
|
||||||
|
if (_refreshCompleter != null) {
|
||||||
|
await _refreshCompleter!.future;
|
||||||
|
return;
|
||||||
|
} else {
|
||||||
|
_refreshCompleter = Completer<void>();
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
credentialsRefreshMutex.acquire();
|
|
||||||
if (!credentials!.isExpired) return;
|
if (!credentials!.isExpired) return;
|
||||||
final resp = await post('/auth/token', {
|
final resp = await post('/auth/token', {
|
||||||
'refresh_token': credentials!.refreshToken,
|
'refresh_token': credentials!.refreshToken,
|
||||||
@@ -83,10 +92,13 @@ class AuthProvider extends GetConnect {
|
|||||||
key: 'auth_credentials',
|
key: 'auth_credentials',
|
||||||
value: jsonEncode(credentials!.toJson()),
|
value: jsonEncode(credentials!.toJson()),
|
||||||
);
|
);
|
||||||
} catch (_) {
|
_refreshCompleter!.complete();
|
||||||
|
log('Refreshed credentials at ${DateTime.now()}');
|
||||||
|
} catch (e) {
|
||||||
|
_refreshCompleter!.completeError(e);
|
||||||
rethrow;
|
rethrow;
|
||||||
} finally {
|
} finally {
|
||||||
credentialsRefreshMutex.release();
|
_refreshCompleter = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -116,17 +128,16 @@ class AuthProvider extends GetConnect {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Future<void> ensureCredentials() async {
|
Future<void> ensureCredentials() async {
|
||||||
if (!await isAuthorized) throw Exception('unauthorized');
|
if (isAuthorized.isFalse) throw Exception('unauthorized');
|
||||||
if (credentials == null) await loadCredentials();
|
if (credentials == null) await loadCredentials();
|
||||||
|
|
||||||
if (credentials!.isExpired) {
|
if (credentials!.isExpired) {
|
||||||
await refreshCredentials();
|
await refreshCredentials();
|
||||||
log('Refreshed credentials at ${DateTime.now()}');
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> loadCredentials() async {
|
Future<void> loadCredentials() async {
|
||||||
if (await isAuthorized) {
|
if (isAuthorized.isTrue) {
|
||||||
final content = await storage.read(key: 'auth_credentials');
|
final content = await storage.read(key: 'auth_credentials');
|
||||||
credentials = TokenSet.fromJson(jsonDecode(content!));
|
credentials = TokenSet.fromJson(jsonDecode(content!));
|
||||||
}
|
}
|
||||||
@@ -137,7 +148,7 @@ class AuthProvider extends GetConnect {
|
|||||||
String username,
|
String username,
|
||||||
String password,
|
String password,
|
||||||
) async {
|
) async {
|
||||||
_cachedUserProfileResponse = null;
|
userProfile.value = null;
|
||||||
|
|
||||||
final client = ServiceFinder.configureClient('auth');
|
final client = ServiceFinder.configureClient('auth');
|
||||||
|
|
||||||
@@ -179,7 +190,8 @@ class AuthProvider extends GetConnect {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void signout() {
|
void signout() {
|
||||||
_cachedUserProfileResponse = null;
|
isAuthorized.value = false;
|
||||||
|
userProfile.value = null;
|
||||||
|
|
||||||
Get.find<WebSocketProvider>().disconnect();
|
Get.find<WebSocketProvider>().disconnect();
|
||||||
Get.find<WebSocketProvider>().notifications.clear();
|
Get.find<WebSocketProvider>().notifications.clear();
|
||||||
@@ -195,30 +207,20 @@ class AuthProvider extends GetConnect {
|
|||||||
|
|
||||||
// Data Layer
|
// Data Layer
|
||||||
|
|
||||||
Response? _cachedUserProfileResponse;
|
RxBool isAuthorized = false.obs;
|
||||||
|
Rx<Map<String, dynamic>?> userProfile = Rx(null);
|
||||||
|
|
||||||
Future<bool> get isAuthorized => storage.containsKey(key: 'auth_credentials');
|
Future<void> refreshAuthorizeStatus() async {
|
||||||
|
isAuthorized.value = await storage.containsKey(key: 'auth_credentials');
|
||||||
Future<Response> getProfile({noCache = false}) async {
|
}
|
||||||
if (!noCache && _cachedUserProfileResponse != null) {
|
|
||||||
return _cachedUserProfileResponse!;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
Future<void> refreshUserProfile() async {
|
||||||
final client = configureClient('auth');
|
final client = configureClient('auth');
|
||||||
|
|
||||||
final resp = await client.get('/users/me');
|
final resp = await client.get('/users/me');
|
||||||
if (resp.statusCode != 200) {
|
if (resp.statusCode != 200) {
|
||||||
throw Exception(resp.bodyString);
|
throw Exception(resp.bodyString);
|
||||||
} else {
|
|
||||||
_cachedUserProfileResponse = resp;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return resp;
|
userProfile.value = resp.body;
|
||||||
}
|
|
||||||
|
|
||||||
Future<Response?> getProfileWithCheck({noCache = false}) async {
|
|
||||||
if (!await isAuthorized) return null;
|
|
||||||
|
|
||||||
return await getProfile(noCache: noCache);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ class ChatCallProvider extends GetxController {
|
|||||||
|
|
||||||
RxBool isReady = false.obs;
|
RxBool isReady = false.obs;
|
||||||
RxBool isMounted = false.obs;
|
RxBool isMounted = false.obs;
|
||||||
|
RxBool isInitialized = false.obs;
|
||||||
|
|
||||||
String? token;
|
String? token;
|
||||||
String? endpoint;
|
String? endpoint;
|
||||||
@@ -55,7 +56,7 @@ class ChatCallProvider extends GetxController {
|
|||||||
|
|
||||||
Future<(String, String)> getRoomToken() async {
|
Future<(String, String)> getRoomToken() async {
|
||||||
final AuthProvider auth = Get.find();
|
final AuthProvider auth = Get.find();
|
||||||
if (!await auth.isAuthorized) throw Exception('unauthorized');
|
if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
|
||||||
|
|
||||||
final client = auth.configureClient('messaging');
|
final client = auth.configureClient('messaging');
|
||||||
|
|
||||||
@@ -151,6 +152,8 @@ class ChatCallProvider extends GetxController {
|
|||||||
void onRoomDidUpdate() => sortParticipants();
|
void onRoomDidUpdate() => sortParticipants();
|
||||||
|
|
||||||
void setupRoom() {
|
void setupRoom() {
|
||||||
|
if(isInitialized.value) return;
|
||||||
|
|
||||||
sortParticipants();
|
sortParticipants();
|
||||||
room.addListener(onRoomDidUpdate);
|
room.addListener(onRoomDidUpdate);
|
||||||
WidgetsBindingCompatible.instance?.addPostFrameCallback(
|
WidgetsBindingCompatible.instance?.addPostFrameCallback(
|
||||||
@@ -160,6 +163,8 @@ class ChatCallProvider extends GetxController {
|
|||||||
if (lkPlatformIsMobile()) {
|
if (lkPlatformIsMobile()) {
|
||||||
Hardware.instance.setSpeakerphoneOn(true);
|
Hardware.instance.setSpeakerphoneOn(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
isInitialized.value = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void setupRoomListeners({
|
void setupRoomListeners({
|
||||||
@@ -362,6 +367,7 @@ class ChatCallProvider extends GetxController {
|
|||||||
|
|
||||||
void disposeRoom() {
|
void disposeRoom() {
|
||||||
isMounted.value = false;
|
isMounted.value = false;
|
||||||
|
isInitialized.value = false;
|
||||||
current.value = null;
|
current.value = null;
|
||||||
channel.value = null;
|
channel.value = null;
|
||||||
room.removeListener(onRoomDidUpdate);
|
room.removeListener(onRoomDidUpdate);
|
||||||
@@ -1,58 +1,13 @@
|
|||||||
import 'dart:convert';
|
import 'dart:convert';
|
||||||
import 'dart:io';
|
|
||||||
import 'dart:isolate';
|
|
||||||
import 'dart:typed_data';
|
import 'dart:typed_data';
|
||||||
|
|
||||||
import 'package:crypto/crypto.dart';
|
|
||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
import 'package:path/path.dart';
|
import 'package:path/path.dart';
|
||||||
import 'package:solian/platform.dart';
|
import 'package:solian/models/attachment.dart';
|
||||||
|
import 'package:solian/models/pagination.dart';
|
||||||
import 'package:solian/providers/auth.dart';
|
import 'package:solian/providers/auth.dart';
|
||||||
import 'package:solian/services.dart';
|
import 'package:solian/services.dart';
|
||||||
import 'package:image/image.dart' as img;
|
import 'package:dio/dio.dart' as dio;
|
||||||
|
|
||||||
Future<String> calculateBytesSha256(Uint8List data) async {
|
|
||||||
Digest digest;
|
|
||||||
if (PlatformInfo.isWeb) {
|
|
||||||
digest = sha256.convert(data);
|
|
||||||
} else {
|
|
||||||
digest = await Isolate.run(() => sha256.convert(data));
|
|
||||||
}
|
|
||||||
return digest.toString();
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<String> calculateFileSha256(File file) async {
|
|
||||||
Uint8List bytes;
|
|
||||||
if (PlatformInfo.isWeb) {
|
|
||||||
bytes = await file.readAsBytes();
|
|
||||||
} else {
|
|
||||||
bytes = await Isolate.run(() => file.readAsBytesSync());
|
|
||||||
}
|
|
||||||
return await calculateBytesSha256(bytes);
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<Map<String, dynamic>> calculateImageData(Uint8List data) async {
|
|
||||||
if (PlatformInfo.isWeb) {
|
|
||||||
return {};
|
|
||||||
}
|
|
||||||
final decoder = await Isolate.run(() => img.findDecoderForData(data));
|
|
||||||
if (decoder == null) return {};
|
|
||||||
final image = await Isolate.run(() => decoder.decode(data));
|
|
||||||
if (image == null) return {};
|
|
||||||
return {
|
|
||||||
'width': image.width,
|
|
||||||
'height': image.height,
|
|
||||||
'ratio': image.width / image.height
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<Map<String, dynamic>> calculateImageMetaFromFile(File file) async {
|
|
||||||
if (PlatformInfo.isWeb) {
|
|
||||||
return {};
|
|
||||||
}
|
|
||||||
final bytes = await Isolate.run(() => file.readAsBytesSync());
|
|
||||||
return await calculateImageData(bytes);
|
|
||||||
}
|
|
||||||
|
|
||||||
class AttachmentProvider extends GetConnect {
|
class AttachmentProvider extends GetConnect {
|
||||||
static Map<String, String> mimetypeOverrides = {
|
static Map<String, String> mimetypeOverrides = {
|
||||||
@@ -65,35 +20,79 @@ class AttachmentProvider extends GetConnect {
|
|||||||
httpClient.baseUrl = ServiceFinder.buildUrl('files', null);
|
httpClient.baseUrl = ServiceFinder.buildUrl('files', null);
|
||||||
}
|
}
|
||||||
|
|
||||||
final Map<int, Response> _cachedResponses = {};
|
final Map<int, Attachment> _cachedResponses = {};
|
||||||
|
|
||||||
Future<Response> getMetadata(int id, {noCache = false}) async {
|
Future<List<Attachment?>> listMetadata(
|
||||||
|
List<int> id, {
|
||||||
|
noCache = false,
|
||||||
|
}) async {
|
||||||
|
if (id.isEmpty) return List.empty();
|
||||||
|
|
||||||
|
List<Attachment?> result = List.filled(id.length, null);
|
||||||
|
List<int> pendingQuery = List.empty(growable: true);
|
||||||
|
if (!noCache) {
|
||||||
|
for (var idx = 0; idx < id.length; idx++) {
|
||||||
|
if (_cachedResponses.containsKey(id[idx])) {
|
||||||
|
result[idx] = _cachedResponses[id[idx]];
|
||||||
|
} else {
|
||||||
|
pendingQuery.add(id[idx]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
final resp = await get(
|
||||||
|
'/attachments?take=${pendingQuery.length}&id=${pendingQuery.join(',')}',
|
||||||
|
);
|
||||||
|
if (resp.statusCode != 200) return result;
|
||||||
|
|
||||||
|
final rawOut = PaginationResult.fromJson(resp.body);
|
||||||
|
if (rawOut.data == null) return result;
|
||||||
|
|
||||||
|
final List<Attachment> out =
|
||||||
|
rawOut.data!.map((x) => Attachment.fromJson(x)).toList();
|
||||||
|
for (final item in out) {
|
||||||
|
if (item.destination != 0 && item.isAnalyzed) {
|
||||||
|
_cachedResponses[item.id] = item;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (var i = 0; i < out.length; i++) {
|
||||||
|
for (var j = 0; j < id.length; j++) {
|
||||||
|
if (out[i].id == id[j]) {
|
||||||
|
result[j] = out[i];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<Attachment?> getMetadata(int id, {noCache = false}) async {
|
||||||
if (!noCache && _cachedResponses.containsKey(id)) {
|
if (!noCache && _cachedResponses.containsKey(id)) {
|
||||||
return _cachedResponses[id]!;
|
return _cachedResponses[id]!;
|
||||||
}
|
}
|
||||||
|
|
||||||
final resp = await get('/attachments/$id/meta');
|
final resp = await get('/attachments/$id/meta');
|
||||||
_cachedResponses[id] = resp;
|
if (resp.statusCode == 200) {
|
||||||
|
final result = Attachment.fromJson(resp.body);
|
||||||
|
if (result.destination != 0 && result.isAnalyzed) {
|
||||||
|
_cachedResponses[id] = result;
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
return resp;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<Response> createAttachment(
|
Future<Attachment> createAttachment(
|
||||||
Uint8List data,
|
Uint8List data, String path, String usage, Map<String, dynamic>? metadata,
|
||||||
String path,
|
{Function(double)? onProgress}) async {
|
||||||
String hash,
|
|
||||||
String usage,
|
|
||||||
Map<String, dynamic>? metadata,
|
|
||||||
) async {
|
|
||||||
final AuthProvider auth = Get.find();
|
final AuthProvider auth = Get.find();
|
||||||
if (!await auth.isAuthorized) throw Exception('unauthorized');
|
if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
|
||||||
|
|
||||||
final client = auth.configureClient(
|
await auth.ensureCredentials();
|
||||||
'files',
|
|
||||||
timeout: const Duration(minutes: 3),
|
|
||||||
);
|
|
||||||
|
|
||||||
final filePayload = MultipartFile(data, filename: basename(path));
|
final filePayload =
|
||||||
|
dio.MultipartFile.fromBytes(data, filename: basename(path));
|
||||||
final fileAlt = basename(path).contains('.')
|
final fileAlt = basename(path).contains('.')
|
||||||
? basename(path).substring(0, basename(path).lastIndexOf('.'))
|
? basename(path).substring(0, basename(path).lastIndexOf('.'))
|
||||||
: basename(path);
|
: basename(path);
|
||||||
@@ -106,38 +105,44 @@ class AttachmentProvider extends GetConnect {
|
|||||||
if (mimetypeOverrides.keys.contains(fileExt)) {
|
if (mimetypeOverrides.keys.contains(fileExt)) {
|
||||||
mimetypeOverride = mimetypeOverrides[fileExt];
|
mimetypeOverride = mimetypeOverrides[fileExt];
|
||||||
}
|
}
|
||||||
final payload = FormData({
|
final payload = dio.FormData.fromMap({
|
||||||
'alt': fileAlt,
|
'alt': fileAlt,
|
||||||
'file': filePayload,
|
'file': filePayload,
|
||||||
'hash': hash,
|
|
||||||
'usage': usage,
|
'usage': usage,
|
||||||
if (mimetypeOverride != null) 'mimetype': mimetypeOverride,
|
if (mimetypeOverride != null) 'mimetype': mimetypeOverride,
|
||||||
'metadata': jsonEncode(metadata),
|
'metadata': jsonEncode(metadata),
|
||||||
});
|
});
|
||||||
final resp = await client.post('/attachments', payload);
|
final resp = await dio.Dio(
|
||||||
|
dio.BaseOptions(
|
||||||
|
baseUrl: ServiceFinder.buildUrl('files', null),
|
||||||
|
headers: {'Authorization': 'Bearer ${auth.credentials!.accessToken}'},
|
||||||
|
),
|
||||||
|
).post(
|
||||||
|
'/attachments',
|
||||||
|
data: payload,
|
||||||
|
onSendProgress: (count, total) {
|
||||||
|
if (onProgress != null) onProgress(count / total);
|
||||||
|
},
|
||||||
|
);
|
||||||
if (resp.statusCode != 200) {
|
if (resp.statusCode != 200) {
|
||||||
throw Exception(resp.bodyString);
|
throw Exception(resp.data);
|
||||||
}
|
}
|
||||||
|
|
||||||
return resp;
|
return Attachment.fromJson(resp.data);
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<Response> updateAttachment(
|
Future<Response> updateAttachment(
|
||||||
int id,
|
int id,
|
||||||
String alt,
|
String alt,
|
||||||
String usage, {
|
String usage, {
|
||||||
double? ratio,
|
|
||||||
bool isMature = false,
|
bool isMature = false,
|
||||||
}) async {
|
}) async {
|
||||||
final AuthProvider auth = Get.find();
|
final AuthProvider auth = Get.find();
|
||||||
if (!await auth.isAuthorized) throw Exception('unauthorized');
|
if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
|
||||||
|
|
||||||
final client = auth.configureClient('files');
|
final client = auth.configureClient('files');
|
||||||
|
|
||||||
var resp = await client.put('/attachments/$id', {
|
var resp = await client.put('/attachments/$id', {
|
||||||
'metadata': {
|
|
||||||
if (ratio != null) 'ratio': ratio,
|
|
||||||
},
|
|
||||||
'alt': alt,
|
'alt': alt,
|
||||||
'usage': usage,
|
'usage': usage,
|
||||||
'is_mature': isMature,
|
'is_mature': isMature,
|
||||||
@@ -152,7 +157,7 @@ class AttachmentProvider extends GetConnect {
|
|||||||
|
|
||||||
Future<Response> deleteAttachment(int id) async {
|
Future<Response> deleteAttachment(int id) async {
|
||||||
final AuthProvider auth = Get.find();
|
final AuthProvider auth = Get.find();
|
||||||
if (!await auth.isAuthorized) throw Exception('unauthorized');
|
if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
|
||||||
|
|
||||||
final client = auth.configureClient('files');
|
final client = auth.configureClient('files');
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
|
|||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
import 'package:solian/models/channel.dart';
|
import 'package:solian/models/channel.dart';
|
||||||
import 'package:solian/providers/auth.dart';
|
import 'package:solian/providers/auth.dart';
|
||||||
import 'package:solian/widgets/account/friend_select.dart';
|
import 'package:solian/widgets/account/relative_select.dart';
|
||||||
import 'package:uuid/uuid.dart';
|
import 'package:uuid/uuid.dart';
|
||||||
|
|
||||||
class ChannelProvider extends GetxController {
|
class ChannelProvider extends GetxController {
|
||||||
@@ -16,7 +16,7 @@ class ChannelProvider extends GetxController {
|
|||||||
|
|
||||||
Future<void> refreshAvailableChannel() async {
|
Future<void> refreshAvailableChannel() async {
|
||||||
final AuthProvider auth = Get.find();
|
final AuthProvider auth = Get.find();
|
||||||
if (!await auth.isAuthorized) throw Exception('unauthorized');
|
if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
|
||||||
|
|
||||||
isLoading.value = true;
|
isLoading.value = true;
|
||||||
final resp = await listAvailableChannel();
|
final resp = await listAvailableChannel();
|
||||||
@@ -29,7 +29,7 @@ class ChannelProvider extends GetxController {
|
|||||||
|
|
||||||
Future<Response> getChannel(String alias, {String realm = 'global'}) async {
|
Future<Response> getChannel(String alias, {String realm = 'global'}) async {
|
||||||
final AuthProvider auth = Get.find();
|
final AuthProvider auth = Get.find();
|
||||||
if (!await auth.isAuthorized) throw Exception('unauthorized');
|
if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
|
||||||
|
|
||||||
final client = auth.configureClient('messaging');
|
final client = auth.configureClient('messaging');
|
||||||
|
|
||||||
@@ -44,7 +44,7 @@ class ChannelProvider extends GetxController {
|
|||||||
Future<Response> getMyChannelProfile(String alias,
|
Future<Response> getMyChannelProfile(String alias,
|
||||||
{String realm = 'global'}) async {
|
{String realm = 'global'}) async {
|
||||||
final AuthProvider auth = Get.find();
|
final AuthProvider auth = Get.find();
|
||||||
if (!await auth.isAuthorized) throw Exception('unauthorized');
|
if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
|
||||||
|
|
||||||
final client = auth.configureClient('messaging');
|
final client = auth.configureClient('messaging');
|
||||||
|
|
||||||
@@ -59,7 +59,7 @@ class ChannelProvider extends GetxController {
|
|||||||
Future<Response?> getChannelOngoingCall(String alias,
|
Future<Response?> getChannelOngoingCall(String alias,
|
||||||
{String realm = 'global'}) async {
|
{String realm = 'global'}) async {
|
||||||
final AuthProvider auth = Get.find();
|
final AuthProvider auth = Get.find();
|
||||||
if (!await auth.isAuthorized) throw Exception('unauthorized');
|
if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
|
||||||
|
|
||||||
final client = auth.configureClient('messaging');
|
final client = auth.configureClient('messaging');
|
||||||
|
|
||||||
@@ -75,7 +75,7 @@ class ChannelProvider extends GetxController {
|
|||||||
|
|
||||||
Future<Response> listChannel({String scope = 'global'}) async {
|
Future<Response> listChannel({String scope = 'global'}) async {
|
||||||
final AuthProvider auth = Get.find();
|
final AuthProvider auth = Get.find();
|
||||||
if (!await auth.isAuthorized) throw Exception('unauthorized');
|
if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
|
||||||
|
|
||||||
final client = auth.configureClient('messaging');
|
final client = auth.configureClient('messaging');
|
||||||
|
|
||||||
@@ -89,7 +89,7 @@ class ChannelProvider extends GetxController {
|
|||||||
|
|
||||||
Future<Response> listAvailableChannel({String realm = 'global'}) async {
|
Future<Response> listAvailableChannel({String realm = 'global'}) async {
|
||||||
final AuthProvider auth = Get.find();
|
final AuthProvider auth = Get.find();
|
||||||
if (!await auth.isAuthorized) throw Exception('unauthorized');
|
if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
|
||||||
|
|
||||||
final client = auth.configureClient('messaging');
|
final client = auth.configureClient('messaging');
|
||||||
|
|
||||||
@@ -103,7 +103,7 @@ class ChannelProvider extends GetxController {
|
|||||||
|
|
||||||
Future<Response> createChannel(String scope, dynamic payload) async {
|
Future<Response> createChannel(String scope, dynamic payload) async {
|
||||||
final AuthProvider auth = Get.find();
|
final AuthProvider auth = Get.find();
|
||||||
if (!await auth.isAuthorized) throw Exception('unauthorized');
|
if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
|
||||||
|
|
||||||
final client = auth.configureClient('messaging');
|
final client = auth.configureClient('messaging');
|
||||||
|
|
||||||
@@ -118,25 +118,25 @@ class ChannelProvider extends GetxController {
|
|||||||
Future<Response?> createDirectChannel(
|
Future<Response?> createDirectChannel(
|
||||||
BuildContext context, String scope) async {
|
BuildContext context, String scope) async {
|
||||||
final AuthProvider auth = Get.find();
|
final AuthProvider auth = Get.find();
|
||||||
if (!await auth.isAuthorized) throw Exception('unauthorized');
|
if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
|
||||||
|
|
||||||
final related = await showModalBottomSheet(
|
final related = await showModalBottomSheet(
|
||||||
useRootNavigator: true,
|
useRootNavigator: true,
|
||||||
context: context,
|
context: context,
|
||||||
builder: (context) => FriendSelect(
|
builder: (context) => RelativeSelector(
|
||||||
title: 'channelOrganizeDirectHint'.tr,
|
title: 'channelOrganizeDirectHint'.tr,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
if (related == null) return null;
|
if (related == null) return null;
|
||||||
|
|
||||||
final prof = await auth.getProfile();
|
final prof = auth.userProfile.value!;
|
||||||
final client = auth.configureClient('messaging');
|
final client = auth.configureClient('messaging');
|
||||||
|
|
||||||
final resp = await client.post('/channels/$scope/dm', {
|
final resp = await client.post('/channels/$scope/dm', {
|
||||||
'alias': const Uuid().v4().replaceAll('-', '').substring(0, 12),
|
'alias': const Uuid().v4().replaceAll('-', '').substring(0, 12),
|
||||||
'name': 'DM',
|
'name': 'DM',
|
||||||
'description':
|
'description':
|
||||||
'A direct message channel between @${prof.body['name']} and @${related.name}',
|
'A direct message channel between @${prof['name']} and @${related.name}',
|
||||||
'related_user': related.id,
|
'related_user': related.id,
|
||||||
'is_encrypted': false,
|
'is_encrypted': false,
|
||||||
});
|
});
|
||||||
@@ -149,7 +149,7 @@ class ChannelProvider extends GetxController {
|
|||||||
|
|
||||||
Future<Response> updateChannel(String scope, int id, dynamic payload) async {
|
Future<Response> updateChannel(String scope, int id, dynamic payload) async {
|
||||||
final AuthProvider auth = Get.find();
|
final AuthProvider auth = Get.find();
|
||||||
if (!await auth.isAuthorized) throw Exception('unauthorized');
|
if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
|
||||||
|
|
||||||
final client = auth.configureClient('messaging');
|
final client = auth.configureClient('messaging');
|
||||||
|
|
||||||
|
|||||||
@@ -9,15 +9,17 @@ class PostProvider extends GetConnect {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Future<Response> listRecommendations(int page,
|
Future<Response> listRecommendations(int page,
|
||||||
{int? realm, String? tag, category}) async {
|
{int? realm, String? channel}) async {
|
||||||
final queries = [
|
final queries = [
|
||||||
'take=${10}',
|
'take=${10}',
|
||||||
'offset=$page',
|
'offset=$page',
|
||||||
if (tag != null) 'tag=$tag',
|
|
||||||
if (category != null) 'category=$category',
|
|
||||||
if (realm != null) 'realmId=$realm',
|
if (realm != null) 'realmId=$realm',
|
||||||
];
|
];
|
||||||
final resp = await get('/recommendations?${queries.join('&')}');
|
final resp = await get(
|
||||||
|
channel == null
|
||||||
|
? '/recommendations?${queries.join('&')}'
|
||||||
|
: '/recommendations/$channel?${queries.join('&')}',
|
||||||
|
);
|
||||||
if (resp.statusCode != 200) {
|
if (resp.statusCode != 200) {
|
||||||
throw Exception(resp.body);
|
throw Exception(resp.body);
|
||||||
}
|
}
|
||||||
@@ -27,14 +29,14 @@ class PostProvider extends GetConnect {
|
|||||||
|
|
||||||
Future<Response> listDraft(int page) async {
|
Future<Response> listDraft(int page) async {
|
||||||
final AuthProvider auth = Get.find();
|
final AuthProvider auth = Get.find();
|
||||||
if (!await auth.isAuthorized) throw Exception('unauthorized');
|
if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
|
||||||
|
|
||||||
final queries = [
|
final queries = [
|
||||||
'take=${10}',
|
'take=${10}',
|
||||||
'offset=$page',
|
'offset=$page',
|
||||||
];
|
];
|
||||||
final client = auth.configureClient('interactive');
|
final client = auth.configureClient('interactive');
|
||||||
final resp = await client.get('/drafts?${queries.join('&')}');
|
final resp = await client.get('/posts/drafts?${queries.join('&')}');
|
||||||
if (resp.statusCode != 200) {
|
if (resp.statusCode != 200) {
|
||||||
throw Exception(resp.body);
|
throw Exception(resp.body);
|
||||||
}
|
}
|
||||||
@@ -42,10 +44,14 @@ class PostProvider extends GetConnect {
|
|||||||
return resp;
|
return resp;
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<Response> listPost(int page, {int? realm}) async {
|
Future<Response> listPost(int page,
|
||||||
|
{int? realm, String? author, tag, category}) async {
|
||||||
final queries = [
|
final queries = [
|
||||||
'take=${10}',
|
'take=${10}',
|
||||||
'offset=$page',
|
'offset=$page',
|
||||||
|
if (tag != null) 'tag=$tag',
|
||||||
|
if (category != null) 'category=$category',
|
||||||
|
if (author != null) 'author=$author',
|
||||||
if (realm != null) 'realmId=$realm',
|
if (realm != null) 'realmId=$realm',
|
||||||
];
|
];
|
||||||
final resp = await get('/posts?${queries.join('&')}');
|
final resp = await get('/posts?${queries.join('&')}');
|
||||||
|
|||||||
@@ -1,10 +1,27 @@
|
|||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
|
import 'package:solian/models/realm.dart';
|
||||||
import 'package:solian/providers/auth.dart';
|
import 'package:solian/providers/auth.dart';
|
||||||
|
|
||||||
class RealmProvider extends GetxController {
|
class RealmProvider extends GetxController {
|
||||||
|
RxBool isLoading = false.obs;
|
||||||
|
RxList<Realm> availableRealms = RxList.empty(growable: true);
|
||||||
|
|
||||||
|
Future<void> refreshAvailableRealms() async {
|
||||||
|
final AuthProvider auth = Get.find();
|
||||||
|
if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
|
||||||
|
|
||||||
|
isLoading.value = true;
|
||||||
|
final resp = await listAvailableRealm();
|
||||||
|
isLoading.value = false;
|
||||||
|
|
||||||
|
availableRealms.value =
|
||||||
|
resp.body.map((x) => Realm.fromJson(x)).toList().cast<Realm>();
|
||||||
|
availableRealms.refresh();
|
||||||
|
}
|
||||||
|
|
||||||
Future<Response> getRealm(String alias) async {
|
Future<Response> getRealm(String alias) async {
|
||||||
final AuthProvider auth = Get.find();
|
final AuthProvider auth = Get.find();
|
||||||
if (!await auth.isAuthorized) throw Exception('unauthorized');
|
if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
|
||||||
|
|
||||||
final client = auth.configureClient('auth');
|
final client = auth.configureClient('auth');
|
||||||
|
|
||||||
@@ -18,7 +35,7 @@ class RealmProvider extends GetxController {
|
|||||||
|
|
||||||
Future<Response> listAvailableRealm() async {
|
Future<Response> listAvailableRealm() async {
|
||||||
final AuthProvider auth = Get.find();
|
final AuthProvider auth = Get.find();
|
||||||
if (!await auth.isAuthorized) throw Exception('unauthorized');
|
if (auth.isAuthorized.isFalse) throw Exception('unauthorized');
|
||||||
|
|
||||||
final client = auth.configureClient('auth');
|
final client = auth.configureClient('auth');
|
||||||
|
|
||||||
|
|||||||
@@ -1,43 +0,0 @@
|
|||||||
import 'package:get/get.dart';
|
|
||||||
import 'package:solian/models/friendship.dart';
|
|
||||||
import 'package:solian/providers/auth.dart';
|
|
||||||
import 'package:solian/services.dart';
|
|
||||||
|
|
||||||
class FriendProvider extends GetConnect {
|
|
||||||
@override
|
|
||||||
void onInit() {
|
|
||||||
final AuthProvider auth = Get.find();
|
|
||||||
|
|
||||||
httpClient.baseUrl = ServiceFinder.buildUrl('auth', null);
|
|
||||||
httpClient.addAuthenticator(auth.requestAuthenticator);
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<Response> listFriendship() => get('/users/me/friends');
|
|
||||||
|
|
||||||
Future<Response> listFriendshipWithStatus(int status) =>
|
|
||||||
get('/users/me/friends?status=$status');
|
|
||||||
|
|
||||||
Future<Response> createFriendship(String username) async {
|
|
||||||
final resp = await post('/users/me/friends?related=$username', {});
|
|
||||||
if (resp.statusCode != 200) {
|
|
||||||
throw Exception(resp.bodyString);
|
|
||||||
}
|
|
||||||
|
|
||||||
return resp;
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<Response> updateFriendship(Friendship relationship, int status) async {
|
|
||||||
final AuthProvider auth = Get.find();
|
|
||||||
final prof = await auth.getProfile();
|
|
||||||
final otherside = relationship.getOtherside(prof.body['id']);
|
|
||||||
|
|
||||||
final resp = await put('/users/me/friends/${otherside.id}', {
|
|
||||||
'status': status,
|
|
||||||
});
|
|
||||||
if (resp.statusCode != 200) {
|
|
||||||
throw Exception(resp.bodyString);
|
|
||||||
}
|
|
||||||
|
|
||||||
return resp;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -18,7 +18,7 @@ Future<MessageHistoryDb> createHistoryDb() async {
|
|||||||
|
|
||||||
Future<Event?> getRemoteEvent(int id, Channel channel, String scope) async {
|
Future<Event?> getRemoteEvent(int id, Channel channel, String scope) async {
|
||||||
final AuthProvider auth = Get.find();
|
final AuthProvider auth = Get.find();
|
||||||
if (!await auth.isAuthorized) return null;
|
if (auth.isAuthorized.isFalse) return null;
|
||||||
|
|
||||||
final client = auth.configureClient('messaging');
|
final client = auth.configureClient('messaging');
|
||||||
|
|
||||||
@@ -48,7 +48,7 @@ Future<(List<Event>, int)?> getRemoteEvents(
|
|||||||
}
|
}
|
||||||
|
|
||||||
final AuthProvider auth = Get.find();
|
final AuthProvider auth = Get.find();
|
||||||
if (!await auth.isAuthorized) return null;
|
if (auth.isAuthorized.isFalse) return null;
|
||||||
|
|
||||||
final client = auth.configureClient('messaging');
|
final client = auth.configureClient('messaging');
|
||||||
|
|
||||||
|
|||||||
79
lib/providers/relation.dart
Normal file
@@ -0,0 +1,79 @@
|
|||||||
|
import 'package:get/get.dart';
|
||||||
|
import 'package:solian/models/account.dart';
|
||||||
|
import 'package:solian/models/relations.dart';
|
||||||
|
import 'package:solian/providers/auth.dart';
|
||||||
|
|
||||||
|
class RelationshipProvider extends GetxController {
|
||||||
|
final RxInt friendRequestCount = 0.obs;
|
||||||
|
|
||||||
|
final RxList<Relationship> _friends = RxList.empty(growable: true);
|
||||||
|
|
||||||
|
Future<void> refreshRelativeList() async {
|
||||||
|
final resp = await listRelation();
|
||||||
|
final List<Relationship> result = resp.body
|
||||||
|
.map((e) => Relationship.fromJson(e))
|
||||||
|
.toList()
|
||||||
|
.cast<Relationship>();
|
||||||
|
_friends.value = result.where((x) => x.status == 1).toList();
|
||||||
|
_friends.refresh();
|
||||||
|
friendRequestCount.value = result.where((x) => x.status == 0).length;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool hasFriend(Account account) {
|
||||||
|
final auth = Get.find<AuthProvider>();
|
||||||
|
if (auth.userProfile.value!['id'] == account.id) return true;
|
||||||
|
return _friends.any((x) => x.relatedId == account.id);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<Response> listRelation() {
|
||||||
|
final AuthProvider auth = Get.find();
|
||||||
|
final client = auth.configureClient('auth');
|
||||||
|
return client.get('/users/me/relations');
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<Response> listRelationWithStatus(int status) {
|
||||||
|
final AuthProvider auth = Get.find();
|
||||||
|
final client = auth.configureClient('auth');
|
||||||
|
return client.get('/users/me/relations?status=$status');
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<Response> makeFriend(String username) async {
|
||||||
|
final AuthProvider auth = Get.find();
|
||||||
|
final client = auth.configureClient('auth');
|
||||||
|
final resp = await client.post('/users/me/relations?related=$username', {});
|
||||||
|
if (resp.statusCode != 200) {
|
||||||
|
throw Exception(resp.bodyString);
|
||||||
|
}
|
||||||
|
|
||||||
|
return resp;
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<Response> handleRelation(
|
||||||
|
Relationship relationship, bool doAccept) async {
|
||||||
|
final AuthProvider auth = Get.find();
|
||||||
|
final client = auth.configureClient('auth');
|
||||||
|
final resp = await client.post(
|
||||||
|
'/users/me/relations/${relationship.relatedId}/${doAccept ? 'accept' : 'decline'}',
|
||||||
|
{},
|
||||||
|
);
|
||||||
|
if (resp.statusCode != 200) {
|
||||||
|
throw Exception(resp.bodyString);
|
||||||
|
}
|
||||||
|
|
||||||
|
return resp;
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<Response> editRelation(Relationship relationship, int status) async {
|
||||||
|
final AuthProvider auth = Get.find();
|
||||||
|
final client = auth.configureClient('auth');
|
||||||
|
final resp = await client.patch(
|
||||||
|
'/users/me/relations/${relationship.relatedId}',
|
||||||
|
{'status': status},
|
||||||
|
);
|
||||||
|
if (resp.statusCode != 200) {
|
||||||
|
throw Exception(resp.bodyString);
|
||||||
|
}
|
||||||
|
|
||||||
|
return resp;
|
||||||
|
}
|
||||||
|
}
|
||||||
34
lib/providers/stickers.dart
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
import 'package:get/get.dart';
|
||||||
|
import 'package:solian/models/pagination.dart';
|
||||||
|
import 'package:solian/models/stickers.dart';
|
||||||
|
import 'package:solian/services.dart';
|
||||||
|
|
||||||
|
class StickerProvider extends GetxController {
|
||||||
|
final RxMap<String, String> aliasImageMapping = RxMap();
|
||||||
|
final RxList<Sticker> availableStickers = RxList.empty(growable: true);
|
||||||
|
|
||||||
|
Future<void> refreshAvailableStickers() async {
|
||||||
|
availableStickers.clear();
|
||||||
|
aliasImageMapping.clear();
|
||||||
|
|
||||||
|
final client = ServiceFinder.configureClient('files');
|
||||||
|
final resp = await client.get(
|
||||||
|
'/stickers/manifest?take=100',
|
||||||
|
);
|
||||||
|
if (resp.statusCode == 200) {
|
||||||
|
final result = PaginationResult.fromJson(resp.body);
|
||||||
|
final out = result.data?.map((e) => StickerPack.fromJson(e)).toList();
|
||||||
|
if (out == null) return;
|
||||||
|
|
||||||
|
for (final pack in out) {
|
||||||
|
for (final sticker in (pack.stickers ?? List<Sticker>.empty())) {
|
||||||
|
sticker.pack = pack;
|
||||||
|
aliasImageMapping[sticker.textPlaceholder.toUpperCase()] =
|
||||||
|
sticker.imageUrl;
|
||||||
|
availableStickers.add(sticker);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
availableStickers.refresh();
|
||||||
|
}
|
||||||
|
}
|
||||||
30
lib/providers/theme_switcher.dart
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:shared_preferences/shared_preferences.dart';
|
||||||
|
import 'package:solian/theme.dart';
|
||||||
|
|
||||||
|
class ThemeSwitcher extends ChangeNotifier {
|
||||||
|
ThemeData lightThemeData;
|
||||||
|
ThemeData darkThemeData;
|
||||||
|
|
||||||
|
ThemeSwitcher({
|
||||||
|
required this.lightThemeData,
|
||||||
|
required this.darkThemeData,
|
||||||
|
});
|
||||||
|
|
||||||
|
Future<void> restoreTheme() async {
|
||||||
|
final prefs = await SharedPreferences.getInstance();
|
||||||
|
if (prefs.containsKey('global_theme_color')) {
|
||||||
|
final value = prefs.getInt('global_theme_color')!;
|
||||||
|
final color = Color(value);
|
||||||
|
lightThemeData = SolianTheme.build(Brightness.light, seedColor: color);
|
||||||
|
darkThemeData = SolianTheme.build(Brightness.dark, seedColor: color);
|
||||||
|
notifyListeners();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void setTheme(ThemeData light, dark) {
|
||||||
|
lightThemeData = light;
|
||||||
|
darkThemeData = dark;
|
||||||
|
notifyListeners();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -42,7 +42,7 @@ class WebSocketProvider extends GetxController {
|
|||||||
super.onInit();
|
super.onInit();
|
||||||
}
|
}
|
||||||
|
|
||||||
void connect({noRetry = false}) async {
|
Future<void> connect({noRetry = false}) async {
|
||||||
if (isConnected.value) {
|
if (isConnected.value) {
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
@@ -102,7 +102,7 @@ class WebSocketProvider extends GetxController {
|
|||||||
|
|
||||||
Future<void> notifyPrefetch() async {
|
Future<void> notifyPrefetch() async {
|
||||||
final AuthProvider auth = Get.find();
|
final AuthProvider auth = Get.find();
|
||||||
if (!await auth.isAuthorized) return;
|
if (auth.isAuthorized.isFalse) return;
|
||||||
|
|
||||||
final client = auth.configureClient('auth');
|
final client = auth.configureClient('auth');
|
||||||
|
|
||||||
@@ -119,7 +119,7 @@ class WebSocketProvider extends GetxController {
|
|||||||
|
|
||||||
Future<void> registerPushNotifications() async {
|
Future<void> registerPushNotifications() async {
|
||||||
final AuthProvider auth = Get.find();
|
final AuthProvider auth = Get.find();
|
||||||
if (!await auth.isAuthorized) return;
|
if (auth.isAuthorized.isFalse) return;
|
||||||
|
|
||||||
late final String? token;
|
late final String? token;
|
||||||
late final String provider;
|
late final String provider;
|
||||||
|
|||||||
@@ -1,9 +1,13 @@
|
|||||||
|
import 'package:animations/animations.dart';
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
import 'package:go_router/go_router.dart';
|
import 'package:go_router/go_router.dart';
|
||||||
import 'package:solian/models/realm.dart';
|
import 'package:solian/models/realm.dart';
|
||||||
import 'package:solian/screens/about.dart';
|
import 'package:solian/screens/about.dart';
|
||||||
import 'package:solian/screens/account.dart';
|
import 'package:solian/screens/account.dart';
|
||||||
import 'package:solian/screens/account/friend.dart';
|
import 'package:solian/screens/account/friend.dart';
|
||||||
import 'package:solian/screens/account/personalize.dart';
|
import 'package:solian/screens/account/personalize.dart';
|
||||||
|
import 'package:solian/screens/account/profile_page.dart';
|
||||||
|
import 'package:solian/screens/account/stickers.dart';
|
||||||
import 'package:solian/screens/channel/channel_chat.dart';
|
import 'package:solian/screens/channel/channel_chat.dart';
|
||||||
import 'package:solian/screens/channel/channel_detail.dart';
|
import 'package:solian/screens/channel/channel_detail.dart';
|
||||||
import 'package:solian/screens/channel/channel_organize.dart';
|
import 'package:solian/screens/channel/channel_organize.dart';
|
||||||
@@ -17,6 +21,7 @@ import 'package:solian/screens/realms/realm_organize.dart';
|
|||||||
import 'package:solian/screens/realms/realm_view.dart';
|
import 'package:solian/screens/realms/realm_view.dart';
|
||||||
import 'package:solian/screens/home.dart';
|
import 'package:solian/screens/home.dart';
|
||||||
import 'package:solian/screens/posts/post_editor.dart';
|
import 'package:solian/screens/posts/post_editor.dart';
|
||||||
|
import 'package:solian/screens/settings.dart';
|
||||||
import 'package:solian/shells/root_shell.dart';
|
import 'package:solian/shells/root_shell.dart';
|
||||||
import 'package:solian/shells/title_shell.dart';
|
import 'package:solian/shells/title_shell.dart';
|
||||||
|
|
||||||
@@ -33,6 +38,22 @@ abstract class AppRouter {
|
|||||||
_chatRoute,
|
_chatRoute,
|
||||||
_realmRoute,
|
_realmRoute,
|
||||||
_accountRoute,
|
_accountRoute,
|
||||||
|
GoRoute(
|
||||||
|
path: '/about',
|
||||||
|
name: 'about',
|
||||||
|
builder: (context, state) => TitleShell(
|
||||||
|
state: state,
|
||||||
|
child: const AboutScreen(),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
GoRoute(
|
||||||
|
path: '/settings',
|
||||||
|
name: 'settings',
|
||||||
|
builder: (context, state) => TitleShell(
|
||||||
|
state: state,
|
||||||
|
child: const SettingScreen(),
|
||||||
|
),
|
||||||
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
@@ -75,13 +96,25 @@ abstract class AppRouter {
|
|||||||
GoRoute(
|
GoRoute(
|
||||||
path: '/posts/editor',
|
path: '/posts/editor',
|
||||||
name: 'postEditor',
|
name: 'postEditor',
|
||||||
builder: (context, state) {
|
pageBuilder: (context, state) {
|
||||||
final arguments = state.extra as PostPublishArguments?;
|
final arguments = state.extra as PostPublishArguments?;
|
||||||
return PostPublishScreen(
|
return CustomTransitionPage(
|
||||||
edit: arguments?.edit,
|
child: PostPublishScreen(
|
||||||
reply: arguments?.reply,
|
edit: arguments?.edit,
|
||||||
repost: arguments?.repost,
|
reply: arguments?.reply,
|
||||||
realm: arguments?.realm,
|
repost: arguments?.repost,
|
||||||
|
realm: arguments?.realm,
|
||||||
|
mode: int.tryParse(state.uri.queryParameters['mode'] ?? '0') ?? 0,
|
||||||
|
),
|
||||||
|
transitionsBuilder:
|
||||||
|
(context, animation, secondaryAnimation, child) {
|
||||||
|
return FadeThroughTransition(
|
||||||
|
fillColor: Theme.of(context).scaffoldBackgroundColor,
|
||||||
|
animation: animation,
|
||||||
|
secondaryAnimation: secondaryAnimation,
|
||||||
|
child: child,
|
||||||
|
);
|
||||||
|
},
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
@@ -191,9 +224,14 @@ abstract class AppRouter {
|
|||||||
GoRoute(
|
GoRoute(
|
||||||
path: '/account/friend',
|
path: '/account/friend',
|
||||||
name: 'accountFriend',
|
name: 'accountFriend',
|
||||||
|
builder: (context, state) => const FriendScreen(),
|
||||||
|
),
|
||||||
|
GoRoute(
|
||||||
|
path: '/account/stickers',
|
||||||
|
name: 'accountStickers',
|
||||||
builder: (context, state) => TitleShell(
|
builder: (context, state) => TitleShell(
|
||||||
state: state,
|
state: state,
|
||||||
child: const FriendScreen(),
|
child: const StickerScreen(),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
GoRoute(
|
GoRoute(
|
||||||
@@ -205,11 +243,10 @@ abstract class AppRouter {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
GoRoute(
|
GoRoute(
|
||||||
path: '/about',
|
path: '/account/view/:name',
|
||||||
name: 'about',
|
name: 'accountProfilePage',
|
||||||
builder: (context, state) => TitleShell(
|
builder: (context, state) => AccountProfilePage(
|
||||||
state: state,
|
name: state.pathParameters['name']!,
|
||||||
child: const AboutScreen(),
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -17,7 +17,11 @@ class AboutScreen extends StatelessWidget {
|
|||||||
child: Column(
|
child: Column(
|
||||||
mainAxisAlignment: MainAxisAlignment.center,
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
children: [
|
children: [
|
||||||
Image.asset('assets/logo.png', width: 64, height: 64),
|
ClipRRect(
|
||||||
|
borderRadius: const BorderRadius.all(Radius.circular(16)),
|
||||||
|
child: Image.asset('assets/logo.png', width: 120, height: 120),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 8),
|
||||||
Text(
|
Text(
|
||||||
'Solian',
|
'Solian',
|
||||||
style: Theme.of(context).textTheme.headlineMedium,
|
style: Theme.of(context).textTheme.headlineMedium,
|
||||||
@@ -44,17 +48,28 @@ class AboutScreen extends StatelessWidget {
|
|||||||
const SizedBox(height: 16),
|
const SizedBox(height: 16),
|
||||||
TextButton(
|
TextButton(
|
||||||
style: denseButtonStyle,
|
style: denseButtonStyle,
|
||||||
child: const Text('More Information'),
|
child: const Text('App Details'),
|
||||||
onPressed: () {
|
onPressed: () async {
|
||||||
launchUrlString('https://solsynth.dev/products/solar-network');
|
final info = await PackageInfo.fromPlatform();
|
||||||
|
|
||||||
|
showAboutDialog(
|
||||||
|
context: context,
|
||||||
|
applicationVersion: '${info.version} (${info.buildNumber})',
|
||||||
|
applicationLegalese:
|
||||||
|
'The Solar Network App is an intuitive and self-hostable social network and computing platform. Experience the freedom of a user-friendly design that empowers you to create and connect with communities on your own terms. Embrace the future of social networking with a platform that prioritizes your independence and privacy.',
|
||||||
|
applicationIcon: ClipRRect(
|
||||||
|
borderRadius: const BorderRadius.all(Radius.circular(16)),
|
||||||
|
child: Image.asset('assets/logo.png', width: 60, height: 60),
|
||||||
|
),
|
||||||
|
);
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
TextButton(
|
TextButton(
|
||||||
style: denseButtonStyle,
|
style: denseButtonStyle,
|
||||||
|
child: const Text('Project Website'),
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
launchUrlString('https://solsynth.dev');
|
launchUrlString('https://solsynth.dev/products/solar-network');
|
||||||
},
|
},
|
||||||
child: const Text('Official Website'),
|
|
||||||
),
|
),
|
||||||
const SizedBox(height: 16),
|
const SizedBox(height: 16),
|
||||||
const Text(
|
const Text(
|
||||||
|
|||||||
@@ -3,11 +3,13 @@ import 'package:get/get.dart';
|
|||||||
import 'package:solian/models/account.dart';
|
import 'package:solian/models/account.dart';
|
||||||
import 'package:solian/providers/auth.dart';
|
import 'package:solian/providers/auth.dart';
|
||||||
import 'package:solian/providers/account_status.dart';
|
import 'package:solian/providers/account_status.dart';
|
||||||
|
import 'package:solian/providers/relation.dart';
|
||||||
import 'package:solian/router.dart';
|
import 'package:solian/router.dart';
|
||||||
import 'package:solian/screens/auth/signin.dart';
|
import 'package:solian/screens/auth/signin.dart';
|
||||||
import 'package:solian/screens/auth/signup.dart';
|
import 'package:solian/screens/auth/signup.dart';
|
||||||
import 'package:solian/widgets/account/account_heading.dart';
|
import 'package:solian/widgets/account/account_heading.dart';
|
||||||
import 'package:solian/widgets/sized_container.dart';
|
import 'package:solian/widgets/sized_container.dart';
|
||||||
|
import 'package:badges/badges.dart' as badges;
|
||||||
|
|
||||||
class AccountScreen extends StatefulWidget {
|
class AccountScreen extends StatefulWidget {
|
||||||
const AccountScreen({super.key});
|
const AccountScreen({super.key});
|
||||||
@@ -23,99 +25,120 @@ class _AccountScreenState extends State<AccountScreen> {
|
|||||||
(
|
(
|
||||||
const Icon(Icons.color_lens),
|
const Icon(Icons.color_lens),
|
||||||
'accountPersonalize'.tr,
|
'accountPersonalize'.tr,
|
||||||
'accountPersonalize'
|
'accountPersonalize',
|
||||||
|
),
|
||||||
|
(
|
||||||
|
Obx(() {
|
||||||
|
final RelationshipProvider relations = Get.find();
|
||||||
|
return badges.Badge(
|
||||||
|
badgeContent: Text(
|
||||||
|
relations.friendRequestCount.value.toString(),
|
||||||
|
style: const TextStyle(color: Colors.white),
|
||||||
|
),
|
||||||
|
showBadge: relations.friendRequestCount.value > 0,
|
||||||
|
position: badges.BadgePosition.topEnd(
|
||||||
|
top: -12,
|
||||||
|
end: -8,
|
||||||
|
),
|
||||||
|
child: const Icon(Icons.diversity_1),
|
||||||
|
);
|
||||||
|
}),
|
||||||
|
'accountFriend'.tr,
|
||||||
|
'accountFriend',
|
||||||
|
),
|
||||||
|
(
|
||||||
|
const Icon(Icons.emoji_symbols),
|
||||||
|
'accountStickers'.tr,
|
||||||
|
'accountStickers',
|
||||||
),
|
),
|
||||||
(const Icon(Icons.diversity_1), 'accountFriend'.tr, 'accountFriend'),
|
|
||||||
(const Icon(Icons.info_outline), 'about'.tr, 'about'),
|
|
||||||
];
|
];
|
||||||
|
|
||||||
final AuthProvider provider = Get.find();
|
final AuthProvider auth = Get.find();
|
||||||
|
|
||||||
return Material(
|
return Material(
|
||||||
color: Theme.of(context).colorScheme.surface,
|
color: Theme.of(context).colorScheme.surface,
|
||||||
child: SafeArea(
|
child: SafeArea(
|
||||||
child: FutureBuilder(
|
child: Obx(() {
|
||||||
future: provider.isAuthorized,
|
if (auth.isAuthorized.isFalse) {
|
||||||
builder: (context, snapshot) {
|
return Center(
|
||||||
if (!snapshot.hasData) {
|
child: Column(
|
||||||
return const Center(child: CircularProgressIndicator());
|
mainAxisSize: MainAxisSize.min,
|
||||||
}
|
|
||||||
|
|
||||||
if (snapshot.hasData && snapshot.data == false) {
|
|
||||||
return Center(
|
|
||||||
child: Column(
|
|
||||||
mainAxisSize: MainAxisSize.min,
|
|
||||||
children: [
|
|
||||||
ActionCard(
|
|
||||||
icon: const Icon(Icons.login, color: Colors.white),
|
|
||||||
title: 'signin'.tr,
|
|
||||||
caption: 'signinCaption'.tr,
|
|
||||||
onTap: () {
|
|
||||||
showModalBottomSheet(
|
|
||||||
useRootNavigator: true,
|
|
||||||
isDismissible: false,
|
|
||||||
isScrollControlled: true,
|
|
||||||
context: context,
|
|
||||||
builder: (context) => const SignInPopup(),
|
|
||||||
).then((val) async {
|
|
||||||
if (val == true) {
|
|
||||||
await provider.getProfile(noCache: true);
|
|
||||||
setState(() {});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
},
|
|
||||||
),
|
|
||||||
ActionCard(
|
|
||||||
icon: const Icon(Icons.add, color: Colors.white),
|
|
||||||
title: 'signup'.tr,
|
|
||||||
caption: 'signupCaption'.tr,
|
|
||||||
onTap: () {
|
|
||||||
showModalBottomSheet(
|
|
||||||
useRootNavigator: true,
|
|
||||||
isDismissible: false,
|
|
||||||
isScrollControlled: true,
|
|
||||||
context: context,
|
|
||||||
builder: (context) => const SignUpPopup(),
|
|
||||||
).then((_) {
|
|
||||||
setState(() {});
|
|
||||||
});
|
|
||||||
},
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return CenteredContainer(
|
|
||||||
child: ListView(
|
|
||||||
children: [
|
children: [
|
||||||
const AccountHeading().paddingOnly(bottom: 8, top: 8),
|
ActionCard(
|
||||||
...(actionItems.map(
|
icon: Icon(
|
||||||
(x) => ListTile(
|
Icons.login,
|
||||||
contentPadding: const EdgeInsets.symmetric(horizontal: 34),
|
color: Theme.of(context).colorScheme.onPrimary,
|
||||||
leading: x.$1,
|
|
||||||
title: Text(x.$2),
|
|
||||||
onTap: () {
|
|
||||||
AppRouter.instance
|
|
||||||
.pushNamed(x.$3)
|
|
||||||
.then((_) => setState(() {}));
|
|
||||||
},
|
|
||||||
),
|
),
|
||||||
)),
|
title: 'signin'.tr,
|
||||||
ListTile(
|
caption: 'signinCaption'.tr,
|
||||||
contentPadding: const EdgeInsets.symmetric(horizontal: 34),
|
|
||||||
leading: const Icon(Icons.logout),
|
|
||||||
title: Text('signout'.tr),
|
|
||||||
onTap: () {
|
onTap: () {
|
||||||
provider.signout();
|
showModalBottomSheet(
|
||||||
setState(() {});
|
useRootNavigator: true,
|
||||||
|
isDismissible: false,
|
||||||
|
isScrollControlled: true,
|
||||||
|
context: context,
|
||||||
|
builder: (context) => const SignInPopup(),
|
||||||
|
).then((val) async {
|
||||||
|
if (val == true) {
|
||||||
|
await auth.refreshUserProfile();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
),
|
||||||
|
ActionCard(
|
||||||
|
icon: Icon(
|
||||||
|
Icons.add,
|
||||||
|
color: Theme.of(context).colorScheme.onPrimary,
|
||||||
|
),
|
||||||
|
title: 'signup'.tr,
|
||||||
|
caption: 'signupCaption'.tr,
|
||||||
|
onTap: () {
|
||||||
|
showModalBottomSheet(
|
||||||
|
useRootNavigator: true,
|
||||||
|
isDismissible: false,
|
||||||
|
isScrollControlled: true,
|
||||||
|
context: context,
|
||||||
|
builder: (context) => const SignUpPopup(),
|
||||||
|
).then((_) {
|
||||||
|
setState(() {});
|
||||||
|
});
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
},
|
}
|
||||||
),
|
|
||||||
|
return CenteredContainer(
|
||||||
|
child: ListView(
|
||||||
|
children: [
|
||||||
|
if (auth.userProfile.value != null)
|
||||||
|
const AccountHeading().paddingOnly(bottom: 8, top: 8),
|
||||||
|
...(actionItems.map(
|
||||||
|
(x) => ListTile(
|
||||||
|
contentPadding: const EdgeInsets.symmetric(horizontal: 34),
|
||||||
|
leading: x.$1,
|
||||||
|
title: Text(x.$2),
|
||||||
|
onTap: () {
|
||||||
|
AppRouter.instance
|
||||||
|
.pushNamed(x.$3)
|
||||||
|
.then((_) => setState(() {}));
|
||||||
|
},
|
||||||
|
),
|
||||||
|
)),
|
||||||
|
ListTile(
|
||||||
|
contentPadding: const EdgeInsets.symmetric(horizontal: 34),
|
||||||
|
leading: const Icon(Icons.logout),
|
||||||
|
title: Text('signout'.tr),
|
||||||
|
onTap: () {
|
||||||
|
auth.signout();
|
||||||
|
setState(() {});
|
||||||
|
},
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -139,33 +162,25 @@ class _AccountHeadingState extends State<AccountHeading> {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
final AuthProvider provider = Get.find();
|
final AuthProvider auth = Get.find();
|
||||||
|
|
||||||
return FutureBuilder(
|
final prof = auth.userProfile.value!;
|
||||||
future: provider.getProfile(),
|
|
||||||
builder: (context, snapshot) {
|
|
||||||
if (!snapshot.hasData) {
|
|
||||||
return const LinearProgressIndicator();
|
|
||||||
}
|
|
||||||
|
|
||||||
final prof = snapshot.data!;
|
return AccountHeadingWidget(
|
||||||
return AccountHeadingWidget(
|
avatar: prof['avatar'],
|
||||||
avatar: prof.body['avatar'],
|
banner: prof['banner'],
|
||||||
banner: prof.body['banner'],
|
name: prof['name'],
|
||||||
name: prof.body['name'],
|
nick: prof['nick'],
|
||||||
nick: prof.body['nick'],
|
desc: prof['description'],
|
||||||
desc: prof.body['description'],
|
status: _status,
|
||||||
status: _status,
|
badges: prof['badges']
|
||||||
badges: prof.body['badges']
|
?.map((e) => AccountBadge.fromJson(e))
|
||||||
?.map((e) => AccountBadge.fromJson(e))
|
.toList()
|
||||||
.toList()
|
.cast<AccountBadge>(),
|
||||||
.cast<AccountBadge>(),
|
onEditStatus: () {
|
||||||
onEditStatus: () {
|
setState(() {
|
||||||
setState(() {
|
_status = Get.find<StatusProvider>().getCurrentStatus();
|
||||||
_status = Get.find<StatusProvider>().getCurrentStatus();
|
});
|
||||||
});
|
|
||||||
},
|
|
||||||
);
|
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -199,7 +214,7 @@ class ActionCard extends StatelessWidget {
|
|||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
CircleAvatar(
|
CircleAvatar(
|
||||||
backgroundColor: Colors.indigo,
|
backgroundColor: Theme.of(context).colorScheme.primary,
|
||||||
child: icon,
|
child: icon,
|
||||||
).paddingOnly(bottom: 12),
|
).paddingOnly(bottom: 12),
|
||||||
Text(
|
Text(
|
||||||
|
|||||||
@@ -1,11 +1,10 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_animate/flutter_animate.dart';
|
|
||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
import 'package:solian/exts.dart';
|
import 'package:solian/exts.dart';
|
||||||
import 'package:solian/models/friendship.dart';
|
import 'package:solian/models/relations.dart';
|
||||||
import 'package:solian/providers/auth.dart';
|
import 'package:solian/providers/relation.dart';
|
||||||
import 'package:solian/providers/friend.dart';
|
import 'package:solian/theme.dart';
|
||||||
import 'package:solian/widgets/account/friend_list.dart';
|
import 'package:solian/widgets/account/relative_list.dart';
|
||||||
|
|
||||||
class FriendScreen extends StatefulWidget {
|
class FriendScreen extends StatefulWidget {
|
||||||
const FriendScreen({super.key});
|
const FriendScreen({super.key});
|
||||||
@@ -14,71 +13,41 @@ class FriendScreen extends StatefulWidget {
|
|||||||
State<FriendScreen> createState() => _FriendScreenState();
|
State<FriendScreen> createState() => _FriendScreenState();
|
||||||
}
|
}
|
||||||
|
|
||||||
class _FriendScreenState extends State<FriendScreen> {
|
class _FriendScreenState extends State<FriendScreen>
|
||||||
|
with SingleTickerProviderStateMixin {
|
||||||
|
late final TabController _tabController;
|
||||||
|
|
||||||
bool _isBusy = false;
|
bool _isBusy = false;
|
||||||
int? _accountId;
|
|
||||||
|
|
||||||
List<Friendship> _friendships = List.empty();
|
List<Relationship> _relations = List.empty();
|
||||||
|
|
||||||
List<Friendship> filterWithStatus(int status) {
|
List<Relationship> _filterByStatus(int status) {
|
||||||
return _friendships.where((x) => x.status == status).toList();
|
return _relations.where((x) => x.status == status).toList();
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> getFriendship() async {
|
Future<void> _loadRelations() async {
|
||||||
setState(() => _isBusy = true);
|
setState(() => _isBusy = true);
|
||||||
|
|
||||||
final FriendProvider provider = Get.find();
|
final RelationshipProvider relations = Get.find();
|
||||||
final resp = await provider.listFriendship();
|
final resp = await relations.listRelation();
|
||||||
|
|
||||||
setState(() {
|
setState(() {
|
||||||
_friendships = resp.body
|
_relations = resp.body
|
||||||
.map((e) => Friendship.fromJson(e))
|
.map((e) => Relationship.fromJson(e))
|
||||||
.toList()
|
.toList()
|
||||||
.cast<Friendship>();
|
.cast<Relationship>();
|
||||||
_isBusy = false;
|
_isBusy = false;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
relations.friendRequestCount.value =
|
||||||
|
_relations.where((x) => x.status == 0).length;
|
||||||
}
|
}
|
||||||
|
|
||||||
void showScopedListPopup(String title, int status) {
|
void _promptAddFriend() async {
|
||||||
showModalBottomSheet(
|
final RelationshipProvider provider = Get.find();
|
||||||
useRootNavigator: true,
|
|
||||||
isScrollControlled: true,
|
|
||||||
context: context,
|
|
||||||
builder: (context) {
|
|
||||||
return SizedBox(
|
|
||||||
height: MediaQuery.of(context).size.height * 0.85,
|
|
||||||
child: Column(
|
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
|
||||||
children: [
|
|
||||||
Text(
|
|
||||||
title,
|
|
||||||
style: Theme.of(context).textTheme.headlineSmall,
|
|
||||||
).paddingOnly(left: 24, right: 24, top: 32, bottom: 16),
|
|
||||||
Expanded(
|
|
||||||
child: CustomScrollView(
|
|
||||||
slivers: [
|
|
||||||
SliverFriendList(
|
|
||||||
accountId: _accountId!,
|
|
||||||
items: filterWithStatus(status),
|
|
||||||
onUpdate: () {
|
|
||||||
getFriendship();
|
|
||||||
},
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
);
|
|
||||||
},
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
void promptAddFriend() async {
|
|
||||||
final FriendProvider provider = Get.find();
|
|
||||||
|
|
||||||
final controller = TextEditingController();
|
final controller = TextEditingController();
|
||||||
final input = await showDialog(
|
final input = await showDialog<String?>(
|
||||||
context: context,
|
context: context,
|
||||||
builder: (context) {
|
builder: (context) {
|
||||||
return AlertDialog(
|
return AlertDialog(
|
||||||
@@ -125,7 +94,7 @@ class _FriendScreenState extends State<FriendScreen> {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
setState(() => _isBusy = true);
|
setState(() => _isBusy = true);
|
||||||
await provider.createFriendship(input);
|
await provider.makeFriend(input);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
context.showErrorDialog(e);
|
context.showErrorDialog(e);
|
||||||
} finally {
|
} finally {
|
||||||
@@ -135,12 +104,14 @@ class _FriendScreenState extends State<FriendScreen> {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
Get.find<AuthProvider>().getProfile().then((value) {
|
|
||||||
_accountId = value.body['id'];
|
|
||||||
});
|
|
||||||
super.initState();
|
super.initState();
|
||||||
|
_tabController = TabController(length: 3, vsync: this);
|
||||||
|
|
||||||
Future.delayed(Duration.zero, () => getFriendship());
|
_loadRelations().then((_) {
|
||||||
|
if (_filterByStatus(0).isEmpty) {
|
||||||
|
_tabController.animateTo(1);
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -148,65 +119,73 @@ class _FriendScreenState extends State<FriendScreen> {
|
|||||||
return Material(
|
return Material(
|
||||||
color: Theme.of(context).colorScheme.surface,
|
color: Theme.of(context).colorScheme.surface,
|
||||||
child: Scaffold(
|
child: Scaffold(
|
||||||
floatingActionButton: FloatingActionButton(
|
appBar: AppBar(
|
||||||
child: const Icon(Icons.add),
|
centerTitle: false,
|
||||||
onPressed: () => promptAddFriend(),
|
title: Text('accountFriend'.tr),
|
||||||
),
|
actions: [
|
||||||
body: RefreshIndicator(
|
if (_isBusy)
|
||||||
onRefresh: () => getFriendship(),
|
SizedBox(
|
||||||
child: CustomScrollView(
|
height: 48,
|
||||||
slivers: [
|
width: 48,
|
||||||
if (_isBusy)
|
child: const CircularProgressIndicator(
|
||||||
SliverToBoxAdapter(
|
strokeWidth: 3,
|
||||||
child: const LinearProgressIndicator().animate().scaleX(),
|
).paddingAll(14),
|
||||||
),
|
|
||||||
SliverToBoxAdapter(
|
|
||||||
child: ListTile(
|
|
||||||
tileColor: Theme.of(context).colorScheme.surfaceContainerLow,
|
|
||||||
contentPadding: const EdgeInsets.symmetric(horizontal: 20),
|
|
||||||
leading: const Icon(Icons.person_add),
|
|
||||||
trailing: const Icon(Icons.chevron_right),
|
|
||||||
title: Text(
|
|
||||||
'${'accountFriendPending'.tr} (${filterWithStatus(0).length})',
|
|
||||||
),
|
|
||||||
onTap: () =>
|
|
||||||
showScopedListPopup('accountFriendPending'.tr, 0),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
SliverToBoxAdapter(
|
|
||||||
child: ListTile(
|
|
||||||
tileColor: Theme.of(context).colorScheme.surfaceContainerLow,
|
|
||||||
contentPadding: const EdgeInsets.symmetric(horizontal: 20),
|
|
||||||
leading: const Icon(Icons.block),
|
|
||||||
trailing: const Icon(Icons.chevron_right),
|
|
||||||
title: Text(
|
|
||||||
'${'accountFriendBlocked'.tr} (${filterWithStatus(2).length})',
|
|
||||||
),
|
|
||||||
onTap: () =>
|
|
||||||
showScopedListPopup('accountFriendBlocked'.tr, 2),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
if (_accountId != null)
|
|
||||||
SliverFriendList(
|
|
||||||
accountId: _accountId!,
|
|
||||||
items: filterWithStatus(1),
|
|
||||||
onUpdate: () {
|
|
||||||
getFriendship();
|
|
||||||
},
|
|
||||||
),
|
|
||||||
const SliverToBoxAdapter(
|
|
||||||
child: Divider(thickness: 0.3, height: 0.3),
|
|
||||||
),
|
|
||||||
SliverToBoxAdapter(
|
|
||||||
child: Text(
|
|
||||||
'accountFriendListHint'.tr,
|
|
||||||
textAlign: TextAlign.center,
|
|
||||||
style: Theme.of(context).textTheme.bodySmall,
|
|
||||||
).paddingOnly(top: 16, bottom: 32),
|
|
||||||
),
|
),
|
||||||
|
SizedBox(
|
||||||
|
width: SolianTheme.isLargeScreen(context) ? 8 : 16,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
bottom: TabBar(
|
||||||
|
controller: _tabController,
|
||||||
|
tabs: const [
|
||||||
|
Tab(icon: Icon(Icons.call_received)),
|
||||||
|
Tab(icon: Icon(Icons.people)),
|
||||||
|
Tab(icon: Icon(Icons.call_made)),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
floatingActionButton: FloatingActionButton(
|
||||||
|
child: const Icon(Icons.add),
|
||||||
|
onPressed: () => _promptAddFriend(),
|
||||||
|
),
|
||||||
|
body: TabBarView(
|
||||||
|
controller: _tabController,
|
||||||
|
children: [
|
||||||
|
RefreshIndicator(
|
||||||
|
onRefresh: () => _loadRelations(),
|
||||||
|
child: CustomScrollView(
|
||||||
|
slivers: [
|
||||||
|
SilverRelativeList(
|
||||||
|
items: _filterByStatus(0),
|
||||||
|
onUpdate: () => _loadRelations(),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
RefreshIndicator(
|
||||||
|
onRefresh: () => _loadRelations(),
|
||||||
|
child: CustomScrollView(
|
||||||
|
slivers: [
|
||||||
|
SilverRelativeList(
|
||||||
|
items: _filterByStatus(1),
|
||||||
|
onUpdate: () => _loadRelations(),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
RefreshIndicator(
|
||||||
|
onRefresh: () => _loadRelations(),
|
||||||
|
child: CustomScrollView(
|
||||||
|
slivers: [
|
||||||
|
SilverRelativeList(
|
||||||
|
items: _filterByStatus(3),
|
||||||
|
onUpdate: () => _loadRelations(),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ class _NotificationScreenState extends State<NotificationScreen> {
|
|||||||
|
|
||||||
Future<void> markAllRead() async {
|
Future<void> markAllRead() async {
|
||||||
final AuthProvider auth = Get.find();
|
final AuthProvider auth = Get.find();
|
||||||
if (!await auth.isAuthorized) return;
|
if (auth.isAuthorized.isFalse) return;
|
||||||
|
|
||||||
setState(() => _isBusy = true);
|
setState(() => _isBusy = true);
|
||||||
|
|
||||||
@@ -32,7 +32,7 @@ class _NotificationScreenState extends State<NotificationScreen> {
|
|||||||
|
|
||||||
if (markList.isNotEmpty) {
|
if (markList.isNotEmpty) {
|
||||||
final client = auth.configureClient('auth');
|
final client = auth.configureClient('auth');
|
||||||
await client.put('/notifications/batch/read', {'messages': markList});
|
await client.put('/notifications/read', {'messages': markList});
|
||||||
}
|
}
|
||||||
|
|
||||||
provider.notifications.clear();
|
provider.notifications.clear();
|
||||||
@@ -42,7 +42,7 @@ class _NotificationScreenState extends State<NotificationScreen> {
|
|||||||
|
|
||||||
Future<void> markOneRead(notify.Notification element, int index) async {
|
Future<void> markOneRead(notify.Notification element, int index) async {
|
||||||
final AuthProvider auth = Get.find();
|
final AuthProvider auth = Get.find();
|
||||||
if (!await auth.isAuthorized) return;
|
if (auth.isAuthorized.isFalse) return;
|
||||||
|
|
||||||
final WebSocketProvider provider = Get.find();
|
final WebSocketProvider provider = Get.find();
|
||||||
|
|
||||||
@@ -55,7 +55,7 @@ class _NotificationScreenState extends State<NotificationScreen> {
|
|||||||
|
|
||||||
final client = auth.configureClient('auth');
|
final client = auth.configureClient('auth');
|
||||||
|
|
||||||
await client.put('/notifications/${element.id}/read', {});
|
await client.put('/notifications/read/${element.id}', {});
|
||||||
|
|
||||||
provider.notifications.removeAt(index);
|
provider.notifications.removeAt(index);
|
||||||
|
|
||||||
@@ -98,14 +98,14 @@ class _NotificationScreenState extends State<NotificationScreen> {
|
|||||||
),
|
),
|
||||||
if (provider.notifications.isNotEmpty)
|
if (provider.notifications.isNotEmpty)
|
||||||
SliverToBoxAdapter(
|
SliverToBoxAdapter(
|
||||||
child: ListTile(
|
child: Container(
|
||||||
tileColor:
|
padding: const EdgeInsets.symmetric(horizontal: 10),
|
||||||
Theme.of(context).colorScheme.secondaryContainer,
|
color: Theme.of(context).colorScheme.secondaryContainer,
|
||||||
leading: const Icon(Icons.checklist),
|
child: ListTile(
|
||||||
title: Text('notifyAllRead'.tr),
|
leading: const Icon(Icons.checklist),
|
||||||
contentPadding:
|
title: Text('notifyAllRead'.tr),
|
||||||
const EdgeInsets.symmetric(horizontal: 28),
|
onTap: _isBusy ? null : () => markAllRead(),
|
||||||
onTap: _isBusy ? null : () => markAllRead(),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
SliverList.separated(
|
SliverList.separated(
|
||||||
|
|||||||
@@ -3,9 +3,11 @@ import 'dart:io';
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_animate/flutter_animate.dart';
|
import 'package:flutter_animate/flutter_animate.dart';
|
||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
|
import 'package:image_cropper/image_cropper.dart';
|
||||||
import 'package:image_picker/image_picker.dart';
|
import 'package:image_picker/image_picker.dart';
|
||||||
import 'package:intl/intl.dart';
|
import 'package:intl/intl.dart';
|
||||||
import 'package:solian/exts.dart';
|
import 'package:solian/exts.dart';
|
||||||
|
import 'package:solian/models/attachment.dart';
|
||||||
import 'package:solian/providers/auth.dart';
|
import 'package:solian/providers/auth.dart';
|
||||||
import 'package:solian/providers/content/attachment.dart';
|
import 'package:solian/providers/content/attachment.dart';
|
||||||
import 'package:solian/services.dart';
|
import 'package:solian/services.dart';
|
||||||
@@ -34,7 +36,7 @@ class _PersonalizeScreenState extends State<PersonalizeScreen> {
|
|||||||
|
|
||||||
bool _isBusy = false;
|
bool _isBusy = false;
|
||||||
|
|
||||||
void selectBirthday() async {
|
void _selectBirthday() async {
|
||||||
final DateTime? picked = await showDatePicker(
|
final DateTime? picked = await showDatePicker(
|
||||||
context: context,
|
context: context,
|
||||||
initialDate: _birthday?.toLocal(),
|
initialDate: _birthday?.toLocal(),
|
||||||
@@ -49,52 +51,73 @@ class _PersonalizeScreenState extends State<PersonalizeScreen> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void syncWidget() async {
|
void _syncWidget() async {
|
||||||
setState(() => _isBusy = true);
|
_isBusy = true;
|
||||||
|
|
||||||
final AuthProvider auth = Get.find();
|
final AuthProvider auth = Get.find();
|
||||||
final prof = await auth.getProfile(noCache: true);
|
final prof = auth.userProfile.value!;
|
||||||
setState(() {
|
_usernameController.text = prof['name'];
|
||||||
_usernameController.text = prof.body['name'];
|
_nicknameController.text = prof['nick'];
|
||||||
_nicknameController.text = prof.body['nick'];
|
_descriptionController.text = prof['description'];
|
||||||
_descriptionController.text = prof.body['description'];
|
_firstNameController.text = prof['profile']['first_name'];
|
||||||
_firstNameController.text = prof.body['profile']['first_name'];
|
_lastNameController.text = prof['profile']['last_name'];
|
||||||
_lastNameController.text = prof.body['profile']['last_name'];
|
_avatar = prof['avatar'];
|
||||||
_avatar = prof.body['avatar'];
|
_banner = prof['banner'];
|
||||||
_banner = prof.body['banner'];
|
if (prof['profile']['birthday'] != null) {
|
||||||
if (prof.body['profile']['birthday'] != null) {
|
_birthday = DateTime.parse(prof['profile']['birthday']);
|
||||||
_birthday = DateTime.parse(prof.body['profile']['birthday']);
|
_birthdayController.text =
|
||||||
_birthdayController.text =
|
DateFormat('yyyy-MM-dd').format(_birthday!.toLocal());
|
||||||
DateFormat('yyyy-MM-dd').format(_birthday!.toLocal());
|
}
|
||||||
}
|
|
||||||
|
|
||||||
_isBusy = false;
|
_isBusy = false;
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<void> updateImage(String position) async {
|
Future<void> _editImage(String position) async {
|
||||||
final AuthProvider auth = Get.find();
|
final AuthProvider auth = Get.find();
|
||||||
if (!await auth.isAuthorized) return;
|
if (auth.isAuthorized.isFalse) return;
|
||||||
|
|
||||||
final image = await _imagePicker.pickImage(source: ImageSource.gallery);
|
final image = await _imagePicker.pickImage(source: ImageSource.gallery);
|
||||||
if (image == null) return;
|
if (image == null) return;
|
||||||
|
|
||||||
|
CroppedFile? croppedFile = await ImageCropper().cropImage(
|
||||||
|
sourcePath: image.path,
|
||||||
|
uiSettings: [
|
||||||
|
AndroidUiSettings(
|
||||||
|
toolbarTitle: 'cropImage'.tr,
|
||||||
|
toolbarColor: Theme.of(context).colorScheme.primary,
|
||||||
|
toolbarWidgetColor: Theme.of(context).colorScheme.onPrimary,
|
||||||
|
aspectRatioPresets: [
|
||||||
|
if (position == 'avatar') CropAspectRatioPreset.square,
|
||||||
|
if (position == 'banner') _BannerCropAspectRatioPreset(),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
IOSUiSettings(
|
||||||
|
title: 'cropImage'.tr,
|
||||||
|
aspectRatioPresets: [
|
||||||
|
if (position == 'avatar') CropAspectRatioPreset.square,
|
||||||
|
if (position == 'banner') _BannerCropAspectRatioPreset(),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
WebUiSettings(
|
||||||
|
context: context,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
|
||||||
|
if (croppedFile == null) return;
|
||||||
|
final file = File(croppedFile.path);
|
||||||
|
|
||||||
setState(() => _isBusy = true);
|
setState(() => _isBusy = true);
|
||||||
|
|
||||||
final AttachmentProvider provider = Get.find();
|
final AttachmentProvider provider = Get.find();
|
||||||
|
|
||||||
Response? attachResp;
|
Attachment? attachResult;
|
||||||
try {
|
try {
|
||||||
final file = File(image.path);
|
attachResult = await provider.createAttachment(
|
||||||
final hash = await calculateFileSha256(file);
|
|
||||||
final meta = await calculateImageMetaFromFile(file);
|
|
||||||
|
|
||||||
attachResp = await provider.createAttachment(
|
|
||||||
await file.readAsBytes(),
|
await file.readAsBytes(),
|
||||||
file.path,
|
file.path,
|
||||||
hash,
|
|
||||||
'p.$position',
|
'p.$position',
|
||||||
{...meta},
|
null,
|
||||||
);
|
);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
setState(() => _isBusy = false);
|
setState(() => _isBusy = false);
|
||||||
@@ -106,10 +129,10 @@ class _PersonalizeScreenState extends State<PersonalizeScreen> {
|
|||||||
|
|
||||||
final resp = await client.put(
|
final resp = await client.put(
|
||||||
'/users/me/$position',
|
'/users/me/$position',
|
||||||
{'attachment': attachResp.body['id']},
|
{'attachment': attachResult.id},
|
||||||
);
|
);
|
||||||
if (resp.statusCode == 200) {
|
if (resp.statusCode == 200) {
|
||||||
syncWidget();
|
_syncWidget();
|
||||||
context.showSnackbar('accountPersonalizeApplied'.tr);
|
context.showSnackbar('accountPersonalizeApplied'.tr);
|
||||||
} else {
|
} else {
|
||||||
context.showErrorDialog(resp.bodyString);
|
context.showErrorDialog(resp.bodyString);
|
||||||
@@ -118,9 +141,9 @@ class _PersonalizeScreenState extends State<PersonalizeScreen> {
|
|||||||
setState(() => _isBusy = false);
|
setState(() => _isBusy = false);
|
||||||
}
|
}
|
||||||
|
|
||||||
void updatePersonalize() async {
|
void _editUserInfo() async {
|
||||||
final AuthProvider auth = Get.find();
|
final AuthProvider auth = Get.find();
|
||||||
if (!await auth.isAuthorized) return;
|
if (auth.isAuthorized.isFalse) return;
|
||||||
|
|
||||||
setState(() => _isBusy = true);
|
setState(() => _isBusy = true);
|
||||||
|
|
||||||
@@ -138,7 +161,7 @@ class _PersonalizeScreenState extends State<PersonalizeScreen> {
|
|||||||
},
|
},
|
||||||
);
|
);
|
||||||
if (resp.statusCode == 200) {
|
if (resp.statusCode == 200) {
|
||||||
syncWidget();
|
_syncWidget();
|
||||||
context.showSnackbar('accountPersonalizeApplied'.tr);
|
context.showSnackbar('accountPersonalizeApplied'.tr);
|
||||||
} else {
|
} else {
|
||||||
context.showErrorDialog(resp.bodyString);
|
context.showErrorDialog(resp.bodyString);
|
||||||
@@ -150,8 +173,7 @@ class _PersonalizeScreenState extends State<PersonalizeScreen> {
|
|||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
super.initState();
|
super.initState();
|
||||||
|
_syncWidget();
|
||||||
Future.delayed(Duration.zero, () => syncWidget());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -172,7 +194,7 @@ class _PersonalizeScreenState extends State<PersonalizeScreen> {
|
|||||||
left: 40,
|
left: 40,
|
||||||
child: FloatingActionButton.small(
|
child: FloatingActionButton.small(
|
||||||
heroTag: const Key('avatar-editor'),
|
heroTag: const Key('avatar-editor'),
|
||||||
onPressed: () => updateImage('avatar'),
|
onPressed: () => _editImage('avatar'),
|
||||||
child: const Icon(
|
child: const Icon(
|
||||||
Icons.camera,
|
Icons.camera,
|
||||||
),
|
),
|
||||||
@@ -191,7 +213,8 @@ class _PersonalizeScreenState extends State<PersonalizeScreen> {
|
|||||||
color: Theme.of(context).colorScheme.surfaceContainerHigh,
|
color: Theme.of(context).colorScheme.surfaceContainerHigh,
|
||||||
child: _banner != null
|
child: _banner != null
|
||||||
? Image.network(
|
? Image.network(
|
||||||
ServiceFinder.buildUrl('files', '/attachments/$_banner'),
|
ServiceFinder.buildUrl(
|
||||||
|
'files', '/attachments/$_banner'),
|
||||||
fit: BoxFit.cover,
|
fit: BoxFit.cover,
|
||||||
loadingBuilder: (BuildContext context, Widget child,
|
loadingBuilder: (BuildContext context, Widget child,
|
||||||
ImageChunkEvent? loadingProgress) {
|
ImageChunkEvent? loadingProgress) {
|
||||||
@@ -216,7 +239,7 @@ class _PersonalizeScreenState extends State<PersonalizeScreen> {
|
|||||||
right: 16,
|
right: 16,
|
||||||
child: FloatingActionButton(
|
child: FloatingActionButton(
|
||||||
heroTag: const Key('banner-editor'),
|
heroTag: const Key('banner-editor'),
|
||||||
onPressed: () => updateImage('banner'),
|
onPressed: () => _editImage('banner'),
|
||||||
child: const Icon(
|
child: const Icon(
|
||||||
Icons.camera_alt,
|
Icons.camera_alt,
|
||||||
),
|
),
|
||||||
@@ -297,18 +320,18 @@ class _PersonalizeScreenState extends State<PersonalizeScreen> {
|
|||||||
border: const OutlineInputBorder(),
|
border: const OutlineInputBorder(),
|
||||||
labelText: 'birthday'.tr,
|
labelText: 'birthday'.tr,
|
||||||
),
|
),
|
||||||
onTap: () => selectBirthday(),
|
onTap: () => _selectBirthday(),
|
||||||
).paddingSymmetric(horizontal: padding),
|
).paddingSymmetric(horizontal: padding),
|
||||||
const SizedBox(height: 16),
|
const SizedBox(height: 16),
|
||||||
Row(
|
Row(
|
||||||
mainAxisAlignment: MainAxisAlignment.end,
|
mainAxisAlignment: MainAxisAlignment.end,
|
||||||
children: [
|
children: [
|
||||||
TextButton(
|
TextButton(
|
||||||
onPressed: _isBusy ? null : () => syncWidget(),
|
onPressed: _isBusy ? null : () => _syncWidget(),
|
||||||
child: Text('reset'.tr),
|
child: Text('reset'.tr),
|
||||||
),
|
),
|
||||||
ElevatedButton(
|
ElevatedButton(
|
||||||
onPressed: _isBusy ? null : () => updatePersonalize(),
|
onPressed: _isBusy ? null : () => _editUserInfo(),
|
||||||
child: Text('apply'.tr),
|
child: Text('apply'.tr),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
@@ -329,3 +352,11 @@ class _PersonalizeScreenState extends State<PersonalizeScreen> {
|
|||||||
super.dispose();
|
super.dispose();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class _BannerCropAspectRatioPreset extends CropAspectRatioPresetData {
|
||||||
|
@override
|
||||||
|
(int, int)? get data => (16, 7);
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get name => '16x7';
|
||||||
|
}
|
||||||
|
|||||||
355
lib/screens/account/profile_page.dart
Normal file
@@ -0,0 +1,355 @@
|
|||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:get/get.dart';
|
||||||
|
import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
|
||||||
|
import 'package:solian/controllers/post_list_controller.dart';
|
||||||
|
import 'package:solian/exts.dart';
|
||||||
|
import 'package:solian/models/account.dart';
|
||||||
|
import 'package:solian/models/attachment.dart';
|
||||||
|
import 'package:solian/models/pagination.dart';
|
||||||
|
import 'package:solian/models/post.dart';
|
||||||
|
import 'package:solian/providers/relation.dart';
|
||||||
|
import 'package:solian/services.dart';
|
||||||
|
import 'package:solian/theme.dart';
|
||||||
|
import 'package:solian/widgets/account/account_avatar.dart';
|
||||||
|
import 'package:solian/widgets/app_bar_leading.dart';
|
||||||
|
import 'package:solian/widgets/attachments/attachment_list.dart';
|
||||||
|
import 'package:solian/widgets/posts/post_list.dart';
|
||||||
|
import 'package:solian/widgets/posts/post_warped_list.dart';
|
||||||
|
import 'package:solian/widgets/sized_container.dart';
|
||||||
|
|
||||||
|
class AccountProfilePage extends StatefulWidget {
|
||||||
|
final String name;
|
||||||
|
|
||||||
|
const AccountProfilePage({super.key, required this.name});
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<AccountProfilePage> createState() => _AccountProfilePageState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _AccountProfilePageState extends State<AccountProfilePage> {
|
||||||
|
late final RelationshipProvider _relationshipProvider;
|
||||||
|
late final PostListController _postController;
|
||||||
|
final PagingController<int, Attachment> _albumPagingController =
|
||||||
|
PagingController(firstPageKey: 0);
|
||||||
|
|
||||||
|
bool _isBusy = true;
|
||||||
|
bool _isMakingFriend = false;
|
||||||
|
bool _showMature = false;
|
||||||
|
|
||||||
|
Account? _userinfo;
|
||||||
|
List<Post> _pinnedPosts = List.empty();
|
||||||
|
int _totalUpvote = 0, _totalDownvote = 0;
|
||||||
|
|
||||||
|
Future<void> _getUserinfo() async {
|
||||||
|
setState(() => _isBusy = true);
|
||||||
|
|
||||||
|
var client = ServiceFinder.configureClient('auth');
|
||||||
|
var resp = await client.get('/users/${widget.name}');
|
||||||
|
if (resp.statusCode != 200) {
|
||||||
|
context.showErrorDialog(resp.bodyString).then((_) {
|
||||||
|
Navigator.pop(context);
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
_userinfo = Account.fromJson(resp.body);
|
||||||
|
}
|
||||||
|
|
||||||
|
client = ServiceFinder.configureClient('interactive');
|
||||||
|
resp = await client.get('/users/${widget.name}');
|
||||||
|
if (resp.statusCode != 200) {
|
||||||
|
context.showErrorDialog(resp.bodyString).then((_) {
|
||||||
|
Navigator.pop(context);
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
_totalUpvote = resp.body['total_upvote'];
|
||||||
|
_totalDownvote = resp.body['total_downvote'];
|
||||||
|
}
|
||||||
|
|
||||||
|
setState(() => _isBusy = false);
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<void> getPinnedPosts() async {
|
||||||
|
final client = ServiceFinder.configureClient('interactive');
|
||||||
|
final resp = await client.get('/users/${widget.name}/pin');
|
||||||
|
if (resp.statusCode != 200) {
|
||||||
|
context.showErrorDialog(resp.bodyString).then((_) {
|
||||||
|
Navigator.pop(context);
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
setState(() {
|
||||||
|
_pinnedPosts =
|
||||||
|
resp.body.map((x) => Post.fromJson(x)).toList().cast<Post>();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
int get _userSocialCreditPoints {
|
||||||
|
int birthPart =
|
||||||
|
DateTime.now().difference(_userinfo!.createdAt.toLocal()).inSeconds;
|
||||||
|
birthPart = birthPart >> 16;
|
||||||
|
return _totalUpvote * 2 - _totalDownvote + birthPart;
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
super.initState();
|
||||||
|
_relationshipProvider = Get.find();
|
||||||
|
_postController = PostListController(author: widget.name);
|
||||||
|
_albumPagingController.addPageRequestListener((pageKey) async {
|
||||||
|
final client = ServiceFinder.configureClient('files');
|
||||||
|
final resp = await client
|
||||||
|
.get('/attachments?take=10&offset=$pageKey&author=${widget.name}');
|
||||||
|
if (resp.statusCode == 200) {
|
||||||
|
final result = PaginationResult.fromJson(resp.body);
|
||||||
|
final out = result.data
|
||||||
|
?.map((e) => Attachment.fromJson(e))
|
||||||
|
.where((x) => x.mimetype.split('/').firstOrNull == 'image')
|
||||||
|
.toList();
|
||||||
|
if (out != null && result.data!.length >= 10) {
|
||||||
|
_albumPagingController.appendPage(out, pageKey + out.length);
|
||||||
|
} else if (out != null) {
|
||||||
|
_albumPagingController.appendLastPage(out);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
_albumPagingController.error = resp.bodyString;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
_getUserinfo();
|
||||||
|
getPinnedPosts();
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget _buildStatisticsEntry(String label, String content) {
|
||||||
|
return Expanded(
|
||||||
|
child: Column(
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
label,
|
||||||
|
style: Theme.of(context).textTheme.bodySmall,
|
||||||
|
),
|
||||||
|
Text(
|
||||||
|
content,
|
||||||
|
style: Theme.of(context).textTheme.bodyLarge,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
if (_isBusy || _userinfo == null) {
|
||||||
|
return const Center(child: CircularProgressIndicator());
|
||||||
|
}
|
||||||
|
|
||||||
|
return Material(
|
||||||
|
color: Theme.of(context).colorScheme.surface,
|
||||||
|
child: DefaultTabController(
|
||||||
|
length: 2,
|
||||||
|
child: NestedScrollView(
|
||||||
|
headerSliverBuilder: (BuildContext context, bool innerBoxIsScrolled) {
|
||||||
|
return [
|
||||||
|
SliverAppBar(
|
||||||
|
centerTitle: false,
|
||||||
|
floating: true,
|
||||||
|
toolbarHeight: SolianTheme.toolbarHeight(context),
|
||||||
|
leadingWidth: 24,
|
||||||
|
automaticallyImplyLeading: false,
|
||||||
|
flexibleSpace: Row(
|
||||||
|
children: [
|
||||||
|
AppBarLeadingButton.adaptive(context) ??
|
||||||
|
const SizedBox(width: 8),
|
||||||
|
const SizedBox(width: 8),
|
||||||
|
if (_userinfo != null)
|
||||||
|
AccountAvatar(content: _userinfo!.avatar, radius: 16),
|
||||||
|
const SizedBox(width: 12),
|
||||||
|
Expanded(
|
||||||
|
child: Column(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
if (_userinfo != null)
|
||||||
|
Text(
|
||||||
|
_userinfo!.nick,
|
||||||
|
style: Theme.of(context).textTheme.bodyLarge,
|
||||||
|
),
|
||||||
|
if (_userinfo != null)
|
||||||
|
Text(
|
||||||
|
'@${_userinfo!.name}',
|
||||||
|
style: Theme.of(context).textTheme.bodySmall,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
if (_userinfo != null &&
|
||||||
|
!_relationshipProvider.hasFriend(_userinfo!))
|
||||||
|
IconButton(
|
||||||
|
icon: const Icon(Icons.person_add),
|
||||||
|
onPressed: _isMakingFriend
|
||||||
|
? null
|
||||||
|
: () async {
|
||||||
|
setState(() => _isMakingFriend = true);
|
||||||
|
try {
|
||||||
|
await _relationshipProvider
|
||||||
|
.makeFriend(widget.name);
|
||||||
|
context.showSnackbar(
|
||||||
|
'accountFriendRequestSent'.tr,
|
||||||
|
);
|
||||||
|
} catch (e) {
|
||||||
|
context.showErrorDialog(e);
|
||||||
|
} finally {
|
||||||
|
setState(() => _isMakingFriend = false);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
)
|
||||||
|
else
|
||||||
|
const IconButton(
|
||||||
|
icon: Icon(Icons.handshake),
|
||||||
|
onPressed: null,
|
||||||
|
),
|
||||||
|
SizedBox(
|
||||||
|
width: SolianTheme.isLargeScreen(context) ? 8 : 16,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
bottom: TabBar(
|
||||||
|
tabs: [
|
||||||
|
Tab(text: 'profilePosts'.tr),
|
||||||
|
Tab(text: 'profileAlbum'.tr),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
)
|
||||||
|
];
|
||||||
|
},
|
||||||
|
body: TabBarView(
|
||||||
|
physics: const NeverScrollableScrollPhysics(),
|
||||||
|
children: [
|
||||||
|
RefreshIndicator(
|
||||||
|
onRefresh: () => Future.wait([
|
||||||
|
_postController.reloadAllOver(),
|
||||||
|
getPinnedPosts(),
|
||||||
|
]),
|
||||||
|
child: CustomScrollView(slivers: [
|
||||||
|
SliverToBoxAdapter(
|
||||||
|
child: Column(
|
||||||
|
children: [
|
||||||
|
Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.spaceAround,
|
||||||
|
children: [
|
||||||
|
_buildStatisticsEntry(
|
||||||
|
'totalSocialCreditPoints'.tr,
|
||||||
|
_userinfo != null
|
||||||
|
? _userSocialCreditPoints.toString()
|
||||||
|
: 0.toString(),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
const SizedBox(height: 16),
|
||||||
|
Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.spaceAround,
|
||||||
|
children: [
|
||||||
|
Obx(
|
||||||
|
() => _buildStatisticsEntry(
|
||||||
|
'totalPostCount'.tr,
|
||||||
|
_postController.postTotal.value.toString(),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
_buildStatisticsEntry(
|
||||||
|
'totalUpvote'.tr,
|
||||||
|
_totalUpvote.toString(),
|
||||||
|
),
|
||||||
|
_buildStatisticsEntry(
|
||||||
|
'totalDownvote'.tr,
|
||||||
|
_totalDownvote.toString(),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
],
|
||||||
|
).paddingOnly(top: 16, bottom: 12),
|
||||||
|
),
|
||||||
|
const SliverToBoxAdapter(
|
||||||
|
child: Divider(thickness: 0.3, height: 0.3),
|
||||||
|
),
|
||||||
|
SliverList.separated(
|
||||||
|
itemCount: _pinnedPosts.length,
|
||||||
|
itemBuilder: (context, idx) {
|
||||||
|
final element = _pinnedPosts[idx];
|
||||||
|
return Material(
|
||||||
|
color:
|
||||||
|
Theme.of(context).colorScheme.surfaceContainerLow,
|
||||||
|
child: PostListEntryWidget(
|
||||||
|
backgroundColor:
|
||||||
|
Theme.of(context).colorScheme.surfaceContainerLow,
|
||||||
|
item: element,
|
||||||
|
isClickable: true,
|
||||||
|
isNestedClickable: true,
|
||||||
|
isShowEmbed: true,
|
||||||
|
onUpdate: () {
|
||||||
|
_postController.reloadAllOver();
|
||||||
|
},
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
separatorBuilder: (context, idx) =>
|
||||||
|
const Divider(thickness: 0.3, height: 0.3),
|
||||||
|
),
|
||||||
|
if (_userinfo == null)
|
||||||
|
const SliverFillRemaining(
|
||||||
|
child: Center(child: CircularProgressIndicator()),
|
||||||
|
),
|
||||||
|
if (_userinfo != null)
|
||||||
|
PostWarpedListWidget(
|
||||||
|
isPinned: false,
|
||||||
|
controller: _postController.pagingController,
|
||||||
|
onUpdate: () => _postController.reloadAllOver(),
|
||||||
|
),
|
||||||
|
]),
|
||||||
|
),
|
||||||
|
CenteredContainer(
|
||||||
|
child: RefreshIndicator(
|
||||||
|
onRefresh: () =>
|
||||||
|
Future.sync(() => _albumPagingController.refresh()),
|
||||||
|
child: PagedGridView<int, Attachment>(
|
||||||
|
padding: EdgeInsets.zero,
|
||||||
|
pagingController: _albumPagingController,
|
||||||
|
gridDelegate:
|
||||||
|
const SliverGridDelegateWithFixedCrossAxisCount(
|
||||||
|
crossAxisCount: 3,
|
||||||
|
mainAxisSpacing: 8.0,
|
||||||
|
crossAxisSpacing: 8.0,
|
||||||
|
),
|
||||||
|
builderDelegate: PagedChildBuilderDelegate<Attachment>(
|
||||||
|
itemBuilder: (BuildContext context, item, int index) {
|
||||||
|
const radius = BorderRadius.all(Radius.circular(8));
|
||||||
|
return Container(
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
border: Border.all(
|
||||||
|
color: Theme.of(context).dividerColor,
|
||||||
|
width: 0.3,
|
||||||
|
),
|
||||||
|
borderRadius: radius,
|
||||||
|
),
|
||||||
|
child: ClipRRect(
|
||||||
|
borderRadius: radius,
|
||||||
|
child: AttachmentListEntry(
|
||||||
|
item: item,
|
||||||
|
isDense: true,
|
||||||
|
parentId: 'album',
|
||||||
|
showMature: _showMature,
|
||||||
|
onReveal: (value) {
|
||||||
|
setState(() => _showMature = value);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
).paddingAll(16),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
191
lib/screens/account/stickers.dart
Normal file
@@ -0,0 +1,191 @@
|
|||||||
|
import 'package:cached_network_image/cached_network_image.dart';
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:get/get.dart';
|
||||||
|
import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
|
||||||
|
import 'package:solian/models/pagination.dart';
|
||||||
|
import 'package:solian/models/stickers.dart';
|
||||||
|
import 'package:solian/platform.dart';
|
||||||
|
import 'package:solian/providers/auth.dart';
|
||||||
|
import 'package:solian/providers/stickers.dart';
|
||||||
|
import 'package:solian/services.dart';
|
||||||
|
import 'package:solian/widgets/stickers/sticker_uploader.dart';
|
||||||
|
|
||||||
|
class StickerScreen extends StatefulWidget {
|
||||||
|
const StickerScreen({super.key});
|
||||||
|
|
||||||
|
@override
|
||||||
|
State<StickerScreen> createState() => _StickerScreenState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class _StickerScreenState extends State<StickerScreen> {
|
||||||
|
final PagingController<int, StickerPack> _pagingController =
|
||||||
|
PagingController(firstPageKey: 0);
|
||||||
|
|
||||||
|
Future<bool> _promptDelete(Sticker item, String prefix) async {
|
||||||
|
final AuthProvider auth = Get.find();
|
||||||
|
if (auth.isAuthorized.isFalse) return false;
|
||||||
|
|
||||||
|
final confirm = await showDialog(
|
||||||
|
context: context,
|
||||||
|
builder: (context) => AlertDialog(
|
||||||
|
title: Text('stickerDeletionConfirm'.tr),
|
||||||
|
content: Text(
|
||||||
|
'stickerDeletionConfirmCaption'.trParams({
|
||||||
|
'name': ':${'$prefix${item.alias}'.camelCase}:',
|
||||||
|
}),
|
||||||
|
),
|
||||||
|
actions: <Widget>[
|
||||||
|
TextButton(
|
||||||
|
onPressed: () => Navigator.pop(context),
|
||||||
|
child: Text('cancel'.tr),
|
||||||
|
),
|
||||||
|
TextButton(
|
||||||
|
onPressed: () => Navigator.pop(context, true),
|
||||||
|
child: Text('confirm'.tr),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
if (confirm != true) return false;
|
||||||
|
|
||||||
|
final client = auth.configureClient('files');
|
||||||
|
final resp = await client.delete('/stickers/${item.id}');
|
||||||
|
|
||||||
|
return resp.statusCode == 200;
|
||||||
|
}
|
||||||
|
|
||||||
|
Future<bool?> _promptUploadSticker({Sticker? edit}) {
|
||||||
|
return showDialog(
|
||||||
|
context: context,
|
||||||
|
builder: (context) => StickerUploadDialog(
|
||||||
|
edit: edit,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget _buildEmoteEntry(Sticker item, String prefix) {
|
||||||
|
final imageUrl = ServiceFinder.buildUrl(
|
||||||
|
'files',
|
||||||
|
'/attachments/${item.attachmentId}',
|
||||||
|
);
|
||||||
|
return ListTile(
|
||||||
|
title: Text(item.name),
|
||||||
|
subtitle: Text(item.textWarpedPlaceholder),
|
||||||
|
contentPadding: const EdgeInsets.only(left: 16, right: 14),
|
||||||
|
trailing: Row(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
IconButton(
|
||||||
|
icon: const Icon(Icons.edit_square),
|
||||||
|
onPressed: () {
|
||||||
|
_promptUploadSticker(edit: item).then((value) {
|
||||||
|
if (value == true) _pagingController.refresh();
|
||||||
|
});
|
||||||
|
},
|
||||||
|
),
|
||||||
|
IconButton(
|
||||||
|
icon: const Icon(Icons.delete),
|
||||||
|
onPressed: () {
|
||||||
|
_promptDelete(item, prefix).then((value) {
|
||||||
|
if (value == true) _pagingController.refresh();
|
||||||
|
});
|
||||||
|
},
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
leading: PlatformInfo.canCacheImage
|
||||||
|
? CachedNetworkImage(
|
||||||
|
imageUrl: imageUrl,
|
||||||
|
width: 28,
|
||||||
|
height: 28,
|
||||||
|
)
|
||||||
|
: Image.network(
|
||||||
|
imageUrl,
|
||||||
|
width: 28,
|
||||||
|
height: 28,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
final AuthProvider auth = Get.find();
|
||||||
|
final name = auth.userProfile.value!['name'];
|
||||||
|
_pagingController.addPageRequestListener((pageKey) async {
|
||||||
|
final client = ServiceFinder.configureClient('files');
|
||||||
|
final resp = await client.get(
|
||||||
|
'/stickers/manifest?take=10&offset=$pageKey&author=$name',
|
||||||
|
);
|
||||||
|
if (resp.statusCode == 200) {
|
||||||
|
final result = PaginationResult.fromJson(resp.body);
|
||||||
|
final out = result.data?.map((e) => StickerPack.fromJson(e)).toList();
|
||||||
|
if (out != null && result.data!.length >= 10) {
|
||||||
|
_pagingController.appendPage(out, pageKey + out.length);
|
||||||
|
} else if (out != null) {
|
||||||
|
_pagingController.appendLastPage(out);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
_pagingController.error = resp.bodyString;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
super.initState();
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void dispose() {
|
||||||
|
final StickerProvider sticker = Get.find();
|
||||||
|
sticker.refreshAvailableStickers();
|
||||||
|
_pagingController.dispose();
|
||||||
|
super.dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
return Scaffold(
|
||||||
|
floatingActionButton: FloatingActionButton(
|
||||||
|
child: const Icon(Icons.add),
|
||||||
|
onPressed: () {
|
||||||
|
_promptUploadSticker().then((value) {
|
||||||
|
if (value == true) _pagingController.refresh();
|
||||||
|
});
|
||||||
|
},
|
||||||
|
),
|
||||||
|
body: RefreshIndicator(
|
||||||
|
onRefresh: () => Future.sync(() => _pagingController.refresh()),
|
||||||
|
child: CustomScrollView(
|
||||||
|
slivers: [
|
||||||
|
PagedSliverList<int, StickerPack>(
|
||||||
|
pagingController: _pagingController,
|
||||||
|
builderDelegate: PagedChildBuilderDelegate(
|
||||||
|
itemBuilder: (BuildContext context, item, int index) {
|
||||||
|
return ExpansionTile(
|
||||||
|
title: Row(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.center,
|
||||||
|
children: [
|
||||||
|
Text(item.name),
|
||||||
|
const SizedBox(width: 6),
|
||||||
|
Badge(
|
||||||
|
label: Text('#${item.id}'),
|
||||||
|
)
|
||||||
|
],
|
||||||
|
),
|
||||||
|
subtitle: Text(
|
||||||
|
item.description,
|
||||||
|
maxLines: 1,
|
||||||
|
overflow: TextOverflow.ellipsis,
|
||||||
|
),
|
||||||
|
children: item.stickers?.map((x) {
|
||||||
|
x.pack = item;
|
||||||
|
return _buildEmoteEntry(x, item.prefix);
|
||||||
|
}).toList() ??
|
||||||
|
List.empty(),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -52,7 +52,7 @@ class _SignInPopupState extends State<SignInPopup> with ProtocolListener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void performAction() async {
|
void performAction() async {
|
||||||
final AuthProvider provider = Get.find();
|
final AuthProvider auth = Get.find();
|
||||||
|
|
||||||
final username = _usernameController.value.text;
|
final username = _usernameController.value.text;
|
||||||
final password = _passwordController.value.text;
|
final password = _passwordController.value.text;
|
||||||
@@ -61,7 +61,11 @@ class _SignInPopupState extends State<SignInPopup> with ProtocolListener {
|
|||||||
setState(() => _isBusy = true);
|
setState(() => _isBusy = true);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await provider.signin(context, username, password);
|
await auth.signin(context, username, password);
|
||||||
|
await Future.delayed(const Duration(milliseconds: 250), () async {
|
||||||
|
await auth.refreshAuthorizeStatus();
|
||||||
|
await auth.refreshUserProfile();
|
||||||
|
});
|
||||||
} on RiskyAuthenticateException catch (e) {
|
} on RiskyAuthenticateException catch (e) {
|
||||||
showDialog(
|
showDialog(
|
||||||
context: context,
|
context: context,
|
||||||
@@ -75,7 +79,8 @@ class _SignInPopupState extends State<SignInPopup> with ProtocolListener {
|
|||||||
onPressed: () {
|
onPressed: () {
|
||||||
const redirect = 'solink://auth?status=done';
|
const redirect = 'solink://auth?status=done';
|
||||||
launchUrlString(
|
launchUrlString(
|
||||||
ServiceFinder.buildUrl('passport', '/mfa?redirect_uri=$redirect&ticketId=${e.ticketId}'),
|
ServiceFinder.buildUrl('passport',
|
||||||
|
'/mfa?redirect_uri=$redirect&ticketId=${e.ticketId}'),
|
||||||
mode: LaunchMode.inAppWebView,
|
mode: LaunchMode.inAppWebView,
|
||||||
);
|
);
|
||||||
Navigator.pop(context);
|
Navigator.pop(context);
|
||||||
@@ -131,8 +136,10 @@ class _SignInPopupState extends State<SignInPopup> with ProtocolListener {
|
|||||||
mainAxisSize: MainAxisSize.min,
|
mainAxisSize: MainAxisSize.min,
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
Image.asset('assets/logo.png', width: 64, height: 64)
|
ClipRRect(
|
||||||
.paddingOnly(bottom: 4),
|
borderRadius: const BorderRadius.all(Radius.circular(8)),
|
||||||
|
child: Image.asset('assets/logo.png', width: 64, height: 64),
|
||||||
|
).paddingOnly(bottom: 4),
|
||||||
Text(
|
Text(
|
||||||
'signinGreeting'.tr,
|
'signinGreeting'.tr,
|
||||||
style: const TextStyle(
|
style: const TextStyle(
|
||||||
|
|||||||
@@ -70,8 +70,10 @@ class _SignUpPopupState extends State<SignUpPopup> {
|
|||||||
mainAxisSize: MainAxisSize.min,
|
mainAxisSize: MainAxisSize.min,
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
Image.asset('assets/logo.png', width: 64, height: 64)
|
ClipRRect(
|
||||||
.paddingOnly(bottom: 4),
|
borderRadius: const BorderRadius.all(Radius.circular(8)),
|
||||||
|
child: Image.asset('assets/logo.png', width: 64, height: 64),
|
||||||
|
).paddingOnly(bottom: 4),
|
||||||
Text(
|
Text(
|
||||||
'signupGreeting'.tr,
|
'signupGreeting'.tr,
|
||||||
style: const TextStyle(
|
style: const TextStyle(
|
||||||
|
|||||||
@@ -1,13 +1,15 @@
|
|||||||
import 'dart:async';
|
import 'dart:async';
|
||||||
import 'dart:math' as math;
|
import 'dart:math' as math;
|
||||||
|
|
||||||
|
import 'package:async/async.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
import 'package:solian/providers/content/call.dart';
|
import 'package:solian/providers/call.dart';
|
||||||
import 'package:solian/theme.dart';
|
import 'package:solian/theme.dart';
|
||||||
import 'package:solian/widgets/app_bar_leading.dart';
|
import 'package:solian/widgets/app_bar_leading.dart';
|
||||||
import 'package:solian/widgets/chat/call/call_controls.dart';
|
import 'package:solian/widgets/chat/call/call_controls.dart';
|
||||||
import 'package:solian/widgets/chat/call/call_participant.dart';
|
import 'package:solian/widgets/chat/call/call_participant.dart';
|
||||||
|
import 'package:livekit_client/livekit_client.dart' as livekit;
|
||||||
|
|
||||||
class CallScreen extends StatefulWidget {
|
class CallScreen extends StatefulWidget {
|
||||||
const CallScreen({super.key});
|
const CallScreen({super.key});
|
||||||
@@ -16,11 +18,26 @@ class CallScreen extends StatefulWidget {
|
|||||||
State<CallScreen> createState() => _CallScreenState();
|
State<CallScreen> createState() => _CallScreenState();
|
||||||
}
|
}
|
||||||
|
|
||||||
class _CallScreenState extends State<CallScreen> {
|
class _CallScreenState extends State<CallScreen> with TickerProviderStateMixin {
|
||||||
Timer? timer;
|
Timer? _timer;
|
||||||
String currentDuration = '00:00:00';
|
String _currentDuration = '00:00:00';
|
||||||
|
|
||||||
String parseDuration() {
|
int _layoutMode = 0;
|
||||||
|
|
||||||
|
bool _showControls = true;
|
||||||
|
CancelableOperation? _hideControlsOperation;
|
||||||
|
|
||||||
|
late final AnimationController _controlsAnimationController =
|
||||||
|
AnimationController(
|
||||||
|
duration: const Duration(milliseconds: 500),
|
||||||
|
vsync: this,
|
||||||
|
);
|
||||||
|
late final Animation<double> _controlsAnimation = CurvedAnimation(
|
||||||
|
parent: _controlsAnimationController,
|
||||||
|
curve: Curves.fastOutSlowIn,
|
||||||
|
);
|
||||||
|
|
||||||
|
String _parseDuration() {
|
||||||
final ChatCallProvider provider = Get.find();
|
final ChatCallProvider provider = Get.find();
|
||||||
if (provider.current.value == null) return '00:00:00';
|
if (provider.current.value == null) return '00:00:00';
|
||||||
Duration duration =
|
Duration duration =
|
||||||
@@ -34,9 +51,141 @@ class _CallScreenState extends State<CallScreen> {
|
|||||||
return formattedTime;
|
return formattedTime;
|
||||||
}
|
}
|
||||||
|
|
||||||
void updateDuration() {
|
void _updateDuration() {
|
||||||
setState(() {
|
setState(() {
|
||||||
currentDuration = parseDuration();
|
_currentDuration = _parseDuration();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
void _switchLayout() {
|
||||||
|
if (_layoutMode < 1) {
|
||||||
|
setState(() => _layoutMode++);
|
||||||
|
} else {
|
||||||
|
setState(() => _layoutMode = 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void _toggleControls() {
|
||||||
|
if (_showControls) {
|
||||||
|
setState(() => _showControls = false);
|
||||||
|
_controlsAnimationController.animateTo(0);
|
||||||
|
_hideControlsOperation?.cancel();
|
||||||
|
} else {
|
||||||
|
setState(() => _showControls = true);
|
||||||
|
_controlsAnimationController.animateTo(1);
|
||||||
|
_planAutoHideControls();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void _planAutoHideControls() {
|
||||||
|
_hideControlsOperation = CancelableOperation.fromFuture(
|
||||||
|
Future.delayed(const Duration(seconds: 3), () {
|
||||||
|
if (!mounted) return;
|
||||||
|
if (_showControls) _toggleControls();
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget _buildListLayout() {
|
||||||
|
final ChatCallProvider call = Get.find();
|
||||||
|
return Obx(
|
||||||
|
() => Stack(
|
||||||
|
children: [
|
||||||
|
Container(
|
||||||
|
color: Theme.of(context).colorScheme.surfaceContainer,
|
||||||
|
child: call.focusTrack.value != null
|
||||||
|
? InteractiveParticipantWidget(
|
||||||
|
isFixedAvatar: false,
|
||||||
|
participant: call.focusTrack.value!,
|
||||||
|
onTap: () {},
|
||||||
|
)
|
||||||
|
: const SizedBox(),
|
||||||
|
),
|
||||||
|
Positioned(
|
||||||
|
left: 0,
|
||||||
|
right: 0,
|
||||||
|
top: 0,
|
||||||
|
child: SizedBox(
|
||||||
|
height: 128,
|
||||||
|
child: ListView.builder(
|
||||||
|
scrollDirection: Axis.horizontal,
|
||||||
|
itemCount: math.max(0, call.participantTracks.length),
|
||||||
|
itemBuilder: (BuildContext context, int index) {
|
||||||
|
final track = call.participantTracks[index];
|
||||||
|
if (track.participant.sid ==
|
||||||
|
call.focusTrack.value?.participant.sid) {
|
||||||
|
return Container();
|
||||||
|
}
|
||||||
|
|
||||||
|
return Padding(
|
||||||
|
padding: const EdgeInsets.only(top: 8, left: 8),
|
||||||
|
child: ClipRRect(
|
||||||
|
borderRadius: const BorderRadius.all(Radius.circular(8)),
|
||||||
|
child: InteractiveParticipantWidget(
|
||||||
|
isFixedAvatar: true,
|
||||||
|
width: 120,
|
||||||
|
height: 120,
|
||||||
|
color: Theme.of(context).cardColor,
|
||||||
|
participant: track,
|
||||||
|
onTap: () {
|
||||||
|
if (track.participant.sid !=
|
||||||
|
call.focusTrack.value?.participant.sid) {
|
||||||
|
call.changeFocusTrack(track);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Widget _buildGridLayout() {
|
||||||
|
final ChatCallProvider call = Get.find();
|
||||||
|
return LayoutBuilder(builder: (context, constraints) {
|
||||||
|
double screenWidth = constraints.maxWidth;
|
||||||
|
double screenHeight = constraints.maxHeight;
|
||||||
|
|
||||||
|
int columns = (math.sqrt(call.participantTracks.length)).ceil();
|
||||||
|
int rows = (call.participantTracks.length / columns).ceil();
|
||||||
|
|
||||||
|
double tileWidth = screenWidth / columns;
|
||||||
|
double tileHeight = screenHeight / rows;
|
||||||
|
|
||||||
|
return Obx(
|
||||||
|
() => GridView.builder(
|
||||||
|
gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
|
||||||
|
crossAxisCount: columns,
|
||||||
|
childAspectRatio: tileWidth / tileHeight,
|
||||||
|
crossAxisSpacing: 8,
|
||||||
|
mainAxisSpacing: 8,
|
||||||
|
),
|
||||||
|
itemCount: math.max(0, call.participantTracks.length),
|
||||||
|
itemBuilder: (BuildContext context, int index) {
|
||||||
|
final track = call.participantTracks[index];
|
||||||
|
return Card(
|
||||||
|
child: ClipRRect(
|
||||||
|
borderRadius: const BorderRadius.all(Radius.circular(8)),
|
||||||
|
child: InteractiveParticipantWidget(
|
||||||
|
color: Theme.of(context).colorScheme.surfaceContainerHigh,
|
||||||
|
participant: track,
|
||||||
|
onTap: () {
|
||||||
|
if (track.participant.sid !=
|
||||||
|
call.focusTrack.value?.participant.sid) {
|
||||||
|
call.changeFocusTrack(track);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
).paddingAll(8);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -45,7 +194,18 @@ class _CallScreenState extends State<CallScreen> {
|
|||||||
Get.find<ChatCallProvider>().setupRoom();
|
Get.find<ChatCallProvider>().setupRoom();
|
||||||
super.initState();
|
super.initState();
|
||||||
|
|
||||||
timer = Timer.periodic(const Duration(seconds: 1), (_) => updateDuration());
|
_updateDuration();
|
||||||
|
_planAutoHideControls();
|
||||||
|
_timer = Timer.periodic(
|
||||||
|
const Duration(seconds: 1),
|
||||||
|
(_) => _updateDuration(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
void dispose() {
|
||||||
|
_controlsAnimationController.dispose();
|
||||||
|
super.dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -68,80 +228,140 @@ class _CallScreenState extends State<CallScreen> {
|
|||||||
),
|
),
|
||||||
const TextSpan(text: '\n'),
|
const TextSpan(text: '\n'),
|
||||||
TextSpan(
|
TextSpan(
|
||||||
text: currentDuration,
|
text: _currentDuration,
|
||||||
style: Theme.of(context).textTheme.bodySmall,
|
style: Theme.of(context).textTheme.bodySmall,
|
||||||
),
|
),
|
||||||
]),
|
]),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
body: SafeArea(
|
body: SafeArea(
|
||||||
child: Obx(
|
child: GestureDetector(
|
||||||
() => Stack(
|
behavior: HitTestBehavior.translucent,
|
||||||
|
child: Column(
|
||||||
children: [
|
children: [
|
||||||
Column(
|
SizeTransition(
|
||||||
children: [
|
sizeFactor: _controlsAnimation,
|
||||||
Expanded(
|
axis: Axis.vertical,
|
||||||
child: Container(
|
|
||||||
color: Theme.of(context).colorScheme.surfaceContainer,
|
|
||||||
child: provider.focusTrack.value != null
|
|
||||||
? InteractiveParticipantWidget(
|
|
||||||
isFixed: false,
|
|
||||||
participant: provider.focusTrack.value!,
|
|
||||||
onTap: () {},
|
|
||||||
)
|
|
||||||
: const SizedBox(),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
if (provider.room.localParticipant != null)
|
|
||||||
ControlsWidget(
|
|
||||||
provider.room,
|
|
||||||
provider.room.localParticipant!,
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
Positioned(
|
|
||||||
left: 0,
|
|
||||||
right: 0,
|
|
||||||
top: 0,
|
|
||||||
child: SizedBox(
|
child: SizedBox(
|
||||||
height: 128,
|
width: MediaQuery.of(context).size.width,
|
||||||
child: ListView.builder(
|
height: 64,
|
||||||
scrollDirection: Axis.horizontal,
|
child: Row(
|
||||||
itemCount: math.max(0, provider.participantTracks.length),
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
itemBuilder: (BuildContext context, int index) {
|
crossAxisAlignment: CrossAxisAlignment.center,
|
||||||
final track = provider.participantTracks[index];
|
children: [
|
||||||
if (track.participant.sid ==
|
Builder(builder: (context) {
|
||||||
provider.focusTrack.value?.participant.sid) {
|
final call = Get.find<ChatCallProvider>();
|
||||||
return Container();
|
final connectionQuality =
|
||||||
}
|
call.room.localParticipant?.connectionQuality ??
|
||||||
|
livekit.ConnectionQuality.unknown;
|
||||||
return Padding(
|
return Expanded(
|
||||||
padding: const EdgeInsets.only(top: 8, left: 8),
|
child: Column(
|
||||||
child: ClipRRect(
|
mainAxisSize: MainAxisSize.min,
|
||||||
borderRadius:
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
const BorderRadius.all(Radius.circular(8)),
|
children: [
|
||||||
child: InteractiveParticipantWidget(
|
Row(
|
||||||
isFixed: true,
|
children: [
|
||||||
width: 120,
|
Text(call.room.serverRegion ?? 'unknown'),
|
||||||
height: 120,
|
const SizedBox(width: 6),
|
||||||
color: Theme.of(context).cardColor,
|
Text(call.room.serverVersion ?? 'unknown')
|
||||||
participant: track,
|
],
|
||||||
onTap: () {
|
),
|
||||||
if (track.participant.sid !=
|
Row(
|
||||||
provider
|
children: [
|
||||||
.focusTrack.value?.participant.sid) {
|
Text(
|
||||||
provider.changeFocusTrack(track);
|
{
|
||||||
}
|
livekit.ConnectionState.disconnected:
|
||||||
},
|
'callStatusDisconnected'.tr,
|
||||||
|
livekit.ConnectionState.connected:
|
||||||
|
'callStatusConnected'.tr,
|
||||||
|
livekit.ConnectionState.connecting:
|
||||||
|
'callStatusConnecting'.tr,
|
||||||
|
livekit.ConnectionState.reconnecting:
|
||||||
|
'callStatusReconnecting'.tr,
|
||||||
|
}[call.room.connectionState]!,
|
||||||
|
),
|
||||||
|
const SizedBox(width: 6),
|
||||||
|
if (connectionQuality !=
|
||||||
|
livekit.ConnectionQuality.unknown)
|
||||||
|
Icon(
|
||||||
|
{
|
||||||
|
livekit.ConnectionQuality.excellent:
|
||||||
|
Icons.signal_cellular_alt,
|
||||||
|
livekit.ConnectionQuality.good:
|
||||||
|
Icons.signal_cellular_alt_2_bar,
|
||||||
|
livekit.ConnectionQuality.poor:
|
||||||
|
Icons.signal_cellular_alt_1_bar,
|
||||||
|
}[connectionQuality],
|
||||||
|
color: {
|
||||||
|
livekit.ConnectionQuality.excellent:
|
||||||
|
Colors.green,
|
||||||
|
livekit.ConnectionQuality.good:
|
||||||
|
Colors.orange,
|
||||||
|
livekit.ConnectionQuality.poor:
|
||||||
|
Colors.red,
|
||||||
|
}[connectionQuality],
|
||||||
|
size: 16,
|
||||||
|
)
|
||||||
|
else
|
||||||
|
const SizedBox(
|
||||||
|
width: 12,
|
||||||
|
height: 12,
|
||||||
|
child: CircularProgressIndicator(
|
||||||
|
color: Colors.white,
|
||||||
|
strokeWidth: 2,
|
||||||
|
),
|
||||||
|
).paddingAll(3),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
],
|
||||||
),
|
),
|
||||||
),
|
);
|
||||||
);
|
}),
|
||||||
|
IconButton(
|
||||||
|
icon: _layoutMode == 0
|
||||||
|
? const Icon(Icons.view_list)
|
||||||
|
: const Icon(Icons.grid_view),
|
||||||
|
onPressed: () {
|
||||||
|
_switchLayout();
|
||||||
|
},
|
||||||
|
),
|
||||||
|
],
|
||||||
|
).paddingOnly(left: 20, right: 16),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Expanded(
|
||||||
|
child: Material(
|
||||||
|
color: Theme.of(context).colorScheme.surfaceContainerLow,
|
||||||
|
elevation: 2,
|
||||||
|
child: Builder(
|
||||||
|
builder: (context) {
|
||||||
|
switch (_layoutMode) {
|
||||||
|
case 1:
|
||||||
|
return _buildGridLayout();
|
||||||
|
default:
|
||||||
|
return _buildListLayout();
|
||||||
|
}
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
if (provider.room.localParticipant != null)
|
||||||
|
SizeTransition(
|
||||||
|
sizeFactor: _controlsAnimation,
|
||||||
|
axis: Axis.vertical,
|
||||||
|
child: SizedBox(
|
||||||
|
width: MediaQuery.of(context).size.width,
|
||||||
|
child: ControlsWidget(
|
||||||
|
provider.room,
|
||||||
|
provider.room.localParticipant!,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
|
onTap: () {
|
||||||
|
_toggleControls();
|
||||||
|
},
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@@ -150,16 +370,16 @@ class _CallScreenState extends State<CallScreen> {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
void deactivate() {
|
void deactivate() {
|
||||||
timer?.cancel();
|
_timer?.cancel();
|
||||||
timer = null;
|
_timer = null;
|
||||||
super.deactivate();
|
super.deactivate();
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void activate() {
|
void activate() {
|
||||||
timer ??= Timer.periodic(
|
_timer ??= Timer.periodic(
|
||||||
const Duration(seconds: 1),
|
const Duration(seconds: 1),
|
||||||
(_) => updateDuration(),
|
(_) => _updateDuration(),
|
||||||
);
|
);
|
||||||
super.activate();
|
super.activate();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ import 'package:solian/models/channel.dart';
|
|||||||
import 'package:solian/models/event.dart';
|
import 'package:solian/models/event.dart';
|
||||||
import 'package:solian/models/packet.dart';
|
import 'package:solian/models/packet.dart';
|
||||||
import 'package:solian/providers/auth.dart';
|
import 'package:solian/providers/auth.dart';
|
||||||
import 'package:solian/providers/content/call.dart';
|
|
||||||
import 'package:solian/providers/content/channel.dart';
|
import 'package:solian/providers/content/channel.dart';
|
||||||
import 'package:solian/providers/websocket.dart';
|
import 'package:solian/providers/websocket.dart';
|
||||||
import 'package:solian/router.dart';
|
import 'package:solian/router.dart';
|
||||||
@@ -19,7 +18,7 @@ import 'package:solian/screens/channel/channel_detail.dart';
|
|||||||
import 'package:solian/theme.dart';
|
import 'package:solian/theme.dart';
|
||||||
import 'package:solian/widgets/app_bar_leading.dart';
|
import 'package:solian/widgets/app_bar_leading.dart';
|
||||||
import 'package:solian/widgets/app_bar_title.dart';
|
import 'package:solian/widgets/app_bar_title.dart';
|
||||||
import 'package:solian/widgets/chat/call/call_prejoin.dart';
|
import 'package:solian/widgets/channel/channel_call_indicator.dart';
|
||||||
import 'package:solian/widgets/chat/call/chat_call_action.dart';
|
import 'package:solian/widgets/chat/call/chat_call_action.dart';
|
||||||
import 'package:solian/widgets/chat/chat_event.dart';
|
import 'package:solian/widgets/chat/chat_event.dart';
|
||||||
import 'package:solian/widgets/chat/chat_event_list.dart';
|
import 'package:solian/widgets/chat/chat_event_list.dart';
|
||||||
@@ -44,7 +43,7 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
|
|||||||
bool _isBusy = false;
|
bool _isBusy = false;
|
||||||
int? _accountId;
|
int? _accountId;
|
||||||
|
|
||||||
String? _overrideAlias;
|
String? _newAlias;
|
||||||
|
|
||||||
Channel? _channel;
|
Channel? _channel;
|
||||||
Call? _ongoingCall;
|
Call? _ongoingCall;
|
||||||
@@ -53,26 +52,20 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
|
|||||||
|
|
||||||
late final ChatEventController _chatController;
|
late final ChatEventController _chatController;
|
||||||
|
|
||||||
getProfile() async {
|
_getChannel({String? alias}) async {
|
||||||
final AuthProvider auth = Get.find();
|
|
||||||
final prof = await auth.getProfile();
|
|
||||||
_accountId = prof.body['id'];
|
|
||||||
}
|
|
||||||
|
|
||||||
getChannel({String? overrideAlias}) async {
|
|
||||||
final ChannelProvider provider = Get.find();
|
final ChannelProvider provider = Get.find();
|
||||||
|
|
||||||
setState(() => _isBusy = true);
|
setState(() => _isBusy = true);
|
||||||
|
|
||||||
if (overrideAlias != null) _overrideAlias = overrideAlias;
|
if (alias != null) _newAlias = alias;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
final resp = await provider.getChannel(
|
final resp = await provider.getChannel(
|
||||||
_overrideAlias ?? widget.alias,
|
_newAlias ?? widget.alias,
|
||||||
realm: widget.realm,
|
realm: widget.realm,
|
||||||
);
|
);
|
||||||
final respProfile = await provider.getMyChannelProfile(
|
final respProfile = await provider.getMyChannelProfile(
|
||||||
_overrideAlias ?? widget.alias,
|
_newAlias ?? widget.alias,
|
||||||
realm: widget.realm,
|
realm: widget.realm,
|
||||||
);
|
);
|
||||||
setState(() {
|
setState(() {
|
||||||
@@ -86,14 +79,14 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
|
|||||||
setState(() => _isBusy = false);
|
setState(() => _isBusy = false);
|
||||||
}
|
}
|
||||||
|
|
||||||
getOngoingCall() async {
|
_getOngoingCall() async {
|
||||||
final ChannelProvider provider = Get.find();
|
final ChannelProvider provider = Get.find();
|
||||||
|
|
||||||
setState(() => _isBusy = true);
|
setState(() => _isBusy = true);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
final resp = await provider.getChannelOngoingCall(
|
final resp = await provider.getChannelOngoingCall(
|
||||||
_overrideAlias ?? widget.alias,
|
_newAlias ?? widget.alias,
|
||||||
realm: widget.realm,
|
realm: widget.realm,
|
||||||
);
|
);
|
||||||
if (resp != null) {
|
if (resp != null) {
|
||||||
@@ -106,7 +99,7 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
|
|||||||
setState(() => _isBusy = false);
|
setState(() => _isBusy = false);
|
||||||
}
|
}
|
||||||
|
|
||||||
void listenMessages() {
|
void _listenMessages() {
|
||||||
final WebSocketProvider provider = Get.find();
|
final WebSocketProvider provider = Get.find();
|
||||||
_subscription = provider.stream.stream.listen((event) {
|
_subscription = provider.stream.stream.listen((event) {
|
||||||
switch (event.method) {
|
switch (event.method) {
|
||||||
@@ -116,26 +109,20 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
|
|||||||
break;
|
break;
|
||||||
case 'calls.new':
|
case 'calls.new':
|
||||||
final payload = Call.fromJson(event.payload!);
|
final payload = Call.fromJson(event.payload!);
|
||||||
setState(() => _ongoingCall = payload);
|
if (payload.channel.id == _channel!.id) {
|
||||||
|
setState(() => _ongoingCall = payload);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case 'calls.end':
|
case 'calls.end':
|
||||||
setState(() => _ongoingCall = null);
|
final payload = Call.fromJson(event.payload!);
|
||||||
|
if (payload.channel.id == _channel!.id) {
|
||||||
|
setState(() => _ongoingCall = null);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
void showCallPrejoin() {
|
|
||||||
showModalBottomSheet(
|
|
||||||
useRootNavigator: true,
|
|
||||||
context: context,
|
|
||||||
builder: (context) => ChatCallPrejoinPopup(
|
|
||||||
ongoingCall: _ongoingCall!,
|
|
||||||
channel: _channel!,
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
Event? _messageToReplying;
|
Event? _messageToReplying;
|
||||||
Event? _messageToEditing;
|
Event? _messageToEditing;
|
||||||
|
|
||||||
@@ -150,18 +137,17 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
|
_accountId = Get.find<AuthProvider>().userProfile.value!['id'];
|
||||||
|
|
||||||
_chatController = ChatEventController();
|
_chatController = ChatEventController();
|
||||||
_chatController.initialize();
|
_chatController.initialize();
|
||||||
|
|
||||||
getChannel().then((_) {
|
_getOngoingCall();
|
||||||
|
_getChannel().then((_) {
|
||||||
_chatController.getEvents(_channel!, widget.realm);
|
_chatController.getEvents(_channel!, widget.realm);
|
||||||
|
_listenMessages();
|
||||||
listenMessages();
|
|
||||||
});
|
});
|
||||||
|
|
||||||
getProfile();
|
|
||||||
getOngoingCall();
|
|
||||||
|
|
||||||
super.initState();
|
super.initState();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -189,8 +175,6 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
final ChatCallProvider call = Get.find();
|
|
||||||
|
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
appBar: AppBar(
|
appBar: AppBar(
|
||||||
leading: AppBarLeadingButton.adaptive(context),
|
leading: AppBarLeadingButton.adaptive(context),
|
||||||
@@ -225,7 +209,7 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
|
|||||||
if (value == false) AppRouter.instance.pop();
|
if (value == false) AppRouter.instance.pop();
|
||||||
if (value != null) {
|
if (value != null) {
|
||||||
final resp = Channel.fromJson(value as Map<String, dynamic>);
|
final resp = Channel.fromJson(value as Map<String, dynamic>);
|
||||||
getChannel(overrideAlias: resp.alias);
|
_getChannel(alias: resp.alias);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
@@ -238,32 +222,9 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
|
|||||||
body: Column(
|
body: Column(
|
||||||
children: [
|
children: [
|
||||||
if (_ongoingCall != null)
|
if (_ongoingCall != null)
|
||||||
MaterialBanner(
|
ChannelCallIndicator(
|
||||||
padding: const EdgeInsets.only(left: 16, top: 4, bottom: 4),
|
channel: _channel!,
|
||||||
leading: const Icon(Icons.call_received),
|
ongoingCall: _ongoingCall!,
|
||||||
backgroundColor: Theme.of(context).colorScheme.surfaceContainer,
|
|
||||||
dividerColor: Colors.transparent,
|
|
||||||
content: Text('callOngoing'.tr),
|
|
||||||
actions: [
|
|
||||||
Obx(() {
|
|
||||||
if (call.current.value == null) {
|
|
||||||
return TextButton(
|
|
||||||
onPressed: showCallPrejoin,
|
|
||||||
child: Text('callJoin'.tr),
|
|
||||||
);
|
|
||||||
} else if (call.channel.value?.id == _channel?.id) {
|
|
||||||
return TextButton(
|
|
||||||
onPressed: () => call.gotoScreen(context),
|
|
||||||
child: Text('callResume'.tr),
|
|
||||||
);
|
|
||||||
} else {
|
|
||||||
return TextButton(
|
|
||||||
onPressed: null,
|
|
||||||
child: Text('callJoin'.tr),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
})
|
|
||||||
],
|
|
||||||
),
|
),
|
||||||
Expanded(
|
Expanded(
|
||||||
child: ChatEventList(
|
child: ChatEventList(
|
||||||
|
|||||||
@@ -41,9 +41,9 @@ class _ChannelDetailScreenState extends State<ChannelDetailScreen> {
|
|||||||
|
|
||||||
void checkOwner() async {
|
void checkOwner() async {
|
||||||
final AuthProvider auth = Get.find();
|
final AuthProvider auth = Get.find();
|
||||||
final prof = await auth.getProfile();
|
|
||||||
setState(() {
|
setState(() {
|
||||||
_isOwned = prof.body['id'] == widget.channel.account.externalId;
|
_isOwned =
|
||||||
|
auth.userProfile.value!['id'] == widget.channel.account.externalId;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -75,14 +75,14 @@ class _ChannelDetailScreenState extends State<ChannelDetailScreen> {
|
|||||||
|
|
||||||
void applyProfileChanges() async {
|
void applyProfileChanges() async {
|
||||||
final AuthProvider auth = Get.find();
|
final AuthProvider auth = Get.find();
|
||||||
if (!await auth.isAuthorized) return;
|
if (auth.isAuthorized.isFalse) return;
|
||||||
|
|
||||||
setState(() => _isBusy = true);
|
setState(() => _isBusy = true);
|
||||||
|
|
||||||
final client = auth.configureClient('messaging');
|
final client = auth.configureClient('messaging');
|
||||||
|
|
||||||
final resp = await client.put(
|
final resp = await client
|
||||||
'/channels/${widget.realm}/${widget.channel.alias}/members/me', {
|
.put('/channels/${widget.realm}/${widget.channel.alias}/members/me', {
|
||||||
'nick': null,
|
'nick': null,
|
||||||
'notify_level': _notifyLevel,
|
'notify_level': _notifyLevel,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ class _ChannelOrganizeScreenState extends State<ChannelOrganizeScreen> {
|
|||||||
|
|
||||||
void applyChannel() async {
|
void applyChannel() async {
|
||||||
final AuthProvider auth = Get.find();
|
final AuthProvider auth = Get.find();
|
||||||
if (!await auth.isAuthorized) return;
|
if (auth.isAuthorized.isFalse) return;
|
||||||
|
|
||||||
if (_aliasController.value.text.isEmpty) randomizeAlias();
|
if (_aliasController.value.text.isEmpty) randomizeAlias();
|
||||||
|
|
||||||
|
|||||||
@@ -97,49 +97,42 @@ class _ChatScreenState extends State<ChatScreen> {
|
|||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
body: FutureBuilder(
|
body: Obx(() {
|
||||||
future: auth.getProfileWithCheck(),
|
if (auth.isAuthorized.isFalse) {
|
||||||
builder: (context, snapshot) {
|
return SigninRequiredOverlay(
|
||||||
if (!snapshot.hasData) {
|
onSignedIn: () => _channels.refreshAvailableChannel(),
|
||||||
return const Center(
|
);
|
||||||
child: CircularProgressIndicator(),
|
}
|
||||||
);
|
|
||||||
} else if (snapshot.data == null) {
|
|
||||||
return SigninRequiredOverlay(
|
|
||||||
onSignedIn: () => _channels.refreshAvailableChannel(),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
final selfId = snapshot.data!.body['id'];
|
final selfId = auth.userProfile.value!['id'];
|
||||||
|
|
||||||
return Column(
|
return Column(
|
||||||
children: [
|
children: [
|
||||||
Obx(() {
|
Obx(() {
|
||||||
if (_channels.isLoading.isFalse) {
|
if (_channels.isLoading.isFalse) {
|
||||||
return const SizedBox();
|
return const SizedBox();
|
||||||
} else {
|
} else {
|
||||||
return const LinearProgressIndicator();
|
return const LinearProgressIndicator();
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
const ChatCallCurrentIndicator(),
|
const ChatCallCurrentIndicator(),
|
||||||
Expanded(
|
Expanded(
|
||||||
child: CenteredContainer(
|
child: CenteredContainer(
|
||||||
child: RefreshIndicator(
|
child: RefreshIndicator(
|
||||||
onRefresh: _channels.refreshAvailableChannel,
|
onRefresh: _channels.refreshAvailableChannel,
|
||||||
child: Obx(
|
child: Obx(
|
||||||
() => ChannelListWidget(
|
() => ChannelListWidget(
|
||||||
noCategory: true,
|
noCategory: true,
|
||||||
channels: _channels.directChannels,
|
channels: _channels.directChannels,
|
||||||
selfId: selfId,
|
selfId: selfId,
|
||||||
),
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
],
|
),
|
||||||
);
|
],
|
||||||
},
|
);
|
||||||
),
|
}),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
|
|||||||
import 'package:solian/models/pagination.dart';
|
import 'package:solian/models/pagination.dart';
|
||||||
import 'package:solian/models/post.dart';
|
import 'package:solian/models/post.dart';
|
||||||
import 'package:solian/providers/content/posts.dart';
|
import 'package:solian/providers/content/posts.dart';
|
||||||
import 'package:solian/screens/home.dart';
|
|
||||||
import 'package:solian/theme.dart';
|
import 'package:solian/theme.dart';
|
||||||
import 'package:solian/widgets/app_bar_leading.dart';
|
import 'package:solian/widgets/app_bar_leading.dart';
|
||||||
import 'package:solian/widgets/app_bar_title.dart';
|
import 'package:solian/widgets/app_bar_title.dart';
|
||||||
@@ -22,7 +21,7 @@ class _DraftBoxScreenState extends State<DraftBoxScreen> {
|
|||||||
final PagingController<int, Post> _pagingController =
|
final PagingController<int, Post> _pagingController =
|
||||||
PagingController(firstPageKey: 0);
|
PagingController(firstPageKey: 0);
|
||||||
|
|
||||||
getPosts(int pageKey) async {
|
_getPosts(int pageKey) async {
|
||||||
final PostProvider provider = Get.find();
|
final PostProvider provider = Get.find();
|
||||||
|
|
||||||
Response resp;
|
Response resp;
|
||||||
@@ -50,7 +49,7 @@ class _DraftBoxScreenState extends State<DraftBoxScreen> {
|
|||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
super.initState();
|
super.initState();
|
||||||
_pagingController.addPageRequestListener(getPosts);
|
_pagingController.addPageRequestListener(_getPosts);
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -64,10 +63,6 @@ class _DraftBoxScreenState extends State<DraftBoxScreen> {
|
|||||||
centerTitle: false,
|
centerTitle: false,
|
||||||
toolbarHeight: SolianTheme.toolbarHeight(context),
|
toolbarHeight: SolianTheme.toolbarHeight(context),
|
||||||
actions: [
|
actions: [
|
||||||
FeedCreationButton(
|
|
||||||
hideDraftBox: true,
|
|
||||||
onCreated: () {},
|
|
||||||
),
|
|
||||||
SizedBox(
|
SizedBox(
|
||||||
width: SolianTheme.isLargeScreen(context) ? 8 : 16,
|
width: SolianTheme.isLargeScreen(context) ? 8 : 16,
|
||||||
),
|
),
|
||||||
@@ -81,6 +76,9 @@ class _DraftBoxScreenState extends State<DraftBoxScreen> {
|
|||||||
itemBuilder: (context, item, index) {
|
itemBuilder: (context, item, index) {
|
||||||
return PostOwnedListEntry(
|
return PostOwnedListEntry(
|
||||||
item: item,
|
item: item,
|
||||||
|
isFullContent: true,
|
||||||
|
backgroundColor:
|
||||||
|
Theme.of(context).colorScheme.surfaceContainerLow,
|
||||||
onTap: () async {
|
onTap: () async {
|
||||||
showModalBottomSheet(
|
showModalBottomSheet(
|
||||||
useRootNavigator: true,
|
useRootNavigator: true,
|
||||||
@@ -90,7 +88,13 @@ class _DraftBoxScreenState extends State<DraftBoxScreen> {
|
|||||||
noReact: true,
|
noReact: true,
|
||||||
),
|
),
|
||||||
).then((value) {
|
).then((value) {
|
||||||
if (value != null) _pagingController.refresh();
|
if (value is Future) {
|
||||||
|
value.then((_) {
|
||||||
|
_pagingController.refresh();
|
||||||
|
});
|
||||||
|
} else if (value != null) {
|
||||||
|
_pagingController.refresh();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
).paddingOnly(left: 12, right: 12, bottom: 4);
|
).paddingOnly(left: 12, right: 12, bottom: 4);
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import 'package:get/get.dart';
|
|||||||
import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
|
import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
|
||||||
import 'package:solian/models/pagination.dart';
|
import 'package:solian/models/pagination.dart';
|
||||||
import 'package:solian/providers/content/posts.dart';
|
import 'package:solian/providers/content/posts.dart';
|
||||||
import 'package:solian/widgets/feed/feed_list.dart';
|
import 'package:solian/widgets/posts/post_warped_list.dart';
|
||||||
|
|
||||||
import '../../models/post.dart';
|
import '../../models/post.dart';
|
||||||
|
|
||||||
@@ -26,7 +26,7 @@ class _FeedSearchScreenState extends State<FeedSearchScreen> {
|
|||||||
|
|
||||||
Response resp;
|
Response resp;
|
||||||
try {
|
try {
|
||||||
resp = await provider.listRecommendations(
|
resp = await provider.listPost(
|
||||||
pageKey,
|
pageKey,
|
||||||
tag: widget.tag,
|
tag: widget.tag,
|
||||||
category: widget.category,
|
category: widget.category,
|
||||||
@@ -77,7 +77,10 @@ class _FeedSearchScreenState extends State<FeedSearchScreen> {
|
|||||||
onRefresh: () => Future.sync(() => _pagingController.refresh()),
|
onRefresh: () => Future.sync(() => _pagingController.refresh()),
|
||||||
child: CustomScrollView(
|
child: CustomScrollView(
|
||||||
slivers: [
|
slivers: [
|
||||||
FeedListWidget(controller: _pagingController),
|
PostWarpedListWidget(
|
||||||
|
controller: _pagingController,
|
||||||
|
onUpdate: () => _pagingController.refresh(),
|
||||||
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -1,17 +1,15 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
import 'package:infinite_scroll_pagination/infinite_scroll_pagination.dart';
|
import 'package:solian/controllers/post_list_controller.dart';
|
||||||
import 'package:solian/models/pagination.dart';
|
|
||||||
import 'package:solian/models/post.dart';
|
|
||||||
import 'package:solian/providers/auth.dart';
|
import 'package:solian/providers/auth.dart';
|
||||||
import 'package:solian/providers/content/posts.dart';
|
|
||||||
import 'package:solian/router.dart';
|
import 'package:solian/router.dart';
|
||||||
import 'package:solian/screens/account/notification.dart';
|
import 'package:solian/screens/account/notification.dart';
|
||||||
import 'package:solian/theme.dart';
|
import 'package:solian/theme.dart';
|
||||||
import 'package:solian/widgets/app_bar_title.dart';
|
import 'package:solian/widgets/app_bar_title.dart';
|
||||||
import 'package:solian/widgets/current_state_action.dart';
|
import 'package:solian/widgets/current_state_action.dart';
|
||||||
import 'package:solian/widgets/app_bar_leading.dart';
|
import 'package:solian/widgets/app_bar_leading.dart';
|
||||||
import 'package:solian/widgets/feed/feed_list.dart';
|
import 'package:solian/widgets/posts/post_shuffle_swiper.dart';
|
||||||
|
import 'package:solian/widgets/posts/post_warped_list.dart';
|
||||||
|
|
||||||
class HomeScreen extends StatefulWidget {
|
class HomeScreen extends StatefulWidget {
|
||||||
const HomeScreen({super.key});
|
const HomeScreen({super.key});
|
||||||
@@ -20,45 +18,53 @@ class HomeScreen extends StatefulWidget {
|
|||||||
State<HomeScreen> createState() => _HomeScreenState();
|
State<HomeScreen> createState() => _HomeScreenState();
|
||||||
}
|
}
|
||||||
|
|
||||||
class _HomeScreenState extends State<HomeScreen> {
|
class _HomeScreenState extends State<HomeScreen>
|
||||||
final PagingController<int, Post> _pagingController =
|
with SingleTickerProviderStateMixin {
|
||||||
PagingController(firstPageKey: 0);
|
late final PostListController _postController;
|
||||||
|
late final TabController _tabController;
|
||||||
getPosts(int pageKey) async {
|
|
||||||
final PostProvider provider = Get.find();
|
|
||||||
|
|
||||||
Response resp;
|
|
||||||
try {
|
|
||||||
resp = await provider.listRecommendations(pageKey);
|
|
||||||
} catch (e) {
|
|
||||||
_pagingController.error = e;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
final PaginationResult result = PaginationResult.fromJson(resp.body);
|
|
||||||
final parsed = result.data?.map((e) => Post.fromJson(e)).toList();
|
|
||||||
if (parsed != null && parsed.length >= 10) {
|
|
||||||
_pagingController.appendPage(parsed, pageKey + parsed.length);
|
|
||||||
} else if (parsed != null) {
|
|
||||||
_pagingController.appendLastPage(parsed);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
super.initState();
|
super.initState();
|
||||||
_pagingController.addPageRequestListener(getPosts);
|
_postController = PostListController();
|
||||||
|
_tabController = TabController(length: 2, vsync: this);
|
||||||
|
_tabController.addListener(() {
|
||||||
|
switch (_tabController.index) {
|
||||||
|
case 0:
|
||||||
|
case 1:
|
||||||
|
if (_postController.mode.value == _tabController.index) return;
|
||||||
|
_postController.mode.value = _tabController.index;
|
||||||
|
_postController.reloadAllOver();
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Scaffold(
|
return Material(
|
||||||
body: Material(
|
color: Theme.of(context).colorScheme.surface,
|
||||||
color: Theme.of(context).colorScheme.surface,
|
child: Scaffold(
|
||||||
child: RefreshIndicator(
|
floatingActionButton: FloatingActionButton(
|
||||||
onRefresh: () => Future.sync(() => _pagingController.refresh()),
|
child: const Icon(Icons.add),
|
||||||
child: CustomScrollView(
|
onPressed: () async {
|
||||||
slivers: [
|
final value = await showModalBottomSheet(
|
||||||
|
useRootNavigator: true,
|
||||||
|
isScrollControlled: true,
|
||||||
|
context: context,
|
||||||
|
builder: (context) => const PostCreatePopup(),
|
||||||
|
);
|
||||||
|
if (value is Future) {
|
||||||
|
value.then((_) {
|
||||||
|
_postController.reloadAllOver();
|
||||||
|
});
|
||||||
|
} else if (value != null) {
|
||||||
|
_postController.reloadAllOver();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
),
|
||||||
|
body: NestedScrollView(
|
||||||
|
headerSliverBuilder: (BuildContext context, bool innerBoxIsScrolled) {
|
||||||
|
return [
|
||||||
SliverAppBar(
|
SliverAppBar(
|
||||||
title: AppBarTitle('home'.tr),
|
title: AppBarTitle('home'.tr),
|
||||||
centerTitle: false,
|
centerTitle: false,
|
||||||
@@ -68,19 +74,44 @@ class _HomeScreenState extends State<HomeScreen> {
|
|||||||
actions: [
|
actions: [
|
||||||
const BackgroundStateWidget(),
|
const BackgroundStateWidget(),
|
||||||
const NotificationButton(),
|
const NotificationButton(),
|
||||||
FeedCreationButton(
|
|
||||||
onCreated: () {
|
|
||||||
_pagingController.refresh();
|
|
||||||
},
|
|
||||||
),
|
|
||||||
SizedBox(
|
SizedBox(
|
||||||
width: SolianTheme.isLargeScreen(context) ? 8 : 16,
|
width: SolianTheme.isLargeScreen(context) ? 8 : 16,
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
bottom: TabBar(
|
||||||
FeedListWidget(controller: _pagingController),
|
controller: _tabController,
|
||||||
],
|
tabs: [
|
||||||
),
|
Tab(text: 'postListNews'.tr),
|
||||||
|
Tab(text: 'postListShuffle'.tr),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
)
|
||||||
|
];
|
||||||
|
},
|
||||||
|
body: Obx(() {
|
||||||
|
if (_postController.isPreparing.isTrue) {
|
||||||
|
return const Center(
|
||||||
|
child: CircularProgressIndicator(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return TabBarView(
|
||||||
|
physics: const NeverScrollableScrollPhysics(),
|
||||||
|
controller: _tabController,
|
||||||
|
children: [
|
||||||
|
RefreshIndicator(
|
||||||
|
onRefresh: () => _postController.reloadAllOver(),
|
||||||
|
child: CustomScrollView(slivers: [
|
||||||
|
PostWarpedListWidget(
|
||||||
|
controller: _postController.pagingController,
|
||||||
|
onUpdate: () => _postController.reloadAllOver(),
|
||||||
|
),
|
||||||
|
]),
|
||||||
|
),
|
||||||
|
PostShuffleSwiper(controller: _postController),
|
||||||
|
],
|
||||||
|
);
|
||||||
|
}),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
@@ -88,61 +119,105 @@ class _HomeScreenState extends State<HomeScreen> {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
void dispose() {
|
void dispose() {
|
||||||
_pagingController.dispose();
|
_postController.dispose();
|
||||||
super.dispose();
|
super.dispose();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class FeedCreationButton extends StatelessWidget {
|
class PostCreatePopup extends StatelessWidget {
|
||||||
final bool hideDraftBox;
|
final bool hideDraftBox;
|
||||||
final Function? onCreated;
|
|
||||||
|
|
||||||
const FeedCreationButton({
|
const PostCreatePopup({
|
||||||
super.key,
|
super.key,
|
||||||
this.hideDraftBox = false,
|
this.hideDraftBox = false,
|
||||||
this.onCreated,
|
|
||||||
});
|
});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
final AuthProvider auth = Get.find();
|
final AuthProvider auth = Get.find();
|
||||||
|
|
||||||
return FutureBuilder(
|
if (auth.isAuthorized.isFalse) {
|
||||||
future: auth.isAuthorized,
|
return const SizedBox();
|
||||||
builder: (context, snapshot) {
|
}
|
||||||
if (snapshot.hasData && snapshot.data == true) {
|
|
||||||
return PopupMenuButton(
|
final List<dynamic> actionList = [
|
||||||
icon: const Icon(Icons.edit_square),
|
(
|
||||||
itemBuilder: (BuildContext context) => [
|
icon: const Icon(Icons.post_add),
|
||||||
PopupMenuItem(
|
label: 'postEditorModeStory'.tr,
|
||||||
child: ListTile(
|
onTap: () {
|
||||||
title: Text('postEditor'.tr),
|
Navigator.pop(
|
||||||
leading: const Icon(Icons.article),
|
context,
|
||||||
contentPadding: const EdgeInsets.symmetric(horizontal: 8),
|
AppRouter.instance.pushNamed(
|
||||||
),
|
'postEditor',
|
||||||
onTap: () {
|
queryParameters: {
|
||||||
AppRouter.instance.pushNamed('postEditor').then((val) {
|
'mode': 0.toString(),
|
||||||
if (val != null && onCreated != null) {
|
},
|
||||||
onCreated!();
|
),
|
||||||
}
|
);
|
||||||
});
|
},
|
||||||
},
|
),
|
||||||
),
|
(
|
||||||
if (!hideDraftBox)
|
icon: const Icon(Icons.description),
|
||||||
PopupMenuItem(
|
label: 'postEditorModeArticle'.tr,
|
||||||
child: ListTile(
|
onTap: () {
|
||||||
title: Text('draftBoxOpen'.tr),
|
Navigator.pop(
|
||||||
leading: const Icon(Icons.drafts),
|
context,
|
||||||
contentPadding: const EdgeInsets.symmetric(horizontal: 8),
|
AppRouter.instance.pushNamed(
|
||||||
),
|
'postEditor',
|
||||||
onTap: () {
|
queryParameters: {
|
||||||
AppRouter.instance.pushNamed('draftBox');
|
'mode': 1.toString(),
|
||||||
},
|
},
|
||||||
),
|
),
|
||||||
],
|
);
|
||||||
);
|
},
|
||||||
}
|
),
|
||||||
return const SizedBox();
|
(
|
||||||
});
|
icon: const Icon(Icons.drafts),
|
||||||
|
label: 'draftBoxOpen'.tr,
|
||||||
|
onTap: () {
|
||||||
|
Navigator.pop(
|
||||||
|
context,
|
||||||
|
AppRouter.instance.pushNamed('draftBox'),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
];
|
||||||
|
|
||||||
|
return SizedBox(
|
||||||
|
height: MediaQuery.of(context).size.height * 0.38,
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Text(
|
||||||
|
'postNew'.tr,
|
||||||
|
style: Theme.of(context).textTheme.headlineSmall,
|
||||||
|
).paddingOnly(left: 24, right: 24, top: 32, bottom: 16),
|
||||||
|
Expanded(
|
||||||
|
child: GridView.count(
|
||||||
|
physics: const NeverScrollableScrollPhysics(),
|
||||||
|
crossAxisCount: 3,
|
||||||
|
children: actionList
|
||||||
|
.map((x) => Card(
|
||||||
|
color: Theme.of(context).colorScheme.surfaceContainer,
|
||||||
|
child: InkWell(
|
||||||
|
borderRadius:
|
||||||
|
const BorderRadius.all(Radius.circular(8)),
|
||||||
|
onTap: x.onTap,
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
x.icon,
|
||||||
|
const SizedBox(height: 8),
|
||||||
|
Text(x.label),
|
||||||
|
],
|
||||||
|
).paddingAll(18),
|
||||||
|
),
|
||||||
|
))
|
||||||
|
.toList(),
|
||||||
|
).paddingSymmetric(horizontal: 20),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,14 +3,18 @@ import 'package:get/get.dart';
|
|||||||
import 'package:solian/exts.dart';
|
import 'package:solian/exts.dart';
|
||||||
import 'package:solian/models/post.dart';
|
import 'package:solian/models/post.dart';
|
||||||
import 'package:solian/providers/content/posts.dart';
|
import 'package:solian/providers/content/posts.dart';
|
||||||
import 'package:solian/widgets/sized_container.dart';
|
|
||||||
import 'package:solian/widgets/posts/post_item.dart';
|
import 'package:solian/widgets/posts/post_item.dart';
|
||||||
import 'package:solian/widgets/posts/post_replies.dart';
|
import 'package:solian/widgets/posts/post_replies.dart';
|
||||||
|
|
||||||
class PostDetailScreen extends StatefulWidget {
|
class PostDetailScreen extends StatefulWidget {
|
||||||
final String id;
|
final String id;
|
||||||
|
final Post? post;
|
||||||
|
|
||||||
const PostDetailScreen({super.key, required this.id});
|
const PostDetailScreen({
|
||||||
|
super.key,
|
||||||
|
required this.id,
|
||||||
|
this.post,
|
||||||
|
});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
State<PostDetailScreen> createState() => _PostDetailScreenState();
|
State<PostDetailScreen> createState() => _PostDetailScreenState();
|
||||||
@@ -20,6 +24,11 @@ class _PostDetailScreenState extends State<PostDetailScreen> {
|
|||||||
Post? item;
|
Post? item;
|
||||||
|
|
||||||
Future<Post?> getDetail() async {
|
Future<Post?> getDetail() async {
|
||||||
|
if (widget.post != null) {
|
||||||
|
item = widget.post;
|
||||||
|
return widget.post;
|
||||||
|
}
|
||||||
|
|
||||||
final PostProvider provider = Get.find();
|
final PostProvider provider = Get.find();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -48,14 +57,14 @@ class _PostDetailScreenState extends State<PostDetailScreen> {
|
|||||||
return CustomScrollView(
|
return CustomScrollView(
|
||||||
slivers: [
|
slivers: [
|
||||||
SliverToBoxAdapter(
|
SliverToBoxAdapter(
|
||||||
child: CenteredContainer(
|
child: PostItem(
|
||||||
child: PostItem(
|
item: item!,
|
||||||
item: item!,
|
isClickable: false,
|
||||||
isClickable: true,
|
isOverrideEmbedClickable: true,
|
||||||
isFullDate: true,
|
isFullDate: true,
|
||||||
isShowReply: false,
|
isFullContent: true,
|
||||||
isContentSelectable: true,
|
isShowReply: false,
|
||||||
),
|
isContentSelectable: true,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
SliverToBoxAdapter(
|
SliverToBoxAdapter(
|
||||||
@@ -63,14 +72,12 @@ class _PostDetailScreenState extends State<PostDetailScreen> {
|
|||||||
.paddingOnly(top: 4),
|
.paddingOnly(top: 4),
|
||||||
),
|
),
|
||||||
SliverToBoxAdapter(
|
SliverToBoxAdapter(
|
||||||
child: CenteredContainer(
|
child: Align(
|
||||||
child: Align(
|
alignment: Alignment.centerLeft,
|
||||||
alignment: Alignment.centerLeft,
|
child: Text(
|
||||||
child: Text(
|
'postReplies'.tr,
|
||||||
'postReplies'.tr,
|
style: Theme.of(context).textTheme.headlineSmall,
|
||||||
style: Theme.of(context).textTheme.headlineSmall,
|
).paddingOnly(left: 24, right: 24, top: 16),
|
||||||
).paddingOnly(left: 24, right: 24, top: 16),
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
PostReplyList(item: item!),
|
PostReplyList(item: item!),
|
||||||
|
|||||||
@@ -2,18 +2,19 @@ import 'package:flutter/material.dart';
|
|||||||
import 'package:flutter_animate/flutter_animate.dart';
|
import 'package:flutter_animate/flutter_animate.dart';
|
||||||
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
|
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
|
||||||
import 'package:get/get.dart';
|
import 'package:get/get.dart';
|
||||||
|
import 'package:intl/intl.dart';
|
||||||
|
import 'package:markdown_toolbar/markdown_toolbar.dart';
|
||||||
|
import 'package:solian/controllers/post_editor_controller.dart';
|
||||||
import 'package:solian/exts.dart';
|
import 'package:solian/exts.dart';
|
||||||
import 'package:solian/models/post.dart';
|
import 'package:solian/models/post.dart';
|
||||||
import 'package:solian/models/realm.dart';
|
import 'package:solian/models/realm.dart';
|
||||||
|
import 'package:solian/providers/attachment_uploader.dart';
|
||||||
import 'package:solian/providers/auth.dart';
|
import 'package:solian/providers/auth.dart';
|
||||||
import 'package:solian/router.dart';
|
import 'package:solian/router.dart';
|
||||||
import 'package:solian/theme.dart';
|
import 'package:solian/theme.dart';
|
||||||
import 'package:solian/widgets/app_bar_leading.dart';
|
import 'package:solian/widgets/app_bar_leading.dart';
|
||||||
import 'package:solian/widgets/app_bar_title.dart';
|
import 'package:solian/widgets/app_bar_title.dart';
|
||||||
import 'package:solian/widgets/attachments/attachment_publish.dart';
|
|
||||||
import 'package:solian/widgets/posts/post_item.dart';
|
import 'package:solian/widgets/posts/post_item.dart';
|
||||||
import 'package:solian/widgets/feed/feed_tags_field.dart';
|
|
||||||
import 'package:textfield_tags/textfield_tags.dart';
|
|
||||||
import 'package:badges/badges.dart' as badges;
|
import 'package:badges/badges.dart' as badges;
|
||||||
|
|
||||||
class PostPublishArguments {
|
class PostPublishArguments {
|
||||||
@@ -22,7 +23,12 @@ class PostPublishArguments {
|
|||||||
final Post? repost;
|
final Post? repost;
|
||||||
final Realm? realm;
|
final Realm? realm;
|
||||||
|
|
||||||
PostPublishArguments({this.edit, this.reply, this.repost, this.realm});
|
PostPublishArguments({
|
||||||
|
this.edit,
|
||||||
|
this.reply,
|
||||||
|
this.repost,
|
||||||
|
this.realm,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
class PostPublishScreen extends StatefulWidget {
|
class PostPublishScreen extends StatefulWidget {
|
||||||
@@ -30,6 +36,7 @@ class PostPublishScreen extends StatefulWidget {
|
|||||||
final Post? reply;
|
final Post? reply;
|
||||||
final Post? repost;
|
final Post? repost;
|
||||||
final Realm? realm;
|
final Realm? realm;
|
||||||
|
final int mode;
|
||||||
|
|
||||||
const PostPublishScreen({
|
const PostPublishScreen({
|
||||||
super.key,
|
super.key,
|
||||||
@@ -37,6 +44,7 @@ class PostPublishScreen extends StatefulWidget {
|
|||||||
this.reply,
|
this.reply,
|
||||||
this.repost,
|
this.repost,
|
||||||
this.realm,
|
this.realm,
|
||||||
|
required this.mode,
|
||||||
});
|
});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -44,87 +52,92 @@ class PostPublishScreen extends StatefulWidget {
|
|||||||
}
|
}
|
||||||
|
|
||||||
class _PostPublishScreenState extends State<PostPublishScreen> {
|
class _PostPublishScreenState extends State<PostPublishScreen> {
|
||||||
final _contentController = TextEditingController();
|
final _editorController = PostEditorController();
|
||||||
final _tagsController = StringTagController();
|
final _contentFocusNode = FocusNode();
|
||||||
|
|
||||||
bool _isBusy = false;
|
bool _isBusy = false;
|
||||||
|
|
||||||
List<int> _attachments = List.empty();
|
void _applyPost() async {
|
||||||
|
|
||||||
bool _isDraft = false;
|
|
||||||
|
|
||||||
void showAttachments() {
|
|
||||||
showModalBottomSheet(
|
|
||||||
context: context,
|
|
||||||
isScrollControlled: true,
|
|
||||||
builder: (context) => AttachmentPublishPopup(
|
|
||||||
usage: 'i.attachment',
|
|
||||||
current: _attachments,
|
|
||||||
onUpdate: (value) {
|
|
||||||
setState(() => _attachments = value);
|
|
||||||
},
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
void applyPost() async {
|
|
||||||
final AuthProvider auth = Get.find();
|
final AuthProvider auth = Get.find();
|
||||||
if (!await auth.isAuthorized) return;
|
if (auth.isAuthorized.isFalse) return;
|
||||||
if (_contentController.value.text.isEmpty) return;
|
if (_editorController.isEmpty) return;
|
||||||
|
|
||||||
|
final AttachmentUploaderController uploader = Get.find();
|
||||||
|
if (uploader.queueOfUpload.any(
|
||||||
|
((x) => x.usage == 'i.attachment' && x.isUploading),
|
||||||
|
)) {
|
||||||
|
context.showErrorDialog('attachmentUploadInProgress'.tr);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
setState(() => _isBusy = true);
|
setState(() => _isBusy = true);
|
||||||
|
|
||||||
final client = auth.configureClient('interactive');
|
final client = auth.configureClient('interactive');
|
||||||
|
|
||||||
final payload = {
|
|
||||||
'content': _contentController.value.text,
|
|
||||||
'tags': _tagsController.getTags?.map((x) => {'alias': x}).toList() ??
|
|
||||||
List.empty(),
|
|
||||||
'attachments': _attachments,
|
|
||||||
'is_draft': _isDraft,
|
|
||||||
if (widget.reply != null) 'reply_to': widget.reply!.id,
|
|
||||||
if (widget.repost != null) 'repost_to': widget.repost!.id,
|
|
||||||
if (widget.realm != null) 'realm': widget.realm!.alias,
|
|
||||||
};
|
|
||||||
|
|
||||||
Response resp;
|
Response resp;
|
||||||
if (widget.edit != null) {
|
if (widget.edit != null) {
|
||||||
resp = await client.put('/stories/${widget.edit!.id}', payload);
|
resp = await client.put(
|
||||||
|
'/${_editorController.typeEndpoint}/${widget.edit!.id}',
|
||||||
|
_editorController.payload,
|
||||||
|
);
|
||||||
} else {
|
} else {
|
||||||
resp = await client.post('/stories', payload);
|
resp = await client.post(
|
||||||
|
'/${_editorController.typeEndpoint}',
|
||||||
|
_editorController.payload,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
if (resp.statusCode != 200) {
|
if (resp.statusCode != 200) {
|
||||||
context.showErrorDialog(resp.bodyString);
|
context.showErrorDialog(resp.bodyString);
|
||||||
} else {
|
} else {
|
||||||
|
_editorController.localClear();
|
||||||
AppRouter.instance.pop(resp.body);
|
AppRouter.instance.pop(resp.body);
|
||||||
}
|
}
|
||||||
|
|
||||||
setState(() => _isBusy = false);
|
setState(() => _isBusy = false);
|
||||||
}
|
}
|
||||||
|
|
||||||
void syncWidget() {
|
void _syncWidget() {
|
||||||
|
_editorController.mode.value = widget.mode;
|
||||||
if (widget.edit != null) {
|
if (widget.edit != null) {
|
||||||
_contentController.text = widget.edit!.body['content'];
|
_editorController.editTarget = widget.edit;
|
||||||
_attachments = widget.edit!.body['attachments'] ?? List.empty();
|
}
|
||||||
_isDraft = widget.edit!.isDraft ?? false;
|
if (widget.realm != null) {
|
||||||
|
_editorController.realmZone.value = widget.realm;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void cancelAction() {
|
void _cancelAction() {
|
||||||
|
_editorController.localClear();
|
||||||
AppRouter.instance.pop();
|
AppRouter.instance.pop();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Post? get _editTo => _editorController.editTo.value;
|
||||||
|
|
||||||
|
Post? get _replyTo => _editorController.replyTo.value;
|
||||||
|
|
||||||
|
Post? get _repostTo => _editorController.repostTo.value;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
syncWidget();
|
|
||||||
super.initState();
|
super.initState();
|
||||||
|
if (widget.edit == null && widget.reply == null && widget.repost == null) {
|
||||||
|
_editorController.localRead();
|
||||||
|
}
|
||||||
|
if (widget.reply != null) {
|
||||||
|
_editorController.replyTo.value = widget.reply;
|
||||||
|
}
|
||||||
|
if (widget.repost != null) {
|
||||||
|
_editorController.repostTo.value = widget.repost;
|
||||||
|
}
|
||||||
|
_editorController.contentController.addListener(() => setState(() {}));
|
||||||
|
_syncWidget();
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
final notifyBannerActions = [
|
final notifyBannerActions = [
|
||||||
TextButton(
|
TextButton(
|
||||||
onPressed: cancelAction,
|
onPressed: _cancelAction,
|
||||||
child: Text('cancel'.tr),
|
child: Text('cancel'.tr),
|
||||||
)
|
)
|
||||||
];
|
];
|
||||||
@@ -134,156 +147,347 @@ class _PostPublishScreenState extends State<PostPublishScreen> {
|
|||||||
child: Scaffold(
|
child: Scaffold(
|
||||||
appBar: AppBar(
|
appBar: AppBar(
|
||||||
leading: AppBarLeadingButton.adaptive(context),
|
leading: AppBarLeadingButton.adaptive(context),
|
||||||
title: AppBarTitle('postPublish'.tr),
|
title: Obx(
|
||||||
|
() => AppBarTitle(
|
||||||
|
_editorController.mode.value == 0
|
||||||
|
? 'postEditorModeStory'.tr
|
||||||
|
: 'postEditorModeArticle'.tr,
|
||||||
|
),
|
||||||
|
),
|
||||||
centerTitle: false,
|
centerTitle: false,
|
||||||
toolbarHeight: SolianTheme.toolbarHeight(context),
|
toolbarHeight: SolianTheme.toolbarHeight(context),
|
||||||
actions: [
|
actions: [
|
||||||
TextButton(
|
TextButton(
|
||||||
onPressed: _isBusy ? null : () => applyPost(),
|
onPressed: _isBusy ? null : () => _applyPost(),
|
||||||
child: Text(
|
child: Obx(
|
||||||
_isDraft
|
() => Text(
|
||||||
? 'draftSave'.tr.toUpperCase()
|
_editorController.isDraft.isTrue
|
||||||
: 'postAction'.tr.toUpperCase(),
|
? 'draftSave'.tr.toUpperCase()
|
||||||
|
: 'postAction'.tr.toUpperCase(),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
body: Stack(
|
body: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
children: [
|
children: [
|
||||||
ListView(
|
ListTile(
|
||||||
children: [
|
tileColor: Theme.of(context).colorScheme.surfaceContainerLow,
|
||||||
if (_isBusy) const LinearProgressIndicator().animate().scaleX(),
|
title: Text(
|
||||||
if (widget.edit != null && widget.edit!.isDraft != true)
|
_editorController.title ?? 'title'.tr,
|
||||||
MaterialBanner(
|
maxLines: 1,
|
||||||
leading: const Icon(Icons.edit),
|
overflow: TextOverflow.ellipsis,
|
||||||
leadingPadding: const EdgeInsets.only(left: 10, right: 20),
|
),
|
||||||
dividerColor: Colors.transparent,
|
subtitle: Text(
|
||||||
content: Text('postEditingNotify'.tr),
|
_editorController.description ?? 'description'.tr,
|
||||||
actions: notifyBannerActions,
|
maxLines: 2,
|
||||||
),
|
overflow: TextOverflow.ellipsis,
|
||||||
if (widget.reply != null)
|
),
|
||||||
ExpansionTile(
|
contentPadding: const EdgeInsets.only(
|
||||||
leading: const FaIcon(
|
left: 17,
|
||||||
FontAwesomeIcons.reply,
|
right: 8,
|
||||||
size: 18,
|
top: 0,
|
||||||
).paddingOnly(left: 2),
|
bottom: 0,
|
||||||
title: Text('postReplyingNotify'.trParams(
|
),
|
||||||
{'username': '@${widget.reply!.author.name}'},
|
trailing: IconButton(
|
||||||
)),
|
icon: const Icon(Icons.edit),
|
||||||
collapsedBackgroundColor:
|
onPressed: () {
|
||||||
Theme.of(context).colorScheme.surfaceContainer,
|
_editorController.editOverview(context).then((_) {
|
||||||
children: [
|
setState(() {});
|
||||||
PostItem(
|
});
|
||||||
item: widget.reply!,
|
},
|
||||||
isReactable: false,
|
),
|
||||||
).paddingOnly(bottom: 8),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
if (widget.repost != null)
|
|
||||||
ExpansionTile(
|
|
||||||
leading: const FaIcon(
|
|
||||||
FontAwesomeIcons.retweet,
|
|
||||||
size: 18,
|
|
||||||
).paddingOnly(left: 2),
|
|
||||||
title: Text('postRepostingNotify'.trParams(
|
|
||||||
{'username': '@${widget.repost!.author.name}'},
|
|
||||||
)),
|
|
||||||
collapsedBackgroundColor:
|
|
||||||
Theme.of(context).colorScheme.surfaceContainer,
|
|
||||||
children: [
|
|
||||||
PostItem(
|
|
||||||
item: widget.repost!,
|
|
||||||
isReactable: false,
|
|
||||||
).paddingOnly(bottom: 8),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
if (widget.realm != null)
|
|
||||||
MaterialBanner(
|
|
||||||
leading: const Icon(Icons.group),
|
|
||||||
leadingPadding: const EdgeInsets.only(left: 10, right: 20),
|
|
||||||
dividerColor: Colors.transparent,
|
|
||||||
content: Text(
|
|
||||||
'postInRealmNotify'
|
|
||||||
.trParams({'realm': '#${widget.realm!.alias}'}),
|
|
||||||
),
|
|
||||||
actions: notifyBannerActions,
|
|
||||||
),
|
|
||||||
const Divider(thickness: 0.3, height: 0.3)
|
|
||||||
.paddingOnly(bottom: 8),
|
|
||||||
Container(
|
|
||||||
padding:
|
|
||||||
const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
|
|
||||||
child: TextField(
|
|
||||||
maxLines: null,
|
|
||||||
autofocus: true,
|
|
||||||
autocorrect: true,
|
|
||||||
keyboardType: TextInputType.multiline,
|
|
||||||
controller: _contentController,
|
|
||||||
decoration: InputDecoration.collapsed(
|
|
||||||
hintText: 'postContentPlaceholder'.tr,
|
|
||||||
),
|
|
||||||
onTapOutside: (_) =>
|
|
||||||
FocusManager.instance.primaryFocus?.unfocus(),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
const SizedBox(height: 120)
|
|
||||||
],
|
|
||||||
),
|
),
|
||||||
Positioned(
|
if (_editTo != null && _editTo!.isDraft != true)
|
||||||
bottom: 0,
|
MaterialBanner(
|
||||||
left: 0,
|
leading: const Icon(Icons.edit),
|
||||||
right: 0,
|
leadingPadding: const EdgeInsets.only(left: 10, right: 20),
|
||||||
child: Material(
|
dividerColor: Colors.transparent,
|
||||||
elevation: 8,
|
content: Text('postEditingNotify'.tr),
|
||||||
color: Theme.of(context).colorScheme.surface,
|
actions: notifyBannerActions,
|
||||||
child: Column(
|
),
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
if (_replyTo != null)
|
||||||
children: [
|
ExpansionTile(
|
||||||
TagsField(
|
leading: const FaIcon(
|
||||||
initialTags:
|
FontAwesomeIcons.reply,
|
||||||
widget.edit?.tags?.map((x) => x.alias).toList(),
|
size: 18,
|
||||||
tagsController: _tagsController,
|
).paddingOnly(left: 2),
|
||||||
hintText: 'postTagsPlaceholder'.tr,
|
title: Text('postReplyingNotify'.trParams(
|
||||||
|
{'username': '@${widget.reply!.author.name}'},
|
||||||
|
)),
|
||||||
|
collapsedBackgroundColor:
|
||||||
|
Theme.of(context).colorScheme.surfaceContainer,
|
||||||
|
children: [
|
||||||
|
Container(
|
||||||
|
constraints: const BoxConstraints(maxHeight: 280),
|
||||||
|
child: SingleChildScrollView(
|
||||||
|
child: PostItem(
|
||||||
|
item: _replyTo!,
|
||||||
|
isReactable: false,
|
||||||
|
).paddingOnly(bottom: 8),
|
||||||
),
|
),
|
||||||
const Divider(thickness: 0.3, height: 0.3),
|
),
|
||||||
SizedBox(
|
],
|
||||||
height: 56,
|
),
|
||||||
child: ListView(
|
if (_repostTo != null)
|
||||||
scrollDirection: Axis.horizontal,
|
ExpansionTile(
|
||||||
|
leading: const FaIcon(
|
||||||
|
FontAwesomeIcons.retweet,
|
||||||
|
size: 18,
|
||||||
|
).paddingOnly(left: 2),
|
||||||
|
title: Text('postRepostingNotify'.trParams(
|
||||||
|
{'username': '@${widget.repost!.author.name}'},
|
||||||
|
)),
|
||||||
|
collapsedBackgroundColor:
|
||||||
|
Theme.of(context).colorScheme.surfaceContainer,
|
||||||
|
children: [
|
||||||
|
Container(
|
||||||
|
constraints: const BoxConstraints(maxHeight: 280),
|
||||||
|
child: SingleChildScrollView(
|
||||||
|
child: PostItem(
|
||||||
|
item: _repostTo!,
|
||||||
|
isReactable: false,
|
||||||
|
).paddingOnly(bottom: 8),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
Expanded(
|
||||||
|
child: ListView(
|
||||||
|
children: [
|
||||||
|
if (_isBusy)
|
||||||
|
const LinearProgressIndicator().animate().scaleX(),
|
||||||
|
Container(
|
||||||
|
padding: const EdgeInsets.symmetric(
|
||||||
|
horizontal: 16,
|
||||||
|
vertical: 8,
|
||||||
|
),
|
||||||
|
child: TextField(
|
||||||
|
maxLines: null,
|
||||||
|
autofocus: true,
|
||||||
|
autocorrect: true,
|
||||||
|
keyboardType: TextInputType.multiline,
|
||||||
|
controller: _editorController.contentController,
|
||||||
|
focusNode: _contentFocusNode,
|
||||||
|
decoration: InputDecoration.collapsed(
|
||||||
|
hintText: 'postContentPlaceholder'.tr,
|
||||||
|
),
|
||||||
|
onTapOutside: (_) =>
|
||||||
|
FocusManager.instance.primaryFocus?.unfocus(),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 120)
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Material(
|
||||||
|
color: Theme.of(context).colorScheme.surface,
|
||||||
|
child: Column(
|
||||||
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
|
children: [
|
||||||
|
Obx(() {
|
||||||
|
final textStyle = TextStyle(
|
||||||
|
fontSize: 12,
|
||||||
|
color: Theme.of(context)
|
||||||
|
.colorScheme
|
||||||
|
.onSurface
|
||||||
|
.withOpacity(0.75),
|
||||||
|
);
|
||||||
|
final showFactors = [
|
||||||
|
_editorController.isRestoreFromLocal.value,
|
||||||
|
_editorController.lastSaveTime.value != null,
|
||||||
|
];
|
||||||
|
final doShow = showFactors.any((x) => x);
|
||||||
|
return Container(
|
||||||
|
padding: const EdgeInsets.symmetric(
|
||||||
|
vertical: 4,
|
||||||
|
horizontal: 16,
|
||||||
|
),
|
||||||
|
child: Row(
|
||||||
children: [
|
children: [
|
||||||
IconButton(
|
if (showFactors[0])
|
||||||
icon: _isDraft
|
Text('postRestoreFromLocal'.tr, style: textStyle)
|
||||||
? const Icon(Icons.drive_file_rename_outline)
|
.paddingOnly(right: 4),
|
||||||
: const Icon(Icons.public),
|
if (showFactors[0])
|
||||||
color: _isDraft
|
InkWell(
|
||||||
? Colors.grey.shade600
|
child: Text('clear'.tr, style: textStyle),
|
||||||
: Colors.green.shade700,
|
onTap: () {
|
||||||
|
_editorController.localClear();
|
||||||
|
_editorController.currentClear();
|
||||||
|
setState(() {});
|
||||||
|
},
|
||||||
|
),
|
||||||
|
if (showFactors.where((x) => x).length > 1)
|
||||||
|
Text(
|
||||||
|
'·',
|
||||||
|
style: textStyle,
|
||||||
|
).paddingSymmetric(horizontal: 8),
|
||||||
|
if (showFactors[1])
|
||||||
|
Text(
|
||||||
|
'postAutoSaveAt'.trParams({
|
||||||
|
'date': DateFormat('HH:mm:ss').format(
|
||||||
|
_editorController.lastSaveTime.value ??
|
||||||
|
DateTime.now(),
|
||||||
|
)
|
||||||
|
}),
|
||||||
|
style: textStyle,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
)
|
||||||
|
.animate(
|
||||||
|
key: const Key('post-editor-hint-animation'),
|
||||||
|
target: doShow ? 1 : 0,
|
||||||
|
)
|
||||||
|
.fade(curve: Curves.easeInOut, duration: 300.ms);
|
||||||
|
}),
|
||||||
|
if (_editorController.mode.value == 0)
|
||||||
|
Obx(
|
||||||
|
() => TweenAnimationBuilder<double>(
|
||||||
|
tween: Tween(
|
||||||
|
begin: 0,
|
||||||
|
end: _editorController.contentLength.value / 4096,
|
||||||
|
),
|
||||||
|
duration: const Duration(milliseconds: 300),
|
||||||
|
curve: Curves.easeInOut,
|
||||||
|
builder: (context, value, _) => LinearProgressIndicator(
|
||||||
|
minHeight: 2,
|
||||||
|
color: _editorController.contentLength.value > 4096
|
||||||
|
? Colors.red[900]
|
||||||
|
: Theme.of(context).colorScheme.primary,
|
||||||
|
value: value,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
SizedBox(
|
||||||
|
height: 56,
|
||||||
|
child: ListView(
|
||||||
|
scrollDirection: Axis.horizontal,
|
||||||
|
children: [
|
||||||
|
Obx(() {
|
||||||
|
final isDraft = _editorController.isDraft.value;
|
||||||
|
return IconButton(
|
||||||
|
icon: const Icon(
|
||||||
|
Icons.drive_file_rename_outline,
|
||||||
|
color: Colors.grey,
|
||||||
|
)
|
||||||
|
.animate(
|
||||||
|
target: isDraft ? 0 : 1,
|
||||||
|
)
|
||||||
|
.fadeOut(duration: 150.ms)
|
||||||
|
.swap(
|
||||||
|
duration: 150.ms,
|
||||||
|
builder: (_, __) => const Icon(
|
||||||
|
Icons.public,
|
||||||
|
color: Colors.green,
|
||||||
|
).animate().fadeIn(duration: 150.ms),
|
||||||
|
),
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
setState(() => _isDraft = !_isDraft);
|
_editorController.toggleDraftMode();
|
||||||
},
|
},
|
||||||
),
|
);
|
||||||
IconButton(
|
}),
|
||||||
icon: badges.Badge(
|
IconButton(
|
||||||
|
icon: const Icon(Icons.disabled_visible),
|
||||||
|
color: Theme.of(context).colorScheme.primary,
|
||||||
|
onPressed: () {
|
||||||
|
_editorController.editVisibility(context);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
IconButton(
|
||||||
|
icon: Obx(() {
|
||||||
|
return badges.Badge(
|
||||||
badgeContent: Text(
|
badgeContent: Text(
|
||||||
_attachments.length.toString(),
|
_editorController.attachments.length.toString(),
|
||||||
style: const TextStyle(color: Colors.white),
|
style: const TextStyle(color: Colors.white),
|
||||||
),
|
),
|
||||||
showBadge: _attachments.isNotEmpty,
|
showBadge:
|
||||||
|
_editorController.attachments.isNotEmpty,
|
||||||
position: badges.BadgePosition.topEnd(
|
position: badges.BadgePosition.topEnd(
|
||||||
top: -12,
|
top: -12,
|
||||||
end: -8,
|
end: -8,
|
||||||
),
|
),
|
||||||
child: const Icon(Icons.camera_alt),
|
child: const Icon(Icons.file_present_rounded),
|
||||||
),
|
);
|
||||||
color: Theme.of(context).colorScheme.primary,
|
}),
|
||||||
onPressed: () => showAttachments(),
|
color: Theme.of(context).colorScheme.primary,
|
||||||
),
|
onPressed: () {
|
||||||
],
|
_editorController.editAttachment(context);
|
||||||
).paddingSymmetric(horizontal: 6, vertical: 8),
|
},
|
||||||
),
|
),
|
||||||
],
|
IconButton(
|
||||||
).paddingOnly(bottom: MediaQuery.of(context).padding.bottom),
|
icon: Obx(() {
|
||||||
),
|
return badges.Badge(
|
||||||
|
badgeContent: Text(
|
||||||
|
_editorController.tags.length.toString(),
|
||||||
|
style: const TextStyle(color: Colors.white),
|
||||||
|
),
|
||||||
|
showBadge: _editorController.tags.isNotEmpty,
|
||||||
|
position: badges.BadgePosition.topEnd(
|
||||||
|
top: -12,
|
||||||
|
end: -8,
|
||||||
|
),
|
||||||
|
child: const Icon(Icons.label),
|
||||||
|
);
|
||||||
|
}),
|
||||||
|
color: Theme.of(context).colorScheme.primary,
|
||||||
|
onPressed: () {
|
||||||
|
_editorController.editCategoriesAndTags(context);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
IconButton(
|
||||||
|
icon: Obx(() {
|
||||||
|
return badges.Badge(
|
||||||
|
showBadge:
|
||||||
|
_editorController.realmZone.value != null,
|
||||||
|
position: badges.BadgePosition.topEnd(
|
||||||
|
top: -4,
|
||||||
|
end: -6,
|
||||||
|
),
|
||||||
|
child: const Icon(Icons.workspaces),
|
||||||
|
);
|
||||||
|
}),
|
||||||
|
color: Theme.of(context).colorScheme.primary,
|
||||||
|
onPressed: () {
|
||||||
|
_editorController.editPublishZone(context);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
IconButton(
|
||||||
|
icon: Obx(() {
|
||||||
|
return badges.Badge(
|
||||||
|
showBadge:
|
||||||
|
_editorController.publishedAt.value != null ||
|
||||||
|
_editorController.publishedUntil.value !=
|
||||||
|
null,
|
||||||
|
position: badges.BadgePosition.topEnd(
|
||||||
|
top: -4,
|
||||||
|
end: -6,
|
||||||
|
),
|
||||||
|
child: const Icon(Icons.schedule),
|
||||||
|
);
|
||||||
|
}),
|
||||||
|
color: Theme.of(context).colorScheme.primary,
|
||||||
|
onPressed: () {
|
||||||
|
_editorController.editPublishDate(context);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
MarkdownToolbar(
|
||||||
|
hideImage: true,
|
||||||
|
useIncludedTextField: false,
|
||||||
|
backgroundColor: Colors.transparent,
|
||||||
|
iconColor: Theme.of(context).colorScheme.onSurface,
|
||||||
|
controller: _editorController.contentController,
|
||||||
|
focusNode: _contentFocusNode,
|
||||||
|
borderRadius:
|
||||||
|
const BorderRadius.all(Radius.circular(20)),
|
||||||
|
width: 40,
|
||||||
|
).paddingSymmetric(horizontal: 4),
|
||||||
|
],
|
||||||
|
).paddingSymmetric(horizontal: 6, vertical: 8),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
).paddingOnly(bottom: MediaQuery.of(context).padding.bottom),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
@@ -293,8 +497,8 @@ class _PostPublishScreenState extends State<PostPublishScreen> {
|
|||||||
|
|
||||||
@override
|
@override
|
||||||
void dispose() {
|
void dispose() {
|
||||||
_contentController.dispose();
|
_contentFocusNode.dispose();
|
||||||
_tagsController.dispose();
|
_editorController.dispose();
|
||||||
super.dispose();
|
super.dispose();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,9 +26,9 @@ class _RealmListScreenState extends State<RealmListScreen> {
|
|||||||
|
|
||||||
final List<Realm> _realms = List.empty(growable: true);
|
final List<Realm> _realms = List.empty(growable: true);
|
||||||
|
|
||||||
getRealms() async {
|
_getRealms() async {
|
||||||
final AuthProvider auth = Get.find();
|
final AuthProvider auth = Get.find();
|
||||||
if (!await auth.isAuthorized) return;
|
if (auth.isAuthorized.isFalse) return;
|
||||||
|
|
||||||
setState(() => _isBusy = true);
|
setState(() => _isBusy = true);
|
||||||
|
|
||||||
@@ -48,7 +48,7 @@ class _RealmListScreenState extends State<RealmListScreen> {
|
|||||||
@override
|
@override
|
||||||
void initState() {
|
void initState() {
|
||||||
super.initState();
|
super.initState();
|
||||||
getRealms();
|
_getRealms();
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -71,7 +71,7 @@ class _RealmListScreenState extends State<RealmListScreen> {
|
|||||||
onPressed: () {
|
onPressed: () {
|
||||||
AppRouter.instance.pushNamed('realmOrganizing').then(
|
AppRouter.instance.pushNamed('realmOrganizing').then(
|
||||||
(value) {
|
(value) {
|
||||||
if (value != null) getRealms();
|
if (value != null) _getRealms();
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
@@ -81,47 +81,38 @@ class _RealmListScreenState extends State<RealmListScreen> {
|
|||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
body: FutureBuilder(
|
body: Obx(() {
|
||||||
future: auth.isAuthorized,
|
if (auth.isAuthorized.isFalse) {
|
||||||
builder: (context, snapshot) {
|
return SigninRequiredOverlay(
|
||||||
if (!snapshot.hasData) {
|
onSignedIn: () => _getRealms(),
|
||||||
return const Center(
|
);
|
||||||
child: CircularProgressIndicator(),
|
}
|
||||||
);
|
|
||||||
} else if (snapshot.data == false) {
|
|
||||||
return SigninRequiredOverlay(
|
|
||||||
onSignedIn: () {
|
|
||||||
getRealms();
|
|
||||||
},
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return Column(
|
return Column(
|
||||||
children: [
|
children: [
|
||||||
if (_isBusy) const LinearProgressIndicator().animate().scaleX(),
|
if (_isBusy) const LinearProgressIndicator().animate().scaleX(),
|
||||||
Expanded(
|
Expanded(
|
||||||
child: CenteredContainer(
|
child: CenteredContainer(
|
||||||
child: RefreshIndicator(
|
child: RefreshIndicator(
|
||||||
onRefresh: () => getRealms(),
|
onRefresh: () => _getRealms(),
|
||||||
child: ListView.builder(
|
child: ListView.builder(
|
||||||
itemCount: _realms.length,
|
itemCount: _realms.length,
|
||||||
itemBuilder: (context, index) {
|
itemBuilder: (context, index) {
|
||||||
final element = _realms[index];
|
final element = _realms[index];
|
||||||
return buildRealm(element);
|
return _buildEntry(element);
|
||||||
},
|
},
|
||||||
),
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
],
|
),
|
||||||
);
|
],
|
||||||
},
|
);
|
||||||
),
|
}),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
Widget buildRealm(Realm element) {
|
Widget _buildEntry(Realm element) {
|
||||||
return Card(
|
return Card(
|
||||||
child: ClipRRect(
|
child: ClipRRect(
|
||||||
borderRadius: const BorderRadius.all(Radius.circular(8)),
|
borderRadius: const BorderRadius.all(Radius.circular(8)),
|
||||||
|
|||||||
@@ -26,9 +26,8 @@ class _RealmDetailScreenState extends State<RealmDetailScreen> {
|
|||||||
|
|
||||||
void checkOwner() async {
|
void checkOwner() async {
|
||||||
final AuthProvider auth = Get.find();
|
final AuthProvider auth = Get.find();
|
||||||
final prof = await auth.getProfile();
|
|
||||||
setState(() {
|
setState(() {
|
||||||
_isOwned = prof.body['id'] == widget.realm.accountId;
|
_isOwned = auth.userProfile.value!['id'] == widget.realm.accountId;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||