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.

Sign up for GitHub

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

fix: migrate to flutter 2.5 #144

Merged
merged 5 commits into from
Oct 3, 2021
Merged

fix: migrate to flutter 2.5 #144

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d38804e
fix: migrate to flutter 2.5
manjotsidhu Oct 1, 2021
1f400a9
Revert "fix: failed to load widget/error widget (#134)"
manjotsidhu Oct 1, 2021
87e768b
fix: update kotlin version to 1.5.10
manjotsidhu Oct 1, 2021
0ed807c
fix: iOS build failure (#146)
RakeshSeervi Oct 2, 2021
f4fb507
fix: format lib/ib_theme.dart
manjotsidhu Oct 2, 2021
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
2 changes: 1 addition & 1 deletion android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
buildscript {
ext.kotlin_version = '1.3.50'
ext.kotlin_version = '1.5.10'
repositories {
google()
jcenter()
Expand Down
2 changes: 1 addition & 1 deletion ios/Flutter/AppFrameworkInfo.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
<key>CFBundleVersion</key>
<string>1.0</string>
<key>MinimumOSVersion</key>
<string>8.0</string>
<string>9.0</string>
</dict>
</plist>
83 changes: 48 additions & 35 deletions ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,33 @@ PODS:
- AppAuth/ExternalUserAgent (= 1.4.0)
- AppAuth/Core (1.4.0)
- AppAuth/ExternalUserAgent (1.4.0)
- FBSDKCoreKit (11.0.1):
- FBSDKCoreKit/Core (= 11.0.1)
- FBSDKCoreKit/Core (11.0.1):
- FBSDKCoreKit_Basics (~> 11.0.1)
- FBSDKCoreKit_Basics (11.0.1):
- FBSDKCoreKit_Basics/Basics (= 11.0.1)
- FBSDKCoreKit_Basics/Basics (11.0.1)
- FBSDKLoginKit (11.0.1):
- FBSDKLoginKit/Login (= 11.0.1)
- FBSDKLoginKit/Login (11.0.1):
- FBSDKCoreKit (~> 11.0.1)
- FBSDKCoreKit_Basics (~> 11.0.1)
- FBAEMKit (11.2.1):
- FBAEMKit/AEM (= 11.2.1)
- FBAEMKit/AEM (11.2.1):
- FBSDKCoreKit_Basics (~> 11.2.1)
- FBSDKCoreKit (11.2.1):
- FBSDKCoreKit/Core (= 11.2.1)
- FBSDKCoreKit/Core (11.2.1):
- FBAEMKit (~> 11.2.1)
- FBSDKCoreKit_Basics (~> 11.2.1)
- FBSDKCoreKit_Basics (11.2.1):
- FBSDKCoreKit_Basics/Basics (= 11.2.1)
- FBSDKCoreKit_Basics/Basics (11.2.1)
- FBSDKLoginKit (11.2.1):
- FBSDKLoginKit/Login (= 11.2.1)
- FBSDKLoginKit/Login (11.2.1):
- FBSDKCoreKit (~> 11.2.1)
- FBSDKCoreKit_Basics (~> 11.2.1)
- Flutter (1.0.0)
- flutter_facebook_auth (2.0.0):
- FBSDKCoreKit (~> 11.0.0)
- FBSDKLoginKit (~> 11.0.0)
- flutter_facebook_auth (3.5.1):
- FBSDKCoreKit (~> 11.2.0)
- FBSDKLoginKit (~> 11.2.0)
- Flutter
- flutter_keyboard_visibility (0.0.1):
- Flutter
- flutter_secure_storage (3.3.1):
- Flutter
- flutter_web_auth (0.3.0):
- flutter_web_auth (0.3.1):
- Flutter
- google_sign_in (0.0.1):
- Flutter
Expand All @@ -37,9 +42,11 @@ PODS:
- GTMAppAuth (1.2.2):
- AppAuth/Core (~> 1.4)
- GTMSessionFetcher/Core (~> 1.5)
- GTMSessionFetcher/Core (1.6.1)
- GTMSessionFetcher/Core (1.7.0)
- image_picker (0.0.1):
- Flutter
- path_provider (0.0.1):
- Flutter
- share (0.0.1):
- Flutter
- shared_preferences (0.0.1):
Expand All @@ -50,7 +57,7 @@ PODS:
- Flutter
- wakelock (0.0.1):
- Flutter
- webview_flutter (0.0.1):
- webview_flutter_wkwebview (0.0.1):
- Flutter

DEPENDENCIES:
Expand All @@ -61,16 +68,18 @@ DEPENDENCIES:
- flutter_web_auth (from `.symlinks/plugins/flutter_web_auth/ios`)
- google_sign_in (from `.symlinks/plugins/google_sign_in/ios`)
- image_picker (from `.symlinks/plugins/image_picker/ios`)
- path_provider (from `.symlinks/plugins/path_provider/ios`)
- share (from `.symlinks/plugins/share/ios`)
- shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
- url_launcher (from `.symlinks/plugins/url_launcher/ios`)
- video_player (from `.symlinks/plugins/video_player/ios`)
- wakelock (from `.symlinks/plugins/wakelock/ios`)
- webview_flutter (from `.symlinks/plugins/webview_flutter/ios`)
- webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`)

SPEC REPOS:
trunk:
- AppAuth
- FBAEMKit
- FBSDKCoreKit
- FBSDKCoreKit_Basics
- FBSDKLoginKit
Expand All @@ -93,6 +102,8 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/google_sign_in/ios"
image_picker:
:path: ".symlinks/plugins/image_picker/ios"
path_provider:
:path: ".symlinks/plugins/path_provider/ios"
share:
:path: ".symlinks/plugins/share/ios"
shared_preferences:
Expand All @@ -103,31 +114,33 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/video_player/ios"
wakelock:
:path: ".symlinks/plugins/wakelock/ios"
webview_flutter:
:path: ".symlinks/plugins/webview_flutter/ios"
webview_flutter_wkwebview:
:path: ".symlinks/plugins/webview_flutter_wkwebview/ios"

SPEC CHECKSUMS:
AppAuth: 31bcec809a638d7bd2f86ea8a52bd45f6e81e7c7
FBSDKCoreKit: 38c9e29a3f1436362acacff6486d3a28628c288f
FBSDKCoreKit_Basics: 06780a4a12e16596bde8406add02c6aa1bf38616
FBSDKLoginKit: 8243e04c590c38b85c69fcf09d1234514d2475c3
Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
flutter_facebook_auth: abc044072738b7baa90d80583dabdb1211614f0d
FBAEMKit: 5de0a7aaa854eec69bb5be20795952a63d38a5f6
FBSDKCoreKit: bf655f808b040ed66a72b9922911b39d703e64f4
FBSDKCoreKit_Basics: 73ebe3a27eb688ac5b5aa7e99f68992993042115
FBSDKLoginKit: 2e76831ef08d356b8f9150ea51cce865074ea304
Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
flutter_facebook_auth: 870a465b1afff3ace7a592bd44665d921991726c
flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069
flutter_secure_storage: 7953c38a04c3fdbb00571bcd87d8e3b5ceb9daec
flutter_web_auth: ede89bf8107b021cf16e769756d267d84d24e88b
google_sign_in: 6bd214b9c154f881422f5fe27b66aaa7bbd580cc
flutter_web_auth: eae2fc62b97d9a44c5c2a1ed0404a6ce396e3d7f
google_sign_in: c5cecea71f3be43282263550556e311c4cc03582
GoogleSignIn: 7137d297ddc022a7e0aa4619c86d72c909fa7213
GTMAppAuth: ad5c2b70b9a8689e1a04033c9369c4915bfcbe89
GTMSessionFetcher: 36689134877faeb055b27dfa4ccc9ceaa42e029e
image_picker: e06f7a68f000bd36f552c1847e33cda96ed31f1f
GTMSessionFetcher: 43748f93435c2aa068b1cbe39655aaf600652e91
image_picker: 9aa50e1d8cdacdbed739e925b7eea16d014367e6
path_provider: d1e9807085df1f9cc9318206cd649dc0b76be3de
share: 0b2c3e82132f5888bccca3351c504d0003b3b410
shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
video_player: 9cc823b1d9da7e8427ee591e8438bfbcde500e6e
shared_preferences: 5033afbb22d372e15aff8ff766df9021b845f273
url_launcher: b6e016d912f04be9f5bf6e8e82dc599b7ba59649
video_player: ecd305f42e9044793efd34846e1ce64c31ea6fcb
wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f
webview_flutter: 3603125dfd3bcbc9d8d418c3f80aeecf331c068b
webview_flutter_wkwebview: 44aa025fbcf6730d808f1e0d86a5af5ac25fa8de

PODFILE CHECKSUM: a75497545d4391e2d394c3668e20cfb1c2bbd4aa

COCOAPODS: 1.10.0
COCOAPODS: 1.11.2
16 changes: 10 additions & 6 deletions ios/Runner.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,7 @@
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/AppAuth/AppAuth.framework",
"${BUILT_PRODUCTS_DIR}/FBAEMKit/FBAEMKit.framework",
"${BUILT_PRODUCTS_DIR}/FBSDKCoreKit/FBSDKCoreKit.framework",
"${BUILT_PRODUCTS_DIR}/FBSDKCoreKit_Basics/FBSDKCoreKit_Basics.framework",
"${BUILT_PRODUCTS_DIR}/FBSDKLoginKit/FBSDKLoginKit.framework",
Expand All @@ -292,16 +293,18 @@
"${BUILT_PRODUCTS_DIR}/flutter_secure_storage/flutter_secure_storage.framework",
"${BUILT_PRODUCTS_DIR}/flutter_web_auth/flutter_web_auth.framework",
"${BUILT_PRODUCTS_DIR}/image_picker/image_picker.framework",
"${BUILT_PRODUCTS_DIR}/path_provider/path_provider.framework",
"${BUILT_PRODUCTS_DIR}/share/share.framework",
"${BUILT_PRODUCTS_DIR}/shared_preferences/shared_preferences.framework",
"${BUILT_PRODUCTS_DIR}/url_launcher/url_launcher.framework",
"${BUILT_PRODUCTS_DIR}/video_player/video_player.framework",
"${BUILT_PRODUCTS_DIR}/wakelock/wakelock.framework",
"${BUILT_PRODUCTS_DIR}/webview_flutter/webview_flutter.framework",
"${BUILT_PRODUCTS_DIR}/webview_flutter_wkwebview/webview_flutter_wkwebview.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AppAuth.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBAEMKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBSDKCoreKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBSDKCoreKit_Basics.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBSDKLoginKit.framework",
Expand All @@ -312,12 +315,13 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_secure_storage.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_web_auth.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/image_picker.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/share.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_player.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/wakelock.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/webview_flutter.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/webview_flutter_wkwebview.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand Down Expand Up @@ -399,7 +403,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
Expand Down Expand Up @@ -481,7 +485,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
Expand Down Expand Up @@ -530,7 +534,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
Expand Down Expand Up @@ -619,4 +623,4 @@
/* End XCConfigurationList section */
};
rootObject = 97C146E61CF9000F007C117D /* Project object */;
}
}
9 changes: 6 additions & 3 deletions lib/cv_theme.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,12 @@ class CVTheme {

static ThemeData themeData(context) {
return ThemeData(
accentColor: CVTheme.primaryColor,
primaryColor: CVTheme.primaryColor,
brightness: Theme.of(context).brightness);
brightness: Theme.of(context).brightness,
colorScheme: ThemeData().colorScheme.copyWith(
brightness: Theme.of(context).brightness,
primary: CVTheme.secondaryColor,
),
);
}

static const Color primaryColor = Color.fromRGBO(66, 185, 131, 1);
Expand Down
7 changes: 3 additions & 4 deletions lib/ib_theme.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@ class IbTheme {

static ThemeData getThemeData(context) {
return Theme.of(context).copyWith(
brightness: Theme.of(context).brightness,
primaryIconTheme: Theme.of(context).primaryIconTheme.copyWith(
color: Colors.white,
),
accentColor: IbTheme.primaryColor,
appBarTheme: AppBarTheme(
foregroundColor: Colors.white, backgroundColor: IbTheme.primaryColor),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't miss trailing commas please, leads to better formatting.

manjotsidhu marked this conversation as resolved.
Show resolved Hide resolved
primaryColor: IbTheme.primaryColor,
textTheme: Theme.of(context).textTheme.apply(
fontFamily: IbTheme.fontFamily,
Expand All @@ -18,9 +20,6 @@ class IbTheme {
fontFamily: IbTheme.fontFamily,
bodyColor: Colors.white,
),
accentTextTheme: Theme.of(context).accentTextTheme.apply(
fontFamily: IbTheme.fontFamily,
),
);
}

Expand Down
12 changes: 8 additions & 4 deletions lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,24 @@ class CircuitVerseMobile extends StatelessWidget {
AppTheme(
id: 'light',
data: ThemeData(
primaryColor: CVTheme.primaryColor,
accentColor: CVTheme.primaryColor,
fontFamily: 'Poppins',
brightness: Brightness.light,
textSelectionTheme: TextSelectionThemeData(
cursorColor: CVTheme.primaryColor,
),
appBarTheme: AppBarTheme(
foregroundColor: CVTheme.drawerIcon(context),
),
colorScheme: Theme.of(context).colorScheme.copyWith(
primary: CVTheme.primaryColor,
brightness: Brightness.light,
),
),
description: 'LightTheme',
),
AppTheme(
id: 'dark',
data: ThemeData(
primaryColor: CVTheme.secondaryColor,
accentColor: CVTheme.secondaryColor,
fontFamily: 'Poppins',
brightness: Brightness.dark,
textSelectionTheme: TextSelectionThemeData(
Expand Down
12 changes: 0 additions & 12 deletions lib/ui/components/cv_exception.dart
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions lib/ui/views/groups/assignment_details_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import 'package:mobile_app/ui/components/cv_primary_button.dart';
import 'package:mobile_app/ui/components/cv_text_field.dart';
import 'package:mobile_app/ui/views/base_view.dart';
import 'package:mobile_app/ui/views/groups/update_assignment_view.dart';
import 'package:mobile_app/ui/components/cv_exception.dart';
import 'package:mobile_app/utils/snackbar_utils.dart';
import 'package:mobile_app/utils/validators.dart';
import 'package:mobile_app/viewmodels/groups/assignment_details_viewmodel.dart';
Expand Down Expand Up @@ -464,14 +463,6 @@ class _AssignmentDetailsViewState extends State<AssignmentDetailsView> {
_buildGrades(),
],
),
if (_model.isError(_model.FETCH_ASSIGNMENT_DETAILS))
Column(
children: <Widget>[
CVException(
_model.errorMessageFor(_model.FETCH_ASSIGNMENT_DETAILS),
),
],
),
],
);
}),
Expand Down
8 changes: 0 additions & 8 deletions lib/ui/views/groups/group_details_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import 'package:mobile_app/ui/views/groups/components/assignment_card.dart';
import 'package:mobile_app/ui/views/groups/components/member_card.dart';
import 'package:mobile_app/ui/views/groups/edit_group_view.dart';
import 'package:mobile_app/ui/views/groups/update_assignment_view.dart';
import 'package:mobile_app/ui/components/cv_exception.dart';
import 'package:mobile_app/utils/snackbar_utils.dart';
import 'package:mobile_app/utils/validators.dart';
import 'package:mobile_app/ui/components/cv_flat_button.dart';
Expand Down Expand Up @@ -408,13 +407,6 @@ class _GroupDetailsViewState extends State<GroupDetailsView> {
);
});
}
if (_model.isError(_model.FETCH_GROUP_DETAILS)) {
_items.add(
CVException(
_model.errorMessageFor(_model.FETCH_GROUP_DETAILS),
),
);
}

return ListView(
padding: const EdgeInsets.all(8),
Expand Down
Loading