Merge branch 'release/0.0.3' into main

.github/workflows/release.yml

@@ -86,13 +86,6 @@ jobs:
       - name: Build IPA (IOS)
         run: flutter build ipa --build-number=42$GITHUB_RUN_NUMBER
 
-      - name: Create Release
-        uses: ncipollo/release-action@v1
-        with:
-          artifacts: "build/app/bundle/release/*.aab,build/ios/archive/*.xcarchive"
-          replacesArtifacts: false
-          token: ${{ secrets.GH_TOKEN }}
-
       - name: Deploy to Testflight
         env:
           CONNECT_USERNAME: ${{ secrets.CONNECT_USERNAME }}
@@ -108,4 +101,11 @@ jobs:
           serviceAccountJson: android/play_service.json
           packageName: com.mytiki.app
           releaseFiles: build/app/outputs/bundle/release/app-release.aab
-          track: internal
+          track: internal
+
+      - name: Create Release
+        uses: ncipollo/release-action@v1
+        with:
+          artifacts: "build/app/outputs/bundle/release/*.aab,build/ios/release/app.ipa"
+          replacesArtifacts: false
+          token: ${{ secrets.GH_TOKEN }}

.gitignore

@@ -55,4 +55,8 @@ app.*.map.json
 **/GoogleService-Info.plist
 
 # Android Signing
-**.jks
+**.jks
+
+# Environment Config
+**.env
+!.template.env

android/app/src/main/res/drawable-v21/launch_background.xml

@@ -4,9 +4,19 @@
     <item android:drawable="@color/sunglow" />
 
     <!-- You can insert your own image assets here -->
-    <!-- <item>
+    <item>
+        <bitmap
+            android:gravity="left|top"
+            android:src="@mipmap/blob_tl" />
+    </item>
+    <item>
         <bitmap
             android:gravity="center"
-            android:src="@mipmap/launch_image" />
-    </item> -->
+            android:src="@mipmap/blob_logo" />
+    </item>
+    <item>
+        <bitmap
+            android:gravity="right|bottom"
+            android:src="@mipmap/blob_br" />
+    </item>
 </layer-list>

android/app/src/main/res/drawable/launch_background.xml

@@ -4,9 +4,9 @@
     <item android:drawable="@color/sunglow" />
 
     <!-- You can insert your own image assets here -->
-    <!-- <item>
+    <item>
         <bitmap
             android:gravity="center"
-            android:src="@mipmap/launch_image" />
-    </item> -->
+            android:src="@mipmap/blob_logo" />
+    </item>
 </layer-list>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

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

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFD225</color>
+</resources>

ios/Podfile.lock

@@ -41,13 +41,23 @@ PODS:
   - flutter_secure_storage (3.3.1):
     - Flutter
   - MTBBarcodeScanner (5.0.11)
+  - package_info (0.0.1):
+    - Flutter
+  - package_info_plus (0.4.5):
+    - Flutter
   - path_provider (0.0.1):
     - Flutter
   - qr_code_tools (0.0.7):
     - Flutter
   - SDWebImage (5.10.4):
     - SDWebImage/Core (= 5.10.4)
   - SDWebImage/Core (5.10.4)
+  - Sentry (6.2.1):
+    - Sentry/Core (= 6.2.1)
+  - Sentry/Core (6.2.1)
+  - sentry_flutter (0.0.1):
+    - Flutter
+    - Sentry (~> 6.2.1)
   - share (0.0.1):
     - Flutter
   - shared_preferences (0.0.1):
@@ -64,8 +74,11 @@ DEPENDENCIES:
   - file_picker (from `.symlinks/plugins/file_picker/ios`)
   - Flutter (from `Flutter`)
   - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
+  - package_info (from `.symlinks/plugins/package_info/ios`)
+  - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - path_provider (from `.symlinks/plugins/path_provider/ios`)
   - qr_code_tools (from `.symlinks/plugins/qr_code_tools/ios`)
+  - sentry_flutter (from `.symlinks/plugins/sentry_flutter/ios`)
   - share (from `.symlinks/plugins/share/ios`)
   - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
   - uni_links (from `.symlinks/plugins/uni_links/ios`)
@@ -77,6 +90,7 @@ SPEC REPOS:
     - DKPhotoGallery
     - MTBBarcodeScanner
     - SDWebImage
+    - Sentry
     - SwiftProtobuf
     - SwiftyGif
 
