Migrate away from helpers package

Reviewed-on: tom/rluv-client#3

.envrc

@@ -0,0 +1,2 @@
+use flake
+layout node

.gitea/workflows/lint.yml

@@ -0,0 +1,108 @@
+name: Lint Code
+
+on:
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  lint-mobile:
+    runs-on: ubuntu-latest
+    outputs:
+      output1: ${{ steps.filter.outputs.workflows }}
+    name: 'Lint Flutter Mobile'
+    steps:
+    - uses: actions/checkout@v3
+    # - uses: dorny/paths-filter@v2
+    #   id: filter
+    #   with:
+    #     list-files: shell
+    #     filters: |
+    #       mobile:
+    #         - added|modified: 'mobile/**'
+    - name: Install Deps
+      run: |
+          apt-get update
+          apt-get --yes --force-yes install jq unzip
+    - name: Install Flutter SDK and Lint
+      # if: steps.filter.outputs.mobile == 'true'
+      run: |
+        echo 'Downloading sdk...'
+        cd ..
+        git clone -b stable --single-branch https://github.com/flutter/flutter.git
+        echo 'Adding flutter to path:'
+        export PATH="$PATH:`pwd`/flutter/bin"
+        cd rluv-client
+        flutter doctor
+        echo 'Generating model files...'
+        dart run build_runner build
+        echo 'Analyzing...'
+        flutter analyze --no-fatal-infos --no-fatal-warnings > mobile_lint.txt
+        export MOBILE=$(cat mobile_lint.txt | grep -o 'No issues found' | wc -l | xargs)
+        if [[ $MOBILE == 0 ]]; then echo 'Flutter Linting failed with' && cat mobile_lint.txt | tail -n 15 && echo '...' && exit 1; fi
+
+  
+  # lint-busypay:
+  #   runs-on: ubuntu-latest
+  #   outputs:
+  #     output1: ${{ steps.filter.outputs.workflows }}
+  #   name: 'Lint Flutter Busypay'
+  #   steps:
+  #   - uses: actions/checkout@v3
+  #   - uses: dorny/paths-filter@v2
+  #     id: filter
+  #     with:
+  #       list-files: shell
+  #       filters: |
+  #         busypay:
+  #           - added|modified: 'busypay/lib/**'
+  #   - name: Install Flutter SDK
+  #     if: steps.filter.outputs.busypay == 'true'
+  #     uses: subosito/flutter-action@v2
+  #     with:
+  #       flutter-version: '3.0.2'
+  #       channel: 'stable'
+  #   - name: Lint BusyPay Flutter Files
+  #     if: steps.filter.outputs.busypay == 'true'
+  #     run: |
+  #         echo 'Analyzing flutter files'
+  #         cd busypay
+  #         flutter pub get
+  #         cd ..
+  #         flutter analyze --no-fatal-infos --no-fatal-warnings ${{ steps.filter.outputs.busypay_files }} > busypay_lint.txt
+  #         export BUSYPAY=$(cat busypay_lint.txt | grep -o 'No issues found' | wc -l | xargs)
+  #         if [[ $BUSYPAY == 0 ]]; then echo 'Flutter Linting failed with' && cat busypay_lint.txt | tail -n 15 && echo '...' && exit 1; fi
+
+  # lint-api:
+  #   runs-on: ubuntu-latest
+  #   outputs:
+  #     output1: ${{ steps.filter.outputs.workflows }}
+  #   name: 'Lint API'
+  #   steps:
+  #   - uses: actions/checkout@v3
+  #   - uses: dorny/paths-filter@v2
+  #     id: filter
+  #     with:
+  #       list-files: shell
+  #       filters: |
+  #         api:
+  #           - added|modified: 'api/**/*.rb'
+  #   # Run only if .rb files in api were modified
+  #   - name: Install Ruby
+  #     if: steps.filter.outputs.api == 'true'
+  #     uses: ruby/setup-ruby@v1
+  #     with:
+  #       ruby-version: '2.6'
+  #       #bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+  #       working-directory: 'api/'
+  #   - name: Lint API
+  #     if: steps.filter.outputs.api == 'true'  # sudo apt-get -yqq install libpq-dev
+  #     run: |
+  #         echo 'Installing rubocop gem'
+  #         export PATH=$RUBY_PATH:$PATH
+  #         gem install rubocop
+  #         rubocop -v
+  #         rubocop --fail-level=E ${{ steps.filter.outputs.api_files }} > api_lint.txt
+  #         export API=$(cat api_lint.txt | grep -o 'no offenses' | wc -l | xargs)
+  #         if [[ $API == 0 ]]; then echo 'API Linting failed with' && cat api_lint.txt | tail -n 15 && echo '...' && exit 1; fi
+  #     env: 
+  #       RUBY_PATH: /home/runner/.gem/ruby/2.6.0/bin

.gitignore

@@ -42,3 +42,7 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+
+#generated files
+lib/**/*.g.dart
+.direnv/

.ignore

@@ -0,0 +1,8 @@
+android
+ios
+web
+linux
+.metadata
+analysis_options.yaml
+pubspec.lock
+// lib/**/*.g.dart

.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: 4d9e56e694b656610ab87fcf2efbcd226e0ed8cf
+  channel: unknown
+
+project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: 4d9e56e694b656610ab87fcf2efbcd226e0ed8cf
+      base_revision: 4d9e56e694b656610ab87fcf2efbcd226e0ed8cf
+    - platform: android
+      create_revision: 4d9e56e694b656610ab87fcf2efbcd226e0ed8cf
+      base_revision: 4d9e56e694b656610ab87fcf2efbcd226e0ed8cf
+    - platform: ios
+      create_revision: 4d9e56e694b656610ab87fcf2efbcd226e0ed8cf
+      base_revision: 4d9e56e694b656610ab87fcf2efbcd226e0ed8cf
+    - platform: linux
+      create_revision: 4d9e56e694b656610ab87fcf2efbcd226e0ed8cf
+      base_revision: 4d9e56e694b656610ab87fcf2efbcd226e0ed8cf
+    - platform: macos
+      create_revision: 4d9e56e694b656610ab87fcf2efbcd226e0ed8cf
+      base_revision: 4d9e56e694b656610ab87fcf2efbcd226e0ed8cf
+    - platform: web
+      create_revision: 4d9e56e694b656610ab87fcf2efbcd226e0ed8cf
+      base_revision: 4d9e56e694b656610ab87fcf2efbcd226e0ed8cf
+    - platform: windows
+      create_revision: 4d9e56e694b656610ab87fcf2efbcd226e0ed8cf
+      base_revision: 4d9e56e694b656610ab87fcf2efbcd226e0ed8cf
+
+  # 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'

README.md

@@ -1,16 +0,0 @@
-# rluv
-
-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.

android.nix

@@ -0,0 +1,18 @@
+{androidenv}:
+androidenv.composeAndroidPackages {
+  toolsVersion = "26.1.1";
+  platformToolsVersion = "34.0.5";
+  buildToolsVersions = [ "30.0.3" ];
+  includeEmulator = false;
+  emulatorVersion = "34.1.9";
+  platformVersions = [ "28" "29" "30" "31" "32" "33" "34" ];
+  includeSources = false;
+  includeSystemImages = false;
+  systemImageTypes = [ "google_apis_playstore" ];
+  abiVersions = [ "armeabi-v7a" "arm64-v8a" ];
+  cmakeVersions = [ "3.10.2" ];
+  includeNDK = true;
+  ndkVersions = [ "22.0.7026061" ];
+  useGoogleAPIs = false;
+  useGoogleTVAddOns = false;
+}

android/Gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "fastlane"
+# Gem for fetching flutter version
+gem 'fastlane-plugin-flutter_version', '~> 1.0', '>= 1.0.1'

android/Gemfile.lock

@@ -0,0 +1,220 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (3.0.7)
+      base64
+      nkf
+      rexml
+    addressable (2.8.6)
+      public_suffix (>= 2.0.2, < 6.0)
+    artifactory (3.0.17)
+    atomos (0.1.3)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.912.0)
+    aws-sdk-core (3.191.6)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.8)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.78.0)
+      aws-sdk-core (~> 3, >= 3.191.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.146.1)
+      aws-sdk-core (~> 3, >= 3.191.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.8)
+    aws-sigv4 (1.8.0)
+      aws-eventstream (~> 1, >= 1.0.2)
+    babosa (1.0.4)
+    base64 (0.2.0)
+    claide (1.1.0)
+    colored (1.2)
+    colored2 (3.1.2)
+    commander (4.6.0)
+      highline (~> 2.0.0)
+    declarative (0.0.20)
+    digest-crc (0.6.5)
+      rake (>= 12.0.0, < 14.0.0)
+    domain_name (0.6.20240107)
+    dotenv (2.8.1)
+    emoji_regex (3.2.3)
+    excon (0.110.0)
+    faraday (1.10.3)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-cookie_jar (0.0.7)
+      faraday (>= 0.8.0)
+      http-cookie (~> 1.0.0)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    faraday_middleware (1.2.0)
+      faraday (~> 1.0)
+    fastimage (2.3.1)
+    fastlane (2.220.0)
+      CFPropertyList (>= 2.3, < 4.0.0)
+      addressable (>= 2.8, < 3.0.0)
+      artifactory (~> 3.0)
+      aws-sdk-s3 (~> 1.0)
+      babosa (>= 1.0.3, < 2.0.0)
+      bundler (>= 1.12.0, < 3.0.0)
+      colored (~> 1.2)
+      commander (~> 4.6)
+      dotenv (>= 2.1.1, < 3.0.0)
+      emoji_regex (>= 0.1, < 4.0)
+      excon (>= 0.71.0, < 1.0.0)
+      faraday (~> 1.0)
+      faraday-cookie_jar (~> 0.0.6)
+      faraday_middleware (~> 1.0)
+      fastimage (>= 2.1.0, < 3.0.0)
+      gh_inspector (>= 1.1.2, < 2.0.0)
+      google-apis-androidpublisher_v3 (~> 0.3)
+      google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-env (>= 1.6.0, < 2.0.0)
+      google-cloud-storage (~> 1.31)
+      highline (~> 2.0)
+      http-cookie (~> 1.0.5)
+      json (< 3.0.0)
+      jwt (>= 2.1.0, < 3)
+      mini_magick (>= 4.9.4, < 5.0.0)
+      multipart-post (>= 2.0.0, < 3.0.0)
+      naturally (~> 2.2)
+      optparse (>= 0.1.1, < 1.0.0)
+      plist (>= 3.1.0, < 4.0.0)
+      rubyzip (>= 2.0.0, < 3.0.0)
+      security (= 0.1.5)
+      simctl (~> 1.6.3)
+      terminal-notifier (>= 2.0.0, < 3.0.0)
+      terminal-table (~> 3)
+      tty-screen (>= 0.6.3, < 1.0.0)
+      tty-spinner (>= 0.8.0, < 1.0.0)
+      word_wrap (~> 1.0.0)
+      xcodeproj (>= 1.13.0, < 2.0.0)
+      xcpretty (~> 0.3.0)
+      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
+    fastlane-plugin-flutter_version (1.1.15)
+    gh_inspector (1.1.3)
+    google-apis-androidpublisher_v3 (0.54.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-core (0.11.3)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (>= 0.16.2, < 2.a)
+      httpclient (>= 2.8.1, < 3.a)
+      mini_mime (~> 1.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.a)
+      rexml
+    google-apis-iamcredentials_v1 (0.17.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-playcustomapp_v1 (0.13.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-storage_v1 (0.31.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-cloud-core (1.7.0)
+      google-cloud-env (>= 1.0, < 3.a)
+      google-cloud-errors (~> 1.0)
+    google-cloud-env (1.6.0)
+      faraday (>= 0.17.3, < 3.0)
+    google-cloud-errors (1.4.0)
+    google-cloud-storage (1.47.0)
+      addressable (~> 2.8)
+      digest-crc (~> 0.4)
+      google-apis-iamcredentials_v1 (~> 0.1)
+      google-apis-storage_v1 (~> 0.31.0)
+      google-cloud-core (~> 1.6)
+      googleauth (>= 0.16.2, < 2.a)
+      mini_mime (~> 1.0)
+    googleauth (1.8.1)
+      faraday (>= 0.17.3, < 3.a)
+      jwt (>= 1.4, < 3.0)
+      multi_json (~> 1.11)
+      os (>= 0.9, < 2.0)
+      signet (>= 0.16, < 2.a)
+    highline (2.0.3)
+    http-cookie (1.0.5)
+      domain_name (~> 0.5)
+    httpclient (2.8.3)
+    jmespath (1.6.2)
+    json (2.7.2)
+    jwt (2.8.1)
+      base64
+    mini_magick (4.12.0)
+    mini_mime (1.1.5)
+    multi_json (1.15.0)
+    multipart-post (2.4.0)
+    nanaimo (0.3.0)
+    naturally (2.2.1)
+    nkf (0.2.0)
+    optparse (0.4.0)
+    os (1.1.4)
+    plist (3.7.1)
+    public_suffix (5.0.5)
+    rake (13.2.1)
+    representable (3.2.0)
+      declarative (< 0.1.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
+      uber (< 0.2.0)
+    retriable (3.1.2)
+    rexml (3.2.6)
+    rouge (2.0.7)
+    ruby2_keywords (0.0.5)
+    rubyzip (2.3.2)
+    security (0.1.5)
+    signet (0.19.0)
+      addressable (~> 2.8)
+      faraday (>= 0.17.5, < 3.a)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
+    simctl (1.6.10)
+      CFPropertyList
+      naturally
+    terminal-notifier (2.0.0)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    trailblazer-option (0.1.2)
+    tty-cursor (0.7.1)
+    tty-screen (0.8.2)
+    tty-spinner (0.9.3)
+      tty-cursor (~> 0.7)
+    uber (0.1.0)
+    unicode-display_width (2.5.0)
+    word_wrap (1.0.0)
+    xcodeproj (1.24.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.3.0)
+      rexml (~> 3.2.4)
+    xcpretty (0.3.0)
+      rouge (~> 2.0.7)
+    xcpretty-travis-formatter (1.0.1)
+      xcpretty (~> 0.2, >= 0.0.7)
+
+PLATFORMS
+  ruby
+  x86_64-linux
+
+DEPENDENCIES
+  fastlane
+  fastlane-plugin-flutter_version (~> 1.0, >= 1.0.1)
+
+BUNDLED WITH
+   2.3.26

android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.rluv">
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <application
         android:label="rluv"
         android:name="${applicationName}"

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@color/ic_launcher_background"/>
+  <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

android/app/src/main/res/values/colors.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <color name="ic_launcher_background">#FFA188A6</color>
+</resources>

android/build.gradle

@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

android/gemset.nix

@@ -0,0 +1,914 @@
+{
+  addressable = {
+    dependencies = ["public_suffix"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0irbdwkkjwzajq1ip6ba46q49sxnrl2cw7ddkdhsfhb6aprnm3vr";
+      type = "gem";
+    };
+    version = "2.8.6";
+  };
+  artifactory = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qzj389l2a3zig040h882mf6cxfa71pm2nk51l4p85n3ck4xa8rh";
+      type = "gem";
+    };
+    version = "3.0.17";
+  };
+  atomos = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "17vq6sjyswr5jfzwdccw748kgph6bdw30bakwnn6p8sl4hpv4hvx";
+      type = "gem";
+    };
+    version = "0.1.3";
+  };
+  aws-eventstream = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0gvdg4yx4p9av2glmp7vsxhs0n8fj1ga9kq2xdb8f95j7b04qhzi";
+      type = "gem";
+    };
+    version = "1.3.0";
+  };
+  aws-partitions = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0vpwich545z3lyslis1mikgs9scm6fs9g2yjsqq6jv3a7nx355nd";
+      type = "gem";
+    };
+    version = "1.912.0";
+  };
+  aws-sdk-core = {
+    dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "08h9apxdn2aflkg751j4i56ks4750znfbj56w4zlxf4jk7jxkbyk";
+      type = "gem";
+    };
+    version = "3.191.6";
+  };
+  aws-sdk-kms = {
+    dependencies = ["aws-sdk-core" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0fbp2vw5qnyiya63hlmwiqkbh30lipyqplancmhm84ad7i98ambb";
+      type = "gem";
+    };
+    version = "1.78.0";
+  };
+  aws-sdk-s3 = {
+    dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1al80phz4x9wwfnr07q1l8h5f0qxgfrrycbg8jvznhxm3zhrakrq";
+      type = "gem";
+    };
+    version = "1.146.1";
+  };
+  aws-sigv4 = {
+    dependencies = ["aws-eventstream"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1g3w27wzjy4si6kp49w10as6ml6g6zl3xrfqs5ikpfciidv9kpc4";
+      type = "gem";
+    };
+    version = "1.8.0";
+  };
+  babosa = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "16dwqn33kmxkqkv51cwiikdkbrdjfsymlnc0rgbjwilmym8a9phq";
+      type = "gem";
+    };
+    version = "1.0.4";
+  };
+  base64 = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g";
+      type = "gem";
+    };
+    version = "0.2.0";
+  };
+  CFPropertyList = {
+    dependencies = ["base64" "nkf" "rexml"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0k1w5i4lb1z941m7ds858nly33f3iv12wvr1zav5x3fa99hj2my4";
+      type = "gem";
+    };
+    version = "3.0.7";
+  };
+  claide = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bpqhc0kqjp1bh9b7ffc395l9gfls0337rrhmab4v46ykl45qg3d";
+      type = "gem";
+    };
+    version = "1.1.0";
+  };
+  colored = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0b0x5jmsyi0z69bm6sij1k89z7h0laag3cb4mdn7zkl9qmxb90lx";
+      type = "gem";
+    };
+    version = "1.2";
+  };
+  colored2 = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jlbqa9q4mvrm73aw9mxh23ygzbjiqwisl32d8szfb5fxvbjng5i";
+      type = "gem";
+    };
+    version = "3.1.2";
+  };
+  commander = {
+    dependencies = ["highline"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1n8k547hqq9hvbyqbx2qi08g0bky20bbjca1df8cqq5frhzxq7bx";
+      type = "gem";
+    };
+    version = "4.6.0";
+  };
+  declarative = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1yczgnqrbls7shrg63y88g7wand2yp9h6sf56c9bdcksn5nds8c0";
+      type = "gem";
+    };
+    version = "0.0.20";
+  };
+  digest-crc = {
+    dependencies = ["rake"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09114ndpnnyamc2q07bmpzw7kp3rbbfv7plmxcbzzi9d6prmd92w";
+      type = "gem";
+    };
+    version = "0.6.5";
+  };
+  domain_name = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0cyr2xm576gqhqicsyqnhanni47408w2pgvrfi8pd13h2li3nsaz";
+      type = "gem";
+    };
+    version = "0.6.20240107";
+  };
+  dotenv = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1n0pi8x8ql5h1mijvm8lgn6bhq4xjb5a500p5r1krq4s6j9lg565";
+      type = "gem";
+    };
+    version = "2.8.1";
+  };
+  emoji_regex = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jsnrkfy345v66jlm2xrz8znivfnamg3mfzkddn414bndf2vxn7c";
+      type = "gem";
+    };
+    version = "3.2.3";
+  };
+  excon = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1m3gzvp1wqki0yh4b7761qhdy4pyr4phy429b7s9w25nrkhp4lsz";
+      type = "gem";
+    };
+    version = "0.110.0";
+  };
+  faraday = {
+    dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1c760q0ks4vj4wmaa7nh1dgvgqiwaw0mjr7v8cymy7i3ffgjxx90";
+      type = "gem";
+    };
+    version = "1.10.3";
+  };
+  faraday-cookie_jar = {
+    dependencies = ["faraday" "http-cookie"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00hligx26w9wdnpgsrf0qdnqld4rdccy8ym6027h5m735mpvxjzk";
+      type = "gem";
+    };
+    version = "0.0.7";
+  };
+  faraday-em_http = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "12cnqpbak4vhikrh2cdn94assh3yxza8rq2p9w2j34bqg5q4qgbs";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  faraday-em_synchrony = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  faraday-excon = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh";
+      type = "gem";
+    };
+    version = "1.1.0";
+  };
+  faraday-httpclient = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  faraday-multipart = {
+    dependencies = ["multipart-post"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09871c4hd7s5ws1wl4gs7js1k2wlby6v947m2bbzg43pnld044lh";
+      type = "gem";
+    };
+    version = "1.0.4";
+  };
+  faraday-net_http = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  faraday-net_http_persistent = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b";
+      type = "gem";
+    };
+    version = "1.2.0";
+  };
+  faraday-patron = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  faraday-rack = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1h184g4vqql5jv9s9im6igy00jp6mrah2h14py6mpf9bkabfqq7g";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  faraday-retry = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
+  faraday_middleware = {
+    dependencies = ["faraday"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1bw8mfh4yin2xk7138rg3fhb2p5g2dlmdma88k82psah9mbmvlfy";
+      type = "gem";
+    };
+    version = "1.2.0";
+  };
+  fastimage = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1sfc7svf7h1ja6zmsq9f3ps6pg0q4hymphh6rk7ipmp7ygqjkii3";
+      type = "gem";
+    };
+    version = "2.3.1";
+  };
+  fastlane = {
+    dependencies = ["CFPropertyList" "addressable" "artifactory" "aws-sdk-s3" "babosa" "colored" "commander" "dotenv" "emoji_regex" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-apis-androidpublisher_v3" "google-apis-playcustomapp_v1" "google-cloud-env" "google-cloud-storage" "highline" "http-cookie" "json" "jwt" "mini_magick" "multipart-post" "naturally" "optparse" "plist" "rubyzip" "security" "simctl" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "14ywmlipmryzdxzn4235ah67hy06wh5hf32jbs3a9j7byc2x1kx3";
+      type = "gem";
+    };
+    version = "2.220.0";
+  };
+  fastlane-plugin-flutter_version = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10lyrljpaic2gj9znpw6lh6y46l96jf85q9k62nl9sdklg888m8x";
+      type = "gem";
+    };
+    version = "1.1.15";
+  };
+  gh_inspector = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0f8r9byajj3bi2c7c5sqrc7m0zrv3nblfcd4782lw5l73cbsgk04";
+      type = "gem";
+    };
+    version = "1.1.3";
+  };
+  google-apis-androidpublisher_v3 = {
+    dependencies = ["google-apis-core"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "046j100lrh5dhb8p3gr38fyqrw8vcif97pqb55ysipy874lafw49";
+      type = "gem";
+    };
+    version = "0.54.0";
+  };
+  google-apis-core = {
+    dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15ycm7al9dizabbqmri5xmiz8mbcci343ygb64ndbmr9n49p08a3";
+      type = "gem";
+    };
+    version = "0.11.3";
+  };
+  google-apis-iamcredentials_v1 = {
+    dependencies = ["google-apis-core"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ysil0bkh755kmf9xvw5szhk1yyh3gqzwfsrbwsrl77gsv7jarcs";
+      type = "gem";
+    };
+    version = "0.17.0";
+  };
+  google-apis-playcustomapp_v1 = {
+    dependencies = ["google-apis-core"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1mlgwiid5lgg41y7qk8ca9lzhwx5njs25hz5fbf1mdal0kwm37lm";
+      type = "gem";
+    };
+    version = "0.13.0";
+  };
+  google-apis-storage_v1 = {
+    dependencies = ["google-apis-core"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "13yvc9r8bhs16vq3fjc93qlffmq9p6zx97c9g1c3wh0jbrvwrs03";
+      type = "gem";
+    };
+    version = "0.31.0";
+  };
+  google-cloud-core = {
+    dependencies = ["google-cloud-env" "google-cloud-errors"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0dagdfx3rnk9xplnj19gqpqn41fd09xfn8lp2p75psihhnj2i03l";
+      type = "gem";
+    };
+    version = "1.7.0";
+  };
+  google-cloud-env = {
+    dependencies = ["faraday"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "05gshdqscg4kil6ppfzmikyavsx449bxyj47j33r4n4p8swsqyb1";
+      type = "gem";
+    };
+    version = "1.6.0";
+  };
+  google-cloud-errors = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "056yw9cg771c1xqvw15wpdfdw9lz3m13fh5b6a3p1c9xaq7jwkhb";
+      type = "gem";
+    };
+    version = "1.4.0";
+  };
+  google-cloud-storage = {
+    dependencies = ["addressable" "digest-crc" "google-apis-iamcredentials_v1" "google-apis-storage_v1" "google-cloud-core" "googleauth" "mini_mime"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xpb3s7zr7g647xg66y2mavdargk5ixsfbfdmi4m2jc3khdd0hxm";
+      type = "gem";
+    };
+    version = "1.47.0";
+  };
+  googleauth = {
+    dependencies = ["faraday" "jwt" "multi_json" "os" "signet"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ry9v23kndgx2pxq9v31l68k9lnnrcz1w4v75bkxq88jmbddljl1";
+      type = "gem";
+    };
+    version = "1.8.1";
+  };
+  highline = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0yclf57n2j3cw8144ania99h1zinf8q3f5zrhqa754j6gl95rp9d";
+      type = "gem";
+    };
+    version = "2.0.3";
+  };
+  http-cookie = {
+    dependencies = ["domain_name"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "13rilvlv8kwbzqfb644qp6hrbsj82cbqmnzcvqip1p6vqx36sxbk";
+      type = "gem";
+    };
+    version = "1.0.5";
+  };
+  httpclient = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99";
+      type = "gem";
+    };
+    version = "2.8.3";
+  };
+  jmespath = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1cdw9vw2qly7q7r41s7phnac264rbsdqgj4l0h4nqgbjb157g393";
+      type = "gem";
+    };
+    version = "1.6.2";
+  };
+  json = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0b4qsi8gay7ncmigr0pnbxyb17y3h8kavdyhsh7nrlqwr35vb60q";
+      type = "gem";
+    };
+    version = "2.7.2";
+  };
+  jwt = {
+    dependencies = ["base64"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "02m3vza49pb9dirwpn8vmzbcypi3fc6l3a9dh253jwm1121g7ajb";
+      type = "gem";
+    };
+    version = "2.8.1";
+  };
+  mini_magick = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0slh78f9z6n0l1i2km7m48yz7l4fjrk88sj1f4mh1wb39sl2yc37";
+      type = "gem";
+    };
+    version = "4.12.0";
+  };
+  mini_mime = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1vycif7pjzkr29mfk4dlqv3disc5dn0va04lkwajlpr1wkibg0c6";
+      type = "gem";
+    };
+    version = "1.1.5";
+  };
+  multi_json = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z";
+      type = "gem";
+    };
+    version = "1.15.0";
+  };
+  multipart-post = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1033p35166d9p97y4vajbbvr13pmkk9zwn7sylxpmk9jrpk8ri67";
+      type = "gem";
+    };
+    version = "2.4.0";
+  };
+  nanaimo = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xi36h3f7nm8bc2k0b6svpda1lyank2gf872lxjbhw3h95hdrbma";
+      type = "gem";
+    };
+    version = "0.3.0";
+  };
+  naturally = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04x1nkx6gkqzlc4phdvq05v3vjds6mgqhjqzqpcs6vdh5xyqrf59";
+      type = "gem";
+    };
+    version = "2.2.1";
+  };
+  nkf = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09piyp2pd74klb9wcn0zw4mb5l0k9wzwppxggxi1yi95l2ym3hgv";
+      type = "gem";
+    };
+    version = "0.2.0";
+  };
+  optparse = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1pmsn1g1q5fpkjrc4h1wlw6lxlqp165sdcd951xyl47n6k0az17m";
+      type = "gem";
+    };
+    version = "0.4.0";
+  };
+  os = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0gwd20smyhxbm687vdikfh1gpi96h8qb1x28s2pdcysf6dm6v0ap";
+      type = "gem";
+    };
+    version = "1.1.4";
+  };
+  plist = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0b643i5b7b7galvlb2fc414ifmb78b5lsq47gnvhzl8m27dl559z";
+      type = "gem";
+    };
+    version = "3.7.1";
+  };
+  public_suffix = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "14y4vzjwf5gp0mqgs880kis0k7n2biq8i6ci6q2n315kichl1hvj";
+      type = "gem";
+    };
+    version = "5.0.5";
+  };
+  rake = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6";
+      type = "gem";
+    };
+    version = "13.2.1";
+  };
+  representable = {
+    dependencies = ["declarative" "trailblazer-option" "uber"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1kms3r6w6pnryysnaqqa9fsn0v73zx1ilds9d1c565n3xdzbyafc";
+      type = "gem";
+    };
+    version = "3.2.0";
+  };
+  retriable = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1q48hqws2dy1vws9schc0kmina40gy7sn5qsndpsfqdslh65snha";
+      type = "gem";
+    };
+    version = "3.1.2";
+  };
+  rexml = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0";
+      type = "gem";
+    };
+    version = "3.2.6";
+  };
+  rouge = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0sfikq1q8xyqqx690iiz7ybhzx87am4w50w8f2nq36l3asw4x89d";
+      type = "gem";
+    };
+    version = "2.0.7";
+  };
+  ruby2_keywords = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz";
+      type = "gem";
+    };
+    version = "0.0.5";
+  };
+  rubyzip = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz";
+      type = "gem";
+    };
+    version = "2.3.2";
+  };
+  security = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1drkm2wgjazwzj09db1szrllkag036bdvc3dr42fh1kpr877m5rs";
+      type = "gem";
+    };
+    version = "0.1.5";
+  };
+  signet = {
+    dependencies = ["addressable" "faraday" "jwt" "multi_json"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0cfxa11wy1nv9slmnzjczkdgld0gqizajsb03rliy53zylwkjzsk";
+      type = "gem";
+    };
+    version = "0.19.0";
+  };
+  simctl = {
+    dependencies = ["CFPropertyList" "naturally"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0sr3z4kmp6ym7synicyilj9vic7i9nxgaszqx6n1xn1ss7s7g45r";
+      type = "gem";
+    };
+    version = "1.6.10";
+  };
+  terminal-notifier = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1slc0y8pjpw30hy21v8ypafi8r7z9jlj4bjbgz03b65b28i2n3bs";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
+  terminal-table = {
+    dependencies = ["unicode-display_width"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "14dfmfjppmng5hwj7c5ka6qdapawm3h6k9lhn8zj001ybypvclgr";
+      type = "gem";
+    };
+    version = "3.0.2";
+  };
+  trailblazer-option = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "18s48fndi2kfvrfzmq6rxvjfwad347548yby0341ixz1lhpg3r10";
+      type = "gem";
+    };
+    version = "0.1.2";
+  };
+  tty-cursor = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0j5zw041jgkmn605ya1zc151bxgxl6v192v2i26qhxx7ws2l2lvr";
+      type = "gem";
+    };
+    version = "0.7.1";
+  };
+  tty-screen = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0l4vh6g333jxm9lakilkva2gn17j6gb052626r1pdbmy2lhnb460";
+      type = "gem";
+    };
+    version = "0.8.2";
+  };
+  tty-spinner = {
+    dependencies = ["tty-cursor"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0hh5awmijnzw9flmh5ak610x1d00xiqagxa5mbr63ysggc26y0qf";
+      type = "gem";
+    };
+    version = "0.9.3";
+  };
+  uber = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1p1mm7mngg40x05z52md3mbamkng0zpajbzqjjwmsyw0zw3v9vjv";
+      type = "gem";
+    };
+    version = "0.1.0";
+  };
+  unicode-display_width = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1d0azx233nags5jx3fqyr23qa2rhgzbhv8pxp46dgbg1mpf82xky";
+      type = "gem";
+    };
+    version = "2.5.0";
+  };
+  word_wrap = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1iyc5bc7dbgsd8j3yk1i99ral39f23l6wapi0083fbl19hid8mpm";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  xcodeproj = {
+    dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo" "rexml"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1wpg4n7b8571j2h8h7v2kk8pr141rgf6m8mhk221k990fissrq56";
+      type = "gem";
+    };
+    version = "1.24.0";
+  };
+  xcpretty = {
+    dependencies = ["rouge"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1xq47q2h5llj7b54rws4796904vnnjz7qqnacdv7wlp3gdbwrivm";
+      type = "gem";
+    };
+    version = "0.3.0";
+  };
+  xcpretty-travis-formatter = {
+    dependencies = ["xcpretty"];
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "14rg4f70klrs910n7rsgfa4dn8s2qyny55194ax2qyyb2wpk7k5a";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+}

