Refactor, prepare for flavored overrides

humhub · May 17, 2024 · d1e35c8 · d1e35c8
1 parent b432c8d
commit d1e35c8
Show file tree

Hide file tree

Showing 28 changed files with 165 additions and 173 deletions.
diff --git a/lib/components/animated_padding_component.dart b/lib/components/animated_padding_component.dart
@@ -11,13 +11,8 @@ class AnimatedPaddingComponent extends StatefulWidget {
 }
 
 class AnimatedPaddingComponentState extends State<AnimatedPaddingComponent> {
-
   @override
   Widget build(BuildContext context) {
-    return AnimatedPadding(
-      duration: const Duration(milliseconds: 500),
-      padding: widget.padding,
-      child: widget.child
-    );
+    return AnimatedPadding(duration: const Duration(milliseconds: 500), padding: widget.padding, child: widget.child);
   }
 }
diff --git a/lib/components/bottom_navigation_bar.dart b/lib/components/bottom_navigation_bar.dart
@@ -84,7 +84,9 @@ class BottomNavigationState extends State<BottomNavigation> with TickerProviderS
                   child: TextButton(
                     onPressed: () => navigateForth(),
                     child: Text(
-                      selectedIndex != widget.pageCount - 1 ? AppLocalizations.of(context)!.next : AppLocalizations.of(context)!.connect_now,
+                      selectedIndex != widget.pageCount - 1
+                          ? AppLocalizations.of(context)!.next
+                          : AppLocalizations.of(context)!.connect_now,
                       style: const TextStyle(color: Colors.grey),
                     ),
                   ),

diff --git a/lib/components/language_switcher.dart b/lib/components/language_switcher.dart
@@ -35,7 +35,7 @@ class _LanguageSwitcherState extends State<LanguageSwitcher> {
                   const SizedBox(width: 20),
                   Text(
                     locale.toUpperCase(),
-                    style: TextStyle(color: primaryColor, fontSize: 16),
+                    style: TextStyle(color: HumhubTheme.primaryColor, fontSize: 16),
                   ),
                 ],
               ),
@@ -56,7 +56,7 @@ class _LanguageSwitcherState extends State<LanguageSwitcher> {
               focusedBorder: InputBorder.none,
             ),
       value: _value(context),
