Merge pull request #104 from tiki/release/0.0.9

Release/0.0.9
tiki-deprecated · May 25, 2021 · b7f327f · b7f327f
2 parents d7b2d53 + da19489
commit b7f327f
Show file tree

Hide file tree

Showing 337 changed files with 3,337 additions and 2,836 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -117,12 +117,15 @@ jobs:
           artifacts: "build/app/outputs/bundle/release/*.aab,build/ios/release/app.ipa"
           replacesArtifacts: false
           token: ${{ secrets.GH_TOKEN }}
-
+  semtry release:
+    name: Sentry Release 
+    runs-on: ubuntu-latest
+    steps:
       - name: Create Sentry release
         uses: getsentry/action-release@v1
         env:
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
           SENTRY_ORG: 'my-tiki'
           SENTRY_PROJECT: 'app'
         with:
-          environment: public
+          environment: public
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -1,53 +1,51 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.mytiki.app">
-   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-   <uses-permission android:name="android.permission.CAMERA" />
-   <uses-permission android:name="android.permission.INTERNET" />
-   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-   <application
-        android:label="TIKI"
-        android:icon="@mipmap/ic_launcher"
-        android:roundIcon="@mipmap/ic_launcher_round"
+
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
+    <application
         android:allowBackup="false"
-        android:fullBackupContent="false">
+        android:fullBackupContent="false"
+        android:icon="@mipmap/ic_launcher"
+        android:label="TIKI"
+        android:requestLegacyExternalStorage="true"
+        android:roundIcon="@mipmap/ic_launcher_round">
         <activity
             android:name=".MainActivity"
-            android:launchMode="singleTop"
-            android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
+            android:launchMode="singleInstance"
+            android:theme="@style/LaunchTheme"
             android:windowSoftInputMode="adjustResize">
-            <!-- Specifies an Android theme to apply to this Activity as soon as
-                 the Android process has started. This theme is visible to the user
-                 while the Flutter UI initializes. After that, this theme continues
-                 to determine the Window background behind the Flutter UI. -->
             <meta-data
-              android:name="io.flutter.embedding.android.NormalTheme"
-              android:resource="@style/NormalTheme"
-              />
-            <!-- Displays an Android View that continues showing the launch screen
-                 Drawable until Flutter paints its first frame, then this splash
-                 screen fades out. A splash screen is useful to avoid any visual
-                 gap between the end of Android's launch screen and the painting of
-                 Flutter's first frame. -->
+                android:name="io.flutter.embedding.android.NormalTheme"
+                android:resource="@style/NormalTheme" />
             <meta-data
-              android:name="io.flutter.embedding.android.SplashScreenDrawable"
-              android:resource="@drawable/launch_background"
-              />
+                android:name="io.flutter.embedding.android.SplashScreenDrawable"
+                android:resource="@drawable/launch_background" />
+
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
             <intent-filter android:autoVerify="true">
-                <action android:name="android.intent.action.VIEW"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <category android:name="android.intent.category.BROWSABLE"/>
-                <data android:scheme="https" android:host="mytiki.com" />
-                <data android:scheme="https" android:host="mytiki.app" />
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="mytiki.com"
+                    android:scheme="https" />
+                <data
+                    android:host="mytiki.app"
+                    android:scheme="https" />
             </intent-filter>
         </activity>
-        <!-- Don't delete the meta-data below.
-             This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -3,43 +3,46 @@ PODS:
   - amplitude_flutter (0.0.1):
     - Amplitude (= 7.2.0)
     - Flutter
-  - barcode_scan (0.0.1):
+  - barcode_scan2 (0.0.1):
     - Flutter
     - MTBBarcodeScanner
     - SwiftProtobuf
-  - Firebase/CoreOnly (7.11.0):
-    - FirebaseCore (= 7.11.0)
-  - Firebase/DynamicLinks (7.11.0):
+  - Firebase/CoreOnly (8.0.0):
+    - FirebaseCore (= 8.0.0)
+  - Firebase/DynamicLinks (8.0.0):
     - Firebase/CoreOnly
-    - FirebaseDynamicLinks (~> 7.11.0)
-  - firebase_core (1.1.0):
-    - Firebase/CoreOnly (= 7.11.0)
+    - FirebaseDynamicLinks (~> 8.0.0)
+  - firebase_core (1.2.0):
+    - Firebase/CoreOnly (= 8.0.0)
     - Flutter
-  - firebase_dynamic_links (2.0.2):
-    - Firebase/DynamicLinks (= 7.11.0)
+  - firebase_dynamic_links (2.0.4):
+    - Firebase/DynamicLinks (= 8.0.0)
     - firebase_core
     - Flutter
