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.

Sign up for GitHub

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

chore: convert to folder Wire-iOS - WPB-16244 #2421

Open
wants to merge 16 commits into
base: develop
Choose a base branch
from
+881 −14,664
Open

chore: convert to folder Wire-iOS - WPB-16244 #2421

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
f3ceb9e
delete unused files and move for folder
netbe Jan 11, 2025
199bb57
update project
netbe Feb 21, 2025
1601a1b
fix
netbe Feb 21, 2025
d7b9ce5
fix emoticons
netbe Feb 21, 2025
1385781
convert to folders
netbe Feb 21, 2025
6219edf
move files to Localization
netbe Feb 21, 2025
6f06b09
fix dest
netbe Feb 21, 2025
b8b4b9d
work on Wire-iOS Tests
netbe Feb 21, 2025
754a668
fix tests
netbe Feb 21, 2025
e2ce9ac
reorganise share extension
netbe Feb 21, 2025
4354c44
remove storyboard
netbe Feb 21, 2025
1575d03
share extension update
netbe Feb 21, 2025
e95dd41
remove -prefix.pch
netbe Feb 21, 2025
802c6f8
merge
netbe Feb 21, 2025
96e062c
remove dead refs
netbe Feb 21, 2025
9f2e0b0
Merge branch 'develop' into chore/convert-to-folder-wire-ios
netbe Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
62 changes: 31 additions & 31 deletions crowdin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,111 +14,111 @@

files: [
{
"source" : "/wire-ios/Wire-iOS/Resources/Base.lproj/Localizable.strings",
"source" : "/wire-ios/Wire-iOS/Resources/Localization/Base.lproj/Localizable.strings",
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had to move the localizable inside a folder, hence the change

"dest" : "/App/Wire-iOS/Resources/Localizable.strings",
"translation" : "/wire-ios/Wire-iOS/Resources/%osx_code%/%original_file_name%",
"translation" : "/wire-ios/Wire-iOS/Resources/Localization/%osx_code%/%original_file_name%",
},
{
"source" : "/wire-ios/Wire-iOS/Resources/Base.lproj/Accessibility.strings",
"source" : "/wire-ios/Wire-iOS/Resources/Localization/Base.lproj/Accessibility.strings",
"dest" : "/App/Wire-iOS/Resources/Accessibility.strings",
"translation" : "/wire-ios/Wire-iOS/Resources/%osx_code%/%original_file_name%",
"translation" : "/wire-ios/Wire-iOS/Resources/Localization/%osx_code%/%original_file_name%",
},
{
"source" : "/wire-ios/Wire-iOS/Resources/Base.lproj/Localizable.stringsdict",
"source" : "/wire-ios/Wire-iOS/Resources/Localization/Base.lproj/Localizable.stringsdict",
"dest" : "/App/Wire-iOS/Resources/Localizable.stringsdict",
"translation" : "/wire-ios/Wire-iOS/Resources/%osx_code%/%original_file_name%",
"translation" : "/wire-ios/Wire-iOS/Resources/Localization/%osx_code%/%original_file_name%",
},
{
"source" : "/wire-ios/Wire-iOS/Resources/Base.lproj/InfoPlist.strings",
"source" : "/wire-ios/Wire-iOS/Resources/Localization/Base.lproj/InfoPlist.strings",
"dest" : "/App/Wire-iOS/Resources/InfoPlist.strings",
"translation" : "/wire-ios/Wire-iOS/Resources/%osx_code%/%original_file_name%",
"translation" : "/wire-ios/Wire-iOS/Resources/Localization/%osx_code%/%original_file_name%",
},
{
"source" : "/wire-ios/Wire-iOS Share Extension/Resources/Base.lproj/Localizable.strings",
"source" : "/wire-ios/Wire-iOS Share Extension/Resources/Localization/Base.lproj/Localizable.strings",
"dest" : "/App/Wire-iOS Share Extension/Localizable.strings",
"translation" : "/wire-ios/Wire-iOS Share Extension/%osx_code%/%original_file_name%",
},
{
"source" : "/WireUI/Sources/WireSidebarUI/Resources/en.lproj/Localizable.strings",
"source" : "/WireUI/Sources/WireSidebarUI/Resources/Localization/en.lproj/Localizable.strings",
"dest" : "/App/WireSidebarUI/Resources/Localizable.strings",
"translation" : "/WireUI/Sources/WireSidebarUI/Resources/%osx_code%/%original_file_name%",
"translation" : "/WireUI/Sources/WireSidebarUI/Resources/Localization/%osx_code%/%original_file_name%",
},
{
"source" : "/WireUI/Sources/WireSidebarUI/Resources/en.lproj/Accessibility.strings",
"source" : "/WireUI/Sources/WireSidebarUI/Resources/Localization/en.lproj/Accessibility.strings",
"dest" : "/App/WireSidebarUI/Resources/Accessibility.strings",
"translation" : "/WireUI/Sources/WireSidebarUI/Resources/%osx_code%/%original_file_name%",
"translation" : "/WireUI/Sources/WireSidebarUI/Resources/Localization/%osx_code%/%original_file_name%",
},
{
"source" : "/WireAuthentication/Sources/WireAuthenticationUI/Resources/en.lproj/Accessibility.strings",
"source" : "/WireAuthentication/Sources/WireAuthenticationUI/Resources/Localization/en.lproj/Accessibility.strings",
"dest" : "/App/WireAuthenticationUI/Resources/Accessibility.strings",
"translation" : "/WireAuthentication/Sources/WireAuthenticationUI/Resources/%osx_code%/%original_file_name%",
"translation" : "/WireAuthentication/Sources/WireAuthenticationUI/Resources/Localization/%osx_code%/%original_file_name%",
},
{
"source" : "/WireAuthentication/Sources/WireAuthenticationUI/Resources/en.lproj/Localizable.strings",
"source" : "/WireAuthentication/Sources/WireAuthenticationUI/Resources/Localization/en.lproj/Localizable.strings",
"dest" : "/App/WireAuthenticationUI/Resources/Localizable.strings",
"translation" : "/WireAuthentication/Sources/WireAuthenticationUI/Resources/%osx_code%/%original_file_name%",
"translation" : "/WireAuthentication/Sources/WireAuthenticationUI/Resources/Localization/%osx_code%/%original_file_name%",
},
{
"source" : "/WireUI/Sources/WireMainNavigationUI/Resources/Localizable.xcstrings",
"source" : "/WireUI/Sources/WireMainNavigationUI/Resources/Localization/Localizable.xcstrings",
"dest" : "/App/WireMainNavigationUI/Resources/Localizable.xcstrings",
"translation" : "%original_path%/%original_file_name%",
"multilingual": true,
},
{
"source" : "/WireUI/Sources/WireMainNavigationUI/Resources/Accessibility.xcstrings",
"source" : "/WireUI/Sources/WireMainNavigationUI/Resources/Localization/Accessibility.xcstrings",
"dest" : "/App/WireMainNavigationUI/Resources/Accessibility.xcstrings",
"translation" : "%original_path%/%original_file_name%",
"multilingual": true,
},
{
"source" : "/WireUI/Sources/WireFolderPickerUI/Resources/Localizable.xcstrings",
"source" : "/WireUI/Sources/WireFolderPickerUI/Resources/Localization/Localizable.xcstrings",
"dest" : "/App/WireFolderPickerUI/Resources/Localizable.xcstrings",
"translation" : "%original_path%/%original_file_name%",
"multilingual": true,
},
{
"source" : "/WireUI/Sources/WireFolderPickerUI/Resources/Accessibility.xcstrings",
"source" : "/WireUI/Sources/WireFolderPickerUI/Resources/Localization/Accessibility.xcstrings",
"dest" : "/App/WireFolderPickerUI/Resources/Accessibility.xcstrings",
"translation" : "%original_path%/%original_file_name%",
"multilingual": true,
},
{
"source" : "/WireUI/Sources/WireIndividualToTeamMigrationUI/Resources/Localizable.xcstrings",
"source" : "/WireUI/Sources/WireIndividualToTeamMigrationUI/Resources/Localization/Localizable.xcstrings",
"dest" : "/App/WireIndividualToTeamMigrationUI/Resources/Localizable.xcstrings",
"translation" : "%original_path%/%original_file_name%",
"multilingual": true,
},
{
"source" : "/WireUI/Sources/WireIndividualToTeamMigrationUI/Resources/Accessibility.xcstrings",
"source" : "/WireUI/Sources/WireIndividualToTeamMigrationUI/Resources/Localization/Accessibility.xcstrings",
"dest" : "/App/WireIndividualToTeamMigrationUI/Resources/Accessibility.xcstrings",
"translation" : "%original_path%/%original_file_name%",
"multilingual": true,
},
{
"source" : "/WireUI/Sources/WireMoveToFolderUI/Resources/Localizable.xcstrings",
"source" : "/WireUI/Sources/WireMoveToFolderUI/Resources/Localization/Localizable.xcstrings",
"dest" : "/App/WireMoveToFolderUI/Resources/Localizable.xcstrings",
"translation" : "%original_path%/%original_file_name%",
"multilingual": true,
},
{
"source" : "/WireUI/Sources/WireMoveToFolderUI/Resources/Accessibility.xcstrings",
"source" : "/WireUI/Sources/WireMoveToFolderUI/Resources/Localization/Accessibility.xcstrings",
"dest" : "/App/WireMoveToFolderUI/Resources/Accessibility.xcstrings",
"translation" : "%original_path%/%original_file_name%",
"multilingual": true,
},
{
"source" : "/WireUI/Sources/WireReusableUIComponents/Resources/en.lproj/Localizable.strings",
"source" : "/WireUI/Sources/WireReusableUIComponents/Resources/Localization/en.lproj/Localizable.strings",
"dest" : "/App/WireReusableUIComponents/Resources/Localizable.strings",
"translation" : "/WireUI/Sources/WireReusableUIComponents/Resources/%osx_code%/%original_file_name%",
"translation" : "/WireUI/Sources/WireReusableUIComponents/Resources/Localization/%osx_code%/%original_file_name%",
},
{
"source" : "/WireUI/Sources/WireSettingsUI/Resources/en.lproj/Accessibility.strings",
"source" : "/WireUI/Sources/WireSettingsUI/Resources/Localization/en.lproj/Accessibility.strings",
"dest" : "/App/WireSettingsUI/Resources/Accessibility.strings",
"translation" : "/WireUI/Sources/WireSettingsUI/Resources/%osx_code%/%original_file_name%",
"translation" : "/WireUI/Sources/WireSettingsUI/Resources/Localization/%osx_code%/%original_file_name%",
},
{
"source" : "/WireUI/Sources/WireSettingsUI/Resources/en.lproj/Localizable.strings",
"source" : "/WireUI/Sources/WireSettingsUI/Resources/Localization/en.lproj/Localizable.strings",
"dest" : "/App/WireSettingsUI/Resources/Localizable.strings",
"translation" : "/WireUI/Sources/WireSettingsUI/Resources/%osx_code%/%original_file_name%",
"translation" : "/WireUI/Sources/WireSettingsUI/Resources/Localization/%osx_code%/%original_file_name%",
}
]
6 changes: 6 additions & 0 deletions wire-ios-mono.xcworkspace/contents.xcworkspacedata
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

