Skip to content

Commit

Permalink
Merge branch 'develop' into Sang/fix/lazy_load_sync_wallet
Browse files Browse the repository at this point in the history
  • Loading branch information
@ppupha
ppupha authored Sep 9, 2024
2 parents d792f99 + f077452 commit fdeb31f
Show file tree
Hide file tree
Showing 10 changed files with 117 additions and 80 deletions.
20 changes: 15 additions & 5 deletions ios/Runner.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1044,10 +1044,12 @@
PRODUCT_BUNDLE_IDENTIFIER = com.bitmark.autonomywallet;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "Autonomy Wallet Appstore";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = prod;
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
TARGETED_DEVICE_FAMILY = 1;
VERSIONING_SYSTEM = "apple-generic";
};
name = "Profile-prd";
Expand Down Expand Up @@ -1129,11 +1131,13 @@
PRODUCT_BUNDLE_IDENTIFIER = com.bitmark.autonomywallet;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "Feral File Wallet Appstore Dev";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = prod;
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
TARGETED_DEVICE_FAMILY = 1;
VERSIONING_SYSTEM = "apple-generic";
};
name = "Debug-prd";
Expand Down Expand Up @@ -1335,10 +1339,12 @@
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "Feral File Wallet Appstore";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = Autonomy_Wallet_Appstore;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = prod;
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
TARGETED_DEVICE_FAMILY = 1;
VERSIONING_SYSTEM = "apple-generic";
};
name = "Release-prd";
Expand Down Expand Up @@ -1539,10 +1545,12 @@
PRODUCT_BUNDLE_IDENTIFIER = com.bitmark.autonomywallet;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "Autonomy Wallet Appstore Dev";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
TARGETED_DEVICE_FAMILY = 1;
VERSIONING_SYSTEM = "apple-generic";
};
name = "Debug-inhouse";
Expand Down Expand Up @@ -1738,9 +1746,11 @@
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "Autonomy Wallet Appstore";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Autonomy Wallet Adhoc";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
TARGETED_DEVICE_FAMILY = 1;
VERSIONING_SYSTEM = "apple-generic";
};
name = "Release-inhouse";
Expand Down
2 changes: 0 additions & 2 deletions ios/Runner/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,7 @@
<key>UISupportedInterfaceOrientations~ipad</key>
<array>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
</array>
<key>UIUserInterfaceStyle</key>
<string>Light</string>
Expand Down
15 changes: 13 additions & 2 deletions lib/screen/dailies_work/dailies_work_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,20 @@ class DailyWorkPageState extends State<DailyWorkPage>

void pauseDailyWork() {
_artworkKey.currentState?.pause();
muteDailyWork();
}

void resumeDailyWork() {
_artworkKey.currentState?.resume();
unmuteDailyWork();
}

void muteDailyWork() {
_artworkKey.currentState?.mute();
}

void unmuteDailyWork() {
_artworkKey.currentState?.unmute();
}

