diff --git a/filcnaplo/assets/launch_icons/refilc_default.png b/filcnaplo/assets/launch_icons/refilc_default.png new file mode 100644 index 0000000..ab54f58 Binary files /dev/null and b/filcnaplo/assets/launch_icons/refilc_default.png differ diff --git a/filcnaplo/pubspec.yaml b/filcnaplo/pubspec.yaml index 2ccd85e..86880ae 100644 --- a/filcnaplo/pubspec.yaml +++ b/filcnaplo/pubspec.yaml @@ -87,6 +87,7 @@ flutter: - assets/animations/ - assets/images/ - assets/images/subject_covers/ + - assets/launch_icons/ fonts: - family: FilcIcons diff --git a/filcnaplo_desktop_ui/lib/common/filter_bar.dart b/filcnaplo_desktop_ui/lib/common/filter_bar.dart index 12dbf84..ef52e1e 100644 --- a/filcnaplo_desktop_ui/lib/common/filter_bar.dart +++ b/filcnaplo_desktop_ui/lib/common/filter_bar.dart @@ -61,19 +61,26 @@ class FilterBar extends StatelessWidget implements PreferredSizeWidget { // avoid fading over selected tab return ShaderMask( shaderCallback: (Rect bounds) { - final Color bg = Theme.of(context).scaffoldBackgroundColor; + final Color bg = + Theme.of(context).scaffoldBackgroundColor; final double index = controller.animation!.value; - return LinearGradient(begin: Alignment.topLeft, end: Alignment.bottomRight, colors: [ - index < 0.2 ? Colors.transparent : bg, - Colors.transparent, - Colors.transparent, - index > controller.length - 1.2 ? Colors.transparent : bg - ], stops: const [ - 0, - 0.1, - 0.9, - 1 - ]).createShader(bounds); + return LinearGradient( + begin: Alignment.topLeft, + end: Alignment.bottomRight, + colors: [ + index < 0.2 ? Colors.transparent : bg, + Colors.transparent, + Colors.transparent, + index > controller.length - 1.2 + ? Colors.transparent + : bg + ], + stops: const [ + 0, + 0.1, + 0.9, + 1 + ]).createShader(bounds); }, blendMode: BlendMode.dstOut, child: child); diff --git a/filcnaplo_mobile_ui/lib/screens/settings/settings_screen.dart b/filcnaplo_mobile_ui/lib/screens/settings/settings_screen.dart index cd00f02..963f781 100755 --- a/filcnaplo_mobile_ui/lib/screens/settings/settings_screen.dart +++ b/filcnaplo_mobile_ui/lib/screens/settings/settings_screen.dart @@ -20,7 +20,6 @@ import 'package:filcnaplo_mobile_ui/common/bottom_sheet_menu/bottom_sheet_menu_i import 'package:filcnaplo_mobile_ui/common/panel/panel.dart'; import 'package:filcnaplo_mobile_ui/common/panel/panel_button.dart'; import 'package:filcnaplo_mobile_ui/common/profile_image/profile_image.dart'; -import 'package:filcnaplo_mobile_ui/common/soon_alert/soon_alert.dart'; import 'package:filcnaplo_mobile_ui/common/system_chrome.dart'; import 'package:filcnaplo_mobile_ui/common/widgets/update/updates_view.dart'; import 'package:filcnaplo_mobile_ui/screens/news/news_screen.dart'; @@ -31,6 +30,7 @@ import 'package:filcnaplo_mobile_ui/screens/settings/modify_subject_names.dart'; import 'package:filcnaplo_mobile_ui/screens/settings/notifications_screen.dart'; import 'package:filcnaplo_mobile_ui/screens/settings/privacy_view.dart'; import 'package:filcnaplo_mobile_ui/screens/settings/settings_helper.dart'; +import 'package:filcnaplo_premium/ui/mobile/settings/app_icon_screen.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; @@ -843,17 +843,20 @@ class _SettingsScreenState extends State MenuRenamedTeachers( settings: settings, ), - PanelButton( - onPressed: () { - SoonAlert.show(context: context); - }, - title: Text('app_icon'.i18n), - leading: const Icon(FeatherIcons.edit), - // trailing: Text( - // 'default'.i18n, - // style: const TextStyle(fontSize: 14.0), - // ), + PremiumCustomAppIconMenu( + settings: settings, ), + // PanelButton( + // onPressed: () { + // SoonAlert.show(context: context); + // }, + // title: Text('app_icon'.i18n), + // leading: const Icon(FeatherIcons.edit), + // // trailing: Text( + // // 'default'.i18n, + // // style: const TextStyle(fontSize: 14.0), + // // ), + // ), ], ), ), diff --git a/filcnaplo_premium b/filcnaplo_premium index b7d15b7..6abcf9a 160000 --- a/filcnaplo_premium +++ b/filcnaplo_premium @@ -1 +1 @@ -Subproject commit b7d15b7e5ff31da4455f11108920ec054b67f26e +Subproject commit 6abcf9a4f39985ae7447677d50e81c68a622fa7c