From 3721aeaba716826a5af16dcf3f041c976ee45b2d Mon Sep 17 00:00:00 2001 From: richtwin567 Date: Sun, 6 Sep 2020 12:00:59 -0500 Subject: [PATCH] minor changes --- android/app/build.gradle | 4 ++-- .../com/example/fst_app_flutter/MainActivity.java | 1 - .../fst_app_flutter/contact/NativeContact.java | 1 - android/build.gradle | 2 +- lib/main.dart | 5 ----- lib/models/from_postgres/contact/contact_model.dart | 1 - .../from_postgres/map/geo_json_types/feature.dart | 1 - .../from_postgres/map/geometry_types/point.dart | 1 - lib/screens/contact_screen/contact_state.dart | 11 +++-------- lib/utils/social_media_contact_share.dart | 1 - 10 files changed, 6 insertions(+), 22 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index a207d49..c648c86 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -25,7 +25,7 @@ apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 29 + compileSdkVersion 28 lintOptions { disable 'InvalidPackage' @@ -35,7 +35,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.example.fst_app_flutter" minSdkVersion 16 - targetSdkVersion 29 + targetSdkVersion 28 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/android/app/src/main/java/com/example/fst_app_flutter/MainActivity.java b/android/app/src/main/java/com/example/fst_app_flutter/MainActivity.java index 3a008d3..c438342 100644 --- a/android/app/src/main/java/com/example/fst_app_flutter/MainActivity.java +++ b/android/app/src/main/java/com/example/fst_app_flutter/MainActivity.java @@ -38,7 +38,6 @@ public void configureFlutterEngine(@NonNull FlutterEngine flutterEngine) { NativeContact contact = new NativeContact((HashMap) call.arguments); contact.saveNatively(this); } catch (Exception e) { - //System.out.println(e.getMessage()); } } else { result.notImplemented(); diff --git a/android/app/src/main/java/com/example/fst_app_flutter/contact/NativeContact.java b/android/app/src/main/java/com/example/fst_app_flutter/contact/NativeContact.java index db5dc20..e54958b 100644 --- a/android/app/src/main/java/com/example/fst_app_flutter/contact/NativeContact.java +++ b/android/app/src/main/java/com/example/fst_app_flutter/contact/NativeContact.java @@ -45,7 +45,6 @@ public NativeContact(HashMap map) { } } } catch (Exception e) { - //System.out.println(e.getMessage()); } diff --git a/android/build.gradle b/android/build.gradle index f92baf1..0e2eeac 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.0.1' + classpath 'com.android.tools.build:gradle:3.5.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/lib/main.dart b/lib/main.dart index 94ae31e..3764e26 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -32,11 +32,6 @@ class FSTApp extends StatelessWidget { create: (context) => themeModel, builder: (context, child) => Consumer( builder: (context, themeModel, child) { - /* SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle( - statusBarColor: AppTheme.getTheme(themeModel.selectedTheme, - MediaQuery.platformBrightnessOf(context)) - .primaryColor, - )); */ return MaterialApp( debugShowCheckedModeBanner: false, theme: AppTheme.getTheme(ThemeMode.light, diff --git a/lib/models/from_postgres/contact/contact_model.dart b/lib/models/from_postgres/contact/contact_model.dart index cf0b9ec..ce0f6ad 100644 --- a/lib/models/from_postgres/contact/contact_model.dart +++ b/lib/models/from_postgres/contact/contact_model.dart @@ -72,7 +72,6 @@ class Contact { await channel.invokeMethod('saveNatively', toNativeMap()); } } catch (e) { - print(e); } } } diff --git a/lib/models/from_postgres/map/geo_json_types/feature.dart b/lib/models/from_postgres/map/geo_json_types/feature.dart index 3145ecf..7c51d7c 100644 --- a/lib/models/from_postgres/map/geo_json_types/feature.dart +++ b/lib/models/from_postgres/map/geo_json_types/feature.dart @@ -25,7 +25,6 @@ class Feature extends GeoJsonObject { id = feature['id']; var uknGeometry = feature['geometry']; var newCoords = uknGeometry['coordinates']; - //print(newCoords); switch (stringToGeometryType(uknGeometry['geometry_type'])) { case GeoJsonGeometryType.point: geometry = GeoJsonPoint(coordsJson: newCoords); diff --git a/lib/models/from_postgres/map/geometry_types/point.dart b/lib/models/from_postgres/map/geometry_types/point.dart index 8d25c47..e3b40d5 100644 --- a/lib/models/from_postgres/map/geometry_types/point.dart +++ b/lib/models/from_postgres/map/geometry_types/point.dart @@ -11,7 +11,6 @@ class GeoJsonPoint extends GeoJsonGeometryObject { GeoJsonPoint({@required coordsJson}) : assert(coordsJson != null), super(GeoJsonGeometryType.point) { - //print(coordsJSON[0]['longitude'] is double); _coordinates = GeoJsonPosition( newLongitude: coordsJson[0]['longitude'], newLatitude: coordsJson[0]['latitude']); diff --git a/lib/screens/contact_screen/contact_state.dart b/lib/screens/contact_screen/contact_state.dart index 29abf63..05a0e1e 100644 --- a/lib/screens/contact_screen/contact_state.dart +++ b/lib/screens/contact_screen/contact_state.dart @@ -158,13 +158,9 @@ abstract class ContactViewState extends State /// Toggles the [AppBar] between the page title and the search [TextField] and /// hiding the [filterDropdown]. void revealSearchField({@required double searchFieldWidth}) { - print('p'); if (dropdownController.isDismissed) { - print('k'); toggleAppBarAnimation(); - print('j'); toggleFilterDropdownAnimation().then((value) { - print('m'); appBarLeading = null; extraActions = false; appBarTitle = Container( @@ -216,7 +212,7 @@ abstract class ContactViewState extends State begin: themeModel.isDark ? Color.alphaBlend(overlayColor, theme.primaryColor) : theme.primaryColor, - end: theme.scaffoldBackgroundColor); + end: themeModel.isDark? Color.alphaBlend(overlayColor, theme.scaffoldBackgroundColor): theme.scaffoldBackgroundColor); return AnimatedBuilder( animation: appBarColorController, builder: (BuildContext context, Widget child) { @@ -236,7 +232,6 @@ abstract class ContactViewState extends State animationName: themeModel.isDark ? 'white_to_white' : 'white_to_black', setStateFunction: () { - print('o'); this.revealSearchField( searchFieldWidth: MediaQuery.of(context).size.width); }, @@ -386,7 +381,7 @@ abstract class ContactViewState extends State namedRoute: contactDetailRoute, arguments: contacts[index], ), - Divider() + Divider( thickness: 1.0,color: Theme.of(context).accentColor) ]); }), ); @@ -411,7 +406,7 @@ abstract class ContactViewState extends State mainAxisSize: MainAxisSize.max, verticalDirection: VerticalDirection.down, crossAxisAlignment: CrossAxisAlignment.center, - mainAxisAlignment: MainAxisAlignment.spaceAround, + mainAxisAlignment: MainAxisAlignment.start, children: [ Expanded( child: FutureBuilder( diff --git a/lib/utils/social_media_contact_share.dart b/lib/utils/social_media_contact_share.dart index 5b25476..955cbe3 100644 --- a/lib/utils/social_media_contact_share.dart +++ b/lib/utils/social_media_contact_share.dart @@ -36,6 +36,5 @@ shareContactToWhatsApp(VCard vCard) async { ); } } catch (e) { - //print(e); } }