Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2623 new onboarding #2020

Merged
merged 159 commits into from
Aug 30, 2024
Merged
Show file tree
Hide file tree
Changes from 147 commits
Commits
Show all changes
159 commits
Select commit Hold shift + click to select a range
4f867ca
Add Daily Work
ppupha Jul 30, 2024
3f297f9
Update protocol
ppupha Jul 30, 2024
b366785
Update API and Timer
ppupha Aug 1, 2024
f0d0bc1
Update Asset
ppupha Aug 1, 2024
17fb7bf
fix icon, add didUpdateWidget
ppupha Aug 2, 2024
6d1d47b
fix: dailies token not up to date
ppupha Aug 5, 2024
9211b56
Update indexID
ppupha Aug 6, 2024
0554bec
Add New UI
ppupha Aug 13, 2024
0985b92
Add Artist Details
ppupha Aug 15, 2024
6aea03e
Merge branch 'develop' into Sang/feat/2721_dailies
ppupha Aug 16, 2024
023e04f
update didKey to primaryAddress
ppupha Aug 16, 2024
040e348
add sort/filter, update UI
ppupha Aug 16, 2024
7856842
fix lint and add loading widget
ppupha Aug 16, 2024
f4573d7
Fix bugs
ppupha Aug 19, 2024
1bc1aa0
Update
ppupha Aug 19, 2024
6d90cc8
Update
ppupha Aug 19, 2024
bdb8817
Update
ppupha Aug 19, 2024
06692ac
Update Asset
ppupha Aug 19, 2024
a672d37
Update
ppupha Aug 19, 2024
c13036a
Handle display featured work
ppupha Aug 19, 2024
9065fc0
tap to scroll to top
ppupha Aug 19, 2024
ccb9960
tap outside to collapse
ppupha Aug 19, 2024
6620c4d
fix UI
ppupha Aug 20, 2024
6a5ce4b
Add Asset
ppupha Aug 20, 2024
487d7f7
fix lint and update fix bugs
ppupha Aug 20, 2024
f2b8225
Update Asset
ppupha Aug 20, 2024
b380960
Update
ppupha Aug 20, 2024
bf9c520
Update
ppupha Aug 20, 2024
462aa89
Add Source and padding
ppupha Aug 20, 2024
da07b1b
Remove exhibition from home navigation
ppupha Aug 20, 2024
965bd8c
fix: thumbnail, gotoPost, tr()
ppupha Aug 21, 2024
2f7a445
Upgrade flutter to 3.24.0
ppupha Aug 21, 2024
93e45d0
Update CI
ppupha Aug 21, 2024
93fdb54
Merge branch 'Sang/feat/new_UI' into Sang/fix/upgrade_flutter
ppupha Aug 21, 2024
d21e253
Merge branch 'Sang/fix/upgrade_flutter' into Sang/feat/new_UI
ppupha Aug 21, 2024
fdf1b87
Update Artwork Title
ppupha Aug 21, 2024
90b56a5
Merge branch 'Sang/feat/2721_dailies' into Sang/feat/2721_dailies_new_UI
ppupha Aug 21, 2024
05673e3
feat: membership profile payment (#1832)
ppupha Jul 30, 2024
05fde0e
feat new onboarding page
phuocbitmark Aug 21, 2024
c5ee3c9
action when select membership
phuocbitmark Aug 22, 2024
b5b0796
handle get subscription fail
phuocbitmark Aug 22, 2024
c00c7ec
Update lib/screen/settings/subscription/upgrade_bloc.dart
phuocbitmark Aug 22, 2024
80224b4
disable predictive pop subscription page
phuocbitmark Aug 22, 2024
8422f1e
update assets
phuocbitmark Aug 22, 2024
73d7596
dispose old page
phuocbitmark Aug 22, 2024
33b01e5
Merge branch 'develop' into 2623-new-onboarding
phuocbitmark Aug 23, 2024
d88ee59
show upgrade pop up
phuocbitmark Aug 23, 2024
959a1d5
Daily new UI
ppupha Aug 23, 2024
68a7ccc
add log
phuocbitmark Aug 23, 2024
47bd310
lint
phuocbitmark Aug 23, 2024
dec0d5b
Fix daily, featured work, daily api
ppupha Aug 23, 2024
d666f82
Merge branch '2623-new-onboarding' into Sang/feat/2721_dailies_new_UI
ppupha Aug 23, 2024
3af079d
Update Cast Button
ppupha Aug 23, 2024
32cfbab
Update
ppupha Aug 23, 2024
912acd3
Update
ppupha Aug 23, 2024
c6921fe
Update
ppupha Aug 23, 2024
2083ded
Update
ppupha Aug 23, 2024
9561623
Update Text
ppupha Aug 23, 2024
dd552b6
Update
ppupha Aug 23, 2024
e2e54ca
fix text
phuocbitmark Aug 23, 2024
342e8df
fix text
phuocbitmark Aug 23, 2024
76d56ad
Merge branch 'develop' into 2623-new-onboarding
longbmk Aug 23, 2024
1d349b0
fix padding
phuocbitmark Aug 26, 2024
911e952
Merge branch '2623-new-onboarding' of github.com:bitmark-inc/autonomy…
phuocbitmark Aug 26, 2024
89fbdb1
fix lint and comment
ppupha Aug 26, 2024
76262f1
Update
ppupha Aug 26, 2024
ba8838e
fix feedback
ppupha Aug 26, 2024
a9b75d0
fix loading widget
phuocbitmark Aug 26, 2024
7cd1a9f
fix calling get subscription infor at onboarding
phuocbitmark Aug 26, 2024
b2c70fb
Merge branch 'develop' into Sang/feat/2721_dailies_new_UI
phuocbitmark Aug 26, 2024
4f7313d
Merge branch 'Sang/feat/2721_dailies_new_UI' into 2623-new-onboarding
phuocbitmark Aug 26, 2024
1b468f5
fix loading widget, expanded widget
phuocbitmark Aug 26, 2024
e5418ba
fix upgrade bloc
phuocbitmark Aug 26, 2024
58ab1b0
Move collection and organize to menu
ppupha Aug 26, 2024
0d21d74
upgrade listen: don't listen when already completed
phuocbitmark Aug 26, 2024
555b684
remove test code
phuocbitmark Aug 26, 2024
03523e1
Add loading more
ppupha Aug 26, 2024
37db423
Merge branch 'Sang/feat/2721_dailies_new_UI' into 2623-new-onboarding
phuocbitmark Aug 26, 2024
03d3b32
Merge branch 'develop' into 2623-new-onboarding
phuocbitmark Aug 26, 2024
89acad0
Update
ppupha Aug 26, 2024
b67a284
add log
phuocbitmark Aug 27, 2024
decad6c
app delegate annotation
phuocbitmark Aug 27, 2024
edde325
Merge branch '2623-new-onboarding' of github.com:bitmark-inc/autonomy…
phuocbitmark Aug 27, 2024
fc2d4ac
fix feature text padding
phuocbitmark Aug 27, 2024
b338af8
fix UI layer, scanQr page background
phuocbitmark Aug 27, 2024
169846d
recognize deeplink handler, add pop up to handle case fail
phuocbitmark Aug 26, 2024
8d8265c
add log
phuocbitmark Aug 27, 2024
842e523
add log
phuocbitmark Aug 27, 2024
6990c91
Update UI
ppupha Aug 27, 2024
2a0ee44
Capture error for 4xx 5xx error
ppupha Aug 27, 2024
81ce5b0
fix match type
phuocbitmark Aug 27, 2024
362628c
Merge branch 'develop' into 2623-new-onboarding
phuocbitmark Aug 27, 2024
669d703
update subsription status after subscribe
phuocbitmark Aug 27, 2024
098433a
purchase at onboarding
phuocbitmark Aug 27, 2024
e867ec4
fix: wallet connect sign message error
hoangbtmrk Aug 27, 2024
9052a0c
Merge branch '2623-new-onboarding' of github.com:bitmark-inc/autonomy…
phuocbitmark Aug 27, 2024
e873790
alway go new onboarding swiper once
phuocbitmark Aug 27, 2024
0361cc6
fix return after name continue
phuocbitmark Aug 27, 2024
9581e0e
Handle Error
ppupha Aug 27, 2024
1a275af
Update
ppupha Aug 27, 2024
9c36a6c
Merge branch 'Sang/fix/new_UI' into 2623-new-onboarding
ppupha Aug 27, 2024
61d3024
Merge branch 'Sang/fix/improve_tv_connection' into 2623-new-onboarding
ppupha Aug 27, 2024
dfa7e6a
Update Explore Icon
ppupha Aug 27, 2024
1e9fca3
Update
ppupha Aug 27, 2024
88f8dc2
assets
phuocbitmark Aug 28, 2024
3626062
Merge branch '2623-new-onboarding' into 2623-onboarding-swipe
phuocbitmark Aug 28, 2024
281329a
update library version
hoangbtmrk Aug 28, 2024
4cbe862
onboarding page
phuocbitmark Aug 28, 2024
75b262a
Merge branch '2623-new-onboarding' into 2623-onboarding-swipe
phuocbitmark Aug 28, 2024
570f669
skip for subscribed user
phuocbitmark Aug 28, 2024
bf1ec48
lint
phuocbitmark Aug 28, 2024
e7db0fc
handle skip onboarding cases
phuocbitmark Aug 28, 2024
d2c417b
do not show connect tv result in onboarding swiper
phuocbitmark Aug 28, 2024
9b85a37
fix restore if needed
phuocbitmark Aug 28, 2024
3d713ec
Merge pull request #2033 from bitmark-inc/2623-onboarding-swipe
phuocbitmark Aug 28, 2024
f282a1e
fix: override package_info_plus dependency
hoangbtmrk Aug 28, 2024
05b9339
fix: refactor deeplink
anhnguyenbitmark Aug 28, 2024
4482e43
refactor onboarding
phuocbitmark Aug 28, 2024
92217b6
refactor onboarding
phuocbitmark Aug 28, 2024
7d9d773
fix stream
phuocbitmark Aug 28, 2024
5509e25
delay to preserve context
phuocbitmark Aug 28, 2024
234d307
fix streams already have listener
phuocbitmark Aug 28, 2024
49967b0
upgrade pub, upgradebloc singleton
phuocbitmark Aug 28, 2024
ee9582a
lint
phuocbitmark Aug 28, 2024
f148792
Merge branch '2623-new-onboarding' into 2623-onboarding-swipe-refactor
phuocbitmark Aug 28, 2024
6380e25
logging, verify receipt once
phuocbitmark Aug 29, 2024
d6c5311
fix injector
phuocbitmark Aug 29, 2024
2071991
remove unused condition
phuocbitmark Aug 29, 2024
7e05cc2
remove unused condition
phuocbitmark Aug 29, 2024
33dd481
Merge pull request #2035 from bitmark-inc/2623-onboarding-swipe-refactor
phuocbitmark Aug 29, 2024
91019bd
remove router bloc
phuocbitmark Aug 29, 2024
43cc927
fix: display ínstruction (#2034)
ppupha Aug 29, 2024
f817a0e
lint
phuocbitmark Aug 29, 2024
da8d581
Merge branch 'develop' into 2623-new-onboarding
phuocbitmark Aug 29, 2024
c6997d9
add notification after subscribed
phuocbitmark Aug 29, 2024
db76b34
restore iap
phuocbitmark Aug 29, 2024
0f22c36
remove unused code
phuocbitmark Aug 29, 2024
a107f96
xcode signing settings
phuocbitmark Aug 29, 2024
c440f51
show continue on onboarding if already subscribed
phuocbitmark Aug 29, 2024
1df0b73
fix regex
phuocbitmark Aug 29, 2024
4db4f76
fix regex
phuocbitmark Aug 29, 2024
70accf3
remove pro page
ppupha Aug 29, 2024
17d99dd
lint
phuocbitmark Aug 29, 2024
ff21c34
Merge branch '2623-new-onboarding' of github.com:bitmark-inc/autonomy…
phuocbitmark Aug 29, 2024
e2a80db
lint
phuocbitmark Aug 29, 2024
5b08b97
Merge branch 'develop' into 2623-new-onboarding
phuocbitmark Aug 29, 2024
0bbd97d
lint
phuocbitmark Aug 29, 2024
04645d6
Update UI
hoangbtmrk Aug 29, 2024
ab8c885
Update assets
hoangbtmrk Aug 29, 2024
b1da605
Handle Error
ppupha Aug 29, 2024
cf187c8
Revert "xcode signing settings"
phuocbitmark Aug 29, 2024
e5a9b0d
Merge branch '2623-new-onboarding' of github.com:bitmark-inc/autonomy…
phuocbitmark Aug 29, 2024
5da8881
color and text
phuocbitmark Aug 29, 2024
b9a3da1
remove tap to view when there is no handler
phuocbitmark Aug 29, 2024
94bdb45
add id to feralfile error
ppupha Aug 29, 2024
bcd2746
delete canvas device at forget exist
phuocbitmark Aug 30, 2024
c76b90c
fix: Cast when scan device (#2037)
ppupha Aug 30, 2024
d6a6afe
Merge pull request #2038 from bitmark-inc/forgot_exist_deletion
phuocbitmark Aug 30, 2024
9f83a62
remove notification purchase onboarding
phuocbitmark Aug 30, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/android-release-appcenter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:
description: Using testnet (Default staging)
jobs:
build:
runs-on: [self-hosted, macOS]
runs-on: [ self-hosted, macOS ]
steps:
- uses: actions/checkout@v2
- uses: actions/setup-java@v2
Expand All @@ -27,7 +27,7 @@ jobs:
java-version: "17"
- uses: subosito/flutter-action@v2
with:
flutter-version: "3.19.0"
flutter-version: "3.24.0"
channel: stable
- name: Set env
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/auto_test_android.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ on:
# - update_autotest
jobs:
build:
runs-on: [self-hosted, macOS]
runs-on: [ self-hosted, macOS ]
steps:
# Checkout code and get packages.
- name: Checkout code
uses: actions/checkout@v3
# Set build number
- uses: subosito/flutter-action@v2
with:
flutter-version: "3.22.1"
flutter-version: "3.24.0"
channel: stable
- name: Set env
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/auto_test_ios.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ on:
# - develop
jobs:
build:
runs-on: [self-hosted, macOS]
runs-on: [ self-hosted, macOS ]
steps:
# Checkout code and get packages.
- name: Checkout code
uses: actions/checkout@v3
# Set build number
- uses: subosito/flutter-action@v2
with:
flutter-version: "3.22.1"
flutter-version: "3.24.0"
channel: stable
- name: Set env
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/bmvn_build_appcenter_android.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ on:
description: Using testnet (Default staging)
jobs:
build:
runs-on: [self-hosted, macOS, macm2, android]
runs-on: [ self-hosted, macOS, macm2, android ]
steps:
- name: Extract Build number for Testnet
id: extract-version-testnet
Expand All @@ -57,7 +57,7 @@ jobs:
java-version: "17"
- uses: subosito/flutter-action@v2
with:
flutter-version: "3.22.1"
flutter-version: "3.24.0"
channel: stable
- name: Set env
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/bmvn_build_appcenter_ios.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ on:

jobs:
fastlane-deploy:
runs-on: [self-hosted, macOS, macm2, ios]
runs-on: [ self-hosted, macOS, macm2, ios ]
steps:
# Set up Flutter.
- name: Clone Flutter repository with master channel
uses: subosito/flutter-action@v2
with:
flutter-version: "3.22.1"
flutter-version: "3.24.0"
channel: stable
# - uses: maxim-lobanov/setup-xcode@v1
# with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ios-release-appcenter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ on:

jobs:
fastlane-deploy:
runs-on: [self-hosted, macOS]
runs-on: [ self-hosted, macOS ]
steps:
# Set up Flutter.
- name: Clone Flutter repository with master channel
uses: subosito/flutter-action@v2
with:
flutter-version: "3.22.1"
flutter-version: "3.24.0"
channel: stable
- uses: maxim-lobanov/setup-xcode@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ios-release-testflight.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Clone Flutter repository with master channel
uses: subosito/flutter-action@v2
with:
flutter-version: "3.22.1"
flutter-version: "3.24.0"
channel: stable
- uses: maxim-lobanov/setup-xcode@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion assets
49 changes: 27 additions & 22 deletions ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1033,6 +1033,7 @@
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = Z5CE7A3A7N;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = Z5CE7A3A7N;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
Expand All @@ -1044,6 +1045,7 @@
PRODUCT_BUNDLE_IDENTIFIER = com.bitmark.autonomywallet;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "Autonomy Wallet Appstore";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = Autonomy_Wallet_Appstore;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = prod;
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
Expand Down Expand Up @@ -1116,6 +1118,8 @@
BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/RunnerDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = Z5CE7A3A7N;
ENABLE_BITCODE = NO;
Expand All @@ -1128,7 +1132,7 @@
MARKETING_VERSION = 0.32.0;
PRODUCT_BUNDLE_IDENTIFIER = com.bitmark.autonomywallet;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "Feral File Wallet Appstore Dev";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = prod;
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
Expand All @@ -1149,7 +1153,8 @@
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_ENTITLEMENTS = "Runner Notification/Runner NotificationDebug.entitlements";
CODE_SIGN_STYLE = Manual;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 20;
DEVELOPMENT_TEAM = Z5CE7A3A7N;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand All @@ -1168,7 +1173,7 @@
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.bitmark.autonomywallet.notification;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "Feral File Wallet Notification Development";
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_EMIT_LOC_STRINGS = YES;
Expand Down Expand Up @@ -1319,6 +1324,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = Z5CE7A3A7N;
Expand Down Expand Up @@ -1353,11 +1359,10 @@
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 20;
DEVELOPMENT_TEAM = Z5CE7A3A7N;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = Z5CE7A3A7N;
GCC_C_LANGUAGE_STANDARD = gnu11;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "Runner Notification/Info.plist";
Expand All @@ -1373,8 +1378,7 @@
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.bitmark.autonomywallet.notification;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "Feral File Wallet Push Notification Appstore";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = Autonomy_Wallet_Push_Notification_Appstore;
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = YES;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_EMIT_LOC_STRINGS = YES;
Expand Down Expand Up @@ -1526,6 +1530,8 @@
BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/RunnerDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = Z5CE7A3A7N;
ENABLE_BITCODE = NO;
Expand All @@ -1538,7 +1544,7 @@
MARKETING_VERSION = 0.32.0;
PRODUCT_BUNDLE_IDENTIFIER = com.bitmark.autonomywallet;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "Autonomy Wallet Appstore Dev";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
Expand All @@ -1558,7 +1564,8 @@
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_ENTITLEMENTS = "Runner Notification/Runner NotificationDebug.entitlements";
CODE_SIGN_STYLE = Manual;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 20;
DEVELOPMENT_TEAM = Z5CE7A3A7N;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand All @@ -1577,7 +1584,7 @@
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.bitmark.autonomywallet.notification;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "Autonomy Wallet Notification Development";
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_EMIT_LOC_STRINGS = YES;
Expand Down Expand Up @@ -1721,11 +1728,10 @@
BUILD_LIBRARY_FOR_DISTRIBUTION = NO;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
DEVELOPMENT_TEAM = Z5CE7A3A7N;
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = Z5CE7A3A7N;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
Expand All @@ -1736,8 +1742,7 @@
MARKETING_VERSION = 0.32.0;
PRODUCT_BUNDLE_IDENTIFIER = com.bitmark.autonomywallet;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "Autonomy Wallet Appstore";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Autonomy Wallet Adhoc";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
Expand All @@ -1755,8 +1760,8 @@
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 20;
DEVELOPMENT_TEAM = Z5CE7A3A7N;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand All @@ -1774,7 +1779,7 @@
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.bitmark.autonomywallet.notification;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "Autonomy Wallet Push Notification Appstore";
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = YES;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_EMIT_LOC_STRINGS = YES;
Expand Down Expand Up @@ -1915,8 +1920,8 @@
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 20;
DEVELOPMENT_TEAM = Z5CE7A3A7N;
GCC_C_LANGUAGE_STANDARD = gnu11;
Expand All @@ -1934,7 +1939,7 @@
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.bitmark.autonomywallet.notification;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "Autonomy Wallet Notification Development";
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = YES;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_EMIT_LOC_STRINGS = YES;
Expand Down
2 changes: 1 addition & 1 deletion ios/Runner/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import IOSSecuritySuite
import Sentry
import Logging

@UIApplicationMain
@main
@objc class AppDelegate: FlutterAppDelegate {

var cancelBag = Set<AnyCancellable>()
Expand Down
20 changes: 16 additions & 4 deletions lib/common/injector.dart
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,15 @@ import 'package:autonomy_flutter/screen/bloc/identity/identity_bloc.dart';
import 'package:autonomy_flutter/screen/bloc/subscription/subscription_bloc.dart';
import 'package:autonomy_flutter/screen/chat/chat_bloc.dart';
import 'package:autonomy_flutter/screen/collection_pro/collection_pro_bloc.dart';
import 'package:autonomy_flutter/screen/dailies_work/dailies_work_bloc.dart';
import 'package:autonomy_flutter/screen/detail/preview/canvas_device_bloc.dart';
import 'package:autonomy_flutter/screen/exhibitions/exhibitions_bloc.dart';
import 'package:autonomy_flutter/screen/interactive_postcard/claim_empty_postcard/claim_empty_postcard_bloc.dart';
import 'package:autonomy_flutter/screen/playlists/add_new_playlist/add_new_playlist_bloc.dart';
import 'package:autonomy_flutter/screen/playlists/edit_playlist/edit_playlist_bloc.dart';
import 'package:autonomy_flutter/screen/playlists/view_playlist/view_playlist_bloc.dart';
import 'package:autonomy_flutter/screen/predefined_collection/predefined_collection_bloc.dart';
import 'package:autonomy_flutter/screen/settings/subscription/upgrade_bloc.dart';
import 'package:autonomy_flutter/service/account_service.dart';
import 'package:autonomy_flutter/service/address_service.dart';
import 'package:autonomy_flutter/service/announcement/announcement_service.dart';
Expand Down Expand Up @@ -255,8 +257,14 @@ Future<void> setup() async {
injector.registerLazySingleton<IAPService>(
() => IAPServiceImpl(injector(), injector()));

injector.registerLazySingleton(() =>
TvCastApi(tvCastDio(dioOptions), baseUrl: Environment.tvCastApiUrl));
injector.registerLazySingleton(() => TvCastApi(
tvCastDio(
dioOptions.copyWith(
receiveTimeout: const Duration(seconds: 10),
connectTimeout: const Duration(seconds: 10),
),
),
baseUrl: Environment.tvCastApiUrl));
injector.registerLazySingleton(() => Wc2Service(
injector(),
injector(),
Expand Down Expand Up @@ -400,14 +408,18 @@ Future<void> setup() async {
));
injector.registerLazySingleton<CanvasDeviceBloc>(
() => CanvasDeviceBloc(injector()));
injector
.registerLazySingleton<ExhibitionBloc>(() => ExhibitionBloc(injector()));
injector.registerFactory<ExhibitionBloc>(() => ExhibitionBloc(injector()));
injector.registerLazySingleton<SubscriptionBloc>(
() => SubscriptionBloc(injector()));
injector.registerLazySingleton<DailyWorkBloc>(
() => DailyWorkBloc(injector(), injector()));

injector.registerLazySingleton<AnnouncementStore>(() => AnnouncementStore());
await injector<AnnouncementStore>().init('');

injector.registerLazySingleton<AnnouncementService>(
() => AnnouncementServiceImpl(injector(), injector(), injector()));

injector.registerLazySingleton<UpgradesBloc>(
() => UpgradesBloc(injector(), injector()));
}
Loading
Loading