build.yaml

@@ -0,0 +1,10 @@
+targets:
+  $default:
+    sources:
+      exclude:
+        - 'example/**'
+    builders:
+      json_serializable:
+        options:
+          explicit_to_json: true 
+          field_rename: snake

flake.lock

@@ -0,0 +1,186 @@
+{
+  "nodes": {
+    "android-nixpkgs": {
+      "inputs": {
+        "devshell": "devshell",
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1712088936,
+        "narHash": "sha256-mVjeSWQiR/t4UZ9fUawY9OEPAhY1R3meYG+0oh8DUBs=",
+        "owner": "tadfisher",
+        "repo": "android-nixpkgs",
+        "rev": "2d8181caef279f19c4a33dc694723f89ffc195d4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tadfisher",
+        "repo": "android-nixpkgs",
+        "type": "github"
+      }
+    },
+    "devshell": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "android-nixpkgs",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1711099426,
+        "narHash": "sha256-HzpgM/wc3aqpnHJJ2oDqPBkNsqWbW0WfWUO8lKu8nGk=",
+        "owner": "numtide",
+        "repo": "devshell",
+        "rev": "2d45b54ca4a183f2fdcf4b19c895b64fbf620ee8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "devshell",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1701680307,
+        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_3": {
+      "inputs": {
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1711703276,
+        "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1712608508,
+        "narHash": "sha256-vMZ5603yU0wxgyQeHJryOI+O61yrX2AHwY6LOFyV1gM=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "android-nixpkgs": "android-nixpkgs",
+        "flake-utils": "flake-utils_3",
+        "nixpkgs": "nixpkgs_2"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -0,0 +1,76 @@
+{
+  description = "An example project using flutter";
+
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+  inputs.flake-utils.url = "github:numtide/flake-utils";
+  inputs.android-nixpkgs.url = "github:tadfisher/android-nixpkgs";
+
+  outputs = {
+    self,
+    flake-utils,
+    nixpkgs,
+    ...
+  } @ inputs:
+    flake-utils.lib.eachDefaultSystem (system: let
+      pkgs = import nixpkgs {
+        inherit system;
+      };
+    in {
+      devShell = let
+        android-nixpkgs = pkgs.callPackage inputs.android-nixpkgs {};
+        android-sdk = android-nixpkgs.sdk (sdkPkgs:
+          with sdkPkgs; [
+            cmdline-tools-latest
+            build-tools-30-0-3
+            # This version needs to match the GRADLE_OPTS env var down below, vice versa
+            build-tools-34-0-0
+            platform-tools
+            platforms-android-28
+            platforms-android-29
+            platforms-android-31
+            platforms-android-33
+            platforms-android-34
+            emulator
+          ]);
+        # See below link for configuring ruby env with bundix
+        # https://github.com/the-nix-way/nix-flake-dev-environments/tree/main/ruby-on-rails
+        rubyEnv = pkgs.bundlerEnv {
+          name = "ruby-env";
+          inherit (pkgs) ruby;
+          gemdir = ./android;
+        };
+        # buildNodeJs = pkgs.callPackage "${nixpkgs}/pkgs/development/web/nodejs/nodejs.nix" {
+        #   python = pkgs.python3;
+        # };
+        # nodejs = buildNodeJs {
+        #   enableNpm = true;
+        #   version = "20.0.0";
+        #   sha256 = "sha256-Q5xxqi84woYWV7+lOOmRkaVxJYBmy/1FSFhgScgTQZA=";
+        # };
+      in 
+        pkgs.mkShell {
+          # Fix an issue with Flutter using an older version of aapt2, which does not know
+          # an used parameter.
+          GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${android-sdk}/share/android-sdk/build-tools/34.0.0/aapt2";
+          FLUTTER_ROOT = "${pkgs.flutter}";
+          # nativeBuildInputs = with pkgs; [
+          # ];
+          buildInputs = with pkgs; [
+            flutter
+            # pkg-config
+            jdk17
+            android-sdk
+            rubyEnv
+            rubyEnv.wrappedRuby
+            # fastlane
+            bundix
+            # gems
+            firebase-tools
+            # nodejs
+          ];
+          shellHook = ''
+            export PATH="$PATH":"$HOME/.pub-cache/bin" 
+          '';
+        };
+    });
+}

ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,122 +1,122 @@
 {
   "images": [
     {
-      "size" : "20x20",
-      "idiom" : "iphone",
       "filename": "Icon-App-20x20@2x.png",
-      "scale" : "2x"
+      "idiom": "iphone",
+      "scale": "2x",
+      "size": "20x20"
     },
     {
-      "size" : "20x20",
-      "idiom" : "iphone",
       "filename": "Icon-App-20x20@3x.png",
-      "scale" : "3x"
+      "idiom": "iphone",
+      "scale": "3x",
+      "size": "20x20"
     },
     {
-      "size" : "29x29",
-      "idiom" : "iphone",
       "filename": "Icon-App-29x29@1x.png",
-      "scale" : "1x"
+      "idiom": "iphone",
+      "scale": "1x",
+      "size": "29x29"
     },
     {
-      "size" : "29x29",
-      "idiom" : "iphone",
       "filename": "Icon-App-29x29@2x.png",
-      "scale" : "2x"
+      "idiom": "iphone",
+      "scale": "2x",
+      "size": "29x29"
     },
     {
-      "size" : "29x29",
-      "idiom" : "iphone",
       "filename": "Icon-App-29x29@3x.png",
-      "scale" : "3x"
+      "idiom": "iphone",
+      "scale": "3x",
+      "size": "29x29"
     },
     {
-      "size" : "40x40",
-      "idiom" : "iphone",
       "filename": "Icon-App-40x40@2x.png",
-      "scale" : "2x"
+      "idiom": "iphone",
+      "scale": "2x",
+      "size": "40x40"
     },
     {
-      "size" : "40x40",
-      "idiom" : "iphone",
       "filename": "Icon-App-40x40@3x.png",
-      "scale" : "3x"
+      "idiom": "iphone",
+      "scale": "3x",
+      "size": "40x40"
     },
     {
-      "size" : "60x60",
-      "idiom" : "iphone",
       "filename": "Icon-App-60x60@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "60x60",
       "idiom": "iphone",
+      "scale": "2x",
+      "size": "60x60"
+    },
+    {
       "filename": "Icon-App-60x60@3x.png",
-      "scale" : "3x"
+      "idiom": "iphone",
+      "scale": "3x",
+      "size": "60x60"
     },
     {
-      "size" : "20x20",
-      "idiom" : "ipad",
       "filename": "Icon-App-20x20@1x.png",
-      "scale" : "1x"
+      "idiom": "ipad",
+      "scale": "1x",
+      "size": "20x20"
     },
     {
-      "size" : "20x20",
-      "idiom" : "ipad",
       "filename": "Icon-App-20x20@2x.png",
-      "scale" : "2x"
+      "idiom": "ipad",
+      "scale": "2x",
+      "size": "20x20"
     },
     {
-      "size" : "29x29",
-      "idiom" : "ipad",
       "filename": "Icon-App-29x29@1x.png",
-      "scale" : "1x"
+      "idiom": "ipad",
+      "scale": "1x",
+      "size": "29x29"
     },
     {
-      "size" : "29x29",
-      "idiom" : "ipad",
       "filename": "Icon-App-29x29@2x.png",
-      "scale" : "2x"
+      "idiom": "ipad",
+      "scale": "2x",
+      "size": "29x29"
     },
     {
-      "size" : "40x40",
-      "idiom" : "ipad",
       "filename": "Icon-App-40x40@1x.png",
-      "scale" : "1x"
+      "idiom": "ipad",
+      "scale": "1x",
+      "size": "40x40"
     },
     {
-      "size" : "40x40",
-      "idiom" : "ipad",
       "filename": "Icon-App-40x40@2x.png",
-      "scale" : "2x"
+      "idiom": "ipad",
+      "scale": "2x",
+      "size": "40x40"
     },
     {
-      "size" : "76x76",
-      "idiom" : "ipad",
       "filename": "Icon-App-76x76@1x.png",
-      "scale" : "1x"
+      "idiom": "ipad",
+      "scale": "1x",
+      "size": "76x76"
     },
     {
-      "size" : "76x76",
-      "idiom" : "ipad",
       "filename": "Icon-App-76x76@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "83.5x83.5",
       "idiom": "ipad",
+      "scale": "2x",
+      "size": "76x76"
+    },
+    {
       "filename": "Icon-App-83.5x83.5@2x.png",
-      "scale" : "2x"
+      "idiom": "ipad",
+      "scale": "2x",
+      "size": "83.5x83.5"
     },
     {
-      "size" : "1024x1024",
-      "idiom" : "ios-marketing",
       "filename": "Icon-App-1024x1024@1x.png",
-      "scale" : "1x"
+      "idiom": "ios-marketing",
+      "scale": "1x",
+      "size": "1024x1024"
     }
   ],
   "info": {
-    "version" : 1,
+    "author": "icons_launcher",
-    "author" : "xcode"
+    "version": 1
   }
 }

lib/features/account/account_create_screen.dart

@@ -0,0 +1,110 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:rluv/features/account/signup.dart';
+import 'package:rluv/global/styles.dart';
+
+import '../../global/api.dart';
+import '../../global/widgets/ui_button.dart';
+import '../../main.dart';
+import 'login.dart';
+
+class AccountCreateScreen extends ConsumerStatefulWidget {
+  const AccountCreateScreen({super.key});
+
+  @override
+  ConsumerState<AccountCreateScreen> createState() => _AccountCreateScreenState();
+}
+
+enum _AccountScreen { options, login, signup }
+
+class _AccountCreateScreenState extends ConsumerState<AccountCreateScreen> {
+  _AccountScreen currentScreen = _AccountScreen.options;
+  static final signupFormKey = GlobalKey<FormState>();
+  static final loginFormKey = GlobalKey<FormState>();
+
+  bool usingUsername = true;
+  bool hasFamilyCode = false;
+
+  @override
+  Widget build(BuildContext context) {
+    if (ref.watch(tokenProvider) != null) {
+      WidgetsBinding.instance.addPostFrameCallback(
+        (_) {
+          Navigator.pushAndRemoveUntil(
+            context,
+            MaterialPageRoute(builder: (ctx) => const Home()),
+            (r) => false,
+          );
+        },
+      );
+    }
+    final screen = MediaQuery.of(context).size;
+    return Scaffold(
+      backgroundColor: Styles.purpleNurple,
+      body: SafeArea(
+        child: AnimatedSwitcher(
+          duration: const Duration(milliseconds: 300),
+          child: currentScreen == _AccountScreen.options
+              ? Center(
+                  child: SizedBox(
+                    width: screen.width * 0.5 > 400 ? 400 : screen.width * 0.5,
+                    child: Column(
+                      children: [
+                        const Spacer(),
+                        const Text(
+                          'Welcome!',
+                          style: TextStyle(fontSize: 28),
+                        ),
+                        Padding(
+                          padding: const EdgeInsets.symmetric(vertical: 40.0),
+                          child: Image.asset("assets/app_icon.png",
+                              height: screen.width > 500 ? 250 : screen.width * 0.5,
+                              width: screen.width > 500 ? 250 : screen.width * 0.5),
+                        ),
+                        UiButton(
+                          color: Styles.sunflower,
+                          onPressed: () {
+                            setState(
+                              () => currentScreen = _AccountScreen.signup,
+                            );
+                          },
+                          text: 'Signup',
+                        ),
+                        const SizedBox(height: 20),
+                        UiButton(
+                          color: Styles.flounderBlue,
+                          onPressed: () {
+                            setState(
+                              () => currentScreen = _AccountScreen.login,
+                            );
+                          },
+                          text: 'Login',
+                        ),
+                        const Spacer(),
+                      ],
+                    ),
+                  ),
+                )
+              : currentScreen == _AccountScreen.login
+                  ? Login(formKey: loginFormKey, exitNav: exitNav())
+                  : Signup(
+                      formKey: signupFormKey,
+                      exitNav: exitNav(),
+                    ),
+        ),
+      ),
+    );
+  }
+
+  Widget exitNav() => Align(
+        alignment: Alignment.topLeft,
+        child: IconButton(
+          icon: const Icon(Icons.chevron_left),
+          onPressed: () {
+            setState(
+              () => currentScreen = _AccountScreen.options,
+            );
+          },
+        ),
+      );
+}

lib/features/account/login.dart

@@ -0,0 +1,231 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import '../../global/api.dart';
+import '../../global/styles.dart';
+import '../../global/utils.dart';
+import '../../global/widgets/ui_button.dart';
+
+class Login extends ConsumerStatefulWidget {
+  const Login({super.key, required this.formKey, required this.exitNav});
+
+  final GlobalKey<FormState> formKey;
+  final Widget exitNav;
+
+  @override
+  ConsumerState<Login> createState() => _LoginState();
+}
+
+class _LoginState extends ConsumerState<Login> {
+  bool usingUsername = false;
+  final emailController = TextEditingController();
+  final usernameController = TextEditingController();
+  final passwordController = TextEditingController();
+
+  final focusNodes = [
+    FocusNode(),
+    FocusNode(),
+    FocusNode(),
+  ];
+
+  @override
+  Widget build(BuildContext context) {
+    final screen = MediaQuery.of(context).size;
+    return Form(
+      key: widget.formKey,
+      child: Stack(
+        children: [
+          Column(
+            children: [
+              const Spacer(),
+              const Text(
+                'Login',
+                style: TextStyle(fontSize: 24),
+              ),
+              const Spacer(flex: 2),
+              Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  Column(
+                    children: [
+                      const Padding(
+                        padding: EdgeInsets.all(2.0),
+                        child: Text(
+                          'Username',
+                          style: TextStyle(
+                            fontSize: 16,
+                          ),
+                        ),
+                      ),
+                      Checkbox(
+                        activeColor: Styles.lavender,
+                        onChanged: (bool? value) {
+                          setState(() => usingUsername = true);
+                        },
+                        value: usingUsername,
+                      ),
+                    ],
+                  ),
+                  const SizedBox(
+                    width: 35,
+                  ),
+                  Column(
+                    children: [
+                      const Padding(
+                        padding: EdgeInsets.all(2.0),
+                        child: Text(
+                          'Email',
+                          style: TextStyle(
+                            fontSize: 16,
+                          ),
+                        ),
+                      ),
+                      Checkbox(
+                        activeColor: Styles.lavender,
+                        onChanged: (bool? value) {
+                          setState(() => usingUsername = false);
+                        },
+                        value: !usingUsername,
+                      ),
+                    ],
+                  ),
+                ],
+              ),
+              AnimatedSwitcher(
+                duration: const Duration(milliseconds: 200),
+                child: !usingUsername
+                    ? generateTextField(
+                        controller: emailController,
+                        size: screen,
+                        text: 'Email: ',
+                        validatorFunc: (s) {
+                          if (s != null && s.isNotEmpty && !isEmailValid(s)) {
+                            return 'Email entered is invalid';
+                          }
+                          return null;
+                        },
+                        index: 0)
+                    : generateTextField(
+                        controller: usernameController,
+                        size: screen,
+                        text: 'Username: ',
+                        validatorFunc: (s) {
+                          if (s == null || s.isEmpty) {
+                            return 'Invalid Username';
+                          }
+                          if (s.length < 3) {
+                            return 'Username Not 3 Letters Long';
+                          }
+                          if (s.length > 20) {
+                            return 'Username Too Long';
+                          }
+                          if (!isUsernameValid(s)) {
+                            return 'Letters, Numbers, and ., -, _ Allowed';
+                          }
+                          return null;
+                        },
+                        index: 0),
+              ),
+              generateTextField(
+                  controller: passwordController,
+                  size: screen,
+                  text: 'Password: ',
+                  validatorFunc: (s) {
+                    if (s != null && s.length < 6) {
+                      return 'Please do a better password (you have to)';
+                    }
+                    return null;
+                  },
+                  index: 1,
+                  isPassword: true),
+              const Spacer(flex: 2),
+              UiButton(
+                width: screen.width * 0.85 > 400 ? 400 : screen.width * 0.85,
+                showLoading: true,
+                onPressed: () => login(),
+                text: 'Submit',
+                color: Styles.seaweedGreen,
+              ),
+              const Spacer(),
+            ],
+          ),
+          widget.exitNav,
+        ],
+      ),
+    );
+  }
+
+  Widget generateTextField({
+    required String text,
+    String? label,
+    required int index,
+    required TextEditingController controller,
+    isPassword = false,
+    required Size size,
+    required String? Function(String?) validatorFunc,
+  }) {
+    return Padding(
+      padding: const EdgeInsets.all(8.0),
+      child: Row(
+        children: [
+          Padding(
+            padding: const EdgeInsets.all(8.0),
+            child: Text(
+              text,
+              style: TextStyle(fontSize: size.width < 350 ? 16 : 20),
+            ),
+          ),
+          const Spacer(),
+          Container(
+            decoration: Styles.boxLavenderBubble,
+            width: size.width * 0.5 > 300 ? 300 : size.width * 0.5,
+            child: TextFormField(
+              validator: validatorFunc,
+              controller: controller,
+              decoration: Styles.inputLavenderBubble(labelText: label),
+              obscureText: isPassword,
+              focusNode: focusNodes[index],
+              style: const TextStyle(fontSize: 16),
+              onFieldSubmitted: (_) {
+                if (index != focusNodes.length - 1) {
+                  focusNodes[index + 1].requestFocus();
+                }
+              },
+            ),
+          ),
+          SizedBox(
+            width: size.width * 0.05,
+          ),
+        ],
+      ),
+    );
+  }
+
+  Future login() async {
+    try {
+      if (widget.formKey.currentState != null && !widget.formKey.currentState!.validate()) {
+        return;
+      }
+      final data = await ref.read(apiProvider.notifier).post(path: 'auth/login', data: {
+        'username': usernameController.text.isEmpty ? null : usernameController.text,
+        'email': emailController.text.isEmpty ? null : emailController.text,
+        'password': passwordController.text,
+      });
+
+      String message = 'Login unsuccessful';
+      bool success = data?['success'] == 'false';
+      if (data != null) {
+        if (data['message'] != null) {
+          message = data['message'];
+        } else if (success) {
+          message = 'Logged in!';
+        }
+      }
+      // final bool success = data?['success'] ?? false;
+      print(data);
+      showSnack(ref: ref, text: message, type: !success ? SnackType.error : SnackType.success);
+    } catch (err, st) {
+      print('Error in login: $err\n$st');
+    }
+  }
+}

lib/features/account/signup.dart

@@ -0,0 +1,245 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import '../../global/api.dart';
+import '../../global/styles.dart';
+import '../../global/utils.dart';
+import '../../global/widgets/ui_button.dart';
+
+class Signup extends ConsumerStatefulWidget {
+  const Signup({super.key, required this.formKey, required this.exitNav});
+
+  final GlobalKey<FormState> formKey;
+  final Widget exitNav;
+
+  @override
+  ConsumerState<Signup> createState() => _SignupState();
+}
+
+class _SignupState extends ConsumerState<Signup> {
+  bool hasFamilyCode = false;
+  final nameCotroller = TextEditingController();
+  final usernameController = TextEditingController();
+  final emailController = TextEditingController();
+  final passwordController = TextEditingController();
+  final familyCodeController = TextEditingController();
+
+  final focusNodes = [
+    FocusNode(),
+    FocusNode(),
+    FocusNode(),
+    FocusNode(),
+    FocusNode(),
+  ];
+
+  @override
+  Widget build(BuildContext context) {
+    final screen = MediaQuery.of(context).size;
+    return Form(
+      key: widget.formKey,
+      child: Stack(
+        children: [
+          Column(
+            children: [
+              const Spacer(),
+              const Text(
+                'Signup',
+                style: TextStyle(fontSize: 24),
+              ),
+              const Spacer(),
+              generateTextField(
+                  controller: nameCotroller,
+                  size: screen,
+                  text: 'Name:',
+                  validatorFunc: (s) {
+                    if (s == null || s.isEmpty) {
+                      return 'You matter! Enter a name :)';
+                    }
+                    return null;
+                  },
+                  index: 0),
+              generateTextField(
+                  controller: usernameController,
+                  size: screen,
+                  text: 'Username: ',
+                  validatorFunc: (s) {
+                    if (s == null || s.isEmpty) {
+                      return 'Invalid Username';
+                    }
+                    if (s.length < 3) {
+                      return 'Username Not 3 Letters Long';
+                    }
+                    if (s.length > 20) {
+                      return 'Username Too Long';
+                    }
+                    if (!isUsernameValid(s)) {
+                      return 'Letters, Numbers, and ., -, _ Allowed';
+                    }
+                    return null;
+                  },
+                  index: 1),
+              generateTextField(
+                  controller: emailController,
+                  size: screen,
+                  validatorFunc: (s) {
+                    if (s != null && s.isNotEmpty && !isEmailValid(s)) {
+                      return 'Email entered is invalid';
+                    }
+                    return null;
+                  },
+                  text: 'Email:',
+                  subtext: '(optional)',
+                  index: 2),
+              generateTextField(
+                  controller: passwordController,
+                  size: screen,
+                  validatorFunc: (s) {
+                    if (s != null && s.length < 6) {
+                      return 'Please do a better password (you have to)';
+                    }
+                    return null;
+                  },
+                  text: 'Password:',
+                  index: 3,
+                  isPassword: true),
+              const SizedBox(height: 30),
+              AnimatedSwitcher(
+                  duration: const Duration(milliseconds: 300),
+                  child: hasFamilyCode
+                      ? Column(
+                          children: [
+                            generateTextField(
+                              controller: familyCodeController,
+                              size: screen,
+                              validatorFunc: (s) {
+                                if (hasFamilyCode) {
+                                  if (s == null || s.length != 5) {
+                                    return 'Invalid Code';
+                                  }
+                                }
+                                return null;
+                              },
+                              text: 'Family Code:',
+                              index: 4,
+                            ),
+                            UiButton(
+                              width: screen.width * 0.4,
+                              icon: const Icon(Icons.cancel, color: Styles.washedStone, size: 20),
+                              onPressed: () {
+                                setState(
+                                  () => hasFamilyCode = false,
+                                );
+                              },
+                              text: 'Cancel',
+                            ),
+                          ],
+                        )
+                      : Padding(
+                          padding: const EdgeInsets.all(8.0),
+                          child: UiButton(
+                            width: screen.width * 0.5 > 400 ? 400 : screen.width * 0.5,
+                            text: 'JOIN FAMILY',
+                            // color: Styles.flounderBlue,
+                            onPressed: () {
+                              setState(
+                                () => hasFamilyCode = true,
+                              );
+                            },
+                          ),
+                        )),
+              const Spacer(),
+              UiButton(
+                showLoading: true,
+                onPressed: () => signup(),
+                text: 'Submit',
+                color: Styles.seaweedGreen,
+              ),
+              const Spacer(),
+            ],
+          ),
+          widget.exitNav,
+        ],
+      ),
+    );
+  }
+
+  Widget generateTextField({
+    required String text,
+    String? subtext,
+    String? label,
+    required int index,
+    required TextEditingController controller,
+    isPassword = false,
+    required Size size,
+    required String? Function(String?) validatorFunc,
+  }) {
+    return Padding(
+      padding: const EdgeInsets.all(8.0),
+      child: Row(
+        children: [
+          Padding(
+            padding: const EdgeInsets.all(8.0),
+            child: Column(
+              children: [
+                Text(
+                  text,
+                  style: TextStyle(fontSize: size.width < 350 ? 16 : 20),
+                ),
+                if (subtext != null) Text(subtext, style: const TextStyle(fontSize: 12)),
+              ],
+            ),
+          ),
+          const Spacer(),
+          Container(
+            decoration: Styles.boxLavenderBubble,
+            width: size.width * 0.5 > 300 ? 300 : size.width * 0.5,
+            child: TextFormField(
+              validator: validatorFunc,
+              controller: controller,
+              decoration: Styles.inputLavenderBubble(labelText: label),
+              obscureText: isPassword,
+              focusNode: focusNodes[index],
+              style: const TextStyle(fontSize: 16),
+              onFieldSubmitted: (_) {
+                if (index != focusNodes.length - 1) {
+                  focusNodes[index + 1].requestFocus();
+                }
+              },
+            ),
+          ),
+          SizedBox(
+            width: size.width * 0.05,
+          ),
+        ],
+      ),
+    );
+  }
+
+  Future signup() async {
+    try {
+      if (widget.formKey.currentState != null && !widget.formKey.currentState!.validate()) {
+        return;
+      }
+      final data = await ref.read(apiProvider.notifier).post(path: 'auth/signup', data: {
+        'name': nameCotroller.text,
+        'username': usernameController.text.isEmpty ? null : usernameController.text,
+        'email': emailController.text.isEmpty ? null : emailController.text,
+        'password': passwordController.text,
+        'family_code': familyCodeController.text.isEmpty ? null : familyCodeController.text.toUpperCase(),
+        'budget_name': 'Budget'
+      });
+
+      final success = data?['success'] ?? false;
+      showSnack(
+          ref: ref,
+          text: data?['message'] ?? success ? 'Login successful' : 'Login unsuccessful',
+          type: !success ? SnackType.error : SnackType.success);
+
+      print(data);
+      // final user = User.fromJson(data?['user']);
+      // ref.read(tokenProvider.notifier).state =
+    } catch (err) {
+      print(err);
+    }
+  }
+}

lib/features/budget/screens/budget_overview.dart

@@ -0,0 +1,278 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:rluv/features/budget/screens/transactions_listview.dart';
+import 'package:rluv/features/budget/widgets/add_transaction_dialog.dart';
+import 'package:rluv/features/budget/widgets/budget_category_bar.dart';
+import 'package:rluv/features/budget/widgets/budget_net_bar.dart';
+import 'package:rluv/global/styles.dart';
+import 'package:rluv/global/utils.dart';
+import 'package:rluv/models/budget_category_model.dart';
+
+import '../../../global/store.dart';
+import '../../../global/widgets/ui_button.dart';
+import '../../../models/transaction_model.dart';
+import '../widgets/add_budget_category_dialog.dart';
+
+class BudgetOverviewScreen extends ConsumerStatefulWidget {
+  const BudgetOverviewScreen({super.key, required this.initialData});
+
+  final Map<String, dynamic> initialData;
+
+  @override
+  ConsumerState<BudgetOverviewScreen> createState() => _BudgetOverviewScreenState();
+}
+
+class _BudgetOverviewScreenState extends ConsumerState<BudgetOverviewScreen> {
+  final budgetListScrollController = ScrollController();
+  @override
+  Widget build(BuildContext context) {
+    final budget = ref.watch(budgetProvider);
+    final budgetCategories = ref.watch(budgetCategoriesProvider);
+    final transactions = ref.watch(transactionsProvider);
+    final screen = MediaQuery.of(context).size;
+    double netExpense = 0.0;
+    double netIncome = 0.0;
+    double expectedExpenses = 0.0;
+    Map<int, double> budgetCategoryNetMap = {};
+    netExpense =
+        transactions.where((t) => t.type == TransactionType.expense).fold(netExpense, (net, t) => net + t.amount);
+    netIncome = transactions.where((t) => t.type == TransactionType.income).fold(netIncome, (net, t) => net + t.amount);
+    for (final bud in budgetCategories) {
+      double net = 0.0;
+      expectedExpenses += bud.amount;
+      net = transactions.where((t) => t.budgetCategoryId == bud.id).fold(net, (net, t) => net + t.amount);
+      budgetCategoryNetMap[bud.id!] = net;
+    }
+    return Stack(
+      children: [
+        Column(
+          children: [
+            /// TOP HALF, TITLE & OVERVIEW
+            Container(
+              height: screen.height * 0.3,
+              width: screen.width,
+              color: Styles.purpleNurple,
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.center,
+                children: [
+                  const Spacer(flex: 2),
+                  Text(
+                    formatDate(DateTime.now()),
+                    style: const TextStyle(fontSize: 16, color: Styles.electricBlue),
+                  ),
+                  const Spacer(),
+                  const Text('MONTHLY', style: TextStyle(fontSize: 42, color: Styles.electricBlue)),
+                  const Spacer(flex: 2),
+                  BudgetNetBar(isPositive: true, net: netIncome, expected: budget?.expectedIncome ?? 0.0),
+                  const Spacer(),
+                  BudgetNetBar(isPositive: false, net: netExpense, expected: expectedExpenses),
+                  const Spacer(),
+                ],
+              ),
+            ),
+
+            /// BOTTOM HALF, BUDGET BREAKDOWN
+            Expanded(
+              child: Container(
+                color: Styles.sunflower,
+                width: screen.width,
+                child: Column(
+                  mainAxisSize: MainAxisSize.max,
+                  children: [
+                    Padding(
+                      padding: const EdgeInsets.all(14.0),
+                      child: Container(
+                        decoration: BoxDecoration(
+                          color: Styles.blushingPink,
+                          borderRadius: BorderRadius.circular(16.0),
+                        ),
+                        child: Column(
+                          children: [
+                            const Padding(
+                              padding: EdgeInsets.all(8.0),
+                              child: Text(
+                                'BUDGET',
+                                style: TextStyle(fontSize: 28, color: Styles.electricBlue),
+                              ),
+                            ),
+                            budgetCategories.isEmpty
+                                ? Padding(
+                                    padding: const EdgeInsets.all(8.0),
+                                    child: SizedBox(
+                                      width: screen.width * 0.8,
+                                      child: Column(
+                                        children: [
+                                          const Padding(
+                                            padding: EdgeInsets.all(8.0),
+                                            child: Text('No budget categories created yet, add some!'),
+                                          ),
+                                          UiButton(
+                                            onPressed: ref.watch(budgetProvider) == null
+                                                ? null
+                                                : () => showDialog(
+                                                      context: context,
+                                                      builder: (context) => Dialog(
+                                                          shape: Styles.dialogShape,
+                                                          backgroundColor: Styles.dialogColor,
+                                                          child: const BudgetCategoryDialog()),
+                                                    ),
+                                            text: 'Add Category',
+                                          ),
+                                        ],
+                                      ),
+                                    ),
+                                  )
+                                : Padding(
+                                    padding: const EdgeInsets.symmetric(horizontal: 2.0, vertical: 4.0),
+                                    child: SizedBox(
+                                      height: screen.height * 0.36,
+                                      child: Scrollbar(
+                                        controller: budgetListScrollController,
+                                        thumbVisibility: true,
+                                        child: ListView(
+                                          physics: const BouncingScrollPhysics(),
+                                          controller: budgetListScrollController,
+                                          shrinkWrap: true,
+                                          children: [
+                                            ...budgetCategories.map((BudgetCategory category) {
+                                              final i = budgetCategories.indexOf(category);
+                                              return BudgetCategoryBar(
+                                                budgetCategory: category,
+                                                currentAmount: budgetCategoryNetMap[category.id]!,
+                                                index: i,
+                                              );
+                                            }).toList(),
+                                            const SizedBox(height: 20),
+                                            Row(
+                                              mainAxisAlignment: MainAxisAlignment.center,
+                                              children: [
+                                                SizedBox(
+                                                  width: 140,
+                                                  child: ElevatedButton(
+                                                    onPressed: ref.watch(budgetProvider) == null
+                                                        ? null
+                                                        : () => showDialog(
+                                                              context: context,
+                                                              builder: (context) => Dialog(
+                                                                  shape: Styles.dialogShape,
+                                                                  backgroundColor: Styles.dialogColor,
+                                                                  child: const BudgetCategoryDialog()),
+                                                            ),
+                                                    child: const Text('Add Category'),
+                                                  ),
+                                                ),
+                                              ],
+                                            ),
+                                            const SizedBox(height: 20),
+                                          ],
+                                        ),
+                                      ),
+                                    ),
+                                  ),
+                          ],
+                        ),
+                      ),
+                    ),
+                    const Spacer(),
+                    Row(
+                      children: [
+                        Expanded(
+                          child: Padding(
+                            padding: const EdgeInsets.only(left: 20.0, right: 15.0),
+                            child: Container(
+                              height: 70,
+                              decoration: BoxDecoration(
+                                color: Styles.seaweedGreen,
+                                borderRadius: BorderRadius.circular(15.0),
+                              ),
+                              child: InkWell(
+                                child: const Center(
+                                  child: Padding(
+                                    padding: EdgeInsets.symmetric(horizontal: 20.0, vertical: 14.0),
+                                    child: FittedBox(
+                                      child: Text(
+                                        'Transaction History',
+                                        textAlign: TextAlign.center,
+                                        style: TextStyle(fontSize: 25),
+                                      ),
+                                    ),
+                                  ),
+                                ),
+                                onTap: () {
+                                  Navigator.push(
+                                      context, MaterialPageRoute(builder: (context) => const TransactionsListview()));
+                                },
+                              ),
+                            ),
+                          ),
+                        ),
+                        Padding(
+                          padding: const EdgeInsets.only(right: 20.0),
+                          child: Container(
+                            decoration: BoxDecoration(
+                              color: Styles.purpleNurple,
+                              borderRadius: BorderRadius.circular(40.0),
+                            ),
+                            height: 80,
+                            width: 80,
+                            child: IconButton(
+                              icon: const Icon(
+                                Icons.add,
+                                size: 48,
+                                color: Styles.lavender,
+                              ),
+                              onPressed: () {
+                                showDialog(
+                                  context: context,
+                                  builder: (BuildContext context) {
+                                    return Dialog(
+                                        backgroundColor: Styles.dialogColor,
+                                        shape: Styles.dialogShape,
+                                        child: const TransactionDialog());
+                                  },
+                                );
+                              },
+                            ),
+                          ),
+                        ),
+                      ],
+                    ),
+                    const Spacer(),
+                  ],
+                ),
+              ),
+            )
+          ],
+        ),
+        Align(
+          alignment: Alignment.topRight,
+          child: Padding(
+            padding: const EdgeInsets.only(top: 5.0, right: 5.0),
+            child: IconButton(
+              icon: const Icon(Icons.loop),
+              color: Styles.seaweedGreen,
+              onPressed: () => ref.read(dashboardProvider.notifier).fetchDashboard(),
+            ),
+          ),
+        ),
+        IgnorePointer(
+          child: AnimatedOpacity(
+            duration: const Duration(milliseconds: 150),
+            opacity: ref.watch(loadingStateProvider) ? 0.75 : 0.0,
+            child: Container(
+              color: Colors.black12,
+              height: screen.height,
+              width: screen.width,
+              child: const Center(
+                child: CircularProgressIndicator(
+                  color: Styles.lavender,
+                  strokeWidth: 2.5,
+                ),
+              ),
+            ),
+          ),
+        )
+      ],
+    );
+  }
+}

