Merge branch 'release/0.0.8'

tiki-deprecated · May 14, 2021 · d7b2d53 · d7b2d53
2 parents 9371253 + 746eac5
commit d7b2d53
Show file tree

Hide file tree

Showing 23 changed files with 387 additions and 188 deletions.
diff --git a/README.md b/README.md
@@ -1,2 +1,55 @@
-# app
-CODE NAME TIKI BAR
+# Tiki App
+
+*We’re all users and in it together.*
+
+**No** secrets.  **Real** transparency. **Open source** by design.
+
+Everything that we do in our app is here. And you are welcome to explore it and contribute.
+
+-----
+#### Our Mission
+
+We’re building a fair, user-centric, decentralized system, giving the users control of their data. 
+It’s **your** data; you deserve the right to see, control, and monetize it. Your data does not belong to corporations, **TIKI included**! 
+We build tools to protect users from exploitation, greed, and carelessness. We build tools to **empower** users.
+
+#### Our values
+- **TRANSPARENCY** helps build trust. Seeing is believing, and nothing is off-limits. No shadowbans or secret algorithms at TIKI.
+- **COMMUNITY** is what connects us. Together, we're an unstoppable force. We expect better. We demand better.
+- **DIVERSITY** is not optional within the walls of TIKI. We're here for our users; we represent our users
+- **SUSTAINABILITY** comes before profit. We work tirelessly to bring lasting positive change to our users' lives.
+- **RELIABILITY** is foundational to trust. We want our users to count on us and aim never to break that trust.
+
+-----
+## Contributing
+
+1. [Join our Discord](https://discord.com/invite/evjYQq48Be), meet the community and help us in giving back people the control of their data.
+2. [Create an issue](https://github.com/tiki/app/issues/new/choose) if you find a bug or would like to ask for a feature,
+3. [Fork this repository](https://github.com/tiki/app/fork) to contribute with code and send us a Pull Request.
+
+## About Tiki
+### It's **your** data. Get **paid** for it
+
+Your data is worth thousands a year. Why aren’t you getting your fair share? Take back control. Get paid.
+
+**Tiki’s got your back.**
+
+Why TIKI?
+You think you own your data?
+In 2020 alone, the data on our behaviour and purchases was worth more than $382 billion in advertising revenue.
+
+### How does it work?
+
+Link your accounts to the TIKI app and we'll get you paid your fair share.
+
+
+1. **See** what data companies are collecting on you, how its used, and how secure it really is.
+
+2. **Control** who has access to your data and for what purpose. It’s your decision.
+
+3. **Monetize** Get paid your fair share for granting buyers access to your data.
+
+## Contact Us
+Follow us, tweet us, hit us up. Together we're a revolution.
+
+[Twitter](https://twitter.com/my_tiki_) - [Instagram](https://www.instagram.com/my.tiki/) - [Facebook](https://www.facebook.com/mytikiapp) - [Tiktok](https://www.tiktok.com/@my.tiki?) - [LinkedIn](https://www.linkedin.com/company/mytiki/) - [Discord](https://discord.com/invite/evjYQq48Be) - [Telegram](https://t.me/mytikiapp) - [Signal](https://signal.group/#CjQKIA66Eq2VHecpcCd-cu-dziozMRSH3EuQdcZJNyMOYNi5EhC0coWtjWzKQ1dDKEjMqhkP)
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -1,4 +1,8 @@
 PODS:
+  - Amplitude (7.2.0)
+  - amplitude_flutter (0.0.1):
+    - Amplitude (= 7.2.0)
+    - Flutter
   - barcode_scan (0.0.1):
     - Flutter
     - MTBBarcodeScanner
@@ -67,6 +71,7 @@ PODS:
     - Flutter
 
 DEPENDENCIES:
+  - amplitude_flutter (from `.symlinks/plugins/amplitude_flutter/ios`)
   - barcode_scan (from `.symlinks/plugins/barcode_scan/ios`)
   - firebase_core (from `.symlinks/plugins/firebase_core/ios`)
   - firebase_dynamic_links (from `.symlinks/plugins/firebase_dynamic_links/ios`)
@@ -83,6 +88,7 @@ DEPENDENCIES:
 
 SPEC REPOS:
   trunk:
+    - Amplitude
     - Firebase
     - FirebaseCore
     - FirebaseCoreDiagnostics
@@ -96,6 +102,8 @@ SPEC REPOS:
     - SwiftProtobuf
 
 EXTERNAL SOURCES:
+  amplitude_flutter:
+    :path: ".symlinks/plugins/amplitude_flutter/ios"
   barcode_scan:
     :path: ".symlinks/plugins/barcode_scan/ios"
   firebase_core:
@@ -124,6 +132,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/url_launcher/ios"
 
 SPEC CHECKSUMS:
+  Amplitude: c948c6f99c7f798c196523b2a5584367401d910f
+  amplitude_flutter: 5c934cf8331619b62bbd5a69f3cfea9090b3ca94
   barcode_scan: a5c27959edfafaa0c771905bad0b29d6d39e4479
   Firebase: c121feb35e4126c0b355e3313fa9b487d47319fd
   firebase_core: 84dcd80ac6d29c3d1039071b7306ee99688eb9c7

diff --git a/lib/main.dart b/lib/main.dart
@@ -1,3 +1,4 @@
+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';
@@ -9,14 +10,25 @@ import 'package:sentry_flutter/sentry_flutter.dart';
 import 'src/app.dart';
 import 'src/config/config_sentry.dart';
 
+/// The dart entrypoint
+///
+/// Initializes the app execution and configurates its dependencies.
+/// [WidgetsFlutterBinding.ensureInitialized] waits until widget tree binding is initialized to configure the app.
+/// [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.
+/// [SentryFlutter] enables Sentry.io monitoring in the app.
 Future<void> main() async {
   WidgetsFlutterBinding.ensureInitialized();
+  await TikiAnalytics.getLogger();
   await Firebase.initializeApp();
   FlutterSecureStorage secureStorage = FlutterSecureStorage();
   HelperLogIn helperLogIn = HelperLogIn.auto(secureStorage);
   await Migrate0to001(secureStorage).migrate();
   await helperLogIn.load();
-  await SentryFlutter.init(
+  SentryFlutter.init(
       (options) async => options
         ..dsn = ConfigSentry.dsn
         ..environment = ConfigSentry.environment

diff --git a/lib/src/features/home/home_screen/home_screen_share.dart b/lib/src/features/home/home_screen/home_screen_share.dart
@@ -3,57 +3,30 @@
  * MIT license. See LICENSE file in root directory.
  */
 
-import 'package:app/src/config/config_color.dart';
 import 'package:app/src/features/keys/keys_referral/keys_referral_cubit.dart';
-import 'package:app/src/utils/platform/platform_relative_size.dart';
+import 'package:app/src/widgets/big_button.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:share/share.dart';
 
+/// The [HomeScreen] share section.
+///
+/// It handles the "share your code" action and renders the button.
 class HomeScreenShare extends StatelessWidget {
-  static const String _buttonText = "SHARE";
-  static const String _shareText = "You need to see this.";
-  static final double _letterSpacing =
-      0.05 * PlatformRelativeSize.blockHorizontal;
-  static final double _fontSize = 6 * PlatformRelativeSize.blockHorizontal;
-  static final double _marginHorizontal =
-      10 * PlatformRelativeSize.blockHorizontal;
-  static final double _marginVertical =
-      2.5 * PlatformRelativeSize.blockVertical;
+  static KeysReferralState _state;
+  static const String _shareText = "It's your data. Get paid for it.";
 
   @override
   Widget build(BuildContext context) {
     return BlocBuilder<KeysReferralCubit, KeysReferralState>(
         builder: (BuildContext context, KeysReferralState state) {
-          return _button(state.link);
-        });
+      _state = state;
+      return BigButton("SHARE", true, _share);
+    });
   }
 
-  Widget _button(Uri link) {
-    return ElevatedButton(
-        style: ElevatedButton.styleFrom(
-            shape: RoundedRectangleBorder(
-                borderRadius: BorderRadius.all(
-                    Radius.circular(10 * PlatformRelativeSize.blockVertical))),
-            primary: ConfigColor.mardiGras),
-        child: Wrap(
-          direction: Axis.vertical,
-          children: [
-            Container(
-                margin: EdgeInsets.symmetric(
-                    vertical: _marginVertical, horizontal: _marginHorizontal),
-                child: Center(
-                    child: Text(_buttonText,
-                        style: TextStyle(
-                          fontWeight: FontWeight.w700,
-                          fontSize: _fontSize,
-                          letterSpacing: _letterSpacing,
-                        ))))
-          ],
-        ),
-        onPressed: () {
-          Share.share(link.toString(), subject: _shareText);
-        });
+  _share(BuildContext context) {
+    Share.share(_state.link.toString(), subject: _shareText);
   }
 }
diff --git a/lib/src/features/intro/intro_screen/intro_screen_button.dart b/lib/src/features/intro/intro_screen/intro_screen_button.dart
@@ -12,8 +12,6 @@ class IntroScreenButton extends StatelessWidget {
   static final double _letterSpacing =
       0.05 * PlatformRelativeSize.blockHorizontal;
   static final double _fontSize = 6 * PlatformRelativeSize.blockHorizontal;
-  static final double _marginHorizontal =
-      10 * PlatformRelativeSize.blockHorizontal;
   static final double _marginVertical =
       2.5 * PlatformRelativeSize.blockVertical;
   static final double _buttonWidth = 50 * PlatformRelativeSize.blockHorizontal;

diff --git a/lib/src/features/intro/intro_screen/intro_screen_skip.dart b/lib/src/features/intro/intro_screen/intro_screen_skip.dart
@@ -3,27 +3,25 @@
  * MIT license. See LICENSE file in root directory.
  */
 
-import 'package:app/src/config/config_color.dart';
-import 'package:app/src/utils/platform/platform_relative_size.dart';
+import 'package:app/src/widgets/tiki_button.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
+/// The [IntroScreen] skipper link.
 class IntroScreenSkip extends StatelessWidget {
-  static final double _fontSize = 4 * PlatformRelativeSize.blockHorizontal;
+  static final int _fontSize = 4;
 
   final String toPath;
+
   IntroScreenSkip(this.toPath);
 
   @override
   Widget build(BuildContext context) {
-    return TextButton(
-        onPressed: () {
-          Navigator.of(context).pushNamed(toPath);
-        },
-        child: Text('Skip',
-            style: TextStyle(
-                color: ConfigColor.black,
-                fontWeight: FontWeight.bold,
-                fontSize: _fontSize)));
+    return TikiTextButton(
+      "Skip",
+      () => Navigator.of(context).pushNamed(toPath),
+      fontWeight: FontWeight.bold,
+      fontSize: _fontSize,
+    );
   }
 }
diff --git a/lib/src/features/keys/keys_new_screen_gen/keys_new_screen_gen.dart b/lib/src/features/keys/keys_new_screen_gen/keys_new_screen_gen.dart
@@ -4,11 +4,10 @@
  */
 
 import 'package:app/src/features/keys/keys_new_screen/keys_new_screen_bloc.dart';
-import 'package:app/src/utils/helper/helper_image.dart';
 import 'package:app/src/utils/platform/platform_relative_size.dart';
-import 'package:flutter/src/widgets/framework.dart';
 import 'package:flutter/widgets.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:lottie/lottie.dart';
 
 import 'keys_new_screen_gen_restore.dart';
 import 'keys_new_screen_gen_subtitle.dart';
@@ -51,7 +50,7 @@ class _KeysNewScreenGen extends State<KeysNewScreenGen> {
                 Expanded(
                     child: Container(
                         alignment: Alignment.center,
-                        child: HelperImage("keys-create-pineapple"))),
+                        child: Lottie.asset("res/animation/Securing_account_with_blob.json"))),
                 Container(
                     margin: EdgeInsets.only(bottom: _marginBottomButton),
                     child: KeysNewScreenGenRestore())

diff --git a/lib/src/features/keys/keys_new_screen_save/keys_new_screen_save.dart b/lib/src/features/keys/keys_new_screen_save/keys_new_screen_save.dart
@@ -29,54 +29,46 @@ class KeysNewScreenSave extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Row(children: [
-      Expanded(
-          child: Container(
-              padding: EdgeInsets.symmetric(
-                  horizontal: PlatformRelativeSize.marginHorizontal2x),
-              child: Column(children: [
-                Container(
-                    margin: EdgeInsets.only(top: _marginTopTitle),
-                    alignment: Alignment.center,
-                    child: KeysNewScreenSaveTitle()),
-                Container(
-                    margin:
-                        EdgeInsets.symmetric(vertical: _marginVerticalSubtitle),
-                    alignment: Alignment.center,
-                    child: KeysNewScreenSaveSubtitle()),
-                Expanded(
-                    child: Column(
-                        mainAxisAlignment: MainAxisAlignment.center,
-                        children: [
-                      Container(
-                          alignment: Alignment.centerLeft,
-                          child: KeysNewScreenSaveBkCopy()),
-                      Container(
-                          margin: EdgeInsets.only(
-                              top: 2 * PlatformRelativeSize.blockVertical),
-                          alignment: Alignment.centerLeft,
-                          child: KeysNewScreenSaveBkDownload()),
-                      Container(
-                          margin: EdgeInsets.only(
-                              top: 2 * PlatformRelativeSize.blockVertical),
-                          alignment: Alignment.centerLeft,
-                          child: KeysNewScreenSaveBkSend()),
-                      Container(
-                          alignment: Alignment.centerLeft,
-                          margin: EdgeInsets.only(
-                              top: 2 * PlatformRelativeSize.blockVertical),
-                          child: KeysNewScreenSaveBkQr())
-                    ])),
-                Container(
-                    margin: EdgeInsets.only(top: _marginTopDownload),
-                    child: KeysNewScreenSaveContinue()),
-                Container(
-                    margin: EdgeInsets.symmetric(vertical: _marginVerticalSkip),
-                    child: KeysNewScreenSaveSkip()),
-                Container(
-                    margin: EdgeInsets.only(bottom: _marginBottomButton),
-                    child: KeysNewScreenSaveRestore())
-              ])))
-    ]);
+    return Container(
+        padding: EdgeInsets.symmetric(
+            horizontal: PlatformRelativeSize.marginHorizontal2x),
+        child: SingleChildScrollView(
+            child: Column(children: [
+          Container(
+              margin: EdgeInsets.only(top: _marginTopTitle),
+              alignment: Alignment.center,
+              child: KeysNewScreenSaveTitle()),
+          Container(
+              margin: EdgeInsets.symmetric(vertical: _marginVerticalSubtitle),
+              alignment: Alignment.center,
+              child: KeysNewScreenSaveSubtitle()),
+          Container(
+              alignment: Alignment.centerLeft,
+              child: KeysNewScreenSaveBkCopy()),
+          Container(
+              margin:
+                  EdgeInsets.only(top: 2 * PlatformRelativeSize.blockVertical),
+              alignment: Alignment.centerLeft,
+              child: KeysNewScreenSaveBkDownload()),
+          Container(
+              margin:
+                  EdgeInsets.only(top: 2 * PlatformRelativeSize.blockVertical),
+              alignment: Alignment.centerLeft,
+              child: KeysNewScreenSaveBkSend()),
+          Container(
+              alignment: Alignment.centerLeft,
+              margin:
+                  EdgeInsets.only(top: 2 * PlatformRelativeSize.blockVertical),
+              child: KeysNewScreenSaveBkQr()),
+          Container(
+              margin: EdgeInsets.only(top: _marginTopDownload),
+              child: KeysNewScreenSaveContinue()),
+          Container(
+              margin: EdgeInsets.symmetric(vertical: _marginVerticalSkip),
+              child: KeysNewScreenSaveSkip()),
+          Container(
+              margin: EdgeInsets.only(bottom: _marginBottomButton),
+              child: KeysNewScreenSaveRestore())
+        ])));
   }
 }