void scrollToTop() {
Expand Down Expand Up @@ -582,9 +592,10 @@ class DailyWorkPageState extends State<DailyWorkPage>
exhibition: exhibition,
),
const SizedBox(height: 48),
Text(
HtmlWidget(
exhibition.noteBrief,
style: theme.textTheme.ppMori400White14,
customStylesBuilder: auHtmlStyle,
textStyle: theme.textTheme.ppMori400White14,
),
const SizedBox(height: 16),
Text(
Expand Down
8 changes: 8 additions & 0 deletions lib/screen/detail/preview_detail/preview_detail_widget.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,14 @@ class ArtworkPreviewWidgetState extends State<ArtworkPreviewWidget>
unawaited(_renderingWidget?.resume());
}

void mute() {
unawaited(_renderingWidget?.mute());
}

void unmute() {
unawaited(_renderingWidget?.unmute());
}

@override
Widget build(BuildContext context) =>
BlocBuilder<ArtworkPreviewDetailBloc, ArtworkPreviewDetailState>(
Expand Down
10 changes: 4 additions & 6 deletions lib/screen/exhibition_details/exhibition_detail_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,12 +192,10 @@ class _ExhibitionDetailPageState extends State<ExhibitionDetailPage>
));
}
if (resource is Post) {
if (resource.coverURI != null) {
resources.add(ExhibitionPostView(
post: resource,
exhibitionID: exhibition.id,
));
}
resources.add(ExhibitionPostView(
post: resource,
exhibitionID: exhibition.id,
));
}
}
return resources;
Expand Down
9 changes: 7 additions & 2 deletions lib/screen/feralfile_home/feralfile_home.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,12 @@ class _ItemExpandedWidgetState extends State<ItemExpandedWidget> {
),
// Expanded items
if (_isExpanded) ...[
for (var item in widget.items.skip(1)) _itemWidget(context, item),
for (var item in widget.items.skip(1))
_itemWidget(
context,
item,
withSubtitle: false,
),
]
],
),
Expand All @@ -467,7 +472,7 @@ class _ItemExpandedWidgetState extends State<ItemExpandedWidget> {
);
return Row(
children: [
_itemWidget(context, widget.items.first),
_itemWidget(context, widget.items.first, withSubtitle: false),
const Spacer(),
Column(
children: [
Expand Down
119 changes: 62 additions & 57 deletions lib/screen/onboarding/import_address/import_seeds.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,68 +213,73 @@ class _ImportSeedsPageState extends State<ImportSeedsPage> {
NumberFormat formatter = NumberFormat('00');
final controller = _mnemonicControllers[index];

return Padding(
padding: const EdgeInsets.symmetric(vertical: 10),
child: Row(
children: [
Container(
width: 32,
alignment: Alignment.centerRight,
child: Text(formatter.format(index + 1),
style: theme.textTheme.ppMori400Grey14),
),
const SizedBox(width: 16),
Expanded(
child: TextField(
enableSuggestions: false,
focusNode: _focusNodes[index],
autocorrect: false,
obscureText: _obscureText,
controller: controller,
decoration: InputDecoration(
contentPadding: const EdgeInsets.fromLTRB(0, 3, 0, 0),
isDense: true,
border: InputBorder.none,
hintStyle: ResponsiveLayout.isMobile
? theme.textTheme.ppMori400Black14
.copyWith(color: AppColor.auQuickSilver)
: theme.textTheme.ppMori400Black16
.copyWith(color: AppColor.auQuickSilver, fontSize: 20),
),
onSubmitted: (value) {
if (index < _maxWords) {
FocusScope.of(context).requestFocus(_focusNodes[index + 1]);
}
},
style: theme.textTheme.ppMori400Black14
.copyWith(color: _isError ? AppColor.red : null),
onChanged: (value) {
if (value.contains(' ')) {
final words = value.split(' ');
if (words.last.isEmpty) {
words.removeLast();
return GestureDetector(
onTap: () {
_focusNodes[index].requestFocus();
},
child: Padding(
padding: const EdgeInsets.symmetric(vertical: 10),
child: Row(
children: [
Container(
width: 32,
alignment: Alignment.centerRight,
child: Text(formatter.format(index + 1),
style: theme.textTheme.ppMori400Grey14),
),
const SizedBox(width: 16),
Expanded(
child: TextField(
enableSuggestions: false,
focusNode: _focusNodes[index],
autocorrect: false,
obscureText: _obscureText,
controller: controller,
decoration: InputDecoration(
contentPadding: const EdgeInsets.fromLTRB(0, 3, 0, 0),
isDense: true,
border: InputBorder.none,
hintStyle: ResponsiveLayout.isMobile
? theme.textTheme.ppMori400Black14
.copyWith(color: AppColor.auQuickSilver)
: theme.textTheme.ppMori400Black16.copyWith(
color: AppColor.auQuickSilver, fontSize: 20),
),
onSubmitted: (value) {
if (index < _maxWords) {
FocusScope.of(context).requestFocus(_focusNodes[index + 1]);
}
final wordsLeft = _maxWords - index;
final wordsToInsertNum = min(wordsLeft, words.length);
for (var i = 0; i < wordsToInsertNum; i++) {
if (i != wordsToInsertNum || words[i].isNotEmpty) {
_mnemonicControllers[index + i].text = words[i];
},
style: theme.textTheme.ppMori400Black14
.copyWith(color: _isError ? AppColor.red : null),
onChanged: (value) {
if (value.contains(' ')) {
final words = value.split(' ');
if (words.last.isEmpty) {
words.removeLast();
}
final wordsLeft = _maxWords - index;
final wordsToInsertNum = min(wordsLeft, words.length);
for (var i = 0; i < wordsToInsertNum; i++) {
if (i != wordsToInsertNum || words[i].isNotEmpty) {
_mnemonicControllers[index + i].text = words[i];
}
}
FocusScope.of(context)
.requestFocus(_focusNodes[index + wordsToInsertNum]);
}
FocusScope.of(context)
.requestFocus(_focusNodes[index + wordsToInsertNum]);
}

final numberOfWords = _getMnemonic().split(' ').length;
setState(() {
_isSubmissionEnabled =
[12, 15, 18, 21, 24].contains(numberOfWords);
_isError = false;
});
},
final numberOfWords = _getMnemonic().split(' ').length;
setState(() {
_isSubmissionEnabled =
[12, 15, 18, 21, 24].contains(numberOfWords);
_isError = false;
});
},
),
),
),
],
],
),
),
);
}
Expand Down
8 changes: 5 additions & 3 deletions lib/view/post_view.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class _ExhibitionPostViewState extends State<ExhibitionPostView> {

@override
void initState() {
thumbnailUrl = widget.post.thumbnailUrls[0];
thumbnailUrl = widget.post.thumbnailUrls.firstOrNull;
loadThumbnailFailedCount = 0;
super.initState();
}
Expand Down Expand Up @@ -58,8 +58,10 @@ class _ExhibitionPostViewState extends State<ExhibitionPostView> {
style: theme.textTheme.ppMori400White12,
),
const SizedBox(height: 30),
_buildThumbnailWidget(),
const SizedBox(height: 20),
if (thumbnailUrl != null) ...[
_buildThumbnailWidget(),
const SizedBox(height: 20),
],
Text(
widget.post.title,
style: theme.textTheme.ppMori700White14,
Expand Down
4 changes: 2 additions & 2 deletions pubspec.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1895,8 +1895,8 @@ packages:
dependency: "direct main"
description:
path: "."
ref: "19d6ccb497351cd3ebfba225fbb00202eb621c99"
resolved-ref: "19d6ccb497351cd3ebfba225fbb00202eb621c99"
ref: dde11ef9b3eae914ae8cc5bb950b2a4f798f90bd
resolved-ref: dde11ef9b3eae914ae8cc5bb950b2a4f798f90bd
url: "https://github.com/autonomy-system/nft-rendering.git"
source: git
version: "1.0.9"
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ dependencies:
nft_rendering:
git:
url: https://github.com/autonomy-system/nft-rendering.git
ref: 19d6ccb497351cd3ebfba225fbb00202eb621c99
ref: dde11ef9b3eae914ae8cc5bb950b2a4f798f90bd
onesignal_flutter: ^3.3.0
open_settings: ^2.0.2
overlay_support: ^2.0.0
Expand Down

0 comments on commit fdeb31f

Please sign in to comment.