Migrate away from helpers package

.envrc

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

.gitignore

@@ -45,3 +45,4 @@ app.*.map.json
 
 #generated files
 lib/**/*.g.dart
+.direnv/

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/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";
+  };
+}

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" 
+          '';
+        };
+    });
+}

lib/features/account/account_create_screen.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:helpers/helpers/misc_build/build_media.dart';
 import 'package:rluv/features/account/signup.dart';
 import 'package:rluv/global/styles.dart';
 
@@ -13,8 +12,7 @@ class AccountCreateScreen extends ConsumerStatefulWidget {
   const AccountCreateScreen({super.key});
 
   @override
-  ConsumerState<AccountCreateScreen> createState() =>
+  ConsumerState<AccountCreateScreen> createState() => _AccountCreateScreenState();
-      _AccountCreateScreenState();
 }
 
 enum _AccountScreen { options, login, signup }
@@ -40,7 +38,7 @@ class _AccountCreateScreenState extends ConsumerState<AccountCreateScreen> {
         },
       );
     }
-    final screen = BuildMedia(context).size;
+    final screen = MediaQuery.of(context).size;
     return Scaffold(
       backgroundColor: Styles.purpleNurple,
       body: SafeArea(
@@ -60,11 +58,8 @@ class _AccountCreateScreenState extends ConsumerState<AccountCreateScreen> {
                         Padding(
                           padding: const EdgeInsets.symmetric(vertical: 40.0),
                           child: Image.asset("assets/app_icon.png",
-                              height:
+                              height: screen.width > 500 ? 250 : screen.width * 0.5,
-                                  screen.width > 500 ? 250 : screen.width * 0.5,
+                              width: screen.width > 500 ? 250 : screen.width * 0.5),
-                              width: screen.width > 500
-                                  ? 250
-                                  : screen.width * 0.5),
                         ),
                         UiButton(
                           color: Styles.sunflower,

lib/features/account/login.dart

@@ -1,7 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:helpers/helpers/misc_build/build_media.dart';
-import 'package:helpers/helpers/print.dart';
 
 import '../../global/api.dart';
 import '../../global/styles.dart';
@@ -32,7 +30,7 @@ class _LoginState extends ConsumerState<Login> {
 
   @override
   Widget build(BuildContext context) {
-    final screen = BuildMedia(context).size;
+    final screen = MediaQuery.of(context).size;
     return Form(
       key: widget.formKey,
       child: Stack(
@@ -205,14 +203,11 @@ class _LoginState extends ConsumerState<Login> {
 
   Future login() async {
     try {
-      if (widget.formKey.currentState != null &&
+      if (widget.formKey.currentState != null && !widget.formKey.currentState!.validate()) {
-          !widget.formKey.currentState!.validate()) {
         return;
       }
-      final data =
+      final data = await ref.read(apiProvider.notifier).post(path: 'auth/login', data: {
-          await ref.read(apiProvider.notifier).post(path: 'auth/login', data: {
+        'username': usernameController.text.isEmpty ? null : usernameController.text,
-        'username':
-            usernameController.text.isEmpty ? null : usernameController.text,
         'email': emailController.text.isEmpty ? null : emailController.text,
         'password': passwordController.text,
       });
@@ -227,13 +222,10 @@ class _LoginState extends ConsumerState<Login> {
         }
       }
       // final bool success = data?['success'] ?? false;
-      printAmber(data);
+      print(data);
-      showSnack(
+      showSnack(ref: ref, text: message, type: !success ? SnackType.error : SnackType.success);
-          ref: ref,
-          text: message,
-          type: !success ? SnackType.error : SnackType.success);
     } catch (err, st) {
-      printRed('Error in login: $err\n$st');
+      print('Error in login: $err\n$st');
     }
   }
 }

lib/features/account/signup.dart

@@ -1,7 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:helpers/helpers/misc_build/build_media.dart';
-import 'package:helpers/helpers/print.dart';
 
 import '../../global/api.dart';
 import '../../global/styles.dart';
@@ -36,7 +34,7 @@ class _SignupState extends ConsumerState<Signup> {
 
   @override
   Widget build(BuildContext context) {
-    final screen = BuildMedia(context).size;
+    final screen = MediaQuery.of(context).size;
     return Form(
       key: widget.formKey,
       child: Stack(
@@ -126,8 +124,7 @@ class _SignupState extends ConsumerState<Signup> {
                             ),
                             UiButton(
                               width: screen.width * 0.4,
-                              icon: const Icon(Icons.cancel,
+                              icon: const Icon(Icons.cancel, color: Styles.washedStone, size: 20),
-                                  color: Styles.washedStone, size: 20),
                               onPressed: () {
                                 setState(
                                   () => hasFamilyCode = false,
@@ -140,9 +137,7 @@ class _SignupState extends ConsumerState<Signup> {
                       : Padding(
                           padding: const EdgeInsets.all(8.0),
                           child: UiButton(
-                            width: screen.width * 0.5 > 400
+                            width: screen.width * 0.5 > 400 ? 400 : screen.width * 0.5,
-                                ? 400
-                                : screen.width * 0.5,
                             text: 'JOIN FAMILY',
                             // color: Styles.flounderBlue,
                             onPressed: () {
@@ -190,8 +185,7 @@ class _SignupState extends ConsumerState<Signup> {
                   text,
                   style: TextStyle(fontSize: size.width < 350 ? 16 : 20),
                 ),
-                if (subtext != null)
+                if (subtext != null) Text(subtext, style: const TextStyle(fontSize: 12)),
-                  Text(subtext, style: const TextStyle(fontSize: 12)),
               ],
             ),
           ),
@@ -223,36 +217,29 @@ class _SignupState extends ConsumerState<Signup> {
 
   Future signup() async {
     try {
-      if (widget.formKey.currentState != null &&
+      if (widget.formKey.currentState != null && !widget.formKey.currentState!.validate()) {
-          !widget.formKey.currentState!.validate()) {
         return;
       }
-      final data =
+      final data = await ref.read(apiProvider.notifier).post(path: 'auth/signup', data: {
-          await ref.read(apiProvider.notifier).post(path: 'auth/signup', data: {
         'name': nameCotroller.text,
-        'username':
+        'username': usernameController.text.isEmpty ? null : usernameController.text,
-            usernameController.text.isEmpty ? null : usernameController.text,
         'email': emailController.text.isEmpty ? null : emailController.text,
         'password': passwordController.text,
-        'family_code': familyCodeController.text.isEmpty
+        'family_code': familyCodeController.text.isEmpty ? null : familyCodeController.text.toUpperCase(),
-            ? null
-            : familyCodeController.text.toUpperCase(),
         'budget_name': 'Budget'
       });
 
       final success = data?['success'] ?? false;
       showSnack(
           ref: ref,
-          text: data?['message'] ?? success
+          text: data?['message'] ?? success ? 'Login successful' : 'Login unsuccessful',
-              ? 'Login successful'
-              : 'Login unsuccessful',
           type: !success ? SnackType.error : SnackType.success);
 
-      printAmber(data);
+      print(data);
       // final user = User.fromJson(data?['user']);
       // ref.read(tokenProvider.notifier).state =
     } catch (err) {
-      printRed(err);
+      print(err);
     }
   }
 }

lib/features/budget/screens/budget_overview.dart

@@ -1,12 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:helpers/helpers.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';
@@ -19,8 +19,7 @@ class BudgetOverviewScreen extends ConsumerStatefulWidget {
   final Map<String, dynamic> initialData;
 
   @override
-  ConsumerState<BudgetOverviewScreen> createState() =>
+  ConsumerState<BudgetOverviewScreen> createState() => _BudgetOverviewScreenState();
-      _BudgetOverviewScreenState();
 }
 
 class _BudgetOverviewScreenState extends ConsumerState<BudgetOverviewScreen> {
@@ -30,23 +29,18 @@ class _BudgetOverviewScreenState extends ConsumerState<BudgetOverviewScreen> {
     final budget = ref.watch(budgetProvider);
     final budgetCategories = ref.watch(budgetCategoriesProvider);
     final transactions = ref.watch(transactionsProvider);
-    final screen = BuildMedia(context).size;
+    final screen = MediaQuery.of(context).size;
     double netExpense = 0.0;
     double netIncome = 0.0;
     double expectedExpenses = 0.0;
     Map<int, double> budgetCategoryNetMap = {};
-    netExpense = transactions
+    netExpense =
-        .where((t) => t.type == TransactionType.expense)
+        transactions.where((t) => t.type == TransactionType.expense).fold(netExpense, (net, t) => net + t.amount);
-        .fold(netExpense, (net, t) => net + t.amount);
+    netIncome = transactions.where((t) => t.type == TransactionType.income).fold(netIncome, (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
+      net = transactions.where((t) => t.budgetCategoryId == bud.id).fold(net, (net, t) => net + t.amount);
-          .where((t) => t.budgetCategoryId == bud.id)
-          .fold(net, (net, t) => net + t.amount);
       budgetCategoryNetMap[bud.id!] = net;
     }
     return Stack(
@@ -64,23 +58,14 @@ class _BudgetOverviewScreenState extends ConsumerState<BudgetOverviewScreen> {
                   const Spacer(flex: 2),
                   Text(
                     formatDate(DateTime.now()),
-                    style: const TextStyle(
+                    style: const TextStyle(fontSize: 16, color: Styles.electricBlue),
-                        fontSize: 16, color: Styles.electricBlue),
                   ),
                   const Spacer(),
-                  const Text('MONTHLY',
+                  const Text('MONTHLY', style: TextStyle(fontSize: 42, color: Styles.electricBlue)),
-                      style:
-                          TextStyle(fontSize: 42, color: Styles.electricBlue)),
                   const Spacer(flex: 2),
-                  BudgetNetBar(
+                  BudgetNetBar(isPositive: true, net: netIncome, expected: budget?.expectedIncome ?? 0.0),
-                      isPositive: true,
-                      net: netIncome,
-                      expected: budget?.expectedIncome ?? 0.0),
                   const Spacer(),
-                  BudgetNetBar(
+                  BudgetNetBar(isPositive: false, net: netExpense, expected: expectedExpenses),
-                      isPositive: false,
-                      net: netExpense,
-                      expected: expectedExpenses),
                   const Spacer(),
                 ],
               ),
@@ -107,8 +92,7 @@ class _BudgetOverviewScreenState extends ConsumerState<BudgetOverviewScreen> {
                               padding: EdgeInsets.all(8.0),
                               child: Text(
                                 'BUDGET',
-                                style: TextStyle(
+                                style: TextStyle(fontSize: 28, color: Styles.electricBlue),
-                                    fontSize: 28, color: Styles.electricBlue),
                               ),
                             ),
                             budgetCategories.isEmpty
@@ -120,25 +104,18 @@ class _BudgetOverviewScreenState extends ConsumerState<BudgetOverviewScreen> {
                                         children: [
                                           const Padding(
                                             padding: EdgeInsets.all(8.0),
-                                            child: Text(
+                                            child: Text('No budget categories created yet, add some!'),
-                                                'No budget categories created yet, add some!'),
                                           ),
                                           UiButton(
-                                            onPressed:
+                                            onPressed: ref.watch(budgetProvider) == null
-                                                ref.watch(budgetProvider) ==
+                                                ? null
-                                                        null
+                                                : () => showDialog(
-                                                    ? null
+                                                      context: context,
-                                                    : () => showDialog(
+                                                      builder: (context) => Dialog(
-                                                          context: context,
+                                                          shape: Styles.dialogShape,
-                                                          builder: (context) => Dialog(
+                                                          backgroundColor: Styles.dialogColor,
-                                                              shape: Styles
+                                                          child: const BudgetCategoryDialog()),
-                                                                  .dialogShape,
+                                                    ),
-                                                              backgroundColor:
-                                                                  Styles
-                                                                      .dialogColor,
-                                                              child:
-                                                                  const BudgetCategoryDialog()),
-                                                        ),
                                             text: 'Add Category',
                                           ),
                                         ],
@@ -146,55 +123,42 @@ class _BudgetOverviewScreenState extends ConsumerState<BudgetOverviewScreen> {
                                     ),
                                   )
                                 : Padding(
-                                    padding: const EdgeInsets.symmetric(
+                                    padding: const EdgeInsets.symmetric(horizontal: 2.0, vertical: 4.0),
-                                        horizontal: 2.0, vertical: 4.0),
                                     child: SizedBox(
                                       height: screen.height * 0.36,
                                       child: Scrollbar(
                                         controller: budgetListScrollController,
                                         thumbVisibility: true,
                                         child: ListView(
-                                          physics:
+                                          physics: const BouncingScrollPhysics(),
-                                              const BouncingScrollPhysics(),
+                                          controller: budgetListScrollController,
-                                          controller:
-                                              budgetListScrollController,
                                           shrinkWrap: true,
                                           children: [
-                                            ...budgetCategories
+                                            ...budgetCategories.map((BudgetCategory category) {
-                                                .mapIndexed((i, category) {
+                                              final i = budgetCategories.indexOf(category);
                                               return BudgetCategoryBar(
                                                 budgetCategory: category,
-                                                currentAmount:
+                                                currentAmount: budgetCategoryNetMap[category.id]!,
-                                                    budgetCategoryNetMap[
-                                                        category.id]!,
                                                 index: i,
                                               );
                                             }).toList(),
                                             const SizedBox(height: 20),
                                             Row(
-                                              mainAxisAlignment:
+                                              mainAxisAlignment: MainAxisAlignment.center,
-                                                  MainAxisAlignment.center,
                                               children: [
                                                 SizedBox(
                                                   width: 140,
                                                   child: ElevatedButton(
-                                                    onPressed: ref.watch(
+                                                    onPressed: ref.watch(budgetProvider) == null
-                                                                budgetProvider) ==
-                                                            null
                                                         ? null
                                                         : () => showDialog(
                                                               context: context,
                                                               builder: (context) => Dialog(
-                                                                  shape: Styles
+                                                                  shape: Styles.dialogShape,
-                                                                      .dialogShape,
+                                                                  backgroundColor: Styles.dialogColor,
-                                                                  backgroundColor:
+                                                                  child: const BudgetCategoryDialog()),
-                                                                      Styles
-                                                                          .dialogColor,
-                                                                  child:
-                                                                      const BudgetCategoryDialog()),
                                                             ),
-                                                    child: const Text(
+                                                    child: const Text('Add Category'),
-                                                        'Add Category'),
                                                   ),
                                                 ),
                                               ],
@@ -214,8 +178,7 @@ class _BudgetOverviewScreenState extends ConsumerState<BudgetOverviewScreen> {
                       children: [
                         Expanded(
                           child: Padding(
-                            padding:
+                            padding: const EdgeInsets.only(left: 20.0, right: 15.0),
-                                const EdgeInsets.only(left: 20.0, right: 15.0),
                             child: Container(
                               height: 70,
                               decoration: BoxDecoration(
@@ -225,8 +188,7 @@ class _BudgetOverviewScreenState extends ConsumerState<BudgetOverviewScreen> {
                               child: InkWell(
                                 child: const Center(
                                   child: Padding(
-                                    padding: EdgeInsets.symmetric(
+                                    padding: EdgeInsets.symmetric(horizontal: 20.0, vertical: 14.0),
-                                        horizontal: 20.0, vertical: 14.0),
                                     child: FittedBox(
                                       child: Text(
                                         'Transaction History',
@@ -238,10 +200,7 @@ class _BudgetOverviewScreenState extends ConsumerState<BudgetOverviewScreen> {
                                 ),
                                 onTap: () {
                                   Navigator.push(
-                                      context,
+                                      context, MaterialPageRoute(builder: (context) => const TransactionsListview()));
-                                      MaterialPageRoute(
-                                          builder: (context) =>
-                                              const TransactionsListview()));
                                 },
                               ),
                             ),
@@ -292,8 +251,7 @@ class _BudgetOverviewScreenState extends ConsumerState<BudgetOverviewScreen> {
             child: IconButton(
               icon: const Icon(Icons.loop),
               color: Styles.seaweedGreen,
-              onPressed: () =>
+              onPressed: () => ref.read(dashboardProvider.notifier).fetchDashboard(),
-                  ref.read(dashboardProvider.notifier).fetchDashboard(),
             ),
           ),
         ),

lib/features/budget/screens/transactions_listview.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:helpers/helpers/misc_build/build_media.dart';
 import 'package:rluv/features/budget/widgets/transaction_list_item.dart';
 import 'package:rluv/global/styles.dart';
 import 'package:rluv/models/transaction_model.dart';
@@ -12,8 +11,7 @@ class TransactionsListview extends ConsumerStatefulWidget {
   const TransactionsListview({super.key});
 
   @override
-  ConsumerState<TransactionsListview> createState() =>
+  ConsumerState<TransactionsListview> createState() => _TransactionsListviewState();
-      _TransactionsListviewState();
 }
 
 class _TransactionsListviewState extends ConsumerState<TransactionsListview> {
@@ -23,8 +21,7 @@ class _TransactionsListviewState extends ConsumerState<TransactionsListview> {
   void initState() {
     // TODO: implement initState
     WidgetsBinding.instance.addPostFrameCallback((_) {
-      ref.read(selectedTransactionSortProvider.notifier).state =
+      ref.read(selectedTransactionSortProvider.notifier).state = TransactionSort.all;
-          TransactionSort.all;
       ref.read(selectedSortDateProvider.notifier).state = SortDate.decending;
     });
     super.initState();
@@ -34,8 +31,8 @@ class _TransactionsListviewState extends ConsumerState<TransactionsListview> {
   Widget build(BuildContext context) {
     final budgetCategories = ref.watch(budgetCategoriesProvider);
     if (ref.read(selectedCategory) == null && budgetCategories.isNotEmpty) {
-      WidgetsBinding.instance.addPostFrameCallback((_) =>
+      WidgetsBinding.instance
-          ref.read(selectedCategory.notifier).state = budgetCategories.first);
+          .addPostFrameCallback((_) => ref.read(selectedCategory.notifier).state = budgetCategories.first);
     }
     final sortType = ref.watch(selectedTransactionSortProvider);
     final sortDate = ref.watch(selectedSortDateProvider);
@@ -60,8 +57,7 @@ class _TransactionsListviewState extends ConsumerState<TransactionsListview> {
         if (ref.read(selectedCategory) != null) {
           transactions = transactions
               .where(
-                (element) =>
+                (element) => element.budgetCategoryId == ref.read(selectedCategory)!.id,
-                    element.budgetCategoryId == ref.read(selectedCategory)!.id,
               )
               .toList();
         }
@@ -79,15 +75,15 @@ class _TransactionsListviewState extends ConsumerState<TransactionsListview> {
         break;
     }
 
-    WidgetsBinding.instance.addPostFrameCallback((_) =>
+    WidgetsBinding.instance
-        ref.read(transactionHistoryListProvider.notifier).state = transactions);
+        .addPostFrameCallback((_) => ref.read(transactionHistoryListProvider.notifier).state = transactions);
     return Scaffold(
       endDrawer: Drawer(
         backgroundColor: Styles.purpleNurple,
         child: SafeArea(
           child: Column(
             children: [
-              SizedBox(height: BuildMedia(context).height * 0.15),
+              SizedBox(height: MediaQuery.of(context).size.height * 0.15),
               DropdownButton<TransactionSort>(
                   dropdownColor: Styles.lavender,
                   value: ref.watch(selectedTransactionSortProvider),
@@ -108,8 +104,7 @@ class _TransactionsListviewState extends ConsumerState<TransactionsListview> {
                       .toList(),
                   onChanged: (TransactionSort? value) {
                     if (value != null) {
-                      ref.read(selectedTransactionSortProvider.notifier).state =
+                      ref.read(selectedTransactionSortProvider.notifier).state = value;
-                          value;
                     }
                   }),
               const SizedBox(height: 20),
@@ -137,8 +132,7 @@ class _TransactionsListviewState extends ConsumerState<TransactionsListview> {
                     }
                   }),
               const SizedBox(height: 20),
-              if (ref.read(selectedTransactionSortProvider) ==
+              if (ref.read(selectedTransactionSortProvider) == TransactionSort.category)
-                  TransactionSort.category)
                 DropdownButton<BudgetCategory>(
                   dropdownColor: Styles.lavender,
                   value: ref.watch(selectedCategory),
@@ -154,8 +148,7 @@ class _TransactionsListviewState extends ConsumerState<TransactionsListview> {
                                 width: 18,
                                 decoration: BoxDecoration(
                                   shape: BoxShape.circle,
-                                  border: Border.all(
+                                  border: Border.all(color: Colors.black, width: 1.5),
-                                      color: Colors.black, width: 1.5),
                                   color: e.color,
                                 ),
                               ),
@@ -186,9 +179,7 @@ class _TransactionsListviewState extends ConsumerState<TransactionsListview> {
                 alignment: Alignment.topLeft,
                 child: Padding(
                   padding: const EdgeInsets.only(left: 8.0, top: 16.0),
-                  child: IconButton(
+                  child: IconButton(icon: const Icon(Icons.chevron_left), onPressed: () => Navigator.pop(context)),
-                      icon: const Icon(Icons.chevron_left),
-                      onPressed: () => Navigator.pop(context)),
                 ),
               ),
               const Center(
@@ -201,14 +192,11 @@ class _TransactionsListviewState extends ConsumerState<TransactionsListview> {
                   Row(mainAxisAlignment: MainAxisAlignment.center, children: [
                     Padding(
                       padding: const EdgeInsets.only(left: 8.0, top: 16.0),
-                      child: IconButton(
+                      child: IconButton(icon: const Icon(Icons.chevron_left), onPressed: () => Navigator.pop(context)),
-                          icon: const Icon(Icons.chevron_left),
-                          onPressed: () => Navigator.pop(context)),
                     ),
                     const Spacer(),
                     const Padding(
-                      padding:
+                      padding: EdgeInsets.symmetric(vertical: 18.0, horizontal: 0.0),
-                          EdgeInsets.symmetric(vertical: 18.0, horizontal: 0.0),
                       child: Text(
                         'Transaction History',
                         style: TextStyle(fontSize: 28),
@@ -245,8 +233,7 @@ class _TransactionsListviewState extends ConsumerState<TransactionsListview> {
   }
 
   void toggleDrawer() {
-    if (scaffoldKey.currentState != null &&
+    if (scaffoldKey.currentState != null && scaffoldKey.currentState!.isDrawerOpen) {
-        scaffoldKey.currentState!.isDrawerOpen) {
       scaffoldKey.currentState!.openDrawer();
     } else if (scaffoldKey.currentState != null) {
       scaffoldKey.currentState!.openEndDrawer();
@@ -292,8 +279,7 @@ final selectedTransactionSortProvider = StateProvider<TransactionSort>(
   (ref) => TransactionSort.all,
 );
 
-final selectedSortDateProvider =
+final selectedSortDateProvider = StateProvider<SortDate>((ref) => SortDate.decending);
-    StateProvider<SortDate>((ref) => SortDate.decending);
 
 final transactionHistoryListProvider = StateProvider<List<Transaction>>(
   (ref) => [],

lib/features/budget/widgets/add_budget_category_dialog.dart

@@ -1,7 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:helpers/helpers/misc_build/build_media.dart';
-import 'package:helpers/helpers/print.dart';
 import 'package:rluv/global/styles.dart';
 import 'package:rluv/models/budget.dart';
 import 'package:rluv/models/budget_category_model.dart';
@@ -17,12 +15,10 @@ class BudgetCategoryDialog extends ConsumerStatefulWidget {
   final BudgetCategory? category;
 
   @override
-  ConsumerState<BudgetCategoryDialog> createState() =>
+  ConsumerState<BudgetCategoryDialog> createState() => _AddBudgetCategoryDialogState();
-      _AddBudgetCategoryDialogState();
 }
 
-class _AddBudgetCategoryDialogState
+class _AddBudgetCategoryDialogState extends ConsumerState<BudgetCategoryDialog> {
-    extends ConsumerState<BudgetCategoryDialog> {
   late final Budget? budget;
   final categoryNameController = TextEditingController();
   final amountController = TextEditingController();
@@ -65,12 +61,11 @@ class _AddBudgetCategoryDialogState
       return Container();
     }
     return SizedBox(
-      width: BuildMedia(context).width * Styles.dialogScreenWidthFactor,
+      width: MediaQuery.of(context).size.width * Styles.dialogScreenWidthFactor,
       child: Stack(
         children: [
           Padding(
-            padding:
+            padding: const EdgeInsets.symmetric(vertical: 18.0, horizontal: 32.0),
-                const EdgeInsets.symmetric(vertical: 18.0, horizontal: 32.0),
             child: Form(
               key: formKey,
               child: Column(
@@ -78,9 +73,7 @@ class _AddBudgetCategoryDialogState
                 children: [
                   Padding(
                     padding: const EdgeInsets.only(bottom: 18.0),
-                    child: Text(widget.category == null
+                    child: Text(widget.category == null ? 'Add Category:' : 'Edit Category'),
-                        ? 'Add Category:'
-                        : 'Edit Category'),
                   ),
                   Row(
                     mainAxisAlignment: MainAxisAlignment.spaceEvenly,
@@ -149,8 +142,7 @@ class _AddBudgetCategoryDialogState
                     ],
                   ),
                   Padding(
-                    padding: const EdgeInsets.symmetric(
+                    padding: const EdgeInsets.symmetric(vertical: 6.0, horizontal: 16.0),
-                        vertical: 6.0, horizontal: 16.0),
                     child: SizedBox(
                       height: 76,
                       child: ListView.builder(
@@ -164,23 +156,21 @@ class _AddBudgetCategoryDialogState
                               } else {
                                 setState(() => selectedColorIndex = -1);
                               }
-                              printBlue(selectedColorIndex);
+                              print(selectedColorIndex);
                             },
                             child: Padding(
                               padding: const EdgeInsets.all(8.0),
                               child: AnimatedContainer(
                                 decoration: selectedColorIndex == index
                                     ? BoxDecoration(
-                                        borderRadius:
+                                        borderRadius: BorderRadius.circular(15.0),
-                                            BorderRadius.circular(15.0),
                                         border: Border.all(
                                           color: Styles.washedStone,
                                           width: 2.0,
                                         ),
                                       )
                                     : BoxDecoration(
-                                        borderRadius:
+                                        borderRadius: BorderRadius.circular(5.0),
-                                            BorderRadius.circular(5.0),
                                         border: Border.all(
                                           color: Colors.transparent,
                                           width: 2.0,
@@ -205,8 +195,7 @@ class _AddBudgetCategoryDialogState
                                         decoration: BoxDecoration(
                                           color: colors[index],
                                           shape: BoxShape.circle,
-                                          border: Border.all(
+                                          border: Border.all(color: Colors.black, width: 1.5),
-                                              color: Colors.black, width: 1.5),
                                         ),
                                       ),
                                     ],
@@ -227,8 +216,7 @@ class _AddBudgetCategoryDialogState
                         color: Styles.expensesRed,
                         text: 'DELETE',
                         onPressed: () {
-                          if (formKey.currentState != null &&
+                          if (formKey.currentState != null && formKey.currentState!.validate()) {
-                              formKey.currentState!.validate()) {
                             removeCategory().then((success) {
                               Navigator.pop(context);
                               if (success) {
@@ -254,8 +242,7 @@ class _AddBudgetCategoryDialogState
                     color: Styles.lavender,
                     text: 'SAVE',
                     onPressed: () {
-                      if (formKey.currentState != null &&
+                      if (formKey.currentState != null && formKey.currentState!.validate()) {
-                          formKey.currentState!.validate()) {
                         submitCategory(colors[selectedColorIndex]).then((_) {
                           Navigator.pop(context);
                           showSnack(
@@ -282,7 +269,7 @@ class _AddBudgetCategoryDialogState
 
   Future submitCategory(Color categoryColor) async {
     if (formKey.currentState != null && !formKey.currentState!.validate()) {
-      printPink('Failed validation');
+      print('Failed validation');
       return;
     }
     Map<String, dynamic>? budgetData;
@@ -296,58 +283,41 @@ class _AddBudgetCategoryDialogState
         name: categoryNameController.text,
       );
 
-      budgetData = await ref
+      budgetData = await ref.read(apiProvider.notifier).post(path: 'budget_category', data: newBudget.toJson());
-          .read(apiProvider.notifier)
-          .post(path: 'budget_category', data: newBudget.toJson());
       success = budgetData != null ? budgetData['success'] as bool : false;
       if (success) {
-        ref
+        ref.read(dashboardProvider.notifier).add({'budget_categories': budgetData});
-            .read(dashboardProvider.notifier)
-            .add({'budget_categories': budgetData});
       }
     } else {
-      final newBudget =
+      final newBudget = BudgetCategory.copyWith(category: widget.category!, data: {
-          BudgetCategory.copyWith(category: widget.category!, data: {
         'amount': double.parse(amountController.text),
         'color': categoryColor,
         'name': categoryNameController.text
       });
-      budgetData = await ref
+      budgetData = await ref.read(apiProvider.notifier).put(path: 'budget_category', data: newBudget.toJson());
-          .read(apiProvider.notifier)
-          .put(path: 'budget_category', data: newBudget.toJson());
       success = budgetData != null ? budgetData['success'] as bool : false;
       if (success) {
-        ref
+        ref.read(dashboardProvider.notifier).update({'budget_categories': budgetData});
-            .read(dashboardProvider.notifier)
-            .update({'budget_categories': budgetData});
       }
     }
     if (success) {
       showSnack(
           ref: ref,
-          text: widget.category == null
+          text: widget.category == null ? 'Added budget category!' : 'Updated category!',
-              ? 'Added budget category!'
-              : 'Updated category!',
           type: SnackType.error);
     } else {
       showSnack(
           ref: ref,
-          text: widget.category == null
+          text: widget.category == null ? 'Could not add budget category' : 'Could not update category',
-              ? 'Could not add budget category'
-              : 'Could not update category',
           type: SnackType.error);
     }
   }
 
   Future<bool> removeCategory() async {
-    final res = await ref
+    final res = await ref.read(apiProvider.notifier).delete(path: 'budget_category', data: {'id': widget.category!.id});
-        .read(apiProvider.notifier)
-        .delete(path: 'budget_category', data: {'id': widget.category!.id});
     final success = res != null ? res['success'] as bool : false;
     if (success) {
-      ref
+      ref.read(dashboardProvider.notifier).removeWithId('budget_categories', widget.category!.id!);
-          .read(dashboardProvider.notifier)
-          .removeWithId('budget_categories', widget.category!.id!);
     }
     return success;
   }

lib/features/budget/widgets/add_transaction_dialog.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:helpers/helpers/misc_build/build_media.dart';
 import 'package:rluv/global/utils.dart';
 
 import '../../../global/api.dart';
@@ -18,8 +17,7 @@ class TransactionDialog extends ConsumerStatefulWidget {
   final Transaction? transaction;
 
   @override
-  ConsumerState<TransactionDialog> createState() =>
+  ConsumerState<TransactionDialog> createState() => _AddTransactionDialogState();
-      _AddTransactionDialogState();
 }
 
 class _AddTransactionDialogState extends ConsumerState<TransactionDialog> {
@@ -37,8 +35,7 @@ class _AddTransactionDialogState extends ConsumerState<TransactionDialog> {
   @override
   void initState() {
     if (widget.transaction != null) {
-      amountController =
+      amountController = TextEditingController(text: widget.transaction!.amount.toString());
-          TextEditingController(text: widget.transaction!.amount.toString());
       memoController = TextEditingController(text: widget.transaction!.memo);
       transactionType = widget.transaction!.type;
       selectedDate = widget.transaction!.date;
@@ -53,8 +50,7 @@ class _AddTransactionDialogState extends ConsumerState<TransactionDialog> {
     }
     final u = ref.read(userProvider);
     if (u == null) {
-      WidgetsBinding.instance.addPostFrameCallback(
+      WidgetsBinding.instance.addPostFrameCallback((_) => ref.read(jwtProvider.notifier).revokeToken());
-          (_) => ref.read(jwtProvider.notifier).revokeToken());
     } else {
       user = u;
     }
@@ -65,10 +61,9 @@ class _AddTransactionDialogState extends ConsumerState<TransactionDialog> {
   @override
   Widget build(BuildContext context) {
     if (user == null) return Container();
-    final List<BudgetCategory> budgetCategories =
+    final List<BudgetCategory> budgetCategories = ref.read(budgetCategoriesProvider);
-        ref.read(budgetCategoriesProvider);
     return SizedBox(
-        width: BuildMedia(context).width * Styles.dialogScreenWidthFactor,
+        width: MediaQuery.of(context).size.width * Styles.dialogScreenWidthFactor,
         child: budgetCategories.isEmpty
             ? const Padding(
                 padding: EdgeInsets.all(8.0),
@@ -91,25 +86,21 @@ class _AddTransactionDialogState extends ConsumerState<TransactionDialog> {
                               onTap: transactionType == TransactionType.expense
                                   ? null
                                   : () {
-                                      setState(() => transactionType =
+                                      setState(() => transactionType = TransactionType.expense);
-                                          TransactionType.expense);
                                     },
                               child: AnimatedContainer(
                                 height: 38,
                                 width: 80,
                                 decoration: BoxDecoration(
                                     borderRadius: const BorderRadius.only(
-                                        topLeft: Radius.circular(8.0),
+                                        topLeft: Radius.circular(8.0), topRight: Radius.circular(8.0)),
-                                        topRight: Radius.circular(8.0)),
+                                    color: transactionType == TransactionType.expense
-                                    color: transactionType ==
-                                            TransactionType.expense
                                         ? Styles.lavender
                                         : Styles.washedStone),
                                 duration: const Duration(milliseconds: 300),
                                 child: const Padding(
                                   padding: EdgeInsets.all(8.0),
-                                  child: Text('Expense',
+                                  child: Text('Expense', style: TextStyle(fontSize: 16)),
-                                      style: TextStyle(fontSize: 16)),
                                 ),
                               ),
                             ),
@@ -117,25 +108,20 @@ class _AddTransactionDialogState extends ConsumerState<TransactionDialog> {
                             onTap: transactionType == TransactionType.income
                                 ? null
                                 : () {
-                                    setState(() => transactionType =
+                                    setState(() => transactionType = TransactionType.income);
-                                        TransactionType.income);
                                   },
                             child: AnimatedContainer(
                               height: 38,
                               width: 80,
                               decoration: BoxDecoration(
                                   borderRadius: const BorderRadius.only(
-                                      topLeft: Radius.circular(8.0),
+                                      topLeft: Radius.circular(8.0), topRight: Radius.circular(8.0)),
-                                      topRight: Radius.circular(8.0)),
                                   color:
-                                      transactionType == TransactionType.income
+                                      transactionType == TransactionType.income ? Styles.lavender : Styles.washedStone),
-                                          ? Styles.lavender
-                                          : Styles.washedStone),
                               duration: const Duration(milliseconds: 300),
                               child: const Padding(
                                 padding: EdgeInsets.all(8.0),
-                                child: Text('Income',
+                                child: Text('Income', style: TextStyle(fontSize: 16)),
-                                    style: TextStyle(fontSize: 16)),
                               ),
                             ),
                           ),
@@ -208,9 +194,7 @@ class _AddTransactionDialogState extends ConsumerState<TransactionDialog> {
                                                     width: 18,
                                                     decoration: BoxDecoration(
                                                       shape: BoxShape.circle,
-                                                      border: Border.all(
+                                                      border: Border.all(color: Colors.black, width: 1.5),
-                                                          color: Colors.black,
-                                                          width: 1.5),
                                                       color: e.color,
                                                     ),
                                                   ),
@@ -226,8 +210,7 @@ class _AddTransactionDialogState extends ConsumerState<TransactionDialog> {
                                           if (kDebugMode) {
                                             print('${value.name} selected');
                                           }
-                                          setState(() =>
+                                          setState(() => selectedBudgetCategory = value);
-                                              selectedBudgetCategory = value);
                                         }
                                       },
                                     ),
@@ -247,7 +230,7 @@ class _AddTransactionDialogState extends ConsumerState<TransactionDialog> {
                       ),
                     ),
                     Container(
-                      width: BuildMedia(context).width * 0.65,
+                      width: MediaQuery.of(context).size.width * 0.65,
                       height: 100,
                       decoration: Styles.boxLavenderBubble,
                       child: TextFormField(
@@ -266,12 +249,12 @@ class _AddTransactionDialogState extends ConsumerState<TransactionDialog> {
                       text: 'ADD',
                       color: Styles.lavender,
                       onPressed: () => submitTransaction().then((_) {
-                        Navigator.pop(context);
+                        if (mounted) {
+                          Navigator.pop(context);
+                        }
                         showSnack(
                           ref: ref,
-                          text: widget.transaction != null
+                          text: widget.transaction != null ? 'Transaction updated!' : 'Transaction added!',
-                              ? 'Transaction updated!'
-                              : 'Transaction added!',
                           type: SnackType.success,
                         );
                       }),
@@ -289,9 +272,7 @@ class _AddTransactionDialogState extends ConsumerState<TransactionDialog> {
           data: Transaction.copyWith(widget.transaction!, {
             'memo': memoController.text.isNotEmpty ? memoController.text : null,
             'amount': double.parse(amountController.text),
-            'budget_category_id': transactionType == TransactionType.income
+            'budget_category_id': transactionType == TransactionType.income ? null : selectedBudgetCategory.id,
-                ? null
-                : selectedBudgetCategory.id,
           }).toJson());
     } else {
       data = await ref.read(apiProvider.notifier).post(
@@ -299,15 +280,11 @@ class _AddTransactionDialogState extends ConsumerState<TransactionDialog> {
           data: Transaction(
                   amount: double.parse(amountController.text),
                   createdByUserId: user!.id!,
-                  budgetCategoryId: transactionType == TransactionType.income
+                  budgetCategoryId: transactionType == TransactionType.income ? null : selectedBudgetCategory.id,
-                      ? null
-                      : selectedBudgetCategory.id,
                   budgetId: user!.budgetId,
                   date: DateTime.now(),
                   type: transactionType,
-                  memo: memoController.text.isNotEmpty
+                  memo: memoController.text.isNotEmpty ? memoController.text : null)
-                      ? memoController.text
-                      : null)
               .toJson());
     }
     final success = data != null ? data['success'] as bool : false;
@@ -320,9 +297,7 @@ class _AddTransactionDialogState extends ConsumerState<TransactionDialog> {
     } else {
       showSnack(
           ref: ref,
-          text: widget.transaction != null
+          text: widget.transaction != null ? 'Failed to edit transaction' : 'Failed to add transaction',
-              ? 'Failed to edit transaction'
-              : 'Failed to add transaction',
           type: SnackType.error);
     }
   }

lib/features/budget/widgets/budget_category_bar.dart

@@ -1,7 +1,6 @@
 import 'dart:math';
 
 import 'package:flutter/material.dart';
-import 'package:helpers/helpers/print.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';
@@ -45,8 +44,7 @@ class _BudgetCategoryBarState extends State<BudgetCategoryBar> {
       }
     });
     final innerHeight = widget.height - widget.innerPadding * 2;
-    final isBright =
+    final isBright = getBrightness(widget.budgetCategory.color) == Brightness.light;
-        getBrightness(widget.budgetCategory.color) == Brightness.light;
     final textStyle = TextStyle(
         fontSize: 14,
         fontWeight: FontWeight.bold,
@@ -155,7 +153,6 @@ class _BudgetCategoryBarState extends State<BudgetCategoryBar> {
     if (!name.contains(' ') || name.indexOf(' ') == name.length - 1) {
       return name;
     }
-    printLime('here');
     final words = name.split(' ');
     int index = 0;
     String firstLine = words[index];

lib/features/budget/widgets/budget_net_bar.dart

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

lib/features/budget/widgets/transaction_list_item.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:helpers/helpers/misc_build/build_media.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';
@@ -19,8 +18,7 @@ class TransactionListItem extends ConsumerStatefulWidget {
   final int index;
 
   @override
-  ConsumerState<TransactionListItem> createState() =>
+  ConsumerState<TransactionListItem> createState() => _TransactionListItemState();
-      _TransactionListItemState();
 }
 
 class _TransactionListItemState extends ConsumerState<TransactionListItem> {
@@ -54,17 +52,13 @@ class _TransactionListItemState extends ConsumerState<TransactionListItem> {
       child: Padding(
         padding: const EdgeInsets.only(top: 8.0, left: 8.0, bottom: 8.0),
         child: ClipRRect(
-          borderRadius: const BorderRadius.only(
+          borderRadius: const BorderRadius.only(topLeft: Radius.circular(10.0), bottomLeft: Radius.circular(10.0)),
-              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(
+              borderRadius: BorderRadius.only(topLeft: Radius.circular(10.0), bottomLeft: Radius.circular(10.0)),
-                  topLeft: Radius.circular(10.0),
-                  bottomLeft: Radius.circular(10.0)),
               color: Styles.washedStone,
             ),
             child: Row(
@@ -74,19 +68,16 @@ class _TransactionListItemState extends ConsumerState<TransactionListItem> {
                     duration: const Duration(milliseconds: 200),
                     height: cardHeight,
                     width: 6,
-                    color: transaction!.type == TransactionType.income
+                    color: transaction!.type == TransactionType.income ? Styles.incomeBlue : Styles.expensesOrange),
-                        ? Styles.incomeBlue
-                        : Styles.expensesOrange),
                 SizedBox(
-                  width: BuildMedia(context).width * 0.65,
+                  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')
+                        Text(DateFormat('EEE MMM d, h:mm a').format(transaction!.date)),
-                            .format(transaction!.date)),
                         Row(
                           children: [
                             const SizedBox(
@@ -101,9 +92,7 @@ class _TransactionListItemState extends ConsumerState<TransactionListItem> {
                               ),
                             ],
                             Text(
-                              transaction!.type == TransactionType.income
+                              transaction!.type == TransactionType.income ? 'Income' : budgetCategory!.name,
-                                  ? 'Income'
-                                  : budgetCategory!.name,
                               style: const TextStyle(fontSize: 20),
                             ),
                           ],
@@ -125,9 +114,7 @@ class _TransactionListItemState extends ConsumerState<TransactionListItem> {
                       transaction!.amount.currency(),
                       style: TextStyle(
                           fontSize: 24,
-                          color: transaction!.type == TransactionType.income
+                          color: transaction!.type == TransactionType.income ? Styles.incomeGreen : Styles.expensesRed),
-                              ? Styles.incomeGreen
-                              : Styles.expensesRed),
                     ),
                     if (showDetails) ...[
                       IconButton(
@@ -140,8 +127,7 @@ class _TransactionListItemState extends ConsumerState<TransactionListItem> {
                             builder: (context) => Dialog(
                               backgroundColor: Styles.dialogColor,
                               shape: Styles.dialogShape,
-                              child:
+                              child: TransactionDialog(transaction: transaction),
-                                  TransactionDialog(transaction: transaction),
                             ),
                           );
                         },
@@ -182,21 +168,14 @@ class _TransactionListItemState extends ConsumerState<TransactionListItem> {
   }
 
   Future deleteTransaction() async {
-    final res = await ref
+    final res = await ref.read(apiProvider.notifier).delete(path: 'transaction', data: {'id': transaction!.id});
-        .read(apiProvider.notifier)
-        .delete(path: 'transaction', data: {'id': transaction!.id});
 
     final success = res != null ? res['success'] as bool : false;
     if (success) {
-      ref
+      ref.read(dashboardProvider.notifier).removeWithId('transactions', transaction!.id!);
-          .read(dashboardProvider.notifier)
-          .removeWithId('transactions', transaction!.id!);
       showSnack(ref: ref, text: 'Transaction removed', type: SnackType.success);
     } else {
-      showSnack(
+      showSnack(ref: ref, text: 'Could not delete transaction', type: SnackType.error);
-          ref: ref,
-          text: 'Could not delete transaction',
-          type: SnackType.error);
     }
   }
 }

lib/features/notes/screens/notes_screen.dart

@@ -1,8 +1,6 @@
 import 'package:dio/dio.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:helpers/helpers/misc_build/build_media.dart';
-import 'package:helpers/helpers/print.dart';
 import 'package:rluv/global/utils.dart';
 import 'package:rluv/models/shared_note.dart';
 
@@ -22,7 +20,7 @@ class SharedNotesScreen extends ConsumerStatefulWidget {
 class _SharedNotesScreenState extends ConsumerState<SharedNotesScreen> {
   @override
   Widget build(BuildContext context) {
-    final screen = BuildMedia(context).size;
+    final screen = MediaQuery.of(context).size;
     final sharedNotes = ref.watch(sharedNotesProvider);
     return Column(
       children: [
@@ -47,14 +45,10 @@ class _SharedNotesScreenState extends ConsumerState<SharedNotesScreen> {
               ),
               itemBuilder: (BuildContext context, int index) {
                 final note = sharedNotes[index];
-                final colorBrightness = note.color == null
+                final colorBrightness = note.color == null ? Brightness.light : getBrightness(note.color!);
-                    ? Brightness.light
-                    : getBrightness(note.color!);
                 final textStyle = TextStyle(
                   fontSize: 16.0,
-                  color: colorBrightness == Brightness.light
+                  color: colorBrightness == Brightness.light ? Colors.black54 : Colors.white70,
-                      ? Colors.black54
-                      : Colors.white70,
                 );
                 return Padding(
                   padding: const EdgeInsets.all(8.0),
@@ -67,14 +61,10 @@ class _SharedNotesScreenState extends ConsumerState<SharedNotesScreen> {
                           padding: const EdgeInsets.all(8.0),
                           child: Column(
                             children: [
-                              FittedBox(
+                              FittedBox(child: Text(note.title, style: const TextStyle(fontSize: 20))),
-                                  child: Text(note.title,
-                                      style: const TextStyle(fontSize: 20))),
                               Flexible(
                                 child: Text(
-                                  note.content.length > 80
+                                  note.content.length > 80 ? "${note.content.substring(0, 75)}..." : note.content,
-                                      ? "${note.content.substring(0, 75)}..."
-                                      : note.content,
                                   style: textStyle,
                                 ),
                               ),
@@ -93,9 +83,7 @@ class _SharedNotesScreenState extends ConsumerState<SharedNotesScreen> {
                           context: context,
                           builder: (BuildContext context) {
                             return Padding(
-                              padding: EdgeInsets.only(
+                              padding: EdgeInsets.only(bottom: MediaQuery.of(context).viewInsets.bottom),
-                                  bottom:
-                                      MediaQuery.of(context).viewInsets.bottom),
                               child: NoteBottomSheet(
                                 index: index,
                               ),
@@ -121,8 +109,7 @@ class _SharedNotesScreenState extends ConsumerState<SharedNotesScreen> {
                     context: context,
                     builder: (BuildContext context) {
                       return Padding(
-                        padding: EdgeInsets.only(
+                        padding: EdgeInsets.only(bottom: MediaQuery.of(context).viewInsets.bottom),
-                            bottom: MediaQuery.of(context).viewInsets.bottom),
                         child: const NoteBottomSheet(
                           index: null,
                         ),
@@ -182,19 +169,14 @@ class _NoteBottomSheetState extends ConsumerState<NoteBottomSheet> {
 
   @override
   Widget build(BuildContext context) {
-    final screen = BuildMedia(context).size;
+    final screen = MediaQuery.of(context).size;
     return Container(
       width: screen.width,
       decoration: BoxDecoration(
           color: newNote.color ?? Styles.washedStone,
-          borderRadius: const BorderRadius.only(
+          borderRadius: const BorderRadius.only(topLeft: Radius.circular(20.0), topRight: Radius.circular(20.0)),
-              topLeft: Radius.circular(20.0), topRight: Radius.circular(20.0)),
           boxShadow: const [
-            BoxShadow(
+            BoxShadow(color: Colors.black26, spreadRadius: 5.0, blurRadius: 2.0, offset: Offset(0, -2))
-                color: Colors.black26,
-                spreadRadius: 5.0,
-                blurRadius: 2.0,
-                offset: Offset(0, -2))
           ]),
       child: Padding(
         padding: const EdgeInsets.all(16.0),
@@ -218,8 +200,7 @@ class _NoteBottomSheetState extends ConsumerState<NoteBottomSheet> {
               // decoration: Styles.inputLavenderBubble(),
             ),
             Padding(
-              padding:
+              padding: const EdgeInsets.symmetric(vertical: 28.0, horizontal: 36.0),
-                  const EdgeInsets.symmetric(vertical: 28.0, horizontal: 36.0),
               child: UiButton(
                 onPressed: !noteChanged(oldNote, newNote)
                     ? null
@@ -229,41 +210,26 @@ class _NoteBottomSheetState extends ConsumerState<NoteBottomSheet> {
                         try {
                           Response? res;
                           if (widget.index == null) {
-                            res = await ref
+                            res = await ref.read(apiProvider).post('shared_note', data: newNote.toJson());
-                                .read(apiProvider)
-                                .post('shared_note', data: newNote.toJson());
                           } else {
-                            res = await ref
+                            res = await ref.read(apiProvider).put('shared_note', data: newNote.toJson());
-                                .read(apiProvider)
-                                .put('shared_note', data: newNote.toJson());
                           }
                           if (res.data != null && res.data['success']) {
                             if (widget.index == null) {
-                              ref
+                              ref.read(dashboardProvider.notifier).add({'shared_notes': res.data});
-                                  .read(dashboardProvider.notifier)
-                                  .add({'shared_notes': res.data});
                             } else {
-                              ref
+                              ref.read(dashboardProvider.notifier).update({'shared_notes': res.data});
-                                  .read(dashboardProvider.notifier)
-                                  .update({'shared_notes': res.data});
                             }
-                            showSnack(
+                            showSnack(ref: ref, text: 'Added note', type: SnackType.success);
-                                ref: ref,
-                                text: 'Added note',
-                                type: SnackType.success);
                           } else {
                             showSnack(
                                 ref: ref,
-                                text: res.data['message'] ??
+                                text: res.data['message'] ?? 'Unexpected error occurred',
-                                    'Unexpected error occurred',
                                 type: SnackType.error);
                           }
                         } catch (err) {
-                          showSnack(
+                          showSnack(ref: ref, text: 'Unexpected error occurred', type: SnackType.error);
-                              ref: ref,
+                          print(err);
-                              text: 'Unexpected error occurred',
-                              type: SnackType.error);
-                          printRed(err);
                         }
                         // ignore: use_build_context_synchronously
                         Navigator.pop(context);

lib/global/api.dart

@@ -3,7 +3,6 @@ import 'dart:convert';
 import 'package:dio/dio.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:helpers/helpers/print.dart';
 import 'package:jwt_decoder/jwt_decoder.dart';
 import 'package:rluv/global/store.dart';
 
@@ -11,7 +10,7 @@ import '../models/token.dart';
 
 final tokenProvider = StateProvider<Token?>((ref) {
   final jwt = ref.watch(jwtProvider);
-  printLime('Current token: $jwt');
+  print('Current token: $jwt');
   if (jwt == null) return null;
   try {
     return Token.fromJson(JwtDecoder.decode(jwt));
@@ -37,12 +36,12 @@ class _JwtNotifier extends StateNotifier<String?> {
 
   void setToken(String jwt) {
     state = jwt;
-    printCyan('Loaded jwt into client: $jwt');
+    print('Loaded jwt into client: $jwt');
     ref.read(prefsProvider)?.setString('jwt', jwt);
   }
 
   void revokeToken() {
-    printCyan('jwt token revoked');
+    print('jwt token revoked');
     state = null;
     ref.read(prefsProvider)?.remove('jwt');
   }
@@ -58,8 +57,7 @@ class _ApiNotifier extends StateNotifier<Dio> {
     // dio.options.baseUrl = "http://localhost:8081/";
     dio.options.baseUrl = "https://rluv.fosscat.com/";
     dio.interceptors.addAll([
-      InterceptorsWrapper(onRequest:
+      InterceptorsWrapper(onRequest: (RequestOptions options, RequestInterceptorHandler handler) {
-          (RequestOptions options, RequestInterceptorHandler handler) {
         final jwt = ref.read(jwtProvider);
         if (jwt != null) {
           options.headers['token'] = jwt;
@@ -69,12 +67,10 @@ class _ApiNotifier extends StateNotifier<Dio> {
         if (response.statusCode != null) {
           if (response.statusCode == 200) {
             try {
-              if ((response.data as Map<String, dynamic>)
+              if ((response.data as Map<String, dynamic>).containsKey('success')) {
-                  .containsKey('success')) {
                 if (!response.data['success']) return handler.next(response);
               }
-              if ((response.data as Map<String, dynamic>)
+              if ((response.data as Map<String, dynamic>).containsKey('token')) {
-                  .containsKey('token')) {
                 final jwt = response.data['token'];
                 if (jwt != null) {
                   ref.read(jwtProvider.notifier).setToken(jwt);
@@ -83,7 +79,7 @@ class _ApiNotifier extends StateNotifier<Dio> {
                 }
               }
             } catch (err) {
-              printRed('Error in interceptor for token: $err');
+              print('Error in interceptor for token: $err');
               return handler.next(response);
             }
           }
@@ -115,8 +111,7 @@ class _ApiNotifier extends StateNotifier<Dio> {
     }
   }
 
-  Future<Map<String, dynamic>?> put(
+  Future<Map<String, dynamic>?> put({required String path, Object? data}) async {
-      {required String path, Object? data}) async {
     try {
       final res = await dio.put(path, data: data);
 
@@ -129,8 +124,7 @@ class _ApiNotifier extends StateNotifier<Dio> {
     }
   }
 
-  Future<Map<String, dynamic>?> post(
+  Future<Map<String, dynamic>?> post({required String path, Object? data}) async {
-      {required String path, Object? data}) async {
     try {
       final res = await dio.post(path, data: data);
 
@@ -143,8 +137,7 @@ class _ApiNotifier extends StateNotifier<Dio> {
     }
   }
 
-  Future<Map<String, dynamic>?> delete(
+  Future<Map<String, dynamic>?> delete({required String path, Object? data}) async {
-      {required String path, Object? data}) async {
     try {
       final res = await dio.delete(path, data: data);
 
@@ -162,8 +155,7 @@ class _LoggingInterceptor extends Interceptor {
   _LoggingInterceptor();
 
   @override
-  Future onRequest(
+  Future onRequest(RequestOptions options, RequestInterceptorHandler handler) async {
-      RequestOptions options, RequestInterceptorHandler handler) async {
     logPrint('///*** REQUEST ***\\\\\\');
     printKV('URI', options.uri);
     printKV('METHOD', options.method);
@@ -177,7 +169,7 @@ class _LoggingInterceptor extends Interceptor {
 
   @override
   void onError(DioException err, ErrorInterceptorHandler handler) {
-    printRed('///*** ERROR RESPONSE ***\\\\\\');
+    print('///*** ERROR RESPONSE ***\\\\\\');
     logPrint('URI: ${err.requestOptions.uri}');
     if (err.response != null) {
       logPrint('STATUS CODE: ${err.response?.statusCode?.toString()}');
@@ -192,8 +184,7 @@ class _LoggingInterceptor extends Interceptor {
   }
 
   @override
-  Future onResponse(
+  Future onResponse(Response response, ResponseInterceptorHandler handler) async {
-      Response response, ResponseInterceptorHandler handler) async {
     logPrint('///*** RESPONSE ***\\\\\\');
     printKV('URI', response.requestOptions.uri);
     printKV('STATUS CODE', response.statusCode ?? '');
@@ -206,7 +197,7 @@ class _LoggingInterceptor extends Interceptor {
 
   void printKV(String key, Object v) {
     if (kDebugMode) {
-      printOrange('$key: $v');
+      print('$key: $v');
     }
   }
 
@@ -215,21 +206,21 @@ class _LoggingInterceptor extends Interceptor {
       final data = (s as Map<String, dynamic>?);
       if (kDebugMode) {
         if (data == null) {
-          printAmber({});
+          print({});
           return;
         }
         JsonEncoder encoder = const JsonEncoder.withIndent('  ');
         String prettyprint = encoder.convert(s);
-        printAmber(prettyprint);
+        print(prettyprint);
       }
     } catch (_) {
-      printAmber(s);
+      print(s);
     }
   }
 
   void logPrint(String s) {
     if (kDebugMode) {
-      printOrange(s);
+      print(s);
     }
   }
 }

lib/global/store.dart

@@ -2,7 +2,6 @@ import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:helpers/helpers/print.dart';
 import 'package:rluv/global/api.dart';
 import 'package:rluv/models/budget.dart';
 import 'package:rluv/models/budget_category_model.dart';
@@ -13,8 +12,7 @@ import '../models/shared_note.dart';
 import '../models/transaction_model.dart';
 import '../models/user.dart';
 
-StateProvider<SharedPreferences?> prefsProvider =
+StateProvider<SharedPreferences?> prefsProvider = StateProvider<SharedPreferences?>((ref) => null);
-    StateProvider<SharedPreferences?>((ref) => null);
 
 // final StateProvider<Token?> tokenProvider = StateProvider<Token?>((ref) {
 //   // final tokenStr = prefs.getString('jwt');
@@ -42,8 +40,7 @@ final Provider<FamilyModel?> familyProvider = Provider<FamilyModel?>(
   },
 );
 
-final Provider<List<BudgetCategory>> budgetCategoriesProvider =
+final Provider<List<BudgetCategory>> budgetCategoriesProvider = Provider<List<BudgetCategory>>((ref) {
-    Provider<List<BudgetCategory>>((ref) {
   final dash = ref.watch(dashboardProvider);
   if (dash == null) return [];
   final categoriesData = dash['budget_categories'] as List<dynamic>;
@@ -55,7 +52,7 @@ final Provider<List<BudgetCategory>> budgetCategoriesProvider =
 
   final prefs = ref.read(prefsProvider);
   final budgetJson = jsonEncode({'budget_categories': categoriesData});
-  printBlue('updated prefs stored categories');
+  print('updated prefs stored categories');
   prefs?.setString('budget_categories', budgetJson);
 
   return categories;
@@ -71,8 +68,7 @@ final Provider<Budget?> budgetProvider = Provider<Budget?>(
   },
 );
 
-final Provider<List<Transaction>> transactionsProvider =
+final Provider<List<Transaction>> transactionsProvider = Provider<List<Transaction>>((ref) {
-    Provider<List<Transaction>>((ref) {
   final dash = ref.watch(dashboardProvider);
   if (dash == null) return [];
   final transactions = dash['transactions'] as List<dynamic>;
@@ -83,8 +79,7 @@ final Provider<List<Transaction>> transactionsProvider =
       .toList();
 });
 
-final Provider<List<SharedNote>> sharedNotesProvider =
+final Provider<List<SharedNote>> sharedNotesProvider = Provider<List<SharedNote>>(
-    Provider<List<SharedNote>>(
   (ref) {
     final dash = ref.watch(dashboardProvider);
     if (dash == null) return [];
@@ -97,8 +92,7 @@ final Provider<List<SharedNote>> sharedNotesProvider =
   },
 );
 
-final dashboardProvider =
+final dashboardProvider = StateNotifierProvider<DashBoardStateNotifier, Map<String, dynamic>?>(
-    StateNotifierProvider<DashBoardStateNotifier, Map<String, dynamic>?>(
   (ref) {
     return DashBoardStateNotifier(ref);
   },
@@ -119,10 +113,10 @@ class DashBoardStateNotifier extends StateNotifier<Map<String, dynamic>?> {
     );
     final token = ref.read(tokenProvider);
     if (token?.familyId == null) {
-      printPink('No token, cannot fetch dashboard');
+      print('No token, cannot fetch dashboard');
       return;
     }
-    printAmber('Fetching dashboard');
+    print('Fetching dashboard');
     state = await ref.read(apiProvider.notifier).get("dashboard");
     WidgetsBinding.instance.addPostFrameCallback(
       (_) => ref.read(loadingStateProvider.notifier).state = false,
@@ -131,7 +125,7 @@ class DashBoardStateNotifier extends StateNotifier<Map<String, dynamic>?> {
 
   void update(Map<String, dynamic> data) {
     if (state == null) {
-      printPink('Cant update data, state is null');
+      print('Cant update data, state is null');
       return;
     }
     if (data.keys.length != 1 || data.values.length != 1) {
@@ -149,16 +143,14 @@ class DashBoardStateNotifier extends StateNotifier<Map<String, dynamic>?> {
             )
             .toList();
         subStateListObj.removeWhere(
-          (element) =>
+          (element) => element['id'] == (data.values.first as Map<String, dynamic>)['id'],
-              element['id'] ==
-              (data.values.first as Map<String, dynamic>)['id'],
         );
         subStateListObj.add(data.values.first);
 
         final newState = state;
         newState![key] = subStateListObj;
         state = {...newState};
-        // printBlue(state);
+        // print(state);
         break;
       default:
         break;
@@ -167,7 +159,7 @@ class DashBoardStateNotifier extends StateNotifier<Map<String, dynamic>?> {
 
   void add(Map<String, dynamic> data) {
     if (state == null) {
-      printPink('Cant add data, state is null');
+      print('Cant add data, state is null');
       return;
     }
     if (data.keys.length != 1 || data.values.length != 1) {
@@ -183,7 +175,7 @@ class DashBoardStateNotifier extends StateNotifier<Map<String, dynamic>?> {
         subStateList.add(data.values.first);
         newState![key] = subStateList;
         state = {...newState};
-        // printBlue(state);
+        // print(state);
         break;
       default:
         break;
@@ -192,7 +184,7 @@ class DashBoardStateNotifier extends StateNotifier<Map<String, dynamic>?> {
 
   void removeWithId(String stateKey, int id) {
     if (state == null) {
-      printPink('Cant remove data, state is null');
+      print('Cant remove data, state is null');
       return;
     }
     switch (stateKey) {
@@ -201,11 +193,10 @@ class DashBoardStateNotifier extends StateNotifier<Map<String, dynamic>?> {
       case 'shared_noted':
         final subStateList = state![stateKey] as List<dynamic>;
         final newState = state;
-        subStateList
+        subStateList.removeWhere((e) => (e as Map<String, dynamic>)['id'] == id);
-            .removeWhere((e) => (e as Map<String, dynamic>)['id'] == id);
         newState![stateKey] = subStateList;
         state = {...newState};
-        // printBlue(state);
+        // print(state);
         break;
       default:
         break;

lib/global/utils.dart

@@ -3,7 +3,6 @@ import 'dart:math';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:helpers/helpers/print.dart';
 import 'package:intl/intl.dart';
 import 'package:rluv/global/styles.dart';
 import 'package:rluv/main.dart';
@@ -20,20 +19,16 @@ bool boolFromJson(int value) => value == 1;
 
 int boolToJson(bool hide) => hide ? 1 : 0;
 
-String colorToJson(Color color) =>
+String colorToJson(Color color) => color.toString().split('(0x')[1].split(')')[0];
-    color.toString().split('(0x')[1].split(')')[0];
 
 Color colorFromJson(String hex) => Color(int.parse(hex, radix: 16));
 
-String? optionalColorToJson(Color? optionalColor) => optionalColor == null
+String? optionalColorToJson(Color? optionalColor) =>
-    ? null
+    optionalColor == null ? null : optionalColor.toString().split('(0x')[1].split(')')[0];
-    : optionalColor.toString().split('(0x')[1].split(')')[0];
 
-Color? optionalColorFromJson(String? hex) =>
+Color? optionalColorFromJson(String? hex) => hex == null ? null : Color(int.parse(hex, radix: 16));
-    hex == null ? null : Color(int.parse(hex, radix: 16));
 
-Brightness getBrightness(Color color) =>
+Brightness getBrightness(Color color) => ThemeData.estimateBrightnessForColor(color);
-    ThemeData.estimateBrightnessForColor(color);
 
 List<Color> generateColorList() {
   List<Color> colors = [];
@@ -60,7 +55,7 @@ extension MonetaryExtension on double {
       return "\$${pieces.first}.00";
     } else {
       if (pieces.length > 2) {
-        printBlue(pieces);
+        print(pieces);
       }
       return '\$${pieces[0]}.${pieces[1].padRight(2, "0")}';
     }
@@ -83,7 +78,7 @@ void showSnack(
     Duration duration = const Duration(seconds: 2)}) {
   final messengerKey = ref.read(scaffoldMessengerKeyProvider);
   if (messengerKey.currentState == null) {
-    printPink('Cannot show snackbar, state == null');
+    print('Cannot show snackbar, state == null');
     return;
   }
   final color = type == SnackType.info
@@ -99,8 +94,7 @@ void showSnack(
     elevation: 8,
     backgroundColor: Styles.deepPurpleNurple,
     shape: const RoundedRectangleBorder(
-      borderRadius: BorderRadius.only(
+      borderRadius: BorderRadius.only(topLeft: Radius.circular(20.0), topRight: Radius.circular(20.0)),
-          topLeft: Radius.circular(20.0), topRight: Radius.circular(20.0)),
     ),
     content: Padding(
       padding: const EdgeInsets.all(8.0),
@@ -108,9 +102,7 @@ void showSnack(
         children: [
           Padding(
             padding: const EdgeInsets.only(right: 14.0),
-            child: Icon(
+            child: Icon(type == SnackType.success ? Icons.check_circle : Icons.info, color: color),
-                type == SnackType.success ? Icons.check_circle : Icons.info,
-                color: color),
           ),
           Text(text, style: textStyle),
         ],
@@ -120,8 +112,7 @@ void showSnack(
 }
 
 bool isEmailValid(String email) {
-  final RegExp regex =
+  final RegExp regex = RegExp(r"^[a-zA-Z0-9.a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,6}$");
-      RegExp(r"^[a-zA-Z0-9.a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,6}$");
   return regex.hasMatch(email);
 }
 

lib/main.dart

@@ -1,7 +1,6 @@
 import 'package:animated_splash_screen/animated_splash_screen.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:helpers/helpers/misc_build/build_media.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';
@@ -74,8 +73,7 @@ class _HomeState extends ConsumerState<Home> {
     }
     WidgetsBinding.instance.addPostFrameCallback(
       (_) {
-        ref.read(currentHomePageProvider.notifier).state =
+        ref.read(currentHomePageProvider.notifier).state = const BudgetOverviewScreen(initialData: {});
-            const BudgetOverviewScreen(initialData: {});
       },
     );
     super.initState();
@@ -92,8 +90,7 @@ class _HomeState extends ConsumerState<Home> {
         );
       });
     }
-    if (ref.watch(currentHomePageProvider).toString() ==
+    if (ref.watch(currentHomePageProvider).toString() == "BudgetOverviewScreen") {
-        "BudgetOverviewScreen") {
       initData = {};
     }
     return Scaffold(
@@ -104,15 +101,13 @@ class _HomeState extends ConsumerState<Home> {
         child: SafeArea(
           child: Column(
             children: [
-              SizedBox(height: BuildMedia(context).height * 0.15),
+              SizedBox(height: MediaQuery.of(context).size.height * 0.15),
               UiButton(
                 text: 'Budget',
                 color: drawerColors[4],
                 onPressed: () {
-                  if (ref.read(currentHomePageProvider).toString() !=
+                  if (ref.read(currentHomePageProvider).toString() != "BudgetOverviewScreen") {
-                      "BudgetOverviewScreen") {
+                    ref.read(currentHomePageProvider.notifier).state = BudgetOverviewScreen(initialData: initData);
-                    ref.read(currentHomePageProvider.notifier).state =
-                        BudgetOverviewScreen(initialData: initData);
                   }
                   toggleDrawer();
                 },
@@ -121,10 +116,8 @@ class _HomeState extends ConsumerState<Home> {
                 text: 'Notes',
                 color: drawerColors[5],
                 onPressed: () {
-                  if (ref.read(currentHomePageProvider).toString() !=
+                  if (ref.read(currentHomePageProvider).toString() != "SharedNotesScreen") {
-                      "SharedNotesScreen") {
+                    ref.read(currentHomePageProvider.notifier).state = SharedNotesScreen(initialData: initData);
-                    ref.read(currentHomePageProvider.notifier).state =
-                        SharedNotesScreen(initialData: initData);
                   }
                   toggleDrawer();
                 },
@@ -134,10 +127,8 @@ class _HomeState extends ConsumerState<Home> {
                 text: 'Settings',
                 color: drawerColors[0],
                 onPressed: () {
-                  if (ref.read(currentHomePageProvider).toString() !=
+                  if (ref.read(currentHomePageProvider).toString() != "SettingsScreen") {
-                      "SettingsScreen") {
+                    ref.read(currentHomePageProvider.notifier).state = const SettingsScreen();
-                    ref.read(currentHomePageProvider.notifier).state =
-                        const SettingsScreen();
                   }
                   toggleDrawer();
                 },
@@ -190,5 +181,4 @@ final appBarTitleProvider = Provider<String>(
 );
 
 final scaffoldMessengerKeyProvider =
-    Provider<GlobalKey<ScaffoldMessengerState>>(
+    Provider<GlobalKey<ScaffoldMessengerState>>((ref) => GlobalKey<ScaffoldMessengerState>());
-        (ref) => GlobalKey<ScaffoldMessengerState>());

linux/flutter/generated_plugin_registrant.cc

@@ -6,10 +6,6 @@
 
 #include "generated_plugin_registrant.h"
 
-#include <url_launcher_linux/url_launcher_plugin.h>
 
 void fl_register_plugins(FlPluginRegistry* registry) {
-  g_autoptr(FlPluginRegistrar) url_launcher_linux_registrar =
-      fl_plugin_registry_get_registrar_for_plugin(registry, "UrlLauncherPlugin");
-  url_launcher_plugin_register_with_registrar(url_launcher_linux_registrar);
 }

linux/flutter/generated_plugins.cmake

@@ -3,7 +3,6 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
-  url_launcher_linux
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST

pubspec.lock

@@ -5,18 +5,23 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: eb376e9acf6938204f90eb3b1f00b578640d3188b4c8a8ec054f9f479af8d051
+      sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
       url: "https://pub.dev"
     source: hosted
-    version: "64.0.0"
+    version: "72.0.0"
+  _macros:
+    dependency: transitive
+    description: dart
+    source: sdk
+    version: "0.3.2"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      sha256: "69f54f967773f6c26c7dcb13e93d7ccee8b17a641689da39e878d5cf13b06893"
+      sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
       url: "https://pub.dev"
     source: hosted
-    version: "6.2.0"
+    version: "6.7.0"
   animated_splash_screen:
     dependency: "direct main"
     description:
@@ -29,18 +34,18 @@ packages:
     dependency: transitive
     description:
       name: archive
-      sha256: "0c8368c9b3f0abbc193b9d6133649a614204b528982bebc7026372d61677ce3a"
+      sha256: cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d
       url: "https://pub.dev"
     source: hosted
-    version: "3.3.7"
+    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:
@@ -77,34 +82,34 @@ packages:
     dependency: transitive
     description:
       name: build_daemon
-      sha256: "5f02d73eb2ba16483e693f80bee4f088563a820e47d1027d4cdfe62b5bb43e65"
+      sha256: "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    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: "10c6bcdbf9d049a0b666702cf1cee4ddfdc38f02a19d35ae392863b47519848b"
+      sha256: dd09dd4e2b078992f42aac7f1a622f01882a8492fef08486b27ddde929c19f04
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.6"
+    version: "2.4.12"
   build_runner_core:
     dependency: transitive
     description:
       name: build_runner_core
-      sha256: "6d6ee4276b1c5f34f21fdf39425202712d2be82019983d52f351c94aafbc2c41"
+      sha256: f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0
       url: "https://pub.dev"
     source: hosted
-    version: "7.2.10"
+    version: "7.3.2"
   built_collection:
     dependency: transitive
     description:
@@ -117,10 +122,10 @@ 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:
@@ -149,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: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.2"
+    version: "1.18.0"
   convert:
     dependency: transitive
     description:
@@ -173,42 +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: "65a463f09623f6baf75e45e0c9034e9304810be3f5dfb00a54edde7252f4a524"
+      sha256: c34dd1dfb1f6b9ee2db9c5972586dba5e4445d79f8431f6ab098a6e963ccd39c
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.1"
+    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: ce75a1b40947fea0a0e16ce73337122a86762e38b982e1ccb909daa3b9bc4197
+      sha256: "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260"
       url: "https://pub.dev"
     source: hosted
-    version: "5.3.2"
+    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:
@@ -221,18 +234,18 @@ packages:
     dependency: transitive
     description:
       name: ffi
-      sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878"
+      sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    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:
@@ -246,30 +259,22 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
-  flutter_highlight:
-    dependency: transitive
-    description:
-      name: flutter_highlight
-      sha256: "7b96333867aa07e122e245c033b8ad622e4e3a42a1a2372cbb098a2541d8782c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.7.0"
   flutter_lints:
     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: b6cb0041c6c11cefb2dcb97ef436eba43c6d41287ac6d8ca93e02a497f53a4f3
+      sha256: "0f1974eff5bbe774bf1d870e406fc6f29e3d6f1c46bd9c58e7172ff68a785d7d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.7"
+    version: "2.5.1"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -284,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:
@@ -300,26 +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"
-  highlight:
-    dependency: transitive
-    description:
-      name: highlight
-      sha256: "5353a83ffe3e3eca7df0abfb72dcf3fa66cc56b953728e7113ad4ad88497cf21"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.7.0"
   http_multi_server:
     dependency: transitive
     description:
@@ -340,26 +329,26 @@ packages:
     dependency: "direct dev"
     description:
       name: icons_launcher
-      sha256: af05397792f6d82b93375a8a0253b8db0d3f816ef1dd1bf5c35cbab55321d327
+      sha256: "9b514ffed6ed69b232fd2bf34c44878c8526be71fc74129a658f35c04c9d4a9d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "2.1.7"
   image:
     dependency: transitive
     description:
       name: image
-      sha256: a72242c9a0ffb65d03de1b7113bc4e189686fc07c7147b8b41811d0dd0e0d9bf
+      sha256: "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.17"
+    version: "4.2.0"
   intl:
     dependency: "direct main"
     description:
       name: intl
-      sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
+      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
       url: "https://pub.dev"
     source: hosted
-    version: "0.18.1"
+    version: "0.19.0"
   io:
     dependency: transitive
     description:
@@ -372,26 +361,26 @@ packages:
     dependency: transitive
     description:
       name: js
-      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
+      sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.7"
+    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: aa1f5a8912615733e0fdc7a02af03308933c93235bdc8d50d0b0c8a8ccb0b969
+      sha256: ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b
       url: "https://pub.dev"
     source: hosted
-    version: "6.7.1"
+    version: "6.8.0"
   jwt_decoder:
     dependency: "direct main"
     description:
@@ -400,14 +389,38 @@ packages:
       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: "0a217c6c989d21039f1498c3ed9f3ed71b354e69873f13a8dfc3c9fe76f1b452"
+      sha256: "976c774dd944a42e83e2467f4cc670daef7eed6295b10b36ae8c85bcbf828235"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "4.0.0"
   logging:
     dependency: transitive
     description:
@@ -416,54 +429,46 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.2.0"
-  markdown:
+  macros:
     dependency: transitive
     description:
-      name: markdown
+      name: macros
-      sha256: acf35edccc0463a9d7384e437c015a3535772e09714cf60e07eeef3a15870dcd
+      sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
       url: "https://pub.dev"
     source: hosted
-    version: "7.1.1"
+    version: "0.1.2-main.4"
-  markdown_widget:
-    dependency: "direct main"
-    description:
-      name: markdown_widget
-      sha256: "088feae6be2dd527c7dd54e06ad104a3e70505aff2ce14a3b464482551a0e273"
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.2.0"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
+      sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.16"
+    version: "0.12.16+1"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.0"
+    version: "0.11.1"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    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:
@@ -476,74 +481,66 @@ packages:
     dependency: transitive
     description:
       name: page_transition
-      sha256: a7694bc120b7064a7f57c336914bb8885acf4f70bb3772c30c2fcfe6a85e43ff
+      sha256: dee976b1f23de9bbef5cd512fe567e9f6278caee11f5eaca9a2115c19dc49ef6
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.9"
+    version: "2.1.0"
   path:
     dependency: transitive
     description:
       name: path
-      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.3"
+    version: "1.9.0"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
-      sha256: ba2b77f0c52a33db09fc8caf85b12df691bf28d983e84cf87ff6d693cfa007b3
+      sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.2.1"
   path_provider_platform_interface:
     dependency: transitive
     description:
       name: path_provider_platform_interface
-      sha256: bced5679c7df11190e1ddc35f3222c858f328fff85c3942e46e7f5589bf9eb84
+      sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.2"
   path_provider_windows:
     dependency: transitive
     description:
       name: path_provider_windows
-      sha256: ee0e0d164516b90ae1f970bdf29f726f1aa730d7cfc449ecc74c495378b705da
+      sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "2.3.0"
   petitparser:
     dependency: transitive
     description:
       name: petitparser
-      sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750
+      sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27
       url: "https://pub.dev"
     source: hosted
-    version: "5.4.0"
+    version: "6.0.2"
   platform:
     dependency: transitive
     description:
       name: platform
-      sha256: "57c07bf82207aee366dfaa3867b3164e4f03a238a461a11b0e8a3a510d51203d"
+      sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.1"
+    version: "3.1.5"
   plugin_platform_interface:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      sha256: "43798d895c929056255600343db8f049921cbec94d31ec87f1dc5c16c01935dd"
+      sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.5"
+    version: "2.1.8"
-  pointycastle:
-    dependency: transitive
-    description:
-      name: pointycastle
-      sha256: "7c1e5f0d23c9016c5bbd8b1473d0d3fb3fc851b876046039509e18e0c7485f2c"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.7.3"
   pool:
     dependency: transitive
     description:
@@ -564,82 +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: b0657b5b30c81a3184bdaab353045f0a403ebd60bb381591a8b7ad77dcade793
+      sha256: f21b32ffd26a36555e501b04f4a5dca43ed59e16343f1a30c13632b2351dfa4d
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.7"
+    version: "2.5.1"
-  scroll_to_index:
-    dependency: transitive
-    description:
-      name: scroll_to_index
-      sha256: b707546e7500d9f070d63e5acf74fd437ec7eeeb68d3412ef7b0afada0b4f176
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.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: d29753996d8eb8f7619a1f13df6ce65e34bc107bef6330739ed76f18b22310ef
+      sha256: c4b35f6cb8f63c147312c054ce7c2254c8066745125264f0c88739c417fc9d9f
       url: "https://pub.dev"
     source: hosted
-    version: "2.3.3"
+    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:
@@ -652,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
@@ -665,10 +654,10 @@ packages:
     dependency: transitive
     description:
       name: source_gen
-      sha256: fc0da689e5302edb6177fdd964efcb7f58912f43c28c2047a808f5bfff643d16
+      sha256: "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832"
       url: "https://pub.dev"
     source: hosted
-    version: "1.4.0"
+    version: "1.5.0"
   source_helper:
     dependency: transitive
     description:
@@ -689,10 +678,10 @@ packages:
     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:
@@ -705,10 +694,10 @@ packages:
     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:
@@ -737,10 +726,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
+      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.0"
+    version: "0.7.2"
   timing:
     dependency: transitive
     description:
@@ -765,78 +754,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.2.2"
-  url_launcher:
-    dependency: transitive
-    description:
-      name: url_launcher
-      sha256: "781bd58a1eb16069412365c98597726cd8810ae27435f04b3b4d3a470bacd61e"
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.1.12"
-  url_launcher_android:
-    dependency: transitive
-    description:
-      name: url_launcher_android
-      sha256: "3dd2388cc0c42912eee04434531a26a82512b9cb1827e0214430c9bcbddfe025"
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.0.38"
-  url_launcher_ios:
-    dependency: transitive
-    description:
-      name: url_launcher_ios
-      sha256: "9af7ea73259886b92199f9e42c116072f05ff9bea2dcb339ab935dfc957392c2"
-      url: "https://pub.dev"
-    source: hosted
-    version: "6.1.4"
-  url_launcher_linux:
-    dependency: transitive
-    description:
-      name: url_launcher_linux
-      sha256: "207f4ddda99b95b4d4868320a352d374b0b7e05eefad95a4a26f57da413443f5"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.5"
-  url_launcher_macos:
-    dependency: transitive
-    description:
-      name: url_launcher_macos
-      sha256: "1c4fdc0bfea61a70792ce97157e5cc17260f61abbe4f39354513f39ec6fd73b1"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.6"
-  url_launcher_platform_interface:
-    dependency: transitive
-    description:
-      name: url_launcher_platform_interface
-      sha256: bfdfa402f1f3298637d71ca8ecfe840b4696698213d5346e9d12d4ab647ee2ea
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.1.3"
-  url_launcher_web:
-    dependency: transitive
-    description:
-      name: url_launcher_web
-      sha256: cc26720eefe98c1b71d85f9dc7ef0cada5132617046369d9dc296b3ecaa5cbb4
-      url: "https://pub.dev"
-    source: hosted
-    version: "2.0.18"
-  url_launcher_windows:
-    dependency: transitive
-    description:
-      name: url_launcher_windows
-      sha256: "7967065dd2b5fccc18c653b97958fdf839c5478c28e767c61ee879f4e7882422"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.7"
-  uuid:
-    dependency: "direct main"
-    description:
-      name: uuid
-      sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313"
-      url: "https://pub.dev"
-    source: hosted
-    version: "3.0.7"
   vector_math:
     dependency: transitive
     description:
@@ -845,14 +762,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
-  visibility_detector:
+  vm_service:
     dependency: transitive
     description:
-      name: visibility_detector
+      name: vm_service
-      sha256: dd5cc11e13494f432d15939c3aa8ae76844c42b723398643ce9addb88a5ed420
+      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
       url: "https://pub.dev"
     source: hosted
-    version: "0.4.0+2"
+    version: "14.2.5"
   watcher:
     dependency: transitive
     description:
@@ -865,42 +782,42 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
+      sha256: d43c1d6b787bf0afad444700ae7f4db8827f701bc61c255ac8d328c6f4d52062
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.4-beta"
+    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: f2add6fa510d3ae152903412227bda57d0d5a8da61d2c39c1fb022c9429a41c0
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.0.6"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
-      sha256: f0c26453a2d47aa4c2570c6a033246a3fc62da2fe23c7ffdd0a7495086dc0247
+      sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.2"
+    version: "1.0.4"
   xml:
     dependency: transitive
     description:
       name: xml
-      sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84"
+      sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.0"
+    version: "6.5.0"
   yaml:
     dependency: transitive
     description:
@@ -910,5 +827,5 @@ packages:
     source: hosted
     version: "3.1.2"
 sdks:
-  dart: ">=3.1.0-185.0.dev <4.0.0"
+  dart: ">=3.5.0-259.0.dev <4.0.0"
-  flutter: ">=3.10.0"
+  flutter: ">=3.22.0"

pubspec.yaml

@@ -37,13 +37,16 @@ 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.18.1
+  intl: ^0.19.0
-  markdown_widget: ^2.2.0
+  # markdown_widget: ^2.2.0
-  custom_refresh_indicator: ^2.2.1
+  custom_refresh_indicator: ^4.0.1
   jwt_decoder: ^2.0.1
   animated_splash_screen: ^1.3.0
 
@@ -53,7 +56,7 @@ 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