🔀 Merge pull request #33 from Fedodo/dev

Dev
Fedodo · Jul 5, 2023 · 5c6507b · 5c6507b
2 parents 7f2841f + ef21b4b
commit 5c6507b
Show file tree

Hide file tree

Showing 33 changed files with 24 additions and 28 deletions.
diff --git a/lib/Extensions/string_extensions.dart → lib/extensions/string_extensions.dart b/lib/Extensions/string_extensions.dart → lib/extensions/string_extensions.dart
@@ -1,4 +1,4 @@
-import '../Globals/preferences.dart';
+import '../globals/preferences.dart';
 
 extension StringExtensions on String{
   String asFedodoProxyString() {

diff --git a/lib/Extensions/url_extensions.dart → lib/extensions/url_extensions.dart b/lib/Extensions/url_extensions.dart → lib/extensions/url_extensions.dart
@@ -1,4 +1,4 @@
-import '../Globals/preferences.dart';
+import '../globals/preferences.dart';
 
 extension UriExtensions on Uri{
   Uri asFedodoProxyUri() {

diff --git a/lib/Fonts/NotoColorEmoji-Regular.ttf → lib/fonts/NotoColorEmoji-Regular.ttf b/lib/Fonts/NotoColorEmoji-Regular.ttf → lib/fonts/NotoColorEmoji-Regular.ttf
diff --git a/lib/Fonts/Righteous-Regular.ttf → lib/fonts/Righteous-Regular.ttf b/lib/Fonts/Righteous-Regular.ttf → lib/fonts/Righteous-Regular.ttf
diff --git a/lib/Fonts/Roboto/LICENSE.txt → lib/fonts/Roboto/LICENSE.txt b/lib/Fonts/Roboto/LICENSE.txt → lib/fonts/Roboto/LICENSE.txt
diff --git a/lib/Fonts/Roboto/Roboto-Black.ttf → lib/fonts/Roboto/Roboto-Black.ttf b/lib/Fonts/Roboto/Roboto-Black.ttf → lib/fonts/Roboto/Roboto-Black.ttf
diff --git a/lib/Fonts/Roboto/Roboto-BlackItalic.ttf → lib/fonts/Roboto/Roboto-BlackItalic.ttf b/lib/Fonts/Roboto/Roboto-BlackItalic.ttf → lib/fonts/Roboto/Roboto-BlackItalic.ttf
diff --git a/lib/Fonts/Roboto/Roboto-Bold.ttf → lib/fonts/Roboto/Roboto-Bold.ttf b/lib/Fonts/Roboto/Roboto-Bold.ttf → lib/fonts/Roboto/Roboto-Bold.ttf
diff --git a/lib/Fonts/Roboto/Roboto-BoldItalic.ttf → lib/fonts/Roboto/Roboto-BoldItalic.ttf b/lib/Fonts/Roboto/Roboto-BoldItalic.ttf → lib/fonts/Roboto/Roboto-BoldItalic.ttf
diff --git a/lib/Fonts/Roboto/Roboto-Italic.ttf → lib/fonts/Roboto/Roboto-Italic.ttf b/lib/Fonts/Roboto/Roboto-Italic.ttf → lib/fonts/Roboto/Roboto-Italic.ttf
diff --git a/lib/Fonts/Roboto/Roboto-Light.ttf → lib/fonts/Roboto/Roboto-Light.ttf b/lib/Fonts/Roboto/Roboto-Light.ttf → lib/fonts/Roboto/Roboto-Light.ttf
diff --git a/lib/Fonts/Roboto/Roboto-LightItalic.ttf → lib/fonts/Roboto/Roboto-LightItalic.ttf b/lib/Fonts/Roboto/Roboto-LightItalic.ttf → lib/fonts/Roboto/Roboto-LightItalic.ttf
diff --git a/lib/Fonts/Roboto/Roboto-Medium.ttf → lib/fonts/Roboto/Roboto-Medium.ttf b/lib/Fonts/Roboto/Roboto-Medium.ttf → lib/fonts/Roboto/Roboto-Medium.ttf
diff --git a/lib/Fonts/Roboto/Roboto-MediumItalic.ttf → lib/fonts/Roboto/Roboto-MediumItalic.ttf b/lib/Fonts/Roboto/Roboto-MediumItalic.ttf → lib/fonts/Roboto/Roboto-MediumItalic.ttf
diff --git a/lib/Fonts/Roboto/Roboto-Regular.ttf → lib/fonts/Roboto/Roboto-Regular.ttf b/lib/Fonts/Roboto/Roboto-Regular.ttf → lib/fonts/Roboto/Roboto-Regular.ttf
diff --git a/lib/Fonts/Roboto/Roboto-Thin.ttf → lib/fonts/Roboto/Roboto-Thin.ttf b/lib/Fonts/Roboto/Roboto-Thin.ttf → lib/fonts/Roboto/Roboto-Thin.ttf
diff --git a/lib/Fonts/Roboto/Roboto-ThinItalic.ttf → lib/fonts/Roboto/Roboto-ThinItalic.ttf b/lib/Fonts/Roboto/Roboto-ThinItalic.ttf → lib/fonts/Roboto/Roboto-ThinItalic.ttf
diff --git a/lib/Globals/app_globals.dart → lib/globals/app_globals.dart b/lib/Globals/app_globals.dart → lib/globals/app_globals.dart
@@ -1,5 +1,5 @@
-import 'package:fedodo_general/Globals/general.dart';
-import 'package:fedodo_general/Globals/preferences.dart';
+import 'package:fedodo_general/globals/general.dart';
+import 'package:fedodo_general/globals/preferences.dart';
 import 'package:fedodo_general/fedodo_main.dart';
 import 'package:flutter/material.dart';
 import 'package:shared_preferences/shared_preferences.dart';

diff --git a/lib/Globals/auth.dart → lib/globals/auth.dart b/lib/Globals/auth.dart → lib/globals/auth.dart
@@ -1,4 +1,4 @@
-import 'package:fedodo_general/Globals/preferences.dart';
+import 'package:fedodo_general/globals/preferences.dart';
 import 'package:flutter/foundation.dart';
 
 class AuthGlobals {

diff --git a/lib/Globals/general.dart → lib/globals/general.dart b/lib/Globals/general.dart → lib/globals/general.dart
@@ -1,4 +1,4 @@
-import 'package:fedodo_general/Globals/preferences.dart';
+import 'package:fedodo_general/globals/preferences.dart';
 import 'package:jwt_decoder/jwt_decoder.dart';
 import 'package:logger/logger.dart';
 

diff --git a/lib/Globals/preferences.dart → lib/globals/preferences.dart b/lib/Globals/preferences.dart → lib/globals/preferences.dart
diff --git a/lib/material_app.dart b/lib/material_app.dart
@@ -1,6 +1,6 @@
-import 'package:fedodo_general/Globals/auth.dart';
-import 'package:fedodo_general/Globals/preferences.dart';
-import 'package:fedodo_general/SuSi/susi_view.dart';
+import 'package:fedodo_general/globals/auth.dart';
+import 'package:fedodo_general/globals/preferences.dart';
+import 'package:fedodo_general/widgets/auth/susi_view.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 

diff --git a/lib/navigation.dart b/lib/navigation.dart
@@ -1,5 +1,5 @@
 import 'package:easy_sidemenu/easy_sidemenu.dart';
-import 'package:fedodo_general/Globals/general.dart';
+import 'package:fedodo_general/globals/general.dart';
 import 'package:flutter/material.dart';
 
 class Navigation extends StatefulWidget {

diff --git a/lib/SuSi/APIs/application_registration.dart → ...s/auth/apis/application_registration.dart b/lib/SuSi/APIs/application_registration.dart → ...s/auth/apis/application_registration.dart
@@ -1,7 +1,7 @@
 import 'dart:convert';
 import 'dart:io';
-import 'package:fedodo_general/Globals/auth.dart';
-import 'package:fedodo_general/Globals/preferences.dart';
+import 'package:fedodo_general/globals/auth.dart';
+import 'package:fedodo_general/globals/preferences.dart';
 import 'package:flutter_guid/flutter_guid.dart';
 import 'package:http/http.dart' as http;
 import 'package:flutter/foundation.dart' show kIsWeb;

diff --git a/lib/SuSi/APIs/login_manager.dart → lib/widgets/auth/apis/login_manager.dart b/lib/SuSi/APIs/login_manager.dart → lib/widgets/auth/apis/login_manager.dart
@@ -1,12 +1,12 @@
-import 'package:fedodo_general/Globals/preferences.dart';
-import 'package:fedodo_general/SuSi/OAuthHandler/custom_web_base_dummy.dart'
+import 'package:fedodo_general/globals/preferences.dart';
+import 'package:fedodo_general/widgets/auth/oauth_handler/custom_web_base_dummy.dart'
     if (dart.library.html) '../OAuthHandler/custom_web_base.dart';
 import 'package:flutter/foundation.dart';
 import 'package:oauth2_client/access_token_response.dart';
 import 'package:oauth2_client/interfaces.dart';
 import 'package:oauth2_client/oauth2_client.dart';
 import 'package:random_string/random_string.dart';
-import '../../Globals/auth.dart';
+import '../../../globals/auth.dart';
 
 class LoginManager {
   late OAuth2Client client;

diff --git a/lib/SuSi/OAuthHandler/custom_web_base.dart → ...s/auth/oauth_handler/custom_web_base.dart b/lib/SuSi/OAuthHandler/custom_web_base.dart → ...s/auth/oauth_handler/custom_web_base.dart
@@ -1,5 +1,5 @@
-import 'package:fedodo_general/Globals/auth.dart';
-import 'package:fedodo_general/Globals/preferences.dart';
+import 'package:fedodo_general/globals/auth.dart';
+import 'package:fedodo_general/globals/preferences.dart';
 import 'package:oauth2_client/interfaces.dart';
 // ignore: avoid_web_libraries_in_flutter
 import 'dart:html' as html;

diff --git a/...i/OAuthHandler/custom_web_base_dummy.dart → .../oauth_handler/custom_web_base_dummy.dart b/...i/OAuthHandler/custom_web_base_dummy.dart → .../oauth_handler/custom_web_base_dummy.dart
diff --git a/lib/SuSi/susi_view.dart → lib/widgets/auth/susi_view.dart b/lib/SuSi/susi_view.dart → lib/widgets/auth/susi_view.dart
@@ -1,8 +1,8 @@
 import 'dart:io';
-import 'package:fedodo_general/Globals/preferences.dart';
-import 'package:fedodo_general/SuSi/APIs/application_registration.dart';
+import 'package:fedodo_general/globals/preferences.dart';
+import 'package:fedodo_general/widgets/auth/apis/application_registration.dart';
 import 'package:flutter/material.dart';
-import 'APIs/login_manager.dart';
+import 'apis/login_manager.dart';
 import 'package:flutter/foundation.dart' show kIsWeb;
 
 class SuSiView extends StatelessWidget {

diff --git a/lib/widgets/posts/components/post_bottom.dart b/lib/widgets/posts/components/post_bottom.dart
@@ -10,12 +10,10 @@ class PostBottom extends StatelessWidget {
   const PostBottom({
     Key? key,
     required this.activity,
-    required this.appTitle,
     required this.createPostView,
   }) : super(key: key);
 
   final Activity activity;
-  final String appTitle;
   final Widget createPostView;
 
   @override

diff --git a/lib/widgets/posts/components/user_header.dart b/lib/widgets/posts/components/user_header.dart
@@ -1,21 +1,19 @@
 import 'package:activitypub/activitypub.dart';
 import 'package:cached_network_image/cached_network_image.dart';
-import 'package:fedodo_general/Extensions/string_extensions.dart';
+import 'package:fedodo_general/extensions/string_extensions.dart';
 import 'package:flutter/material.dart';
 import 'package:timeago/timeago.dart' as timeago;
 
 class UserHeader extends StatelessWidget {
   const UserHeader({
     Key? key,
     required this.profileId,
-    required this.appTitle,
     this.publishedDateTime,
     required this.profile,
   }) : super(key: key);
 
   final String profileId;
   final DateTime? publishedDateTime;
-  final String appTitle;
   final Widget profile;
 
   @override

diff --git a/lib/widgets/profile/components/profile_picture_detail.dart b/lib/widgets/profile/components/profile_picture_detail.dart
@@ -1,4 +1,4 @@
-import 'package:fedodo_general/Extensions/string_extensions.dart';
+import 'package:fedodo_general/extensions/string_extensions.dart';
 import 'package:flutter/material.dart';
 
 class ProfilePictureDetail extends StatefulWidget {

diff --git a/lib/widgets/profile/profile_head.dart b/lib/widgets/profile/profile_head.dart
@@ -3,7 +3,7 @@ import 'package:activitypub/APIs/followings_api.dart';
 import 'package:activitypub/APIs/outbox_api.dart';
 import 'package:activitypub/Models/actor.dart';
 import 'package:activitypub/Models/ordered_paged_collection.dart';
-import 'package:fedodo_general/Globals/general.dart';
+import 'package:fedodo_general/globals/general.dart';
 import 'package:flutter/material.dart';
 import 'components/profile_description.dart';
 import 'components/profile_name_row.dart';

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: fedodo_general
 description: A flutter package which contains general components of the Fedodo-UIs.
-version: 1.8.0
+version: 1.8.1
 homepage: https://fedodo.org
 
 environment: