diff --git a/lib/Extensions/string_extensions.dart b/lib/extensions/string_extensions.dart similarity index 83% rename from lib/Extensions/string_extensions.dart rename to lib/extensions/string_extensions.dart index 432d8ab..24a7982 100644 --- a/lib/Extensions/string_extensions.dart +++ b/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 b/lib/extensions/url_extensions.dart similarity index 83% rename from lib/Extensions/url_extensions.dart rename to lib/extensions/url_extensions.dart index 8890811..228bd13 100644 --- a/lib/Extensions/url_extensions.dart +++ b/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 b/lib/fonts/NotoColorEmoji-Regular.ttf similarity index 100% rename from lib/Fonts/NotoColorEmoji-Regular.ttf rename to lib/fonts/NotoColorEmoji-Regular.ttf diff --git a/lib/Fonts/Righteous-Regular.ttf b/lib/fonts/Righteous-Regular.ttf similarity index 100% rename from lib/Fonts/Righteous-Regular.ttf rename to lib/fonts/Righteous-Regular.ttf diff --git a/lib/Fonts/Roboto/LICENSE.txt b/lib/fonts/Roboto/LICENSE.txt similarity index 100% rename from lib/Fonts/Roboto/LICENSE.txt rename to lib/fonts/Roboto/LICENSE.txt diff --git a/lib/Fonts/Roboto/Roboto-Black.ttf b/lib/fonts/Roboto/Roboto-Black.ttf similarity index 100% rename from lib/Fonts/Roboto/Roboto-Black.ttf rename to lib/fonts/Roboto/Roboto-Black.ttf diff --git a/lib/Fonts/Roboto/Roboto-BlackItalic.ttf b/lib/fonts/Roboto/Roboto-BlackItalic.ttf similarity index 100% rename from lib/Fonts/Roboto/Roboto-BlackItalic.ttf rename to lib/fonts/Roboto/Roboto-BlackItalic.ttf diff --git a/lib/Fonts/Roboto/Roboto-Bold.ttf b/lib/fonts/Roboto/Roboto-Bold.ttf similarity index 100% rename from lib/Fonts/Roboto/Roboto-Bold.ttf rename to lib/fonts/Roboto/Roboto-Bold.ttf diff --git a/lib/Fonts/Roboto/Roboto-BoldItalic.ttf b/lib/fonts/Roboto/Roboto-BoldItalic.ttf similarity index 100% rename from lib/Fonts/Roboto/Roboto-BoldItalic.ttf rename to lib/fonts/Roboto/Roboto-BoldItalic.ttf diff --git a/lib/Fonts/Roboto/Roboto-Italic.ttf b/lib/fonts/Roboto/Roboto-Italic.ttf similarity index 100% rename from lib/Fonts/Roboto/Roboto-Italic.ttf rename to lib/fonts/Roboto/Roboto-Italic.ttf diff --git a/lib/Fonts/Roboto/Roboto-Light.ttf b/lib/fonts/Roboto/Roboto-Light.ttf similarity index 100% rename from lib/Fonts/Roboto/Roboto-Light.ttf rename to lib/fonts/Roboto/Roboto-Light.ttf diff --git a/lib/Fonts/Roboto/Roboto-LightItalic.ttf b/lib/fonts/Roboto/Roboto-LightItalic.ttf similarity index 100% rename from lib/Fonts/Roboto/Roboto-LightItalic.ttf rename to lib/fonts/Roboto/Roboto-LightItalic.ttf diff --git a/lib/Fonts/Roboto/Roboto-Medium.ttf b/lib/fonts/Roboto/Roboto-Medium.ttf similarity index 100% rename from lib/Fonts/Roboto/Roboto-Medium.ttf rename to lib/fonts/Roboto/Roboto-Medium.ttf diff --git a/lib/Fonts/Roboto/Roboto-MediumItalic.ttf b/lib/fonts/Roboto/Roboto-MediumItalic.ttf similarity index 100% rename from lib/Fonts/Roboto/Roboto-MediumItalic.ttf rename to lib/fonts/Roboto/Roboto-MediumItalic.ttf diff --git a/lib/Fonts/Roboto/Roboto-Regular.ttf b/lib/fonts/Roboto/Roboto-Regular.ttf similarity index 100% rename from lib/Fonts/Roboto/Roboto-Regular.ttf rename to lib/fonts/Roboto/Roboto-Regular.ttf diff --git a/lib/Fonts/Roboto/Roboto-Thin.ttf b/lib/fonts/Roboto/Roboto-Thin.ttf similarity index 100% rename from lib/Fonts/Roboto/Roboto-Thin.ttf rename to lib/fonts/Roboto/Roboto-Thin.ttf diff --git a/lib/Fonts/Roboto/Roboto-ThinItalic.ttf b/lib/fonts/Roboto/Roboto-ThinItalic.ttf similarity index 100% rename from lib/Fonts/Roboto/Roboto-ThinItalic.ttf rename to lib/fonts/Roboto/Roboto-ThinItalic.ttf diff --git a/lib/Globals/app_globals.dart b/lib/globals/app_globals.dart similarity index 83% rename from lib/Globals/app_globals.dart rename to lib/globals/app_globals.dart index 3d05d07..c3a2144 100644 --- a/lib/Globals/app_globals.dart +++ b/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 b/lib/globals/auth.dart similarity index 84% rename from lib/Globals/auth.dart rename to lib/globals/auth.dart index 324e93e..7fc1f64 100644 --- a/lib/Globals/auth.dart +++ b/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 b/lib/globals/general.dart similarity index 94% rename from lib/Globals/general.dart rename to lib/globals/general.dart index b034e6b..1653bb5 100644 --- a/lib/Globals/general.dart +++ b/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 b/lib/globals/preferences.dart similarity index 100% rename from lib/Globals/preferences.dart rename to lib/globals/preferences.dart diff --git a/lib/material_app.dart b/lib/material_app.dart index 3262217..c33b0e2 100644 --- 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 index e2d6149..faece79 100644 --- 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 b/lib/widgets/auth/apis/application_registration.dart similarity index 91% rename from lib/SuSi/APIs/application_registration.dart rename to lib/widgets/auth/apis/application_registration.dart index be4bb35..9bc0139 100644 --- a/lib/SuSi/APIs/application_registration.dart +++ b/lib/widgets/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 b/lib/widgets/auth/apis/login_manager.dart similarity index 94% rename from lib/SuSi/APIs/login_manager.dart rename to lib/widgets/auth/apis/login_manager.dart index 4552b96..65b3434 100644 --- a/lib/SuSi/APIs/login_manager.dart +++ b/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 b/lib/widgets/auth/oauth_handler/custom_web_base.dart similarity index 88% rename from lib/SuSi/OAuthHandler/custom_web_base.dart rename to lib/widgets/auth/oauth_handler/custom_web_base.dart index 2639dc5..f2ffb36 100644 --- a/lib/SuSi/OAuthHandler/custom_web_base.dart +++ b/lib/widgets/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/lib/SuSi/OAuthHandler/custom_web_base_dummy.dart b/lib/widgets/auth/oauth_handler/custom_web_base_dummy.dart similarity index 100% rename from lib/SuSi/OAuthHandler/custom_web_base_dummy.dart rename to lib/widgets/auth/oauth_handler/custom_web_base_dummy.dart diff --git a/lib/SuSi/susi_view.dart b/lib/widgets/auth/susi_view.dart similarity index 94% rename from lib/SuSi/susi_view.dart rename to lib/widgets/auth/susi_view.dart index 488c36c..cec0a6c 100644 --- a/lib/SuSi/susi_view.dart +++ b/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 index 7b8abd3..d0b71b0 100644 --- 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 index a60470b..b24809d 100644 --- a/lib/widgets/posts/components/user_header.dart +++ b/lib/widgets/posts/components/user_header.dart @@ -1,6 +1,6 @@ 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; @@ -8,14 +8,12 @@ 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 index 0faad43..651daef 100644 --- 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 index a7f222a..e59c72b 100644 --- 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 index e64019f..fb8c0b8 100644 --- 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: