Skip to content

Commit

Permalink
Flutter 3.13 upgrade
Browse files Browse the repository at this point in the history
* chore(deps): upgrade flutter to 3.13

Fix antialiasing issue in gradient overlay and cover image
Change font size of movie description

* chore: prepare 1.1.2 for release
  • Loading branch information
rafayali committed Aug 28, 2023
1 parent 93a958e commit e670f29
Show file tree
Hide file tree
Showing 8 changed files with 97 additions and 78 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,7 @@ app.*.symbols

# Obfuscation related
app.*.map.json

# Keystore files
*.keystore
*.jks
Binary file removed android/upload-keystore.jks
Binary file not shown.
8 changes: 4 additions & 4 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ PODS:
- shared_preferences_foundation (0.0.1):
- Flutter
- FlutterMacOS
- sqflite (0.0.2):
- sqflite (0.0.3):
- Flutter
- FMDB (>= 2.7.5)
- webview_flutter_wkwebview (0.0.1):
Expand Down Expand Up @@ -47,9 +47,9 @@ SPEC CHECKSUMS:
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
integration_test: 13825b8a9334a850581300559b8839134b124670
path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8
shared_preferences_foundation: e2dae3258e06f44cc55f49d42024fd8dd03c590c
sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a
webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a

PODFILE CHECKSUM: 9d8d97787c50dddd06034fc2c1177245616ccdef
Expand Down
2 changes: 1 addition & 1 deletion ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
97C146E61CF9000F007C117D /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1300;
LastUpgradeCheck = 1430;
ORGANIZATIONNAME = "";
TargetAttributes = {
97C146ED1CF9000F007C117D = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1300"
LastUpgradeVersion = "1430"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
73 changes: 40 additions & 33 deletions lib/ui/movie_detail/view/movie_detail_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,11 @@ class MovieDetailPage extends StatefulWidget {
}

class _MovieDetailPageState extends State<MovieDetailPage> {
late final MovieDetailViewModel _viewModel;
late final MovieDetailViewModel _viewModel = context.read();

@override
void initState() {
super.initState();
_viewModel = context.read();

_viewModel.load();
}

Expand Down Expand Up @@ -55,12 +53,14 @@ class MovieContent extends StatelessWidget {
Stack(
alignment: Alignment.topLeft,
children: [
CachedNetworkImage(
imageUrl: _movieDetailUiModel.backdrop ?? emptyString,
height: 372,
width: double.infinity,
fit: BoxFit.cover,
errorWidget: (_, __, ___) => Container(color: Colors.grey),
AspectRatio(
aspectRatio: 1,
child: CachedNetworkImage(
imageUrl: _movieDetailUiModel.backdrop ?? emptyString,
fit: BoxFit.cover,
errorWidget: (_, __, ___) =>
Container(color: Colors.grey),
),
),
Positioned.fill(
child: Align(
Expand Down Expand Up @@ -93,29 +93,36 @@ class MovieContent extends StatelessWidget {
),
),
const SizedBox(height: 8),
Builder(
builder: (context) {
if (_movieDetailUiModel.runtime == null ||
_movieDetailUiModel.releaseDate == null ||
_movieDetailUiModel.genre == null) {
return const Text(emptyString);
} else {
final year =
_movieDetailUiModel.releaseDate!.year;
final genre =
_movieDetailUiModel.genre!.first;
final minutes =
_movieDetailUiModel.runtime! % 60;
final hours =
_movieDetailUiModel.runtime! ~/ 60;
return Text(
'$year • $genre • ${hours}h ${minutes}m',
style:
Theme.of(context).textTheme.bodyLarge,
textAlign: TextAlign.center,
);
}
},
SizedBox(
height: 24,
child: Center(
child: Builder(
builder: (context) {
if (_movieDetailUiModel.runtime == null ||
_movieDetailUiModel.releaseDate ==
null ||
_movieDetailUiModel.genre == null) {
return const Text(emptyString);
} else {
final year =
_movieDetailUiModel.releaseDate!.year;
final genre =
_movieDetailUiModel.genre!.first;
final minutes =
_movieDetailUiModel.runtime! % 60;
final hours =
_movieDetailUiModel.runtime! ~/ 60;
return Text(
'$year • $genre • ${hours}h ${minutes}m',
style: Theme.of(context)
.textTheme
.bodyLarge,
textAlign: TextAlign.center,
);
}
},
),
),
),
],
),
Expand Down Expand Up @@ -145,7 +152,7 @@ class MovieContent extends StatelessWidget {
padding: const EdgeInsets.only(left: 16, right: 16, top: 8),
child: Text(
_movieDetailUiModel.description!,
style: Theme.of(context).textTheme.bodyLarge,
style: Theme.of(context).textTheme.bodyMedium,
textAlign: TextAlign.center,
),
);
Expand Down
84 changes: 46 additions & 38 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@ packages:
dependency: transitive
description:
name: built_value
sha256: "598a2a682e2a7a90f08ba39c0aaa9374c5112340f0a2e275f61b59389543d166"
sha256: ff627b645b28fb8bdb69e645f910c2458fd6b65f6585c3a53e0626024897dedf
url: "https://pub.dev"
source: hosted
version: "8.6.1"
version: "8.6.2"
cached_network_image:
dependency: "direct main"
description:
Expand Down Expand Up @@ -157,18 +157,18 @@ packages:
dependency: "direct main"
description:
name: chopper
sha256: "64b8e3260b52b994317519b72ee98169f46253eff05e2e98c64212644077f412"
sha256: d6d664027c0ec32006b57167bc4e609acdb7c8d4a2496f859171fc4bd49f5924
url: "https://pub.dev"
source: hosted
version: "7.0.2"
version: "7.0.5"
chopper_generator:
dependency: "direct dev"
description:
name: chopper_generator
sha256: "3e55981c7c208269263263d61d23afec9f08ddb022e728bd3ab2cb344096b1a2"
sha256: "08f0f56e71c00cb741931ff12e8e0cabeddf1d489079ba22ea1b66a009571d9f"
url: "https://pub.dev"
source: hosted
version: "7.0.1"
version: "7.0.2"
cli_util:
dependency: transitive
description:
Expand Down Expand Up @@ -197,10 +197,10 @@ packages:
dependency: transitive
description:
name: collection
sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
url: "https://pub.dev"
source: hosted
version: "1.17.1"
version: "1.17.2"
convert:
dependency: transitive
description:
Expand Down Expand Up @@ -448,10 +448,10 @@ packages:
dependency: "direct main"
description:
name: intl
sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6
sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
url: "https://pub.dev"
source: hosted
version: "0.18.0"
version: "0.18.1"
io:
dependency: transitive
description:
Expand Down Expand Up @@ -512,18 +512,18 @@ packages:
dependency: transitive
description:
name: matcher
sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
url: "https://pub.dev"
source: hosted
version: "0.12.15"
version: "0.12.16"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
url: "https://pub.dev"
source: hosted
version: "0.2.0"
version: "0.5.0"
meta:
dependency: transitive
description:
Expand Down Expand Up @@ -752,10 +752,10 @@ packages:
dependency: transitive
description:
name: shared_preferences_foundation
sha256: f39696b83e844923b642ce9dd4bd31736c17e697f6731a5adf445b1274cf3cd4
sha256: d29753996d8eb8f7619a1f13df6ce65e34bc107bef6330739ed76f18b22310ef
url: "https://pub.dev"
source: hosted
version: "2.3.2"
version: "2.3.3"
shared_preferences_linux:
dependency: transitive
description:
Expand Down Expand Up @@ -869,10 +869,10 @@ packages:
dependency: transitive
description:
name: source_span
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
url: "https://pub.dev"
source: hosted
version: "1.9.1"
version: "1.10.0"
sqflite:
dependency: transitive
description:
Expand Down Expand Up @@ -949,26 +949,26 @@ packages:
dependency: transitive
description:
name: test
sha256: "3dac9aecf2c3991d09b9cdde4f98ded7b30804a88a0d7e4e7e1678e78d6b97f4"
sha256: "13b41f318e2a5751c3169137103b60c584297353d4b1761b66029bae6411fe46"
url: "https://pub.dev"
source: hosted
version: "1.24.1"
version: "1.24.3"
test_api:
dependency: transitive
description:
name: test_api
sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
url: "https://pub.dev"
source: hosted
version: "0.5.1"
version: "0.6.0"
test_core:
dependency: transitive
description:
name: test_core
sha256: "5138dbffb77b2289ecb12b81c11ba46036590b72a64a7a90d6ffb880f1a29e93"
sha256: "99806e9e6d95c7b059b7a0fc08f07fc53fabe54a829497f0d9676299f1e8637e"
url: "https://pub.dev"
source: hosted
version: "0.5.1"
version: "0.5.3"
time:
dependency: transitive
description:
Expand Down Expand Up @@ -1037,10 +1037,10 @@ packages:
dependency: transitive
description:
name: vm_service
sha256: f6deed8ed625c52864792459709183da231ebf66ff0cf09e69b573227c377efe
sha256: c620a6f783fa22436da68e42db7ebbf18b8c44b9a46ab911f666ff09ffd9153f
url: "https://pub.dev"
source: hosted
version: "11.3.0"
version: "11.7.1"
watcher:
dependency: transitive
description:
Expand All @@ -1049,6 +1049,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.1.0"
web:
dependency: transitive
description:
name: web
sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
url: "https://pub.dev"
source: hosted
version: "0.1.4-beta"
web_socket_channel:
dependency: transitive
description:
Expand Down Expand Up @@ -1077,42 +1085,42 @@ packages:
dependency: "direct main"
description:
name: webview_flutter
sha256: "789d52bd789373cc1e100fb634af2127e86c99cf9abde09499743270c5de8d00"
sha256: "04a0782fb058b7c71f2048935583488f4d32e9147ca403abc4e58f1de9964629"
url: "https://pub.dev"
source: hosted
version: "4.2.2"
version: "4.2.3"
webview_flutter_android:
dependency: transitive
description:
name: webview_flutter_android
sha256: d936a09fbfd08cb78f7329e0bbacf6158fbdfe24ffc908b22444c07d295eb193
sha256: bca797abba472868655b5f1a6029c1132385685ee9db4713cb0e7f33076210c6
url: "https://pub.dev"
source: hosted
version: "3.9.2"
version: "3.9.3"
webview_flutter_platform_interface:
dependency: transitive
description:
name: webview_flutter_platform_interface
sha256: "564ef378cafc1a0e29f1d76ce175ef517a0a6115875dff7b43fccbef2b0aeb30"
sha256: "0ca3cfcc6781a7de701d580917af4a9efc4e3e129f8ead95a80587f0a749480a"
url: "https://pub.dev"
source: hosted
version: "2.4.0"
version: "2.5.0"
webview_flutter_wkwebview:
dependency: transitive
description:
name: webview_flutter_wkwebview
sha256: "5fa098f28b606f699e8ca52d9e4e11edbbfef65189f5f77ae92703ba5408fd25"
sha256: ed749f94ac9e814d04a258a9255cf69cfa4cc6006ff59542aea7fb4590144972
url: "https://pub.dev"
source: hosted
version: "3.7.2"
version: "3.7.3"
win32:
dependency: transitive
description:
name: win32
sha256: f2add6fa510d3ae152903412227bda57d0d5a8da61d2c39c1fb022c9429a41c0
sha256: "9e82a402b7f3d518fb9c02d0e9ae45952df31b9bf34d77baf19da2de03fc2aaa"
url: "https://pub.dev"
source: hosted
version: "5.0.6"
version: "5.0.7"
xdg_directories:
dependency: transitive
description:
Expand All @@ -1138,5 +1146,5 @@ packages:
source: hosted
version: "3.1.2"
sdks:
dart: ">=3.0.0 <4.0.0"
flutter: ">=3.7.0-0"
dart: ">=3.1.0-185.0.dev <4.0.0"
flutter: ">=3.7.0"
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
# Read more about iOS versioning at
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
version: 1.1.1+6
version: 1.1.2+8

environment:
sdk: ">=3.0.0 <4.0.0"
Expand Down

0 comments on commit e670f29

Please sign in to comment.