Skip to content

Commit 3493a21

Browse files
authored
Fix events in unity (#93)
* Fix events in unity * Reformat files * Reformat files
1 parent 07564b2 commit 3493a21

File tree

8 files changed

+14
-13
lines changed

8 files changed

+14
-13
lines changed

.github/workflows/ios_deploy.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ jobs:
3636
security unlock-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
3737
3838
# import certificate to keychain
39-
security import $CERTIFICATE_PATH -k $KEYCHAIN_PATH -P "$P12_PASSWORD" -T usr/bin/codesign
39+
security import $CERTIFICATE_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
4040
security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
41+
security list-keychain -d user -s $KEYCHAIN_PATH
4142
4243
chmod +x ios/install_dist_profile.sh && ./ios/install_dist_profile.sh
4344

debug.keystore

2.7 KB
Binary file not shown.

ios/Runner.xcodeproj/project.pbxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,7 @@
601601
PRODUCT_BUNDLE_IDENTIFIER = com.canopas.projectunity;
602602
PRODUCT_NAME = "$(TARGET_NAME)";
603603
PROVISIONING_PROFILE_SPECIFIER = "";
604-
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "unity-distribution-21-march-2024";
604+
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "unity-provisioning-profile-03April2024";
605605
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
606606
SWIFT_VERSION = 5.0;
607607
VERSIONING_SYSTEM = "apple-generic";

ios/Runner/ExportOptions.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<key>provisioningProfiles</key>
88
<dict>
99
<key>com.canopas.projectunity</key>
10-
<string>205d1b89-17ca-49a3-bc88-1b79ea02204f</string>
10+
<string>9e32b51b-cdf9-43aa-80fc-e785365ccc9</string>
1111
</dict>
1212
<key>signingCertificate</key>
1313
<string>1EDB213DC565912BC6BC866ADEBF192575C633DC</string>

ios/install_dist_profile.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
DIST_PROFILE_FILE=${DIST_PROVISION_UUID}.mobileprovision
44

55
# Recreate the certificate from the secure environment variable
6-
echo $DIST_PROVISION | base64 --decode > $DIST_PROFILE_FILE
6+
echo "$BUILD_PROVISION_PROFILE_BASE64" | base64 --decode > "$DIST_PROFILE_FILE"
77

88
# copy where Xcode can find it
99
cp ${DIST_PROFILE_FILE} "$HOME/Library/MobileDevice/Provisioning Profiles/${DIST_PROVISION_UUID}.mobileprovision"

lib/data/core/utils/date_formatter.dart

+6-7
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,13 @@ class DateFormatter {
9595
}
9696
}
9797

98-
String showAnniversaries(
99-
{required DateTime dateOfJoining,
100-
required DateTime upcomingDate,
101-
required String name,
102-
int? number}) {
98+
String showAnniversaries({
99+
required DateTime dateOfJoining,
100+
required DateTime upcomingDate,
101+
required String name,
102+
}) {
103103
final today = DateTime.now().dateOnly;
104-
final difference = dateOfJoining.difference(today);
105-
int yearDifference = (difference.inDays / 365).floor().abs();
104+
int yearDifference = dateOfJoining.calculateDifferenceInYears(today);
106105
if (upcomingDate.isAtSameMomentAs(today)) {
107106
return _localization.present_anniversary_text(name, yearDifference);
108107
} else {

lib/data/services/auth_service.dart

+2
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ class AuthService {
9494

9595
firebase_auth.AppleAuthProvider appleProvider =
9696
firebase_auth.AppleAuthProvider();
97+
appleProvider.addScope('email');
98+
appleProvider.addScope('name');
9799
if (kIsWeb) {
98100
credential = await firebase_auth.FirebaseAuth.instance
99101
.signInWithPopup(appleProvider);

lib/ui/sign_in/sign_in_screen.dart

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import 'dart:io';
22

33
import 'package:flutter/cupertino.dart';
4-
import 'package:flutter/foundation.dart';
54
import 'package:flutter/material.dart';
65
import 'package:flutter/widgets.dart';
76
import 'package:flutter_bloc/flutter_bloc.dart';
@@ -108,7 +107,7 @@ class SignInScreenState extends State<SignInScreen> {
108107
const SizedBox(
109108
height: 20,
110109
),
111-
if (kIsWeb || Platform.isIOS) const AppleSignInButton()
110+
if (Platform.isIOS) const AppleSignInButton()
112111
],
113112
),
114113
),

0 commit comments

Comments
 (0)