Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modified the app compatible with the latest SDK #41

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
355 changes: 355 additions & 0 deletions .dart_tool/package_config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,355 @@
{
"configVersion": 2,
"packages": [
{
"name": "_fe_analyzer_shared",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/_fe_analyzer_shared-11.0.0",
"packageUri": "lib/",
"languageVersion": "2.2"
},
{
"name": "analyzer",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/analyzer-0.40.4",
"packageUri": "lib/",
"languageVersion": "2.7"
},
{
"name": "args",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/args-1.6.0",
"packageUri": "lib/",
"languageVersion": "2.3"
},
{
"name": "async",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/async-2.5.0-nullsafety.1",
"packageUri": "lib/",
"languageVersion": "2.10"
},
{
"name": "boolean_selector",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/boolean_selector-2.1.0-nullsafety.1",
"packageUri": "lib/",
"languageVersion": "2.10"
},
{
"name": "build",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/build-1.5.0",
"packageUri": "lib/",
"languageVersion": "2.9"
},
{
"name": "built_collection",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/built_collection-4.3.2",
"packageUri": "lib/",
"languageVersion": "2.6"
},
{
"name": "built_value",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/built_value-7.1.0",
"packageUri": "lib/",
"languageVersion": "2.3"
},
{
"name": "characters",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/characters-1.1.0-nullsafety.3",
"packageUri": "lib/",
"languageVersion": "2.10"
},
{
"name": "charcode",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/charcode-1.2.0-nullsafety.1",
"packageUri": "lib/",
"languageVersion": "2.10"
},
{
"name": "cli_util",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/cli_util-0.2.0",
"packageUri": "lib/",
"languageVersion": "2.0"
},
{
"name": "clock",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/clock-1.1.0-nullsafety.1",
"packageUri": "lib/",
"languageVersion": "2.10"
},
{
"name": "code_builder",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/code_builder-3.5.0",
"packageUri": "lib/",
"languageVersion": "2.7"
},
{
"name": "collection",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/collection-1.15.0-nullsafety.3",
"packageUri": "lib/",
"languageVersion": "2.10"
},
{
"name": "convert",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/convert-2.1.1",
"packageUri": "lib/",
"languageVersion": "1.17"
},
{
"name": "crypto",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/crypto-2.1.5",
"packageUri": "lib/",
"languageVersion": "2.3"
},
{
"name": "dart_style",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/dart_style-1.3.8",
"packageUri": "lib/",
"languageVersion": "2.9"
},
{
"name": "fake_async",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/fake_async-1.2.0-nullsafety.1",
"packageUri": "lib/",
"languageVersion": "2.10"
},
{
"name": "firebase_analytics",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/firebase_analytics-1.2.0+1",
"packageUri": "lib/",
"languageVersion": "2.0"
},
{
"name": "firebase_auth",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/firebase_auth-0.6.6",
"packageUri": "lib/",
"languageVersion": "2.0"
},
{
"name": "firebase_core",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/firebase_core-0.2.5+1",
"packageUri": "lib/",
"languageVersion": "2.0"
},
{
"name": "firebase_database",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/firebase_database-1.1.0+1",
"packageUri": "lib/",
"languageVersion": "2.0"
},
{
"name": "fixnum",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/fixnum-0.10.11",
"packageUri": "lib/",
"languageVersion": "2.1"
},
{
"name": "flutter",
"rootUri": "file:///C:/src/flutter/flutter/packages/flutter",
"packageUri": "lib/",
"languageVersion": "2.10"
},
{
"name": "flutter_redux",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/flutter_redux-0.5.4",
"packageUri": "lib/",
"languageVersion": "2.0"
},
{
"name": "flutter_test",
"rootUri": "file:///C:/src/flutter/flutter/packages/flutter_test",
"packageUri": "lib/",
"languageVersion": "2.2"
},
{
"name": "glob",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/glob-1.2.0",
"packageUri": "lib/",
"languageVersion": "2.1"
},
{
"name": "google_sign_in",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/google_sign_in-3.3.0+1",
"packageUri": "lib/",
"languageVersion": "2.0"
},
{
"name": "intl",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/intl-0.15.8",
"packageUri": "lib/",
"languageVersion": "2.0"
},
{
"name": "js",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/js-0.6.2",
"packageUri": "lib/",
"languageVersion": "2.0"
},
{
"name": "logging",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/logging-0.11.4",
"packageUri": "lib/",
"languageVersion": "2.0"
},
{
"name": "matcher",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/matcher-0.12.10-nullsafety.1",
"packageUri": "lib/",
"languageVersion": "2.10"
},
{
"name": "meta",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/meta-1.3.0-nullsafety.3",
"packageUri": "lib/",
"languageVersion": "2.10"
},
{
"name": "mockito",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/mockito-4.1.3",
"packageUri": "lib/",
"languageVersion": "2.7"
},
{
"name": "node_interop",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/node_interop-1.1.1",
"packageUri": "lib/",
"languageVersion": "2.0"
},
{
"name": "node_io",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/node_io-1.1.1",
"packageUri": "lib/",
"languageVersion": "2.2"
},
{
"name": "numberpicker",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/numberpicker-0.1.7",
"packageUri": "lib/",
"languageVersion": "2.0"
},
{
"name": "package_config",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/package_config-1.9.3",
"packageUri": "lib/",
"languageVersion": "2.7"
},
{
"name": "path",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/path-1.8.0-nullsafety.1",
"packageUri": "lib/",
"languageVersion": "2.10"
},
{
"name": "pedantic",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/pedantic-1.9.2",
"packageUri": "lib/",
"languageVersion": "2.1"
},
{
"name": "pub_semver",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/pub_semver-1.4.4",
"packageUri": "lib/",
"languageVersion": "2.0"
},
{
"name": "quiver",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/quiver-2.1.3",
"packageUri": "lib/",
"languageVersion": "2.0"
},
{
"name": "redux",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/redux-3.0.0",
"packageUri": "lib/",
"languageVersion": "1.24"
},
{
"name": "shared_preferences",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-0.4.3",
"packageUri": "lib/",
"languageVersion": "2.0"
},
{
"name": "sky_engine",
"rootUri": "file:///C:/src/flutter/flutter/bin/cache/pkg/sky_engine",
"packageUri": "lib/",
"languageVersion": "1.11"
},
{
"name": "source_gen",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/source_gen-0.9.7+1",
"packageUri": "lib/",
"languageVersion": "2.7"
},
{
"name": "source_span",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/source_span-1.8.0-nullsafety.2",
"packageUri": "lib/",
"languageVersion": "2.10"
},
{
"name": "stack_trace",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/stack_trace-1.10.0-nullsafety.1",
"packageUri": "lib/",
"languageVersion": "2.10"
},
{
"name": "stream_channel",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/stream_channel-2.1.0-nullsafety.1",
"packageUri": "lib/",
"languageVersion": "2.10"
},
{
"name": "string_scanner",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/string_scanner-1.1.0-nullsafety.1",
"packageUri": "lib/",
"languageVersion": "2.10"
},
{
"name": "term_glyph",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/term_glyph-1.2.0-nullsafety.1",
"packageUri": "lib/",
"languageVersion": "2.10"
},
{
"name": "test_api",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/test_api-0.2.19-nullsafety.2",
"packageUri": "lib/",
"languageVersion": "2.10"
},
{
"name": "tuple",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/tuple-1.0.3",
"packageUri": "lib/",
"languageVersion": "2.0"
},
{
"name": "typed_data",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/typed_data-1.3.0-nullsafety.3",
"packageUri": "lib/",
"languageVersion": "2.10"
},
{
"name": "vector_math",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/vector_math-2.1.0-nullsafety.3",
"packageUri": "lib/",
"languageVersion": "2.10"
},
{
"name": "watcher",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/watcher-0.9.7+15",
"packageUri": "lib/",
"languageVersion": "2.2"
},
{
"name": "yaml",
"rootUri": "file:///C:/src/flutter/flutter/.pub-cache/hosted/pub.dartlang.org/yaml-2.2.1",
"packageUri": "lib/",
"languageVersion": "2.4"
},
{
"name": "weight_tracker",
"rootUri": "../",
"packageUri": "lib/"
}
],
"generated": "2020-10-23T14:31:39.393685Z",
"generator": "pub",
"generatorVersion": "2.10.2"
}
1 change: 1 addition & 0 deletions .flutter-plugins-dependencies
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"firebase_analytics","path":"C:\\\\src\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_analytics-1.2.0+1\\\\","dependencies":[]},{"name":"firebase_auth","path":"C:\\\\src\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth-0.6.6\\\\","dependencies":["firebase_core"]},{"name":"firebase_core","path":"C:\\\\src\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core-0.2.5+1\\\\","dependencies":[]},{"name":"firebase_database","path":"C:\\\\src\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_database-1.1.0+1\\\\","dependencies":["firebase_core"]},{"name":"google_sign_in","path":"C:\\\\src\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_sign_in-3.3.0+1\\\\","dependencies":[]},{"name":"shared_preferences","path":"C:\\\\src\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences-0.4.3\\\\","dependencies":[]}],"android":[{"name":"firebase_analytics","path":"C:\\\\src\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_analytics-1.2.0+1\\\\","dependencies":[]},{"name":"firebase_auth","path":"C:\\\\src\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_auth-0.6.6\\\\","dependencies":["firebase_core"]},{"name":"firebase_core","path":"C:\\\\src\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_core-0.2.5+1\\\\","dependencies":[]},{"name":"firebase_database","path":"C:\\\\src\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\firebase_database-1.1.0+1\\\\","dependencies":["firebase_core"]},{"name":"google_sign_in","path":"C:\\\\src\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\google_sign_in-3.3.0+1\\\\","dependencies":[]},{"name":"shared_preferences","path":"C:\\\\src\\\\flutter\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences-0.4.3\\\\","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"firebase_analytics","dependencies":[]},{"name":"firebase_auth","dependencies":["firebase_core"]},{"name":"firebase_core","dependencies":[]},{"name":"firebase_database","dependencies":["firebase_core"]},{"name":"google_sign_in","dependencies":[]},{"name":"shared_preferences","dependencies":[]}],"date_created":"2020-10-23 20:11:12.167080","version":"1.22.2"}
1 change: 1 addition & 0 deletions android/gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
org.gradle.jvmargs=-Xmx1536M
android.enableR8=true
15 changes: 15 additions & 0 deletions ios/Flutter/flutter_export_environment.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#!/bin/sh
# This is a generated file; do not edit or check into version control.
export "FLUTTER_ROOT=C:\src\flutter\flutter"
export "FLUTTER_APPLICATION_PATH=D:\OpenSource\weight_tracker"
export "FLUTTER_TARGET=lib\main.dart"
export "FLUTTER_BUILD_DIR=build"
export "SYMROOT=${SOURCE_ROOT}/../build\ios"
export "OTHER_LDFLAGS=$(inherited) -framework Flutter"
export "FLUTTER_FRAMEWORK_DIR=C:\src\flutter\flutter\bin\cache\artifacts\engine\ios"
export "FLUTTER_BUILD_NAME=1.0.0"
export "FLUTTER_BUILD_NUMBER=1"
export "DART_OBFUSCATION=false"
export "TRACK_WIDGET_CREATION=false"
export "TREE_SHAKE_ICONS=false"
export "PACKAGE_CONFIG=.packages"
2 changes: 1 addition & 1 deletion lib/screens/profile_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ class ProfileView extends StatelessWidget {
padding: const EdgeInsets.all(16.0),
child: Text(
label,
style: Theme.of(context).textTheme.display1,
style: Theme.of(context).textTheme.bodyText1,
),
);
}
Expand Down
2 changes: 1 addition & 1 deletion lib/screens/settings_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class SettingsPage extends StatelessWidget {
new Expanded(
child: new Text(
"Unit",
style: Theme.of(context).textTheme.headline,
style: Theme.of(context).textTheme.headline1,
)),
new DropdownButton<String>(
key: const Key('UnitDropdown'),
Expand Down
Loading