-  - FirebaseCore (7.11.0):
-    - FirebaseCoreDiagnostics (~> 7.4)
-    - GoogleUtilities/Environment (~> 7.0)
-    - GoogleUtilities/Logger (~> 7.0)
-  - FirebaseCoreDiagnostics (7.11.0):
-    - GoogleDataTransport (~> 8.4)
-    - GoogleUtilities/Environment (~> 7.0)
-    - GoogleUtilities/Logger (~> 7.0)
+  - FirebaseCore (8.0.0):
+    - FirebaseCoreDiagnostics (~> 8.0)
+    - GoogleUtilities/Environment (~> 7.4)
+    - GoogleUtilities/Logger (~> 7.4)
+  - FirebaseCoreDiagnostics (8.0.0):
+    - GoogleDataTransport (~> 9.0)
+    - GoogleUtilities/Environment (~> 7.4)
+    - GoogleUtilities/Logger (~> 7.4)
     - nanopb (~> 2.30908.0)
-  - FirebaseDynamicLinks (7.11.0):
-    - FirebaseCore (~> 7.0)
+  - FirebaseDynamicLinks (8.0.0):
+    - FirebaseCore (~> 8.0)
   - Flutter (1.0.0)
   - flutter_secure_storage (3.3.1):
     - Flutter
-  - GoogleDataTransport (8.4.0):
+  - FMDB (2.7.5):
+    - FMDB/standard (= 2.7.5)
+  - FMDB/standard (2.7.5)
+  - GoogleDataTransport (9.0.0):
     - GoogleUtilities/Environment (~> 7.2)
     - nanopb (~> 2.30908.0)
     - PromisesObjC (~> 1.2)
-  - GoogleUtilities/Environment (7.4.0):
+  - GoogleUtilities/Environment (7.4.1):
     - PromisesObjC (~> 1.2)
-  - GoogleUtilities/Logger (7.4.0):
+  - GoogleUtilities/Logger (7.4.1):
     - GoogleUtilities/Environment
   - MTBBarcodeScanner (5.0.11)
   - nanopb (2.30908.0):
@@ -66,13 +69,16 @@ PODS:
     - Flutter
   - shared_preferences (0.0.1):
     - Flutter
-  - SwiftProtobuf (1.16.0)
+  - sqflite (0.0.2):
+    - Flutter
+    - FMDB (>= 2.7.5)
+  - SwiftProtobuf (1.17.0)
   - url_launcher (0.0.1):
     - Flutter
 
 DEPENDENCIES:
   - amplitude_flutter (from `.symlinks/plugins/amplitude_flutter/ios`)
-  - barcode_scan (from `.symlinks/plugins/barcode_scan/ios`)
+  - barcode_scan2 (from `.symlinks/plugins/barcode_scan2/ios`)
   - firebase_core (from `.symlinks/plugins/firebase_core/ios`)
   - firebase_dynamic_links (from `.symlinks/plugins/firebase_dynamic_links/ios`)
   - Flutter (from `Flutter`)
@@ -84,6 +90,7 @@ DEPENDENCIES:
   - sentry_flutter (from `.symlinks/plugins/sentry_flutter/ios`)
   - share (from `.symlinks/plugins/share/ios`)
   - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
+  - sqflite (from `.symlinks/plugins/sqflite/ios`)
   - url_launcher (from `.symlinks/plugins/url_launcher/ios`)
 
 SPEC REPOS:
@@ -93,6 +100,7 @@ SPEC REPOS:
     - FirebaseCore
     - FirebaseCoreDiagnostics
     - FirebaseDynamicLinks
+    - FMDB
     - GoogleDataTransport
     - GoogleUtilities
     - MTBBarcodeScanner
@@ -104,8 +112,8 @@ SPEC REPOS:
 EXTERNAL SOURCES:
   amplitude_flutter:
     :path: ".symlinks/plugins/amplitude_flutter/ios"
-  barcode_scan:
-    :path: ".symlinks/plugins/barcode_scan/ios"
+  barcode_scan2:
+    :path: ".symlinks/plugins/barcode_scan2/ios"
   firebase_core:
     :path: ".symlinks/plugins/firebase_core/ios"
   firebase_dynamic_links:
@@ -128,23 +136,26 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/share/ios"
   shared_preferences:
     :path: ".symlinks/plugins/shared_preferences/ios"
+  sqflite:
+    :path: ".symlinks/plugins/sqflite/ios"
   url_launcher:
     :path: ".symlinks/plugins/url_launcher/ios"
 
 SPEC CHECKSUMS:
   Amplitude: c948c6f99c7f798c196523b2a5584367401d910f
   amplitude_flutter: 5c934cf8331619b62bbd5a69f3cfea9090b3ca94