lib/features/budget/screens/transactions_listview.dart

@@ -0,0 +1,288 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:rluv/features/budget/widgets/transaction_list_item.dart';
+import 'package:rluv/global/styles.dart';
+import 'package:rluv/models/transaction_model.dart';
+
+import '../../../global/store.dart';
+import '../../../models/budget_category_model.dart';
+
+class TransactionsListview extends ConsumerStatefulWidget {
+  const TransactionsListview({super.key});
+
+  @override
+  ConsumerState<TransactionsListview> createState() => _TransactionsListviewState();
+}
+
+class _TransactionsListviewState extends ConsumerState<TransactionsListview> {
+  final scaffoldKey = GlobalKey<ScaffoldState>();
+
+  @override
+  void initState() {
+    // TODO: implement initState
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      ref.read(selectedTransactionSortProvider.notifier).state = TransactionSort.all;
+      ref.read(selectedSortDateProvider.notifier).state = SortDate.decending;
+    });
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final budgetCategories = ref.watch(budgetCategoriesProvider);
+    if (ref.read(selectedCategory) == null && budgetCategories.isNotEmpty) {
+      WidgetsBinding.instance
+          .addPostFrameCallback((_) => ref.read(selectedCategory.notifier).state = budgetCategories.first);
+    }
+    final sortType = ref.watch(selectedTransactionSortProvider);
+    final sortDate = ref.watch(selectedSortDateProvider);
+    List<Transaction> transactions = [...ref.watch(transactionsProvider)];
+    // Removes transactions by category
+    switch (sortType) {
+      case TransactionSort.income:
+        transactions = transactions
+            .where(
+              (element) => element.type == TransactionType.income,
+            )
+            .toList();
+        break;
+      case TransactionSort.expense:
+        transactions = transactions
+            .where(
+              (element) => element.type == TransactionType.expense,
+            )
+            .toList();
+        break;
+      case TransactionSort.category:
+        if (ref.read(selectedCategory) != null) {
+          transactions = transactions
+              .where(
+                (element) => element.budgetCategoryId == ref.read(selectedCategory)!.id,
+              )
+              .toList();
+        }
+        break;
+      case TransactionSort.all:
+        break;
+    }
+    // Sorts transactions by date
+    switch (sortDate) {
+      case SortDate.ascending:
+        transactions.sort((a, b) => a.date.compareTo(b.date));
+        break;
+      case SortDate.decending:
+        transactions.sort((a, b) => b.date.compareTo(a.date));
+        break;
+    }
+
+    WidgetsBinding.instance
+        .addPostFrameCallback((_) => ref.read(transactionHistoryListProvider.notifier).state = transactions);
+    return Scaffold(
+      endDrawer: Drawer(
+        backgroundColor: Styles.purpleNurple,
+        child: SafeArea(
+          child: Column(
+            children: [
+              SizedBox(height: MediaQuery.of(context).size.height * 0.15),
+              DropdownButton<TransactionSort>(
+                  dropdownColor: Styles.lavender,
+                  value: ref.watch(selectedTransactionSortProvider),
+                  items: TransactionSort.values
+                      .map(
+                        (e) => DropdownMenuItem(
+                          value: e,
+                          child: Row(
+                            mainAxisSize: MainAxisSize.min,
+                            children: [
+                              sortTypeToIcon(e),
+                              const SizedBox(width: 12),
+                              Text(e.name),
+                            ],
+                          ),
+                        ),
+                      )
+                      .toList(),
+                  onChanged: (TransactionSort? value) {
+                    if (value != null) {
+                      ref.read(selectedTransactionSortProvider.notifier).state = value;
+                    }
+                  }),
+              const SizedBox(height: 20),
+              DropdownButton<SortDate>(
+                  dropdownColor: Styles.lavender,
+                  value: ref.watch(selectedSortDateProvider),
+                  items: SortDate.values
+                      .map(
+                        (e) => DropdownMenuItem(
+                          value: e,
+                          child: Row(
+                            mainAxisSize: MainAxisSize.min,
+                            children: [
+                              sortDateToIcon(e),
+                              const SizedBox(width: 12),
+                              Text(e.name),
+                            ],
+                          ),
+                        ),
+                      )
+                      .toList(),
+                  onChanged: (SortDate? value) {
+                    if (value != null) {
+                      ref.read(selectedSortDateProvider.notifier).state = value;
+                    }
+                  }),
+              const SizedBox(height: 20),
+              if (ref.read(selectedTransactionSortProvider) == TransactionSort.category)
+                DropdownButton<BudgetCategory>(
+                  dropdownColor: Styles.lavender,
+                  value: ref.watch(selectedCategory),
+                  items: budgetCategories
+                      .map(
+                        (e) => DropdownMenuItem(
+                          value: e,
+                          child: Row(
+                            mainAxisSize: MainAxisSize.min,
+                            children: [
+                              Container(
+                                height: 18,
+                                width: 18,
+                                decoration: BoxDecoration(
+                                  shape: BoxShape.circle,
+                                  border: Border.all(color: Colors.black, width: 1.5),
+                                  color: e.color,
+                                ),
+                              ),
+                              const SizedBox(width: 12),
+                              Text(e.name),
+                            ],
+                          ),
+                        ),
+                      )
+                      .toList(),
+                  onChanged: (BudgetCategory? value) {
+                    if (value != null) {
+                      ref.read(selectedCategory.notifier).state = value;
+                    }
+                  },
+                ),
+            ],
+          ),
+        ),
+      ),
+      key: scaffoldKey,
+      backgroundColor: Styles.purpleNurple,
+      body: SafeArea(
+        child: Stack(
+          children: [
+            if (transactions.isEmpty) ...[
+              Align(
+                alignment: Alignment.topLeft,
+                child: Padding(
+                  padding: const EdgeInsets.only(left: 8.0, top: 16.0),
+                  child: IconButton(icon: const Icon(Icons.chevron_left), onPressed: () => Navigator.pop(context)),
+                ),
+              ),
+              const Center(
+                child: Text('No transactions'),
+              ),
+            ],
+            if (transactions.isNotEmpty)
+              Column(
+                children: [
+                  Row(mainAxisAlignment: MainAxisAlignment.center, children: [
+                    Padding(
+                      padding: const EdgeInsets.only(left: 8.0, top: 16.0),
+                      child: IconButton(icon: const Icon(Icons.chevron_left), onPressed: () => Navigator.pop(context)),
+                    ),
+                    const Spacer(),
+                    const Padding(
+                      padding: EdgeInsets.symmetric(vertical: 18.0, horizontal: 0.0),
+                      child: Text(
+                        'Transaction History',
+                        style: TextStyle(fontSize: 28),
+                        textAlign: TextAlign.center,
+                      ),
+                    ),
+                    const Spacer(),
+                    Padding(
+                      padding: const EdgeInsets.only(left: 8.0, top: 16.0),
+                      child: IconButton(
+                          icon: const Icon(Icons.sort),
+                          onPressed: () {
+                            toggleDrawer();
+                          }),
+                    ),
+                  ]),
+                  Expanded(
+                    child: ListView.builder(
+                      physics: const BouncingScrollPhysics(),
+                      itemCount: transactions.length,
+                      itemBuilder: (BuildContext context, int index) {
+                        return TransactionListItem(
+                          index: index,
+                        );
+                      },
+                    ),
+                  ),
+                ],
+              ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  void toggleDrawer() {
+    if (scaffoldKey.currentState != null && scaffoldKey.currentState!.isDrawerOpen) {
+      scaffoldKey.currentState!.openDrawer();
+    } else if (scaffoldKey.currentState != null) {
+      scaffoldKey.currentState!.openEndDrawer();
+    }
+  }
+}
+
+enum TransactionSort {
+  all,
+  income,
+  expense,
+  category,
+}
+
+enum SortDate {
+  decending,
+  ascending,
+}
+
+Icon sortTypeToIcon(TransactionSort s) {
+  switch (s) {
+    case TransactionSort.all:
+      return const Icon(Icons.donut_large);
+    case TransactionSort.income:
+      return const Icon(Icons.attach_money);
+    case TransactionSort.expense:
+      return const Icon(Icons.shopping_bag);
+    case TransactionSort.category:
+      return const Icon(Icons.sort);
+  }
+}
+
+Icon sortDateToIcon(SortDate s) {
+  switch (s) {
+    case SortDate.ascending:
+      return const Icon(Icons.arrow_circle_up);
+    case SortDate.decending:
+      return const Icon(Icons.arrow_circle_down);
+  }
+}
+
+final selectedTransactionSortProvider = StateProvider<TransactionSort>(
+  (ref) => TransactionSort.all,
+);
+
+final selectedSortDateProvider = StateProvider<SortDate>((ref) => SortDate.decending);
+
+final transactionHistoryListProvider = StateProvider<List<Transaction>>(
+  (ref) => [],
+);
+
+final selectedCategory = StateProvider<BudgetCategory?>((ref) => null);

lib/features/budget/widgets/add_budget_category_dialog.dart

@@ -0,0 +1,324 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:rluv/global/styles.dart';
+import 'package:rluv/models/budget.dart';
+import 'package:rluv/models/budget_category_model.dart';
+
+import '../../../global/api.dart';
+import '../../../global/store.dart';
+import '../../../global/utils.dart';
+import '../../../global/widgets/ui_button.dart';
+
+class BudgetCategoryDialog extends ConsumerStatefulWidget {
+  const BudgetCategoryDialog({super.key, this.category});
+
+  final BudgetCategory? category;
+
+  @override
+  ConsumerState<BudgetCategoryDialog> createState() => _AddBudgetCategoryDialogState();
+}
+
+class _AddBudgetCategoryDialogState extends ConsumerState<BudgetCategoryDialog> {
+  late final Budget? budget;
+  final categoryNameController = TextEditingController();
+  final amountController = TextEditingController();
+
+  final categoryFocusNode = FocusNode();
+  final amountFocusNode = FocusNode();
+
+  final colors = Styles.curatedColors;
+  int selectedColorIndex = -1;
+
+  final formKey = GlobalKey<FormState>();
+
+  @override
+  void initState() {
+    budget = ref.read(budgetProvider);
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      categoryFocusNode.requestFocus();
+    });
+
+    if (widget.category != null) {
+      categoryNameController.text = widget.category!.name;
+      amountController.text = widget.category!.amount.toString();
+      selectedColorIndex = colors.indexOf(widget.category!.color);
+    }
+
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (budget == null) {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        Navigator.pop(context);
+        showSnack(
+          ref: ref,
+          text: 'Could not get your budget',
+          type: SnackType.error,
+        );
+      });
+      return Container();
+    }
+    return SizedBox(
+      width: MediaQuery.of(context).size.width * Styles.dialogScreenWidthFactor,
+      child: Stack(
+        children: [
+          Padding(
+            padding: const EdgeInsets.symmetric(vertical: 18.0, horizontal: 32.0),
+            child: Form(
+              key: formKey,
+              child: Column(
+                mainAxisSize: MainAxisSize.min,
+                children: [
+                  Padding(
+                    padding: const EdgeInsets.only(bottom: 18.0),
+                    child: Text(widget.category == null ? 'Add Category:' : 'Edit Category'),
+                  ),
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                    children: [
+                      const Text('Name:'),
+                      const SizedBox(width: 30),
+                      Container(
+                        width: 150,
+                        height: 40,
+                        decoration: Styles.boxLavenderBubble,
+                        child: TextFormField(
+                          validator: (text) {
+                            if (text == null || text.isEmpty) {
+                              return 'Cannot be blank';
+                            }
+                            return null;
+                          },
+                          focusNode: categoryFocusNode,
+                          textAlign: TextAlign.center,
+                          cursorColor: Styles.blushingPink,
+                          controller: categoryNameController,
+                          decoration: Styles.inputLavenderBubble(),
+                          onFieldSubmitted: (_) {
+                            amountFocusNode.requestFocus();
+                          },
+                        ),
+                      ),
+                    ],
+                  ),
+                  const SizedBox(height: 18),
+                  Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                    children: [
+                      const Text('Amount:'),
+                      const SizedBox(width: 30),
+                      Container(
+                        width: 150,
+                        height: 40,
+                        decoration: Styles.boxLavenderBubble,
+                        child: TextFormField(
+                          validator: (text) {
+                            try {
+                              if (text == null || text.isEmpty) {
+                                return 'Invalid Amount';
+                              }
+                              final amount = double.tryParse(text);
+                              if (amount == null) {
+                                return 'Not A Number';
+                              }
+                              if (amount < 0) {
+                                return 'Not Positive';
+                              }
+                              return null;
+                            } catch (err) {
+                              return 'Invalid input';
+                            }
+                          },
+                          focusNode: amountFocusNode,
+                          keyboardType: TextInputType.number,
+                          textAlign: TextAlign.center,
+                          cursorColor: Styles.blushingPink,
+                          controller: amountController,
+                          decoration: Styles.inputLavenderBubble(),
+                        ),
+                      ),
+                    ],
+                  ),
+                  Padding(
+                    padding: const EdgeInsets.symmetric(vertical: 6.0, horizontal: 16.0),
+                    child: SizedBox(
+                      height: 76,
+                      child: ListView.builder(
+                        itemCount: colors.length,
+                        scrollDirection: Axis.horizontal,
+                        itemBuilder: (BuildContext context, int index) {
+                          return GestureDetector(
+                            onTap: () {
+                              if (selectedColorIndex != index) {
+                                setState(() => selectedColorIndex = index);
+                              } else {
+                                setState(() => selectedColorIndex = -1);
+                              }
+                              print(selectedColorIndex);
+                            },
+                            child: Padding(
+                              padding: const EdgeInsets.all(8.0),
+                              child: AnimatedContainer(
+                                decoration: selectedColorIndex == index
+                                    ? BoxDecoration(
+                                        borderRadius: BorderRadius.circular(15.0),
+                                        border: Border.all(
+                                          color: Styles.washedStone,
+                                          width: 2.0,
+                                        ),
+                                      )
+                                    : BoxDecoration(
+                                        borderRadius: BorderRadius.circular(5.0),
+                                        border: Border.all(
+                                          color: Colors.transparent,
+                                          width: 2.0,
+                                        ),
+                                      ),
+                                duration: const Duration(milliseconds: 400),
+                                child: Padding(
+                                  padding: const EdgeInsets.all(8.0),
+                                  child: Stack(
+                                    alignment: Alignment.center,
+                                    children: [
+                                      Container(
+                                        height: 40,
+                                        width: 40,
+                                        decoration: const BoxDecoration(
+                                          shape: BoxShape.circle,
+                                        ),
+                                      ),
+                                      Container(
+                                        height: 40,
+                                        width: 40,
+                                        decoration: BoxDecoration(
+                                          color: colors[index],
+                                          shape: BoxShape.circle,
+                                          border: Border.all(color: Colors.black, width: 1.5),
+                                        ),
+                                      ),
+                                    ],
+                                  ),
+                                ),
+                              ),
+                            ),
+                          );
+                        },
+                      ),
+                    ),
+                  ),
+                  if (widget.category != null && widget.category?.id != null)
+                    Padding(
+                      padding: const EdgeInsets.only(bottom: 16.0),
+                      child: UiButton(
+                        showLoading: true,
+                        color: Styles.expensesRed,
+                        text: 'DELETE',
+                        onPressed: () {
+                          if (formKey.currentState != null && formKey.currentState!.validate()) {
+                            removeCategory().then((success) {
+                              Navigator.pop(context);
+                              if (success) {
+                                showSnack(
+                                  ref: ref,
+                                  text: 'Budget Category Removed',
+                                  type: SnackType.success,
+                                );
+                              } else {
+                                showSnack(
+                                  ref: ref,
+                                  text: 'Unable to Remove Budget Category',
+                                  type: SnackType.error,
+                                );
+                              }
+                            });
+                          }
+                        },
+                      ),
+                    ),
+                  UiButton(
+                    showLoading: true,
+                    color: Styles.lavender,
+                    text: 'SAVE',
+                    onPressed: () {
+                      if (formKey.currentState != null && formKey.currentState!.validate()) {
+                        submitCategory(colors[selectedColorIndex]).then((_) {
+                          Navigator.pop(context);
+                          showSnack(
+                            ref: ref,
+                            text: 'Budget Category Added!',
+                            type: SnackType.success,
+                          );
+                        });
+                      }
+                    },
+                  ),
+                ],
+              ),
+            ),
+          ),
+          IconButton(
+            icon: const Icon(Icons.close),
+            onPressed: () => Navigator.pop(context),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Future submitCategory(Color categoryColor) async {
+    if (formKey.currentState != null && !formKey.currentState!.validate()) {
+      print('Failed validation');
+      return;
+    }
+    Map<String, dynamic>? budgetData;
+    bool success = false;
+    if (widget.category == null) {
+      final newBudget = BudgetCategory(
+        id: null,
+        amount: double.parse(amountController.text),
+        budgetId: budget!.id!,
+        color: categoryColor,
+        name: categoryNameController.text,
+      );
+
+      budgetData = await ref.read(apiProvider.notifier).post(path: 'budget_category', data: newBudget.toJson());
+      success = budgetData != null ? budgetData['success'] as bool : false;
+      if (success) {
+        ref.read(dashboardProvider.notifier).add({'budget_categories': budgetData});
+      }
+    } else {
+      final newBudget = BudgetCategory.copyWith(category: widget.category!, data: {
+        'amount': double.parse(amountController.text),
+        'color': categoryColor,
+        'name': categoryNameController.text
+      });
+      budgetData = await ref.read(apiProvider.notifier).put(path: 'budget_category', data: newBudget.toJson());
+      success = budgetData != null ? budgetData['success'] as bool : false;
+      if (success) {
+        ref.read(dashboardProvider.notifier).update({'budget_categories': budgetData});
+      }
+    }
+    if (success) {
+      showSnack(
+          ref: ref,
+          text: widget.category == null ? 'Added budget category!' : 'Updated category!',
+          type: SnackType.error);
+    } else {
+      showSnack(
+          ref: ref,
+          text: widget.category == null ? 'Could not add budget category' : 'Could not update category',
+          type: SnackType.error);
+    }
+  }
+
+  Future<bool> removeCategory() async {
+    final res = await ref.read(apiProvider.notifier).delete(path: 'budget_category', data: {'id': widget.category!.id});
+    final success = res != null ? res['success'] as bool : false;
+    if (success) {
+      ref.read(dashboardProvider.notifier).removeWithId('budget_categories', widget.category!.id!);
+    }
+    return success;
+  }
+}

lib/features/budget/widgets/add_transaction_dialog.dart

@@ -0,0 +1,304 @@
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:rluv/global/utils.dart';
+
+import '../../../global/api.dart';
+import '../../../global/store.dart';
+import '../../../global/styles.dart';
+import '../../../global/widgets/ui_button.dart';
+import '../../../models/budget_category_model.dart';
+import '../../../models/transaction_model.dart';
+import '../../../models/user.dart';
+
+class TransactionDialog extends ConsumerStatefulWidget {
+  const TransactionDialog({super.key, this.transaction});
+
+  final Transaction? transaction;
+
+  @override
+  ConsumerState<TransactionDialog> createState() => _AddTransactionDialogState();
+}
+
+class _AddTransactionDialogState extends ConsumerState<TransactionDialog> {
+  late DateTime selectedDate;
+  late final TextEditingController amountController;
+  late final TextEditingController memoController;
+  User? user;
+
+  final amountFocusNode = FocusNode();
+  final memoFocusNode = FocusNode();
+
+  TransactionType transactionType = TransactionType.expense;
+  late BudgetCategory selectedBudgetCategory;
+
+  @override
+  void initState() {
+    if (widget.transaction != null) {
+      amountController = TextEditingController(text: widget.transaction!.amount.toString());
+      memoController = TextEditingController(text: widget.transaction!.memo);
+      transactionType = widget.transaction!.type;
+      selectedDate = widget.transaction!.date;
+    } else {
+      amountController = TextEditingController();
+      memoController = TextEditingController();
+      selectedDate = DateTime.now();
+    }
+    final categories = ref.read(budgetCategoriesProvider);
+    if (categories.isNotEmpty) {
+      selectedBudgetCategory = categories.first;
+    }
+    final u = ref.read(userProvider);
+    if (u == null) {
+      WidgetsBinding.instance.addPostFrameCallback((_) => ref.read(jwtProvider.notifier).revokeToken());
+    } else {
+      user = u;
+    }
+
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    if (user == null) return Container();
+    final List<BudgetCategory> budgetCategories = ref.read(budgetCategoriesProvider);
+    return SizedBox(
+        width: MediaQuery.of(context).size.width * Styles.dialogScreenWidthFactor,
+        child: budgetCategories.isEmpty
+            ? const Padding(
+                padding: EdgeInsets.all(8.0),
+                child: Text(
+                  'Add budget categories to sort your transactions',
+                  textAlign: TextAlign.center,
+                ),
+              )
+            : Padding(
+                padding: const EdgeInsets.all(18.0),
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    if (widget.transaction == null)
+                      Padding(
+                        padding: const EdgeInsets.only(bottom: 8.0, left: 8.0),
+                        child: Row(children: [
+                          if (budgetCategories.isNotEmpty)
+                            InkWell(
+                              onTap: transactionType == TransactionType.expense
+                                  ? null
+                                  : () {
+                                      setState(() => transactionType = TransactionType.expense);
+                                    },
+                              child: AnimatedContainer(
+                                height: 38,
+                                width: 80,
+                                decoration: BoxDecoration(
+                                    borderRadius: const BorderRadius.only(
+                                        topLeft: Radius.circular(8.0), topRight: Radius.circular(8.0)),
+                                    color: transactionType == TransactionType.expense
+                                        ? Styles.lavender
+                                        : Styles.washedStone),
+                                duration: const Duration(milliseconds: 300),
+                                child: const Padding(
+                                  padding: EdgeInsets.all(8.0),
+                                  child: Text('Expense', style: TextStyle(fontSize: 16)),
+                                ),
+                              ),
+                            ),
+                          InkWell(
+                            onTap: transactionType == TransactionType.income
+                                ? null
+                                : () {
+                                    setState(() => transactionType = TransactionType.income);
+                                  },
+                            child: AnimatedContainer(
+                              height: 38,
+                              width: 80,
+                              decoration: BoxDecoration(
+                                  borderRadius: const BorderRadius.only(
+                                      topLeft: Radius.circular(8.0), topRight: Radius.circular(8.0)),
+                                  color:
+                                      transactionType == TransactionType.income ? Styles.lavender : Styles.washedStone),
+                              duration: const Duration(milliseconds: 300),
+                              child: const Padding(
+                                padding: EdgeInsets.all(8.0),
+                                child: Text('Income', style: TextStyle(fontSize: 16)),
+                              ),
+                            ),
+                          ),
+                        ]),
+                      ),
+                    Row(
+                      children: [
+                        const Padding(
+                          padding: EdgeInsets.all(8.0),
+                          child: Text(
+                            'Amount:',
+                            style: TextStyle(fontSize: 18.0),
+                          ),
+                        ),
+                        Container(
+                          width: 120,
+                          height: 40,
+                          decoration: Styles.boxLavenderBubble,
+                          child: TextFormField(
+                            keyboardType: TextInputType.number,
+                            textAlign: TextAlign.center,
+                            style: const TextStyle(fontSize: 18.0),
+                            cursorColor: Styles.blushingPink,
+                            decoration: Styles.inputLavenderBubble(),
+                            focusNode: amountFocusNode,
+                            controller: amountController,
+                            onFieldSubmitted: (_) {
+                              memoFocusNode.requestFocus();
+                            },
+                          ),
+                        ),
+                      ],
+                    ),
+                    if (budgetCategories.isEmpty)
+                      const Padding(
+                        padding: EdgeInsets.all(18.0),
+                        child: Text(
+                          'Add budget categories to sort your transactions',
+                          textAlign: TextAlign.center,
+                        ),
+                      ),
+                    if (budgetCategories.isNotEmpty)
+                      AnimatedSwitcher(
+                        duration: const Duration(milliseconds: 300),
+                        child: transactionType == TransactionType.income
+                            ? const SizedBox(height: 12.5)
+                            : Padding(
+                                padding: const EdgeInsets.only(left: 8.0),
+                                child: Row(
+                                  children: [
+                                    const Padding(
+                                      padding: EdgeInsets.only(right: 28.0),
+                                      child: Text(
+                                        'Category:',
+                                        style: TextStyle(fontSize: 18.0),
+                                      ),
+                                    ),
+                                    DropdownButton<BudgetCategory>(
+                                      dropdownColor: Styles.lavender,
+                                      value: selectedBudgetCategory,
+                                      items: budgetCategories
+                                          .map(
+                                            (e) => DropdownMenuItem(
+                                              value: e,
+                                              child: Row(
+                                                mainAxisSize: MainAxisSize.min,
+                                                children: [
+                                                  Container(
+                                                    height: 18,
+                                                    width: 18,
+                                                    decoration: BoxDecoration(
+                                                      shape: BoxShape.circle,
+                                                      border: Border.all(color: Colors.black, width: 1.5),
+                                                      color: e.color,
+                                                    ),
+                                                  ),
+                                                  const SizedBox(width: 12),
+                                                  Text(e.name),
+                                                ],
+                                              ),
+                                            ),
+                                          )
+                                          .toList(),
+                                      onChanged: (BudgetCategory? value) {
+                                        if (value != null) {
+                                          if (kDebugMode) {
+                                            print('${value.name} selected');
+                                          }
+                                          setState(() => selectedBudgetCategory = value);
+                                        }
+                                      },
+                                    ),
+                                  ],
+                                ),
+                              ),
+                      ),
+                    const Padding(
+                      padding: EdgeInsets.all(8.0),
+                      child: Row(
+                        children: [
+                          Text(
+                            'Memo',
+                            style: TextStyle(fontSize: 18.0),
+                          ),
+                        ],
+                      ),
+                    ),
+                    Container(
+                      width: MediaQuery.of(context).size.width * 0.65,
+                      height: 100,
+                      decoration: Styles.boxLavenderBubble,
+                      child: TextFormField(
+                        style: const TextStyle(fontSize: 18.0),
+                        maxLines: 4,
+                        focusNode: memoFocusNode,
+                        textAlign: TextAlign.left,
+                        cursorColor: Styles.blushingPink,
+                        controller: memoController,
+                        decoration: Styles.inputLavenderBubble(),
+                        onFieldSubmitted: (_) {},
+                      ),
+                    ),
+                    UiButton(
+                      showLoading: true,
+                      text: 'ADD',
+                      color: Styles.lavender,
+                      onPressed: () => submitTransaction().then((_) {
+                        if (mounted) {
+                          Navigator.pop(context);
+                        }
+                        showSnack(
+                          ref: ref,
+                          text: widget.transaction != null ? 'Transaction updated!' : 'Transaction added!',
+                          type: SnackType.success,
+                        );
+                      }),
+                    ),
+                  ],
+                ),
+              ));
+  }
+
+  Future submitTransaction() async {
+    Map<String, dynamic>? data;
+    if (widget.transaction != null) {
+      data = await ref.read(apiProvider.notifier).put(
+          path: 'transaction',
+          data: Transaction.copyWith(widget.transaction!, {
+            'memo': memoController.text.isNotEmpty ? memoController.text : null,
+            'amount': double.parse(amountController.text),
+            'budget_category_id': transactionType == TransactionType.income ? null : selectedBudgetCategory.id,
+          }).toJson());
+    } else {
+      data = await ref.read(apiProvider.notifier).post(
+          path: 'transaction',
+          data: Transaction(
+                  amount: double.parse(amountController.text),
+                  createdByUserId: user!.id!,
+                  budgetCategoryId: transactionType == TransactionType.income ? null : selectedBudgetCategory.id,
+                  budgetId: user!.budgetId,
+                  date: DateTime.now(),
+                  type: transactionType,
+                  memo: memoController.text.isNotEmpty ? memoController.text : null)
+              .toJson());
+    }
+    final success = data != null ? data['success'] as bool : false;
+    if (success) {
+      if (widget.transaction != null) {
+        ref.read(dashboardProvider.notifier).update({'transactions': data});
+      } else {
+        ref.read(dashboardProvider.notifier).add({'transactions': data});
+      }
+    } else {
+      showSnack(
+          ref: ref,
+          text: widget.transaction != null ? 'Failed to edit transaction' : 'Failed to add transaction',
+          type: SnackType.error);
+    }
+  }
+}

lib/features/budget/widgets/budget_category_bar.dart

@@ -0,0 +1,170 @@
+import 'dart:math';
+
+import 'package:flutter/material.dart';
+import 'package:rluv/features/budget/widgets/add_budget_category_dialog.dart';
+import 'package:rluv/global/utils.dart';
+import 'package:rluv/models/budget_category_model.dart';
+
+import '../../../global/styles.dart';
+
+class BudgetCategoryBar extends StatefulWidget {
+  const BudgetCategoryBar(
+      {super.key,
+      required this.budgetCategory,
+      required this.currentAmount,
+      required this.index,
+      this.height = 32,
+      this.innerPadding = 2.5});
+
+  final int index;
+  final double currentAmount;
+  final BudgetCategory budgetCategory;
+  final double height;
+  final double innerPadding;
+  @override
+  State<BudgetCategoryBar> createState() => _BudgetCategoryBarState();
+}
+
+class _BudgetCategoryBarState extends State<BudgetCategoryBar> {
+  double percentSpent = 0.0;
+  double setTo = 0.0;
+
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    Future.delayed(Duration(milliseconds: min(1600, 200 * widget.index)), () {
+      final valToSetTo = widget.currentAmount / widget.budgetCategory.amount;
+      if (valToSetTo != setTo) {
+        setTo = valToSetTo;
+        setState(() => percentSpent = valToSetTo);
+      }
+    });
+    final innerHeight = widget.height - widget.innerPadding * 2;
+    final isBright = getBrightness(widget.budgetCategory.color) == Brightness.light;
+    final textStyle = TextStyle(
+        fontSize: 14,
+        fontWeight: FontWeight.bold,
+        color: widget.currentAmount > widget.budgetCategory.amount
+            ? Styles.expensesRed
+            : isBright
+                ? Colors.black87
+                : Colors.white);
+    return InkWell(
+      onLongPress: () async {
+        showDialog(
+            context: context,
+            builder: (context) => Dialog(
+                shape: Styles.dialogShape,
+                backgroundColor: Styles.dialogColor,
+                child: BudgetCategoryDialog(category: widget.budgetCategory)));
+      },
+      child: Padding(
+        padding: const EdgeInsets.symmetric(vertical: 4.0),
+        child: Row(
+          children: [
+            Padding(
+              padding: const EdgeInsets.all(8.0),
+              child: SizedBox(
+                width: 90,
+                child: FittedBox(
+                  fit: BoxFit.scaleDown,
+                  alignment: Alignment.centerLeft,
+                  child: Text(
+                    formatBudgetName(widget.budgetCategory.name),
+                    style: const TextStyle(fontSize: 18.0),
+                  ),
+                ),
+              ),
+            ),
+            Expanded(
+                child: Padding(
+              padding: const EdgeInsets.only(right: 18.0),
+              child: Stack(
+                children: [
+                  Container(
+                    height: widget.height,
+                    decoration: BoxDecoration(
+                      color: Colors.black,
+                      borderRadius: BorderRadius.circular(13.0),
+                    ),
+                  ),
+                  Padding(
+                    padding: EdgeInsets.all(widget.innerPadding),
+                    child: Container(
+                      height: innerHeight,
+                      decoration: BoxDecoration(
+                        color: Styles.emptyBarGrey,
+                        borderRadius: BorderRadius.circular(12.0),
+                      ),
+                    ),
+                  ),
+                  Padding(
+                    padding: EdgeInsets.all(widget.innerPadding),
+                    child: SizedBox(
+                      height: innerHeight,
+                      child: AnimatedFractionallySizedBox(
+                        curve: Curves.easeOutSine,
+                        heightFactor: 1.0,
+                        widthFactor: min(1.0, max(0.08, percentSpent)),
+                        duration: const Duration(milliseconds: 350),
+                        child: Container(
+                          decoration: BoxDecoration(
+                            color: widget.budgetCategory.color,
+                            borderRadius: BorderRadius.circular(12.0),
+                          ),
+                        ),
+                      ),
+                    ),
+                  ),
+                  SizedBox(
+                    height: widget.height,
+                    child: Row(
+                      mainAxisSize: MainAxisSize.min,
+                      crossAxisAlignment: CrossAxisAlignment.center,
+                      children: [
+                        Center(
+                          child: Padding(
+                            padding: const EdgeInsets.only(left: 8.0),
+                            child: Text(
+                                '${widget.currentAmount.currency()} / ${widget.budgetCategory.amount.currency()}',
+                                style: textStyle),
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                ],
+              ),
+            ))
+          ],
+        ),
+      ),
+    );
+  }
+
+  String formatBudgetName(String name) {
+    if (name.length < 12) {
+      return name;
+    }
+    if (!name.contains(' ') || name.indexOf(' ') == name.length - 1) {
+      return name;
+    }
+    final words = name.split(' ');
+    int index = 0;
+    String firstLine = words[index];
+    while (true) {
+      index += 1;
+      if (index == words.length) {
+        return '$firstLine\n${words.sublist(index).join(' ')}';
+      }
+      if (firstLine.length + words[index].length > 12) {
+        return '$firstLine\n${words.sublist(index).join(' ')}';
+      }
+      firstLine += ' ${words[index]}';
+    }
+  }
+}

lib/features/budget/widgets/budget_net_bar.dart

@@ -0,0 +1,38 @@
+import 'package:flutter/material.dart';
+import 'package:rluv/global/styles.dart';
+import 'package:rluv/global/utils.dart';
+
+class BudgetNetBar extends StatelessWidget {
+  const BudgetNetBar({super.key, required this.isPositive, required this.net, required this.expected});
+
+  final bool isPositive;
+  final double net;
+  final double expected;
+
+  @override
+  Widget build(BuildContext context) {
+    final screenWidth = MediaQuery.of(context).size.width;
+    return Container(
+      width: screenWidth * 0.85,
+      decoration: BoxDecoration(
+        borderRadius: BorderRadius.circular(10.0),
+        color: isPositive ? Styles.incomeBlue : Styles.expensesOrange,
+      ),
+      child: Padding(
+        padding: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 12.0),
+        child: Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
+          Text(
+            isPositive ? 'Income' : 'Expenses',
+            style: const TextStyle(
+              fontSize: 20,
+            ),
+          ),
+          Text(
+            '${net.currency()} / ${expected.currency()}',
+            style: TextStyle(fontSize: 20, color: isPositive ? Styles.incomeGreen : Styles.expensesRed),
+          ),
+        ]),
+      ),
+    );
+  }
+}

lib/features/budget/widgets/transaction_list_item.dart

@@ -0,0 +1,181 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:intl/intl.dart';
+import 'package:rluv/features/budget/screens/transactions_listview.dart';
+import 'package:rluv/features/budget/widgets/add_transaction_dialog.dart';
+import 'package:rluv/global/api.dart';
+import 'package:rluv/global/utils.dart';
+import 'package:rluv/models/transaction_model.dart';
+
+import '../../../global/store.dart';
+import '../../../global/styles.dart';
+import '../../../global/widgets/budget_color_circle.dart';
+import '../../../models/budget_category_model.dart';
+
+class TransactionListItem extends ConsumerStatefulWidget {
+  const TransactionListItem({super.key, required this.index});
+
+  final int index;
+
+  @override
+  ConsumerState<TransactionListItem> createState() => _TransactionListItemState();
+}
+
+class _TransactionListItemState extends ConsumerState<TransactionListItem> {
+  bool showDetails = false;
+  double cardHeight = 70.0;
+
+  BudgetCategory? budgetCategory;
+  Transaction? transaction;
+
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    transaction =
+        // ignore: sdk_version_since
+        ref.watch(transactionHistoryListProvider).elementAtOrNull(widget.index);
+    if (transaction == null) return Container();
+    final budgetCategories = ref.read(budgetCategoriesProvider);
+    if (transaction!.type == TransactionType.expense) {
+      budgetCategory = budgetCategories.singleWhere(
+        (category) => category.id == transaction!.budgetCategoryId,
+      );
+    } else {
+      budgetCategory = null;
+    }
+    return GestureDetector(
+      onTap: () => toggleDetails(),
+      child: Padding(
+        padding: const EdgeInsets.only(top: 8.0, left: 8.0, bottom: 8.0),
+        child: ClipRRect(
+          borderRadius: const BorderRadius.only(topLeft: Radius.circular(10.0), bottomLeft: Radius.circular(10.0)),
+          child: AnimatedContainer(
+            curve: Curves.easeOut,
+            duration: const Duration(milliseconds: 200),
+            height: cardHeight,
+            decoration: const BoxDecoration(
+              borderRadius: BorderRadius.only(topLeft: Radius.circular(10.0), bottomLeft: Radius.circular(10.0)),
+              color: Styles.washedStone,
+            ),
+            child: Row(
+              children: [
+                AnimatedContainer(
+                    curve: Curves.easeOut,
+                    duration: const Duration(milliseconds: 200),
+                    height: cardHeight,
+                    width: 6,
+                    color: transaction!.type == TransactionType.income ? Styles.incomeBlue : Styles.expensesOrange),
+                SizedBox(
+                  width: MediaQuery.of(context).size.width * 0.65,
+                  child: Padding(
+                    padding: const EdgeInsets.only(left: 8.0),
+                    child: Column(
+                      mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                      crossAxisAlignment: CrossAxisAlignment.start,
+                      children: [
+                        Text(DateFormat('EEE MMM d, h:mm a').format(transaction!.date)),
+                        Row(
+                          children: [
+                            const SizedBox(
+                              width: 6,
+                            ),
+                            if (budgetCategory != null) ...[
+                              BudgetColorCircle(
+                                color: budgetCategory!.color,
+                              ),
+                              const SizedBox(
+                                width: 8,
+                              ),
+                            ],
+                            Text(
+                              transaction!.type == TransactionType.income ? 'Income' : budgetCategory!.name,
+                              style: const TextStyle(fontSize: 20),
+                            ),
+                          ],
+                        ),
+                        if (showDetails)
+                          Text(
+                            transaction!.memo ?? '',
+                            style: const TextStyle(fontSize: 16),
+                          )
+                      ],
+                    ),
+                  ),
+                ),
+                const Spacer(),
+                Column(
+                  mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                  children: [
+                    Text(
+                      transaction!.amount.currency(),
+                      style: TextStyle(
+                          fontSize: 24,
+                          color: transaction!.type == TransactionType.income ? Styles.incomeGreen : Styles.expensesRed),
+                    ),
+                    if (showDetails) ...[
+                      IconButton(
+                        icon: const Icon(
+                          Icons.edit_rounded,
+                        ),
+                        onPressed: () {
+                          showDialog(
+                            context: context,
+                            builder: (context) => Dialog(
+                              backgroundColor: Styles.dialogColor,
+                              shape: Styles.dialogShape,
+                              child: TransactionDialog(transaction: transaction),
+                            ),
+                          );
+                        },
+                      ),
+                      IconButton(
+                        icon: const Icon(
+                          Icons.delete,
+                          color: Styles.expensesRed,
+                        ),
+                        onPressed: () => deleteTransaction(),
+                      ),
+                    ],
+                  ],
+                ),
+                const SizedBox(
+                  width: 14,
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+
+  void toggleDetails() {
+    if (showDetails) {
+      setState(() {
+        showDetails = false;
+        cardHeight = 70;
+      });
+    } else {
+      setState(() {
+        showDetails = true;
+        cardHeight = 120;
+      });
+    }
+  }
+
+  Future deleteTransaction() async {
+    final res = await ref.read(apiProvider.notifier).delete(path: 'transaction', data: {'id': transaction!.id});
+
+    final success = res != null ? res['success'] as bool : false;
+    if (success) {
+      ref.read(dashboardProvider.notifier).removeWithId('transactions', transaction!.id!);
+      showSnack(ref: ref, text: 'Transaction removed', type: SnackType.success);
+    } else {
+      showSnack(ref: ref, text: 'Could not delete transaction', type: SnackType.error);
+    }
+  }
+}

lib/features/notes/screens/notes_screen.dart

@@ -0,0 +1,254 @@
+import 'package:dio/dio.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:rluv/global/utils.dart';
+import 'package:rluv/models/shared_note.dart';
+
+import '../../../global/api.dart';
+import '../../../global/store.dart';
+import '../../../global/styles.dart';
+import '../../../global/widgets/ui_button.dart';
+
+class SharedNotesScreen extends ConsumerStatefulWidget {
+  const SharedNotesScreen({super.key, required this.initialData});
+
+  final Map<String, dynamic> initialData;
+  @override
+  ConsumerState<SharedNotesScreen> createState() => _SharedNotesScreenState();
+}
+
+class _SharedNotesScreenState extends ConsumerState<SharedNotesScreen> {
+  @override
+  Widget build(BuildContext context) {
+    final screen = MediaQuery.of(context).size;
+    final sharedNotes = ref.watch(sharedNotesProvider);
+    return Column(
+      children: [
+        const Padding(
+          padding: EdgeInsets.all(18.0),
+          child: Text(
+            'Notes:',
+            style: TextStyle(fontSize: 20),
+            textAlign: TextAlign.center,
+          ),
+        ),
+        if (sharedNotes.isEmpty) ...[
+          const Text('Add notes to get started:'),
+        ],
+        if (sharedNotes.isNotEmpty)
+          SizedBox(
+            height: screen.height * 0.65,
+            child: GridView.builder(
+              itemCount: sharedNotes.length,
+              gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
+                crossAxisCount: 2,
+              ),
+              itemBuilder: (BuildContext context, int index) {
+                final note = sharedNotes[index];
+                final colorBrightness = note.color == null ? Brightness.light : getBrightness(note.color!);
+                final textStyle = TextStyle(
+                  fontSize: 16.0,
+                  color: colorBrightness == Brightness.light ? Colors.black54 : Colors.white70,
+                );
+                return Padding(
+                  padding: const EdgeInsets.all(8.0),
+                  child: InkWell(
+                    child: Card(
+                      color: note.color ?? Styles.washedStone,
+                      child: SizedBox(
+                        width: screen.width * 0.4,
+                        child: Padding(
+                          padding: const EdgeInsets.all(8.0),
+                          child: Column(
+                            children: [
+                              FittedBox(child: Text(note.title, style: const TextStyle(fontSize: 20))),
+                              Flexible(
+                                child: Text(
+                                  note.content.length > 80 ? "${note.content.substring(0, 75)}..." : note.content,
+                                  style: textStyle,
+                                ),
+                              ),
+                            ],
+                          ),
+                        ),
+                      ),
+                    ),
+                    onTap: () {
+                      showModalBottomSheet(
+                          isScrollControlled: true,
+                          shape: RoundedRectangleBorder(
+                            borderRadius: BorderRadius.circular(20.0),
+                          ),
+                          backgroundColor: Colors.transparent,
+                          context: context,
+                          builder: (BuildContext context) {
+                            return Padding(
+                              padding: EdgeInsets.only(bottom: MediaQuery.of(context).viewInsets.bottom),
+                              child: NoteBottomSheet(
+                                index: index,
+                              ),
+                            );
+                          });
+                    },
+                  ),
+                );
+              },
+            ),
+          ),
+        Padding(
+          padding: const EdgeInsets.symmetric(vertical: 18.0, horizontal: 12.0),
+          child: UiButton(
+              text: 'Add Note',
+              onPressed: () {
+                showModalBottomSheet(
+                    isScrollControlled: true,
+                    shape: RoundedRectangleBorder(
+                      borderRadius: BorderRadius.circular(20.0),
+                    ),
+                    backgroundColor: Colors.transparent,
+                    context: context,
+                    builder: (BuildContext context) {
+                      return Padding(
+                        padding: EdgeInsets.only(bottom: MediaQuery.of(context).viewInsets.bottom),
+                        child: const NoteBottomSheet(
+                          index: null,
+                        ),
+                      );
+                    });
+              }),
+        ),
+      ],
+    );
+  }
+}
+
+class NoteBottomSheet extends ConsumerStatefulWidget {
+  const NoteBottomSheet({super.key, required this.index});
+
+  final int? index;
+
+  @override
+  ConsumerState<NoteBottomSheet> createState() => _NoteBottomSheetState();
+}
+
+class _NoteBottomSheetState extends ConsumerState<NoteBottomSheet> {
+  late final SharedNote? oldNote;
+  late SharedNote newNote;
+
+  final titleFocusNode = FocusNode();
+  final contentFocusNode = FocusNode();
+  late final TextEditingController titleController;
+  late final TextEditingController contentController;
+
+  @override
+  void initState() {
+    super.initState();
+    if (widget.index == null) {
+      oldNote = null;
+      final family = ref.read(familyProvider);
+      final user = ref.read(userProvider);
+      newNote = SharedNote(
+        familyId: family!.id,
+        createdByUserId: user!.id!,
+        title: 'Title',
+        content: '',
+        tagIds: [],
+        color: Styles.washedStone,
+        isMarkdown: false,
+      );
+    } else {
+      oldNote = ref.read(sharedNotesProvider).elementAt(widget.index!);
+      newNote = SharedNote.copy(oldNote!);
+    }
+    titleController = TextEditingController(text: newNote.title);
+    contentController = TextEditingController(text: newNote.content);
+    WidgetsBinding.instance.addPostFrameCallback(
+      (timeStamp) => titleFocusNode.requestFocus(),
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final screen = MediaQuery.of(context).size;
+    return Container(
+      width: screen.width,
+      decoration: BoxDecoration(
+          color: newNote.color ?? Styles.washedStone,
+          borderRadius: const BorderRadius.only(topLeft: Radius.circular(20.0), topRight: Radius.circular(20.0)),
+          boxShadow: const [
+            BoxShadow(color: Colors.black26, spreadRadius: 5.0, blurRadius: 2.0, offset: Offset(0, -2))
+          ]),
+      child: Padding(
+        padding: const EdgeInsets.all(16.0),
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          children: [
+            TextField(
+              style: const TextStyle(fontSize: 18.0),
+              maxLines: 1,
+              focusNode: titleFocusNode,
+              textAlign: TextAlign.left,
+              controller: titleController,
+              // decoration: Styles.inputLavenderBubble(),
+            ),
+            TextField(
+              style: const TextStyle(fontSize: 18.0),
+              maxLines: 6,
+              focusNode: contentFocusNode,
+              textAlign: TextAlign.left,
+              controller: contentController,
+              // decoration: Styles.inputLavenderBubble(),
+            ),
+            Padding(
+              padding: const EdgeInsets.symmetric(vertical: 28.0, horizontal: 36.0),
+              child: UiButton(
+                onPressed: !noteChanged(oldNote, newNote)
+                    ? null
+                    : () async {
+                        newNote.content = contentController.text;
+                        newNote.title = titleController.text;
+                        try {
+                          Response? res;
+                          if (widget.index == null) {
+                            res = await ref.read(apiProvider).post('shared_note', data: newNote.toJson());
+                          } else {
+                            res = await ref.read(apiProvider).put('shared_note', data: newNote.toJson());
+                          }
+                          if (res.data != null && res.data['success']) {
+                            if (widget.index == null) {
+                              ref.read(dashboardProvider.notifier).add({'shared_notes': res.data});
+                            } else {
+                              ref.read(dashboardProvider.notifier).update({'shared_notes': res.data});
+                            }
+                            showSnack(ref: ref, text: 'Added note', type: SnackType.success);
+                          } else {
+                            showSnack(
+                                ref: ref,
+                                text: res.data['message'] ?? 'Unexpected error occurred',
+                                type: SnackType.error);
+                          }
+                        } catch (err) {
+                          showSnack(ref: ref, text: 'Unexpected error occurred', type: SnackType.error);
+                          print(err);
+                        }
+                        // ignore: use_build_context_synchronously
+                        Navigator.pop(context);
+                      },
+                text: 'Save',
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  bool noteChanged(SharedNote? n, SharedNote m) {
+    if (n == null) return true;
+    if (n.content != m.content) return true;
+    if (n.title != m.content) return true;
+    if (n.tagIds != m.tagIds) return true;
+    if (n.color != m.color) return true;
+    return false;
+  }
+}

lib/features/settings/screens/settings_screen.dart

@@ -0,0 +1,44 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+import '../../../global/api.dart';
+import '../../../global/store.dart';
+import '../../../global/widgets/ui_button.dart';
+
+class SettingsScreen extends ConsumerStatefulWidget {
+  const SettingsScreen({super.key});
+
+  @override
+  ConsumerState<SettingsScreen> createState() => _SettingsScreenState();
+}
+
+class _SettingsScreenState extends ConsumerState<SettingsScreen> {
+  @override
+  Widget build(BuildContext context) {
+    final user = ref.read(userProvider);
+    final family = ref.read(familyProvider);
+    return Column(
+      children: [
+        const Text('Settings'),
+        const SizedBox(height: 20),
+        Text(user?.name ?? 'N/A'),
+        Text("Username: ${user?.username ?? 'N/A'}"),
+        Text("Email: ${user?.email ?? 'N/A'}"),
+        Text("Family Code: ${family?.code ?? 'N/A'}"),
+        const Spacer(),
+        UiButton(
+          onPressed: () {
+            ref.read(jwtProvider.notifier).revokeToken();
+            // Navigator.pushAndRemoveUntil(
+            //   context,
+            //   MaterialPageRoute(builder: (ctx) => const AccountCreateScreen()),
+            //   (_) => false,
+            // );
+          },
+          text: 'Sign Out',
+        ),
+        const SizedBox(height: 20),
+      ],
+    );
+  }
+}

lib/global/api.dart

@@ -0,0 +1,226 @@
+import 'dart:convert';
+
+import 'package:dio/dio.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:jwt_decoder/jwt_decoder.dart';
+import 'package:rluv/global/store.dart';
+
+import '../models/token.dart';
+
+final tokenProvider = StateProvider<Token?>((ref) {
+  final jwt = ref.watch(jwtProvider);
+  print('Current token: $jwt');
+  if (jwt == null) return null;
+  try {
+    return Token.fromJson(JwtDecoder.decode(jwt));
+  } catch (_) {
+    return null;
+  }
+});
+
+final jwtProvider = StateNotifierProvider<_JwtNotifier, String?>((ref) {
+  final prefs = ref.watch(prefsProvider);
+  final jwt = prefs?.getString('jwt');
+  return _JwtNotifier(ref, jwt);
+});
+
+class _JwtNotifier extends StateNotifier<String?> {
+  _JwtNotifier(this.ref, String? jwt) : super(null) {
+    if (jwt != null) {
+      setToken(jwt);
+    }
+  }
+
+  final StateNotifierProviderRef ref;
+
+  void setToken(String jwt) {
+    state = jwt;
+    print('Loaded jwt into client: $jwt');
+    ref.read(prefsProvider)?.setString('jwt', jwt);
+  }
+
+  void revokeToken() {
+    print('jwt token revoked');
+    state = null;
+    ref.read(prefsProvider)?.remove('jwt');
+  }
+}
+
+final apiProvider = StateNotifierProvider<_ApiNotifier, Dio>((ref) {
+  return _ApiNotifier(ref, Dio());
+});
+
+class _ApiNotifier extends StateNotifier<Dio> {
+  _ApiNotifier(this.ref, this.dio) : super(dio) {
+    // dio.options.baseUrl = "https://af70-136-36-2-234.ngrok-free.app/";
+    // dio.options.baseUrl = "http://localhost:8081/";
+    dio.options.baseUrl = "https://rluv.fosscat.com/";
+    dio.interceptors.addAll([
+      InterceptorsWrapper(onRequest: (RequestOptions options, RequestInterceptorHandler handler) {
+        final jwt = ref.read(jwtProvider);
+        if (jwt != null) {
+          options.headers['token'] = jwt;
+        }
+        return handler.next(options);
+      }, onResponse: (Response response, ResponseInterceptorHandler handler) {
+        if (response.statusCode != null) {
+          if (response.statusCode == 200) {
+            try {
+              if ((response.data as Map<String, dynamic>).containsKey('success')) {
+                if (!response.data['success']) return handler.next(response);
+              }
+              if ((response.data as Map<String, dynamic>).containsKey('token')) {
+                final jwt = response.data['token'];
+                if (jwt != null) {
+                  ref.read(jwtProvider.notifier).setToken(jwt);
+                  // ref.read(tokenProvider.notifier).state =
+                  //     Token.fromJson(jwtData);
+                }
+              }
+            } catch (err) {
+              print('Error in interceptor for token: $err');
+              return handler.next(response);
+            }
+          }
+        }
+        return handler.next(response);
+      }, onError: (DioException err, ErrorInterceptorHandler handler) {
+        if (err.response?.statusCode == 403) {
+          ref.read(jwtProvider.notifier).revokeToken();
+        }
+        return handler.next(err);
+      }),
+      _LoggingInterceptor(),
+    ]);
+  }
+
+  final Dio dio;
+  final StateNotifierProviderRef ref;
+
+  Future<Map<String, dynamic>?> get(String path) async {
+    try {
+      final res = await dio.get(path);
+
+      if (res.data != null) {
+        return res.data as Map<String, dynamic>;
+      }
+      return null;
+    } catch (err) {
+      return null;
+    }
+  }
+
+  Future<Map<String, dynamic>?> put({required String path, Object? data}) async {
+    try {
+      final res = await dio.put(path, data: data);
+
+      if (res.data != null) {
+        return res.data as Map<String, dynamic>;
+      }
+      return null;
+    } catch (err) {
+      return null;
+    }
+  }
+
+  Future<Map<String, dynamic>?> post({required String path, Object? data}) async {
+    try {
+      final res = await dio.post(path, data: data);
+
+      if (res.data != null) {
+        return res.data as Map<String, dynamic>;
+      }
+      return null;
+    } catch (err) {
+      return null;
+    }
+  }
+
+  Future<Map<String, dynamic>?> delete({required String path, Object? data}) async {
+    try {
+      final res = await dio.delete(path, data: data);
+
+      if (res.data != null) {
+        return res.data as Map<String, dynamic>;
+      }
+      return null;
+    } catch (err) {
+      return null;
+    }
+  }
+}
+
+class _LoggingInterceptor extends Interceptor {
+  _LoggingInterceptor();
+
+  @override
+  Future onRequest(RequestOptions options, RequestInterceptorHandler handler) async {
+    logPrint('///*** REQUEST ***\\\\\\');
+    printKV('URI', options.uri);
+    printKV('METHOD', options.method);
+    logPrint('HEADERS:');
+    options.headers.forEach((key, v) => printKV(' - $key', v));
+    logPrint('BODY:');
+    printJson(options.data);
+
+    return handler.next(options);
+  }
+
+  @override
+  void onError(DioException err, ErrorInterceptorHandler handler) {
+    print('///*** ERROR RESPONSE ***\\\\\\');
+    logPrint('URI: ${err.requestOptions.uri}');
+    if (err.response != null) {
+      logPrint('STATUS CODE: ${err.response?.statusCode?.toString()}');
+    }
+    logPrint('$err');
+    if (err.response != null) {
+      printKV('REDIRECT', err.response?.realUri ?? '');
+      logPrint('BODY:');
+      printJson(err.response?.data);
+    }
+    return handler.next(err);
+  }
+
+  @override
+  Future onResponse(Response response, ResponseInterceptorHandler handler) async {
+    logPrint('///*** RESPONSE ***\\\\\\');
+    printKV('URI', response.requestOptions.uri);
+    printKV('STATUS CODE', response.statusCode ?? '');
+    // printKV('REDIRECT', response.isRedirect);
+    logPrint('BODY:');
+    printJson(response.data);
+
+    return handler.next(response);
+  }
+
+  void printKV(String key, Object v) {
+    if (kDebugMode) {
+      print('$key: $v');
+    }
+  }
+
+  void printJson(dynamic s) {
+    try {
+      final data = (s as Map<String, dynamic>?);
+      if (kDebugMode) {
+        if (data == null) {
+          print({});
+          return;
+        }
+        JsonEncoder encoder = const JsonEncoder.withIndent('  ');
+        String prettyprint = encoder.convert(s);
+        print(prettyprint);
+      }
+    } catch (_) {
+      print(s);
+    }
+  }
+
+  void logPrint(String s) {
+    if (kDebugMode) {
+      print(s);
+    }
+  }
+}

lib/global/store.dart

@@ -0,0 +1,205 @@
+import 'dart:convert';
+
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:rluv/global/api.dart';
+import 'package:rluv/models/budget.dart';
+import 'package:rluv/models/budget_category_model.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+import '../models/family_model.dart';
+import '../models/shared_note.dart';
+import '../models/transaction_model.dart';
+import '../models/user.dart';
+
+StateProvider<SharedPreferences?> prefsProvider = StateProvider<SharedPreferences?>((ref) => null);
+
+// final StateProvider<Token?> tokenProvider = StateProvider<Token?>((ref) {
+//   // final tokenStr = prefs.getString('jwt');
+//   // if (tokenStr != null) {
+//   // return Token.fromJson(jsonDecode(tokenStr));
+//   // }
+//   return null;
+// });
+
+final Provider<User?> userProvider = Provider<User?>(
+  (ref) {
+    final dash = ref.watch(dashboardProvider);
+    if (dash == null) return null;
+    final userData = dash['user'] as Map<String, dynamic>;
+    return User.fromJson(userData);
+  },
+);
+
+final Provider<FamilyModel?> familyProvider = Provider<FamilyModel?>(
+  (ref) {
+    final dash = ref.watch(dashboardProvider);
+    if (dash == null) return null;
+    final familyData = dash['family'] as Map<String, dynamic>;
+    return FamilyModel.fromJson(familyData);
+  },
+);
+
+final Provider<List<BudgetCategory>> budgetCategoriesProvider = Provider<List<BudgetCategory>>((ref) {
+  final dash = ref.watch(dashboardProvider);
+  if (dash == null) return [];
+  final categoriesData = dash['budget_categories'] as List<dynamic>;
+  final categories = categoriesData
+      .map(
+        (e) => BudgetCategory.fromJson(e as Map<String, dynamic>),
+      )
+      .toList();
+
+  final prefs = ref.read(prefsProvider);
+  final budgetJson = jsonEncode({'budget_categories': categoriesData});
+  print('updated prefs stored categories');
+  prefs?.setString('budget_categories', budgetJson);
+
+  return categories;
+});
+
+final Provider<Budget?> budgetProvider = Provider<Budget?>(
+  (ref) {
+    final dash = ref.watch(dashboardProvider);
+    if (dash == null) return null;
+    final budgetData = dash['budget'] as Map<String, dynamic>?;
+    if (budgetData == null) return null;
+    return Budget.fromJson(budgetData);
+  },
+);
+
+final Provider<List<Transaction>> transactionsProvider = Provider<List<Transaction>>((ref) {
+  final dash = ref.watch(dashboardProvider);
+  if (dash == null) return [];
+  final transactions = dash['transactions'] as List<dynamic>;
+  return transactions
+      .map(
+        (e) => Transaction.fromJson(e as Map<String, dynamic>),
+      )
+      .toList();
+});
+
+final Provider<List<SharedNote>> sharedNotesProvider = Provider<List<SharedNote>>(
+  (ref) {
+    final dash = ref.watch(dashboardProvider);
+    if (dash == null) return [];
+    final sharedNotes = dash['shared_notes'] as List<dynamic>;
+    return sharedNotes
+        .map(
+          (e) => SharedNote.fromJson(e as Map<String, dynamic>),
+        )
+        .toList();
+  },
+);
+
+final dashboardProvider = StateNotifierProvider<DashBoardStateNotifier, Map<String, dynamic>?>(
+  (ref) {
+    return DashBoardStateNotifier(ref);
+  },
+);
+
+final loadingStateProvider = StateProvider<bool>(
+  (ref) => false,
+);
+
+class DashBoardStateNotifier extends StateNotifier<Map<String, dynamic>?> {
+  DashBoardStateNotifier(this.ref) : super(null);
+
+  StateNotifierProviderRef ref;
+
+  Future<void> fetchDashboard() async {
+    WidgetsBinding.instance.addPostFrameCallback(
+      (_) => ref.read(loadingStateProvider.notifier).state = true,
+    );
+    final token = ref.read(tokenProvider);
+    if (token?.familyId == null) {
+      print('No token, cannot fetch dashboard');
+      return;
+    }
+    print('Fetching dashboard');
+    state = await ref.read(apiProvider.notifier).get("dashboard");
+    WidgetsBinding.instance.addPostFrameCallback(
+      (_) => ref.read(loadingStateProvider.notifier).state = false,
+    );
+  }
+
+  void update(Map<String, dynamic> data) {
+    if (state == null) {
+      print('Cant update data, state is null');
+      return;
+    }
+    if (data.keys.length != 1 || data.values.length != 1) {
+      throw Exception('Only one key/val used in update');
+    }
+    final key = data.keys.first;
+    switch (key) {
+      case 'transactions':
+      case 'budget_categories':
+      case 'shared_notes':
+        final subStateList = state![key] as List<dynamic>;
+        final subStateListObj = subStateList
+            .map(
+              (e) => e as Map<String, dynamic>,
+            )
+            .toList();
+        subStateListObj.removeWhere(
+          (element) => element['id'] == (data.values.first as Map<String, dynamic>)['id'],
+        );
+        subStateListObj.add(data.values.first);
+
+        final newState = state;
+        newState![key] = subStateListObj;
+        state = {...newState};
+        // print(state);
+        break;
+      default:
+        break;
+    }
+  }
+
+  void add(Map<String, dynamic> data) {
+    if (state == null) {
+      print('Cant add data, state is null');
+      return;
+    }
+    if (data.keys.length != 1 || data.values.length != 1) {
+      throw Exception('Only one key/val used in add');
+    }
+    final key = data.keys.first;
+    switch (key) {
+      case 'transactions':
+      case 'budget_categories':
+      case 'shared_noted':
+        final subStateList = state![key] as List<dynamic>;
+        final newState = state;
+        subStateList.add(data.values.first);
+        newState![key] = subStateList;
+        state = {...newState};
+        // print(state);
+        break;
+      default:
+        break;
+    }
+  }
+
+  void removeWithId(String stateKey, int id) {
+    if (state == null) {
+      print('Cant remove data, state is null');
+      return;
+    }
+    switch (stateKey) {
+      case 'transactions':
+      case 'budget_categories':
+      case 'shared_noted':
+        final subStateList = state![stateKey] as List<dynamic>;
+        final newState = state;
+        subStateList.removeWhere((e) => (e as Map<String, dynamic>)['id'] == id);
+        newState![stateKey] = subStateList;
+        state = {...newState};
+        // print(state);
+        break;
+      default:
+        break;
+    }
+  }
+}

lib/global/styles.dart

@@ -0,0 +1,81 @@
+import 'package:flutter/material.dart';
+
+class Styles {
+  // Theme Colors
+  static const Color purpleNurple = Color(0xFFA188A6);
+  static const Color deepPurpleNurple = Color(0xFF977C9C);
+  static const Color sunflower = Color(0xffFFEE88);
+  static const Color electricBlue = Color(0xFF19647E);
+  static const Color blushingPink = Color(0xFFE78F8E);
+  static const Color seaweedGreen = Color(0xFF86BA90);
+  static const Color emptyBarGrey = Color(0xFFC8C8C8);
+  static const Color lavender = Color(0xFFB8B8FF);
+  static const Color washedStone = Color(0xFFD9D9D9);
+  static const Color flounderBlue = Color(0xFFA7E2E3);
+  // Income Colors
+  static const Color incomeBlue = Color(0xFFB8B8FF);
+  static const Color incomeGreen = Color(0xFF0FA102);
+
+  // Expenses Colors
+  static const Color expensesOrange = Color(0xFFFA824C);
+  static const Color expensesRed = Color(0xFFC73E1D);
+
+  static const List<Color> curatedColors = [
+    Color(0xFF6D326D),
+    Color(0xFFE58F65),
+    Color(0xFFD3E298),
+    Color(0xFFFD96A9),
+    Color(0xFF4F7CAC),
+    Color(0xFFE4B4C2),
+    Color(0xFFFFB8D1),
+    Color(0xFFDDFDFE),
+    Color(0xFFD7BE82),
+    Color(0xFFD4C5C7),
+    Color(0xFF8EB8E5),
+    Color(0xFF9893DA),
+    Color(0xFF99AA38),
+    Color(0xFFA7E2E3),
+    Color(0xFFF7B2BD),
+    Color(0xFFFEDC97),
+    Color(0xFFC28CAE),
+    Color(0xFFF1BF98),
+    Color(0xFFD1BCE3),
+    Color(0xFFBDC667),
+    Color(0xFFFFB563)
+  ];
+
+  // Button Styles
+  static const Color disabledButton = Color(0xFFA8A8A8);
+  static const Color disabledButtonText = Color(0xFFD9D9D9);
+
+  // Widget Styles
+  static BoxDecoration boxLavenderBubble = BoxDecoration(
+    color: Styles.lavender,
+    borderRadius: BorderRadius.circular(20.0),
+  );
+
+  static InputDecoration inputLavenderBubble({String? labelText}) =>
+      InputDecoration(
+        contentPadding:
+            const EdgeInsets.symmetric(vertical: 8.0, horizontal: 8.0),
+        labelText: labelText,
+        errorStyle: const TextStyle(
+          color: Styles.expensesRed,
+        ),
+        focusColor: Styles.blushingPink,
+        hoverColor: Styles.blushingPink,
+        fillColor: Styles.lavender,
+        border: const OutlineInputBorder(
+          borderSide: BorderSide.none,
+        ),
+      );
+
+  static const Color dialogColor = Styles.purpleNurple;
+
+  static RoundedRectangleBorder dialogShape = RoundedRectangleBorder(
+    borderRadius: BorderRadius.circular(20.0),
+  );
+
+  // Sizing Styles
+  static const dialogScreenWidthFactor = 0.75;
+}

lib/global/utils.dart

@@ -0,0 +1,122 @@
+import 'dart:math';
+
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:intl/intl.dart';
+import 'package:rluv/global/styles.dart';
+import 'package:rluv/main.dart';
+
+String formatDate(DateTime time) {
+  return DateFormat('EEEE, dd MMMM yyyy').format(time);
+}
+
+DateTime dateFromJson(int value) => DateTime.fromMillisecondsSinceEpoch(value);
+
+int? dateToJson(DateTime? value) => value?.millisecondsSinceEpoch;
+
+bool boolFromJson(int value) => value == 1;
+
+int boolToJson(bool hide) => hide ? 1 : 0;
+
+String colorToJson(Color color) => color.toString().split('(0x')[1].split(')')[0];
+
+Color colorFromJson(String hex) => Color(int.parse(hex, radix: 16));
+
+String? optionalColorToJson(Color? optionalColor) =>
+    optionalColor == null ? null : optionalColor.toString().split('(0x')[1].split(')')[0];
+
+Color? optionalColorFromJson(String? hex) => hex == null ? null : Color(int.parse(hex, radix: 16));
+
+Brightness getBrightness(Color color) => ThemeData.estimateBrightnessForColor(color);
+
+List<Color> generateColorList() {
+  List<Color> colors = [];
+  for (int i = 100; i <= 255; i += 30) {
+    // Red value variations
+    for (int j = 100; j <= 255; j += 30) {
+      // Green value variations
+      for (int k = 100; k <= 255; k += 30) {
+        // Blue value variations
+        final alpha = Random().nextInt(256) + 50 % 255;
+        colors.add(Color.fromARGB(alpha, i, j, k));
+      }
+    }
+  }
+  colors.shuffle();
+  return colors;
+}
+
+extension MonetaryExtension on double {
+  String currency() {
+    final numStr = toStringAsFixed(2);
+    final pieces = numStr.split(".");
+    if (pieces.length == 1) {
+      return "\$${pieces.first}.00";
+    } else {
+      if (pieces.length > 2) {
+        print(pieces);
+      }
+      return '\$${pieces[0]}.${pieces[1].padRight(2, "0")}';
+    }
+  }
+}
+
+void setDevicePortraitOrientation() {
+  SystemChrome.setPreferredOrientations([
+    DeviceOrientation.portraitUp,
+    DeviceOrientation.portraitDown,
+  ]);
+}
+
+enum SnackType { info, success, error }
+
+void showSnack(
+    {required WidgetRef ref,
+    required String text,
+    SnackType type = SnackType.info,
+    Duration duration = const Duration(seconds: 2)}) {
+  final messengerKey = ref.read(scaffoldMessengerKeyProvider);
+  if (messengerKey.currentState == null) {
+    print('Cannot show snackbar, state == null');
+    return;
+  }
+  final color = type == SnackType.info
+      ? Styles.washedStone
+      : type == SnackType.success
+          ? Styles.seaweedGreen
+          : Styles.expensesRed;
+  final textStyle = TextStyle(
+    fontSize: 16,
+    color: color,
+  );
+  messengerKey.currentState!.showSnackBar(SnackBar(
+    elevation: 8,
+    backgroundColor: Styles.deepPurpleNurple,
+    shape: const RoundedRectangleBorder(
+      borderRadius: BorderRadius.only(topLeft: Radius.circular(20.0), topRight: Radius.circular(20.0)),
+    ),
+    content: Padding(
+      padding: const EdgeInsets.all(8.0),
+      child: Row(
+        children: [
+          Padding(
+            padding: const EdgeInsets.only(right: 14.0),
+            child: Icon(type == SnackType.success ? Icons.check_circle : Icons.info, color: color),
+          ),
+          Text(text, style: textStyle),
+        ],
+      ),
+    ),
+  ));
+}
+
+bool isEmailValid(String email) {
+  final RegExp regex = RegExp(r"^[a-zA-Z0-9.a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,6}$");
+  return regex.hasMatch(email);
+}
+
+bool isUsernameValid(String username) {
+  final RegExp regex = RegExp(r"[a-zA-Z0-9._-]");
+  return regex.hasMatch(username);
+}

lib/global/widgets/budget_color_circle.dart

@@ -0,0 +1,35 @@
+import 'package:flutter/material.dart';
+
+class BudgetColorCircle extends StatelessWidget {
+  const BudgetColorCircle(
+      {super.key, required this.color, this.height = 18, this.width = 18});
+
+  final double height;
+  final double width;
+  final Color color;
+
+  @override
+  Widget build(BuildContext context) {
+    return Stack(
+      children: [
+        Container(
+          height: height,
+          width: width,
+          decoration: const BoxDecoration(
+            shape: BoxShape.circle,
+            color: Colors.white,
+          ),
+        ),
+        Container(
+          height: height,
+          width: width,
+          decoration: BoxDecoration(
+            shape: BoxShape.circle,
+            border: Border.all(color: Colors.black, width: 1.5),
+            color: color,
+          ),
+        ),
+      ],
+    );
+  }
+}

lib/global/widgets/ui_button.dart

@@ -0,0 +1,107 @@
+import 'package:flutter/material.dart';
+import 'package:rluv/global/styles.dart';
+import 'package:rluv/global/utils.dart';
+
+class UiButton extends StatefulWidget {
+  const UiButton({
+    super.key,
+    required this.text,
+    this.color = Styles.deepPurpleNurple,
+    required this.onPressed,
+    this.height,
+    this.width,
+    this.icon,
+    this.showLoading = false,
+  });
+
+  final String text;
+  final Function? onPressed;
+  final Color color;
+  final double? width;
+  final double? height;
+  final Icon? icon;
+  final bool showLoading;
+
+  @override
+  State<UiButton> createState() => _UiButtonState();
+}
+
+class _UiButtonState extends State<UiButton> {
+  final double borderRadius = 12.0;
+  bool loading = false;
+
+  @override
+  Widget build(BuildContext context) {
+    final computedColor =
+        widget.onPressed == null ? Styles.disabledButton : widget.color;
+    final brightness = getBrightness(computedColor);
+    return SizedBox(
+      width: widget.width,
+      height: widget.height,
+      child: Padding(
+        padding: const EdgeInsets.all(8.0),
+        child: InkWell(
+          borderRadius: BorderRadius.circular(borderRadius),
+          onTap: widget.onPressed == null || loading
+              ? null
+              : widget.showLoading
+                  ? () async {
+                      setState(() => loading = true);
+                      await widget.onPressed!();
+                      setState(() => loading = false);
+                    }
+                  : () => widget.onPressed!(),
+          child: Container(
+            decoration: BoxDecoration(
+              color: computedColor,
+              boxShadow: const [
+                BoxShadow(
+                  color: Colors.black26,
+                  blurRadius: 2.0,
+                  spreadRadius: 2.0,
+                  offset: Offset(2.5, 2.5),
+                )
+              ],
+              borderRadius: BorderRadius.circular(borderRadius),
+            ),
+            child: Row(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: loading
+                  ? [
+                      Padding(
+                        padding: const EdgeInsets.all(4.0),
+                        child: SizedBox(
+                            height: 26,
+                            width: 26,
+                            child: CircularProgressIndicator(
+                                strokeWidth: 2.0,
+                                color: brightness == Brightness.dark
+                                    ? Styles.lavender
+                                    : Styles.electricBlue)),
+                      ),
+                    ]
+                  : [
+                      if (widget.icon != null) widget.icon!,
+                      Padding(
+                        padding: const EdgeInsets.all(8.0),
+                        child: Text(
+                          widget.text,
+                          style: TextStyle(
+                            fontSize: 16,
+                            fontWeight: FontWeight.w600,
+                            color: widget.onPressed == null
+                                ? Styles.disabledButtonText
+                                : brightness == Brightness.dark
+                                    ? Styles.washedStone
+                                    : Colors.black87,
+                          ),
+                        ),
+                      ),
+                    ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/main.dart

@@ -1,115 +1,184 @@
+import 'package:animated_splash_screen/animated_splash_screen.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:rluv/features/account/account_create_screen.dart';
+import 'package:rluv/features/budget/screens/budget_overview.dart';
+import 'package:rluv/features/notes/screens/notes_screen.dart';
+import 'package:rluv/features/settings/screens/settings_screen.dart';
+import 'package:rluv/global/store.dart';
+import 'package:rluv/global/styles.dart';
+import 'package:rluv/global/utils.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 
-void main() {
+import 'global/api.dart';
-  runApp(const MyApp());
+import 'global/widgets/ui_button.dart';
+
+void main() async {
+  runApp(const ProviderScope(child: MyApp()));
 }
 
-class MyApp extends StatelessWidget {
+class MyApp extends ConsumerStatefulWidget {
   const MyApp({super.key});
 
+  @override
+  ConsumerState<MyApp> createState() => _MyAppState();
+}
+
+class _MyAppState extends ConsumerState<MyApp> {
   // This widget is the root of your application.
   @override
   Widget build(BuildContext context) {
     return MaterialApp(
-      title: 'Flutter Demo',
+      scaffoldMessengerKey: ref.read(scaffoldMessengerKeyProvider),
+      debugShowCheckedModeBanner: false,
       theme: ThemeData(
-        // This is the theme of your application.
-        //
-        // Try running your application with "flutter run". You'll see the
-        // application has a blue toolbar. Then, without quitting the app, try
-        // changing the primarySwatch below to Colors.green and then invoke
-        // "hot reload" (press "r" in the console where you ran "flutter run",
-        // or simply save your changes to "hot reload" in a Flutter IDE).
-        // Notice that the counter didn't reset back to zero; the application
-        // is not restarted.
         primarySwatch: Colors.blue,
       ),
-      home: const MyHomePage(title: 'Flutter Demo Home Page'),
+      home: AnimatedSplashScreen.withScreenFunction(
+        curve: Curves.easeInOutCubic,
+        splashTransition: SplashTransition.scaleTransition,
+        splashIconSize: 200,
+        splash: Image.asset('assets/splash_icon.png'),
+        backgroundColor: Styles.purpleNurple,
+        duration: 1,
+        screenFunction: () async {
+          final prefs = await SharedPreferences.getInstance();
+          ref.read(prefsProvider.notifier).state = prefs;
+          Widget nextScreen = const AccountCreateScreen();
+          if (ref.read(tokenProvider) != null) {
+            nextScreen = const Home();
+          }
+          return nextScreen;
+        },
+      ),
     );
   }
 }
 
-class MyHomePage extends StatefulWidget {
+class Home extends ConsumerStatefulWidget {
-  const MyHomePage({super.key, required this.title});
+  const Home({super.key});
-
-  // This widget is the home page of your application. It is stateful, meaning
-  // that it has a State object (defined below) that contains fields that affect
-  // how it looks.
-
-  // This class is the configuration for the state. It holds the values (in this
-  // case the title) provided by the parent (in this case the App widget) and
-  // used by the build method of the State. Fields in a Widget subclass are
-  // always marked "final".
-
-  final String title;
 
   @override
-  State<MyHomePage> createState() => _MyHomePageState();
+  ConsumerState<Home> createState() => _HomeState();
 }
 
-class _MyHomePageState extends State<MyHomePage> {
+class _HomeState extends ConsumerState<Home> {
-  int _counter = 0;
+  Map<String, dynamic> initData = {};
-
+  final drawerColors = Styles.curatedColors;
-  void _incrementCounter() {
+  @override
-    setState(() {
+  void initState() {
-      // This call to setState tells the Flutter framework that something has
+    setDevicePortraitOrientation();
-      // changed in this State, which causes it to rerun the build method below
+    if (!ref.read(loadingStateProvider)) {
-      // so that the display can reflect the updated values. If we changed
+      ref.read(dashboardProvider.notifier).fetchDashboard();
-      // _counter without calling setState(), then the build method would not be
+    }
-      // called again, and so nothing would appear to happen.
+    WidgetsBinding.instance.addPostFrameCallback(
-      _counter++;
+      (_) {
-    });
+        ref.read(currentHomePageProvider.notifier).state = const BudgetOverviewScreen(initialData: {});
+      },
+    );
+    super.initState();
   }
 
   @override
   Widget build(BuildContext context) {
-    // This method is rerun every time setState is called, for instance as done
+    if (ref.watch(tokenProvider) == null) {
-    // by the _incrementCounter method above.
+      WidgetsBinding.instance.addPostFrameCallback((_) {
-    //
+        Navigator.pushAndRemoveUntil(
-    // The Flutter framework has been optimized to make rerunning build methods
+          context,
-    // fast, so that you can just rebuild anything that needs updating rather
+          MaterialPageRoute(builder: (ctx) => const AccountCreateScreen()),
-    // than having to individually change instances of widgets.
+          (r) => false,
+        );
+      });
+    }
+    if (ref.watch(currentHomePageProvider).toString() == "BudgetOverviewScreen") {
+      initData = {};
+    }
     return Scaffold(
-      appBar: AppBar(
+      key: ref.read(_scaffoldKeyProvider),
-        // Here we take the value from the MyHomePage object that was created by
+      resizeToAvoidBottomInset: false,
-        // the App.build method, and use it to set our appbar title.
+      drawer: Drawer(
-        title: Text(widget.title),
+        backgroundColor: Styles.purpleNurple,
-      ),
+        child: SafeArea(
-      body: Center(
-        // Center is a layout widget. It takes a single child and positions it
-        // in the middle of the parent.
           child: Column(
-          // Column is also a layout widget. It takes a list of children and
+            children: [
-          // arranges them vertically. By default, it sizes itself to fit its
+              SizedBox(height: MediaQuery.of(context).size.height * 0.15),
-          // children horizontally, and tries to be as tall as its parent.
+              UiButton(
-          //
+                text: 'Budget',
-          // Invoke "debug painting" (press "p" in the console, choose the
+                color: drawerColors[4],
-          // "Toggle Debug Paint" action from the Flutter Inspector in Android
+                onPressed: () {
-          // Studio, or the "Toggle Debug Paint" command in Visual Studio Code)
+                  if (ref.read(currentHomePageProvider).toString() != "BudgetOverviewScreen") {
-          // to see the wireframe for each widget.
+                    ref.read(currentHomePageProvider.notifier).state = BudgetOverviewScreen(initialData: initData);
-          //
+                  }
-          // Column has various properties to control how it sizes itself and
+                  toggleDrawer();
-          // how it positions its children. Here we use mainAxisAlignment to
+                },
-          // center the children vertically; the main axis here is the vertical
-          // axis because Columns are vertical (the cross axis would be
-          // horizontal).
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: <Widget>[
-            const Text(
-              'You have pushed the button this many times:',
               ),
-            Text(
+              UiButton(
-              '$_counter',
+                text: 'Notes',
-              style: Theme.of(context).textTheme.headlineMedium,
+                color: drawerColors[5],
+                onPressed: () {
+                  if (ref.read(currentHomePageProvider).toString() != "SharedNotesScreen") {
+                    ref.read(currentHomePageProvider.notifier).state = SharedNotesScreen(initialData: initData);
+                  }
+                  toggleDrawer();
+                },
               ),
+              const Spacer(),
+              UiButton(
+                text: 'Settings',
+                color: drawerColors[0],
+                onPressed: () {
+                  if (ref.read(currentHomePageProvider).toString() != "SettingsScreen") {
+                    ref.read(currentHomePageProvider.notifier).state = const SettingsScreen();
+                  }
+                  toggleDrawer();
+                },
+              ),
+              const SizedBox(height: 24),
             ],
           ),
         ),
-      floatingActionButton: FloatingActionButton(
+      ),
-        onPressed: _incrementCounter,
+      appBar: AppBar(
-        tooltip: 'Increment',
+        backgroundColor: Styles.purpleNurple,
-        child: const Icon(Icons.add),
+        title: Text(
-      ), // This trailing comma makes auto-formatting nicer for build methods.
+          ref.watch(appBarTitleProvider),
+        ),
+      ),
+      body: ref.watch(currentHomePageProvider),
     );
   }
+
+  toggleDrawer() async {
+    final key = ref.read(_scaffoldKeyProvider);
+    if (key.currentState != null && key.currentState!.isDrawerOpen) {
+      key.currentState!.openEndDrawer();
+    } else if (key.currentState != null) {
+      key.currentState!.openDrawer();
     }
+  }
+}
+
+final _scaffoldKeyProvider = Provider<GlobalKey<ScaffoldState>>(
+  (ref) => GlobalKey<ScaffoldState>(),
+);
+
+final currentHomePageProvider = StateProvider<Widget>(
+  (ref) => Container(),
+);
+
+final appBarTitleProvider = Provider<String>(
+  (ref) {
+    final currentPageName = ref.watch(currentHomePageProvider).toString();
+    switch (currentPageName) {
+      case 'BudgetOverviewScreen':
+        return 'Budget';
+      case 'SharedNotesScreen':
+        return 'Notes';
+      default:
+        return '';
+    }
+  },
+);
+
+final scaffoldMessengerKeyProvider =
+    Provider<GlobalKey<ScaffoldMessengerState>>((ref) => GlobalKey<ScaffoldMessengerState>());

lib/models/budget.dart

@@ -0,0 +1,34 @@
+import 'package:json_annotation/json_annotation.dart';
+
+import '../global/utils.dart';
+
+part 'budget.g.dart';
+
+@JsonSerializable()
+class Budget {
+  const Budget({
+    this.id,
+    required this.familyId,
+    required this.name,
+    required this.expectedIncome,
+    required this.createdAt,
+    required this.updatedAt,
+    this.hide = false,
+  });
+
+  final int? id;
+  final int familyId;
+  final double? expectedIncome;
+  final String name;
+
+  @JsonKey(fromJson: boolFromJson, toJson: boolToJson)
+  final bool hide;
+  @JsonKey(fromJson: dateFromJson, toJson: dateToJson)
+  final DateTime createdAt;
+  @JsonKey(fromJson: dateFromJson, toJson: dateToJson)
+  final DateTime updatedAt;
+
+  factory Budget.fromJson(Map<String, dynamic> json) => _$BudgetFromJson(json);
+
+  Map<String, dynamic> toJson() => _$BudgetToJson(this);
+}

lib/models/budget_category_model.dart

@@ -0,0 +1,57 @@
+import 'dart:ui';
+
+import 'package:json_annotation/json_annotation.dart';
+
+import '../global/utils.dart';
+
+part 'budget_category_model.g.dart';
+
+@JsonSerializable()
+class BudgetCategory {
+  const BudgetCategory({
+    this.id,
+    required this.budgetId,
+    required this.name,
+    required this.color,
+    this.createdAt,
+    this.updatedAt,
+    required this.amount,
+    this.hide = false,
+  });
+
+  final int budgetId;
+  final int? id;
+  final String name;
+  final double amount;
+
+  @JsonKey(fromJson: boolFromJson, toJson: boolToJson)
+  final bool hide;
+
+  @JsonKey(fromJson: colorFromJson, toJson: colorToJson)
+  final Color color;
+
+  @JsonKey(fromJson: dateFromJson, toJson: dateToJson)
+  final DateTime? createdAt;
+
+  @JsonKey(fromJson: dateFromJson, toJson: dateToJson)
+  final DateTime? updatedAt;
+
+  factory BudgetCategory.fromJson(Map<String, dynamic> json) =>
+      _$BudgetCategoryFromJson(json);
+
+  Map<String, dynamic> toJson() => _$BudgetCategoryToJson(this);
+
+  factory BudgetCategory.copyWith(
+          {required BudgetCategory category,
+          required Map<String, dynamic> data}) =>
+      BudgetCategory(
+        id: data['id'] ?? category.id,
+        budgetId: data['budget_id'] ?? category.budgetId,
+        name: data['name'] ?? category.name,
+        color: data['color'] ?? category.color,
+        createdAt: data['created_at'] ?? category.createdAt,
+        updatedAt: data['updated_at'] ?? category.updatedAt,
+        amount: data['amount'] ?? category.amount,
+        hide: data['hide'] ?? category.hide,
+      );
+}

lib/models/family_model.dart

@@ -0,0 +1,31 @@
+import 'package:json_annotation/json_annotation.dart';
+
+import '../global/utils.dart';
+
+part 'family_model.g.dart';
+
+@JsonSerializable()
+class FamilyModel {
+  const FamilyModel({
+    required this.id,
+    required this.code,
+    required this.createdAt,
+    required this.updatedAt,
+    this.hide = false,
+  });
+
+  final int id;
+  final String? code;
+
+  @JsonKey(fromJson: boolFromJson, toJson: boolToJson)
+  final bool hide;
+  @JsonKey(fromJson: dateFromJson, toJson: dateToJson)
+  final DateTime createdAt;
+  @JsonKey(fromJson: dateFromJson, toJson: dateToJson)
+  final DateTime updatedAt;
+
+  factory FamilyModel.fromJson(Map<String, dynamic> json) =>
+      _$FamilyModelFromJson(json);
+
+  Map<String, dynamic> toJson() => _$FamilyModelToJson(this);
+}

lib/models/shared_note.dart

@@ -0,0 +1,68 @@
+import 'dart:convert';
+import 'dart:ui';
+
+import 'package:json_annotation/json_annotation.dart';
+
+import '../global/utils.dart';
+
+part 'shared_note.g.dart';
+
+@JsonSerializable()
+class SharedNote {
+  SharedNote({
+    this.id,
+    required this.familyId,
+    required this.createdByUserId,
+    required this.content,
+    required this.title,
+    this.color,
+    this.createdAt,
+    this.updatedAt,
+    required this.tagIds,
+    this.isMarkdown = false,
+    this.hide = false,
+  });
+
+  final int? id;
+  final int familyId, createdByUserId;
+  String content, title;
+
+  @JsonKey(fromJson: _tagIdsFromJson, toJson: _tagIdsToJson)
+  List<int> tagIds;
+
+  @JsonKey(fromJson: optionalColorFromJson, toJson: optionalColorToJson)
+  Color? color;
+
+  @JsonKey(fromJson: boolFromJson, toJson: boolToJson)
+  bool isMarkdown;
+
+  @JsonKey(fromJson: boolFromJson, toJson: boolToJson)
+  final bool hide;
+
+  @JsonKey(fromJson: dateFromJson, toJson: dateToJson)
+  final DateTime? createdAt;
+
+  @JsonKey(fromJson: dateFromJson, toJson: dateToJson)
+  final DateTime? updatedAt;
+
+  factory SharedNote.fromJson(Map<String, dynamic> json) =>
+      _$SharedNoteFromJson(json);
+
+  Map<String, dynamic> toJson() => _$SharedNoteToJson(this);
+
+  factory SharedNote.copy(SharedNote note) =>
+      SharedNote.fromJson(note.toJson());
+}
+
+List<int> _tagIdsFromJson(String tagJson) {
+  final tagsMap = jsonDecode(tagJson) as List<dynamic>;
+  return tagsMap
+      .map(
+        (e) => int.parse(e),
+      )
+      .toList();
+}
+
+String _tagIdsToJson(List<int> tagIds) {
+  return jsonEncode(tagIds);
+}

lib/models/tag.dart

@@ -0,0 +1,41 @@
+import 'package:json_annotation/json_annotation.dart';
+
+import '../global/utils.dart';
+
+part 'tag.g.dart';
+
+enum TagType {
+  note,
+}
+
+@JsonSerializable()
+class Tag {
+  const Tag({
+    this.id,
+    required this.familyId,
+    required this.createdByUserId,
+    required this.name,
+    required this.type,
+    this.createdAt,
+    this.updatedAt,
+    this.hide = false,
+  });
+
+  final int? id;
+  final int familyId, createdByUserId;
+  final String name;
+  final TagType type;
+
+  @JsonKey(fromJson: boolFromJson, toJson: boolToJson)
+  final bool hide;
+
+  @JsonKey(fromJson: dateFromJson, toJson: dateToJson)
+  final DateTime? createdAt;
+
+  @JsonKey(fromJson: dateFromJson, toJson: dateToJson)
+  final DateTime? updatedAt;
+
+  factory Tag.fromJson(Map<String, dynamic> json) => _$TagFromJson(json);
+
+  Map<String, dynamic> toJson() => _$TagToJson(this);
+}

lib/models/token.dart

@@ -0,0 +1,27 @@
+import 'package:json_annotation/json_annotation.dart';
+
+import '../global/utils.dart';
+
+part 'token.g.dart';
+
+@JsonSerializable()
+class Token {
+  const Token({
+    required this.userId,
+    required this.familyId,
+    required this.generatedAt,
+    required this.expiresAt,
+  });
+
+  final int familyId, userId;
+
+  @JsonKey(fromJson: dateFromJson, toJson: dateToJson)
+  final DateTime generatedAt;
+
+  @JsonKey(fromJson: dateFromJson, toJson: dateToJson)
+  final DateTime expiresAt;
+
+  factory Token.fromJson(Map<String, dynamic> json) => _$TokenFromJson(json);
+
+  Map<String, dynamic> toJson() => _$TokenToJson(this);
+}

lib/models/transaction_model.dart

@@ -0,0 +1,65 @@
+import 'package:json_annotation/json_annotation.dart';
+
+import '../global/utils.dart';
+
+part 'transaction_model.g.dart';
+
+enum TransactionType {
+  income,
+  expense,
+}
+
+@JsonSerializable()
+class Transaction {
+  const Transaction({
+    this.id,
+    required this.amount,
+    required this.type,
+    required this.budgetId,
+    this.budgetCategoryId,
+    required this.createdByUserId,
+    required this.date,
+    this.memo,
+    this.createdAt,
+    this.updatedAt,
+    this.hide = false,
+  });
+
+  final int? id, budgetCategoryId;
+  final int budgetId, createdByUserId;
+  final double amount;
+  final String? memo;
+  final TransactionType type;
+
+  @JsonKey(fromJson: boolFromJson, toJson: boolToJson)
+  final bool hide;
+
+  @JsonKey(fromJson: dateFromJson, toJson: dateToJson)
+  final DateTime date;
+
+  @JsonKey(fromJson: dateFromJson, toJson: dateToJson)
+  final DateTime? createdAt;
+
+  @JsonKey(fromJson: dateFromJson, toJson: dateToJson)
+  final DateTime? updatedAt;
+
+  factory Transaction.fromJson(Map<String, dynamic> json) =>
+      _$TransactionFromJson(json);
+
+  factory Transaction.copyWith(Transaction trans, Map<String, dynamic> data) =>
+      Transaction(
+        id: data['id'] ?? trans.id,
+        amount: data['amount'] ?? trans.amount,
+        type: data['type'] ?? trans.type,
+        budgetId: data['budget_id'] ?? trans.budgetId,
+        budgetCategoryId: data['budget_category_id'] ?? trans.budgetCategoryId,
+        createdByUserId: data['created_by_user_id'] ?? trans.createdByUserId,
+        date: data['date'] ?? trans.date,
+        memo: data['memo'] ?? trans.memo,
+        createdAt: data['created_at'] ?? trans.createdAt,
+        updatedAt: data['updated_at'] ?? trans.updatedAt,
+        hide: data['hide'] ?? trans.hide,
+      );
+
+  Map<String, dynamic> toJson() => _$TransactionToJson(this);
+}

lib/models/user.dart

@@ -0,0 +1,39 @@
+import 'package:json_annotation/json_annotation.dart';
+
+import '../global/utils.dart';
+
+part 'user.g.dart';
+
+@JsonSerializable()
+class User {
+  const User({
+    this.id,
+    required this.name,
+    required this.familyId,
+    required this.budgetId,
+    this.email,
+    this.username,
+    this.createdAt,
+    this.updatedAt,
+    this.lastActivityAt,
+    this.hide = false,
+  });
+
+  final int? id;
+  final int familyId, budgetId;
+  final String name;
+  final String? username, email;
+
+  @JsonKey(fromJson: boolFromJson, toJson: boolToJson)
+  final bool hide;
+  @JsonKey(fromJson: dateFromJson, toJson: dateToJson)
+  final DateTime? createdAt;
+  @JsonKey(fromJson: dateFromJson, toJson: dateToJson)
+  final DateTime? updatedAt;
+  @JsonKey(fromJson: dateFromJson, toJson: dateToJson)
+  final DateTime? lastActivityAt;
+
+  factory User.fromJson(Map<String, dynamic> json) => _$UserFromJson(json);
+
+  Map<String, dynamic> toJson() => _$UserToJson(this);
+}

lib/splash_screen.dart

@@ -0,0 +1 @@
+

pubspec.lock

@@ -5,34 +5,55 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: ae92f5d747aee634b87f89d9946000c2de774be1d6ac3e58268224348cd0101a
+      sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
       url: "https://pub.dev"
     source: hosted
-    version: "61.0.0"
+    version: "72.0.0"
+  _macros:
+    dependency: transitive
+    description: dart
+    source: sdk
+    version: "0.3.2"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      sha256: ea3d8652bda62982addfd92fdc2d0214e5f82e43325104990d4f4c4a2a313562
+      sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
       url: "https://pub.dev"
     source: hosted
-    version: "5.13.0"
+    version: "6.7.0"
+  animated_splash_screen:
+    dependency: "direct main"
+    description:
+      name: animated_splash_screen
+      sha256: f45634db6ec4e8cf034c53e03f3bd83898a16fe3c9286bf5510b6831dfcf2124
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.0"
+  archive:
+    dependency: transitive
+    description:
+      name: archive
+      sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.6.1"
   args:
     dependency: transitive
     description:
       name: args
-      sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596
+      sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.2"
+    version: "2.5.0"
   async:
     dependency: transitive
     description:
       name: async
-      sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
+      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.10.0"
+    version: "2.11.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -45,10 +66,10 @@ packages:
     dependency: transitive
     description:
       name: build
-      sha256: "3fbda25365741f8251b39f3917fb3c8e286a96fd068a5a242e11c2012d495777"
+      sha256: "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.4.1"
   build_config:
     dependency: transitive
     description:
@@ -61,34 +82,34 @@ packages:
     dependency: transitive
     description:
       name: build_daemon
-      sha256: "757153e5d9cd88253cb13f28c2fb55a537dc31fefd98137549895b5beb7c6169"
+      sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.1"
+    version: "4.0.2"
   build_resolvers:
     dependency: transitive
     description:
       name: build_resolvers
-      sha256: "6c4dd11d05d056e76320b828a1db0fc01ccd376922526f8e9d6c796a5adbac20"
+      sha256: "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    version: "2.4.2"
   build_runner:
     dependency: "direct dev"
     description:
       name: build_runner
-      sha256: b0a8a7b8a76c493e85f1b84bffa0588859a06197863dba8c9036b15581fd9727
+      sha256: dd09dd4e2b078992f42aac7f1a622f01882a8492fef08486b27ddde929c19f04
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.3"
+    version: "2.4.12"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
-      sha256: "0671ad4162ed510b70d0eb4ad6354c249f8429cab4ae7a4cec86bbc2886eb76e"
+      sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0
       url: "https://pub.dev"
     source: hosted
-    version: "7.2.7+1"
+    version: "7.3.2"
   built_collection:
     dependency: transitive
     description:
@@ -101,18 +122,18 @@ packages:
     dependency: transitive
     description:
       name: built_value
-      sha256: "598a2a682e2a7a90f08ba39c0aaa9374c5112340f0a2e275f61b59389543d166"
+      sha256: c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb
       url: "https://pub.dev"
     source: hosted
-    version: "8.6.1"
+    version: "8.9.2"
   characters:
     dependency: transitive
     description:
       name: characters
-      sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
+      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.3.0"
   checked_yaml:
     dependency: transitive
     description:
@@ -133,18 +154,18 @@ packages:
     dependency: transitive
     description:
       name: code_builder
-      sha256: "4ad01d6e56db961d29661561effde45e519939fdaeb46c351275b182eac70189"
+      sha256: f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37
       url: "https://pub.dev"
     source: hosted
-    version: "4.5.0"
+    version: "4.10.0"
   collection:
     dependency: transitive
     description:
       name: collection
-      sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.0"
+    version: "1.18.0"
   convert:
     dependency: transitive
     description:
@@ -157,34 +178,50 @@ packages:
     dependency: transitive
     description:
       name: crypto
-      sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab
+      sha256: ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.3"
+    version: "3.0.5"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be
+      sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.5"
+    version: "1.0.8"
+  custom_refresh_indicator:
+    dependency: "direct main"
+    description:
+      name: custom_refresh_indicator
+      sha256: c34dd1dfb1f6b9ee2db9c5972586dba5e4445d79f8431f6ab098a6e963ccd39c
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.1"
   dart_style:
     dependency: transitive
     description:
       name: dart_style
-      sha256: "1efa911ca7086affd35f463ca2fc1799584fb6aa89883cf0af8e3664d6a02d55"
+      sha256: "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.3.7"
   dio:
     dependency: "direct main"
     description:
       name: dio
-      sha256: a9d76e72985d7087eb7c5e7903224ae52b337131518d127c554b9405936752b8
+      sha256: "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260"
       url: "https://pub.dev"
     source: hosted
-    version: "5.2.1+1"
+    version: "5.7.0"
+  dio_web_adapter:
+    dependency: transitive
+    description:
+      name: dio_web_adapter
+      sha256: "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.0"
   fake_async:
     dependency: transitive
     description:
@@ -197,18 +234,18 @@ packages:
     dependency: transitive
     description:
       name: ffi
-      sha256: ed5337a5660c506388a9f012be0288fb38b49020ce2b45fe1f8b8323fe429f99
+      sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.2"
+    version: "2.1.3"
   file:
     dependency: transitive
     description:
       name: file
-      sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d"
+      sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.4"
+    version: "7.0.0"
   fixnum:
     dependency: transitive
     description:
@@ -226,18 +263,18 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      sha256: "2118df84ef0c3ca93f96123a616ae8540879991b8b57af2f81b76a7ada49b2a4"
+      sha256: "3f41d009ba7172d5ff9be5f6e6e6abb4300e263aab8866d2a0842ed2a70f8f0c"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.2"
+    version: "4.0.0"
   flutter_riverpod:
     dependency: "direct main"
     description:
       name: flutter_riverpod
-      sha256: b83ac5827baadefd331ea1d85110f34645827ea234ccabf53a655f41901a9bf4
+      sha256: "0f1974eff5bbe774bf1d870e406fc6f29e3d6f1c46bd9c58e7172ff68a785d7d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.6"
+    version: "2.5.1"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -252,10 +289,10 @@ packages:
     dependency: transitive
     description:
       name: frontend_server_client
-      sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612"
+      sha256: f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.0"
+    version: "4.0.0"
   glob:
     dependency: transitive
     description:
@@ -268,18 +305,10 @@ packages:
     dependency: transitive
     description:
       name: graphs
-      sha256: aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19
+      sha256: "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.1"
+    version: "2.3.2"
-  helpers:
-    dependency: "direct main"
-    description:
-      name: helpers
-      sha256: d82a48e5acd45e3650af20779cf61326dd9c1aaf729fdab4ae721dc48f28b840
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.2.3"
   http_multi_server:
     dependency: transitive
     description:
@@ -296,6 +325,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.0.2"
+  icons_launcher:
+    dependency: "direct dev"
+    description:
+      name: icons_launcher
+      sha256: "9b514ffed6ed69b232fd2bf34c44878c8526be71fc74129a658f35c04c9d4a9d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.7"
+  image:
+    dependency: transitive
+    description:
+      name: image
+      sha256: "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.2.0"
+  intl:
+    dependency: "direct main"
+    description:
+      name: intl
+      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.19.0"
   io:
     dependency: transitive
     description:
@@ -308,34 +361,66 @@ packages:
     dependency: transitive
     description:
       name: js
-      sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
+      sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.5"
+    version: "0.7.1"
   json_annotation:
     dependency: "direct main"
     description:
       name: json_annotation
-      sha256: b10a7b2ff83d83c777edba3c6a0f97045ddadd56c944e1a23a3fdf43a1bf4467
+      sha256: "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1"
       url: "https://pub.dev"
     source: hosted
-    version: "4.8.1"
+    version: "4.9.0"
   json_serializable:
     dependency: "direct dev"
     description:
       name: json_serializable
-      sha256: "43793352f90efa5d8b251893a63d767b2f7c833120e3cc02adad55eefec04dc7"
+      sha256: ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b
       url: "https://pub.dev"
     source: hosted
-    version: "6.6.2"
+    version: "6.8.0"
+  jwt_decoder:
+    dependency: "direct main"
+    description:
+      name: jwt_decoder
+      sha256: "54774aebf83f2923b99e6416b4ea915d47af3bde56884eb622de85feabbc559f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
+  leak_tracker:
+    dependency: transitive
+    description:
+      name: leak_tracker
+      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
+      url: "https://pub.dev"
+    source: hosted
+    version: "10.0.5"
+  leak_tracker_flutter_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_flutter_testing
+      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.5"
+  leak_tracker_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_testing
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.1"
   lints:
     dependency: transitive
     description:
       name: lints
-      sha256: "5e4a9cd06d447758280a8ac2405101e0e2094d2a1dbdd3756aec3fe7775ba593"
+      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.1"
+    version: "4.0.0"
   logging:
     dependency: transitive
     description:
@@ -344,38 +429,46 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.0"
+  macros:
+    dependency: transitive
+    description:
+      name: macros
+      sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.2-main.4"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
+      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.13"
+    version: "0.12.16+1"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
+      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
       url: "https://pub.dev"
     source: hosted
-    version: "0.2.0"
+    version: "0.11.1"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
+      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.0"
+    version: "1.15.0"
   mime:
     dependency: transitive
     description:
       name: mime
-      sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e
+      sha256: "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.6"
   package_config:
     dependency: transitive
     description:
@@ -384,54 +477,70 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.0"
+  page_transition:
+    dependency: transitive
+    description:
+      name: page_transition
+      sha256: dee976b1f23de9bbef5cd512fe567e9f6278caee11f5eaca9a2115c19dc49ef6
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
   path:
     dependency: transitive
     description:
       name: path
-      sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
+      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.2"
+    version: "1.9.0"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
-      sha256: ffbb8cc9ed2c9ec0e4b7a541e56fd79b138e8f47d2fb86815f15358a349b3b57
+      sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.11"
+    version: "2.2.1"
   path_provider_platform_interface:
     dependency: transitive
     description:
       name: path_provider_platform_interface
-      sha256: "57585299a729335f1298b43245842678cb9f43a6310351b18fb577d6e33165ec"
+      sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.6"
+    version: "2.1.2"
   path_provider_windows:
     dependency: transitive
     description:
       name: path_provider_windows
-      sha256: "1cb68ba4cd3a795033de62ba1b7b4564dace301f952de6bfb3cd91b202b6ee96"
+      sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.7"
+    version: "2.3.0"
+  petitparser:
+    dependency: transitive
+    description:
+      name: petitparser
+      sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.0.2"
   platform:
     dependency: transitive
     description:
       name: platform
-      sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76"
+      sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.0"
+    version: "3.1.5"
   plugin_platform_interface:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      sha256: "6a2128648c854906c53fa8e33986fc0247a1116122f9534dd20e3ab9e16a32bc"
+      sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.4"
+    version: "2.1.8"
   pool:
     dependency: transitive
     description:
@@ -452,74 +561,74 @@ packages:
     dependency: transitive
     description:
       name: pubspec_parse
-      sha256: c63b2876e58e194e4b0828fcb080ad0e06d051cb607a6be51a9e084f47cb9367
+      sha256: c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.3"
+    version: "1.3.0"
   riverpod:
     dependency: transitive
     description:
       name: riverpod
-      sha256: "80e48bebc83010d5e67a11c9514af6b44bbac1ec77b4333c8ea65dbc79e2d8ef"
+      sha256: f21b32ffd26a36555e501b04f4a5dca43ed59e16343f1a30c13632b2351dfa4d
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.6"
+    version: "2.5.1"
   shared_preferences:
     dependency: "direct main"
     description:
       name: shared_preferences
-      sha256: "0344316c947ffeb3a529eac929e1978fcd37c26be4e8468628bac399365a3ca1"
+      sha256: "746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.3.2"
   shared_preferences_android:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: fe8401ec5b6dcd739a0fe9588802069e608c3fdbfd3c3c93e546cf2f90438076
+      sha256: "480ba4345773f56acda9abf5f50bd966f581dac5d514e5fc4a18c62976bbba7e"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.3.2"
   shared_preferences_foundation:
     dependency: transitive
     description:
       name: shared_preferences_foundation
-      sha256: f39696b83e844923b642ce9dd4bd31736c17e697f6731a5adf445b1274cf3cd4
+      sha256: c4b35f6cb8f63c147312c054ce7c2254c8066745125264f0c88739c417fc9d9f
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.2"
+    version: "2.5.2"
   shared_preferences_linux:
     dependency: transitive
     description:
       name: shared_preferences_linux
-      sha256: "71d6806d1449b0a9d4e85e0c7a917771e672a3d5dc61149cc9fac871115018e1"
+      sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.0"
+    version: "2.4.1"
   shared_preferences_platform_interface:
     dependency: transitive
     description:
       name: shared_preferences_platform_interface
-      sha256: "23b052f17a25b90ff2b61aad4cc962154da76fb62848a9ce088efe30d7c50ab1"
+      sha256: "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.0"
+    version: "2.4.1"
   shared_preferences_web:
     dependency: transitive
     description:
       name: shared_preferences_web
-      sha256: "7347b194fb0bbeb4058e6a4e87ee70350b6b2b90f8ac5f8bd5b3a01548f6d33a"
+      sha256: d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.4.2"
   shared_preferences_windows:
     dependency: transitive
     description:
       name: shared_preferences_windows
-      sha256: f95e6a43162bce43c9c3405f3eb6f39e5b5d11f65fab19196cf8225e2777624d
+      sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.0"
+    version: "2.4.1"
   shelf:
     dependency: transitive
     description:
@@ -532,10 +641,10 @@ packages:
     dependency: transitive
     description:
       name: shelf_web_socket
-      sha256: "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1"
+      sha256: "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.4"
+    version: "2.0.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -545,10 +654,10 @@ packages:
     dependency: transitive
     description:
       name: source_gen
-      sha256: "373f96cf5a8744bc9816c1ff41cf5391bbdbe3d7a96fe98c622b6738a8a7bd33"
+      sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.2"
+    version: "1.5.0"
   source_helper:
     dependency: transitive
     description:
@@ -561,34 +670,34 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
+      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.10.0"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.11.1"
   state_notifier:
     dependency: transitive
     description:
       name: state_notifier
-      sha256: "8fe42610f179b843b12371e40db58c9444f8757f8b69d181c97e50787caed289"
+      sha256: b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.2+1"
+    version: "1.0.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   stream_transform:
     dependency: transitive
     description:
@@ -617,10 +726,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
+      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.4.16"
+    version: "0.7.2"
   timing:
     dependency: transitive
     description:
@@ -637,14 +746,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.2"
-  uuid:
+  universal_io:
-    dependency: "direct main"
+    dependency: transitive
     description:
-      name: uuid
+      name: universal_io
-      sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313"
+      sha256: "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad"
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.7"
+    version: "2.2.2"
   vector_math:
     dependency: transitive
     description:
@@ -653,38 +762,62 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
+  vm_service:
+    dependency: transitive
+    description:
+      name: vm_service
+      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
+      url: "https://pub.dev"
+    source: hosted
+    version: "14.2.5"
   watcher:
     dependency: transitive
     description:
       name: watcher
-      sha256: "6a7f46926b01ce81bfc339da6a7f20afbe7733eff9846f6d6a5466aa4c6667c0"
+      sha256: "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.2"
+    version: "1.1.0"
+  web:
+    dependency: transitive
+    description:
+      name: web
+      sha256: d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0"
+  web_socket:
+    dependency: transitive
+    description:
+      name: web_socket
+      sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.6"
   web_socket_channel:
     dependency: transitive
     description:
       name: web_socket_channel
-      sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b
+      sha256: "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.0"
+    version: "3.0.1"
-  win32:
-    dependency: transitive
-    description:
-      name: win32
-      sha256: "5a751eddf9db89b3e5f9d50c20ab8612296e4e8db69009788d6c8b060a84191c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.1.4"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
-      sha256: e0b1147eec179d3911f1f19b59206448f78195ca1d20514134e10641b7d7fbff
+      sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
+    version: "1.0.4"
+  xml:
+    dependency: transitive
+    description:
+      name: xml
+      sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.5.0"
   yaml:
     dependency: transitive
     description:
@@ -694,5 +827,5 @@ packages:
     source: hosted
     version: "3.1.2"
 sdks:
-  dart: ">=2.19.6 <3.0.0"
+  dart: ">=3.5.0-259.0.dev <4.0.0"
-  flutter: ">=3.3.0"
+  flutter: ">=3.22.0"

pubspec.yaml

@@ -37,10 +37,18 @@ dependencies:
   cupertino_icons: ^1.0.2
   dio: ^5.2.1+1
   flutter_riverpod: ^2.1.3
-  helpers: ^1.2.0
+  # helpers:
-  uuid: ^3.0.7
+  #   git:
+  #     url: https://github.com/mitch2na/helpers.git
+  #     ref: main
+  # uuid: ^3.0.7
   json_annotation: ^4.8.0
   shared_preferences: ^2.1.2
+  intl: ^0.19.0
+  # markdown_widget: ^2.2.0
+  custom_refresh_indicator: ^4.0.1
+  jwt_decoder: ^2.0.1
+  animated_splash_screen: ^1.3.0
 
 dev_dependencies:
   flutter_test:
@@ -48,7 +56,8 @@ dev_dependencies:
 
   build_runner: ^2.3.3
   json_serializable: ^6.6.0
-  flutter_lints: ^2.0.0
+  flutter_lints: ^4.0.0
+  icons_launcher: ^2.1.3
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
@@ -62,9 +71,8 @@ flutter:
   uses-material-design: true
 
   # To add assets to your application, add an assets section, like this:
-  # assets:
+  assets:
-  #   - images/a_dot_burr.jpeg
+    - assets/
-  #   - images/a_dot_ham.jpeg
 
   # An image asset can refer to one or more resolution-specific "variants", see
   # https://flutter.dev/assets-and-images/#resolution-aware
@@ -91,3 +99,13 @@ flutter:
   #
   # For details regarding fonts from package dependencies,
   # see https://flutter.dev/custom-fonts/#from-packages
+icons_launcher:
+  image_path: "assets/app_icon.png"
+  platforms:
+    android:
+      enable: true
+      adaptive_background_color: "#A188A6"
+      adaptive_foreground_image: "assets/app_icon1.png"
+      adaptize_round_image: "assets/app_icon_round.png"
+    ios:
+      enable: true