Skip to content
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
13 changes: 13 additions & 0 deletions ios/Flutter/flutter_export_environment.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/sh
# This is a generated file; do not edit or check into version control.
export "FLUTTER_ROOT=/home/alexa/snap/flutter/common/flutter"
export "FLUTTER_APPLICATION_PATH=/home/alexa/Documents/Clima-Flutter"
export "COCOAPODS_PARALLEL_CODE_SIGN=true"
export "FLUTTER_TARGET=lib/main.dart"
export "FLUTTER_BUILD_DIR=build"
export "FLUTTER_BUILD_NAME=1.0.0"
export "FLUTTER_BUILD_NUMBER=1"
export "DART_OBFUSCATION=false"
export "TRACK_WIDGET_CREATION=true"
export "TREE_SHAKE_ICONS=false"
export "PACKAGE_CONFIG=.dart_tool/package_config.json"
4 changes: 2 additions & 2 deletions lib/screens/city_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class _CityScreenState extends State<CityScreen> {
children: <Widget>[
Align(
alignment: Alignment.topLeft,
child: FlatButton(
child: TextButton(
onPressed: () {},
child: Icon(
Icons.arrow_back_ios,
Expand All @@ -35,7 +35,7 @@ class _CityScreenState extends State<CityScreen> {
padding: EdgeInsets.all(20.0),
child: null,
),
FlatButton(
TextButton(
onPressed: () {},
child: Text(
'Get Weather',
Expand Down
2 changes: 1 addition & 1 deletion lib/screens/loading_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class _LoadingScreenState extends State<LoadingScreen> {
Widget build(BuildContext context) {
return Scaffold(
body: Center(
child: RaisedButton(
child: ElevatedButton(
onPressed: () {
//Get the current location
},
Expand Down
6 changes: 3 additions & 3 deletions lib/screens/location_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class _LocationScreenState extends State<LocationScreen> {
image: AssetImage('images/location_background.jpg'),
fit: BoxFit.cover,
colorFilter: ColorFilter.mode(
Colors.white.withOpacity(0.8), BlendMode.dstATop),
Colors.white.withValues(alpha: 0.8), BlendMode.dstATop),
),
),
constraints: BoxConstraints.expand(),
Expand All @@ -28,14 +28,14 @@ class _LocationScreenState extends State<LocationScreen> {
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
FlatButton(
TextButton(
onPressed: () {},
child: Icon(
Icons.near_me,
size: 50.0,
),
),
FlatButton(
TextButton(
onPressed: () {},
child: Icon(
Icons.location_city,
Expand Down
190 changes: 96 additions & 94 deletions pubspec.lock
Original file line number Diff line number Diff line change
@@ -1,69 +1,62 @@
# Generated by pub
# See https://dart.dev/tools/pub/glossary#lockfile
packages:
archive:
dependency: transitive
description:
name: archive
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.11"
args:
dependency: transitive
description:
name: args
url: "https://pub.dartlang.org"
source: hosted
version: "1.5.2"
async:
dependency: transitive
description:
name: async
url: "https://pub.dartlang.org"
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
url: "https://pub.dev"
source: hosted
version: "2.4.0"
version: "2.11.0"
boolean_selector:
dependency: transitive
description:
name: boolean_selector
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.5"
charcode:
dependency: transitive
description:
name: charcode
url: "https://pub.dartlang.org"
sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
url: "https://pub.dev"
source: hosted
version: "1.1.2"
collection:
version: "2.1.1"
characters:
dependency: transitive
description:
name: collection
url: "https://pub.dartlang.org"
name: characters
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
url: "https://pub.dev"
source: hosted
version: "1.14.11"
convert:
version: "1.3.0"
clock:
dependency: transitive
description:
name: convert
url: "https://pub.dartlang.org"
name: clock
sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
url: "https://pub.dev"
source: hosted
version: "2.1.1"
crypto:
version: "1.1.1"
collection:
dependency: transitive
description:
name: crypto
url: "https://pub.dartlang.org"
name: collection
sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
url: "https://pub.dev"
source: hosted
version: "2.1.3"
version: "1.19.0"
cupertino_icons:
dependency: "direct main"
description:
name: cupertino_icons
url: "https://pub.dartlang.org"
sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6
url: "https://pub.dev"
source: hosted
version: "1.0.8"
fake_async:
dependency: transitive
description:
name: fake_async
sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
url: "https://pub.dev"
source: hosted
version: "0.1.2"
version: "1.3.1"
flutter:
dependency: "direct main"
description: flutter
Expand All @@ -74,122 +67,131 @@ packages:
description: flutter
source: sdk
version: "0.0.0"
image:
leak_tracker:
dependency: transitive
description:
name: image
url: "https://pub.dartlang.org"
name: leak_tracker
sha256: "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06"
url: "https://pub.dev"
source: hosted
version: "2.1.4"
matcher:
version: "10.0.7"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: matcher
url: "https://pub.dartlang.org"
name: leak_tracker_flutter_testing
sha256: "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379"
url: "https://pub.dev"
source: hosted
version: "0.12.6"
meta:
version: "3.0.8"
leak_tracker_testing:
dependency: transitive
description:
name: meta
url: "https://pub.dartlang.org"
name: leak_tracker_testing
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
url: "https://pub.dev"
source: hosted
version: "1.1.8"
path:
version: "3.0.1"
matcher:
dependency: transitive
description:
name: path
url: "https://pub.dartlang.org"
name: matcher
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
url: "https://pub.dev"
source: hosted
version: "1.6.4"
pedantic:
version: "0.12.16+1"
material_color_utilities:
dependency: transitive
description:
name: pedantic
url: "https://pub.dartlang.org"
name: material_color_utilities
sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
url: "https://pub.dev"
source: hosted
version: "1.8.0+1"
petitparser:
version: "0.11.1"
meta:
dependency: transitive
description:
name: petitparser
url: "https://pub.dartlang.org"
name: meta
sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
url: "https://pub.dev"
source: hosted
version: "2.4.0"
quiver:
version: "1.15.0"
path:
dependency: transitive
description:
name: quiver
url: "https://pub.dartlang.org"
name: path
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
url: "https://pub.dev"
source: hosted
version: "2.0.5"
version: "1.9.0"
sky_engine:
dependency: transitive
description: flutter
source: sdk
version: "0.0.99"
version: "0.0.0"
source_span:
dependency: transitive
description:
name: source_span
url: "https://pub.dartlang.org"
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
url: "https://pub.dev"
source: hosted
version: "1.5.5"
version: "1.10.0"
stack_trace:
dependency: transitive
description:
name: stack_trace
url: "https://pub.dartlang.org"
sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
url: "https://pub.dev"
source: hosted
version: "1.9.3"
version: "1.12.0"
stream_channel:
dependency: transitive
description:
name: stream_channel
url: "https://pub.dartlang.org"
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
url: "https://pub.dev"
source: hosted
version: "2.0.0"
version: "2.1.2"
string_scanner:
dependency: transitive
description:
name: string_scanner
url: "https://pub.dartlang.org"
sha256: "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3"
url: "https://pub.dev"
source: hosted
version: "1.0.5"
version: "1.3.0"
term_glyph:
dependency: transitive
description:
name: term_glyph
url: "https://pub.dartlang.org"
sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
url: "https://pub.dev"
source: hosted
version: "1.1.0"
version: "1.2.1"
test_api:
dependency: transitive
description:
name: test_api
url: "https://pub.dartlang.org"
sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
url: "https://pub.dev"
source: hosted
version: "0.2.11"
typed_data:
dependency: transitive
description:
name: typed_data
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.6"
version: "0.7.3"
vector_math:
dependency: transitive
description:
name: vector_math
url: "https://pub.dartlang.org"
sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
url: "https://pub.dev"
source: hosted
version: "2.0.8"
xml:
version: "2.1.4"
vm_service:
dependency: transitive
description:
name: xml
url: "https://pub.dartlang.org"
name: vm_service
sha256: f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b
url: "https://pub.dev"
source: hosted
version: "3.5.0"
version: "14.3.0"
sdks:
dart: ">=2.4.0 <3.0.0"
dart: ">=3.4.0 <4.0.0"
flutter: ">=3.18.0-18.0.pre.54"
14 changes: 7 additions & 7 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ description: A new Flutter application.
version: 1.0.0+1

environment:
sdk: ">=2.1.0 <3.0.0"
sdk: ">=2.17.0 <4.0.0"

dependencies:
flutter:
sdk: flutter

cupertino_icons: ^0.1.2
cupertino_icons: ^1.0.8

dev_dependencies:
flutter_test:
Expand All @@ -20,10 +20,10 @@ flutter:
uses-material-design: true

assets:
- images/
- images/

fonts:
- family: Spartan MB
fonts:
- asset: fonts/SpartanMB-Black.otf
weight: 900
- family: Spartan MB
fonts:
- asset: fonts/SpartanMB-Black.otf
weight: 900