-  barcode_scan: a5c27959edfafaa0c771905bad0b29d6d39e4479
-  Firebase: c121feb35e4126c0b355e3313fa9b487d47319fd
-  firebase_core: 84dcd80ac6d29c3d1039071b7306ee99688eb9c7
-  firebase_dynamic_links: e54ea29b74507402560461965d0483657dedf1b7
-  FirebaseCore: 907447d8917a4d3eb0cce2829c5a0ad21d90b432
-  FirebaseCoreDiagnostics: 68ad972f99206cef818230f3f3179d52ccfb7f8c
-  FirebaseDynamicLinks: 07f101c20bb40fd39f6b3e5278a64a5f2f660dc1
+  barcode_scan2: 0af2bb63c81b4565aab6cd78278e4c0fa136dbb0
+  Firebase: 73c3e3b216ec1ecbc54d2ffdd4670c65c749edb1
+  firebase_core: e4d3efb030a2b2021819f8faa538bb23deb46695
+  firebase_dynamic_links: 832d198922d1919858cca05a1b5ecd3bc1b4495a
+  FirebaseCore: 3f09591d51292843e2a46f18358d60bf4e996255
+  FirebaseCoreDiagnostics: a31d987ba0fe16d59886a5dbadc2f1de871f88c8
+  FirebaseDynamicLinks: 42858c22626d9c519b28e0421b2ea6bcc5a241ff
   Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
   flutter_secure_storage: 7953c38a04c3fdbb00571bcd87d8e3b5ceb9daec
-  GoogleDataTransport: cd9db2180fcecd8da1b561aea31e3e56cf834aa7
-  GoogleUtilities: 284cddc7fffc14ae1907efb6f78ab95c1fccaedc
+  FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
+  GoogleDataTransport: 11e3a5f2c190327df1a4a5d7e7ae3d4d5b9c9e4c
+  GoogleUtilities: f8a43108b38a68eebe8b3540e1f4f2d28843ce20
   MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
   nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
   package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
@@ -156,7 +167,8 @@ SPEC CHECKSUMS:
   sentry_flutter: 5b3c6d717db5b7482504a313c831b318297d4d37
   share: 0b2c3e82132f5888bccca3351c504d0003b3b410
   shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
-  SwiftProtobuf: 4e16842b83c6fda06b10fac50d73b3f1fce8ab7b
+  sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
+  SwiftProtobuf: 9c85136c6ba74b0a1b84279dbf0f6db8efb714e0
   url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
 
 PODFILE CHECKSUM: 369a5dd265c3a98e02ffc0493427fc70d9c648fc

diff --git a/lib/main.dart b/lib/main.dart
@@ -1,6 +1,6 @@
+import 'package:app/src/features/repo/repo_local_db/repo_local_db.dart';
 import 'package:app/src/utils/analytics/tiki_analytics.dart';
 import 'package:app/src/utils/helper/helper_log_in.dart';
-import 'package:app/src/utils/migrate/migrate_0_to_001/migrate_0_to_001.dart';
 import 'package:firebase_core/firebase_core.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
@@ -17,17 +17,17 @@ import 'src/config/config_sentry.dart';
 /// [Firebase.initializeApp] initializes Firebase.
 /// [FlutterSecureStorage] initializes the secure storage that will keep the keys.
 /// [HelperLogin] handles login state.
-/// [Migrate0to001] is a helper class to move old accounts to the new Secure Storage system. It will be removed in 0.0.9.
 /// [TikiAnalytics] enables in-app anonymous analytics with Amplitude.
+/// [TikiDatabase] SQLite connector
 /// [SentryFlutter] enables Sentry.io monitoring in the app.
 Future<void> main() async {
   WidgetsFlutterBinding.ensureInitialized();
-  await TikiAnalytics.getLogger();
+  TikiAnalytics.getLogger();
   await Firebase.initializeApp();
   FlutterSecureStorage secureStorage = FlutterSecureStorage();
   HelperLogIn helperLogIn = HelperLogIn.auto(secureStorage);
-  await Migrate0to001(secureStorage).migrate();
   await helperLogIn.load();
+  await TikiDatabase.instance!.database;
   SentryFlutter.init(
       (options) async => options
         ..dsn = ConfigSentry.dsn

diff --git a/lib/src/app.dart b/lib/src/app.dart
@@ -3,8 +3,6 @@
  * MIT license. See LICENSE file in root directory.
  */
 
-import 'dart:io';
-
 import 'package:app/src/utils/helper/helper_log_in.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
@@ -22,39 +20,18 @@ class App extends StatelessWidget {
   App(this._helperIsLoggedIn);
 
   @override
-  Widget build(BuildContext context) =>
-      Provide.chain(Platform.isIOS ? iosApp(context) : androidApp(context));
-
-  MaterialApp androidApp(BuildContext context) {
-    return MaterialApp(
-        title: _title,
-        routes: ConfigNavigate.routeTable(context, _helperIsLoggedIn),
-        navigatorKey: ConfigNavigate.key,
-        localizationsDelegates: [
-          DefaultMaterialLocalizations.delegate,
-          DefaultCupertinoLocalizations.delegate,
-          DefaultWidgetsLocalizations.delegate,
-        ],
-        theme: ThemeData(
-            textTheme: Theme.of(context).textTheme.apply(
-                fontFamily: _nunitoSans,
-                bodyColor: ConfigColor.mardiGras,
-                displayColor: ConfigColor.mardiGras)));
-  }
-
-  CupertinoApp iosApp(BuildContext context) {
-    return CupertinoApp(
-        title: _title,
-        routes: ConfigNavigate.routeTable(context, _helperIsLoggedIn),
-        navigatorKey: ConfigNavigate.key,
-        localizationsDelegates: [
-          DefaultMaterialLocalizations.delegate,
-          DefaultCupertinoLocalizations.delegate,
-          DefaultWidgetsLocalizations.delegate,
-        ],
-        theme: CupertinoThemeData(
-            textTheme: CupertinoTextThemeData(
-                textStyle: TextStyle(
-                    color: ConfigColor.mardiGras, fontFamily: _nunitoSans))));
-  }
+  Widget build(BuildContext context) => Provide.chain(MaterialApp(
+      title: _title,
+      routes: ConfigNavigate.routeTable(context, _helperIsLoggedIn),
+      navigatorKey: ConfigNavigate.key,
+      localizationsDelegates: [
+        DefaultMaterialLocalizations.delegate,
+        DefaultCupertinoLocalizations.delegate,
+        DefaultWidgetsLocalizations.delegate,
+      ],
+      theme: ThemeData(
+          textTheme: Theme.of(context).textTheme.apply(
+              fontFamily: _nunitoSans,
+              bodyColor: ConfigColor.mardiGras,
+              displayColor: ConfigColor.mardiGras))));
 }
diff --git a/lib/src/config/config_color.dart b/lib/src/config/config_color.dart
@@ -30,4 +30,8 @@ class ConfigColor {
   static const Color boulder = Color(0xFF797979);
   static const Color emperor = Color(0xFF545454);
   static const Color black = Color(0xFF000000);
+
+  static const Color telegramBlue = Color(0xFF0088CC);
+  static const Color signalBlue = Color(0xFF3661D1);
+  static const Color discordBlue = Color(0xFF7289DA);
 }
diff --git a/lib/src/config/config_domain.dart b/lib/src/config/config_domain.dart
@@ -14,7 +14,7 @@ class ConfigDomain {
       ConfigEnvironment.isPublic ? "api.mytiki.com" : "localhost:3000";
 
   static Uri asUri(String authority, String unencodedPath,
-      [Map<String, dynamic> queryParameters]) {
+      [Map<String, dynamic>? queryParameters]) {
     return ConfigEnvironment.isPublic
         ? Uri.https(authority, unencodedPath, queryParameters)
         : Uri.http(authority, unencodedPath, queryParameters);

diff --git a/lib/src/config/config_navigate.dart b/lib/src/config/config_navigate.dart
@@ -5,14 +5,14 @@
 
 import 'package:app/src/entry.dart';
 import 'package:app/src/features/home/home_screen/home_screen.dart';
-import 'package:app/src/features/intro/intro_screen_control/intro_screen_control.dart';
-import 'package:app/src/features/intro/intro_screen_earn/intro_screen_earn.dart';
-import 'package:app/src/features/intro/intro_screen_together/intro_screen_together.dart';
+import 'package:app/src/features/intro/intro_screen/widgets/intro_screen_control.dart';
+import 'package:app/src/features/intro/intro_screen/widgets/intro_screen_earn.dart';
+import 'package:app/src/features/intro/intro_screen/widgets/intro_screen_together.dart';
 import 'package:app/src/features/keys/keys_new_screen/keys_new_screen.dart';
 import 'package:app/src/features/keys/keys_restore_screen/keys_restore_screen.dart';
-import 'package:app/src/features/login/login_email_screen/login_email_screen.dart';
-import 'package:app/src/features/login/login_inbox_screen/login_inbox_screen.dart';
-import 'package:app/src/features/login/login_otp_screen/login_otp_screen.dart';
+import 'package:app/src/features/login/login_email_screen/widgets/login_email_screen.dart';
+import 'package:app/src/features/login/login_inbox_screen/widgets/login_inbox_screen.dart';
+import 'package:app/src/features/login/login_otp/login_otp_screen/widgets/login_otp_screen.dart';
 import 'package:app/src/utils/helper/helper_log_in.dart';
 import 'package:flutter/widgets.dart';