Merge pull request #14 from JohnRamberger/development

Development

Author: JohnRamberger

amplify/team-provider-info.json

@@ -21,7 +21,7 @@
       "function": {
         "hacklyticsportal20232e32fd51": {
           "deploymentBucketName": "amplify-hacklyticsportal2023-prod-221126-deployment",
-          "s3Key": "amplify-builds/hacklyticsportal20232e32fd51-53694b4a504e56477952-build.zip"
+          "s3Key": "amplify-builds/hacklyticsportal20232e32fd51-70577737482b35743137-build.zip"
         },
         "hacklyticsportal2023listusers": {
           "deploymentBucketName": "amplify-hacklyticsportal2023-prod-221126-deployment",

android/app/build.gradle

@@ -54,6 +54,9 @@ android {
     }
 
     buildTypes {
+        debug {
+             applicationIdSuffix ".debug"
+        }
         release {
             // TODO: Add your own signing config for the release build.
             // Signing with the debug keys for now, so `flutter run --release` works.

android/app/src/debug/res/values/strings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+	<string name="app_name">Hacklytics debug</string>
+
+</resources>

android/app/src/main/AndroidManifest.xml

@@ -2,7 +2,7 @@
     package="com.example.hacklytics_checkin_flutter">
     <uses-permission android:name="android.permission.NFC" />
    <application
-        android:label="Hacklytics"
+        android:label="@string/app_name"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
         android:usesCleartextTraffic="true">

android/app/src/main/res/values/strings.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+	<string name="app_name">Hacklytics</string>
+
+</resources>

lib/model/amplifyuser.dart

@@ -21,10 +21,10 @@ class AmplifyUser {
     final response = utf8.decode(base64Url.decode(normalized));
 
     var json = jsonDecode(response);
-    groups = json['cognito:groups'];
-    username = json['username'];
-    deviceKey = json['device_key'];
-    clientId = json['client_id'];
+    groups = json['cognito:groups'] ?? [];
+    username = json['username'] ?? "";
+    deviceKey = json['device_key'] ?? "";
+    clientId = json['client_id'] ?? "";
 
     // check if the user is in the allowed groups
     for (var group in groups) {

lib/view/Home.view.dart

@@ -60,7 +60,7 @@ class _HomeViewState extends State<HomeView> {
         const DrawerHeader(
           child: Text("Hacklytics"),
         ),
-        _loadingUser == false && _user.hasAccess
+        _loadingUser == false && _error.isEmpty && _user.hasAccess
             ? Column(children: [
                 ListTile(
                   title: const Text("General NFC"),

pubspec.yaml

@@ -17,7 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.0.33
+version: 1.0.34
 
 environment:
   sdk: '>=2.18.5 <3.0.0'