diff --git a/.gitignore b/.gitignore index 1fcdb3b..d3ffc1c 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ refilc/ios/Runner/GeneratedPluginRegistrant.h refilc/ios/Runner/GeneratedPluginRegistrant.m refilc/android/local.properties refilc/macos/Flutter/GeneratedPluginRegistrant.swift +refilc/android/debugkey.properties diff --git a/refilc/android/app/build.gradle b/refilc/android/app/build.gradle index c41b003..7bfadc3 100644 --- a/refilc/android/app/build.gradle +++ b/refilc/android/app/build.gradle @@ -29,6 +29,10 @@ def keystoreProperties = new Properties() def keystorePropertiesFile = rootProject.file("key.properties") keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) +def debugKeystoreProperties = new Properties() +def debugKeystorePropertiesFile = rootProject.file("debugkey.properties") +debugKeystoreProperties.load(new FileInputStream(debugKeystorePropertiesFile)) + android { ndkVersion "25.1.8937393" @@ -67,7 +71,7 @@ android { debug { keyAlias "androiddebugkey" keyPassword "android" - storeFile file("/home/reinerrego/debug.keystore") + storeFile file(debugKeystoreProperties['storeFile']) storePassword "android" } diff --git a/refilc/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java b/refilc/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java deleted file mode 100644 index d639f8a..0000000 --- a/refilc/android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java +++ /dev/null @@ -1,184 +0,0 @@ -package io.flutter.plugins; - -import androidx.annotation.Keep; -import androidx.annotation.NonNull; -import io.flutter.Log; - -import io.flutter.embedding.engine.FlutterEngine; - -/** - * Generated file. Do not edit. - * This file is generated by the Flutter tool based on the - * plugins that support the Android platform. - */ -@Keep -public final class GeneratedPluginRegistrant { - private static final String TAG = "GeneratedPluginRegistrant"; - public static void registerWith(@NonNull FlutterEngine flutterEngine) { - try { - flutterEngine.getPlugins().add(new com.example.android_dynamic_icon.AndroidDynamicIconPlugin()); - } catch (Exception e) { - Log.e(TAG, "Error registering plugin android_dynamic_icon, com.example.android_dynamic_icon.AndroidDynamicIconPlugin", e); - } - try { - flutterEngine.getPlugins().add(new me.wolszon.app_group_directory.AppGroupDirectoryPlugin()); - } catch (Exception e) { - Log.e(TAG, "Error registering plugin app_group_directory, me.wolszon.app_group_directory.AppGroupDirectoryPlugin", e); - } - try { - flutterEngine.getPlugins().add(new com.transistorsoft.flutter.backgroundfetch.BackgroundFetchPlugin()); - } catch (Exception e) { - Log.e(TAG, "Error registering plugin background_fetch, com.transistorsoft.flutter.backgroundfetch.BackgroundFetchPlugin", e); - } - try { - flutterEngine.getPlugins().add(new dev.fluttercommunity.plus.connectivity.ConnectivityPlugin()); - } catch (Exception e) { - Log.e(TAG, "Error registering plugin connectivity_plus, dev.fluttercommunity.plus.connectivity.ConnectivityPlugin", e); - } - try { - flutterEngine.getPlugins().add(new io.material.plugins.dynamic_color.DynamicColorPlugin()); - } catch (Exception e) { - Log.e(TAG, "Error registering plugin dynamic_color, io.material.plugins.dynamic_color.DynamicColorPlugin", e); - } - try { - flutterEngine.getPlugins().add(new com.mr.flutter.plugin.filepicker.FilePickerPlugin()); - } catch (Exception e) { - Log.e(TAG, "Error registering plugin file_picker, com.mr.flutter.plugin.filepicker.FilePickerPlugin", e); - } - try { - flutterEngine.getPlugins().add(new com.jordyhers.flutter_any_logo.FlutterAnyLogoPlugin()); - } catch (Exception e) { - Log.e(TAG, "Error registering plugin flutter_any_logo, com.jordyhers.flutter_any_logo.FlutterAnyLogoPlugin", e); - } - try { - flutterEngine.getPlugins().add(new com.github.droibit.flutter.plugins.customtabs.CustomTabsPlugin()); - } catch (Exception e) { - Log.e(TAG, "Error registering plugin flutter_custom_tabs_android, com.github.droibit.flutter.plugins.customtabs.CustomTabsPlugin", e); - } - try { - flutterEngine.getPlugins().add(new com.ajinasokan.flutterdisplaymode.DisplayModePlugin()); - } catch (Exception e) { - Log.e(TAG, "Error registering plugin flutter_displaymode, com.ajinasokan.flutterdisplaymode.DisplayModePlugin", e); - } - try { - flutterEngine.getPlugins().add(new io.github.tastelessjolt.flutterdynamicicon.FlutterDynamicIconPlugin()); - } catch (Exception e) { - Log.e(TAG, "Error registering plugin flutter_dynamic_icon, io.github.tastelessjolt.flutterdynamicicon.FlutterDynamicIconPlugin", e); - } - try { - flutterEngine.getPlugins().add(new com.fluttercandies.flutter_image_compress.ImageCompressPlugin()); - } catch (Exception e) { - Log.e(TAG, "Error registering plugin flutter_image_compress_common, com.fluttercandies.flutter_image_compress.ImageCompressPlugin", e); - } - try { - flutterEngine.getPlugins().add(new com.dexterous.flutterlocalnotifications.FlutterLocalNotificationsPlugin()); - } catch (Exception e) { - Log.e(TAG, "Error registering plugin flutter_local_notifications, com.dexterous.flutterlocalnotifications.FlutterLocalNotificationsPlugin", e); - } - try { - flutterEngine.getPlugins().add(new com.example.flutternativeimage.FlutterNativeImagePlugin()); - } catch (Exception e) { - Log.e(TAG, "Error registering plugin flutter_native_image, com.example.flutternativeimage.FlutterNativeImagePlugin", e); - } - try { - flutterEngine.getPlugins().add(new net.jonhanson.flutter_native_splash.FlutterNativeSplashPlugin()); - } catch (Exception e) { - Log.e(TAG, "Error registering plugin flutter_native_splash, net.jonhanson.flutter_native_splash.FlutterNativeSplashPlugin", e); - } - try { - flutterEngine.getPlugins().add(new io.flutter.plugins.flutter_plugin_android_lifecycle.FlutterAndroidLifecyclePlugin()); - } catch (Exception e) { - Log.e(TAG, "Error registering plugin flutter_plugin_android_lifecycle, io.flutter.plugins.flutter_plugin_android_lifecycle.FlutterAndroidLifecyclePlugin", e); - } - try { - flutterEngine.getPlugins().add(new io.flutter.plugins.googlesignin.GoogleSignInPlugin()); - } catch (Exception e) { - Log.e(TAG, "Error registering plugin google_sign_in_android, io.flutter.plugins.googlesignin.GoogleSignInPlugin", e); - } - try { - flutterEngine.getPlugins().add(new es.antonborri.home_widget.HomeWidgetPlugin()); - } catch (Exception e) { - Log.e(TAG, "Error registering plugin home_widget, es.antonborri.home_widget.HomeWidgetPlugin", e); - } - try { - flutterEngine.getPlugins().add(new com.lykhonis.imagecrop.ImageCropPlugin()); - } catch (Exception e) { - Log.e(TAG, "Error registering plugin image_crop, com.lykhonis.imagecrop.ImageCropPlugin", e); - } - try { - flutterEngine.getPlugins().add(new com.example.imagegallerysaver.ImageGallerySaverPlugin()); - } catch (Exception e) { - Log.e(TAG, "Error registering plugin image_gallery_saver, com.example.imagegallerysaver.ImageGallerySaverPlugin", e); - } - try { - flutterEngine.getPlugins().add(new io.flutter.plugins.imagepicker.ImagePickerPlugin()); - } catch (Exception e) { - Log.e(TAG, "Error registering plugin image_picker_android, io.flutter.plugins.imagepicker.ImagePickerPlugin", e); - } - try { - flutterEngine.getPlugins().add(new com.flutter_live_activities.FlutterLiveActivitiesPlugin()); - } catch (Exception e) { - Log.e(TAG, "Error registering plugin live_activities, com.flutter_live_activities.FlutterLiveActivitiesPlugin", e); - } - try { - flutterEngine.getPlugins().add(new com.example.maps_launcher.MapsLauncherPlugin()); - } catch (Exception e) { - Log.e(TAG, "Error registering plugin maps_launcher, com.example.maps_launcher.MapsLauncherPlugin", e); - } - try { - flutterEngine.getPlugins().add(new com.crazecoder.openfile.OpenFilePlugin()); - } catch (Exception e) { - Log.e(TAG, "Error registering plugin open_filex, com.crazecoder.openfile.OpenFilePlugin", e); - } - try { - flutterEngine.getPlugins().add(new dev.fluttercommunity.plus.packageinfo.PackageInfoPlugin()); - } catch (Exception e) { - Log.e(TAG, "Error registering plugin package_info_plus, dev.fluttercommunity.plus.packageinfo.PackageInfoPlugin", e); - } - try { - flutterEngine.getPlugins().add(new io.flutter.plugins.pathprovider.PathProviderPlugin()); - } catch (Exception e) { - Log.e(TAG, "Error registering plugin path_provider_android, io.flutter.plugins.pathprovider.PathProviderPlugin", e); - } - try { - flutterEngine.getPlugins().add(new com.baseflow.permissionhandler.PermissionHandlerPlugin()); - } catch (Exception e) { - Log.e(TAG, "Error registering plugin permission_handler_android, com.baseflow.permissionhandler.PermissionHandlerPlugin", e); - } - try { - flutterEngine.getPlugins().add(new io.flutter.plugins.quickactions.QuickActionsPlugin()); - } catch (Exception e) { - Log.e(TAG, "Error registering plugin quick_actions_android, io.flutter.plugins.quickactions.QuickActionsPlugin", e); - } - try { - flutterEngine.getPlugins().add(new app.rive.rive.RivePlugin()); - } catch (Exception e) { - Log.e(TAG, "Error registering plugin rive_common, app.rive.rive.RivePlugin", e); - } - try { - flutterEngine.getPlugins().add(new dev.fluttercommunity.plus.share.SharePlusPlugin()); - } catch (Exception e) { - Log.e(TAG, "Error registering plugin share_plus, dev.fluttercommunity.plus.share.SharePlusPlugin", e); - } - try { - flutterEngine.getPlugins().add(new com.tekartik.sqflite.SqflitePlugin()); - } catch (Exception e) { - Log.e(TAG, "Error registering plugin sqflite, com.tekartik.sqflite.SqflitePlugin", e); - } - try { - flutterEngine.getPlugins().add(new name.avioli.unilinks.UniLinksPlugin()); - } catch (Exception e) { - Log.e(TAG, "Error registering plugin uni_links, name.avioli.unilinks.UniLinksPlugin", e); - } - try { - flutterEngine.getPlugins().add(new io.flutter.plugins.urllauncher.UrlLauncherPlugin()); - } catch (Exception e) { - Log.e(TAG, "Error registering plugin url_launcher_android, io.flutter.plugins.urllauncher.UrlLauncherPlugin", e); - } - try { - flutterEngine.getPlugins().add(new dev.fluttercommunity.workmanager.WorkmanagerPlugin()); - } catch (Exception e) { - Log.e(TAG, "Error registering plugin workmanager, dev.fluttercommunity.workmanager.WorkmanagerPlugin", e); - } - } -} diff --git a/refilc/android/local.properties b/refilc/android/local.properties deleted file mode 100644 index 33b7021..0000000 --- a/refilc/android/local.properties +++ /dev/null @@ -1,5 +0,0 @@ -sdk.dir=/media/zypherift/FileStorage/android-sdk -flutter.sdk=/home/reinerrego/flutter/flutter -flutter.buildMode=debug -flutter.versionName=5.0.0 -flutter.versionCode=241 \ No newline at end of file diff --git a/refilc/assets/svg/menu_icons/grades.svg b/refilc/assets/svg/menu_icons/grades.svg new file mode 100644 index 0000000..cea66bd --- /dev/null +++ b/refilc/assets/svg/menu_icons/grades.svg @@ -0,0 +1,3 @@ + + + diff --git a/refilc/assets/svg/menu_icons/grades_selected.svg b/refilc/assets/svg/menu_icons/grades_selected.svg new file mode 100644 index 0000000..a58eb19 --- /dev/null +++ b/refilc/assets/svg/menu_icons/grades_selected.svg @@ -0,0 +1,3 @@ + + + diff --git a/refilc/assets/svg/menu_icons/inbox.svg b/refilc/assets/svg/menu_icons/inbox.svg new file mode 100644 index 0000000..1a8f5bb --- /dev/null +++ b/refilc/assets/svg/menu_icons/inbox.svg @@ -0,0 +1,3 @@ + + + diff --git a/refilc/assets/svg/menu_icons/inbox_selected.svg b/refilc/assets/svg/menu_icons/inbox_selected.svg new file mode 100644 index 0000000..58dc5e7 --- /dev/null +++ b/refilc/assets/svg/menu_icons/inbox_selected.svg @@ -0,0 +1,4 @@ + + + + diff --git a/refilc/assets/svg/menu_icons/notes.svg b/refilc/assets/svg/menu_icons/notes.svg new file mode 100644 index 0000000..ecda024 --- /dev/null +++ b/refilc/assets/svg/menu_icons/notes.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/refilc/assets/svg/menu_icons/notes_selected.svg b/refilc/assets/svg/menu_icons/notes_selected.svg new file mode 100644 index 0000000..170162b --- /dev/null +++ b/refilc/assets/svg/menu_icons/notes_selected.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/refilc/assets/svg/menu_icons/timetable.svg b/refilc/assets/svg/menu_icons/timetable.svg new file mode 100644 index 0000000..de2dc46 --- /dev/null +++ b/refilc/assets/svg/menu_icons/timetable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/refilc/assets/svg/menu_icons/timetable_selected.svg b/refilc/assets/svg/menu_icons/timetable_selected.svg new file mode 100644 index 0000000..3c4d13f --- /dev/null +++ b/refilc/assets/svg/menu_icons/timetable_selected.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/refilc/assets/svg/menu_icons/today.svg b/refilc/assets/svg/menu_icons/today.svg new file mode 100644 index 0000000..c7e558b --- /dev/null +++ b/refilc/assets/svg/menu_icons/today.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/refilc/assets/svg/menu_icons/today_selected.svg b/refilc/assets/svg/menu_icons/today_selected.svg new file mode 100644 index 0000000..bc7036a --- /dev/null +++ b/refilc/assets/svg/menu_icons/today_selected.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/refilc_mobile_ui/lib/premium/components/active_sponsor_card.dart b/refilc_mobile_ui/lib/premium/components/active_sponsor_card.dart index 219577e..9fd40e9 100644 --- a/refilc_mobile_ui/lib/premium/components/active_sponsor_card.dart +++ b/refilc_mobile_ui/lib/premium/components/active_sponsor_card.dart @@ -34,6 +34,11 @@ class ActiveSponsorCard extends StatelessWidget { return FilcIcons.kupak; case PremiumFeatureLevel.old: return FilcIcons.kupak; + case PremiumFeatureLevel.basic: + return FilcIcons.kupak; + + case PremiumFeatureLevel.gold: + return FilcIcons.kupak; } } @@ -61,6 +66,12 @@ class ActiveSponsorCard extends StatelessWidget { case PremiumFeatureLevel.old: glow = Colors.red; break; + case PremiumFeatureLevel.basic: + glow = Colors.red; + break; + case PremiumFeatureLevel.gold: + glow = Colors.red; + break; } return Container( decoration: BoxDecoration( diff --git a/refilc_mobile_ui/lib/premium/plus_screen.dart b/refilc_mobile_ui/lib/premium/plus_screen.dart index 977d523..95e2b6b 100644 --- a/refilc_mobile_ui/lib/premium/plus_screen.dart +++ b/refilc_mobile_ui/lib/premium/plus_screen.dart @@ -176,10 +176,10 @@ class PlusScreen extends StatelessWidget { bottom: Radius.circular(8.0)), features: [ ['✨', 'rfp_1'.i18n], - ['👥', 'rfp_2'.i18n], + ['1️⃣', 'rfp_5'.i18n], + // ['👥', 'rfp_2'.i18n], ['👋', 'rfp_3'.i18n], ['📓', 'rfp_4'.i18n], - ['1️⃣', 'rfp_5'.i18n], ['🎓', 'rfp_6'.i18n], ], ), @@ -202,7 +202,7 @@ class PlusScreen extends StatelessWidget { features: [ ['🕑', 'rfp_7'.i18n], ['🔤', 'rfp_8'.i18n], - ['👥', 'rfp_9'.i18n], + // ['👥', 'rfp_9'.i18n], // ['🎓', 'Összesített átlagszámoló'], ['📱', 'rfp_10'.i18n], ['🟦', 'rfp_11'.i18n], diff --git a/refilc_mobile_ui/lib/screens/settings/settings_helper.dart b/refilc_mobile_ui/lib/screens/settings/settings_helper.dart index daf9d8e..249997c 100644 --- a/refilc_mobile_ui/lib/screens/settings/settings_helper.dart +++ b/refilc_mobile_ui/lib/screens/settings/settings_helper.dart @@ -36,9 +36,9 @@ import 'package:flutter_material_color_picker/flutter_material_color_picker.dart import 'package:refilc/models/icon_pack.dart'; import 'package:refilc/utils/format.dart'; import 'package:refilc_mobile_ui/screens/settings/theme_screen.dart'; -import 'package:refilc_plus/models/premium_scopes.dart'; -import 'package:refilc_plus/providers/premium_provider.dart'; -import 'package:refilc_plus/ui/mobile/premium/upsell.dart'; +// import 'package:refilc_plus/models/premium_scopes.dart'; +// import 'package:refilc_plus/providers/premium_provider.dart'; +// import 'package:refilc_plus/ui/mobile/premium/upsell.dart'; import 'package:refilc_plus/ui/mobile/settings/settings_helper.dart'; class SettingsHelper { @@ -409,20 +409,20 @@ class SettingsHelper { } else if (index == accountTiles.length + 1) { return PanelButton( onPressed: () { - if (!Provider.of(context, listen: false) - .hasScope(PremiumScopes.maxTwoAccounts)) { - PremiumLockedFeatureUpsell.show( - context: context, feature: PremiumFeature.moreAccounts); - return; - } + // if (!Provider.of(context, listen: false) + // .hasScope(PremiumScopes.maxTwoAccounts)) { + // PremiumLockedFeatureUpsell.show( + // context: context, feature: PremiumFeature.moreAccounts); + // return; + // } - if ((accountTiles.length - 1 == 2) && - !Provider.of(context, listen: false) - .hasScope(PremiumScopes.noAccountLimit)) { - PremiumLockedFeatureUpsell.show( - context: context, feature: PremiumFeature.moreAccounts); - return; - } + // if ((accountTiles.length - 1 == 2) && + // !Provider.of(context, listen: false) + // .hasScope(PremiumScopes.noAccountLimit)) { + // PremiumLockedFeatureUpsell.show( + // context: context, feature: PremiumFeature.moreAccounts); + // return; + // } Navigator.of(context).pushNamed("login_back").then((value) { setSystemChrome(context); diff --git a/refilc_mobile_ui/lib/screens/settings/settings_screen.dart b/refilc_mobile_ui/lib/screens/settings/settings_screen.dart index 5f14fd1..af97a8c 100644 --- a/refilc_mobile_ui/lib/screens/settings/settings_screen.dart +++ b/refilc_mobile_ui/lib/screens/settings/settings_screen.dart @@ -59,7 +59,7 @@ import 'package:refilc_mobile_ui/screens/settings/user/nickname.dart'; import 'package:refilc_mobile_ui/screens/settings/user/profile_pic.dart'; // import 'package:refilc_plus/ui/mobile/settings/modify_teacher_names.dart'; // import 'package:refilc_plus/ui/mobile/settings/welcome_message.dart'; -import 'package:refilc_mobile_ui/screens/error_screen.dart'; +// import 'package:refilc_mobile_ui/screens/error_screen.dart'; import 'package:refilc_mobile_ui/screens/error_report_screen.dart'; import 'submenu/general_screen.dart';