zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 17 Releases Wiki Activity

Merge branch 'develop' into ios-192-profile-about

This commit is contained in:
Nathan Mattes 2024-02-07 16:33:05 +01:00
parent cabdc30be7 a236e114fd
commit 84236b1084
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Mastodon.xcodeproj/project.pbxproj
View File

@ -4643,7 +4643,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2024.1;
MARKETING_VERSION = 2024.2;
PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.app;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
@ -4674,7 +4674,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2024.1;
MARKETING_VERSION = 2024.2;
PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.app;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
@ -4864,7 +4864,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2024.1;
MARKETING_VERSION = 2024.2;
PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.app;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
@ -5160,7 +5160,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 2024.1;
MARKETING_VERSION = 2024.2;
PRODUCT_BUNDLE_IDENTIFIER = org.joinmastodon.app;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";

2
Mastodon/Scene/Profile/UserList/FavoritedBy/FavoritedByViewController.swift
View File

@ -59,6 +59,8 @@ extension FavoritedByViewController {
self.viewModel.stateMachine.enter(UserListViewModel.State.Loading.self)
}
.store(in: &disposeBag)
viewModel.listBatchFetchViewModel.shouldFetch.send()
}
override func viewWillAppear(_ animated: Bool) {

2
Mastodon/Scene/Profile/UserList/RebloggedBy/RebloggedByViewController.swift
View File

@ -65,6 +65,8 @@ extension RebloggedByViewController {
self.viewModel.stateMachine.enter(UserListViewModel.State.Loading.self)
}
.store(in: &disposeBag)
viewModel.listBatchFetchViewModel.shouldFetch.send()
}
override func viewWillAppear(_ animated: Bool) {