🐛 Realm related bug fixes

README.md

@@ -0,0 +1,27 @@
+# Solar Network
+
+![](https://solsynth.dev/_next/static/media/alpha.e779a584.webp)
+
+Hello there! Welcome to the main repository of the HyperNet (also known as the Solar Network). The code here is mainly about the frontend app (also known as Solian). But you can still post issues here to get help and request new features!
+
+## Sub Projects
+
+HyperNet, the Solar Network is a microservices project in which the backends are stored in separate repositories. Here is a simple index for it.
+
+- The Core, Gateway: [Nexus](https://github.com/Solsynth/HyperNet.Nexus)
+- The Auth Service: [Passport](https://github.com/Solsynth/HyperNet.Passport)
+- The Posting Service: [Interactive](https://github.com/Solsynth/HyperNet.Interactive)
+- The Messaging Service: [Messaging](https://github.com/Solsynth/HyperNet.Messaging)
+- The Wallet Service: [Wallet](https://github.com/Solsynth/HyperNet.Wallet)
+- The Crawler: [Reader](https://github.com/Solsynth/HyperNet.Reader)
+- Some others may not be listed, you can search in the organization with `HyperNet.` the prefix of all HyperNet projects.
+
+## Tech Stack
+
+For those people who want to know the tech stack of this project, the frontend was built by Flutter, which provides the cross-platform ability.
+
+The backend was built in Go and PostgreSQL with our very own microservice framework included in the nexus.
+
+-----
+
+The readme will be updated in the future, to be determined. For now, you can check out the link of this repository to learn more on our official website.

android/app/src/main/AndroidManifest.xml

@@ -17,7 +17,6 @@
         android:label="Solian"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
-        android:enableOnBackInvokedCallback="true"
         android:requestLegacyExternalStorage="true">
         <meta-data
             android:name="flutterEmbedding"

android/app/src/main/kotlin/dev/solsynth/solian/widgets/CheckInWidget.kt

@@ -54,7 +54,7 @@ class CheckInWidget : GlanceAppWidget() {
                 .setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES)
                 .registerTypeAdapter(Instant::class.java, InstantAdapter())
                 .create()
-        val resultTierSymbols = listOf("大凶", "凶", "中平", "吉", "大吉")
+        val resultTierSymbols = listOf("Bad", "Poor", "Medium", "Good", "Great")
 
         val prefs = currentState.preferences
         val checkInRaw: String? = prefs.getString("pas_check_in_record", null)
@@ -120,7 +120,7 @@ class CheckInWidget : GlanceAppWidget() {
             }
 
             Text(
-                text = "You haven't checked in today",
+                text = "You haven't divined today",
                 style = TextStyle(fontSize = 15.sp, color = GlanceTheme.colors.onSurface)
             )
         }

assets/translations/en-US.json

@@ -419,7 +419,7 @@
   "callMessageEnded": "Call lasted {}",
   "callMessageStarted": "Call started",
   "dailyCheckIn": "Check In",
-  "dailyCheckInNone": "You haven't checked in today",
+  "dailyCheckInNone": "You haven't divined today",
   "dailyCheckAction": "Check in right now!",
   "dailyCheckDetail": "Can't understand the symbol? Master, help me understand it!",
   "dailyCheckDetailTitle": "{}'s fortune details",

debian/debian.yml

@@ -0,0 +1,14 @@
+flutter_app: 
+  command: surface
+  arch: x64
+  parent: /usr/local/lib
+  nonInteractive: false
+
+control:
+  Package: solian
+  Version: 2.3.2
+  Architecture: amd64
+  Priority: optional
+  Depends: mpv keybinder-3.0
+  Maintainer: Solsynth LLC
+  Description: The Solar Network Desktop Application

debian/gui/surface.desktop

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=2.3.2
+Name=Solian
+GenericName=Solian
+Comment=The Solar Network Desktop Application
+Terminal=false
+Type=Application
+Categories=Social Networking
+Keywords=social;social network;chat;solar network

ios/SolarWidget/CheckInWidget.swift

@@ -15,14 +15,14 @@ struct CheckInProvider: TimelineProvider {
 
     func getSnapshot(in context: Context, completion: @escaping (CheckInEntry) -> ()) {
         let prefs = UserDefaults(suiteName: "group.solsynth.solian")
-        
+
         let dateFormatter = DateFormatter()
         dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSSSS'Z'"
-        
+
         let jsonDecoder = JSONDecoder()
         jsonDecoder.dateDecodingStrategy = .formatted(dateFormatter)
         jsonDecoder.keyDecodingStrategy = .convertFromSnakeCase
-        
+
         let checkInRaw = prefs?.string(forKey: "pas_check_in_record")
         var checkIn: SolarCheckInRecord?
         if let checkInRaw = checkInRaw {
@@ -31,7 +31,7 @@ struct CheckInProvider: TimelineProvider {
                 checkIn = nil
             }
         }
-        
+
         let entry = CheckInEntry(
             date: Date(),
             checkIn: checkIn
@@ -54,11 +54,11 @@ struct CheckInEntry: TimelineEntry {
 
 struct CheckInWidgetEntryView : View {
     var entry: CheckInProvider.Entry
-    
-    private let resultTierSymbols: [String] = ["大凶", "凶", "中平", "吉", "大吉"]
-    
+
+    private let resultTierSymbols: [String] = ["Bad", "Poor", "Medium", "Good", "Great"]
+
     func checkIn() -> Void {}
-    
+
     func seeDetail() -> Void {}
 
     var body: some View {
@@ -68,9 +68,9 @@ struct CheckInWidgetEntryView : View {
                     Text(resultTierSymbols[checkIn.resultTier]).font(.system(size: 27, weight: .bold))
                     Text("+\(checkIn.resultExperience) EXP").font(.system(size: 15, design: .monospaced))
                 }.padding(.horizontal, 4)
-                
+
                 Spacer()
-                
+
                 HStack {
                     VStack(alignment: .leading) {
                         Text(
@@ -82,7 +82,7 @@ struct CheckInWidgetEntryView : View {
                             format: .dateTime.day().month()
                         ).font(.system(size: 13))
                     }.padding(.leading, 4)
-                    
+
                     Button("See Detail", systemImage: "arrow.right", action: seeDetail)
                         .labelStyle(.iconOnly)
                         .buttonBorderShape(.circle)
@@ -91,11 +91,11 @@ struct CheckInWidgetEntryView : View {
             } else {
                 VStack(alignment: .leading) {
                     Text("Check In").font(.system(size: 19, weight: .bold))
-                    Text("You haven't check in today").font(.system(size: 15))
+                    Text("You haven't divined today").font(.system(size: 15))
                 }.padding(.horizontal, 4)
-                
+
                 Spacer()
-                
+
                 HStack(alignment: .bottom) {
                     Button("Check In", systemImage: "checkmark", action: checkIn).labelStyle(.iconOnly).buttonBorderShape(.circle).frame(maxWidth: .infinity, alignment: .trailing)
                 }

lib/main.dart

@@ -69,20 +69,6 @@ void appBackgroundDispatcher() {
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
-  await EasyLocalization.ensureInitialized();
-
-  await Hive.initFlutter();
-  Hive.registerAdapter(SnChannelImplAdapter());
-  Hive.registerAdapter(SnRealmImplAdapter());
-  Hive.registerAdapter(SnChannelMemberImplAdapter());
-  Hive.registerAdapter(SnChatMessageImplAdapter());
-
-  await Firebase.initializeApp(
-    options: DefaultFirebaseOptions.currentPlatform,
-  );
-
-  GoRouter.optionURLReflectsImperativeAPIs = true;
-  usePathUrlStrategy();
 
   if (!kIsWeb && (Platform.isWindows || Platform.isLinux || Platform.isMacOS)) {
     doWhenWindowReady(() {
@@ -93,6 +79,23 @@ void main() async {
     });
   }
 
+  await EasyLocalization.ensureInitialized();
+
+  await Hive.initFlutter();
+  Hive.registerAdapter(SnChannelImplAdapter());
+  Hive.registerAdapter(SnRealmImplAdapter());
+  Hive.registerAdapter(SnChannelMemberImplAdapter());
+  Hive.registerAdapter(SnChatMessageImplAdapter());
+
+  if (kIsWeb && !Platform.isLinux) {
+    await Firebase.initializeApp(
+      options: DefaultFirebaseOptions.currentPlatform,
+    );
+  }
+
+  GoRouter.optionURLReflectsImperativeAPIs = true;
+  usePathUrlStrategy();
+
   if (!kIsWeb && (Platform.isAndroid || Platform.isIOS)) {
     Workmanager().initialize(
       appBackgroundDispatcher,

lib/screens/realm.dart

@@ -186,7 +186,11 @@ class _RealmScreenState extends State<RealmScreen> {
                           GoRouter.of(context).pushNamed(
                             'realmDetail',
                             pathParameters: {'alias': realm.alias},
-                          );
+                          ).then((value) {
+                            if (value == true) {
+                              _fetchRealms();
+                            }
+                          });
                         },
                       );
                     }
@@ -244,7 +248,11 @@ class _RealmScreenState extends State<RealmScreen> {
                             GoRouter.of(context).pushNamed(
                               'realmDetail',
                               pathParameters: {'alias': realm.alias},
-                            );
+                            ).then((value) {
+                              if (value == true) {
+                                _fetchRealms();
+                              }
+                            });
                           },
                         ),
                       ),

lib/screens/realm/realm_detail.dart

@@ -343,12 +343,9 @@ class _RealmSettingsWidgetState extends State<_RealmSettingsWidget> {
     setState(() => _isBusy = true);
 
     try {
-      await sn.client.delete('/cgi/id/realms/${widget.realm!.alias}');
+      await sn.client.delete('/cgi/id/realms/${widget.realm!.id}');
       if (!mounted) return;
       Navigator.pop(context, true);
-      context.showSnackbar('realmDeleted'.tr(args: [
-        '#${widget.realm!.alias}',
-      ]));
     } catch (err) {
       if (!mounted) return;
       context.showErrorDialog(err);

lib/theme.dart

@@ -57,7 +57,7 @@ Future<ThemeData> createAppTheme(
     ),
     pageTransitionsTheme: PageTransitionsTheme(
       builders: {
-        TargetPlatform.android: PredictiveBackPageTransitionsBuilder(),
+        TargetPlatform.android: ZoomPageTransitionsBuilder(),
         TargetPlatform.iOS: CupertinoPageTransitionsBuilder(),
         TargetPlatform.macOS: ZoomPageTransitionsBuilder(),
         TargetPlatform.fuchsia: ZoomPageTransitionsBuilder(),

lib/types/account.dart

@@ -20,7 +20,7 @@ class SnAccount with _$SnAccount {
     required String description,
     required String name,
     required String nick,
-    required Map<String, dynamic> permNodes,
+    @Default({}) Map<String, dynamic> permNodes,
     required String language,
     required SnAccountProfile? profile,
     @Default([]) List<SnAccountBadge> badges,

lib/types/account.freezed.dart

@@ -385,7 +385,7 @@ class _$SnAccountImpl extends _SnAccount {
       required this.description,
       required this.name,
       required this.nick,
-      required final Map<String, dynamic> permNodes,
+      final Map<String, dynamic> permNodes = const {},
       required this.language,
       required this.profile,
       final List<SnAccountBadge> badges = const [],
@@ -437,6 +437,7 @@ class _$SnAccountImpl extends _SnAccount {
   final String nick;
   final Map<String, dynamic> _permNodes;
   @override
+  @JsonKey()
   Map<String, dynamic> get permNodes {
     if (_permNodes is EqualUnmodifiableMapView) return _permNodes;
     // ignore: implicit_dynamic_type
@@ -566,7 +567,7 @@ abstract class _SnAccount extends SnAccount {
       required final String description,
       required final String name,
       required final String nick,
-      required final Map<String, dynamic> permNodes,
+      final Map<String, dynamic> permNodes,
       required final String language,
       required final SnAccountProfile? profile,
       final List<SnAccountBadge> badges,

lib/types/account.g.dart

@@ -25,7 +25,7 @@ _$SnAccountImpl _$$SnAccountImplFromJson(Map<String, dynamic> json) =>
       description: json['description'] as String,
       name: json['name'] as String,
       nick: json['nick'] as String,
-      permNodes: json['perm_nodes'] as Map<String, dynamic>,
+      permNodes: json['perm_nodes'] as Map<String, dynamic>? ?? const {},
       language: json['language'] as String,
       profile: json['profile'] == null
           ? null

lib/types/check_in.dart

@@ -3,7 +3,7 @@ import 'package:freezed_annotation/freezed_annotation.dart';
 part 'check_in.freezed.dart';
 part 'check_in.g.dart';
 
-const List<String> kCheckInResultTierSymbols = ['大凶', '凶', '中平', '吉', '大吉'];
+const List<String> kCheckInResultTierSymbols = ['Bad', 'Poor', 'Medium', 'Good', 'Great'];
 
 @freezed
 class SnCheckInRecord with _$SnCheckInRecord {

lib/widgets/navigation/app_scaffold.dart

@@ -166,10 +166,12 @@ class AppRootScaffold extends StatelessWidget {
                         crossAxisAlignment: CrossAxisAlignment.center,
                         mainAxisAlignment: Platform.isMacOS ? MainAxisAlignment.center : MainAxisAlignment.start,
                         children: [
-                          Text(
-                            'Solar Network',
-                            style: GoogleFonts.spaceGrotesk(),
-                          ).padding(horizontal: 12, vertical: 5),
+                          Expanded(
+                            child: Text(
+                              'Solar Network',
+                              style: GoogleFonts.spaceGrotesk(),
+                            ).padding(horizontal: 12, vertical: 5),
+                          ),
                           if (!Platform.isMacOS)
                             Row(
                               mainAxisSize: MainAxisSize.min,

linux/my_application.cc

@@ -1,6 +1,5 @@
-#include "my_application.h"
-
 #include <bitsdojo_window_linux/bitsdojo_window_plugin.h>
+#include "my_application.h"
 
 #include <flutter_linux/flutter_linux.h>
 #ifdef GDK_WINDOWING_X11
@@ -42,15 +41,16 @@ static void my_application_activate(GApplication* application) {
   if (use_header_bar) {
     GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new());
     gtk_widget_show(GTK_WIDGET(header_bar));
-    gtk_header_bar_set_title(header_bar, "Surface");
+    gtk_header_bar_set_title(header_bar, "bitsdojo_window_example");
     gtk_header_bar_set_show_close_button(header_bar, TRUE);
     gtk_window_set_titlebar(window, GTK_WIDGET(header_bar));
   } else {
-    gtk_window_set_title(window, "Surface");
+    gtk_window_set_title(window, "bitsdojo_window_example");
   }
 
   auto bdw = bitsdojo_window_from(window);
   bdw->setCustomFrame(true);
+  //gtk_window_set_default_size(window, 1280, 720);
   gtk_widget_show(GTK_WIDGET(window));
 
   g_autoptr(FlDartProject) project = fl_dart_project_new();
@@ -84,24 +84,6 @@ static gboolean my_application_local_command_line(GApplication* application, gch
   return TRUE;
 }
 
-// Implements GApplication::startup.
-static void my_application_startup(GApplication* application) {
-  //MyApplication* self = MY_APPLICATION(object);
-
-  // Perform any actions required at application startup.
-
-  G_APPLICATION_CLASS(my_application_parent_class)->startup(application);
-}
-
-// Implements GApplication::shutdown.
-static void my_application_shutdown(GApplication* application) {
-  //MyApplication* self = MY_APPLICATION(object);
-
-  // Perform any actions required at application shutdown.
-
-  G_APPLICATION_CLASS(my_application_parent_class)->shutdown(application);
-}
-
 // Implements GObject::dispose.
 static void my_application_dispose(GObject* object) {
   MyApplication* self = MY_APPLICATION(object);
@@ -112,8 +94,6 @@ static void my_application_dispose(GObject* object) {
 static void my_application_class_init(MyApplicationClass* klass) {
   G_APPLICATION_CLASS(klass)->activate = my_application_activate;
   G_APPLICATION_CLASS(klass)->local_command_line = my_application_local_command_line;
-  G_APPLICATION_CLASS(klass)->startup = my_application_startup;
-  G_APPLICATION_CLASS(klass)->shutdown = my_application_shutdown;
   G_OBJECT_CLASS(klass)->dispose = my_application_dispose;
 }
 

pubspec.lock

@@ -354,10 +354,10 @@ packages:
     dependency: "direct main"
     description:
       name: dart_webrtc
-      sha256: "3b3ff59c66cbc1577ed0f28d7005b5163555208fb1697a42207424ab8baa27c5"
+      sha256: "03df5b41b23bc185ebcf4b0ffc92d002e295bf56287fb5f9d2c321ddaf7760cc"
       url: "https://pub.dev"
     source: hosted
-    version: "1.5.0"
+    version: "1.5.1"
   dbus:
     dependency: transitive
     description:
@@ -538,10 +538,10 @@ packages:
     dependency: transitive
     description:
       name: file_selector_windows
-      sha256: "8f5d2f6590d51ecd9179ba39c64f722edc15226cc93dcc8698466ad36a4a85a4"
+      sha256: "320fcfb6f33caa90f0b58380489fc5ac05d99ee94b61aa96ec2bff0ba81d3c2b"
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.3+3"
+    version: "0.9.3+4"
   firebase_analytics:
     dependency: "direct main"
     description: