Skip to content

Commit

Permalink
Merge pull request #1984 from Pylons-tech/log-user-navigation-for-cra…
Browse files Browse the repository at this point in the history
…shlytics

Added user navigation history in crashlytics
  • Loading branch information
MikeSofaer authored May 31, 2023
2 parents faba66b + 1335650 commit ef21f2a
Show file tree
Hide file tree
Showing 115 changed files with 538 additions and 444 deletions.
15 changes: 8 additions & 7 deletions wallet/ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,7 @@
files = (
);
inputPaths = (
"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
);
name = "Thin Binary";
outputPaths = (
Expand Down Expand Up @@ -411,7 +412,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = QV67PMQ8H3;
ENABLE_BITCODE = NO;
GOOGLE_SERVICE_PATH = "";
Expand Down Expand Up @@ -549,7 +550,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = QV67PMQ8H3;
ENABLE_BITCODE = NO;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386;
Expand Down Expand Up @@ -582,7 +583,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = QV67PMQ8H3;
ENABLE_BITCODE = NO;
GOOGLE_SERVICE_PATH = "";
Expand Down Expand Up @@ -668,7 +669,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = QV67PMQ8H3;
ENABLE_BITCODE = NO;
GOOGLE_SERVICE_PATH = "${SRCROOT}/Runner/Firebase/prod/GoogleService-Info.plist";
Expand Down Expand Up @@ -752,7 +753,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = QV67PMQ8H3;
ENABLE_BITCODE = NO;
GOOGLE_SERVICE_PATH = "${SRCROOT}/Runner/Firebase/prod/GoogleService-Info.plist";
Expand Down Expand Up @@ -838,7 +839,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = QV67PMQ8H3;
ENABLE_BITCODE = NO;
GOOGLE_SERVICE_PATH = "${SRCROOT}/Runner/Firebase/development/GoogleService-Info.plist";
Expand Down Expand Up @@ -922,7 +923,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = QV67PMQ8H3;
ENABLE_BITCODE = NO;
GOOGLE_SERVICE_PATH = "${SRCROOT}/Runner/Firebase/development/GoogleService-Info.plist";
Expand Down
4 changes: 2 additions & 2 deletions wallet/lib/components/buttons/add_friend_button.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ class AddFriendButton extends StatelessWidget {
final String text;

const AddFriendButton({
Key? key,
super.key,
required this.onTap,
this.text = "",
}) : super(key: key);
});

@override
Widget build(BuildContext context) {
Expand Down
2 changes: 1 addition & 1 deletion wallet/lib/components/buttons/custom_paint_button.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class CustomPaintButton extends StatelessWidget {
final Color bgColor;
final double width;

const CustomPaintButton({Key? key, required this.onPressed, required this.title, required this.bgColor, required this.width}) : super(key: key);
const CustomPaintButton({super.key, required this.onPressed, required this.title, required this.bgColor, required this.width});

@override
Widget build(BuildContext context) {
Expand Down
4 changes: 2 additions & 2 deletions wallet/lib/components/buttons/favorite_button.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ class FavoriteButton extends StatelessWidget {
final VoidCallback onTap;

const FavoriteButton({
Key? key,
super.key,
required this.onTap,
}) : super(key: key);
});

@override
Widget build(BuildContext context) {
Expand Down
9 changes: 6 additions & 3 deletions wallet/lib/components/buttons/more_button.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,11 @@ class MoreButton extends StatelessWidget {
final VoidCallback onTap;
final bool showText;

const MoreButton({Key? key, required this.onTap, this.showText = true})
: super(key: key);
const MoreButton({
super.key,
required this.onTap,
this.showText = true,
});

@override
Widget build(BuildContext context) {
Expand All @@ -25,7 +28,7 @@ class MoreButton extends StatelessWidget {
)
else
const SizedBox.shrink(),
Icon(
Icon(
Icons.keyboard_arrow_right_rounded,
size: kIconSize,
color: AppColors.kSelectedIcon,
Expand Down
4 changes: 2 additions & 2 deletions wallet/lib/components/buttons/next_button.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ class NextButton extends StatelessWidget {
final VoidCallback onTap;

const NextButton({
Key? key,
super.key,
required this.onTap,
}) : super(key: key);
});

@override
Widget build(BuildContext context) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ class PylonsBlueButtonLoading extends StatelessWidget {
final bool enabled;

const PylonsBlueButtonLoading({
Key? key,
super.key,
required this.onTap,
this.text = "",
required this.loader,
this.enabled = true,
}) : super(key: key);
});

@override
Widget build(BuildContext context) {
Expand Down
4 changes: 2 additions & 2 deletions wallet/lib/components/buttons/pylons_get_started_button.dart
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class PylonsGetStartedButton extends StatelessWidget {
final double fontSize;

const PylonsGetStartedButton({
Key? key,
super.key,
required this.onTap,
this.text = "",
required this.loader,
Expand All @@ -27,7 +27,7 @@ class PylonsGetStartedButton extends StatelessWidget {
this.btnHeight = 45,
this.btnWidth = 200,
this.fontSize = 16,
}) : super(key: key);
});

@override
Widget build(BuildContext context) {
Expand Down
4 changes: 2 additions & 2 deletions wallet/lib/components/buttons/share_button.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ class ShareButton extends StatelessWidget {
final VoidCallback onTap;

const ShareButton({
Key? key,
super.key,
required this.onTap,
}) : super(key: key);
});

@override
Widget build(BuildContext context) {
Expand Down
34 changes: 21 additions & 13 deletions wallet/lib/components/feedback_text_field.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ import 'package:pylons_wallet/utils/image_util.dart';
import 'package:pylons_wallet/utils/screen_responsive.dart';

class FeedBackTextField extends StatelessWidget {
const FeedBackTextField(
{Key? key,
required this.label,
this.hint = "",
this.controller,
this.validator,
this.noOfLines = 1, // default to single line
this.inputFormatters = const [],
this.keyboardType = TextInputType.text,
this.textCapitalization = TextCapitalization.none})
: super(key: key);
const FeedBackTextField({
super.key,
required this.label,
this.hint = "",
this.controller,
this.validator,
this.noOfLines = 1, // default to single line
this.inputFormatters = const [],
this.keyboardType = TextInputType.text,
this.textCapitalization = TextCapitalization.none,
});

final String label;
final String hint;
Expand Down Expand Up @@ -68,7 +68,11 @@ class FeedBackTextField extends StatelessWidget {
height: isOneLine() ? 40.h : 120.h,
child: Align(
child: TextFormField(
style: TextStyle(fontSize: isOneLine() ? 18.sp : 15.sp, fontWeight: FontWeight.w400, color: AppColors.kTextBlackColor),
style: TextStyle(
fontSize: isOneLine() ? 18.sp : 15.sp,
fontWeight: FontWeight.w400,
color: AppColors.kTextBlackColor,
),
controller: controller,
validator: validator,
minLines: noOfLines,
Expand All @@ -93,7 +97,11 @@ class FeedBackTextField extends StatelessWidget {
height: isOneLine() ? 32.h : 110.h,
child: Align(
child: TextFormField(
style: TextStyle(fontSize: isOneLine() ? 16.sp : 14.sp, fontWeight: FontWeight.w400, color: AppColors.kTextBlackColor),
style: TextStyle(
fontSize: isOneLine() ? 16.sp : 14.sp,
fontWeight: FontWeight.w400,
color: AppColors.kTextBlackColor,
),
controller: controller,
validator: validator,
minLines: noOfLines,
Expand Down
4 changes: 2 additions & 2 deletions wallet/lib/components/image_widgets.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ const backgroundImage = BackgroundImage();

class BackgroundImage extends StatelessWidget {
const BackgroundImage({
Key? key,
}) : super(key: key);
super.key,
});

@override
Widget build(BuildContext context) {
Expand Down
4 changes: 2 additions & 2 deletions wallet/lib/components/maintenance_mode_widgets.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import '../utils/constants.dart';


class MaintenanceModeBannerWidget extends StatelessWidget {
const MaintenanceModeBannerWidget({Key? key}) : super(key: key);
const MaintenanceModeBannerWidget({super.key});

@override
Widget build(BuildContext context) {
Expand All @@ -24,7 +24,7 @@ class MaintenanceModeBannerWidget extends StatelessWidget {
}

class MaintenanceModeMessageWidget extends StatelessWidget {
const MaintenanceModeMessageWidget({Key? key}) : super(key: key);
const MaintenanceModeMessageWidget({super.key});

@override
Widget build(BuildContext context) {
Expand Down
4 changes: 2 additions & 2 deletions wallet/lib/components/pylons_blue_button.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ class PylonsBlueButton extends StatelessWidget {
final bool fulfilled;

const PylonsBlueButton({
Key? key,
super.key,
required this.onTap,
this.text = "",
this.fulfilled = true,
}) : super(key: key);
});

@override
Widget build(BuildContext context) {
Expand Down
20 changes: 10 additions & 10 deletions wallet/lib/components/pylons_glass.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ class GlassMorphism extends StatelessWidget {
final double borderRadius;
final double blurLevel;

const GlassMorphism(
{Key? key,
required this.child,
required this.startColor,
required this.startOpacity,
required this.endColor,
required this.endOpacity,
this.borderRadius = 0,
required this.blurLevel})
: super(key: key);
const GlassMorphism({
super.key,
required this.child,
required this.startColor,
required this.startOpacity,
required this.endColor,
required this.endOpacity,
this.borderRadius = 0,
required this.blurLevel,
});

@override
Widget build(BuildContext context) {
Expand Down
4 changes: 2 additions & 2 deletions wallet/lib/components/pylons_rounded_button.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ class PylonsRoundedButton extends StatelessWidget {
final Color textColor;

const PylonsRoundedButton({
Key? key,
super.key,
this.glyph,
required this.onTap,
this.textColor = Colors.black,
this.text = "",
}) : super(key: key);
});

@override
Widget build(BuildContext context) {
Expand Down
5 changes: 2 additions & 3 deletions wallet/lib/components/pylons_text_input_old.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@ import 'package:flutter/material.dart';

class PylonsTextInputOld extends StatelessWidget {
const PylonsTextInputOld(
{Key? key,
{super.key,
required this.controller,
required this.label,
this.disabled = false,
this.inputType = TextInputType.text,
this.errorText})
: super(key: key);
this.errorText});

final TextEditingController controller;
final String label;
Expand Down
16 changes: 8 additions & 8 deletions wallet/lib/components/pylons_text_input_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ import 'package:pylons_wallet/pages/presenting_onboard_page/components/custom_cl
import 'package:pylons_wallet/utils/constants.dart';

class PylonsTextInput extends StatelessWidget {
const PylonsTextInput(
{Key? key,
required this.controller,
required this.label,
this.disabled = false,
this.inputType = TextInputType.text,
this.errorText})
: super(key: key);
const PylonsTextInput({
super.key,
required this.controller,
required this.label,
this.disabled = false,
this.inputType = TextInputType.text,
this.errorText,
});

final TextEditingController controller;
final String label;
Expand Down
2 changes: 1 addition & 1 deletion wallet/lib/components/user_image_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import 'package:pylons_wallet/utils/constants.dart';
import 'package:pylons_wallet/utils/image_util.dart';

abstract class UserImageWidget extends StatelessWidget {
const UserImageWidget({Key? key}) : super(key: key);
const UserImageWidget({super.key});

@visibleForTesting
ImageProvider getImage(ImageProvider defaultVal, String uriKey) {
Expand Down
2 changes: 1 addition & 1 deletion wallet/lib/ipc/handler/handlers/create_recipe_handler.dart
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class CreateRecipeHandler implements BaseHandler {
final nft = await NFT.fromRecipeId(msgObj.cookbookId, msgObj.id);

if (nft != null) {
await navigatorKey.currentState!.pushNamed(RouteUtil.ROUTE_OWNER_VIEW, arguments: nft);
await navigatorKey.currentState!.pushNamed(Routes.ownerView.name, arguments: nft);
}

GetIt.I.get<HomeProvider>().changeTabs(0);
Expand Down
Loading

0 comments on commit ef21f2a

Please sign in to comment.