@@ -89,10 +103,16 @@ EXTERNAL SOURCES:
     :path: Flutter
   flutter_secure_storage:
     :path: ".symlinks/plugins/flutter_secure_storage/ios"
+  package_info:
+    :path: ".symlinks/plugins/package_info/ios"
+  package_info_plus:
+    :path: ".symlinks/plugins/package_info_plus/ios"
   path_provider:
     :path: ".symlinks/plugins/path_provider/ios"
   qr_code_tools:
     :path: ".symlinks/plugins/qr_code_tools/ios"
+  sentry_flutter:
+    :path: ".symlinks/plugins/sentry_flutter/ios"
   share:
     :path: ".symlinks/plugins/share/ios"
   shared_preferences:
@@ -110,9 +130,13 @@ SPEC CHECKSUMS:
   Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
   flutter_secure_storage: 7953c38a04c3fdbb00571bcd87d8e3b5ceb9daec
   MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
+  package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
+  package_info_plus: 6c92f08e1f853dc01228d6f553146438dafcd14e
   path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
   qr_code_tools: 5b5dd44ccdfa4b81f645c251e421f61003254b81
   SDWebImage: c666b97e1fa9c64b4909816a903322018f0a9c84
+  Sentry: 9b922b396b0e0bca8516a10e36b0ea3ebea5faf7
+  sentry_flutter: 5b3c6d717db5b7482504a313c831b318297d4d37
   share: 0b2c3e82132f5888bccca3351c504d0003b3b410
   shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
   SwiftProtobuf: 3320217e9d8fb75f36b40282e78c482640fd75dd

ios/Runner/Assets.xcassets/logo-bkg.imageset/Contents.json → ios/Runner/Assets.xcassets/blob-logo.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "logo-bkg.png",
+      "filename" : "blob-logo.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "logo-bkg-2x.png",
+      "filename" : "blob-logo-2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "logo-bkg-3x.png",
+      "filename" : "blob-logo-3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

ios/Runner/Base.lproj/LaunchScreen.storyboard

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
-    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
@@ -16,41 +16,36 @@
                         <viewControllerLayoutGuide type="bottom" id="xbc-2k-c8Z"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" fixedFrame="YES" image="logo-bkg" translatesAutoresizingMaskIntoConstraints="NO" id="p3Q-y6-GMW">
-                                <rect key="frame" x="49" y="317" width="316" height="263"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <imageView opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" image="blob-br" id="rxA-Id-IL7">
+                                <rect key="frame" x="294" y="576" width="81" height="91"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
                             </imageView>
-                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" fixedFrame="YES" image="blob-br" translatesAutoresizingMaskIntoConstraints="NO" id="rxA-Id-IL7">
-                                <rect key="frame" x="333" y="805" width="81" height="91"/>
+                            <imageView opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="blob-tl" id="3ib-QB-3um">
+                                <rect key="frame" x="-7" y="0.0" width="70" height="248"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             </imageView>
-                            <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="logo" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4">
-                                <rect key="frame" x="126" y="419" width="162" height="58"/>
-                            </imageView>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="blob-tl" translatesAutoresizingMaskIntoConstraints="NO" id="3ib-QB-3um">
-                                <rect key="frame" x="0.0" y="0.0" width="70" height="292"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="blob-logo" translatesAutoresizingMaskIntoConstraints="NO" id="7QX-BP-duO">
+                                <rect key="frame" x="30" y="202" width="315" height="262"/>
                             </imageView>
                         </subviews>
                         <color key="backgroundColor" red="1" green="0.82352941176470584" blue="0.14509803921568626" alpha="1" colorSpace="calibratedRGB"/>
                         <constraints>
-                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="1a2-6s-vTC"/>
-                            <constraint firstItem="YRO-k0-Ey4" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="4X2-HB-R7a"/>
+                            <constraint firstItem="7QX-BP-duO" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="P1o-h7-uNx"/>
+                            <constraint firstItem="7QX-BP-duO" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="YT4-XF-ndH"/>
                         </constraints>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="76.811594202898561" y="251.11607142857142"/>
+            <point key="canvasLocation" x="75.362318840579718" y="250.44642857142856"/>
         </scene>
     </scenes>
     <resources>
         <image name="blob-br" width="81" height="91"/>
+        <image name="blob-logo" width="315" height="262.5"/>
         <image name="blob-tl" width="69.5" height="290.5"/>
-        <image name="logo" width="161.5" height="58"/>
-        <image name="logo-bkg" width="315" height="262.5"/>
     </resources>
 </document>

lib/main.dart

@@ -1,8 +1,25 @@
+import 'package:app/src/configs/config_sentry.dart' as ConfigSentry;
+import 'package:app/src/helpers/helper_login/helper_login_bloc.dart';
+import 'package:app/src/repos/repo_ss_user/repo_ss_user_bloc.dart';
+import 'package:app/src/repos/repo_ss_user/repo_ss_user_model.dart';
+import 'package:app/src/utilities/utility_functions.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+import 'package:sentry_flutter/sentry_flutter.dart';
 
 import 'src/app.dart';
 
-void main() {
+Future<void> main() async {
   WidgetsFlutterBinding.ensureInitialized();
-  runApp(App());
+
+  RepoSSUserModel user = await HelperLoginBloc.getLoggedInUser(
+      RepoSSUserBloc(FlutterSecureStorage()));
+
+  await SentryFlutter.init(
+      (options) async => options
+        ..dsn = ConfigSentry.of(ConfigSentry.dsn)
+        ..environment = ConfigSentry.of(ConfigSentry.environment)
+        ..release = await version()
+        ..sendDefaultPii = false,
+      appRunner: () => runApp(App(user)));
 }

lib/src/app.dart

@@ -1,32 +1,32 @@
 import 'dart:io';
 
-import 'package:app/src/constants/constant_colors.dart';
+import 'package:app/src/configs/config_colors.dart';
 import 'package:app/src/entry.dart';
-import 'package:app/src/inject.dart';
+import 'package:app/src/inject.dart' as Inject;
 import 'package:app/src/platform/platform_relative_size.dart';
-import 'package:app/src/screens/screen_splash.dart';
+import 'package:app/src/repos/repo_ss_user/repo_ss_user_model.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:google_fonts/google_fonts.dart';
 
+final GlobalKey<NavigatorState> navigatorKey = new GlobalKey<NavigatorState>();
+
 class App extends StatelessWidget {
-  final _title = 'TIKI';
+  static final _title = 'TIKI';
   static final double _fSize = 4 * PlatformRelativeSize.safeBlockHorizontal;
+  final RepoSSUserModel _user;
+
+  App(this._user);
 
   @override
-  Widget build(BuildContext context) {
-    Widget platform;
-    if (Platform.isIOS)
-      platform = iosApp(context);
-    else
-      platform = androidApp(context);
-    return inject(context, child: platform);
-  }
+  Widget build(BuildContext context) => Inject.chain(context,
+      child: Platform.isIOS ? iosApp(context) : androidApp(context));
 
   MaterialApp androidApp(BuildContext context) {
     return MaterialApp(
       title: _title,
-      home: EntryPoint(ScreenSplash()),
+      home: Entry(_user),
+      navigatorKey: navigatorKey,
       theme: ThemeData(
           textTheme:
               GoogleFonts.nunitoSansTextTheme(Theme.of(context).textTheme)),
@@ -36,12 +36,13 @@ class App extends StatelessWidget {
   CupertinoApp iosApp(BuildContext context) {
     return CupertinoApp(
         title: _title,
-        home: EntryPoint(ScreenSplash()),
+        home: Entry(_user),
+        navigatorKey: navigatorKey,
         theme: CupertinoThemeData(
             textTheme: CupertinoTextThemeData(
                 textStyle: GoogleFonts.nunitoSans(
                     fontWeight: FontWeight.normal,
-                    color: ConstantColors.mardiGras,
+                    color: ConfigColors.mardiGras,
                     fontSize: _fSize))));
   }
 }

lib/src/constants/constant_colors.dart → lib/src/configs/config_colors.dart

@@ -5,7 +5,7 @@
 
 import 'package:flutter/material.dart';
 
-class ConstantColors {
+class ConfigColors {
   //YELLOWS
   static const Color fireBush = Color(0xFFE89933);
   static const Color sunglow = Color(0xFFFFD225);

lib/src/constants/constant_domains.dart → lib/src/configs/config_domains.dart

@@ -3,7 +3,7 @@
  * MIT license. See LICENSE file in root directory.
  */
 
-class ConstantDomains {
+class ConfigDomains {
   static final String bouncer = "bouncer.mytiki.com";
   static final String website = "api.mytiki.com";
 }