27 changes: 0 additions & 27 deletions wire-ios/Tests/Mocks/MockE2eIFeatureChangeActionsHandler.swift
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions wire-ios/Tests/Mocks/MockUser+Image.swift
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions wire-ios/Tests/Mocks/MockUserType+ProfileImageFetchable.swift
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions wire-ios/Wire-iOS Share Extension/Base.lproj/MainInterface.storyboard
View file
Open in desktop

This file was deleted.

28 changes: 14 additions & 14 deletions wire-ios/Wire-iOS Share Extension/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,36 +24,36 @@
<string>${WIRE_BUILD_NUMBER}</string>
<key>HostBundleIdentifier</key>
<string>$(WIRE_BUNDLE_ID)</string>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
</dict>
<key>NSExtension</key>
<dict>
<key>NSExtensionAttributes</key>
<dict>
<key>NSExtensionActivationRule</key>
<string>
(SUBQUERY(extensionItems, $extensionItem, SUBQUERY($extensionItem.attachments, $attachment, ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.plain-text").@count &gt;= 1).@count &gt;= 1
<string>
(SUBQUERY(extensionItems, $extensionItem, SUBQUERY($extensionItem.attachments, $attachment, ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO &quot;public.plain-text&quot;).@count &gt;= 1).@count &gt;= 1

OR SUBQUERY(extensionItems, $extensionItem, SUBQUERY($extensionItem.attachments, $attachment, SUBQUERY($attachment.registeredTypeIdentifiers, $uti, $uti UTI-CONFORMS-TO "public.url").@count &gt;= 1).@count &gt;= 1).@count &gt;= 1
OR SUBQUERY(extensionItems, $extensionItem, SUBQUERY($extensionItem.attachments, $attachment, SUBQUERY($attachment.registeredTypeIdentifiers, $uti, $uti UTI-CONFORMS-TO &quot;public.url&quot;).@count &gt;= 1).@count &gt;= 1).@count &gt;= 1

OR SUBQUERY(extensionItems,$extensionItem,SUBQUERY($extensionItem.attachments,$attachment,ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.image").@count == $extensionItem.attachments.@count AND $extensionItem.attachments.@count &lt;= 20).@count == 1
OR SUBQUERY(extensionItems,$extensionItem,SUBQUERY($extensionItem.attachments,$attachment,ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO &quot;public.image&quot;).@count == $extensionItem.attachments.@count AND $extensionItem.attachments.@count &lt;= 20).@count == 1

OR SUBQUERY(extensionItems,$extensionItem,SUBQUERY($extensionItem.attachments,$attachment,ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.movie").@count == $extensionItem.attachments.@count AND $extensionItem.attachments.@count &lt;= 1).@count == 1
OR SUBQUERY(extensionItems,$extensionItem,SUBQUERY($extensionItem.attachments,$attachment,ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO &quot;public.movie&quot;).@count == $extensionItem.attachments.@count AND $extensionItem.attachments.@count &lt;= 1).@count == 1

OR SUBQUERY(extensionItems,$extensionItem,SUBQUERY($extensionItem.attachments,$attachment,ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "com.apple.pkpass").@count == $extensionItem.attachments.@count AND $extensionItem.attachments.@count &lt;= 1).@count == 1
OR SUBQUERY(extensionItems,$extensionItem,SUBQUERY($extensionItem.attachments,$attachment,ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO &quot;com.apple.pkpass&quot;).@count == $extensionItem.attachments.@count AND $extensionItem.attachments.@count &lt;= 1).@count == 1

OR SUBQUERY(extensionItems,$extensionItem,SUBQUERY($extensionItem.attachments,$attachment,ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO "public.content").@count == $extensionItem.attachments.@count AND $extensionItem.attachments.@count &lt;= 1).@count == 1)
OR SUBQUERY(extensionItems,$extensionItem,SUBQUERY($extensionItem.attachments,$attachment,ANY $attachment.registeredTypeIdentifiers UTI-CONFORMS-TO &quot;public.content&quot;).@count == $extensionItem.attachments.@count AND $extensionItem.attachments.@count &lt;= 1).@count == 1)
</string>
</dict>
<key>NSExtensionMainStoryboard</key>
<string>MainInterface</string>
<key>NSExtensionPointIdentifier</key>
<string>com.apple.share-services</string>
<key>NSExtensionPrincipalClass</key>
<string>$(PRODUCT_MODULE_NAME).ShareExtensionViewController</string>
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this replaces the MainInterface storyboard

</dict>
<key>WireGroupId</key>
<string>${WIRE_BUNDLE_ID}</string>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
</dict>
</dict>
</plist>
0 ...sion/NSExtensionContext+Attachments.swift → ...tent/NSExtensionContext+Attachments.swift
View file
Open in desktop
File renamed without changes.
0 ...ire-iOS Share Extension/PostContent.swift → ...tension/Sources/Content/PostContent.swift
View file
Open in desktop
File renamed without changes.
0 ...omposeServiceViewController+Preview.swift → ...omposeServiceViewController+Preview.swift
View file
Open in desktop
File renamed without changes.
0 ...-iOS Share Extension/SendController.swift → ...sion/Sources/Content/SendController.swift
View file
Open in desktop
File renamed without changes.
0 ...re Extension/UnsentGifImageSendable.swift → ...rces/Content/UnsentGifImageSendable.swift
View file
Open in desktop
File renamed without changes.
0 ...-iOS Share Extension/UnsentSendable.swift → ...sion/Sources/Content/UnsentSendable.swift
View file
Open in desktop
File renamed without changes.
0 ...n/Account+ShareExtensionDisplayName.swift → ...s/Account+ShareExtensionDisplayName.swift
View file
Open in desktop
File renamed without changes.
0 ...e-iOS Share Extension/Error+Logging.swift → ...nsion/Sources/Helpers/Error+Logging.swift
View file
Open in desktop
File renamed without changes.
0 ...e Extension/ExtensionBackupExcluder.swift → ...ces/Helpers/ExtensionBackupExcluder.swift
View file
Open in desktop
File renamed without changes.
0 ...e Extension/NSItemProvider+Fetching.swift → ...ces/Helpers/NSItemProvider+Fetching.swift
View file
Open in desktop
File renamed without changes.
0 ...e Extension/ShareExtensionAnalytics.swift → ...ces/Helpers/ShareExtensionAnalytics.swift
View file
Open in desktop
File renamed without changes.
0 ...OS Share Extension/UIButton+SetIcon.swift → ...on/Sources/Helpers/UIButton+SetIcon.swift
View file
Open in desktop
File renamed without changes.
0 ...sion/AccountSelectionViewController.swift → ...lers/AccountSelectionViewController.swift
View file
Open in desktop
File renamed without changes.
0 ...ConversationSelectionViewController.swift → ...ConversationSelectionViewController.swift
View file
Open in desktop
File renamed without changes.
0 ...Extension/NotSignedInViewController.swift → ...ntrollers/NotSignedInViewController.swift
View file
Open in desktop
File renamed without changes.
0 ...nsion/SendingProgressViewController.swift → ...llers/SendingProgressViewController.swift
View file
Open in desktop
File renamed without changes.
0 ...ension/ShareExtensionViewController.swift → ...ollers/ShareExtensionViewController.swift
View file
Open in desktop
File renamed without changes.
0 ...hare Extension/UnlockViewController.swift → ...ew Controllers/UnlockViewController.swift
View file
Open in desktop
File renamed without changes.
0 ...sion/ConversationStateAccessoryView.swift → ...iews/ConversationStateAccessoryView.swift
View file
Open in desktop
File renamed without changes.
0 ...S Share Extension/PasscodeTextField.swift → ...ion/Sources/Views/PasscodeTextField.swift
View file
Open in desktop
File renamed without changes.
0 ...OS Share Extension/PreviewImageView.swift → ...sion/Sources/Views/PreviewImageView.swift
View file
Open in desktop
File renamed without changes.
0 ...re Extension/TargetConversationCell.swift → ...ources/Views/TargetConversationCell.swift
View file
Open in desktop
File renamed without changes.
Loading