-      icon: Icon(Icons.arrow_drop_down, color: primaryColor),
+      icon: Icon(Icons.arrow_drop_down, color: HumhubTheme.primaryColor),
       items: _items
           .mapIndexed(
             (localeString, index) => DropdownMenuItem(
@@ -67,7 +67,7 @@ class _LanguageSwitcherState extends State<LanguageSwitcher> {
                   const SizedBox(width: 20),
                   Text(
                     localeString.toUpperCase(),
-                    style: TextStyle(color: primaryColor, fontSize: 16),
+                    style: TextStyle(color: HumhubTheme.primaryColor, fontSize: 16),
                   ),
                 ],
               ),

diff --git a/lib/components/rotating_globe.dart b/lib/components/rotating_globe.dart
@@ -29,7 +29,7 @@ class _RotatingGlobeState extends State<RotatingGlobe> with TickerProviderStateM
 
   @override
   Widget build(BuildContext context) {
-    if(_controller.isCompleted){
+    if (_controller.isCompleted) {
       _animation = widget.rotationDirection == Direction.left ? _animationSec : _animationFir;
       _controller.reset();
     }

diff --git a/lib/models/channel_message.g.dart b/lib/models/channel_message.g.dart
@@ -1,30 +1,24 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
-part of 'channel_message.dart';
-
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
-ChannelMessage _$ChannelMessageFromJson(String json) {
-  if (json == "humhub.mobile.hideOpener") {
-    return ChannelMessage(
-      "hideOpener",
-      null,
-      null,
-    );
-  } else if (json == "humhub.mobile.showOpener") {
-    return ChannelMessage(
-      "showOpener",
-      null,
-      null,
-    );
-  } else {
-    var jsonMap = jsonDecode(json) as Map<String, dynamic>;
-    return ChannelMessage(
-      jsonMap['type'] as String,
-      jsonMap['url'] as String?,
-      jsonMap['count'] as int?,
-    );
-  }
-}
+part of 'channel_message.dart';
+
+ChannelMessage _$ChannelMessageFromJson(String json) {
+  if (json == "humhub.mobile.hideOpener") {
+    return ChannelMessage(
+      "hideOpener",
+      null,
+      null,
+    );
+  } else if (json == "humhub.mobile.showOpener") {
+    return ChannelMessage(
+      "showOpener",
+      null,
+      null,
+    );
+  } else {
+    var jsonMap = jsonDecode(json) as Map<String, dynamic>;
+    return ChannelMessage(
+      jsonMap['type'] as String,
+      jsonMap['url'] as String?,
+      jsonMap['count'] as int?,
+    );
+  }
+}
diff --git a/lib/models/event.dart b/lib/models/event.dart
@@ -7,20 +7,20 @@ class PushEvent extends RemoteMessage {
   PushEvent(RemoteMessage message)
       : parsedData = PushEventData.fromJson(message.data),
         super(
-        senderId: message.senderId,
-        category: message.category,
-        collapseKey: message.collapseKey,
-        contentAvailable: message.contentAvailable,
-        data: message.data,
-        from: message.from,
-        messageId: message.messageId,
-        messageType: message.messageType,
-        mutableContent: message.mutableContent,
-        notification: message.notification,
-        sentTime: message.sentTime,
-        threadId: message.threadId,
-        ttl: message.ttl,
-      );
+          senderId: message.senderId,
+          category: message.category,
+          collapseKey: message.collapseKey,
+          contentAvailable: message.contentAvailable,
+          data: message.data,
+          from: message.from,
+          messageId: message.messageId,
+          messageType: message.messageType,
+          mutableContent: message.mutableContent,
+          notification: message.notification,
+          sentTime: message.sentTime,
+          threadId: message.threadId,
+          ttl: message.ttl,
+        );
 }
 
 class PushEventData {
@@ -32,13 +32,13 @@ class PushEventData {
   final String? notificationCount;
 
   PushEventData(
-      this.notificationTitle,
-      this.notificationBody,
-      this.channel,
-      this.channelPayload,
-      this.redirectUrl,
-      this.notificationCount,
-      );
+    this.notificationTitle,
+    this.notificationBody,
+    this.channel,
+    this.channelPayload,
+    this.redirectUrl,
+    this.notificationCount,
+  );
 
   factory PushEventData.fromJson(Map<String, dynamic> json) => _$PushEventDataFromJson(json);
 }

diff --git a/lib/models/event.g.dart b/lib/models/event.g.dart
@@ -1,14 +1,13 @@
-// GENERATED CODE - DO NOT MODIFY BY HAND
-
 part of 'event.dart';
 
-// **************************************************************************
-// JsonSerializableGenerator
-// **************************************************************************
-
 PushEventData _$PushEventDataFromJson(Map<String, dynamic> json) {
-  return PushEventData(json['notification_title'] as String?, json['notification_body'] as String?, json['channel'] as String?,
-      json['channel_payload'] as String?, json['url'] as String?, json['notification_count'] as String?);
+  return PushEventData(
+      json['notification_title'] as String?,
+      json['notification_body'] as String?,
+      json['channel'] as String?,
+      json['channel_payload'] as String?,
+      json['url'] as String?,
+      json['notification_count'] as String?);
 }
 
 SimpleNotification _$SimpleNotificationFromJson(Map<String, dynamic> json) {

diff --git a/lib/models/hum_hub.dart b/lib/models/hum_hub.dart
@@ -1,6 +1,6 @@
 import 'dart:math';
 import 'package:humhub/models/manifest.dart';
-import 'package:humhub/util/universal_opener_controller.dart';
+import 'package:humhub/util/openers/universal_opener_controller.dart';
 
 enum RedirectAction { opener, webView }
 

diff --git a/lib/pages/help/components/first_page.dart b/lib/pages/help/components/first_page.dart
@@ -3,10 +3,12 @@ import 'package:humhub/components/rotating_globe.dart';
 import 'package:humhub/util/const.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
-
 class FirstPage extends StatelessWidget {
   final bool fadeIn;
-  const FirstPage({Key? key, required this.fadeIn,}) : super(key: key);
+  const FirstPage({
+    Key? key,
+    required this.fadeIn,
+  }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -22,20 +24,20 @@ class FirstPage extends StatelessWidget {
               alignment: Alignment.centerLeft,
               child: Text(
                 AppLocalizations.of(context)!.help_title,
-                style: getHeaderStyle(context),
+                style: HumhubTheme.getHeaderStyle(context),
               ),
             ),
           ),
           Padding(
             padding: const EdgeInsets.symmetric(vertical: 10),
             child: Text(
               AppLocalizations.of(context)!.help_first_par,
-              style: paragraphStyle,
+              style: HumhubTheme.paragraphStyle,
             ),
           ),
           Padding(
             padding: const EdgeInsets.symmetric(vertical: 10),
-            child: Text(AppLocalizations.of(context)!.help_second_par, style: paragraphStyle),
+            child: Text(AppLocalizations.of(context)!.help_second_par, style: HumhubTheme.paragraphStyle),
           ),
           Center(
             child: RotatingGlobe(

diff --git a/lib/pages/help/components/second_page.dart b/lib/pages/help/components/second_page.dart
@@ -21,13 +21,13 @@ class SecondPage extends StatelessWidget {
               alignment: Alignment.centerLeft,
               child: Text(
                 AppLocalizations.of(context)!.how_to_connect_title,
-                style: getHeaderStyle(context),
+                style: HumhubTheme.getHeaderStyle(context),
               ),
             ),
           ),
           Padding(
             padding: const EdgeInsets.symmetric(vertical: 10),
-            child: Text(AppLocalizations.of(context)!.how_to_connect_first_par, style: paragraphStyle),
+            child: Text(AppLocalizations.of(context)!.how_to_connect_first_par, style: HumhubTheme.paragraphStyle),
           ),
           EaseOutContainer(
             fadeIn: fadeIn,
@@ -79,7 +79,7 @@ class SecondPage extends StatelessWidget {
           ),
           Padding(
             padding: const EdgeInsets.symmetric(vertical: 10),
-            child: Text(AppLocalizations.of(context)!.how_to_connect_sec_par, style: paragraphStyle),
+            child: Text(AppLocalizations.of(context)!.how_to_connect_sec_par, style: HumhubTheme.paragraphStyle),
           ),
           EaseOutContainer(
             fadeIn: fadeIn,
@@ -94,7 +94,7 @@ class SecondPage extends StatelessWidget {
                     style: ButtonStyle(
                       backgroundColor: MaterialStateProperty.resolveWith<Color>(
                         (Set<MaterialState> states) {
-                          return primaryColor;
+                          return HumhubTheme.primaryColor;
                         },
                       ),
                     ),
@@ -114,7 +114,7 @@ class SecondPage extends StatelessWidget {
           ),
           Padding(
             padding: const EdgeInsets.symmetric(vertical: 20),
-            child: Text(AppLocalizations.of(context)!.how_to_connect_third_par, style: paragraphStyle),
+            child: Text(AppLocalizations.of(context)!.how_to_connect_third_par, style: HumhubTheme.paragraphStyle),
           )
         ],
       ),

diff --git a/lib/pages/help/components/third_page.dart b/lib/pages/help/components/third_page.dart
@@ -22,21 +22,21 @@ class ThirdPage extends StatelessWidget {
               alignment: Alignment.centerLeft,
               child: Text(
                 AppLocalizations.of(context)!.more_info_title,
-                style: getHeaderStyle(context),
+                style: HumhubTheme.getHeaderStyle(context),
               ),
             ),
           ),
           Padding(
             padding: const EdgeInsets.symmetric(vertical: 10),
-            child: Text(AppLocalizations.of(context)!.more_info_first_par, style: paragraphStyle),
+            child: Text(AppLocalizations.of(context)!.more_info_first_par, style: HumhubTheme.paragraphStyle),
           ),
           Padding(
             padding: const EdgeInsets.symmetric(vertical: 10),
-            child: Text(AppLocalizations.of(context)!.more_info_second_par, style: paragraphStyle),
+            child: Text(AppLocalizations.of(context)!.more_info_second_par, style: HumhubTheme.paragraphStyle),
           ),
           Padding(
             padding: const EdgeInsets.symmetric(vertical: 10),
-            child: Text(AppLocalizations.of(context)!.more_info_third_par, style: paragraphStyle),
+            child: Text(AppLocalizations.of(context)!.more_info_third_par, style: HumhubTheme.paragraphStyle),
           ),
           const SizedBox(
             height: 40,
@@ -54,12 +54,13 @@ class ThirdPage extends StatelessWidget {
                     style: ButtonStyle(
                       backgroundColor: MaterialStateProperty.resolveWith<Color>(
                         (Set<MaterialState> states) {
-                          return primaryColor;
+                          return HumhubTheme.primaryColor;
                         },
                       ),
                     ),
                     onPressed: () {
-                      launchUrl(Uri.parse(AppLocalizations.of(context)!.more_info_pro_edition_url), mode: LaunchMode.platformDefault);
+                      launchUrl(Uri.parse(AppLocalizations.of(context)!.more_info_pro_edition_url),
+                          mode: LaunchMode.platformDefault);
                     },
                     child: Center(
                       child: Text(

diff --git a/lib/pages/opener.dart b/lib/pages/opener.dart
@@ -8,7 +8,7 @@ import 'package:humhub/util/const.dart';
 import 'package:humhub/util/form_helper.dart';
 import 'package:humhub/util/intent/intent_plugin.dart';
 import 'package:humhub/util/notifications/channel.dart';
-import 'package:humhub/util/opener_controller.dart';
+import 'package:humhub/util/openers/opener_controller.dart';
 import 'package:humhub/util/providers.dart';
 import 'package:rive/rive.dart';
 import 'help/help_android.dart';
@@ -171,7 +171,7 @@ class OpenerState extends ConsumerState<Opener> with SingleTickerProviderStateMi
                               onPressed: _connectInstance,
                               child: Text(
                                 AppLocalizations.of(context)!.connect,
-                                style: TextStyle(color: primaryColor, fontSize: 20),
+                                style: TextStyle(color: HumhubTheme.primaryColor, fontSize: 20),
                               ),
                             ),
                           ),

diff --git a/lib/pages/web_view.dart b/lib/pages/web_view.dart
@@ -16,7 +16,8 @@ import 'package:humhub/util/connectivity_plugin.dart';
 import 'package:humhub/util/extensions.dart';
 import 'package:humhub/util/notifications/channel.dart';
 import 'package:humhub/util/providers.dart';
-import 'package:humhub/util/universal_opener_controller.dart';
+import 'package:humhub/util/openers/universal_opener_controller.dart';
+import 'package:humhub/util/push/provider.dart';
 import 'package:humhub/util/router.dart';
 import 'package:loggy/loggy.dart';
 import 'package:permission_handler/permission_handler.dart';

diff --git a/lib/util/connectivity_plugin.dart b/lib/util/connectivity_plugin.dart
@@ -15,11 +15,11 @@ class NoConnectionDialog extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return AlertDialog(
-      title:  Text(AppLocalizations.of(context)!.connectivity_popup_title),
-      content:  Text(AppLocalizations.of(context)!.connectivity_popup_content),
+      title: Text(AppLocalizations.of(context)!.connectivity_popup_title),
+      content: Text(AppLocalizations.of(context)!.connectivity_popup_content),
       actions: [
         TextButton(
-          child:  Text(AppLocalizations.of(context)!.ok.toUpperCase()),
+          child: Text(AppLocalizations.of(context)!.ok.toUpperCase()),
           onPressed: () {
             Navigator.of(context).pop(); // Close the dialog
           },
@@ -32,7 +32,9 @@ class NoConnectionDialog extends StatelessWidget {
     showDialog(
       context: context,
       builder: (BuildContext context) {
-        return const NoConnectionDialog();
+        return NoConnectionDialog(
+          key: context.widget.key,
+        );
       },
     );
   }