From fad1a5ce55f3314455d33fbb0ae93ab099bd1f6e Mon Sep 17 00:00:00 2001 From: Sara Djordjevic <sarasdj@stud.ntnu.no> Date: Mon, 5 Feb 2024 13:12:32 +0100 Subject: [PATCH] update: regenerate flutter porject --- .gitignore | 4 +- .idea/.gitignore | 3 + .idea/libraries/Dart_Packages.xml | 228 ++++++++++++++++++ .idea/libraries/Dart_SDK.xml | 29 +++ .idea/modules.xml | 8 + .idea/repo2900.iml | 15 ++ .idea/vcs.xml | 6 + app/README.md | 13 - app/analysis_options.yaml | 27 --- .../com/example/ice_map/MainActivity.kt | 6 - app/assets/images/2.0x/flutter_logo.png | Bin 619 -> 0 bytes app/assets/images/3.0x/flutter_logo.png | Bin 810 -> 0 bytes app/assets/images/flutter_logo.png | Bin 419 -> 0 bytes app/l10n.yaml | 3 - app/lib/main.dart | 10 +- app/lib/src/app.dart | 85 ------- app/lib/src/localization/app_en.arb | 6 - app/lib/src/sample_feature/sample_item.dart | 6 - .../sample_item_details_view.dart | 20 -- .../sample_feature/sample_item_list_view.dart | 71 ------ app/lib/src/settings/settings_controller.dart | 50 ---- app/lib/src/settings/settings_service.dart | 17 -- app/lib/src/settings/settings_view.dart | 51 ---- app/pubspec.lock | 12 +- app/pubspec.yaml | 77 +----- app/test/unit_test.dart | 15 -- app/test/widget_test.dart | 30 --- service.proto | 9 - 28 files changed, 304 insertions(+), 497 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/libraries/Dart_Packages.xml create mode 100644 .idea/libraries/Dart_SDK.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/repo2900.iml create mode 100644 .idea/vcs.xml delete mode 100644 app/android/app/src/main/kotlin/com/example/ice_map/MainActivity.kt delete mode 100644 app/assets/images/2.0x/flutter_logo.png delete mode 100644 app/assets/images/3.0x/flutter_logo.png delete mode 100644 app/assets/images/flutter_logo.png delete mode 100644 app/l10n.yaml delete mode 100644 app/lib/src/app.dart delete mode 100644 app/lib/src/localization/app_en.arb delete mode 100644 app/lib/src/sample_feature/sample_item.dart delete mode 100644 app/lib/src/sample_feature/sample_item_details_view.dart delete mode 100644 app/lib/src/sample_feature/sample_item_list_view.dart delete mode 100644 app/lib/src/settings/settings_controller.dart delete mode 100644 app/lib/src/settings/settings_service.dart delete mode 100644 app/lib/src/settings/settings_view.dart delete mode 100644 app/test/unit_test.dart delete mode 100644 app/test/widget_test.dart delete mode 100644 service.proto diff --git a/.gitignore b/.gitignore index 9f9aaf91..95089281 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ # Auto-generated VScode -./vs \ No newline at end of file +./vs + +./idea \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 00000000..26d33521 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml new file mode 100644 index 00000000..b55c7cc2 --- /dev/null +++ b/.idea/libraries/Dart_Packages.xml @@ -0,0 +1,228 @@ +<component name="libraryTable"> + <library name="Dart Packages" type="DartPackagesLibraryType"> + <properties> + <option name="packageNameToDirsMap"> + <entry key="async"> + <value> + <list> + <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/async-2.11.0/lib" /> + </list> + </value> + </entry> + <entry key="boolean_selector"> + <value> + <list> + <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/boolean_selector-2.1.1/lib" /> + </list> + </value> + </entry> + <entry key="characters"> + <value> + <list> + <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/characters-1.3.0/lib" /> + </list> + </value> + </entry> + <entry key="clock"> + <value> + <list> + <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/clock-1.1.1/lib" /> + </list> + </value> + </entry> + <entry key="collection"> + <value> + <list> + <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.18.0/lib" /> + </list> + </value> + </entry> + <entry key="cupertino_icons"> + <value> + <list> + <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/cupertino_icons-1.0.6/lib" /> + </list> + </value> + </entry> + <entry key="fake_async"> + <value> + <list> + <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/fake_async-1.3.1/lib" /> + </list> + </value> + </entry> + <entry key="flutter"> + <value> + <list> + <option value="$USER_HOME$/flutter/packages/flutter/lib" /> + </list> + </value> + </entry> + <entry key="flutter_lints"> + <value> + <list> + <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_lints-2.0.3/lib" /> + </list> + </value> + </entry> + <entry key="flutter_test"> + <value> + <list> + <option value="$USER_HOME$/flutter/packages/flutter_test/lib" /> + </list> + </value> + </entry> + <entry key="http"> + <value> + <list> + <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/http-1.2.0/lib" /> + </list> + </value> + </entry> + <entry key="http_parser"> + <value> + <list> + <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/http_parser-4.0.2/lib" /> + </list> + </value> + </entry> + <entry key="lints"> + <value> + <list> + <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/lints-2.1.1/lib" /> + </list> + </value> + </entry> + <entry key="matcher"> + <value> + <list> + <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/matcher-0.12.16/lib" /> + </list> + </value> + </entry> + <entry key="material_color_utilities"> + <value> + <list> + <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/material_color_utilities-0.5.0/lib" /> + </list> + </value> + </entry> + <entry key="meta"> + <value> + <list> + <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/meta-1.10.0/lib" /> + </list> + </value> + </entry> + <entry key="path"> + <value> + <list> + <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.8.3/lib" /> + </list> + </value> + </entry> + <entry key="sky_engine"> + <value> + <list> + <option value="$USER_HOME$/flutter/bin/cache/pkg/sky_engine/lib" /> + </list> + </value> + </entry> + <entry key="source_span"> + <value> + <list> + <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.0/lib" /> + </list> + </value> + </entry> + <entry key="stack_trace"> + <value> + <list> + <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.11.1/lib" /> + </list> + </value> + </entry> + <entry key="stream_channel"> + <value> + <list> + <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1.2/lib" /> + </list> + </value> + </entry> + <entry key="string_scanner"> + <value> + <list> + <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0/lib" /> + </list> + </value> + </entry> + <entry key="term_glyph"> + <value> + <list> + <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1/lib" /> + </list> + </value> + </entry> + <entry key="test_api"> + <value> + <list> + <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/test_api-0.6.1/lib" /> + </list> + </value> + </entry> + <entry key="typed_data"> + <value> + <list> + <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/typed_data-1.3.2/lib" /> + </list> + </value> + </entry> + <entry key="vector_math"> + <value> + <list> + <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/vector_math-2.1.4/lib" /> + </list> + </value> + </entry> + <entry key="web"> + <value> + <list> + <option value="$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/web-0.3.0/lib" /> + </list> + </value> + </entry> + </option> + </properties> + <CLASSES> + <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/async-2.11.0/lib" /> + <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/boolean_selector-2.1.1/lib" /> + <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/characters-1.3.0/lib" /> + <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/clock-1.1.1/lib" /> + <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/collection-1.18.0/lib" /> + <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/cupertino_icons-1.0.6/lib" /> + <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/fake_async-1.3.1/lib" /> + <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/flutter_lints-2.0.3/lib" /> + <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/http-1.2.0/lib" /> + <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/http_parser-4.0.2/lib" /> + <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/lints-2.1.1/lib" /> + <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/matcher-0.12.16/lib" /> + <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/material_color_utilities-0.5.0/lib" /> + <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/meta-1.10.0/lib" /> + <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/path-1.8.3/lib" /> + <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/source_span-1.10.0/lib" /> + <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/stack_trace-1.11.1/lib" /> + <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/stream_channel-2.1.2/lib" /> + <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/string_scanner-1.2.0/lib" /> + <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/term_glyph-1.2.1/lib" /> + <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/test_api-0.6.1/lib" /> + <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/typed_data-1.3.2/lib" /> + <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/vector_math-2.1.4/lib" /> + <root url="file://$USER_HOME$/AppData/Local/Pub/Cache/hosted/pub.dev/web-0.3.0/lib" /> + <root url="file://$USER_HOME$/flutter/bin/cache/pkg/sky_engine/lib" /> + <root url="file://$USER_HOME$/flutter/packages/flutter/lib" /> + <root url="file://$USER_HOME$/flutter/packages/flutter_test/lib" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> +</component> \ No newline at end of file diff --git a/.idea/libraries/Dart_SDK.xml b/.idea/libraries/Dart_SDK.xml new file mode 100644 index 00000000..3b3c0ad6 --- /dev/null +++ b/.idea/libraries/Dart_SDK.xml @@ -0,0 +1,29 @@ +<component name="libraryTable"> + <library name="Dart SDK"> + <CLASSES> + <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/async" /> + <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/cli" /> + <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/collection" /> + <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/convert" /> + <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/core" /> + <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/developer" /> + <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/ffi" /> + <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/html" /> + <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/indexed_db" /> + <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/io" /> + <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/isolate" /> + <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/js" /> + <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/js_interop" /> + <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/js_interop_unsafe" /> + <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/js_util" /> + <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/math" /> + <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/mirrors" /> + <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/svg" /> + <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/typed_data" /> + <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/web_audio" /> + <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/web_gl" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> +</component> \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..b886f057 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="ProjectModuleManager"> + <modules> + <module fileurl="file://$PROJECT_DIR$/.idea/repo2900.iml" filepath="$PROJECT_DIR$/.idea/repo2900.iml" /> + </modules> + </component> +</project> \ No newline at end of file diff --git a/.idea/repo2900.iml b/.idea/repo2900.iml new file mode 100644 index 00000000..e80ce9c8 --- /dev/null +++ b/.idea/repo2900.iml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <excludeFolder url="file://$MODULE_DIR$/app/.dart_tool" /> + <excludeFolder url="file://$MODULE_DIR$/app/.pub" /> + <excludeFolder url="file://$MODULE_DIR$/app/build" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="library" name="Dart SDK" level="project" /> + <orderEntry type="library" name="Dart Packages" level="project" /> + </component> +</module> \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..35eb1ddf --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="VcsDirectoryMappings"> + <mapping directory="" vcs="Git" /> + </component> +</project> \ No newline at end of file diff --git a/app/README.md b/app/README.md index b73cfb0e..61940550 100644 --- a/app/README.md +++ b/app/README.md @@ -1,16 +1,3 @@ # app A new Flutter project. - -## Getting Started - -This project is a starting point for a Flutter application. - -A few resources to get you started if this is your first Flutter project: - -- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab) -- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook) - -For help getting started with Flutter development, view the -[online documentation](https://docs.flutter.dev/), which offers tutorials, -samples, guidance on mobile development, and a full API reference. diff --git a/app/analysis_options.yaml b/app/analysis_options.yaml index 0d290213..f9b30346 100644 --- a/app/analysis_options.yaml +++ b/app/analysis_options.yaml @@ -1,28 +1 @@ -# This file configures the analyzer, which statically analyzes Dart code to -# check for errors, warnings, and lints. -# -# The issues identified by the analyzer are surfaced in the UI of Dart-enabled -# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be -# invoked from the command line by running `flutter analyze`. - -# The following line activates a set of recommended lints for Flutter apps, -# packages, and plugins designed to encourage good coding practices. include: package:flutter_lints/flutter.yaml - -linter: - # The lint rules applied to this project can be customized in the - # section below to disable rules from the `package:flutter_lints/flutter.yaml` - # included above or to enable additional rules. A list of all available lints - # and their documentation is published at https://dart.dev/lints. - # - # Instead of disabling a lint rule for the entire project in the - # section below, it can also be suppressed for a single line of code - # or a specific dart file by using the `// ignore: name_of_lint` and - # `// ignore_for_file: name_of_lint` syntax on the line or in the file - # producing the lint. - rules: - # avoid_print: false # Uncomment to disable the `avoid_print` rule - # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule - -# Additional information about this file can be found at -# https://dart.dev/guides/language/analysis-options diff --git a/app/android/app/src/main/kotlin/com/example/ice_map/MainActivity.kt b/app/android/app/src/main/kotlin/com/example/ice_map/MainActivity.kt deleted file mode 100644 index 19b10d6e..00000000 --- a/app/android/app/src/main/kotlin/com/example/ice_map/MainActivity.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.example.ice_map - -import io.flutter.embedding.android.FlutterActivity - -class MainActivity: FlutterActivity() { -} diff --git a/app/assets/images/2.0x/flutter_logo.png b/app/assets/images/2.0x/flutter_logo.png deleted file mode 100644 index b65164de707ffeaf0adfca5fca65532bf97e6903..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 619 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H3?#oinD`S&H3s;ExB}^b{r?#vrgK>I2kif@ zvH816@%GSTKN!MhbHpsw+WI}@_)o2^Ujq(*4>|fh<k%0!@L5d3GbPj-q?GD{kNyZf z3KW^m6f%n?U^=_k6fTzuJdS<5w!M5--2!GE!UnCPPE*9Rnk3a5q?GGqOncQAKiAy$ zO=szIy&d2DKxY2vJfPwXbc9$*kY6x^fP#X8gF}8j5HvJ2?7t5Ng+aUZ85kIwJzX3_ zDsH{Ke%<e|gFx%UrPEt4h&wTH`{kVaZLh#`y6EJzz&A4|Ua;hU@P2x}jagdP*?pe7 z?M-Z&`Q`0uetdX%xE%*0?VH1`t8&xrkFIWB|5|$Wo6B4lwO)+t=j%WCR?PaRZkNL$ zf6)^^J~C<AhbcU7=XT=Xnew|N`jWGr-ToVX?A{+&cLi;D{4z<?ZfU~v%O`{W)Ew-% zd^YG$%)u3xF9!W7Ie6mo)u2Bi2VY#i8T6;(Aj|UIOMh%^@~o5f)2Q3g@b<dugLbZz zzi*i`>mwB2f9E#&lh@dHUo7LNZ{xgp@r+-ynauvLP<s3LM#0-TkEXxg&3v}0Xm8YA zEwP-MvrV_IYiHD~ZMt?{^TjVI*4p@e2`{|GbAHzqZq^Ss`11GDNy~EGunXVsPcIJl zU$x-1xPGr*_=R7!v8xt*?7qHGFF4?L>wNoN4|Z_>tNAZ;@h5j(?S79JcUYfB`=#qy r6fZFpo3n_4Rl|XiE8s&sR~^H;NW15^d4qg`5ys%@>gTe~DWM4f{@o*g diff --git a/app/assets/images/3.0x/flutter_logo.png b/app/assets/images/3.0x/flutter_logo.png deleted file mode 100644 index 97e5dc9af6e1093966c5cd42d608fd6fbb6a0c59..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 810 zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE8Azrw%`pX16#+gWu0UF2`*(-^-y@EH58eMI z^w{s<Lq9_geb?ObjUjBd*4FPKM}LMK|H%|FTfm}IN~JdB=y$cCMVi~bg&zA6a^weN z_-v+-Su6q5*}bN4xlG`3?BliV<+JJ*FzXNsT_9}GDyG#Wsoo%^TqkQcRb$P2pho+> z-$IW5@LT%57HGF<NswPKgMxyBfqg(iK|K&O0KxqG_ut>UA^wwrfyu|y#WAGf*4wMk zgAN-AxF%k#KCURBVA1=%-ucp;9Uj}ZG#l?Wes0(B%({NdIoXW<{g3WiupaK0x3By2 z<KyGw6f)l5KiOLGT<eeiqw;uvka71L?%$RAewusBkEN_te>O4s)_FGS)mJr|)n_%@ z)kihD)q6Gi)z>tJ)#o(E)yFiZ)%!H&)t5Jx)rUK-{vXl2fA4~;^<VZ}c#yCC;=}pp z+`Rt^9GAyOe7OHFz_BGh<ir2EddDg80T<fuhYP&)*L!jNzD~zCb+Io`*NdzCn9TL- zb2#^;Kb)+!zfQAu{(I3>_xE>GN_~ps{eO!b9`tLyxW8Xh;HNSd-@|xOj=ytR+do>D zt9>mOkvaAL$-iq%!vCf*DgR4ol&oKHV8Z?Agj4S|4W8wT%=mnri|3a%tJ>eCOpE`; zHb(y6c3?w&Y{ISmIsp&Mrw9G7`Sv8_P1LLTesVhEI)8;vvu5vq*tGV3&cSo}TNXSq zj|})It+V3iSy7We$GB|jf?4DCFKlYK@8ftOf60QQ_A~Fi*3bCZZ_jpf?zg4|^)^x| zt2OmGe$>0=M;cybjjOklN_(oQ_u<Fq^Q+=Y9S^_1tgW}==jZhg6}Wv;9goiMzu#Q7 zlr{DLtHbYS>}uL;@3elyf)C=)PemO(7H=26jVtWmubrDh3}(04)hM&xSK7O%X|>Mc j1|}|z1*pUejUUWgK0Q%uH(H?zOn3~Qu6{1-oD!M<&k2w@ diff --git a/app/assets/images/flutter_logo.png b/app/assets/images/flutter_logo.png deleted file mode 100644 index b5c6ca710c937527ca8d2d344214243d6db33832..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 419 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!@&kNAT!FN~`u7^!zegPZ&Ja3_ z)pe?<YJKSbFAQO`723{fZT%i{^k>NNpCL!ThaUauw)u_bwr{%Izl9$A!5B7M$govP zxh~|$561A>Od+#a0;aQjP2sie<+JJ*(`u4bZve_F*PR4v(b@jZ=Md1SAK%^B{{yWQ zFA4GsW)M(NFaUyj5NMdc{{H>@?}1?b(XAk7pYe2Y42d}W_VP)gCIbQ2ix!U>4q9?~ zIsEybZ^G7cAu^%-PQ=yx*;eIK#gYnUFW+9QvQNJH+nbx4)6dKOIC(3+<zw~#(0|vu zEiU|KUDM9G=e@YbJ>3g6;V=GFge(48{@_RM&lLju^uE+^au+>tK7OIONyesA;#Zub zQs3&YevL0~Gu<?AWyt52uy492BGh>E6t~Fo%7BFztX3q{1RVU;;PiN_-8qleWA`_& zw({X*ef?P{^t~Y0vFF>PCUdo}=4?%^3QRb0$VpT0kLyEL`Hh?APM<!{6zDGoPgg&e IbxsLQ04<Qa^#A|> diff --git a/app/l10n.yaml b/app/l10n.yaml deleted file mode 100644 index d480072c..00000000 --- a/app/l10n.yaml +++ /dev/null @@ -1,3 +0,0 @@ -arb-dir: lib/src/localization -template-arb-file: app_en.arb -output-localization-file: app_localizations.dart diff --git a/app/lib/main.dart b/app/lib/main.dart index 16a46c18..4c06d23c 100644 --- a/app/lib/main.dart +++ b/app/lib/main.dart @@ -4,13 +4,15 @@ import 'package:http/http.dart' as http; const SERVER_URI = "https://127.0.0.1:8443"; void main() { - runApp(App()); + runApp(const App()); } class App extends StatelessWidget { + const App({super.key}); + @override Widget build(BuildContext context) { - return MaterialApp( + return const MaterialApp( home: DefaultPage(), ); } @@ -18,6 +20,8 @@ class App extends StatelessWidget { // Default page class DefaultPage extends StatelessWidget { + const DefaultPage({super.key}); + @override Widget build(BuildContext context) { return Scaffold( @@ -32,7 +36,7 @@ class DefaultPage extends StatelessWidget { 'Default flutter app page!', style: TextStyle(fontSize: 24), ), - SizedBox(height: 20), + const SizedBox(height: 20), ElevatedButton( onPressed: () async { // Attempt to connect to server diff --git a/app/lib/src/app.dart b/app/lib/src/app.dart deleted file mode 100644 index 7ba2c2f3..00000000 --- a/app/lib/src/app.dart +++ /dev/null @@ -1,85 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -import 'package:flutter_localizations/flutter_localizations.dart'; - -import 'sample_feature/sample_item_details_view.dart'; -import 'sample_feature/sample_item_list_view.dart'; -import 'settings/settings_controller.dart'; -import 'settings/settings_view.dart'; - -/// The Widget that configures your application. -class MyApp extends StatelessWidget { - const MyApp({ - super.key, - required this.settingsController, - }); - - final SettingsController settingsController; - - @override - Widget build(BuildContext context) { - // Glue the SettingsController to the MaterialApp. - // - // The ListenableBuilder Widget listens to the SettingsController for changes. - // Whenever the user updates their settings, the MaterialApp is rebuilt. - return ListenableBuilder( - listenable: settingsController, - builder: (BuildContext context, Widget? child) { - return MaterialApp( - // Providing a restorationScopeId allows the Navigator built by the - // MaterialApp to restore the navigation stack when a user leaves and - // returns to the app after it has been killed while running in the - // background. - restorationScopeId: 'app', - - // Provide the generated AppLocalizations to the MaterialApp. This - // allows descendant Widgets to display the correct translations - // depending on the user's locale. - localizationsDelegates: const [ - AppLocalizations.delegate, - GlobalMaterialLocalizations.delegate, - GlobalWidgetsLocalizations.delegate, - GlobalCupertinoLocalizations.delegate, - ], - supportedLocales: const [ - Locale('en', ''), // English, no country code - ], - - // Use AppLocalizations to configure the correct application title - // depending on the user's locale. - // - // The appTitle is defined in .arb files found in the localization - // directory. - onGenerateTitle: (BuildContext context) => - AppLocalizations.of(context)!.appTitle, - - // Define a light and dark color theme. Then, read the user's - // preferred ThemeMode (light, dark, or system default) from the - // SettingsController to display the correct theme. - theme: ThemeData(), - darkTheme: ThemeData.dark(), - themeMode: settingsController.themeMode, - - // Define a function to handle named routes in order to support - // Flutter web url navigation and deep linking. - onGenerateRoute: (RouteSettings routeSettings) { - return MaterialPageRoute<void>( - settings: routeSettings, - builder: (BuildContext context) { - switch (routeSettings.name) { - case SettingsView.routeName: - return SettingsView(controller: settingsController); - case SampleItemDetailsView.routeName: - return const SampleItemDetailsView(); - case SampleItemListView.routeName: - default: - return const SampleItemListView(); - } - }, - ); - }, - ); - }, - ); - } -} diff --git a/app/lib/src/localization/app_en.arb b/app/lib/src/localization/app_en.arb deleted file mode 100644 index 30654bb1..00000000 --- a/app/lib/src/localization/app_en.arb +++ /dev/null @@ -1,6 +0,0 @@ -{ - "appTitle": "ice_map", - "@appTitle": { - "description": "The title of the application" - } -} diff --git a/app/lib/src/sample_feature/sample_item.dart b/app/lib/src/sample_feature/sample_item.dart deleted file mode 100644 index b376e0da..00000000 --- a/app/lib/src/sample_feature/sample_item.dart +++ /dev/null @@ -1,6 +0,0 @@ -/// A placeholder class that represents an entity or model. -class SampleItem { - const SampleItem(this.id); - - final int id; -} diff --git a/app/lib/src/sample_feature/sample_item_details_view.dart b/app/lib/src/sample_feature/sample_item_details_view.dart deleted file mode 100644 index 37df4a8a..00000000 --- a/app/lib/src/sample_feature/sample_item_details_view.dart +++ /dev/null @@ -1,20 +0,0 @@ -import 'package:flutter/material.dart'; - -/// Displays detailed information about a SampleItem. -class SampleItemDetailsView extends StatelessWidget { - const SampleItemDetailsView({super.key}); - - static const routeName = '/sample_item'; - - @override - Widget build(BuildContext context) { - return Scaffold( - appBar: AppBar( - title: const Text('Item Details'), - ), - body: const Center( - child: Text('More Information Here'), - ), - ); - } -} diff --git a/app/lib/src/sample_feature/sample_item_list_view.dart b/app/lib/src/sample_feature/sample_item_list_view.dart deleted file mode 100644 index 78066e93..00000000 --- a/app/lib/src/sample_feature/sample_item_list_view.dart +++ /dev/null @@ -1,71 +0,0 @@ -import 'package:flutter/material.dart'; - -import '../settings/settings_view.dart'; -import 'sample_item.dart'; -import 'sample_item_details_view.dart'; - -/// Displays a list of SampleItems. -class SampleItemListView extends StatelessWidget { - const SampleItemListView({ - super.key, - this.items = const [SampleItem(1), SampleItem(2), SampleItem(3)], - }); - - static const routeName = '/'; - - final List<SampleItem> items; - - @override - Widget build(BuildContext context) { - return Scaffold( - appBar: AppBar( - title: const Text('Sample Items'), - actions: [ - IconButton( - icon: const Icon(Icons.settings), - onPressed: () { - // Navigate to the settings page. If the user leaves and returns - // to the app after it has been killed while running in the - // background, the navigation stack is restored. - Navigator.restorablePushNamed(context, SettingsView.routeName); - }, - ), - ], - ), - - // To work with lists that may contain a large number of items, it’s best - // to use the ListView.builder constructor. - // - // In contrast to the default ListView constructor, which requires - // building all Widgets up front, the ListView.builder constructor lazily - // builds Widgets as they’re scrolled into view. - body: ListView.builder( - // Providing a restorationId allows the ListView to restore the - // scroll position when a user leaves and returns to the app after it - // has been killed while running in the background. - restorationId: 'sampleItemListView', - itemCount: items.length, - itemBuilder: (BuildContext context, int index) { - final item = items[index]; - - return ListTile( - title: Text('SampleItem ${item.id}'), - leading: const CircleAvatar( - // Display the Flutter Logo image asset. - foregroundImage: AssetImage('assets/images/flutter_logo.png'), - ), - onTap: () { - // Navigate to the details page. If the user leaves and returns to - // the app after it has been killed while running in the - // background, the navigation stack is restored. - Navigator.restorablePushNamed( - context, - SampleItemDetailsView.routeName, - ); - } - ); - }, - ), - ); - } -} diff --git a/app/lib/src/settings/settings_controller.dart b/app/lib/src/settings/settings_controller.dart deleted file mode 100644 index e32c0dfb..00000000 --- a/app/lib/src/settings/settings_controller.dart +++ /dev/null @@ -1,50 +0,0 @@ -import 'package:flutter/material.dart'; - -import 'settings_service.dart'; - -/// A class that many Widgets can interact with to read user settings, update -/// user settings, or listen to user settings changes. -/// -/// Controllers glue Data Services to Flutter Widgets. The SettingsController -/// uses the SettingsService to store and retrieve user settings. -class SettingsController with ChangeNotifier { - SettingsController(this._settingsService); - - // Make SettingsService a private variable so it is not used directly. - final SettingsService _settingsService; - - // Make ThemeMode a private variable so it is not updated directly without - // also persisting the changes with the SettingsService. - late ThemeMode _themeMode; - - // Allow Widgets to read the user's preferred ThemeMode. - ThemeMode get themeMode => _themeMode; - - /// Load the user's settings from the SettingsService. It may load from a - /// local database or the internet. The controller only knows it can load the - /// settings from the service. - Future<void> loadSettings() async { - _themeMode = await _settingsService.themeMode(); - - // Important! Inform listeners a change has occurred. - notifyListeners(); - } - - /// Update and persist the ThemeMode based on the user's selection. - Future<void> updateThemeMode(ThemeMode? newThemeMode) async { - if (newThemeMode == null) return; - - // Do not perform any work if new and old ThemeMode are identical - if (newThemeMode == _themeMode) return; - - // Otherwise, store the new ThemeMode in memory - _themeMode = newThemeMode; - - // Important! Inform listeners a change has occurred. - notifyListeners(); - - // Persist the changes to a local database or the internet using the - // SettingService. - await _settingsService.updateThemeMode(newThemeMode); - } -} diff --git a/app/lib/src/settings/settings_service.dart b/app/lib/src/settings/settings_service.dart deleted file mode 100644 index 6f94dc33..00000000 --- a/app/lib/src/settings/settings_service.dart +++ /dev/null @@ -1,17 +0,0 @@ -import 'package:flutter/material.dart'; - -/// A service that stores and retrieves user settings. -/// -/// By default, this class does not persist user settings. If you'd like to -/// persist the user settings locally, use the shared_preferences package. If -/// you'd like to store settings on a web server, use the http package. -class SettingsService { - /// Loads the User's preferred ThemeMode from local or remote storage. - Future<ThemeMode> themeMode() async => ThemeMode.system; - - /// Persists the user's preferred ThemeMode to local or remote storage. - Future<void> updateThemeMode(ThemeMode theme) async { - // Use the shared_preferences package to persist settings locally or the - // http package to persist settings over the network. - } -} diff --git a/app/lib/src/settings/settings_view.dart b/app/lib/src/settings/settings_view.dart deleted file mode 100644 index 7aae6445..00000000 --- a/app/lib/src/settings/settings_view.dart +++ /dev/null @@ -1,51 +0,0 @@ -import 'package:flutter/material.dart'; - -import 'settings_controller.dart'; - -/// Displays the various settings that can be customized by the user. -/// -/// When a user changes a setting, the SettingsController is updated and -/// Widgets that listen to the SettingsController are rebuilt. -class SettingsView extends StatelessWidget { - const SettingsView({super.key, required this.controller}); - - static const routeName = '/settings'; - - final SettingsController controller; - - @override - Widget build(BuildContext context) { - return Scaffold( - appBar: AppBar( - title: const Text('Settings'), - ), - body: Padding( - padding: const EdgeInsets.all(16), - // Glue the SettingsController to the theme selection DropdownButton. - // - // When a user selects a theme from the dropdown list, the - // SettingsController is updated, which rebuilds the MaterialApp. - child: DropdownButton<ThemeMode>( - // Read the selected themeMode from the controller - value: controller.themeMode, - // Call the updateThemeMode method any time the user selects a theme. - onChanged: controller.updateThemeMode, - items: const [ - DropdownMenuItem( - value: ThemeMode.system, - child: Text('System Theme'), - ), - DropdownMenuItem( - value: ThemeMode.light, - child: Text('Light Theme'), - ), - DropdownMenuItem( - value: ThemeMode.dark, - child: Text('Dark Theme'), - ) - ], - ), - ), - ); - } -} diff --git a/app/pubspec.lock b/app/pubspec.lock index 8abb6919..399063b4 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -41,14 +41,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.18.0" - cupertino_icons: - dependency: "direct main" - description: - name: cupertino_icons - sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d - url: "https://pub.dev" - source: hosted - version: "1.0.6" fake_async: dependency: transitive description: @@ -79,10 +71,10 @@ packages: dependency: "direct main" description: name: http - sha256: a2bbf9d017fcced29139daa8ed2bba4ece450ab222871df93ca9eec6f80c34ba + sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "0.13.6" http_parser: dependency: transitive description: diff --git a/app/pubspec.yaml b/app/pubspec.yaml index f2ecda03..ad954a09 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -1,92 +1,21 @@ name: app description: "A new Flutter project." -# The following line prevents the package from being accidentally published to -# pub.dev using `flutter pub publish`. This is preferred for private packages. -publish_to: 'none' # Remove this line if you wish to publish to pub.dev - -# The following defines the version and build number for your application. -# A version number is three numbers separated by dots, like 1.2.43 -# followed by an optional build number separated by a +. -# Both the version and the builder number may be overridden in flutter -# build by specifying --build-name and --build-number, respectively. -# In Android, build-name is used as versionName while build-number used as versionCode. -# Read more about Android versioning at https://developer.android.com/studio/publish/versioning -# In iOS, build-name is used as CFBundleShortVersionString while build-number is used as CFBundleVersion. -# Read more about iOS versioning at -# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -# In Windows, build-name is used as the major, minor, and patch parts -# of the product and file versions while build-number is used as the build suffix. -version: 1.0.0+1 +publish_to: 'none' +version: 0.1.0 environment: sdk: '>=3.2.6 <4.0.0' -# Dependencies specify other packages that your package needs in order to work. -# To automatically upgrade your package dependencies to the latest versions -# consider running `flutter pub upgrade --major-versions`. Alternatively, -# dependencies can be manually updated by changing the version numbers below to -# the latest version available on pub.dev. To see which dependencies have newer -# versions available, run `flutter pub outdated`. dependencies: flutter: sdk: flutter - http: ^1.2.0 - - + http: ^0.13.3 - # The following adds the Cupertino Icons font to your application. - # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^1.0.2 dev_dependencies: flutter_test: sdk: flutter - - # The "flutter_lints" package below contains a set of recommended lints to - # encourage good coding practices. The lint set provided by the package is - # activated in the `analysis_options.yaml` file located at the root of your - # package. See that file for information about deactivating specific lint - # rules and activating additional ones. flutter_lints: ^2.0.0 -# For information on the generic Dart part of this file, see the -# following page: https://dart.dev/tools/pub/pubspec - -# The following section is specific to Flutter packages. flutter: - - # The following line ensures that the Material Icons font is - # included with your application, so that you can use the icons in - # the material Icons class. uses-material-design: true - - # To add assets to your application, add an assets section, like this: - # assets: - # - images/a_dot_burr.jpeg - # - images/a_dot_ham.jpeg - - # An image asset can refer to one or more resolution-specific "variants", see - # https://flutter.dev/assets-and-images/#resolution-aware - - # For details regarding adding assets from package dependencies, see - # https://flutter.dev/assets-and-images/#from-packages - - # To add custom fonts to your application, add a fonts section here, - # in this "flutter" section. Each entry in this list should have a - # "family" key with the font family name, and a "fonts" key with a - # list giving the asset and other descriptors for the font. For - # example: - # fonts: - # - family: Schyler - # fonts: - # - asset: fonts/Schyler-Regular.ttf - # - asset: fonts/Schyler-Italic.ttf - # style: italic - # - family: Trajan Pro - # fonts: - # - asset: fonts/TrajanPro.ttf - # - asset: fonts/TrajanPro_Bold.ttf - # weight: 700 - # - # For details regarding fonts from package dependencies, - # see https://flutter.dev/custom-fonts/#from-packages diff --git a/app/test/unit_test.dart b/app/test/unit_test.dart deleted file mode 100644 index e100eb0b..00000000 --- a/app/test/unit_test.dart +++ /dev/null @@ -1,15 +0,0 @@ -// This is an example unit test. -// -// A unit test tests a single function, method, or class. To learn more about -// writing unit tests, visit -// https://flutter.dev/docs/cookbook/testing/unit/introduction - -import 'package:flutter_test/flutter_test.dart'; - -void main() { - group('Plus Operator', () { - test('should add two numbers together', () { - expect(1 + 1, 2); - }); - }); -} diff --git a/app/test/widget_test.dart b/app/test/widget_test.dart deleted file mode 100644 index 7d110a79..00000000 --- a/app/test/widget_test.dart +++ /dev/null @@ -1,30 +0,0 @@ -// This is a basic Flutter widget test. -// -// To perform an interaction with a widget in your test, use the WidgetTester -// utility in the flutter_test package. For example, you can send tap and scroll -// gestures. You can also use WidgetTester to find child widgets in the widget -// tree, read text, and verify that the values of widget properties are correct. - -import 'package:flutter/material.dart'; -import 'package:flutter_test/flutter_test.dart'; - -import 'package:app/main.dart'; - -void main() { - testWidgets('Counter increments smoke test', (WidgetTester tester) async { - // Build our app and trigger a frame. - await tester.pumpWidget(const App()); - - // Verify that our counter starts at 0. - expect(find.text('0'), findsOneWidget); - expect(find.text('1'), findsNothing); - - // Tap the '+' icon and trigger a frame. - await tester.tap(find.byIcon(Icons.add)); - await tester.pump(); - - // Verify that our counter has incremented. - expect(find.text('0'), findsNothing); - expect(find.text('1'), findsOneWidget); - }); -} diff --git a/service.proto b/service.proto deleted file mode 100644 index ae09b6c5..00000000 --- a/service.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; - -service NumberSortingService { - rpc SortNumbers (NumberArray) returns (NumberArray) {} -} - -message NumberArray { - repeated int32 numbers = 1; -} -- GitLab