diff --git a/django_backend/api/admin.py b/django_backend/api/admin.py index 4d7ec65..5032124 100644 --- a/django_backend/api/admin.py +++ b/django_backend/api/admin.py @@ -22,6 +22,10 @@ class UserInline(nested_admin.NestedTabularInline): def has_delete_permission(self, request, obj=None): return False +class HomegroupInviteInline(nested_admin.NestedTabularInline): + model = HomegroupInvite + extra = 0 + class RecipeInline(nested_admin.NestedTabularInline): model = Recipe inlines = (IngredientInline,) @@ -35,9 +39,9 @@ class RecipeAdmin(nested_admin.NestedModelAdmin): @admin.register(Homegroup) class HomegroupAdmin(nested_admin.NestedModelAdmin): list_display = ("id", "name") - inlines = (UserInline, RecipeInline, IngredientInline) + inlines = (UserInline, HomegroupInviteInline, RecipeInline, IngredientInline) @admin.register(List) class ListAdmin(nested_admin.NestedModelAdmin): - list_display = ("id",) + list_display = ("homegroup",) inlines = (RecipeInline, IngredientInline) diff --git a/django_backend/api/migrations/0001_initial.py b/django_backend/api/migrations/0001_initial.py index 961ae9d..42675f6 100644 --- a/django_backend/api/migrations/0001_initial.py +++ b/django_backend/api/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 4.1.3 on 2022-11-22 20:42 +# Generated by Django 4.1.3 on 2022-11-25 09:10 from django.db import migrations, models import django.db.models.deletion @@ -17,12 +17,13 @@ class Migration(migrations.Migration): name='Homegroup', fields=[ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=50)), ], ), migrations.CreateModel( name='List', fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('homegroup', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='api.homegroup')), ], ), migrations.CreateModel( @@ -31,7 +32,6 @@ class Migration(migrations.Migration): ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('name', models.CharField(max_length=50)), ('homegroup', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='recipes', to='api.homegroup')), - ('list', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='recipes', to='api.list')), ], ), migrations.CreateModel( @@ -44,4 +44,11 @@ class Migration(migrations.Migration): ('content_type', models.ForeignKey(limit_choices_to=models.Q(models.Q(('app_label', 'api'), ('model', 'recipe')), models.Q(('app_label', 'api'), ('model', 'list')), _connector='OR'), on_delete=django.db.models.deletion.CASCADE, to='contenttypes.contenttype')), ], ), + migrations.CreateModel( + name='HomegroupInvite', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('homegroup', models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, related_name='invites', to='api.homegroup')), + ], + ), ] diff --git a/django_backend/api/migrations/0002_homegroup_name.py b/django_backend/api/migrations/0002_homegroup_name.py deleted file mode 100644 index 9213778..0000000 --- a/django_backend/api/migrations/0002_homegroup_name.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 4.1.3 on 2022-11-22 21:43 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('api', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='homegroup', - name='name', - field=models.CharField(default="Alex's Kitchen", max_length=50), - preserve_default=False, - ), - ] diff --git a/django_backend/api/migrations/0002_initial.py b/django_backend/api/migrations/0002_initial.py new file mode 100644 index 0000000..8e1585a --- /dev/null +++ b/django_backend/api/migrations/0002_initial.py @@ -0,0 +1,37 @@ +# Generated by Django 4.1.3 on 2022-11-25 09:10 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('api', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.AddField( + model_name='homegroupinvite', + name='user', + field=models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, related_name='invites', to=settings.AUTH_USER_MODEL), + ), + migrations.AddField( + model_name='homegroup', + name='invited_users', + field=models.ManyToManyField(related_name='homegroup_invites', through='api.HomegroupInvite', to=settings.AUTH_USER_MODEL), + ), + migrations.AddField( + model_name='recipe', + name='list', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='recipes', to='api.list'), + ), + migrations.AlterUniqueTogether( + name='homegroupinvite', + unique_together={('homegroup', 'user')}, + ), + ] diff --git a/django_backend/api/models.py b/django_backend/api/models.py index 1995543..9dccbae 100644 --- a/django_backend/api/models.py +++ b/django_backend/api/models.py @@ -13,15 +13,29 @@ class Ingredient(models.Model): name = models.CharField(max_length=50) in_stock = models.BooleanField(default=False) -class List(models.Model): - # Foreign Key Recipe -> List [as recipes] - extra_ingredients = GenericRelation(Ingredient, related_query_name="extra_ingredients") +class HomegroupInvite(models.Model): + homegroup = models.ForeignKey("api.Homegroup", on_delete=models.CASCADE, related_name="invites", blank=True) + user = models.ForeignKey("users.User", on_delete=models.CASCADE, related_name="invites", blank=True) + class Meta: + unique_together = ("homegroup", "user") class Homegroup(models.Model): # Foreign Key Recipe -> Homegroup [as recipes] # Foreign Key User -> Homegroup [as users] name = models.CharField(max_length=50) + invited_users = models.ManyToManyField("users.User", related_name="homegroup_invites", through=HomegroupInvite) + + def __repr__(self): + return f"{self.id}: {self.name}" + + def __str__(self): + return f"{self.id}: {self.name}" + +class List(models.Model): + # Foreign Key Recipe -> List [as recipes] + extra_ingredients = GenericRelation(Ingredient, related_query_name="extra_ingredients") + homegroup = models.OneToOneField(Homegroup, on_delete=models.CASCADE, primary_key=True) class Recipe(models.Model): diff --git a/django_backend/api/serializers.py b/django_backend/api/serializers.py index 8a0948a..684246d 100644 --- a/django_backend/api/serializers.py +++ b/django_backend/api/serializers.py @@ -1,24 +1,42 @@ from rest_framework import serializers from api.models import * +from users.serializers import UserSerializer + +class IngredientSerializer(serializers.ModelSerializer): + class Meta: + model = Ingredient + fields = ["id", "name", "in_stock", "content_type", "object_id"] + read_only_fields = ["id"] class RecipeSerializer(serializers.ModelSerializer): - ingredients = serializers.PrimaryKeyRelatedField(many=True, read_only=True) + # ingredients = serializers.PrimaryKeyRelatedField(many=True, read_only=True) + # ingredients = IngredientSerializer(many=True, read_only=True) + ingredients = serializers.SerializerMethodField() class Meta: model = Recipe fields = ["id", "name", "ingredients"] read_only_fields = ["id"] -class IngredientSerializer(serializers.ModelSerializer): - class Meta: - model = Ingredient - fields = ["id", "name", "in_stock"] - read_only_fields = ["id"] + def get_ingredients(self, instance): + ingredients = instance.ingredients.all().order_by("name") + return IngredientSerializer(ingredients, many=True).data class HomegroupSerializer(serializers.ModelSerializer): users = serializers.PrimaryKeyRelatedField(many=True, read_only=True) recipes = serializers.PrimaryKeyRelatedField(many=True, read_only=True) + def create(self, validated_data): + homegroup = super().create(validated_data) + List.objects.get_or_create(homegroup=homegroup) + return homegroup + class Meta: model = Homegroup - fields = ["id", "recipes", "users"] \ No newline at end of file + fields = ["id", "name", "recipes", "users", "invites"] + read_only_fields = ["recipes", "users", "invites"] + +class InviteSerializer(serializers.ModelSerializer): + class Meta: + model = HomegroupInvite + fields = ["id", "homegroup", "user"] \ No newline at end of file diff --git a/django_backend/api/urls.py b/django_backend/api/urls.py index 7daa8e5..185995f 100644 --- a/django_backend/api/urls.py +++ b/django_backend/api/urls.py @@ -6,6 +6,7 @@ router = routers.DefaultRouter() router.register(r'recipes', views.RecipeView) router.register(r'ingredients', views.IngredientView) router.register(r'homegroups', views.HomegroupView) +router.register(r'groupinvites', views.HomegroupInviteView) urlpatterns = [ path('', include(router.urls)) diff --git a/django_backend/api/views.py b/django_backend/api/views.py index 49e5b88..b2be567 100644 --- a/django_backend/api/views.py +++ b/django_backend/api/views.py @@ -14,3 +14,7 @@ class IngredientView(viewsets.ModelViewSet): class HomegroupView(viewsets.ModelViewSet): serializer_class = HomegroupSerializer queryset = Homegroup.objects.all() + +class HomegroupInviteView(viewsets.ModelViewSet): + serializer_class = InviteSerializer + queryset = HomegroupInvite.objects.all() diff --git a/django_backend/django_backend/settings.py b/django_backend/django_backend/settings.py index 93ab1b6..5e940c8 100644 --- a/django_backend/django_backend/settings.py +++ b/django_backend/django_backend/settings.py @@ -14,6 +14,9 @@ from pathlib import Path # Build paths inside the project like this: BASE_DIR / 'subdir'. BASE_DIR = Path(__file__).resolve().parent.parent +MEDIA_ROOT = BASE_DIR.joinpath("media") +STATIC_URL = "static/" +MEDIA_URL = "/media/" # Quick-start development settings - unsuitable for production @@ -27,7 +30,9 @@ AUTH_USER_MODEL = 'users.User' # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -ALLOWED_HOSTS = [] +ALLOWED_HOSTS = ["192.168.0.16", "127.0.0.1", "localhost"] +# CORS_ALLOWED_ORIGINS = ["http://192.168.0.16:8000"] +CORS_ALLOW_ALL_ORIGINS = True REST_FRAMEWORK = { 'DEFAULT_AUTHENTICATION_CLASSES': [ @@ -47,6 +52,7 @@ INSTALLED_APPS = [ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', + 'corsheaders', 'rest_framework', 'rest_framework.authtoken', 'nested_admin' @@ -55,6 +61,7 @@ INSTALLED_APPS = [ MIDDLEWARE = [ 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', + 'corsheaders.middleware.CorsMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', @@ -124,12 +131,6 @@ USE_I18N = True USE_TZ = True - -# Static files (CSS, JavaScript, Images) -# https://docs.djangoproject.com/en/4.1/howto/static-files/ - -STATIC_URL = 'static/' - # Default primary key field type # https://docs.djangoproject.com/en/4.1/ref/settings/#default-auto-field diff --git a/django_backend/django_backend/urls.py b/django_backend/django_backend/urls.py index 4232d93..e9b1546 100644 --- a/django_backend/django_backend/urls.py +++ b/django_backend/django_backend/urls.py @@ -15,9 +15,12 @@ Including another URLconf """ from django.contrib import admin from django.urls import path, include +from django.conf.urls.static import static +from django.conf import settings urlpatterns = [ path('admin/', admin.site.urls), path('api/', include("api.urls")), - path('auth/', include("users.urls")) -] + path('auth/', include("users.urls")), + path('api-auth/', include('rest_framework.urls')), +] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/django_backend/users/admin.py b/django_backend/users/admin.py index 41a20df..cc429ff 100644 --- a/django_backend/users/admin.py +++ b/django_backend/users/admin.py @@ -4,18 +4,18 @@ from .models import User class CustomUserAdmin(UserAdmin): fieldsets = ( - (None, {"fields": ("username", "password", "homegroup")}), - ("Personal info", {"fields": ("first_name", "last_name", "email")}), - ( - "Permissions", - { - "fields": ( - "is_active", - "is_staff", - "is_superuser", - ), - }, - ), + (None, {"fields": ("username", "password", "image", "homegroup")}), + ("Personal info", {"fields": ("first_name", "last_name")}), + # ( + # "Permissions", + # { + # "fields": ( + # "is_active", + # "is_staff", + # "is_superuser", + # ), + # }, + # ), ("Important dates", {"fields": ("last_login", "date_joined")}), ) add_fieldsets = ( diff --git a/django_backend/users/migrations/0001_initial.py b/django_backend/users/migrations/0001_initial.py index e13852a..8f6e372 100644 --- a/django_backend/users/migrations/0001_initial.py +++ b/django_backend/users/migrations/0001_initial.py @@ -1,10 +1,11 @@ -# Generated by Django 4.1.3 on 2022-11-22 20:42 +# Generated by Django 4.1.3 on 2022-11-25 09:10 import django.contrib.auth.models import django.contrib.auth.validators from django.db import migrations, models import django.db.models.deletion import django.utils.timezone +import users.models class Migration(migrations.Migration): @@ -12,8 +13,8 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('api', '0001_initial'), ('auth', '0012_alter_user_first_name_max_length'), + ('api', '0001_initial'), ] operations = [ @@ -31,6 +32,7 @@ class Migration(migrations.Migration): ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')), ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')), ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')), + ('image', models.ImageField(blank=True, null=True, upload_to=users.models.image_path)), ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.group', verbose_name='groups')), ('homegroup', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='users', to='api.homegroup')), ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.permission', verbose_name='user permissions')), diff --git a/django_backend/users/models.py b/django_backend/users/models.py index 9df4a6b..5ed395e 100644 --- a/django_backend/users/models.py +++ b/django_backend/users/models.py @@ -1,6 +1,13 @@ from django.contrib.auth.models import AbstractUser from django.db import models from api.models import Homegroup +from pathlib import Path + +def image_path(instance, fname): + extension = Path(fname).suffix + return f"profile-images/{instance.id}{extension}" class User(AbstractUser): - homegroup = models.ForeignKey(Homegroup, related_name="users", on_delete=models.SET_NULL, blank=True, null=True) \ No newline at end of file + homegroup = models.ForeignKey(Homegroup, related_name="users", on_delete=models.SET_NULL, blank=True, null=True) + image = models.ImageField(upload_to=image_path, null=True, blank=True) + diff --git a/django_backend/users/serializers.py b/django_backend/users/serializers.py index 417116e..759fd99 100644 --- a/django_backend/users/serializers.py +++ b/django_backend/users/serializers.py @@ -23,6 +23,6 @@ class UserSerializer(serializers.ModelSerializer): # https://stackoverflow.com/ class Meta: model = User - fields = ("id", "username", "email", "password") + fields = ("id", "username", "first_name", "last_name", "password", "image", "homegroup", "homegroup_invites") write_only_fields = ("password",) - read_only_fields = ("id",) + read_only_fields = ("id", "homegroup_invites") diff --git a/django_backend/users/urls.py b/django_backend/users/urls.py index 4aceda4..a258ca0 100644 --- a/django_backend/users/urls.py +++ b/django_backend/users/urls.py @@ -1,11 +1,14 @@ from django.urls import path, include from rest_framework.authtoken import views as authviews from rest_framework import routers - from users import views +router = routers.DefaultRouter() +router.register(r'users', views.UsersListView) + urlpatterns = [ + path('', include(router.urls)), path('token', authviews.obtain_auth_token, name="api-token-auth"), - path('users', views.RegisterUserView.as_view()), # Exposes POST to everyone for registering + # path('users', views.RegisterUserView), # Exposes POST to everyone for registering path('users/me', views.ModifyUserView.as_view()) # exposes GET / PUT / PATCH / DELETE for registered users for their user object ] diff --git a/django_backend/users/views.py b/django_backend/users/views.py index cbdbad6..50b6cb7 100644 --- a/django_backend/users/views.py +++ b/django_backend/users/views.py @@ -1,7 +1,10 @@ -from rest_framework import generics, permissions, views, status +from rest_framework import generics, permissions, viewsets, mixins, filters, pagination from rest_framework.response import Response -from users import serializers, models +from users.models import * +from users.serializers import * +class Pagination(pagination.PageNumberPagination): + page_size = 4 class IsOwner(permissions.BasePermission): def has_object_permission(self, request, view, obj): @@ -12,10 +15,17 @@ class IsOwner(permissions.BasePermission): # Anyone can register -class RegisterUserView(generics.CreateAPIView): - model = models.User - serializer_class = serializers.UserSerializer +class UsersListView(mixins.CreateModelMixin, mixins.ListModelMixin, mixins.RetrieveModelMixin, viewsets.GenericViewSet): + model = User + serializer_class = UserSerializer permission_classes = [permissions.AllowAny] + queryset = User.objects.all().order_by("first_name", "last_name", "username") + filter_backends = [filters.SearchFilter] + search_fields = ["username", "first_name", "last_name"] + pagination_class = Pagination + + def get_serializer(self, *args, **kwargs): + return super().get_serializer(*args, **kwargs) # Allows user to modify their own data only @@ -24,13 +34,13 @@ class ModifyUserView(generics.RetrieveUpdateDestroyAPIView): permissions.IsAuthenticated, IsOwner ] - model = models.User - serializer_class = serializers.UserSerializer + model = User + serializer_class = UserSerializer def get_object(self): - return models.User.objects.get(pk=self.request.user.id) + return User.objects.get(pk=self.request.user.id) def retrieve(self, request, *args, **kwargs): - user = models.User.objects.get(pk=request.user.id) - serializer = serializers.UserSerializer(user) + user = User.objects.get(pk=request.user.id) + serializer = UserSerializer(user, context={"request":request}) return Response(serializer.data) diff --git a/grocery_helper/.gitignore b/grocery_helper/.gitignore new file mode 100644 index 0000000..24476c5 --- /dev/null +++ b/grocery_helper/.gitignore @@ -0,0 +1,44 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.buildlog/ +.history +.svn/ +migrate_working_dir/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# The .vscode folder contains launch configuration and tasks you configure in +# VS Code which you may wish to be included in version control, so this line +# is commented out by default. +#.vscode/ + +# Flutter/Dart/Pub related +**/doc/api/ +**/ios/Flutter/.last_build_id +.dart_tool/ +.flutter-plugins +.flutter-plugins-dependencies +.packages +.pub-cache/ +.pub/ +/build/ + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release diff --git a/grocery_helper/.metadata b/grocery_helper/.metadata new file mode 100644 index 0000000..c5a7f9c --- /dev/null +++ b/grocery_helper/.metadata @@ -0,0 +1,45 @@ +# This file tracks properties of this Flutter project. +# Used by Flutter tool to assess capabilities and perform upgrades etc. +# +# This file should be version controlled. + +version: + revision: 2921ca0c482401e557ebb20d16180e2e14e47ee9 + channel: master + +project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: 2921ca0c482401e557ebb20d16180e2e14e47ee9 + base_revision: 2921ca0c482401e557ebb20d16180e2e14e47ee9 + - platform: android + create_revision: 2921ca0c482401e557ebb20d16180e2e14e47ee9 + base_revision: 2921ca0c482401e557ebb20d16180e2e14e47ee9 + - platform: ios + create_revision: 2921ca0c482401e557ebb20d16180e2e14e47ee9 + base_revision: 2921ca0c482401e557ebb20d16180e2e14e47ee9 + - platform: linux + create_revision: 2921ca0c482401e557ebb20d16180e2e14e47ee9 + base_revision: 2921ca0c482401e557ebb20d16180e2e14e47ee9 + - platform: macos + create_revision: 2921ca0c482401e557ebb20d16180e2e14e47ee9 + base_revision: 2921ca0c482401e557ebb20d16180e2e14e47ee9 + - platform: web + create_revision: 2921ca0c482401e557ebb20d16180e2e14e47ee9 + base_revision: 2921ca0c482401e557ebb20d16180e2e14e47ee9 + - platform: windows + create_revision: 2921ca0c482401e557ebb20d16180e2e14e47ee9 + base_revision: 2921ca0c482401e557ebb20d16180e2e14e47ee9 + + # User provided section + + # List of Local paths (relative to this file) that should be + # ignored by the migrate tool. + # + # Files that are not part of the templates will be ignored by default. + unmanaged_files: + - 'lib/main.dart' + - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/grocery_helper/.vscode/settings.json b/grocery_helper/.vscode/settings.json new file mode 100644 index 0000000..cad7657 --- /dev/null +++ b/grocery_helper/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "cmake.configureOnOpen": false +} \ No newline at end of file diff --git a/grocery_helper/README.md b/grocery_helper/README.md new file mode 100644 index 0000000..ac70fb7 --- /dev/null +++ b/grocery_helper/README.md @@ -0,0 +1,16 @@ +# grocery_helper + +A new Flutter project. + +## Getting Started + +This project is a starting point for a Flutter application. + +A few resources to get you started if this is your first Flutter project: + +- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab) +- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook) + +For help getting started with Flutter development, view the +[online documentation](https://docs.flutter.dev/), which offers tutorials, +samples, guidance on mobile development, and a full API reference. diff --git a/grocery_helper/analysis_options.yaml b/grocery_helper/analysis_options.yaml new file mode 100644 index 0000000..61b6c4d --- /dev/null +++ b/grocery_helper/analysis_options.yaml @@ -0,0 +1,29 @@ +# This file configures the analyzer, which statically analyzes Dart code to +# check for errors, warnings, and lints. +# +# The issues identified by the analyzer are surfaced in the UI of Dart-enabled +# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be +# invoked from the command line by running `flutter analyze`. + +# The following line activates a set of recommended lints for Flutter apps, +# packages, and plugins designed to encourage good coding practices. +include: package:flutter_lints/flutter.yaml + +linter: + # The lint rules applied to this project can be customized in the + # section below to disable rules from the `package:flutter_lints/flutter.yaml` + # included above or to enable additional rules. A list of all available lints + # and their documentation is published at + # https://dart-lang.github.io/linter/lints/index.html. + # + # Instead of disabling a lint rule for the entire project in the + # section below, it can also be suppressed for a single line of code + # or a specific dart file by using the `// ignore: name_of_lint` and + # `// ignore_for_file: name_of_lint` syntax on the line or in the file + # producing the lint. + rules: + # avoid_print: false # Uncomment to disable the `avoid_print` rule + # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule + +# Additional information about this file can be found at +# https://dart.dev/guides/language/analysis-options diff --git a/grocery_helper/android/.gitignore b/grocery_helper/android/.gitignore new file mode 100644 index 0000000..6f56801 --- /dev/null +++ b/grocery_helper/android/.gitignore @@ -0,0 +1,13 @@ +gradle-wrapper.jar +/.gradle +/captures/ +/gradlew +/gradlew.bat +/local.properties +GeneratedPluginRegistrant.java + +# Remember to never publicly share your keystore. +# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app +key.properties +**/*.keystore +**/*.jks diff --git a/grocery_helper/android/app/build.gradle b/grocery_helper/android/app/build.gradle new file mode 100644 index 0000000..99c0056 --- /dev/null +++ b/grocery_helper/android/app/build.gradle @@ -0,0 +1,72 @@ +def localProperties = new Properties() +def localPropertiesFile = rootProject.file('local.properties') +if (localPropertiesFile.exists()) { + localPropertiesFile.withReader('UTF-8') { reader -> + localProperties.load(reader) + } +} + +def flutterRoot = localProperties.getProperty('flutter.sdk') +if (flutterRoot == null) { + throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") +} + +def flutterVersionCode = localProperties.getProperty('flutter.versionCode') +if (flutterVersionCode == null) { + flutterVersionCode = '1' +} + +def flutterVersionName = localProperties.getProperty('flutter.versionName') +if (flutterVersionName == null) { + flutterVersionName = '1.0' +} + +apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' +apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" + +android { + compileSdkVersion flutter.compileSdkVersion + ndkVersion flutter.ndkVersion + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = '1.8' + } + + sourceSets { + main.java.srcDirs += 'src/main/kotlin' + } + + defaultConfig { + // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). + applicationId "com.example.grocery_helper" + // You can update the following values to match your application needs. + // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. + minSdkVersion 18 + compileSdkVersion 33 + targetSdkVersion flutter.targetSdkVersion + versionCode flutterVersionCode.toInteger() + versionName flutterVersionName + } + + buildTypes { + release { + // TODO: Add your own signing config for the release build. + // Signing with the debug keys for now, so `flutter run --release` works. + signingConfig signingConfigs.debug + } + } +} + +flutter { + source '../..' +} + +dependencies { + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" +} diff --git a/grocery_helper/android/app/src/debug/AndroidManifest.xml b/grocery_helper/android/app/src/debug/AndroidManifest.xml new file mode 100644 index 0000000..ce69bfa --- /dev/null +++ b/grocery_helper/android/app/src/debug/AndroidManifest.xml @@ -0,0 +1,8 @@ + + + + diff --git a/grocery_helper/android/app/src/main/AndroidManifest.xml b/grocery_helper/android/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..4dfc7ac --- /dev/null +++ b/grocery_helper/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + diff --git a/grocery_helper/android/app/src/main/kotlin/com/example/grocery_helper/MainActivity.kt b/grocery_helper/android/app/src/main/kotlin/com/example/grocery_helper/MainActivity.kt new file mode 100644 index 0000000..ae880b3 --- /dev/null +++ b/grocery_helper/android/app/src/main/kotlin/com/example/grocery_helper/MainActivity.kt @@ -0,0 +1,6 @@ +package com.example.grocery_helper + +import io.flutter.embedding.android.FlutterActivity + +class MainActivity: FlutterActivity() { +} diff --git a/grocery_helper/android/app/src/main/res/drawable-v21/launch_background.xml b/grocery_helper/android/app/src/main/res/drawable-v21/launch_background.xml new file mode 100644 index 0000000..f74085f --- /dev/null +++ b/grocery_helper/android/app/src/main/res/drawable-v21/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/grocery_helper/android/app/src/main/res/drawable/launch_background.xml b/grocery_helper/android/app/src/main/res/drawable/launch_background.xml new file mode 100644 index 0000000..304732f --- /dev/null +++ b/grocery_helper/android/app/src/main/res/drawable/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/grocery_helper/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/grocery_helper/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..1b3650e Binary files /dev/null and b/grocery_helper/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/grocery_helper/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/grocery_helper/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..f77d4de Binary files /dev/null and b/grocery_helper/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/grocery_helper/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/grocery_helper/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..c5147b2 Binary files /dev/null and b/grocery_helper/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/grocery_helper/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/grocery_helper/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..de3c34e Binary files /dev/null and b/grocery_helper/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/grocery_helper/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/grocery_helper/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..68d497a Binary files /dev/null and b/grocery_helper/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/grocery_helper/android/app/src/main/res/values-night/styles.xml b/grocery_helper/android/app/src/main/res/values-night/styles.xml new file mode 100644 index 0000000..06952be --- /dev/null +++ b/grocery_helper/android/app/src/main/res/values-night/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/grocery_helper/android/app/src/main/res/values/styles.xml b/grocery_helper/android/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..cb1ef88 --- /dev/null +++ b/grocery_helper/android/app/src/main/res/values/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/grocery_helper/android/app/src/profile/AndroidManifest.xml b/grocery_helper/android/app/src/profile/AndroidManifest.xml new file mode 100644 index 0000000..ce69bfa --- /dev/null +++ b/grocery_helper/android/app/src/profile/AndroidManifest.xml @@ -0,0 +1,8 @@ + + + + diff --git a/grocery_helper/android/build.gradle b/grocery_helper/android/build.gradle new file mode 100644 index 0000000..58a8c74 --- /dev/null +++ b/grocery_helper/android/build.gradle @@ -0,0 +1,31 @@ +buildscript { + ext.kotlin_version = '1.7.10' + repositories { + google() + mavenCentral() + } + + dependencies { + classpath 'com.android.tools.build:gradle:7.2.0' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + } +} + +allprojects { + repositories { + google() + mavenCentral() + } +} + +rootProject.buildDir = '../build' +subprojects { + project.buildDir = "${rootProject.buildDir}/${project.name}" +} +subprojects { + project.evaluationDependsOn(':app') +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/grocery_helper/android/gradle.properties b/grocery_helper/android/gradle.properties new file mode 100644 index 0000000..94adc3a --- /dev/null +++ b/grocery_helper/android/gradle.properties @@ -0,0 +1,3 @@ +org.gradle.jvmargs=-Xmx1536M +android.useAndroidX=true +android.enableJetifier=true diff --git a/grocery_helper/android/gradle/wrapper/gradle-wrapper.properties b/grocery_helper/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..3c472b9 --- /dev/null +++ b/grocery_helper/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip diff --git a/grocery_helper/android/settings.gradle b/grocery_helper/android/settings.gradle new file mode 100644 index 0000000..44e62bc --- /dev/null +++ b/grocery_helper/android/settings.gradle @@ -0,0 +1,11 @@ +include ':app' + +def localPropertiesFile = new File(rootProject.projectDir, "local.properties") +def properties = new Properties() + +assert localPropertiesFile.exists() +localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } + +def flutterSdkPath = properties.getProperty("flutter.sdk") +assert flutterSdkPath != null, "flutter.sdk not set in local.properties" +apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" diff --git a/grocery_helper/assets/icons/android.svg b/grocery_helper/assets/icons/android.svg new file mode 100644 index 0000000..3d73053 --- /dev/null +++ b/grocery_helper/assets/icons/android.svg @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + diff --git a/grocery_helper/assets/icons/icon.png b/grocery_helper/assets/icons/icon.png new file mode 100644 index 0000000..74208e1 Binary files /dev/null and b/grocery_helper/assets/icons/icon.png differ diff --git a/grocery_helper/assets/images/base.svg b/grocery_helper/assets/images/base.svg new file mode 100644 index 0000000..5da41eb --- /dev/null +++ b/grocery_helper/assets/images/base.svg @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + + diff --git a/grocery_helper/assets/images/holes-dark.svg b/grocery_helper/assets/images/holes-dark.svg new file mode 100644 index 0000000..f79b598 --- /dev/null +++ b/grocery_helper/assets/images/holes-dark.svg @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + diff --git a/grocery_helper/assets/images/holes.svg b/grocery_helper/assets/images/holes.svg new file mode 100644 index 0000000..afc19b1 --- /dev/null +++ b/grocery_helper/assets/images/holes.svg @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + diff --git a/grocery_helper/assets/images/person.svg b/grocery_helper/assets/images/person.svg new file mode 100644 index 0000000..88c85dd --- /dev/null +++ b/grocery_helper/assets/images/person.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/grocery_helper/ios/.gitignore b/grocery_helper/ios/.gitignore new file mode 100644 index 0000000..7a7f987 --- /dev/null +++ b/grocery_helper/ios/.gitignore @@ -0,0 +1,34 @@ +**/dgph +*.mode1v3 +*.mode2v3 +*.moved-aside +*.pbxuser +*.perspectivev3 +**/*sync/ +.sconsign.dblite +.tags* +**/.vagrant/ +**/DerivedData/ +Icon? +**/Pods/ +**/.symlinks/ +profile +xcuserdata +**/.generated/ +Flutter/App.framework +Flutter/Flutter.framework +Flutter/Flutter.podspec +Flutter/Generated.xcconfig +Flutter/ephemeral/ +Flutter/app.flx +Flutter/app.zip +Flutter/flutter_assets/ +Flutter/flutter_export_environment.sh +ServiceDefinitions.json +Runner/GeneratedPluginRegistrant.* + +# Exceptions to above rules. +!default.mode1v3 +!default.mode2v3 +!default.pbxuser +!default.perspectivev3 diff --git a/grocery_helper/ios/Flutter/AppFrameworkInfo.plist b/grocery_helper/ios/Flutter/AppFrameworkInfo.plist new file mode 100644 index 0000000..9625e10 --- /dev/null +++ b/grocery_helper/ios/Flutter/AppFrameworkInfo.plist @@ -0,0 +1,26 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + App + CFBundleIdentifier + io.flutter.flutter.app + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + App + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1.0 + MinimumOSVersion + 11.0 + + diff --git a/grocery_helper/ios/Flutter/Debug.xcconfig b/grocery_helper/ios/Flutter/Debug.xcconfig new file mode 100644 index 0000000..592ceee --- /dev/null +++ b/grocery_helper/ios/Flutter/Debug.xcconfig @@ -0,0 +1 @@ +#include "Generated.xcconfig" diff --git a/grocery_helper/ios/Flutter/Release.xcconfig b/grocery_helper/ios/Flutter/Release.xcconfig new file mode 100644 index 0000000..592ceee --- /dev/null +++ b/grocery_helper/ios/Flutter/Release.xcconfig @@ -0,0 +1 @@ +#include "Generated.xcconfig" diff --git a/grocery_helper/ios/Runner.xcodeproj/project.pbxproj b/grocery_helper/ios/Runner.xcodeproj/project.pbxproj new file mode 100644 index 0000000..f2c2c34 --- /dev/null +++ b/grocery_helper/ios/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,483 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 54; + objects = { + +/* Begin PBXBuildFile section */ + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; + 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; + 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; +/* End PBXBuildFile section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 9705A1C41CF9048500538489 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; + 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; + 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; + 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 97C146EB1CF9000F007C117D /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 9740EEB11CF90186004384FC /* Flutter */ = { + isa = PBXGroup; + children = ( + 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, + 9740EEB21CF90195004384FC /* Debug.xcconfig */, + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, + 9740EEB31CF90195004384FC /* Generated.xcconfig */, + ); + name = Flutter; + sourceTree = ""; + }; + 97C146E51CF9000F007C117D = { + isa = PBXGroup; + children = ( + 9740EEB11CF90186004384FC /* Flutter */, + 97C146F01CF9000F007C117D /* Runner */, + 97C146EF1CF9000F007C117D /* Products */, + ); + sourceTree = ""; + }; + 97C146EF1CF9000F007C117D /* Products */ = { + isa = PBXGroup; + children = ( + 97C146EE1CF9000F007C117D /* Runner.app */, + ); + name = Products; + sourceTree = ""; + }; + 97C146F01CF9000F007C117D /* Runner */ = { + isa = PBXGroup; + children = ( + 97C146FA1CF9000F007C117D /* Main.storyboard */, + 97C146FD1CF9000F007C117D /* Assets.xcassets */, + 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, + 97C147021CF9000F007C117D /* Info.plist */, + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */, + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */, + ); + path = Runner; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 97C146ED1CF9000F007C117D /* Runner */ = { + isa = PBXNativeTarget; + buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; + buildPhases = ( + 9740EEB61CF901F6004384FC /* Run Script */, + 97C146EA1CF9000F007C117D /* Sources */, + 97C146EB1CF9000F007C117D /* Frameworks */, + 97C146EC1CF9000F007C117D /* Resources */, + 9705A1C41CF9048500538489 /* Embed Frameworks */, + 3B06AD1E1E4923F5004D2608 /* Thin Binary */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = Runner; + productName = Runner; + productReference = 97C146EE1CF9000F007C117D /* Runner.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 97C146E61CF9000F007C117D /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 1300; + ORGANIZATIONNAME = ""; + TargetAttributes = { + 97C146ED1CF9000F007C117D = { + CreatedOnToolsVersion = 7.3.1; + LastSwiftMigration = 1100; + }; + }; + }; + buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 97C146E51CF9000F007C117D; + productRefGroup = 97C146EF1CF9000F007C117D /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 97C146ED1CF9000F007C117D /* Runner */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 97C146EC1CF9000F007C117D /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, + 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, + 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Thin Binary"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; + }; + 9740EEB61CF901F6004384FC /* Run Script */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Run Script"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 97C146EA1CF9000F007C117D /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */, + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXVariantGroup section */ + 97C146FA1CF9000F007C117D /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 97C146FB1CF9000F007C117D /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 97C147001CF9000F007C117D /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 249021D3217E4FDB00AE95B9 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Profile; + }; + 249021D4217E4FDB00AE95B9 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.example.groceryHelper; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Profile; + }; + 97C147031CF9000F007C117D /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 97C147041CF9000F007C117D /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 97C147061CF9000F007C117D /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.example.groceryHelper; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Debug; + }; + 97C147071CF9000F007C117D /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.example.groceryHelper; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 97C147031CF9000F007C117D /* Debug */, + 97C147041CF9000F007C117D /* Release */, + 249021D3217E4FDB00AE95B9 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 97C147061CF9000F007C117D /* Debug */, + 97C147071CF9000F007C117D /* Release */, + 249021D4217E4FDB00AE95B9 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 97C146E61CF9000F007C117D /* Project object */; +} diff --git a/grocery_helper/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/grocery_helper/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..919434a --- /dev/null +++ b/grocery_helper/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/grocery_helper/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/grocery_helper/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/grocery_helper/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/grocery_helper/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/grocery_helper/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..f9b0d7c --- /dev/null +++ b/grocery_helper/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/grocery_helper/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/grocery_helper/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme new file mode 100644 index 0000000..c87d15a --- /dev/null +++ b/grocery_helper/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/grocery_helper/ios/Runner.xcworkspace/contents.xcworkspacedata b/grocery_helper/ios/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..1d526a1 --- /dev/null +++ b/grocery_helper/ios/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/grocery_helper/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/grocery_helper/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/grocery_helper/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/grocery_helper/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/grocery_helper/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..f9b0d7c --- /dev/null +++ b/grocery_helper/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/grocery_helper/ios/Runner/AppDelegate.swift b/grocery_helper/ios/Runner/AppDelegate.swift new file mode 100644 index 0000000..70693e4 --- /dev/null +++ b/grocery_helper/ios/Runner/AppDelegate.swift @@ -0,0 +1,13 @@ +import UIKit +import Flutter + +@UIApplicationMain +@objc class AppDelegate: FlutterAppDelegate { + override func application( + _ application: UIApplication, + didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? + ) -> Bool { + GeneratedPluginRegistrant.register(with: self) + return super.application(application, didFinishLaunchingWithOptions: launchOptions) + } +} diff --git a/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..d36b1fa --- /dev/null +++ b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,122 @@ +{ + "images" : [ + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-App-20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-App-20x20@3x.png", + "scale" : "3x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@3x.png", + "scale" : "3x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@3x.png", + "scale" : "3x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@2x.png", + "scale" : "2x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@3x.png", + "scale" : "3x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-App-20x20@1x.png", + "scale" : "1x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-App-20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@1x.png", + "scale" : "1x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@1x.png", + "scale" : "1x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@2x.png", + "scale" : "2x" + }, + { + "size" : "83.5x83.5", + "idiom" : "ipad", + "filename" : "Icon-App-83.5x83.5@2x.png", + "scale" : "2x" + }, + { + "size" : "1024x1024", + "idiom" : "ios-marketing", + "filename" : "Icon-App-1024x1024@1x.png", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png new file mode 100644 index 0000000..961d23c Binary files /dev/null and b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ diff --git a/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png new file mode 100644 index 0000000..c29771d Binary files /dev/null and b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ diff --git a/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png new file mode 100644 index 0000000..7a13d11 Binary files /dev/null and b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ diff --git a/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png new file mode 100644 index 0000000..238e493 Binary files /dev/null and b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ diff --git a/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png new file mode 100644 index 0000000..3a0c2c4 Binary files /dev/null and b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ diff --git a/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png new file mode 100644 index 0000000..65c6636 Binary files /dev/null and b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png new file mode 100644 index 0000000..344a1d5 Binary files /dev/null and b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png new file mode 100644 index 0000000..7a13d11 Binary files /dev/null and b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ diff --git a/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png new file mode 100644 index 0000000..fdcdb73 Binary files /dev/null and b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png new file mode 100644 index 0000000..f0889b1 Binary files /dev/null and b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png new file mode 100644 index 0000000..0888b38 Binary files /dev/null and b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@1x.png differ diff --git a/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png new file mode 100644 index 0000000..8271a4d Binary files /dev/null and b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-50x50@2x.png differ diff --git a/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png new file mode 100644 index 0000000..e1f8777 Binary files /dev/null and b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@1x.png differ diff --git a/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png new file mode 100644 index 0000000..6c94b51 Binary files /dev/null and b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-57x57@2x.png differ diff --git a/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png new file mode 100644 index 0000000..f0889b1 Binary files /dev/null and b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png new file mode 100644 index 0000000..cd5a201 Binary files /dev/null and b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png new file mode 100644 index 0000000..1b3650e Binary files /dev/null and b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@1x.png differ diff --git a/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png new file mode 100644 index 0000000..de3c34e Binary files /dev/null and b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-72x72@2x.png differ diff --git a/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png new file mode 100644 index 0000000..177b3c2 Binary files /dev/null and b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ diff --git a/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png new file mode 100644 index 0000000..0376301 Binary files /dev/null and b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ diff --git a/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png new file mode 100644 index 0000000..c9d7a11 Binary files /dev/null and b/grocery_helper/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/grocery_helper/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/grocery_helper/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json new file mode 100644 index 0000000..0bedcf2 --- /dev/null +++ b/grocery_helper/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "LaunchImage.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "LaunchImage@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "LaunchImage@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/grocery_helper/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/grocery_helper/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png new file mode 100644 index 0000000..9da19ea Binary files /dev/null and b/grocery_helper/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png differ diff --git a/grocery_helper/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/grocery_helper/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png new file mode 100644 index 0000000..9da19ea Binary files /dev/null and b/grocery_helper/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png differ diff --git a/grocery_helper/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/grocery_helper/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png new file mode 100644 index 0000000..9da19ea Binary files /dev/null and b/grocery_helper/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png differ diff --git a/grocery_helper/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/grocery_helper/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md new file mode 100644 index 0000000..89c2725 --- /dev/null +++ b/grocery_helper/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md @@ -0,0 +1,5 @@ +# Launch Screen Assets + +You can customize the launch screen with your own desired assets by replacing the image files in this directory. + +You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images. \ No newline at end of file diff --git a/grocery_helper/ios/Runner/Base.lproj/LaunchScreen.storyboard b/grocery_helper/ios/Runner/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 0000000..f2e259c --- /dev/null +++ b/grocery_helper/ios/Runner/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/grocery_helper/ios/Runner/Base.lproj/Main.storyboard b/grocery_helper/ios/Runner/Base.lproj/Main.storyboard new file mode 100644 index 0000000..f3c2851 --- /dev/null +++ b/grocery_helper/ios/Runner/Base.lproj/Main.storyboard @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/grocery_helper/ios/Runner/Info.plist b/grocery_helper/ios/Runner/Info.plist new file mode 100644 index 0000000..ecdb42c --- /dev/null +++ b/grocery_helper/ios/Runner/Info.plist @@ -0,0 +1,54 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + One Trip + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + grocery_helper + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleSignature + ???? + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSRequiresIPhoneOS + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UIViewControllerBasedStatusBarAppearance + + CADisableMinimumFrameDurationOnPhone + + UIApplicationSupportsIndirectInputEvents + + NSCameraUsageDescription + So you may take a photo for your profile picture + + + diff --git a/grocery_helper/ios/Runner/Runner-Bridging-Header.h b/grocery_helper/ios/Runner/Runner-Bridging-Header.h new file mode 100644 index 0000000..308a2a5 --- /dev/null +++ b/grocery_helper/ios/Runner/Runner-Bridging-Header.h @@ -0,0 +1 @@ +#import "GeneratedPluginRegistrant.h" diff --git a/grocery_helper/lib/api/auth.dart b/grocery_helper/lib/api/auth.dart new file mode 100644 index 0000000..9824a75 --- /dev/null +++ b/grocery_helper/lib/api/auth.dart @@ -0,0 +1,86 @@ +import 'dart:convert'; + +import 'consts.dart'; +import 'package:http/http.dart' as http; + +class TokenSingleton { + static final TokenSingleton _instance = TokenSingleton._internal(); + String token = ""; + + factory TokenSingleton() { + return _instance; + } + + void setToken(String tok) { + token = tok; + } + + String getToken() { + return token; + } + + TokenSingleton._internal(); +} + +Future getToken(String username, String password) async { + const String requestURL = "$baseURL/auth/token"; + + final http.Response response = await http.post(Uri.parse(requestURL), + body: {"username": username, "password": password}); + + if (response.statusCode == 200) { + Map json = jsonDecode(response.body); + + final TokenSingleton s = TokenSingleton(); + s.setToken(json["token"]); + + return json["token"]; + } else { + return ""; + } +} + +Future testToken(String token) async { + const String requestURL = "$baseURL/auth/users/me"; + + final http.Response response = await http.get( + Uri.parse(requestURL), + headers: { + "Authorization": "Token $token", + }, + ); + + return response.statusCode == 200; +} + +Future signup( + String firstName, + String lastName, + String username, + String password, +) async { + const String requestURL = "$baseURL/auth/users/"; + + final http.Response response = await http.post( + Uri.parse(requestURL), + body: { + "first_name": firstName, + "last_name": lastName, + "username": username, + "password": password, + }, + ); + + if (response.statusCode == 201) { + return ""; + } + + Map errorBody = jsonDecode(response.body); + + List errors = []; + errorBody.forEach((key, value) { + errors.add("$key: ${value[0]}"); + }); + + return errors.join(", "); +} diff --git a/grocery_helper/lib/api/consts.dart b/grocery_helper/lib/api/consts.dart new file mode 100644 index 0000000..6fe171b --- /dev/null +++ b/grocery_helper/lib/api/consts.dart @@ -0,0 +1,3 @@ +const String baseURL = "http://192.168.0.16:8000"; + +const int resultsPerPage = 4; diff --git a/grocery_helper/lib/api/models/homegroup.dart b/grocery_helper/lib/api/models/homegroup.dart new file mode 100644 index 0000000..656112b --- /dev/null +++ b/grocery_helper/lib/api/models/homegroup.dart @@ -0,0 +1,72 @@ +import 'dart:convert'; +import 'package:grocery_helper/api/auth.dart'; +import 'package:grocery_helper/api/consts.dart'; +import 'package:http/http.dart' as http; + +class Homegroup { + int id; + String name; + List recipes; + List users; + List inviteIDs; + + Homegroup({ + required this.id, + required this.name, + required this.recipes, + required this.users, + required this.inviteIDs, + }); + + factory Homegroup.fromJson(Map json) { + List recipes = + (json["recipes"] as List).map(((e) => e as int)).toList(); + List users = + (json["users"] as List).map(((e) => e as int)).toList(); + List inviteIDs = + (json["invites"] as List).map(((e) => e as int)).toList(); + + return Homegroup( + id: json["id"] as int, + name: json["name"] as String, + recipes: recipes, + users: users, + inviteIDs: inviteIDs, + ); + } + + static Future fetchHomegroup(int id) async { + String requestURL = "$baseURL/api/homegroups/$id/"; + + String token = TokenSingleton().getToken(); + final http.Response response = await http.get( + Uri.parse(requestURL), + headers: {"Authorization": "Token $token"}, + ); + + if (response.statusCode == 200) { + Homegroup hg = Homegroup.fromJson(jsonDecode(response.body)); + return hg; + } else { + return null; + } + } + + static Future createHomegroup(String title) async { + String requestURL = "$baseURL/api/homegroups/"; + + String token = TokenSingleton().getToken(); + final http.Response response = await http.post( + Uri.parse(requestURL), + headers: {"Authorization": "Token $token"}, + body: {"name": title}, + ); + + if (response.statusCode == 201) { + Homegroup hg = Homegroup.fromJson(jsonDecode(response.body)); + return hg; + } + + return null; + } +} diff --git a/grocery_helper/lib/api/models/homegroupinvite.dart b/grocery_helper/lib/api/models/homegroupinvite.dart new file mode 100644 index 0000000..ca0c5bf --- /dev/null +++ b/grocery_helper/lib/api/models/homegroupinvite.dart @@ -0,0 +1,71 @@ +import 'dart:convert'; +import 'package:grocery_helper/api/auth.dart'; +import 'package:grocery_helper/api/consts.dart'; +import 'package:http/http.dart' as http; + +class HomegroupInvite { + int id; + int homegroupID; + int userID; + + HomegroupInvite({ + required this.id, + required this.homegroupID, + required this.userID, + }); + + factory HomegroupInvite.fromJson(Map json) { + return HomegroupInvite( + id: json["id"] as int, + homegroupID: json["homegroup"] as int, + userID: json["user"] as int, + ); + } + + static Future get(int id) async { + String requestURL = "$baseURL/api/groupinvites/$id/"; + String token = TokenSingleton().getToken(); + final http.Response response = await http.get( + Uri.parse(requestURL), + headers: {"Authorization": "Token $token"}, + ); + + if (response.statusCode == 200) { + return HomegroupInvite.fromJson(jsonDecode(response.body)); + } + + return null; + } + + static Future createInvite( + int homegroupID, int userID) async { + String requestURL = "$baseURL/api/groupinvites/"; + String token = TokenSingleton().getToken(); + final http.Response response = await http.post( + Uri.parse(requestURL), + headers: {"Authorization": "Token $token"}, + body: {"homegroup": "$homegroupID", "user": "$userID"}, + ); + + if (response.statusCode == 201) { + return HomegroupInvite.fromJson(jsonDecode(response.body)); + } + + return null; + } + + Future deleteInvite() async { + String requestURL = "$baseURL/api/groupinvites/$id/"; + String token = TokenSingleton().getToken(); + final http.Response response = await http.delete( + Uri.parse(requestURL), + headers: {"Authorization": "Token $token"}, + ); + + if (response.statusCode == 204) { + return true; + } + + return false; + } +} diff --git a/grocery_helper/lib/api/models/ingredient.dart b/grocery_helper/lib/api/models/ingredient.dart new file mode 100644 index 0000000..3bc131c --- /dev/null +++ b/grocery_helper/lib/api/models/ingredient.dart @@ -0,0 +1,28 @@ +import 'package:grocery_helper/api/auth.dart'; +import 'package:grocery_helper/api/consts.dart'; +import 'package:http/http.dart' as http; + +class Ingredient { + int id; + String name; + bool inStock; + int contentType; + int objectID; + + Ingredient({ + required this.id, + required this.name, + required this.inStock, + required this.contentType, + required this.objectID, + }); + + factory Ingredient.fromJson(Map json) { + return Ingredient( + id: json["id"] as int, + name: json["name"] as String, + inStock: json["in_stock"] as bool, + contentType: json["content_type"] as int, + objectID: json["object_id"] as int); + } +} diff --git a/grocery_helper/lib/api/models/recipe.dart b/grocery_helper/lib/api/models/recipe.dart new file mode 100644 index 0000000..5ed0cf9 --- /dev/null +++ b/grocery_helper/lib/api/models/recipe.dart @@ -0,0 +1,59 @@ +import 'dart:convert'; + +import 'package:grocery_helper/api/auth.dart'; +import 'package:grocery_helper/api/consts.dart'; +import 'package:grocery_helper/api/models/homegroup.dart'; +import 'package:grocery_helper/api/models/ingredient.dart'; +import 'package:http/http.dart' as http; + +class Recipe { + int id; + String name; + List ingredients; + + Recipe({required this.id, required this.name, required this.ingredients}); + + factory Recipe.fromJson(Map json) { + List ingredients = []; + for (dynamic ingredient in json["ingredients"]) { + ingredients.add(Ingredient.fromJson(ingredient)); + } + return Recipe( + id: json["id"] as int, + name: json["name"] as String, + ingredients: ingredients); + } + + static Future fetch(int id) async { + String requestURL = "$baseURL/api/recipes/$id/"; + + String token = TokenSingleton().getToken(); + final http.Response response = await http.get( + Uri.parse(requestURL), + headers: {"Authorization": "Token $token"}, + ); + + if (response.statusCode == 200) { + return Recipe.fromJson(jsonDecode(response.body)); + } + + return null; + } + + static Future> fetchList(int groupID) async { + Homegroup? group = await Homegroup.fetchHomegroup(groupID); + if (group == null) { + return []; + } + + List recipes = []; + for (int recipeID in group.recipes) { + Recipe? recipe = await Recipe.fetch(recipeID); + if (recipe != null) { + recipes.add(recipe); + } + } + + return recipes; + } +} diff --git a/grocery_helper/lib/api/models/simpleuser.dart b/grocery_helper/lib/api/models/simpleuser.dart new file mode 100644 index 0000000..8e73ec9 --- /dev/null +++ b/grocery_helper/lib/api/models/simpleuser.dart @@ -0,0 +1,89 @@ +import 'dart:convert'; + +import 'package:grocery_helper/api/auth.dart'; +import 'package:grocery_helper/api/consts.dart'; +import 'package:http/http.dart' as http; + +class SearchResult { + List users; + String? next; + + SearchResult({required this.users, required this.next}); +} + +class SimpleUser { + int id; + String username; + String firstName; + String lastName; + String? imageUrl; + int? invite; + + SimpleUser({ + required this.id, + required this.username, + required this.firstName, + required this.lastName, + this.imageUrl, + }); + + factory SimpleUser.fromJson(Map json) { + return SimpleUser( + id: json["id"] as int, + username: json["username"] as String, + firstName: json["first_name"] as String, + lastName: json["last_name"] as String, + imageUrl: json["image"] as String?, + ); + } + + static Future fetchUser({int? id}) async { + String requestURL = "$baseURL/auth/users/${id ?? 'me'}"; + + String token = TokenSingleton().getToken(); + final http.Response response = await http.get( + Uri.parse(requestURL), + headers: {"Authorization": "Token $token"}, + ); + + if (response.statusCode == 200) { + SimpleUser u = SimpleUser.fromJson(jsonDecode(response.body)); + return u; + } else { + return null; + } + } + + static Future search(String query, int page) async { + // String requestURL = ""; + // if (url != null) { + // requestURL = url; + // } else if (query != null) { + // requestURL = "$baseURL/auth/users/?search=$query"; + // } else { + // return SearchResult(users: [], next: null); + // } + + String requestURL = "$baseURL/auth/users/?page=$page&search=$query"; + requestURL = requestURL.replaceAll(RegExp(r"\s+"), "+"); + + String token = TokenSingleton().getToken(); + final http.Response response = await http.get( + Uri.parse(requestURL), + headers: {"Authorization": "Token $token"}, + ); + + if (response.statusCode == 200) { + Map json = jsonDecode(response.body); + List users = []; + for (var userObject in json["results"]) { + SimpleUser u = SimpleUser.fromJson(userObject); + users.add(u); + } + + return SearchResult(users: users, next: json["next"] as String?); + } + + return SearchResult(users: [], next: null); + } +} diff --git a/grocery_helper/lib/api/models/user.dart b/grocery_helper/lib/api/models/user.dart new file mode 100644 index 0000000..2af5956 --- /dev/null +++ b/grocery_helper/lib/api/models/user.dart @@ -0,0 +1,115 @@ +import 'dart:convert'; + +import 'package:grocery_helper/api/auth.dart'; +import 'package:grocery_helper/api/consts.dart'; +import 'package:http/http.dart' as http; +import 'dart:io' show File; + +class User { + int id; + String username; + String firstName; + String lastName; + List homegroupInvites; + int? homegroup; + String? imageUrl; + + User({ + required this.id, + required this.username, + required this.firstName, + required this.lastName, + required this.homegroupInvites, + this.homegroup, + this.imageUrl, + }); + + factory User.fromJson(Map json) { + List invitesDynamic = json["homegroup_invites"]; + List invites = invitesDynamic.map((e) => e as int).toList(); + + return User( + id: json["id"] as int, + username: json["username"] as String, + firstName: json["first_name"] as String, + lastName: json["last_name"] as String, + homegroup: json["homegroup"] as int?, + imageUrl: json["image"] as String?, + homegroupInvites: invites, + ); + } + + static Future fetchUser() async { + String requestURL = "$baseURL/auth/users/me"; + + String token = TokenSingleton().getToken(); + final http.Response response = + await http.get(Uri.parse(requestURL), headers: { + "Authorization": "Token $token", + }); + + if (response.statusCode == 200) { + User u = User.fromJson(jsonDecode(response.body)); + return u; + } else { + return null; + } + } + + Future patch({ + String? firstName, + String? lastName, + int? homegroup, + }) async { + String requestURL = "$baseURL/auth/users/me"; + + Map body = {}; + if (firstName != null) { + body["first_name"] = firstName; + } + + if (lastName != null) { + body["last_name"] = lastName; + } + + if (homegroup != null) { + body["homegroup"] = "$homegroup"; + } + + String token = TokenSingleton().getToken(); + final http.Response response = await http.patch( + Uri.parse(requestURL), + headers: { + "Authorization": "Token $token", + }, + body: body, + ); + + if (response.statusCode == 200) { + return User.fromJson(jsonDecode(response.body)); + } + + return null; + } + + Future uploadImage(File file) async { + String requestURL = "$baseURL/auth/users/me"; + String token = TokenSingleton().getToken(); + + http.MultipartRequest request = + http.MultipartRequest("PATCH", Uri.parse(requestURL)); + + request.headers.addAll({"Authorization": "Token $token"}); + request.files.add(http.MultipartFile.fromBytes( + "image", file.readAsBytesSync(), + filename: file.path)); + + var multiresponse = await request.send(); + http.Response response = await http.Response.fromStream(multiresponse); + if (response.statusCode == 200) { + return User.fromJson(jsonDecode(response.body)); + } + + return null; + } +} diff --git a/grocery_helper/lib/main.dart b/grocery_helper/lib/main.dart new file mode 100644 index 0000000..052570e --- /dev/null +++ b/grocery_helper/lib/main.dart @@ -0,0 +1,30 @@ +import 'package:flutter/material.dart'; +import 'package:grocery_helper/screens/home_screen.dart'; +import 'package:grocery_helper/screens/login_screen.dart'; +import 'package:grocery_helper/theme.dart'; + +void main() { + runApp(const MyApp()); +} + +class MyApp extends StatelessWidget { + const MyApp({super.key}); + + // This widget is the root of your application. + @override + Widget build(BuildContext context) { + return MaterialApp( + title: 'Grocery Helper', + theme: lightTheme, + darkTheme: darkTheme, + themeMode: ThemeMode.system, + debugShowCheckedModeBanner: false, + initialRoute: "/login", + routes: { + "/login": (context) => const LoginScreen(), + "/home": (context) => ScrollConfiguration( + behavior: MyBehavior(), child: const HomeScreen()) + }, + ); + } +} diff --git a/grocery_helper/lib/pages/profile_page/profile_page.dart b/grocery_helper/lib/pages/profile_page/profile_page.dart new file mode 100644 index 0000000..2330c66 --- /dev/null +++ b/grocery_helper/lib/pages/profile_page/profile_page.dart @@ -0,0 +1,165 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_secure_storage/flutter_secure_storage.dart'; +import 'package:grocery_helper/api/models/homegroup.dart'; +import 'package:grocery_helper/widgets/text_entry_dialog.dart'; +import 'package:grocery_helper/pages/profile_page/widgets/homegroup_card_widget.dart'; +import 'package:grocery_helper/pages/profile_page/widgets/profile_card_widget.dart'; +import 'package:grocery_helper/api/models/user.dart'; +import 'package:image_picker/image_picker.dart'; +import 'dart:io' show Platform, File; + +class ProfilePage extends StatefulWidget { + const ProfilePage({super.key}); + + @override + State createState() => _ProfilePageState(); +} + +class _ProfilePageState extends State { + late User _userInfo; + late Future _isLoaded; + + Future _loadProfile() async { + User? userInfo = await User.fetchUser(); + + if (userInfo != null) { + _userInfo = userInfo; + return true; + } + + return false; + } + + void showError(String text) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + backgroundColor: Theme.of(context).colorScheme.error, + content: Text(text), + action: SnackBarAction( + textColor: Theme.of(context).colorScheme.onError, + label: "Dismiss", + onPressed: () => ScaffoldMessenger.of(context).hideCurrentSnackBar(), + ), + ), + ); + } + + @override + void initState() { + super.initState(); + _isLoaded = _loadProfile(); + } + + @override + Widget build(BuildContext context) { + return FutureBuilder( + future: _isLoaded, + builder: (context, snapshot) { + if (snapshot.hasError) { + return Text(snapshot.error.toString()); + } else if (snapshot.hasData && + snapshot.connectionState == ConnectionState.done) { + return Scrollbar( + child: SingleChildScrollView( + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + children: [ + ProfileCard( + userInfo: _userInfo, + onTapPhoto: () async { + if (Platform.isAndroid) { + final ImagePicker picker = ImagePicker(); + final XFile? photo = await picker.pickImage( + source: ImageSource.camera, + imageQuality: 70, + maxWidth: 400, + maxHeight: 400); + + if (photo == null) { + return; + } + File file = File(photo.path); + + User? response = await _userInfo.uploadImage(file); + if (response != null) { + setState(() { + _userInfo = response; + }); + } + } else { + showError( + "This feature is only available on Android"); + } + }, + onLogout: () async { + const storage = FlutterSecureStorage(); + await storage.delete(key: "token"); + + if (mounted) { + Navigator.pushReplacementNamed(context, "/login"); + } + }, + ), + const SizedBox(height: 12), + _userInfo.homegroup == null + ? CreateJoinHomegroup( + invites: _userInfo.homegroupInvites, + onJoin: (id) async { + User? response = + await _userInfo.patch(homegroup: id); + + if (response != null) { + setState(() { + _userInfo = response; + }); + } + }, + onCreate: () async { + String? name = await createHomegroupDialog( + context, + "Create Homegroup", + "Homegroup Name", + defaultValue: "${_userInfo.username}'s Kitchen", + ); + if (name == null) { + return; + } + + if (name == "") { + showError("Homegroup name must not be empty"); + return; + } + + Homegroup? hg = + await Homegroup.createHomegroup(name); + if (hg == null) { + return; + } + + User? response = + await _userInfo.patch(homegroup: hg.id); + + if (response != null) { + setState(() { + _userInfo = response; + }); + } + }, + ) + : EditHomegroup( + homegroupID: _userInfo.homegroup!, + ) + ], + ), + ), + ), + ); + } else { + return const CircularProgressIndicator(); + } + }, + ); + } +} diff --git a/grocery_helper/lib/pages/profile_page/widgets/homegroup_card_widget.dart b/grocery_helper/lib/pages/profile_page/widgets/homegroup_card_widget.dart new file mode 100644 index 0000000..2327d09 --- /dev/null +++ b/grocery_helper/lib/pages/profile_page/widgets/homegroup_card_widget.dart @@ -0,0 +1,360 @@ +import 'package:flutter/material.dart'; +import 'package:grocery_helper/api/models/homegroup.dart'; +import 'package:grocery_helper/api/models/homegroupinvite.dart'; +import 'package:grocery_helper/api/models/simpleuser.dart'; +import 'package:grocery_helper/pages/profile_page/widgets/invite_homegroup_dialog.dart'; +import 'package:grocery_helper/pages/profile_page/widgets/user_chip.dart'; +import 'package:grocery_helper/theme.dart'; + +class CreateJoinHomegroup extends StatefulWidget { + final List invites; + final Function(int id) onJoin; + final Function() onCreate; + + const CreateJoinHomegroup({ + super.key, + required this.invites, + required this.onJoin, + required this.onCreate, + }); + + @override + State createState() => _CreateJoinHomegroupState(); +} + +class _CreateJoinHomegroupState extends State { + late Future _isLoaded; + final List _invitedGroups = []; + + Future _loadInvites() async { + for (int id in widget.invites) { + Homegroup? hg = await Homegroup.fetchHomegroup(id); + + if (hg != null) { + _invitedGroups.add(hg); + } + } + + return true; + } + + @override + void initState() { + super.initState(); + _isLoaded = _loadInvites(); + } + + @override + Widget build(BuildContext context) { + return Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + Card( + elevation: 10, + margin: EdgeInsets.zero, + shape: const RoundedRectangleBorder( + borderRadius: BorderRadius.vertical( + top: Radius.circular(10), bottom: Radius.zero), + ), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + "Create or Join a Homegroup", + style: Theme.of(context).textTheme.titleMedium, + ), + const Divider(), + widget.invites.isEmpty + ? const Text( + "You have not been invited to join any homegroups") + : Center( + child: FutureBuilder( + future: _isLoaded, + builder: ((context, snapshot) { + if (snapshot.hasError) { + return Text(snapshot.error.toString()); + } else if (snapshot.hasData && + snapshot.connectionState == + ConnectionState.done) { + return ListView.separated( + shrinkWrap: true, + itemBuilder: (context, index) { + return JoinRow( + hg: _invitedGroups[index], + onJoin: (id) => widget.onJoin(id), + ); + }, + separatorBuilder: (context, index) => + const Divider(), + itemCount: _invitedGroups.length); + } else { + return const CircularProgressIndicator(); + } + }), + ), + ), + ], + ), + ), + ), + ElevatedButton( + style: bottomButtonStyle, + onPressed: () => widget.onCreate(), + child: const Text("Create Homegroup"), + ) + ], + ); + } +} + +class JoinRow extends StatelessWidget { + final Homegroup hg; + final Function(int id) onJoin; + const JoinRow({super.key, required this.hg, required this.onJoin}); + + @override + Widget build(BuildContext context) { + return Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text(hg.name), + ElevatedButton( + style: ButtonStyle( + backgroundColor: MaterialStatePropertyAll( + Theme.of(context).colorScheme.secondary), + foregroundColor: MaterialStatePropertyAll( + Theme.of(context).colorScheme.onSecondary)), + onPressed: () => onJoin(hg.id), + child: Row( + children: const [ + Text("Join"), + SizedBox(width: 4), + Icon(Icons.check) + ], + ), + ) + ], + ); + } +} + +class EditHomegroup extends StatefulWidget { + final int homegroupID; + + const EditHomegroup({super.key, required this.homegroupID}); + + @override + State createState() => _EditHomegroupState(); +} + +class _EditHomegroupState extends State { + late Future _isLoaded; + Homegroup? _homegroup; + List _groupUsers = []; + List _groupInvites = []; + Map _groupInviteUsers = {}; + + Future _loadHomegroup() async { + Homegroup? hg = await Homegroup.fetchHomegroup(widget.homegroupID); + if (hg == null) { + return false; + } + + _homegroup = hg; + _groupUsers = []; + _groupInvites = []; + _groupInviteUsers = {}; + + for (int id in hg.users) { + SimpleUser? u = await SimpleUser.fetchUser(id: id); + + if (u != null) { + _groupUsers.add(u); + } + } + + for (int id in hg.inviteIDs) { + HomegroupInvite? invite = await HomegroupInvite.get(id); + if (invite == null || hg.users.contains(invite.userID)) { + continue; + } + + SimpleUser? u = await SimpleUser.fetchUser(id: invite.userID); + + if (u != null) { + _groupInvites.add(invite); + _groupInviteUsers[invite] = u; + } + } + + return true; + } + + @override + void initState() { + super.initState(); + _isLoaded = _loadHomegroup(); + } + + @override + Widget build(BuildContext context) { + final TextStyle textstylebase = Theme.of(context).textTheme.titleSmall!; + + final TextStyle textstyle = TextStyle( + fontSize: textstylebase.fontSize, + fontWeight: textstylebase.fontWeight, + color: textstylebase.color, + decorationColor: textstylebase.color, + decorationStyle: TextDecorationStyle.solid, + decoration: TextDecoration.underline); + + return Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + Card( + elevation: 10, + margin: EdgeInsets.zero, + shape: const RoundedRectangleBorder( + borderRadius: BorderRadius.vertical( + top: Radius.circular(10), bottom: Radius.zero), + ), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: FutureBuilder( + future: _isLoaded, + builder: (context, snapshot) { + if (snapshot.hasError) { + return Center(child: Text(snapshot.error.toString())); + } else if (snapshot.hasData && + snapshot.connectionState == ConnectionState.done) { + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + _homegroup!.name, + style: Theme.of(context).textTheme.titleLarge, + ), + const Divider(), + Text( + "Users", + style: textstyle, + ), + const SizedBox(height: 8), + ListView.separated( + physics: const NeverScrollableScrollPhysics(), + shrinkWrap: true, + itemCount: _groupUsers.length, + separatorBuilder: (context, index) => const Divider(), + itemBuilder: (context, index) { + return UserRow( + user: _groupUsers[index], + onButton: (id) {}, + buttonText: "Kick", + ); + }, + ), + const Divider(), + Text( + "Pending Invites", + style: textstyle, + ), + const SizedBox(height: 8), + _groupInvites.isEmpty + ? const Text("None") + : ListView.separated( + physics: const NeverScrollableScrollPhysics(), + shrinkWrap: true, + itemBuilder: (context, index) { + return UserRow( + user: + _groupInviteUsers[_groupInvites[index]]!, + onButton: (id) async { + bool success = await _groupInvites[index] + .deleteInvite(); + if (success) { + setState(() { + _isLoaded = _loadHomegroup(); + }); + } + }, + buttonText: "Cancel", + ); + }, + separatorBuilder: (context, index) => + const Divider(), + itemCount: _groupInvites.length) + ], + ); + } else { + return const Center(child: CircularProgressIndicator()); + } + }, + ), + ), + ), + ElevatedButton( + style: bottomButtonStyle, + onPressed: () async { + List? selectedIDs = await inviteHomegroupDialog(context); + + if (selectedIDs == null) { + return; + } + + for (int id in selectedIDs) { + await HomegroupInvite.createInvite(_homegroup!.id, id); + } + + setState(() { + _isLoaded = _loadHomegroup(); + }); + }, + child: const Text("Invite"), + ) + ], + ); + } +} + +class UserRow extends StatelessWidget { + final SimpleUser user; + final Function(int id) onButton; + final String buttonText; + const UserRow( + {super.key, + required this.user, + required this.onButton, + required this.buttonText}); + + @override + Widget build(BuildContext context) { + final ButtonStyle buttonStyle = ButtonStyle( + padding: const MaterialStatePropertyAll( + EdgeInsets.symmetric(vertical: 8, horizontal: 4)), + backgroundColor: + MaterialStatePropertyAll(Theme.of(context).colorScheme.secondary), + foregroundColor: MaterialStatePropertyAll( + Theme.of(context).colorScheme.onSecondary)); + + return Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + SmallUserChip(user: user), + ElevatedButton( + style: buttonStyle, + onPressed: () => onButton(user.id), + child: Row( + children: [ + Text(buttonText), + const SizedBox(width: 4), + const Icon(Icons.close) + ], + ), + ) + ], + ); + } +} diff --git a/grocery_helper/lib/pages/profile_page/widgets/invite_homegroup_dialog.dart b/grocery_helper/lib/pages/profile_page/widgets/invite_homegroup_dialog.dart new file mode 100644 index 0000000..2836236 --- /dev/null +++ b/grocery_helper/lib/pages/profile_page/widgets/invite_homegroup_dialog.dart @@ -0,0 +1,163 @@ +import 'package:flutter/material.dart'; +import 'package:grocery_helper/api/models/simpleuser.dart'; +import 'package:grocery_helper/pages/profile_page/widgets/user_chip.dart'; +import 'package:grocery_helper/theme.dart'; +import 'package:grocery_helper/widgets/pagination_listview.dart'; + +class InviteHomegroupDialog extends StatefulWidget { + const InviteHomegroupDialog({super.key}); + + @override + State createState() => _InviteHomegroupDialogState(); +} + +class _InviteHomegroupDialogState extends State { + final TextEditingController _searchController = TextEditingController(); + ListViewState _listState = ListViewState.inactive; + List selectedIDs = []; + + @override + Widget build(BuildContext context) { + return Card( + margin: EdgeInsets.zero, + child: Padding( + padding: const EdgeInsets.all(8), + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + "Invite to Homegroup", + style: Theme.of(context).textTheme.titleMedium, + ), + const Divider(), + TextFormField( + controller: _searchController, + textInputAction: TextInputAction.search, + onFieldSubmitted: (value) { + setState(() { + _listState = ListViewState.changed; + }); + }, + onChanged: (value) { + setState(() { + _listState = ListViewState.inactive; + }); + }, + decoration: InputDecoration( + label: const Text("Search"), + isDense: true, + suffix: IconButton( + onPressed: () { + setState(() { + _listState = ListViewState.changed; + }); + + // https://flutterigniter.com/dismiss-keyboard-form-lose-focus/ + FocusScopeNode currentFocus = FocusScope.of(context); + if (!currentFocus.hasPrimaryFocus) { + currentFocus.unfocus(); + } + }, + icon: const Icon(Icons.search), + ), + ), + ), + const SizedBox(height: 8), + LayoutBuilder( + builder: (builder, constraints) { + return ConstrainedBox( + constraints: BoxConstraints.expand( + width: constraints.maxWidth - 8, + height: 160, + ), + child: PaginationListView( + state: _listState, + shrinkWrap: true, + itemBuilder: (context, data) { + return GestureDetector( + behavior: HitTestBehavior.translucent, + onTap: () { + setState(() { + // _ready = false; + _listState = ListViewState.inUse; + if (selectedIDs.contains(data.id)) { + selectedIDs.remove(data.id); + } else { + selectedIDs.add(data.id); + } + }); + }, + child: Container( + padding: const EdgeInsets.all(4), + color: selectedIDs.contains(data.id) + ? Theme.of(context).colorScheme.secondary + : null, + child: Row( + mainAxisSize: MainAxisSize.max, + children: [ + SmallUserChip( + user: data, + radius: 20, + textColor: selectedIDs.contains(data.id) + ? Theme.of(context).colorScheme.onSecondary + : null, + ), + ], + ), + ), + ); + }, + seperatorBuilder: (context, data) { + return const Divider(); + }, + dataProvider: (int page) async { + SearchResult result = + await SimpleUser.search(_searchController.text, page); + List users = List.from(result.users); + + if (result.next == null) { + users.add(null); + } + + return users; + }, + ), + ); + }, + ), + Padding( + padding: const EdgeInsets.only(top: 8), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + ElevatedButton( + onPressed: () => Navigator.pop(context), + child: const Text("Cancel"), + ), + ElevatedButton( + onPressed: () => Navigator.pop(context, selectedIDs), + child: const Text("Done")), + ], + ), + ) + ], + ), + ), + ); + } +} + +Future?> inviteHomegroupDialog(BuildContext context) async { + List? selectedIDs = await showDialog( + context: context, + builder: (context) { + return Dialog( + child: ScrollConfiguration( + behavior: MyBehavior(), child: const InviteHomegroupDialog()), + ); + }, + ); + + return selectedIDs; +} diff --git a/grocery_helper/lib/pages/profile_page/widgets/profile_card_widget.dart b/grocery_helper/lib/pages/profile_page/widgets/profile_card_widget.dart new file mode 100644 index 0000000..2cc59c0 --- /dev/null +++ b/grocery_helper/lib/pages/profile_page/widgets/profile_card_widget.dart @@ -0,0 +1,86 @@ +import 'package:flutter/material.dart'; +import 'package:grocery_helper/api/models/user.dart'; +import 'package:flutter_svg_provider/flutter_svg_provider.dart'; +import 'package:grocery_helper/theme.dart'; + +class ProfileCard extends StatelessWidget { + final User userInfo; + final Function() onTapPhoto; + final Function() onLogout; + const ProfileCard( + {super.key, + required this.userInfo, + required this.onTapPhoto, + required this.onLogout}); + + @override + Widget build(BuildContext context) { + return Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + Card( + elevation: 10, + margin: EdgeInsets.zero, + shape: const RoundedRectangleBorder( + borderRadius: BorderRadius.vertical( + top: Radius.circular(10), bottom: Radius.zero), + ), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Row( + mainAxisSize: MainAxisSize.max, + children: [ + CircleAvatar( + backgroundColor: Theme.of(context).colorScheme.primary, + radius: 42, + child: CircleAvatar( + radius: 40, + backgroundImage: userInfo.imageUrl != null + ? NetworkImage(userInfo.imageUrl!) + : Image( + image: Svg('assets/images/person.svg', + color: Theme.of(context) + .colorScheme + .onPrimaryContainer), + ).image, + backgroundColor: + Theme.of(context).colorScheme.primaryContainer, + // https://github.com/flutter/flutter/issues/42901#issuecomment-708050484 + child: Material( + shape: const CircleBorder(), + clipBehavior: Clip.hardEdge, + color: Colors.transparent, + child: InkWell( + onTap: () => onTapPhoto(), + ), + ), + ), + ), + Padding( + padding: const EdgeInsets.only(left: 12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + "${userInfo.firstName} ${userInfo.lastName}", + style: Theme.of(context).textTheme.titleMedium, + ), + Text("@${userInfo.username}", + style: Theme.of(context).textTheme.titleLarge), + ], + ), + ) + ], + ), + ), + ), + ElevatedButton( + style: bottomButtonStyle, + onPressed: () => onLogout(), + child: const Text("Log out"), + ) + ], + ); + } +} diff --git a/grocery_helper/lib/pages/profile_page/widgets/user_chip.dart b/grocery_helper/lib/pages/profile_page/widgets/user_chip.dart new file mode 100644 index 0000000..2b4147d --- /dev/null +++ b/grocery_helper/lib/pages/profile_page/widgets/user_chip.dart @@ -0,0 +1,51 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_svg_provider/flutter_svg_provider.dart'; +import 'package:grocery_helper/api/models/simpleuser.dart'; + +class SmallUserChip extends StatelessWidget { + final SimpleUser user; + final double? radius; + final Color? textColor; + const SmallUserChip( + {super.key, required this.user, this.radius, this.textColor}); + + @override + Widget build(BuildContext context) { + double baseRadius = radius ?? 30; + return Row( + children: [ + CircleAvatar( + radius: baseRadius, + backgroundColor: Theme.of(context).colorScheme.primary, + child: CircleAvatar( + radius: baseRadius - 2, + backgroundColor: Theme.of(context).colorScheme.primaryContainer, + backgroundImage: user.imageUrl != null + ? NetworkImage(user.imageUrl!) + : Image( + image: Svg('assets/images/person.svg', + color: + Theme.of(context).colorScheme.onPrimaryContainer), + ).image, + ), + ), + const SizedBox(width: 8), + Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + "${user.firstName} ${user.lastName}", + style: TextStyle( + color: textColor ?? Theme.of(context).colorScheme.onSurface), + ), + Text( + "@${user.username}", + style: TextStyle( + color: textColor ?? Theme.of(context).colorScheme.onSurface), + ), + ], + ) + ], + ); + } +} diff --git a/grocery_helper/lib/pages/recipes_page/recipes_page.dart b/grocery_helper/lib/pages/recipes_page/recipes_page.dart new file mode 100644 index 0000000..fd592a8 --- /dev/null +++ b/grocery_helper/lib/pages/recipes_page/recipes_page.dart @@ -0,0 +1,158 @@ +import 'package:flutter/material.dart'; +import 'package:grocery_helper/api/models/homegroup.dart'; +import 'package:grocery_helper/api/models/ingredient.dart'; +import 'package:grocery_helper/api/models/recipe.dart'; +import 'package:grocery_helper/api/models/user.dart'; + +class RecipesPage extends StatefulWidget { + const RecipesPage({super.key}); + + @override + State createState() => _RecipesPageState(); +} + +class _RecipesPageState extends State { + late Future> _recipes; + late User _userInfo; + late Homegroup _homegroup; + + Future> _fetchList() async { + User? userInfo = await User.fetchUser(); + if (userInfo == null || userInfo.homegroup == null) { + return []; + } + _userInfo = userInfo; + + List recipes = await Recipe.fetchList(_userInfo.homegroup!); + return recipes; + } + + @override + void initState() { + super.initState(); + _recipes = _fetchList(); + } + + @override + Widget build(BuildContext context) { + return FutureBuilder( + future: _recipes, + builder: (context, snapshot) { + if (snapshot.hasError) { + return Text(snapshot.error.toString()); + } else if (snapshot.hasData && + snapshot.connectionState == ConnectionState.done) { + return RecipeList(recipes: snapshot.data!); + } else { + return const CircularProgressIndicator(); + } + }, + ); + } +} + +class RecipeList extends StatelessWidget { + final List recipes; + const RecipeList({super.key, required this.recipes}); + + @override + Widget build(BuildContext context) { + return Stack( + children: [ + ListView.builder( + padding: const EdgeInsets.all(8), + itemCount: recipes.length, + itemBuilder: (context, index) => + RecipeCard(recipe: recipes[index])), + Align( + alignment: Alignment.bottomRight, + child: Padding( + padding: const EdgeInsets.all(8.0), + child: FloatingActionButton.extended( + onPressed: () {}, + label: Row( + children: const [Icon(Icons.note_add), Text("New Recipe")], + ), + // child: const Icon(Icons.note_add), + ), + ), + ) + ], + ); + } +} + +class RecipeCard extends StatelessWidget { + final Recipe recipe; + const RecipeCard({super.key, required this.recipe}); + + @override + Widget build(BuildContext context) { + final TextStyle ingredientStyle = Theme.of(context) + .textTheme + .titleLarge! + .copyWith(color: Theme.of(context).colorScheme.onSurface); + + return Card( + elevation: 10, + shape: const RoundedRectangleBorder( + borderRadius: BorderRadius.vertical( + top: Radius.circular(10), bottom: Radius.zero), + ), + margin: EdgeInsets.zero, + child: Padding( + padding: const EdgeInsets.symmetric(vertical: 8), + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + Padding( + padding: const EdgeInsets.symmetric(horizontal: 8), + child: Text( + recipe.name, + style: Theme.of(context).textTheme.titleLarge, + ), + ), + const Divider(), + Container( + color: Theme.of(context).colorScheme.surface, + child: ListView.separated( + padding: const EdgeInsets.all(8), + itemCount: (recipe.ingredients.length / 2).ceil(), + shrinkWrap: true, + separatorBuilder: (context, index) => Divider( + color: Theme.of(context).colorScheme.onSurface, + ), + itemBuilder: (context, index) { + if (recipe.ingredients.length % 2 == 0 || + index * 2 <= recipe.ingredients.length - 2) { + return Row( + children: [ + Expanded( + child: Text( + recipe.ingredients[index * 2].name, + style: ingredientStyle, + ), + ), + Expanded( + child: Text(recipe.ingredients[index * 2 + 1].name, + style: ingredientStyle), + ) + ], + ); + } else { + return Row( + children: [ + Text(recipe.ingredients[index * 2].name, + style: ingredientStyle), + ], + ); + } + }, + ), + ) + ], + ), + ), + ); + } +} diff --git a/grocery_helper/lib/pages/themetest.dart b/grocery_helper/lib/pages/themetest.dart new file mode 100644 index 0000000..9f9ef8e --- /dev/null +++ b/grocery_helper/lib/pages/themetest.dart @@ -0,0 +1,125 @@ +import 'package:flutter/material.dart'; + +class ColorPage extends StatelessWidget { + const ColorPage({super.key}); + + @override + Widget build(BuildContext context) { + return GridView.count( + crossAxisCount: 3, + children: [ + // FIRST ROW + Container( + padding: const EdgeInsets.all(8), + color: Theme.of(context).colorScheme.primary, + child: Center( + child: Text( + "Primary", + style: TextStyle(color: Theme.of(context).colorScheme.onPrimary), + )), + ), + Container( + padding: const EdgeInsets.all(8), + color: Theme.of(context).colorScheme.secondary, + child: Center( + child: Text( + "Secondary", + style: TextStyle(color: Theme.of(context).colorScheme.onSecondary), + )), + ), + Container( + padding: const EdgeInsets.all(8), + color: Theme.of(context).colorScheme.tertiary, + child: Center( + child: Text( + "Tertiary", + style: TextStyle(color: Theme.of(context).colorScheme.onTertiary), + )), + ), + + // SECOND ROW + Container( + padding: const EdgeInsets.all(8), + color: Theme.of(context).colorScheme.primaryContainer, + child: Center( + child: Text( + "Primary Container", + style: TextStyle( + color: Theme.of(context).colorScheme.onPrimaryContainer), + )), + ), + Container( + padding: const EdgeInsets.all(8), + color: Theme.of(context).colorScheme.secondaryContainer, + child: Center( + child: Text( + "Secondary Container", + style: TextStyle( + color: Theme.of(context).colorScheme.onSecondaryContainer), + )), + ), + Container( + padding: const EdgeInsets.all(8), + color: Theme.of(context).colorScheme.tertiaryContainer, + child: Center( + child: Text( + "Tertiary Container", + style: TextStyle( + color: Theme.of(context).colorScheme.onTertiaryContainer), + )), + ), + + // THIRD ROW + Container( + padding: const EdgeInsets.all(8), + color: Theme.of(context).colorScheme.error, + child: Center( + child: Text( + "Error", + style: TextStyle(color: Theme.of(context).colorScheme.onError), + )), + ), + Container( + padding: const EdgeInsets.all(8), + color: Theme.of(context).colorScheme.background, + child: Center( + child: Text( + "Background", + style: TextStyle(color: Theme.of(context).colorScheme.onBackground), + )), + ), + Container( + padding: const EdgeInsets.all(8), + color: Theme.of(context).colorScheme.surface, + child: Center( + child: Text( + "Surface", + style: TextStyle(color: Theme.of(context).colorScheme.onSurface), + )), + ), + + // FOURTH ROW + Container( + padding: const EdgeInsets.all(8), + color: Theme.of(context).colorScheme.errorContainer, + child: Center( + child: Text( + "Error Container", + style: TextStyle( + color: Theme.of(context).colorScheme.onErrorContainer), + )), + ), + Container( + padding: const EdgeInsets.all(8), + color: Theme.of(context).colorScheme.surfaceVariant, + child: Center( + child: Text( + "Surface Variant", + style: TextStyle( + color: Theme.of(context).colorScheme.onSurfaceVariant), + )), + ), + ], + ); + } +} diff --git a/grocery_helper/lib/screens/home_screen.dart b/grocery_helper/lib/screens/home_screen.dart new file mode 100644 index 0000000..cb3e937 --- /dev/null +++ b/grocery_helper/lib/screens/home_screen.dart @@ -0,0 +1,75 @@ +import 'package:flutter/material.dart'; +import 'package:grocery_helper/pages/profile_page/profile_page.dart'; +import 'package:grocery_helper/pages/recipes_page/recipes_page.dart'; +import 'package:grocery_helper/pages/themetest.dart'; + +class HomeScreen extends StatefulWidget { + const HomeScreen({super.key}); + + @override + State createState() => _HomeScreenState(); +} + +class _HomeScreenState extends State { + int _selectedPage = 0; + late List _pages; + final List _pageNames = [ + "Shopping List", + "Saved Recipes", + "Your Profile", + "Color Debug" + ]; + + @override + void initState() { + _pages = [ + Container(), + const RecipesPage(), + const ProfilePage(), + const ColorPage() + ]; + super.initState(); + } + + @override + Widget build(BuildContext context) { + return Scaffold( + body: SafeArea(child: _pages[_selectedPage]), + appBar: AppBar(title: Text(_pageNames[_selectedPage])), + bottomNavigationBar: BottomNavigationBar( + type: BottomNavigationBarType.shifting, + selectedItemColor: Theme.of(context).colorScheme.primary, + unselectedItemColor: Theme.of(context).colorScheme.secondary, + landscapeLayout: BottomNavigationBarLandscapeLayout.centered, + items: [ + BottomNavigationBarItem( + icon: const Icon(Icons.list_alt), + label: "List", + backgroundColor: Theme.of(context).colorScheme.secondaryContainer, + ), + BottomNavigationBarItem( + icon: const Icon(Icons.menu_book), + label: "Recipes", + backgroundColor: Theme.of(context).colorScheme.secondaryContainer, + ), + BottomNavigationBarItem( + icon: const Icon(Icons.person), + label: "Profile", + backgroundColor: Theme.of(context).colorScheme.secondaryContainer, + ), + BottomNavigationBarItem( + icon: const Icon(Icons.grid_3x3), + label: "Colors", + backgroundColor: Theme.of(context).colorScheme.secondaryContainer, + ) + ], + currentIndex: _selectedPage, + onTap: (value) { + setState(() { + _selectedPage = value; + }); + }, + ), + ); + } +} diff --git a/grocery_helper/lib/screens/login_screen.dart b/grocery_helper/lib/screens/login_screen.dart new file mode 100644 index 0000000..039cd99 --- /dev/null +++ b/grocery_helper/lib/screens/login_screen.dart @@ -0,0 +1,338 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_secure_storage/flutter_secure_storage.dart'; +import 'package:flutter_svg/flutter_svg.dart'; +import 'package:grocery_helper/api/auth.dart'; + +class LoginScreen extends StatefulWidget { + const LoginScreen({super.key}); + + @override + State createState() => _LoginScreenState(); +} + +class _LoginScreenState extends State { + final List _isSelected = [true, false]; + + @override + Widget build(BuildContext context) { + final Brightness brightness = Theme.of(context).colorScheme.brightness; + return Scaffold( + body: Center( + child: SingleChildScrollView( + child: Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + mainAxisAlignment: MainAxisAlignment.start, + mainAxisSize: MainAxisSize.max, + children: [ + SizedBox.square( + dimension: 200, + child: SvgPicture.asset( + brightness == Brightness.light + ? "assets/images/holes.svg" + : "assets/images/holes-dark.svg", + fit: BoxFit.contain, + ), + ), + FractionallySizedBox( + widthFactor: 0.9, + child: Card( + elevation: 10, + child: Padding( + padding: const EdgeInsets.all(8), + child: Column( + children: [ + LayoutBuilder(builder: (builder, constraints) { + return ToggleButtons( + isSelected: _isSelected, + constraints: BoxConstraints.expand( + width: constraints.maxWidth / 2 - 8, + height: 30), + selectedBorderColor: + Theme.of(context).colorScheme.primary, + onPressed: (index) { + setState(() { + for (int i = 0; i < _isSelected.length; i++) { + _isSelected[i] = (i == index); + } + }); + }, + children: const [Text("Log In"), Text("Sign Up")], + ); + }), + _isSelected[0] ? const LoginForm() : const SignupForm() + ], + ), + ), + ), + ), + ], + ), + ), + ), + ); + } +} + +class LoginForm extends StatefulWidget { + const LoginForm({super.key}); + + @override + State createState() => _LoginFormState(); +} + +class _LoginFormState extends State { + bool _stayLoggedIn = false; + bool _tryingLogin = false; + final _usernameController = TextEditingController(text: ""); + final _passwordController = TextEditingController(text: ""); + + void tryLogIn(bool save) async { + setState(() { + _tryingLogin = true; + }); + + String tok = + await getToken(_usernameController.text, _passwordController.text); + + if (tok == "") { + showError("That Username / Password combination does not exist."); + setState(() { + _tryingLogin = false; + }); + return; + } + + if (save) { + const storage = FlutterSecureStorage(); + storage.write(key: "token", value: tok); + } + + if (mounted) { + await Navigator.pushReplacementNamed(context, "/home"); + } + } + + void trySavedToken() async { + setState(() { + _tryingLogin = true; + }); + + // get token from storage + const storage = FlutterSecureStorage(); + final String? token = await storage.read(key: "token"); + if (token == null) { + setState(() { + _tryingLogin = false; + }); + + return; + } + + // check the stored token still works + final bool stillValid = await testToken(token); + if (!stillValid) { + storage.delete(key: "token"); + + setState(() { + _tryingLogin = false; + }); + return; + } + + // store the token in a singleton to avoid repeated storage accesses + final TokenSingleton s = TokenSingleton(); + s.setToken(token); + + if (mounted) { + await Navigator.pushReplacementNamed(context, "/home"); + } + } + + void showError(String text) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + backgroundColor: Theme.of(context).colorScheme.error, + content: Text(text), + action: SnackBarAction( + textColor: Theme.of(context).colorScheme.onError, + label: "Dismiss", + onPressed: () => ScaffoldMessenger.of(context).hideCurrentSnackBar(), + ), + ), + ); + } + + @override + void initState() { + super.initState(); + trySavedToken(); + } + + @override + Widget build(BuildContext context) { + return Form( + child: Column( + children: [ + TextFormField( + controller: _usernameController, + textInputAction: TextInputAction.next, + decoration: const InputDecoration(hintText: "Username"), + ), + TextFormField( + controller: _passwordController, + textInputAction: TextInputAction.done, + obscureText: true, + decoration: const InputDecoration(hintText: "Password"), + onFieldSubmitted: (value) => tryLogIn(_stayLoggedIn), + ), + Row( + children: [ + const Text("Stay Logged In:"), + Checkbox( + value: _stayLoggedIn, + onChanged: (value) { + setState(() { + _stayLoggedIn = value!; + }); + }, + ) + ], + ), + ElevatedButton( + onPressed: !_tryingLogin ? () => tryLogIn(_stayLoggedIn) : null, + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + mainAxisSize: MainAxisSize.min, + children: _tryingLogin + ? [ + const Text("Log In"), + const Padding( + padding: EdgeInsets.only(left: 12), + child: Center( + child: SizedBox( + height: 20, + width: 20, + child: CircularProgressIndicator(), + ), + ), + ) + ] + : const [ + Text("Log In"), + ], + ), + ) + ], + ), + ); + } +} + +class SignupForm extends StatefulWidget { + const SignupForm({super.key}); + + @override + State createState() => _SignupFormState(); +} + +class _SignupFormState extends State { + final _usernameController = TextEditingController(text: ""); + final _passwordController = TextEditingController(text: ""); + final _firstnameController = TextEditingController(text: ""); + final _lastnameController = TextEditingController(text: ""); + + void showError(String text) { + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + backgroundColor: Theme.of(context).colorScheme.error, + content: Text(text), + action: SnackBarAction( + textColor: Theme.of(context).colorScheme.onError, + label: "Dismiss", + onPressed: () => ScaffoldMessenger.of(context).hideCurrentSnackBar(), + ), + ), + ); + } + + void trySignUpLogin() async { + String firstName = _firstnameController.text; + String lastName = _lastnameController.text; + String userName = _usernameController.text; + String password = _passwordController.text; + + if (firstName == "" || lastName == "" || userName == "" || password == "") { + showError("All fields must be populated"); + return; + } + + String errors = await signup(firstName, lastName, userName, password); + + if (errors != "") { + showError(errors); + return; + } + + String tok = await getToken(userName, password); + if (tok == "") { + showError("That Username / Password combination does not exist."); + return; + } + + if (mounted) { + await Navigator.pushReplacementNamed(context, "/home"); + } + } + + @override + Widget build(BuildContext context) { + return Form( + child: Column( + children: [ + Row( + children: [ + Flexible( + child: TextFormField( + controller: _firstnameController, + textInputAction: TextInputAction.next, + decoration: const InputDecoration(hintText: "First Name"), + ), + ), + const SizedBox(width: 8), + Flexible( + child: TextFormField( + controller: _lastnameController, + textInputAction: TextInputAction.next, + decoration: const InputDecoration(hintText: "Last Name"), + ), + ) + ], + ), + TextFormField( + controller: _usernameController, + textInputAction: TextInputAction.next, + decoration: const InputDecoration(hintText: "Username"), + ), + TextFormField( + controller: _passwordController, + textInputAction: TextInputAction.done, + obscureText: true, + decoration: const InputDecoration(hintText: "Password"), + onFieldSubmitted: (value) async => trySignUpLogin(), + ), + const SizedBox(height: 8), + ElevatedButton( + onPressed: () async { + trySignUpLogin(); + }, + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + mainAxisSize: MainAxisSize.min, + children: const [Text("Sign up & Log in")], + ), + ) + ], + ), + ); + } +} diff --git a/grocery_helper/lib/theme.dart b/grocery_helper/lib/theme.dart new file mode 100644 index 0000000..0c9c6f2 --- /dev/null +++ b/grocery_helper/lib/theme.dart @@ -0,0 +1,43 @@ +import 'package:flutter/material.dart'; + +// const Color _seed = Color.fromARGB(255, 8, 150, 255); +const Color _seed = Color.fromARGB(255, 50, 110, 160); + +final _darkScheme = + ColorScheme.fromSeed(seedColor: _seed, brightness: Brightness.dark); + +final _lightScheme = + ColorScheme.fromSeed(seedColor: _seed, brightness: Brightness.light); + +final darkTheme = ThemeData( + colorScheme: _darkScheme, + toggleableActiveColor: _darkScheme.primary, + floatingActionButtonTheme: FloatingActionButtonThemeData( + backgroundColor: _darkScheme.primary, + splashColor: _darkScheme.secondary, + ), + cardColor: _darkScheme.secondaryContainer); + +final lightTheme = ThemeData( + colorScheme: _lightScheme, + toggleableActiveColor: _lightScheme.primary, + cardColor: _lightScheme.secondaryContainer); + +final bottomButtonStyle = ButtonStyle( + tapTargetSize: MaterialTapTargetSize.shrinkWrap, + shape: MaterialStateProperty.all( + const RoundedRectangleBorder( + borderRadius: + BorderRadius.vertical(top: Radius.zero, bottom: Radius.circular(10)), + ), + ), +); + +// https://stackoverflow.com/a/51119796/13538080 +class MyBehavior extends ScrollBehavior { + @override + Widget buildOverscrollIndicator( + BuildContext context, Widget child, ScrollableDetails details) { + return child; + } +} diff --git a/grocery_helper/lib/widgets/pagination_listview.dart b/grocery_helper/lib/widgets/pagination_listview.dart new file mode 100644 index 0000000..064a72d --- /dev/null +++ b/grocery_helper/lib/widgets/pagination_listview.dart @@ -0,0 +1,112 @@ +import "package:flutter/material.dart"; + +enum ListViewState { inUse, changed, inactive } + +class PaginationListView extends StatefulWidget { + final Widget Function(BuildContext context, dynamic data) itemBuilder; + final Widget Function(BuildContext context, dynamic data) seperatorBuilder; + final bool? shrinkWrap; + final ListViewState state; + final Future> Function(int page) dataProvider; + + const PaginationListView( + {super.key, + required this.itemBuilder, + required this.dataProvider, + required this.state, + required this.seperatorBuilder, + this.shrinkWrap}); + + @override + State createState() => _PaginationListViewState(); +} + +class _PaginationListViewState extends State { + int _pagesLoaded = 0; + List _data = []; + bool _dataLeft = true; + bool _isLoading = false; + ListViewState _state = ListViewState.inactive; + late ScrollController _scrollController; + + void consumeData() async { + if (_state != ListViewState.inUse || _isLoading || !_dataLeft) { + return; + } + + setState(() { + _isLoading = true; + }); + + List newData = await widget.dataProvider(_pagesLoaded + 1); + if (newData[newData.length - 1] == null) { + newData.removeAt(newData.length - 1); + _dataLeft = false; + } + + _pagesLoaded++; + + setState(() { + _data.addAll(newData); + }); + + setState(() { + _isLoading = false; + }); + } + + @override + void initState() { + super.initState(); + _scrollController = ScrollController(); + _state = widget.state; + } + + @override + void didUpdateWidget(covariant PaginationListView oldWidget) { + super.didUpdateWidget(oldWidget); + _state = widget.state; + if (_state == ListViewState.changed) { + _state = ListViewState.inUse; + _data = []; + _dataLeft = true; + _isLoading = false; + _pagesLoaded = 0; + consumeData(); + } + } + + @override + Widget build(BuildContext context) { + List stackChildren = [ + NotificationListener( + onNotification: (notification) { + if (_scrollController.position.maxScrollExtent == + _scrollController.position.pixels) { + consumeData(); + } + return true; + }, + // child: Scrollbar( + child: ListView.separated( + controller: _scrollController, + itemCount: _data.length, + shrinkWrap: widget.shrinkWrap ?? false, + itemBuilder: (context, index) => + widget.itemBuilder(context, _data[index]), + separatorBuilder: (context, index) => + widget.seperatorBuilder(context, _data[index]), + ), + ), + // ) + ]; + + if (_isLoading) { + stackChildren.add(const Center(child: CircularProgressIndicator())); + } + + return Stack( + children: stackChildren, + ); + } +} diff --git a/grocery_helper/lib/widgets/text_entry_dialog.dart b/grocery_helper/lib/widgets/text_entry_dialog.dart new file mode 100644 index 0000000..fcb4735 --- /dev/null +++ b/grocery_helper/lib/widgets/text_entry_dialog.dart @@ -0,0 +1,82 @@ +import 'package:flutter/material.dart'; + +class TextEntryForm extends StatefulWidget { + final String title; + final String label; + final String? defaultValue; + const TextEntryForm( + {super.key, required this.title, required this.label, this.defaultValue}); + + @override + State createState() => _TextEntryFormState(); +} + +class _TextEntryFormState extends State { + late TextEditingController _textController; + + @override + void initState() { + super.initState(); + _textController = TextEditingController(text: widget.defaultValue); + } + + @override + Widget build(BuildContext context) { + return Card( + margin: EdgeInsets.zero, + child: Padding( + padding: const EdgeInsets.all(8), + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + widget.title, + style: Theme.of(context).textTheme.titleMedium, + ), + const Divider(), + TextFormField( + controller: _textController, + decoration: InputDecoration(hintText: widget.label), + ), + Padding( + padding: const EdgeInsets.only(top: 8), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + ElevatedButton( + onPressed: () => Navigator.pop(context), + child: const Text("Cancel"), + ), + ElevatedButton( + onPressed: () => + Navigator.pop(context, _textController.text), + child: const Text("Done")), + ], + ), + ), + ], + ), + ), + ); + } +} + +Future createHomegroupDialog( + BuildContext context, String title, String label, + {String? defaultValue}) async { + String? name = await showDialog( + context: context, + builder: (context) { + return Dialog( + child: TextEntryForm( + title: title, + label: label, + defaultValue: defaultValue, + ), + ); + }, + ); + + return name; +} diff --git a/grocery_helper/linux/.gitignore b/grocery_helper/linux/.gitignore new file mode 100644 index 0000000..d3896c9 --- /dev/null +++ b/grocery_helper/linux/.gitignore @@ -0,0 +1 @@ +flutter/ephemeral diff --git a/grocery_helper/linux/CMakeLists.txt b/grocery_helper/linux/CMakeLists.txt new file mode 100644 index 0000000..3977f07 --- /dev/null +++ b/grocery_helper/linux/CMakeLists.txt @@ -0,0 +1,138 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.10) +project(runner LANGUAGES CXX) + +# The name of the executable created for the application. Change this to change +# the on-disk name of your application. +set(BINARY_NAME "one_trip") +# The unique GTK application identifier for this application. See: +# https://wiki.gnome.org/HowDoI/ChooseApplicationID +set(APPLICATION_ID "com.example.grocery_helper") + +# Explicitly opt in to modern CMake behaviors to avoid warnings with recent +# versions of CMake. +cmake_policy(SET CMP0063 NEW) + +# Load bundled libraries from the lib/ directory relative to the binary. +set(CMAKE_INSTALL_RPATH "$ORIGIN/lib") + +# Root filesystem for cross-building. +if(FLUTTER_TARGET_PLATFORM_SYSROOT) + set(CMAKE_SYSROOT ${FLUTTER_TARGET_PLATFORM_SYSROOT}) + set(CMAKE_FIND_ROOT_PATH ${CMAKE_SYSROOT}) + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) + set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +endif() + +# Define build configuration options. +if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE "Debug" CACHE + STRING "Flutter build mode" FORCE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Profile" "Release") +endif() + +# Compilation settings that should be applied to most targets. +# +# Be cautious about adding new options here, as plugins use this function by +# default. In most cases, you should add new options to specific targets instead +# of modifying this function. +function(APPLY_STANDARD_SETTINGS TARGET) + target_compile_features(${TARGET} PUBLIC cxx_std_14) + target_compile_options(${TARGET} PRIVATE -Wall -Werror) + target_compile_options(${TARGET} PRIVATE "$<$>:-O3>") + target_compile_definitions(${TARGET} PRIVATE "$<$>:NDEBUG>") +endfunction() + +# Flutter library and tool build rules. +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# System-level dependencies. +find_package(PkgConfig REQUIRED) +pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) + +add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}") + +# Define the application target. To change its name, change BINARY_NAME above, +# not the value here, or `flutter run` will no longer work. +# +# Any new source files that you add to the application should be added here. +add_executable(${BINARY_NAME} + "main.cc" + "my_application.cc" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" +) + +# Apply the standard set of build settings. This can be removed for applications +# that need different build settings. +apply_standard_settings(${BINARY_NAME}) + +# Add dependency libraries. Add any application-specific dependencies here. +target_link_libraries(${BINARY_NAME} PRIVATE flutter) +target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK) + +# Run the Flutter tool portions of the build. This must not be removed. +add_dependencies(${BINARY_NAME} flutter_assemble) + +# Only the install-generated bundle's copy of the executable will launch +# correctly, since the resources must in the right relative locations. To avoid +# people trying to run the unbundled copy, put it in a subdirectory instead of +# the default top-level location. +set_target_properties(${BINARY_NAME} + PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intermediates_do_not_run" +) + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# By default, "installing" just makes a relocatable bundle in the build +# directory. +set(BUILD_BUNDLE_DIR "${PROJECT_BINARY_DIR}/bundle") +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +endif() + +# Start with a clean build bundle directory every time. +install(CODE " + file(REMOVE_RECURSE \"${BUILD_BUNDLE_DIR}/\") + " COMPONENT Runtime) + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib") + +install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +foreach(bundled_library ${PLUGIN_BUNDLED_LIBRARIES}) + install(FILES "${bundled_library}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endforeach(bundled_library) + +# Fully re-copy the assets directory on each build to avoid having stale files +# from a previous install. +set(FLUTTER_ASSET_DIR_NAME "flutter_assets") +install(CODE " + file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") + " COMPONENT Runtime) +install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" + DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) + +# Install the AOT library on non-Debug builds only. +if(NOT CMAKE_BUILD_TYPE MATCHES "Debug") + install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() diff --git a/grocery_helper/linux/flutter/CMakeLists.txt b/grocery_helper/linux/flutter/CMakeLists.txt new file mode 100644 index 0000000..d5bd016 --- /dev/null +++ b/grocery_helper/linux/flutter/CMakeLists.txt @@ -0,0 +1,88 @@ +# This file controls Flutter-level build steps. It should not be edited. +cmake_minimum_required(VERSION 3.10) + +set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") + +# Configuration provided via flutter tool. +include(${EPHEMERAL_DIR}/generated_config.cmake) + +# TODO: Move the rest of this into files in ephemeral. See +# https://github.com/flutter/flutter/issues/57146. + +# Serves the same purpose as list(TRANSFORM ... PREPEND ...), +# which isn't available in 3.10. +function(list_prepend LIST_NAME PREFIX) + set(NEW_LIST "") + foreach(element ${${LIST_NAME}}) + list(APPEND NEW_LIST "${PREFIX}${element}") + endforeach(element) + set(${LIST_NAME} "${NEW_LIST}" PARENT_SCOPE) +endfunction() + +# === Flutter Library === +# System-level dependencies. +find_package(PkgConfig REQUIRED) +pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) +pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0) +pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0) + +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so") + +# Published to parent scope for install step. +set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) +set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) +set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) +set(AOT_LIBRARY "${PROJECT_DIR}/build/lib/libapp.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "fl_basic_message_channel.h" + "fl_binary_codec.h" + "fl_binary_messenger.h" + "fl_dart_project.h" + "fl_engine.h" + "fl_json_message_codec.h" + "fl_json_method_codec.h" + "fl_message_codec.h" + "fl_method_call.h" + "fl_method_channel.h" + "fl_method_codec.h" + "fl_method_response.h" + "fl_plugin_registrar.h" + "fl_plugin_registry.h" + "fl_standard_message_codec.h" + "fl_standard_method_codec.h" + "fl_string_codec.h" + "fl_value.h" + "fl_view.h" + "flutter_linux.h" +) +list_prepend(FLUTTER_LIBRARY_HEADERS "${EPHEMERAL_DIR}/flutter_linux/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}") +target_link_libraries(flutter INTERFACE + PkgConfig::GTK + PkgConfig::GLIB + PkgConfig::GIO +) +add_dependencies(flutter flutter_assemble) + +# === Flutter tool backend === +# _phony_ is a non-existent file to force this command to run every time, +# since currently there's no way to get a full input/output list from the +# flutter tool. +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CMAKE_CURRENT_BINARY_DIR}/_phony_ + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.sh" + ${FLUTTER_TARGET_PLATFORM} ${CMAKE_BUILD_TYPE} + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} +) diff --git a/grocery_helper/linux/flutter/generated_plugin_registrant.cc b/grocery_helper/linux/flutter/generated_plugin_registrant.cc new file mode 100644 index 0000000..d0e7f79 --- /dev/null +++ b/grocery_helper/linux/flutter/generated_plugin_registrant.cc @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + +#include + +void fl_register_plugins(FlPluginRegistry* registry) { + g_autoptr(FlPluginRegistrar) flutter_secure_storage_linux_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterSecureStorageLinuxPlugin"); + flutter_secure_storage_linux_plugin_register_with_registrar(flutter_secure_storage_linux_registrar); +} diff --git a/grocery_helper/linux/flutter/generated_plugin_registrant.h b/grocery_helper/linux/flutter/generated_plugin_registrant.h new file mode 100644 index 0000000..e0f0a47 --- /dev/null +++ b/grocery_helper/linux/flutter/generated_plugin_registrant.h @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void fl_register_plugins(FlPluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/grocery_helper/linux/flutter/generated_plugins.cmake b/grocery_helper/linux/flutter/generated_plugins.cmake new file mode 100644 index 0000000..b29e9ba --- /dev/null +++ b/grocery_helper/linux/flutter/generated_plugins.cmake @@ -0,0 +1,24 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST + flutter_secure_storage_linux +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/linux plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/grocery_helper/linux/main.cc b/grocery_helper/linux/main.cc new file mode 100644 index 0000000..e7c5c54 --- /dev/null +++ b/grocery_helper/linux/main.cc @@ -0,0 +1,6 @@ +#include "my_application.h" + +int main(int argc, char** argv) { + g_autoptr(MyApplication) app = my_application_new(); + return g_application_run(G_APPLICATION(app), argc, argv); +} diff --git a/grocery_helper/linux/my_application.cc b/grocery_helper/linux/my_application.cc new file mode 100644 index 0000000..c9e9c70 --- /dev/null +++ b/grocery_helper/linux/my_application.cc @@ -0,0 +1,104 @@ +#include "my_application.h" + +#include +#ifdef GDK_WINDOWING_X11 +#include +#endif + +#include "flutter/generated_plugin_registrant.h" + +struct _MyApplication { + GtkApplication parent_instance; + char** dart_entrypoint_arguments; +}; + +G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION) + +// Implements GApplication::activate. +static void my_application_activate(GApplication* application) { + MyApplication* self = MY_APPLICATION(application); + GtkWindow* window = + GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application))); + + // Use a header bar when running in GNOME as this is the common style used + // by applications and is the setup most users will be using (e.g. Ubuntu + // desktop). + // If running on X and not using GNOME then just use a traditional title bar + // in case the window manager does more exotic layout, e.g. tiling. + // If running on Wayland assume the header bar will work (may need changing + // if future cases occur). + gboolean use_header_bar = TRUE; +#ifdef GDK_WINDOWING_X11 + GdkScreen* screen = gtk_window_get_screen(window); + if (GDK_IS_X11_SCREEN(screen)) { + const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen); + if (g_strcmp0(wm_name, "GNOME Shell") != 0) { + use_header_bar = FALSE; + } + } +#endif + if (use_header_bar) { + GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); + gtk_widget_show(GTK_WIDGET(header_bar)); + gtk_header_bar_set_title(header_bar, "One Trip"); + gtk_header_bar_set_show_close_button(header_bar, TRUE); + gtk_window_set_titlebar(window, GTK_WIDGET(header_bar)); + } else { + gtk_window_set_title(window, "One Trip"); + } + + gtk_window_set_default_size(window, 1280, 720); + gtk_widget_show(GTK_WIDGET(window)); + + g_autoptr(FlDartProject) project = fl_dart_project_new(); + fl_dart_project_set_dart_entrypoint_arguments(project, self->dart_entrypoint_arguments); + + FlView* view = fl_view_new(project); + gtk_widget_show(GTK_WIDGET(view)); + gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view)); + + fl_register_plugins(FL_PLUGIN_REGISTRY(view)); + + gtk_widget_grab_focus(GTK_WIDGET(view)); +} + +// Implements GApplication::local_command_line. +static gboolean my_application_local_command_line(GApplication* application, gchar*** arguments, int* exit_status) { + MyApplication* self = MY_APPLICATION(application); + // Strip out the first argument as it is the binary name. + self->dart_entrypoint_arguments = g_strdupv(*arguments + 1); + + g_autoptr(GError) error = nullptr; + if (!g_application_register(application, nullptr, &error)) { + g_warning("Failed to register: %s", error->message); + *exit_status = 1; + return TRUE; + } + + g_application_activate(application); + *exit_status = 0; + + return TRUE; +} + +// Implements GObject::dispose. +static void my_application_dispose(GObject* object) { + MyApplication* self = MY_APPLICATION(object); + g_clear_pointer(&self->dart_entrypoint_arguments, g_strfreev); + G_OBJECT_CLASS(my_application_parent_class)->dispose(object); +} + +static void my_application_class_init(MyApplicationClass* klass) { + G_APPLICATION_CLASS(klass)->activate = my_application_activate; + G_APPLICATION_CLASS(klass)->local_command_line = my_application_local_command_line; + G_OBJECT_CLASS(klass)->dispose = my_application_dispose; +} + +static void my_application_init(MyApplication* self) {} + +MyApplication* my_application_new() { + return MY_APPLICATION(g_object_new(my_application_get_type(), + "application-id", APPLICATION_ID, + "flags", G_APPLICATION_NON_UNIQUE, + nullptr)); +} diff --git a/grocery_helper/linux/my_application.h b/grocery_helper/linux/my_application.h new file mode 100644 index 0000000..72271d5 --- /dev/null +++ b/grocery_helper/linux/my_application.h @@ -0,0 +1,18 @@ +#ifndef FLUTTER_MY_APPLICATION_H_ +#define FLUTTER_MY_APPLICATION_H_ + +#include + +G_DECLARE_FINAL_TYPE(MyApplication, my_application, MY, APPLICATION, + GtkApplication) + +/** + * my_application_new: + * + * Creates a new Flutter-based application. + * + * Returns: a new #MyApplication. + */ +MyApplication* my_application_new(); + +#endif // FLUTTER_MY_APPLICATION_H_ diff --git a/grocery_helper/macos/.gitignore b/grocery_helper/macos/.gitignore new file mode 100644 index 0000000..746adbb --- /dev/null +++ b/grocery_helper/macos/.gitignore @@ -0,0 +1,7 @@ +# Flutter-related +**/Flutter/ephemeral/ +**/Pods/ + +# Xcode-related +**/dgph +**/xcuserdata/ diff --git a/grocery_helper/macos/Flutter/Flutter-Debug.xcconfig b/grocery_helper/macos/Flutter/Flutter-Debug.xcconfig new file mode 100644 index 0000000..c2efd0b --- /dev/null +++ b/grocery_helper/macos/Flutter/Flutter-Debug.xcconfig @@ -0,0 +1 @@ +#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/grocery_helper/macos/Flutter/Flutter-Release.xcconfig b/grocery_helper/macos/Flutter/Flutter-Release.xcconfig new file mode 100644 index 0000000..c2efd0b --- /dev/null +++ b/grocery_helper/macos/Flutter/Flutter-Release.xcconfig @@ -0,0 +1 @@ +#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/grocery_helper/macos/Flutter/GeneratedPluginRegistrant.swift b/grocery_helper/macos/Flutter/GeneratedPluginRegistrant.swift new file mode 100644 index 0000000..25d87cc --- /dev/null +++ b/grocery_helper/macos/Flutter/GeneratedPluginRegistrant.swift @@ -0,0 +1,12 @@ +// +// Generated file. Do not edit. +// + +import FlutterMacOS +import Foundation + +import flutter_secure_storage_macos + +func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { + FlutterSecureStorageMacosPlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStorageMacosPlugin")) +} diff --git a/grocery_helper/macos/Runner.xcodeproj/project.pbxproj b/grocery_helper/macos/Runner.xcodeproj/project.pbxproj new file mode 100644 index 0000000..b184356 --- /dev/null +++ b/grocery_helper/macos/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,573 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 54; + objects = { + +/* Begin PBXAggregateTarget section */ + 33CC111A2044C6BA0003C045 /* Flutter Assemble */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */; + buildPhases = ( + 33CC111E2044C6BF0003C045 /* ShellScript */, + ); + dependencies = ( + ); + name = "Flutter Assemble"; + productName = FLX; + }; +/* End PBXAggregateTarget section */ + +/* Begin PBXBuildFile section */ + 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; }; + 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; }; + 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; + 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; + 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 33CC10E52044A3C60003C045 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 33CC111A2044C6BA0003C045; + remoteInfo = FLX; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 33CC110E2044A8840003C045 /* Bundle Framework */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + ); + name = "Bundle Framework"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; + 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; + 33CC10ED2044A3C60003C045 /* grocery_helper.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "grocery_helper.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = ""; }; + 33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; + 33CC10F72044A3C60003C045 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Runner/Info.plist; sourceTree = ""; }; + 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainFlutterWindow.swift; sourceTree = ""; }; + 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Debug.xcconfig"; sourceTree = ""; }; + 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Release.xcconfig"; sourceTree = ""; }; + 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Flutter-Generated.xcconfig"; path = "ephemeral/Flutter-Generated.xcconfig"; sourceTree = ""; }; + 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; + 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; + 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; + 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 33CC10EA2044A3C60003C045 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 33BA886A226E78AF003329D5 /* Configs */ = { + isa = PBXGroup; + children = ( + 33E5194F232828860026EE4D /* AppInfo.xcconfig */, + 9740EEB21CF90195004384FC /* Debug.xcconfig */, + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, + 333000ED22D3DE5D00554162 /* Warnings.xcconfig */, + ); + path = Configs; + sourceTree = ""; + }; + 33CC10E42044A3C60003C045 = { + isa = PBXGroup; + children = ( + 33FAB671232836740065AC1E /* Runner */, + 33CEB47122A05771004F2AC0 /* Flutter */, + 33CC10EE2044A3C60003C045 /* Products */, + D73912EC22F37F3D000D13A0 /* Frameworks */, + ); + sourceTree = ""; + }; + 33CC10EE2044A3C60003C045 /* Products */ = { + isa = PBXGroup; + children = ( + 33CC10ED2044A3C60003C045 /* grocery_helper.app */, + ); + name = Products; + sourceTree = ""; + }; + 33CC11242044D66E0003C045 /* Resources */ = { + isa = PBXGroup; + children = ( + 33CC10F22044A3C60003C045 /* Assets.xcassets */, + 33CC10F42044A3C60003C045 /* MainMenu.xib */, + 33CC10F72044A3C60003C045 /* Info.plist */, + ); + name = Resources; + path = ..; + sourceTree = ""; + }; + 33CEB47122A05771004F2AC0 /* Flutter */ = { + isa = PBXGroup; + children = ( + 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */, + 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */, + 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */, + 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */, + ); + path = Flutter; + sourceTree = ""; + }; + 33FAB671232836740065AC1E /* Runner */ = { + isa = PBXGroup; + children = ( + 33CC10F02044A3C60003C045 /* AppDelegate.swift */, + 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */, + 33E51913231747F40026EE4D /* DebugProfile.entitlements */, + 33E51914231749380026EE4D /* Release.entitlements */, + 33CC11242044D66E0003C045 /* Resources */, + 33BA886A226E78AF003329D5 /* Configs */, + ); + path = Runner; + sourceTree = ""; + }; + D73912EC22F37F3D000D13A0 /* Frameworks */ = { + isa = PBXGroup; + children = ( + ); + name = Frameworks; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 33CC10EC2044A3C60003C045 /* Runner */ = { + isa = PBXNativeTarget; + buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; + buildPhases = ( + 33CC10E92044A3C60003C045 /* Sources */, + 33CC10EA2044A3C60003C045 /* Frameworks */, + 33CC10EB2044A3C60003C045 /* Resources */, + 33CC110E2044A8840003C045 /* Bundle Framework */, + 3399D490228B24CF009A79C7 /* ShellScript */, + ); + buildRules = ( + ); + dependencies = ( + 33CC11202044C79F0003C045 /* PBXTargetDependency */, + ); + name = Runner; + productName = Runner; + productReference = 33CC10ED2044A3C60003C045 /* grocery_helper.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 33CC10E52044A3C60003C045 /* Project object */ = { + isa = PBXProject; + attributes = { + LastSwiftUpdateCheck = 0920; + LastUpgradeCheck = 1300; + ORGANIZATIONNAME = ""; + TargetAttributes = { + 33CC10EC2044A3C60003C045 = { + CreatedOnToolsVersion = 9.2; + LastSwiftMigration = 1100; + ProvisioningStyle = Automatic; + SystemCapabilities = { + com.apple.Sandbox = { + enabled = 1; + }; + }; + }; + 33CC111A2044C6BA0003C045 = { + CreatedOnToolsVersion = 9.2; + ProvisioningStyle = Manual; + }; + }; + }; + buildConfigurationList = 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 33CC10E42044A3C60003C045; + productRefGroup = 33CC10EE2044A3C60003C045 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 33CC10EC2044A3C60003C045 /* Runner */, + 33CC111A2044C6BA0003C045 /* Flutter Assemble */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 33CC10EB2044A3C60003C045 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */, + 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 3399D490228B24CF009A79C7 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh embed\n"; + }; + 33CC111E2044C6BF0003C045 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + Flutter/ephemeral/FlutterInputs.xcfilelist, + ); + inputPaths = ( + Flutter/ephemeral/tripwire, + ); + outputFileListPaths = ( + Flutter/ephemeral/FlutterOutputs.xcfilelist, + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 33CC10E92044A3C60003C045 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */, + 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */, + 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 33CC11202044C79F0003C045 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 33CC111A2044C6BA0003C045 /* Flutter Assemble */; + targetProxy = 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 33CC10F42044A3C60003C045 /* MainMenu.xib */ = { + isa = PBXVariantGroup; + children = ( + 33CC10F52044A3C60003C045 /* Base */, + ); + name = MainMenu.xib; + path = Runner; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 338D0CE9231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.14; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + }; + name = Profile; + }; + 338D0CEA231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; + }; + name = Profile; + }; + 338D0CEB231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Manual; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Profile; + }; + 33CC10F92044A3C60003C045 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.14; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + 33CC10FA2044A3C60003C045 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.14; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + }; + name = Release; + }; + 33CC10FC2044A3C60003C045 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + }; + name = Debug; + }; + 33CC10FD2044A3C60003C045 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; + }; + name = Release; + }; + 33CC111C2044C6BA0003C045 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Manual; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 33CC111D2044C6BA0003C045 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC10F92044A3C60003C045 /* Debug */, + 33CC10FA2044A3C60003C045 /* Release */, + 338D0CE9231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC10FC2044A3C60003C045 /* Debug */, + 33CC10FD2044A3C60003C045 /* Release */, + 338D0CEA231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC111C2044C6BA0003C045 /* Debug */, + 33CC111D2044C6BA0003C045 /* Release */, + 338D0CEB231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 33CC10E52044A3C60003C045 /* Project object */; +} diff --git a/grocery_helper/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/grocery_helper/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/grocery_helper/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/grocery_helper/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/grocery_helper/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme new file mode 100644 index 0000000..473b10a --- /dev/null +++ b/grocery_helper/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/grocery_helper/macos/Runner.xcworkspace/contents.xcworkspacedata b/grocery_helper/macos/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..1d526a1 --- /dev/null +++ b/grocery_helper/macos/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/grocery_helper/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/grocery_helper/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/grocery_helper/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/grocery_helper/macos/Runner/AppDelegate.swift b/grocery_helper/macos/Runner/AppDelegate.swift new file mode 100644 index 0000000..d53ef64 --- /dev/null +++ b/grocery_helper/macos/Runner/AppDelegate.swift @@ -0,0 +1,9 @@ +import Cocoa +import FlutterMacOS + +@NSApplicationMain +class AppDelegate: FlutterAppDelegate { + override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool { + return true + } +} diff --git a/grocery_helper/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/grocery_helper/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..a2ec33f --- /dev/null +++ b/grocery_helper/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,68 @@ +{ + "images" : [ + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "app_icon_16.png", + "scale" : "1x" + }, + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "app_icon_32.png", + "scale" : "2x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "app_icon_32.png", + "scale" : "1x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "app_icon_64.png", + "scale" : "2x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "app_icon_128.png", + "scale" : "1x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "app_icon_256.png", + "scale" : "2x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "app_icon_256.png", + "scale" : "1x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "app_icon_512.png", + "scale" : "2x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "app_icon_512.png", + "scale" : "1x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "app_icon_1024.png", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/grocery_helper/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/grocery_helper/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png new file mode 100644 index 0000000..82b6f9d Binary files /dev/null and b/grocery_helper/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png differ diff --git a/grocery_helper/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/grocery_helper/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png new file mode 100644 index 0000000..13b35eb Binary files /dev/null and b/grocery_helper/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png differ diff --git a/grocery_helper/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/grocery_helper/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png new file mode 100644 index 0000000..0a3f5fa Binary files /dev/null and b/grocery_helper/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png differ diff --git a/grocery_helper/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/grocery_helper/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png new file mode 100644 index 0000000..bdb5722 Binary files /dev/null and b/grocery_helper/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png differ diff --git a/grocery_helper/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/grocery_helper/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png new file mode 100644 index 0000000..f083318 Binary files /dev/null and b/grocery_helper/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png differ diff --git a/grocery_helper/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/grocery_helper/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png new file mode 100644 index 0000000..326c0e7 Binary files /dev/null and b/grocery_helper/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png differ diff --git a/grocery_helper/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/grocery_helper/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png new file mode 100644 index 0000000..2f1632c Binary files /dev/null and b/grocery_helper/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png differ diff --git a/grocery_helper/macos/Runner/Base.lproj/MainMenu.xib b/grocery_helper/macos/Runner/Base.lproj/MainMenu.xib new file mode 100644 index 0000000..80e867a --- /dev/null +++ b/grocery_helper/macos/Runner/Base.lproj/MainMenu.xib @@ -0,0 +1,343 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/grocery_helper/macos/Runner/Configs/AppInfo.xcconfig b/grocery_helper/macos/Runner/Configs/AppInfo.xcconfig new file mode 100644 index 0000000..a00887d --- /dev/null +++ b/grocery_helper/macos/Runner/Configs/AppInfo.xcconfig @@ -0,0 +1,14 @@ +// Application-level settings for the Runner target. +// +// This may be replaced with something auto-generated from metadata (e.g., pubspec.yaml) in the +// future. If not, the values below would default to using the project name when this becomes a +// 'flutter create' template. + +// The application's name. By default this is also the title of the Flutter window. +PRODUCT_NAME = grocery_helper + +// The application's bundle identifier +PRODUCT_BUNDLE_IDENTIFIER = com.example.groceryHelper + +// The copyright displayed in application information +PRODUCT_COPYRIGHT = Copyright © 2022 com.example. All rights reserved. diff --git a/grocery_helper/macos/Runner/Configs/Debug.xcconfig b/grocery_helper/macos/Runner/Configs/Debug.xcconfig new file mode 100644 index 0000000..36b0fd9 --- /dev/null +++ b/grocery_helper/macos/Runner/Configs/Debug.xcconfig @@ -0,0 +1,2 @@ +#include "../../Flutter/Flutter-Debug.xcconfig" +#include "Warnings.xcconfig" diff --git a/grocery_helper/macos/Runner/Configs/Release.xcconfig b/grocery_helper/macos/Runner/Configs/Release.xcconfig new file mode 100644 index 0000000..dff4f49 --- /dev/null +++ b/grocery_helper/macos/Runner/Configs/Release.xcconfig @@ -0,0 +1,2 @@ +#include "../../Flutter/Flutter-Release.xcconfig" +#include "Warnings.xcconfig" diff --git a/grocery_helper/macos/Runner/Configs/Warnings.xcconfig b/grocery_helper/macos/Runner/Configs/Warnings.xcconfig new file mode 100644 index 0000000..42bcbf4 --- /dev/null +++ b/grocery_helper/macos/Runner/Configs/Warnings.xcconfig @@ -0,0 +1,13 @@ +WARNING_CFLAGS = -Wall -Wconditional-uninitialized -Wnullable-to-nonnull-conversion -Wmissing-method-return-type -Woverlength-strings +GCC_WARN_UNDECLARED_SELECTOR = YES +CLANG_UNDEFINED_BEHAVIOR_SANITIZER_NULLABILITY = YES +CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE +CLANG_WARN__DUPLICATE_METHOD_MATCH = YES +CLANG_WARN_PRAGMA_PACK = YES +CLANG_WARN_STRICT_PROTOTYPES = YES +CLANG_WARN_COMMA = YES +GCC_WARN_STRICT_SELECTOR_MATCH = YES +CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES +CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES +GCC_WARN_SHADOW = YES +CLANG_WARN_UNREACHABLE_CODE = YES diff --git a/grocery_helper/macos/Runner/DebugProfile.entitlements b/grocery_helper/macos/Runner/DebugProfile.entitlements new file mode 100644 index 0000000..dddb8a3 --- /dev/null +++ b/grocery_helper/macos/Runner/DebugProfile.entitlements @@ -0,0 +1,12 @@ + + + + + com.apple.security.app-sandbox + + com.apple.security.cs.allow-jit + + com.apple.security.network.server + + + diff --git a/grocery_helper/macos/Runner/Info.plist b/grocery_helper/macos/Runner/Info.plist new file mode 100644 index 0000000..4789daa --- /dev/null +++ b/grocery_helper/macos/Runner/Info.plist @@ -0,0 +1,32 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIconFile + + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSMinimumSystemVersion + $(MACOSX_DEPLOYMENT_TARGET) + NSHumanReadableCopyright + $(PRODUCT_COPYRIGHT) + NSMainNibFile + MainMenu + NSPrincipalClass + NSApplication + + diff --git a/grocery_helper/macos/Runner/MainFlutterWindow.swift b/grocery_helper/macos/Runner/MainFlutterWindow.swift new file mode 100644 index 0000000..2722837 --- /dev/null +++ b/grocery_helper/macos/Runner/MainFlutterWindow.swift @@ -0,0 +1,15 @@ +import Cocoa +import FlutterMacOS + +class MainFlutterWindow: NSWindow { + override func awakeFromNib() { + let flutterViewController = FlutterViewController.init() + let windowFrame = self.frame + self.contentViewController = flutterViewController + self.setFrame(windowFrame, display: true) + + RegisterGeneratedPlugins(registry: flutterViewController) + + super.awakeFromNib() + } +} diff --git a/grocery_helper/macos/Runner/Release.entitlements b/grocery_helper/macos/Runner/Release.entitlements new file mode 100644 index 0000000..852fa1a --- /dev/null +++ b/grocery_helper/macos/Runner/Release.entitlements @@ -0,0 +1,8 @@ + + + + + com.apple.security.app-sandbox + + + diff --git a/grocery_helper/pubspec.lock b/grocery_helper/pubspec.lock new file mode 100644 index 0000000..fa343ca --- /dev/null +++ b/grocery_helper/pubspec.lock @@ -0,0 +1,411 @@ +# Generated by pub +# See https://dart.dev/tools/pub/glossary#lockfile +packages: + archive: + dependency: transitive + description: + name: archive + url: "https://pub.dartlang.org" + source: hosted + version: "3.3.5" + args: + dependency: transitive + description: + name: args + url: "https://pub.dartlang.org" + source: hosted + version: "2.3.1" + async: + dependency: transitive + description: + name: async + url: "https://pub.dartlang.org" + source: hosted + version: "2.9.0" + boolean_selector: + dependency: transitive + description: + name: boolean_selector + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0" + characters: + dependency: transitive + description: + name: characters + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.1" + checked_yaml: + dependency: transitive + description: + name: checked_yaml + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.1" + cli_util: + dependency: transitive + description: + name: cli_util + url: "https://pub.dartlang.org" + source: hosted + version: "0.3.5" + clock: + dependency: transitive + description: + name: clock + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.1" + collection: + dependency: transitive + description: + name: collection + url: "https://pub.dartlang.org" + source: hosted + version: "1.16.0" + convert: + dependency: transitive + description: + name: convert + url: "https://pub.dartlang.org" + source: hosted + version: "3.1.1" + cross_file: + dependency: transitive + description: + name: cross_file + url: "https://pub.dartlang.org" + source: hosted + version: "0.3.3+2" + crypto: + dependency: transitive + description: + name: crypto + url: "https://pub.dartlang.org" + source: hosted + version: "3.0.2" + cupertino_icons: + dependency: "direct main" + description: + name: cupertino_icons + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.5" + fake_async: + dependency: transitive + description: + name: fake_async + url: "https://pub.dartlang.org" + source: hosted + version: "1.3.1" + flutter: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_launcher_icons: + dependency: "direct main" + description: + name: flutter_launcher_icons + url: "https://pub.dartlang.org" + source: hosted + version: "0.11.0" + flutter_lints: + dependency: "direct dev" + description: + name: flutter_lints + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.1" + flutter_plugin_android_lifecycle: + dependency: transitive + description: + name: flutter_plugin_android_lifecycle + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.7" + flutter_secure_storage: + dependency: "direct main" + description: + name: flutter_secure_storage + url: "https://pub.dartlang.org" + source: hosted + version: "6.0.0" + flutter_secure_storage_linux: + dependency: transitive + description: + name: flutter_secure_storage_linux + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.2" + flutter_secure_storage_macos: + dependency: transitive + description: + name: flutter_secure_storage_macos + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.2" + flutter_secure_storage_platform_interface: + dependency: transitive + description: + name: flutter_secure_storage_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" + flutter_secure_storage_web: + dependency: transitive + description: + name: flutter_secure_storage_web + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.1" + flutter_secure_storage_windows: + dependency: transitive + description: + name: flutter_secure_storage_windows + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.3" + flutter_svg: + dependency: "direct main" + description: + name: flutter_svg + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.6" + flutter_svg_provider: + dependency: "direct main" + description: + name: flutter_svg_provider + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.3" + flutter_test: + dependency: "direct dev" + description: flutter + source: sdk + version: "0.0.0" + flutter_web_plugins: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + http: + dependency: "direct main" + description: + name: http + url: "https://pub.dartlang.org" + source: hosted + version: "0.13.5" + http_parser: + dependency: transitive + description: + name: http_parser + url: "https://pub.dartlang.org" + source: hosted + version: "4.0.2" + image: + dependency: transitive + description: + name: image + url: "https://pub.dartlang.org" + source: hosted + version: "3.2.2" + image_picker: + dependency: "direct main" + description: + name: image_picker + url: "https://pub.dartlang.org" + source: hosted + version: "0.8.6" + image_picker_android: + dependency: transitive + description: + name: image_picker_android + url: "https://pub.dartlang.org" + source: hosted + version: "0.8.5+3" + image_picker_for_web: + dependency: transitive + description: + name: image_picker_for_web + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.10" + image_picker_ios: + dependency: transitive + description: + name: image_picker_ios + url: "https://pub.dartlang.org" + source: hosted + version: "0.8.6+1" + image_picker_platform_interface: + dependency: transitive + description: + name: image_picker_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "2.6.2" + js: + dependency: transitive + description: + name: js + url: "https://pub.dartlang.org" + source: hosted + version: "0.6.4" + json_annotation: + dependency: transitive + description: + name: json_annotation + url: "https://pub.dartlang.org" + source: hosted + version: "4.7.0" + lints: + dependency: transitive + description: + name: lints + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.1" + matcher: + dependency: transitive + description: + name: matcher + url: "https://pub.dartlang.org" + source: hosted + version: "0.12.12" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.5" + meta: + dependency: transitive + description: + name: meta + url: "https://pub.dartlang.org" + source: hosted + version: "1.8.0" + path: + dependency: transitive + description: + name: path + url: "https://pub.dartlang.org" + source: hosted + version: "1.8.2" + path_drawing: + dependency: transitive + description: + name: path_drawing + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" + path_parsing: + dependency: transitive + description: + name: path_parsing + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" + petitparser: + dependency: transitive + description: + name: petitparser + url: "https://pub.dartlang.org" + source: hosted + version: "5.1.0" + plugin_platform_interface: + dependency: transitive + description: + name: plugin_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.3" + pointycastle: + dependency: transitive + description: + name: pointycastle + url: "https://pub.dartlang.org" + source: hosted + version: "3.6.2" + sky_engine: + dependency: transitive + description: flutter + source: sdk + version: "0.0.99" + source_span: + dependency: transitive + description: + name: source_span + url: "https://pub.dartlang.org" + source: hosted + version: "1.9.0" + stack_trace: + dependency: transitive + description: + name: stack_trace + url: "https://pub.dartlang.org" + source: hosted + version: "1.10.0" + stream_channel: + dependency: transitive + description: + name: stream_channel + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.0" + string_scanner: + dependency: transitive + description: + name: string_scanner + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.1" + term_glyph: + dependency: transitive + description: + name: term_glyph + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.1" + test_api: + dependency: transitive + description: + name: test_api + url: "https://pub.dartlang.org" + source: hosted + version: "0.4.12" + typed_data: + dependency: transitive + description: + name: typed_data + url: "https://pub.dartlang.org" + source: hosted + version: "1.3.1" + vector_math: + dependency: transitive + description: + name: vector_math + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.2" + xml: + dependency: transitive + description: + name: xml + url: "https://pub.dartlang.org" + source: hosted + version: "6.1.0" + yaml: + dependency: transitive + description: + name: yaml + url: "https://pub.dartlang.org" + source: hosted + version: "3.1.1" +sdks: + dart: ">=2.18.4 <3.0.0" + flutter: ">=2.11.0-0.1.pre" diff --git a/grocery_helper/pubspec.yaml b/grocery_helper/pubspec.yaml new file mode 100644 index 0000000..28c0773 --- /dev/null +++ b/grocery_helper/pubspec.yaml @@ -0,0 +1,103 @@ +name: grocery_helper +description: A new Flutter project. +# The following line prevents the package from being accidentally published to +# pub.dev using `flutter pub publish`. This is preferred for private packages. +publish_to: 'none' # Remove this line if you wish to publish to pub.dev + +# The following defines the version and build number for your application. +# A version number is three numbers separated by dots, like 1.2.43 +# followed by an optional build number separated by a +. +# Both the version and the builder number may be overridden in flutter +# build by specifying --build-name and --build-number, respectively. +# In Android, build-name is used as versionName while build-number used as versionCode. +# Read more about Android versioning at https://developer.android.com/studio/publish/versioning +# In iOS, build-name is used as CFBundleShortVersionString while build-number is used as CFBundleVersion. +# Read more about iOS versioning at +# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html +# In Windows, build-name is used as the major, minor, and patch parts +# of the product and file versions while build-number is used as the build suffix. +version: 1.0.0+1 + +environment: + sdk: '>=2.18.4 <3.0.0' + +# Dependencies specify other packages that your package needs in order to work. +# To automatically upgrade your package dependencies to the latest versions +# consider running `flutter pub upgrade --major-versions`. Alternatively, +# dependencies can be manually updated by changing the version numbers below to +# the latest version available on pub.dev. To see which dependencies have newer +# versions available, run `flutter pub outdated`. +dependencies: + flutter: + sdk: flutter + + http: ^0.13.5 + flutter_secure_storage: ^6.0.0 + flutter_svg: ^1.1.6 + flutter_svg_provider: ^1.0.3 + image_picker: ^0.8.6 + flutter_launcher_icons: ^0.11.0 + + # The following adds the Cupertino Icons font to your application. + # Use with the CupertinoIcons class for iOS style icons. + cupertino_icons: ^1.0.2 + +dev_dependencies: + flutter_test: + sdk: flutter + + # The "flutter_lints" package below contains a set of recommended lints to + # encourage good coding practices. The lint set provided by the package is + # activated in the `analysis_options.yaml` file located at the root of your + # package. See that file for information about deactivating specific lint + # rules and activating additional ones. + flutter_lints: ^2.0.0 + +# For information on the generic Dart part of this file, see the +# following page: https://dart.dev/tools/pub/pubspec + +flutter_icons: + android: true + ios: true + image_path: "assets/icons/icon.png" + +# The following section is specific to Flutter packages. +flutter: + + # The following line ensures that the Material Icons font is + # included with your application, so that you can use the icons in + # the material Icons class. + uses-material-design: true + + # To add assets to your application, add an assets section, like this: + # assets: + # - images/a_dot_burr.jpeg + # - images/a_dot_ham.jpeg + assets: + - assets/images/ + + # An image asset can refer to one or more resolution-specific "variants", see + # https://flutter.dev/assets-and-images/#resolution-aware + + # For details regarding adding assets from package dependencies, see + # https://flutter.dev/assets-and-images/#from-packages + + # To add custom fonts to your application, add a fonts section here, + # in this "flutter" section. Each entry in this list should have a + # "family" key with the font family name, and a "fonts" key with a + # list giving the asset and other descriptors for the font. For + # example: + # fonts: + # - family: Schyler + # fonts: + # - asset: fonts/Schyler-Regular.ttf + # - asset: fonts/Schyler-Italic.ttf + # style: italic + # - family: Trajan Pro + # fonts: + # - asset: fonts/TrajanPro.ttf + # - asset: fonts/TrajanPro_Bold.ttf + # weight: 700 + # + # For details regarding fonts from package dependencies, + # see https://flutter.dev/custom-fonts/#from-packages diff --git a/grocery_helper/test/widget_test.dart b/grocery_helper/test/widget_test.dart new file mode 100644 index 0000000..d5e205e --- /dev/null +++ b/grocery_helper/test/widget_test.dart @@ -0,0 +1,30 @@ +// This is a basic Flutter widget test. +// +// To perform an interaction with a widget in your test, use the WidgetTester +// utility in the flutter_test package. For example, you can send tap and scroll +// gestures. You can also use WidgetTester to find child widgets in the widget +// tree, read text, and verify that the values of widget properties are correct. + +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; + +import 'package:grocery_helper/main.dart'; + +void main() { + testWidgets('Counter increments smoke test', (WidgetTester tester) async { + // Build our app and trigger a frame. + await tester.pumpWidget(const MyApp()); + + // Verify that our counter starts at 0. + expect(find.text('0'), findsOneWidget); + expect(find.text('1'), findsNothing); + + // Tap the '+' icon and trigger a frame. + await tester.tap(find.byIcon(Icons.add)); + await tester.pump(); + + // Verify that our counter has incremented. + expect(find.text('0'), findsNothing); + expect(find.text('1'), findsOneWidget); + }); +} diff --git a/grocery_helper/web/favicon.png b/grocery_helper/web/favicon.png new file mode 100644 index 0000000..8aaa46a Binary files /dev/null and b/grocery_helper/web/favicon.png differ diff --git a/grocery_helper/web/icons/Icon-192.png b/grocery_helper/web/icons/Icon-192.png new file mode 100644 index 0000000..b749bfe Binary files /dev/null and b/grocery_helper/web/icons/Icon-192.png differ diff --git a/grocery_helper/web/icons/Icon-512.png b/grocery_helper/web/icons/Icon-512.png new file mode 100644 index 0000000..88cfd48 Binary files /dev/null and b/grocery_helper/web/icons/Icon-512.png differ diff --git a/grocery_helper/web/icons/Icon-maskable-192.png b/grocery_helper/web/icons/Icon-maskable-192.png new file mode 100644 index 0000000..eb9b4d7 Binary files /dev/null and b/grocery_helper/web/icons/Icon-maskable-192.png differ diff --git a/grocery_helper/web/icons/Icon-maskable-512.png b/grocery_helper/web/icons/Icon-maskable-512.png new file mode 100644 index 0000000..d69c566 Binary files /dev/null and b/grocery_helper/web/icons/Icon-maskable-512.png differ diff --git a/grocery_helper/web/index.html b/grocery_helper/web/index.html new file mode 100644 index 0000000..5adc211 --- /dev/null +++ b/grocery_helper/web/index.html @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + grocery_helper + + + + + + + + + + diff --git a/grocery_helper/web/manifest.json b/grocery_helper/web/manifest.json new file mode 100644 index 0000000..bca451a --- /dev/null +++ b/grocery_helper/web/manifest.json @@ -0,0 +1,35 @@ +{ + "name": "grocery_helper", + "short_name": "grocery_helper", + "start_url": ".", + "display": "standalone", + "background_color": "#0175C2", + "theme_color": "#0175C2", + "description": "A new Flutter project.", + "orientation": "portrait-primary", + "prefer_related_applications": false, + "icons": [ + { + "src": "icons/Icon-192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "icons/Icon-512.png", + "sizes": "512x512", + "type": "image/png" + }, + { + "src": "icons/Icon-maskable-192.png", + "sizes": "192x192", + "type": "image/png", + "purpose": "maskable" + }, + { + "src": "icons/Icon-maskable-512.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "maskable" + } + ] +} diff --git a/grocery_helper/windows/.gitignore b/grocery_helper/windows/.gitignore new file mode 100644 index 0000000..d492d0d --- /dev/null +++ b/grocery_helper/windows/.gitignore @@ -0,0 +1,17 @@ +flutter/ephemeral/ + +# Visual Studio user-specific files. +*.suo +*.user +*.userosscache +*.sln.docstates + +# Visual Studio build-related files. +x64/ +x86/ + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ diff --git a/grocery_helper/windows/CMakeLists.txt b/grocery_helper/windows/CMakeLists.txt new file mode 100644 index 0000000..ed6319e --- /dev/null +++ b/grocery_helper/windows/CMakeLists.txt @@ -0,0 +1,101 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.14) +project(grocery_helper LANGUAGES CXX) + +# The name of the executable created for the application. Change this to change +# the on-disk name of your application. +set(BINARY_NAME "grocery_helper") + +# Explicitly opt in to modern CMake behaviors to avoid warnings with recent +# versions of CMake. +cmake_policy(SET CMP0063 NEW) + +# Define build configuration option. +get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) +if(IS_MULTICONFIG) + set(CMAKE_CONFIGURATION_TYPES "Debug;Profile;Release" + CACHE STRING "" FORCE) +else() + if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE "Debug" CACHE + STRING "Flutter build mode" FORCE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Profile" "Release") + endif() +endif() +# Define settings for the Profile build mode. +set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}") +set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}") +set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE}") +set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE}") + +# Use Unicode for all projects. +add_definitions(-DUNICODE -D_UNICODE) + +# Compilation settings that should be applied to most targets. +# +# Be cautious about adding new options here, as plugins use this function by +# default. In most cases, you should add new options to specific targets instead +# of modifying this function. +function(APPLY_STANDARD_SETTINGS TARGET) + target_compile_features(${TARGET} PUBLIC cxx_std_17) + target_compile_options(${TARGET} PRIVATE /W4 /WX /wd"4100") + target_compile_options(${TARGET} PRIVATE /EHsc) + target_compile_definitions(${TARGET} PRIVATE "_HAS_EXCEPTIONS=0") + target_compile_definitions(${TARGET} PRIVATE "$<$:_DEBUG>") +endfunction() + +# Flutter library and tool build rules. +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# Application build; see runner/CMakeLists.txt. +add_subdirectory("runner") + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# Support files are copied into place next to the executable, so that it can +# run in place. This is done instead of making a separate bundle (as on Linux) +# so that building and running from within Visual Studio will work. +set(BUILD_BUNDLE_DIR "$") +# Make the "install" step default, as it's required to run. +set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1) +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +endif() + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}") + +install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +if(PLUGIN_BUNDLED_LIBRARIES) + install(FILES "${PLUGIN_BUNDLED_LIBRARIES}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() + +# Fully re-copy the assets directory on each build to avoid having stale files +# from a previous install. +set(FLUTTER_ASSET_DIR_NAME "flutter_assets") +install(CODE " + file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") + " COMPONENT Runtime) +install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" + DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) + +# Install the AOT library on non-Debug builds only. +install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + CONFIGURATIONS Profile;Release + COMPONENT Runtime) diff --git a/grocery_helper/windows/flutter/CMakeLists.txt b/grocery_helper/windows/flutter/CMakeLists.txt new file mode 100644 index 0000000..930d207 --- /dev/null +++ b/grocery_helper/windows/flutter/CMakeLists.txt @@ -0,0 +1,104 @@ +# This file controls Flutter-level build steps. It should not be edited. +cmake_minimum_required(VERSION 3.14) + +set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") + +# Configuration provided via flutter tool. +include(${EPHEMERAL_DIR}/generated_config.cmake) + +# TODO: Move the rest of this into files in ephemeral. See +# https://github.com/flutter/flutter/issues/57146. +set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper") + +# === Flutter Library === +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll") + +# Published to parent scope for install step. +set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) +set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) +set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) +set(AOT_LIBRARY "${PROJECT_DIR}/build/windows/app.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "flutter_export.h" + "flutter_windows.h" + "flutter_messenger.h" + "flutter_plugin_registrar.h" + "flutter_texture_registrar.h" +) +list(TRANSFORM FLUTTER_LIBRARY_HEADERS PREPEND "${EPHEMERAL_DIR}/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}.lib") +add_dependencies(flutter flutter_assemble) + +# === Wrapper === +list(APPEND CPP_WRAPPER_SOURCES_CORE + "core_implementations.cc" + "standard_codec.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_CORE PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_PLUGIN + "plugin_registrar.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_PLUGIN PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_APP + "flutter_engine.cc" + "flutter_view_controller.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_APP PREPEND "${WRAPPER_ROOT}/") + +# Wrapper sources needed for a plugin. +add_library(flutter_wrapper_plugin STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} +) +apply_standard_settings(flutter_wrapper_plugin) +set_target_properties(flutter_wrapper_plugin PROPERTIES + POSITION_INDEPENDENT_CODE ON) +set_target_properties(flutter_wrapper_plugin PROPERTIES + CXX_VISIBILITY_PRESET hidden) +target_link_libraries(flutter_wrapper_plugin PUBLIC flutter) +target_include_directories(flutter_wrapper_plugin PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_plugin flutter_assemble) + +# Wrapper sources needed for the runner. +add_library(flutter_wrapper_app STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_APP} +) +apply_standard_settings(flutter_wrapper_app) +target_link_libraries(flutter_wrapper_app PUBLIC flutter) +target_include_directories(flutter_wrapper_app PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_app flutter_assemble) + +# === Flutter tool backend === +# _phony_ is a non-existent file to force this command to run every time, +# since currently there's no way to get a full input/output list from the +# flutter tool. +set(PHONY_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/_phony_") +set_source_files_properties("${PHONY_OUTPUT}" PROPERTIES SYMBOLIC TRUE) +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} + ${PHONY_OUTPUT} + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat" + windows-x64 $ + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} +) diff --git a/grocery_helper/windows/flutter/generated_plugin_registrant.cc b/grocery_helper/windows/flutter/generated_plugin_registrant.cc new file mode 100644 index 0000000..0c50753 --- /dev/null +++ b/grocery_helper/windows/flutter/generated_plugin_registrant.cc @@ -0,0 +1,14 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + +#include + +void RegisterPlugins(flutter::PluginRegistry* registry) { + FlutterSecureStorageWindowsPluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("FlutterSecureStorageWindowsPlugin")); +} diff --git a/grocery_helper/windows/flutter/generated_plugin_registrant.h b/grocery_helper/windows/flutter/generated_plugin_registrant.h new file mode 100644 index 0000000..dc139d8 --- /dev/null +++ b/grocery_helper/windows/flutter/generated_plugin_registrant.h @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void RegisterPlugins(flutter::PluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/grocery_helper/windows/flutter/generated_plugins.cmake b/grocery_helper/windows/flutter/generated_plugins.cmake new file mode 100644 index 0000000..4fc759c --- /dev/null +++ b/grocery_helper/windows/flutter/generated_plugins.cmake @@ -0,0 +1,24 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST + flutter_secure_storage_windows +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/grocery_helper/windows/runner/CMakeLists.txt b/grocery_helper/windows/runner/CMakeLists.txt new file mode 100644 index 0000000..394917c --- /dev/null +++ b/grocery_helper/windows/runner/CMakeLists.txt @@ -0,0 +1,40 @@ +cmake_minimum_required(VERSION 3.14) +project(runner LANGUAGES CXX) + +# Define the application target. To change its name, change BINARY_NAME in the +# top-level CMakeLists.txt, not the value here, or `flutter run` will no longer +# work. +# +# Any new source files that you add to the application should be added here. +add_executable(${BINARY_NAME} WIN32 + "flutter_window.cpp" + "main.cpp" + "utils.cpp" + "win32_window.cpp" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" + "Runner.rc" + "runner.exe.manifest" +) + +# Apply the standard set of build settings. This can be removed for applications +# that need different build settings. +apply_standard_settings(${BINARY_NAME}) + +# Add preprocessor definitions for the build version. +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}") + +# Disable Windows macros that collide with C++ standard library functions. +target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX") + +# Add dependency libraries and include directories. Add any application-specific +# dependencies here. +target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app) +target_link_libraries(${BINARY_NAME} PRIVATE "dwmapi.lib") +target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}") + +# Run the Flutter tool portions of the build. This must not be removed. +add_dependencies(${BINARY_NAME} flutter_assemble) diff --git a/grocery_helper/windows/runner/Runner.rc b/grocery_helper/windows/runner/Runner.rc new file mode 100644 index 0000000..b7cdf80 --- /dev/null +++ b/grocery_helper/windows/runner/Runner.rc @@ -0,0 +1,121 @@ +// Microsoft Visual C++ generated resource script. +// +#pragma code_page(65001) +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "winres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (United States) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_APP_ICON ICON "resources\\app_icon.ico" + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD) +#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD +#else +#define VERSION_AS_NUMBER 1,0,0,0 +#endif + +#if defined(FLUTTER_VERSION) +#define VERSION_AS_STRING FLUTTER_VERSION +#else +#define VERSION_AS_STRING "1.0.0" +#endif + +VS_VERSION_INFO VERSIONINFO + FILEVERSION VERSION_AS_NUMBER + PRODUCTVERSION VERSION_AS_NUMBER + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904e4" + BEGIN + VALUE "CompanyName", "com.example" "\0" + VALUE "FileDescription", "grocery_helper" "\0" + VALUE "FileVersion", VERSION_AS_STRING "\0" + VALUE "InternalName", "grocery_helper" "\0" + VALUE "LegalCopyright", "Copyright (C) 2022 com.example. All rights reserved." "\0" + VALUE "OriginalFilename", "grocery_helper.exe" "\0" + VALUE "ProductName", "grocery_helper" "\0" + VALUE "ProductVersion", VERSION_AS_STRING "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END + +#endif // English (United States) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED diff --git a/grocery_helper/windows/runner/flutter_window.cpp b/grocery_helper/windows/runner/flutter_window.cpp new file mode 100644 index 0000000..b25e363 --- /dev/null +++ b/grocery_helper/windows/runner/flutter_window.cpp @@ -0,0 +1,66 @@ +#include "flutter_window.h" + +#include + +#include "flutter/generated_plugin_registrant.h" + +FlutterWindow::FlutterWindow(const flutter::DartProject& project) + : project_(project) {} + +FlutterWindow::~FlutterWindow() {} + +bool FlutterWindow::OnCreate() { + if (!Win32Window::OnCreate()) { + return false; + } + + RECT frame = GetClientArea(); + + // The size here must match the window dimensions to avoid unnecessary surface + // creation / destruction in the startup path. + flutter_controller_ = std::make_unique( + frame.right - frame.left, frame.bottom - frame.top, project_); + // Ensure that basic setup of the controller was successful. + if (!flutter_controller_->engine() || !flutter_controller_->view()) { + return false; + } + RegisterPlugins(flutter_controller_->engine()); + SetChildContent(flutter_controller_->view()->GetNativeWindow()); + + flutter_controller_->engine()->SetNextFrameCallback([&]() { + this->Show(); + }); + + return true; +} + +void FlutterWindow::OnDestroy() { + if (flutter_controller_) { + flutter_controller_ = nullptr; + } + + Win32Window::OnDestroy(); +} + +LRESULT +FlutterWindow::MessageHandler(HWND hwnd, UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + // Give Flutter, including plugins, an opportunity to handle window messages. + if (flutter_controller_) { + std::optional result = + flutter_controller_->HandleTopLevelWindowProc(hwnd, message, wparam, + lparam); + if (result) { + return *result; + } + } + + switch (message) { + case WM_FONTCHANGE: + flutter_controller_->engine()->ReloadSystemFonts(); + break; + } + + return Win32Window::MessageHandler(hwnd, message, wparam, lparam); +} diff --git a/grocery_helper/windows/runner/flutter_window.h b/grocery_helper/windows/runner/flutter_window.h new file mode 100644 index 0000000..6da0652 --- /dev/null +++ b/grocery_helper/windows/runner/flutter_window.h @@ -0,0 +1,33 @@ +#ifndef RUNNER_FLUTTER_WINDOW_H_ +#define RUNNER_FLUTTER_WINDOW_H_ + +#include +#include + +#include + +#include "win32_window.h" + +// A window that does nothing but host a Flutter view. +class FlutterWindow : public Win32Window { + public: + // Creates a new FlutterWindow hosting a Flutter view running |project|. + explicit FlutterWindow(const flutter::DartProject& project); + virtual ~FlutterWindow(); + + protected: + // Win32Window: + bool OnCreate() override; + void OnDestroy() override; + LRESULT MessageHandler(HWND window, UINT const message, WPARAM const wparam, + LPARAM const lparam) noexcept override; + + private: + // The project to run. + flutter::DartProject project_; + + // The Flutter instance hosted by this window. + std::unique_ptr flutter_controller_; +}; + +#endif // RUNNER_FLUTTER_WINDOW_H_ diff --git a/grocery_helper/windows/runner/main.cpp b/grocery_helper/windows/runner/main.cpp new file mode 100644 index 0000000..62fe021 --- /dev/null +++ b/grocery_helper/windows/runner/main.cpp @@ -0,0 +1,43 @@ +#include +#include +#include + +#include "flutter_window.h" +#include "utils.h" + +int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, + _In_ wchar_t *command_line, _In_ int show_command) { + // Attach to console when present (e.g., 'flutter run') or create a + // new console when running with a debugger. + if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) { + CreateAndAttachConsole(); + } + + // Initialize COM, so that it is available for use in the library and/or + // plugins. + ::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); + + flutter::DartProject project(L"data"); + + std::vector command_line_arguments = + GetCommandLineArguments(); + + project.set_dart_entrypoint_arguments(std::move(command_line_arguments)); + + FlutterWindow window(project); + Win32Window::Point origin(10, 10); + Win32Window::Size size(1280, 720); + if (!window.Create(L"grocery_helper", origin, size)) { + return EXIT_FAILURE; + } + window.SetQuitOnClose(true); + + ::MSG msg; + while (::GetMessage(&msg, nullptr, 0, 0)) { + ::TranslateMessage(&msg); + ::DispatchMessage(&msg); + } + + ::CoUninitialize(); + return EXIT_SUCCESS; +} diff --git a/grocery_helper/windows/runner/resource.h b/grocery_helper/windows/runner/resource.h new file mode 100644 index 0000000..66a65d1 --- /dev/null +++ b/grocery_helper/windows/runner/resource.h @@ -0,0 +1,16 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by Runner.rc +// +#define IDI_APP_ICON 101 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/grocery_helper/windows/runner/resources/app_icon.ico b/grocery_helper/windows/runner/resources/app_icon.ico new file mode 100644 index 0000000..c04e20c Binary files /dev/null and b/grocery_helper/windows/runner/resources/app_icon.ico differ diff --git a/grocery_helper/windows/runner/runner.exe.manifest b/grocery_helper/windows/runner/runner.exe.manifest new file mode 100644 index 0000000..a42ea76 --- /dev/null +++ b/grocery_helper/windows/runner/runner.exe.manifest @@ -0,0 +1,20 @@ + + + + + PerMonitorV2 + + + + + + + + + + + + + + + diff --git a/grocery_helper/windows/runner/utils.cpp b/grocery_helper/windows/runner/utils.cpp new file mode 100644 index 0000000..f5bf9fa --- /dev/null +++ b/grocery_helper/windows/runner/utils.cpp @@ -0,0 +1,64 @@ +#include "utils.h" + +#include +#include +#include +#include + +#include + +void CreateAndAttachConsole() { + if (::AllocConsole()) { + FILE *unused; + if (freopen_s(&unused, "CONOUT$", "w", stdout)) { + _dup2(_fileno(stdout), 1); + } + if (freopen_s(&unused, "CONOUT$", "w", stderr)) { + _dup2(_fileno(stdout), 2); + } + std::ios::sync_with_stdio(); + FlutterDesktopResyncOutputStreams(); + } +} + +std::vector GetCommandLineArguments() { + // Convert the UTF-16 command line arguments to UTF-8 for the Engine to use. + int argc; + wchar_t** argv = ::CommandLineToArgvW(::GetCommandLineW(), &argc); + if (argv == nullptr) { + return std::vector(); + } + + std::vector command_line_arguments; + + // Skip the first argument as it's the binary name. + for (int i = 1; i < argc; i++) { + command_line_arguments.push_back(Utf8FromUtf16(argv[i])); + } + + ::LocalFree(argv); + + return command_line_arguments; +} + +std::string Utf8FromUtf16(const wchar_t* utf16_string) { + if (utf16_string == nullptr) { + return std::string(); + } + int target_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + -1, nullptr, 0, nullptr, nullptr); + std::string utf8_string; + if (target_length == 0 || target_length > utf8_string.max_size()) { + return utf8_string; + } + utf8_string.resize(target_length); + int converted_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + -1, utf8_string.data(), + target_length, nullptr, nullptr); + if (converted_length == 0) { + return std::string(); + } + return utf8_string; +} diff --git a/grocery_helper/windows/runner/utils.h b/grocery_helper/windows/runner/utils.h new file mode 100644 index 0000000..3879d54 --- /dev/null +++ b/grocery_helper/windows/runner/utils.h @@ -0,0 +1,19 @@ +#ifndef RUNNER_UTILS_H_ +#define RUNNER_UTILS_H_ + +#include +#include + +// Creates a console for the process, and redirects stdout and stderr to +// it for both the runner and the Flutter library. +void CreateAndAttachConsole(); + +// Takes a null-terminated wchar_t* encoded in UTF-16 and returns a std::string +// encoded in UTF-8. Returns an empty std::string on failure. +std::string Utf8FromUtf16(const wchar_t* utf16_string); + +// Gets the command line arguments passed in as a std::vector, +// encoded in UTF-8. Returns an empty std::vector on failure. +std::vector GetCommandLineArguments(); + +#endif // RUNNER_UTILS_H_ diff --git a/grocery_helper/windows/runner/win32_window.cpp b/grocery_helper/windows/runner/win32_window.cpp new file mode 100644 index 0000000..041a385 --- /dev/null +++ b/grocery_helper/windows/runner/win32_window.cpp @@ -0,0 +1,288 @@ +#include "win32_window.h" + +#include +#include + +#include "resource.h" + +namespace { + +/// Window attribute that enables dark mode window decorations. +/// +/// Redefined in case the developer's machine has a Windows SDK older than +/// version 10.0.22000.0. +/// See: https://docs.microsoft.com/windows/win32/api/dwmapi/ne-dwmapi-dwmwindowattribute +#ifndef DWMWA_USE_IMMERSIVE_DARK_MODE +#define DWMWA_USE_IMMERSIVE_DARK_MODE 20 +#endif + +constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW"; + +/// Registry key for app theme preference. +/// +/// A value of 0 indicates apps should use dark mode. A non-zero or missing +/// value indicates apps should use light mode. +constexpr const wchar_t kGetPreferredBrightnessRegKey[] = + L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize"; +constexpr const wchar_t kGetPreferredBrightnessRegValue[] = L"AppsUseLightTheme"; + +// The number of Win32Window objects that currently exist. +static int g_active_window_count = 0; + +using EnableNonClientDpiScaling = BOOL __stdcall(HWND hwnd); + +// Scale helper to convert logical scaler values to physical using passed in +// scale factor +int Scale(int source, double scale_factor) { + return static_cast(source * scale_factor); +} + +// Dynamically loads the |EnableNonClientDpiScaling| from the User32 module. +// This API is only needed for PerMonitor V1 awareness mode. +void EnableFullDpiSupportIfAvailable(HWND hwnd) { + HMODULE user32_module = LoadLibraryA("User32.dll"); + if (!user32_module) { + return; + } + auto enable_non_client_dpi_scaling = + reinterpret_cast( + GetProcAddress(user32_module, "EnableNonClientDpiScaling")); + if (enable_non_client_dpi_scaling != nullptr) { + enable_non_client_dpi_scaling(hwnd); + } + FreeLibrary(user32_module); +} + +} // namespace + +// Manages the Win32Window's window class registration. +class WindowClassRegistrar { + public: + ~WindowClassRegistrar() = default; + + // Returns the singleton registar instance. + static WindowClassRegistrar* GetInstance() { + if (!instance_) { + instance_ = new WindowClassRegistrar(); + } + return instance_; + } + + // Returns the name of the window class, registering the class if it hasn't + // previously been registered. + const wchar_t* GetWindowClass(); + + // Unregisters the window class. Should only be called if there are no + // instances of the window. + void UnregisterWindowClass(); + + private: + WindowClassRegistrar() = default; + + static WindowClassRegistrar* instance_; + + bool class_registered_ = false; +}; + +WindowClassRegistrar* WindowClassRegistrar::instance_ = nullptr; + +const wchar_t* WindowClassRegistrar::GetWindowClass() { + if (!class_registered_) { + WNDCLASS window_class{}; + window_class.hCursor = LoadCursor(nullptr, IDC_ARROW); + window_class.lpszClassName = kWindowClassName; + window_class.style = CS_HREDRAW | CS_VREDRAW; + window_class.cbClsExtra = 0; + window_class.cbWndExtra = 0; + window_class.hInstance = GetModuleHandle(nullptr); + window_class.hIcon = + LoadIcon(window_class.hInstance, MAKEINTRESOURCE(IDI_APP_ICON)); + window_class.hbrBackground = 0; + window_class.lpszMenuName = nullptr; + window_class.lpfnWndProc = Win32Window::WndProc; + RegisterClass(&window_class); + class_registered_ = true; + } + return kWindowClassName; +} + +void WindowClassRegistrar::UnregisterWindowClass() { + UnregisterClass(kWindowClassName, nullptr); + class_registered_ = false; +} + +Win32Window::Win32Window() { + ++g_active_window_count; +} + +Win32Window::~Win32Window() { + --g_active_window_count; + Destroy(); +} + +bool Win32Window::Create(const std::wstring& title, + const Point& origin, + const Size& size) { + Destroy(); + + const wchar_t* window_class = + WindowClassRegistrar::GetInstance()->GetWindowClass(); + + const POINT target_point = {static_cast(origin.x), + static_cast(origin.y)}; + HMONITOR monitor = MonitorFromPoint(target_point, MONITOR_DEFAULTTONEAREST); + UINT dpi = FlutterDesktopGetDpiForMonitor(monitor); + double scale_factor = dpi / 96.0; + + HWND window = CreateWindow( + window_class, title.c_str(), WS_OVERLAPPEDWINDOW, + Scale(origin.x, scale_factor), Scale(origin.y, scale_factor), + Scale(size.width, scale_factor), Scale(size.height, scale_factor), + nullptr, nullptr, GetModuleHandle(nullptr), this); + + if (!window) { + return false; + } + + UpdateTheme(window); + + return OnCreate(); +} + +bool Win32Window::Show() { + return ShowWindow(window_handle_, SW_SHOWNORMAL); +} + +// static +LRESULT CALLBACK Win32Window::WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + if (message == WM_NCCREATE) { + auto window_struct = reinterpret_cast(lparam); + SetWindowLongPtr(window, GWLP_USERDATA, + reinterpret_cast(window_struct->lpCreateParams)); + + auto that = static_cast(window_struct->lpCreateParams); + EnableFullDpiSupportIfAvailable(window); + that->window_handle_ = window; + } else if (Win32Window* that = GetThisFromHandle(window)) { + return that->MessageHandler(window, message, wparam, lparam); + } + + return DefWindowProc(window, message, wparam, lparam); +} + +LRESULT +Win32Window::MessageHandler(HWND hwnd, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + switch (message) { + case WM_DESTROY: + window_handle_ = nullptr; + Destroy(); + if (quit_on_close_) { + PostQuitMessage(0); + } + return 0; + + case WM_DPICHANGED: { + auto newRectSize = reinterpret_cast(lparam); + LONG newWidth = newRectSize->right - newRectSize->left; + LONG newHeight = newRectSize->bottom - newRectSize->top; + + SetWindowPos(hwnd, nullptr, newRectSize->left, newRectSize->top, newWidth, + newHeight, SWP_NOZORDER | SWP_NOACTIVATE); + + return 0; + } + case WM_SIZE: { + RECT rect = GetClientArea(); + if (child_content_ != nullptr) { + // Size and position the child window. + MoveWindow(child_content_, rect.left, rect.top, rect.right - rect.left, + rect.bottom - rect.top, TRUE); + } + return 0; + } + + case WM_ACTIVATE: + if (child_content_ != nullptr) { + SetFocus(child_content_); + } + return 0; + + case WM_DWMCOLORIZATIONCOLORCHANGED: + UpdateTheme(hwnd); + return 0; + } + + return DefWindowProc(window_handle_, message, wparam, lparam); +} + +void Win32Window::Destroy() { + OnDestroy(); + + if (window_handle_) { + DestroyWindow(window_handle_); + window_handle_ = nullptr; + } + if (g_active_window_count == 0) { + WindowClassRegistrar::GetInstance()->UnregisterWindowClass(); + } +} + +Win32Window* Win32Window::GetThisFromHandle(HWND const window) noexcept { + return reinterpret_cast( + GetWindowLongPtr(window, GWLP_USERDATA)); +} + +void Win32Window::SetChildContent(HWND content) { + child_content_ = content; + SetParent(content, window_handle_); + RECT frame = GetClientArea(); + + MoveWindow(content, frame.left, frame.top, frame.right - frame.left, + frame.bottom - frame.top, true); + + SetFocus(child_content_); +} + +RECT Win32Window::GetClientArea() { + RECT frame; + GetClientRect(window_handle_, &frame); + return frame; +} + +HWND Win32Window::GetHandle() { + return window_handle_; +} + +void Win32Window::SetQuitOnClose(bool quit_on_close) { + quit_on_close_ = quit_on_close; +} + +bool Win32Window::OnCreate() { + // No-op; provided for subclasses. + return true; +} + +void Win32Window::OnDestroy() { + // No-op; provided for subclasses. +} + +void Win32Window::UpdateTheme(HWND const window) { + DWORD light_mode; + DWORD light_mode_size = sizeof(light_mode); + LSTATUS result = RegGetValue(HKEY_CURRENT_USER, kGetPreferredBrightnessRegKey, + kGetPreferredBrightnessRegValue, + RRF_RT_REG_DWORD, nullptr, &light_mode, + &light_mode_size); + + if (result == ERROR_SUCCESS) { + BOOL enable_dark_mode = light_mode == 0; + DwmSetWindowAttribute(window, DWMWA_USE_IMMERSIVE_DARK_MODE, + &enable_dark_mode, sizeof(enable_dark_mode)); + } +} diff --git a/grocery_helper/windows/runner/win32_window.h b/grocery_helper/windows/runner/win32_window.h new file mode 100644 index 0000000..c86632d --- /dev/null +++ b/grocery_helper/windows/runner/win32_window.h @@ -0,0 +1,102 @@ +#ifndef RUNNER_WIN32_WINDOW_H_ +#define RUNNER_WIN32_WINDOW_H_ + +#include + +#include +#include +#include + +// A class abstraction for a high DPI-aware Win32 Window. Intended to be +// inherited from by classes that wish to specialize with custom +// rendering and input handling +class Win32Window { + public: + struct Point { + unsigned int x; + unsigned int y; + Point(unsigned int x, unsigned int y) : x(x), y(y) {} + }; + + struct Size { + unsigned int width; + unsigned int height; + Size(unsigned int width, unsigned int height) + : width(width), height(height) {} + }; + + Win32Window(); + virtual ~Win32Window(); + + // Creates a win32 window with |title| that is positioned and sized using + // |origin| and |size|. New windows are created on the default monitor. Window + // sizes are specified to the OS in physical pixels, hence to ensure a + // consistent size this function will scale the inputted width and height as + // as appropriate for the default monitor. The window is invisible until + // |Show| is called. Returns true if the window was created successfully. + bool Create(const std::wstring& title, const Point& origin, const Size& size); + + // Show the current window. Returns true if the window was successfully shown. + bool Show(); + + // Release OS resources associated with window. + void Destroy(); + + // Inserts |content| into the window tree. + void SetChildContent(HWND content); + + // Returns the backing Window handle to enable clients to set icon and other + // window properties. Returns nullptr if the window has been destroyed. + HWND GetHandle(); + + // If true, closing this window will quit the application. + void SetQuitOnClose(bool quit_on_close); + + // Return a RECT representing the bounds of the current client area. + RECT GetClientArea(); + + protected: + // Processes and route salient window messages for mouse handling, + // size change and DPI. Delegates handling of these to member overloads that + // inheriting classes can handle. + virtual LRESULT MessageHandler(HWND window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Called when CreateAndShow is called, allowing subclass window-related + // setup. Subclasses should return false if setup fails. + virtual bool OnCreate(); + + // Called when Destroy is called. + virtual void OnDestroy(); + + private: + friend class WindowClassRegistrar; + + // OS callback called by message pump. Handles the WM_NCCREATE message which + // is passed when the non-client area is being created and enables automatic + // non-client DPI scaling so that the non-client area automatically + // responsponds to changes in DPI. All other messages are handled by + // MessageHandler. + static LRESULT CALLBACK WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Retrieves a class instance pointer for |window| + static Win32Window* GetThisFromHandle(HWND const window) noexcept; + + // Update the window frame's theme to match the system theme. + static void UpdateTheme(HWND const window); + + bool quit_on_close_ = false; + + // window handle for top level window. + HWND window_handle_ = nullptr; + + // window handle for hosted content. + HWND child_content_ = nullptr; +}; + +#endif // RUNNER_WIN32_WINDOW_H_