Merge branch /develop into feature/welcome-illustration
# Conflicts: # Mastodon.xcodeproj/project.pbxproj
|
@ -169,10 +169,16 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"home_timeline": {
|
"home_timeline": {
|
||||||
"title": "Home"
|
"title": "Home",
|
||||||
|
"navigation_bar_state": {
|
||||||
|
"offline": "Offline",
|
||||||
|
"new_posts": "See new posts",
|
||||||
|
"published": "Published!",
|
||||||
|
"Publishing": "Publishing post..."
|
||||||
|
},
|
||||||
},
|
},
|
||||||
"public_timeline": {
|
"public_timeline": {
|
||||||
"title": "Public"
|
"title": "Public"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -49,6 +49,7 @@
|
||||||
2D42FF8F25C8228A004A627A /* UIButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D42FF8E25C8228A004A627A /* UIButton.swift */; };
|
2D42FF8F25C8228A004A627A /* UIButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D42FF8E25C8228A004A627A /* UIButton.swift */; };
|
||||||
2D45E5BF25C9549700A6D639 /* PublicTimelineViewModel+State.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D45E5BE25C9549700A6D639 /* PublicTimelineViewModel+State.swift */; };
|
2D45E5BF25C9549700A6D639 /* PublicTimelineViewModel+State.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D45E5BE25C9549700A6D639 /* PublicTimelineViewModel+State.swift */; };
|
||||||
2D46975E25C2A54100CF4AA9 /* NSLayoutConstraint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D46975D25C2A54100CF4AA9 /* NSLayoutConstraint.swift */; };
|
2D46975E25C2A54100CF4AA9 /* NSLayoutConstraint.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D46975D25C2A54100CF4AA9 /* NSLayoutConstraint.swift */; };
|
||||||
|
2D571B2F26004EC000540450 /* NavigationBarProgressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D571B2E26004EC000540450 /* NavigationBarProgressView.swift */; };
|
||||||
2D59819B25E4A581000FB903 /* MastodonConfirmEmailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D59819A25E4A581000FB903 /* MastodonConfirmEmailViewController.swift */; };
|
2D59819B25E4A581000FB903 /* MastodonConfirmEmailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D59819A25E4A581000FB903 /* MastodonConfirmEmailViewController.swift */; };
|
||||||
2D5981A125E4A593000FB903 /* MastodonConfirmEmailViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D5981A025E4A593000FB903 /* MastodonConfirmEmailViewModel.swift */; };
|
2D5981A125E4A593000FB903 /* MastodonConfirmEmailViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D5981A025E4A593000FB903 /* MastodonConfirmEmailViewModel.swift */; };
|
||||||
2D5981BA25E4D7F8000FB903 /* ThirdPartyMailer in Frameworks */ = {isa = PBXBuildFile; productRef = 2D5981B925E4D7F8000FB903 /* ThirdPartyMailer */; };
|
2D5981BA25E4D7F8000FB903 /* ThirdPartyMailer in Frameworks */ = {isa = PBXBuildFile; productRef = 2D5981B925E4D7F8000FB903 /* ThirdPartyMailer */; };
|
||||||
|
@ -72,6 +73,9 @@
|
||||||
2D7631B325C159F700929FB9 /* Item.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D7631B225C159F700929FB9 /* Item.swift */; };
|
2D7631B325C159F700929FB9 /* Item.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D7631B225C159F700929FB9 /* Item.swift */; };
|
||||||
2D82B9FF25E7863200E36F0F /* OnboardingViewControllerAppearance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D82B9FE25E7863200E36F0F /* OnboardingViewControllerAppearance.swift */; };
|
2D82B9FF25E7863200E36F0F /* OnboardingViewControllerAppearance.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D82B9FE25E7863200E36F0F /* OnboardingViewControllerAppearance.swift */; };
|
||||||
2D82BA0525E7897700E36F0F /* MastodonResendEmailViewModelNavigationDelegateShim.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D82BA0425E7897700E36F0F /* MastodonResendEmailViewModelNavigationDelegateShim.swift */; };
|
2D82BA0525E7897700E36F0F /* MastodonResendEmailViewModelNavigationDelegateShim.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D82BA0425E7897700E36F0F /* MastodonResendEmailViewModelNavigationDelegateShim.swift */; };
|
||||||
|
2D8434F525FF465D00EECE90 /* HomeTimelineNavigationBarState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D8434F425FF465D00EECE90 /* HomeTimelineNavigationBarState.swift */; };
|
||||||
|
2D8434FB25FF46B300EECE90 /* HomeTimelineNavigationBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D8434FA25FF46B300EECE90 /* HomeTimelineNavigationBarView.swift */; };
|
||||||
|
2D84350525FF858100EECE90 /* UIScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D84350425FF858100EECE90 /* UIScrollView.swift */; };
|
||||||
2D927F0225C7E4F2004F19B8 /* Mention.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D927F0125C7E4F2004F19B8 /* Mention.swift */; };
|
2D927F0225C7E4F2004F19B8 /* Mention.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D927F0125C7E4F2004F19B8 /* Mention.swift */; };
|
||||||
2D927F0825C7E9A8004F19B8 /* Tag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D927F0725C7E9A8004F19B8 /* Tag.swift */; };
|
2D927F0825C7E9A8004F19B8 /* Tag.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D927F0725C7E9A8004F19B8 /* Tag.swift */; };
|
||||||
2D927F0E25C7E9C9004F19B8 /* History.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D927F0D25C7E9C9004F19B8 /* History.swift */; };
|
2D927F0E25C7E9C9004F19B8 /* History.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2D927F0D25C7E9C9004F19B8 /* History.swift */; };
|
||||||
|
@ -299,6 +303,7 @@
|
||||||
2D42FF8E25C8228A004A627A /* UIButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIButton.swift; sourceTree = "<group>"; };
|
2D42FF8E25C8228A004A627A /* UIButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIButton.swift; sourceTree = "<group>"; };
|
||||||
2D45E5BE25C9549700A6D639 /* PublicTimelineViewModel+State.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "PublicTimelineViewModel+State.swift"; sourceTree = "<group>"; };
|
2D45E5BE25C9549700A6D639 /* PublicTimelineViewModel+State.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "PublicTimelineViewModel+State.swift"; sourceTree = "<group>"; };
|
||||||
2D46975D25C2A54100CF4AA9 /* NSLayoutConstraint.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSLayoutConstraint.swift; sourceTree = "<group>"; };
|
2D46975D25C2A54100CF4AA9 /* NSLayoutConstraint.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSLayoutConstraint.swift; sourceTree = "<group>"; };
|
||||||
|
2D571B2E26004EC000540450 /* NavigationBarProgressView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NavigationBarProgressView.swift; sourceTree = "<group>"; };
|
||||||
2D59819A25E4A581000FB903 /* MastodonConfirmEmailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MastodonConfirmEmailViewController.swift; sourceTree = "<group>"; };
|
2D59819A25E4A581000FB903 /* MastodonConfirmEmailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MastodonConfirmEmailViewController.swift; sourceTree = "<group>"; };
|
||||||
2D5981A025E4A593000FB903 /* MastodonConfirmEmailViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MastodonConfirmEmailViewModel.swift; sourceTree = "<group>"; };
|
2D5981A025E4A593000FB903 /* MastodonConfirmEmailViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MastodonConfirmEmailViewModel.swift; sourceTree = "<group>"; };
|
||||||
2D5A3D0225CF8742002347D6 /* ControlContainableScrollViews.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ControlContainableScrollViews.swift; sourceTree = "<group>"; };
|
2D5A3D0225CF8742002347D6 /* ControlContainableScrollViews.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ControlContainableScrollViews.swift; sourceTree = "<group>"; };
|
||||||
|
@ -320,6 +325,9 @@
|
||||||
2D7631B225C159F700929FB9 /* Item.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Item.swift; sourceTree = "<group>"; };
|
2D7631B225C159F700929FB9 /* Item.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Item.swift; sourceTree = "<group>"; };
|
||||||
2D82B9FE25E7863200E36F0F /* OnboardingViewControllerAppearance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingViewControllerAppearance.swift; sourceTree = "<group>"; };
|
2D82B9FE25E7863200E36F0F /* OnboardingViewControllerAppearance.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingViewControllerAppearance.swift; sourceTree = "<group>"; };
|
||||||
2D82BA0425E7897700E36F0F /* MastodonResendEmailViewModelNavigationDelegateShim.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MastodonResendEmailViewModelNavigationDelegateShim.swift; sourceTree = "<group>"; };
|
2D82BA0425E7897700E36F0F /* MastodonResendEmailViewModelNavigationDelegateShim.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MastodonResendEmailViewModelNavigationDelegateShim.swift; sourceTree = "<group>"; };
|
||||||
|
2D8434F425FF465D00EECE90 /* HomeTimelineNavigationBarState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeTimelineNavigationBarState.swift; sourceTree = "<group>"; };
|
||||||
|
2D8434FA25FF46B300EECE90 /* HomeTimelineNavigationBarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomeTimelineNavigationBarView.swift; sourceTree = "<group>"; };
|
||||||
|
2D84350425FF858100EECE90 /* UIScrollView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIScrollView.swift; sourceTree = "<group>"; };
|
||||||
2D927F0125C7E4F2004F19B8 /* Mention.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Mention.swift; sourceTree = "<group>"; };
|
2D927F0125C7E4F2004F19B8 /* Mention.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Mention.swift; sourceTree = "<group>"; };
|
||||||
2D927F0725C7E9A8004F19B8 /* Tag.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tag.swift; sourceTree = "<group>"; };
|
2D927F0725C7E9A8004F19B8 /* Tag.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tag.swift; sourceTree = "<group>"; };
|
||||||
2D927F0D25C7E9C9004F19B8 /* History.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = History.swift; sourceTree = "<group>"; };
|
2D927F0D25C7E9C9004F19B8 /* History.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = History.swift; sourceTree = "<group>"; };
|
||||||
|
@ -592,6 +600,7 @@
|
||||||
children = (
|
children = (
|
||||||
2D152A8B25C295CC009AA50C /* StatusView.swift */,
|
2D152A8B25C295CC009AA50C /* StatusView.swift */,
|
||||||
2D694A7325F9EB4E0038ADDC /* ContentWarningOverlayView.swift */,
|
2D694A7325F9EB4E0038ADDC /* ContentWarningOverlayView.swift */,
|
||||||
|
2D571B2E26004EC000540450 /* NavigationBarProgressView.swift */,
|
||||||
);
|
);
|
||||||
path = Content;
|
path = Content;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
|
@ -617,6 +626,8 @@
|
||||||
2D38F1EA25CD477000561493 /* HomeTimelineViewModel+LoadLatestState.swift */,
|
2D38F1EA25CD477000561493 /* HomeTimelineViewModel+LoadLatestState.swift */,
|
||||||
2D38F1F025CD477D00561493 /* HomeTimelineViewModel+LoadMiddleState.swift */,
|
2D38F1F025CD477D00561493 /* HomeTimelineViewModel+LoadMiddleState.swift */,
|
||||||
2D38F1F625CD47AC00561493 /* HomeTimelineViewModel+LoadOldestState.swift */,
|
2D38F1F625CD47AC00561493 /* HomeTimelineViewModel+LoadOldestState.swift */,
|
||||||
|
2D8434F425FF465D00EECE90 /* HomeTimelineNavigationBarState.swift */,
|
||||||
|
2D8434FA25FF46B300EECE90 /* HomeTimelineNavigationBarView.swift */,
|
||||||
);
|
);
|
||||||
path = HomeTimeline;
|
path = HomeTimeline;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
|
@ -1151,6 +1162,7 @@
|
||||||
2D32EAB925CB9B0500C9ED86 /* UIView.swift */,
|
2D32EAB925CB9B0500C9ED86 /* UIView.swift */,
|
||||||
DB8AF55C25C138B7002E6C99 /* UIViewController.swift */,
|
DB8AF55C25C138B7002E6C99 /* UIViewController.swift */,
|
||||||
2D3F9E0325DFA133004262D9 /* UITapGestureRecognizer.swift */,
|
2D3F9E0325DFA133004262D9 /* UITapGestureRecognizer.swift */,
|
||||||
|
2D84350425FF858100EECE90 /* UIScrollView.swift */,
|
||||||
DB9E0D6E25EE008500CFDD76 /* UIInterpolatingMotionEffect.swift */,
|
DB9E0D6E25EE008500CFDD76 /* UIInterpolatingMotionEffect.swift */,
|
||||||
);
|
);
|
||||||
path = Extension;
|
path = Extension;
|
||||||
|
@ -1625,6 +1637,7 @@
|
||||||
2D5A3D3825CF8D9F002347D6 /* ScrollViewContainer.swift in Sources */,
|
2D5A3D3825CF8D9F002347D6 /* ScrollViewContainer.swift in Sources */,
|
||||||
DB1E347825F519300079D7DF /* PickServerItem.swift in Sources */,
|
DB1E347825F519300079D7DF /* PickServerItem.swift in Sources */,
|
||||||
DB1FD45A25F27898004CFCFC /* CategoryPickerItem.swift in Sources */,
|
DB1FD45A25F27898004CFCFC /* CategoryPickerItem.swift in Sources */,
|
||||||
|
2D571B2F26004EC000540450 /* NavigationBarProgressView.swift in Sources */,
|
||||||
0FAA101225E105390017CCDE /* PrimaryActionButton.swift in Sources */,
|
0FAA101225E105390017CCDE /* PrimaryActionButton.swift in Sources */,
|
||||||
DB8AF53025C13561002E6C99 /* AppContext.swift in Sources */,
|
DB8AF53025C13561002E6C99 /* AppContext.swift in Sources */,
|
||||||
DB92CF7225E7BB98002C1017 /* PollOptionTableViewCell.swift in Sources */,
|
DB92CF7225E7BB98002C1017 /* PollOptionTableViewCell.swift in Sources */,
|
||||||
|
@ -1632,7 +1645,9 @@
|
||||||
2D364F7225E66D7500204FDC /* MastodonResendEmailViewController.swift in Sources */,
|
2D364F7225E66D7500204FDC /* MastodonResendEmailViewController.swift in Sources */,
|
||||||
2D38F1F125CD477D00561493 /* HomeTimelineViewModel+LoadMiddleState.swift in Sources */,
|
2D38F1F125CD477D00561493 /* HomeTimelineViewModel+LoadMiddleState.swift in Sources */,
|
||||||
DB68A06325E905E000CFDF14 /* UIApplication.swift in Sources */,
|
DB68A06325E905E000CFDF14 /* UIApplication.swift in Sources */,
|
||||||
|
2D8434FB25FF46B300EECE90 /* HomeTimelineNavigationBarView.swift in Sources */,
|
||||||
DB45FAD725CA6C76005A8AC7 /* UIBarButtonItem.swift in Sources */,
|
DB45FAD725CA6C76005A8AC7 /* UIBarButtonItem.swift in Sources */,
|
||||||
|
2D8434F525FF465D00EECE90 /* HomeTimelineNavigationBarState.swift in Sources */,
|
||||||
DBABE3EC25ECAC4B00879EE5 /* WelcomeIllustrationView.swift in Sources */,
|
DBABE3EC25ECAC4B00879EE5 /* WelcomeIllustrationView.swift in Sources */,
|
||||||
2D152A8C25C295CC009AA50C /* StatusView.swift in Sources */,
|
2D152A8C25C295CC009AA50C /* StatusView.swift in Sources */,
|
||||||
2D42FF8525C8224F004A627A /* HitTestExpandedButton.swift in Sources */,
|
2D42FF8525C8224F004A627A /* HitTestExpandedButton.swift in Sources */,
|
||||||
|
@ -1669,6 +1684,7 @@
|
||||||
2D82B9FF25E7863200E36F0F /* OnboardingViewControllerAppearance.swift in Sources */,
|
2D82B9FF25E7863200E36F0F /* OnboardingViewControllerAppearance.swift in Sources */,
|
||||||
5DF1054725F8870E00D6C0D4 /* VideoPlayerViewModel.swift in Sources */,
|
5DF1054725F8870E00D6C0D4 /* VideoPlayerViewModel.swift in Sources */,
|
||||||
2D38F1E525CD46C100561493 /* HomeTimelineViewModel.swift in Sources */,
|
2D38F1E525CD46C100561493 /* HomeTimelineViewModel.swift in Sources */,
|
||||||
|
2D84350525FF858100EECE90 /* UIScrollView.swift in Sources */,
|
||||||
2D76316B25C14D4C00929FB9 /* PublicTimelineViewModel.swift in Sources */,
|
2D76316B25C14D4C00929FB9 /* PublicTimelineViewModel.swift in Sources */,
|
||||||
2DA6055125F74407006356F9 /* AudioContainerViewModel.swift in Sources */,
|
2DA6055125F74407006356F9 /* AudioContainerViewModel.swift in Sources */,
|
||||||
0FB3D2FE25E4CB6400AAD544 /* PickServerTitleCell.swift in Sources */,
|
0FB3D2FE25E4CB6400AAD544 /* PickServerTitleCell.swift in Sources */,
|
||||||
|
|
|
@ -0,0 +1,32 @@
|
||||||
|
//
|
||||||
|
// UIScrollView.swift
|
||||||
|
// Mastodon
|
||||||
|
//
|
||||||
|
// Created by sxiaojian on 2021/3/15.
|
||||||
|
//
|
||||||
|
|
||||||
|
import UIKit
|
||||||
|
|
||||||
|
extension UIScrollView {
|
||||||
|
public enum ScrollDirection {
|
||||||
|
case top
|
||||||
|
case bottom
|
||||||
|
case left
|
||||||
|
case right
|
||||||
|
}
|
||||||
|
|
||||||
|
public func scroll(to direction: ScrollDirection, animated: Bool) {
|
||||||
|
let offset: CGPoint
|
||||||
|
switch direction {
|
||||||
|
case .top:
|
||||||
|
offset = CGPoint(x: contentOffset.x, y: -adjustedContentInset.top)
|
||||||
|
case .bottom:
|
||||||
|
offset = CGPoint(x: contentOffset.x, y: max(-adjustedContentInset.top, contentSize.height - frame.height + adjustedContentInset.bottom))
|
||||||
|
case .left:
|
||||||
|
offset = CGPoint(x: -adjustedContentInset.left, y: contentOffset.y)
|
||||||
|
case .right:
|
||||||
|
offset = CGPoint(x: max(-adjustedContentInset.left, contentSize.width - frame.width + adjustedContentInset.right), y: contentOffset.y)
|
||||||
|
}
|
||||||
|
setContentOffset(offset, animated: animated)
|
||||||
|
}
|
||||||
|
}
|
|
@ -67,6 +67,10 @@ internal enum Asset {
|
||||||
internal static let invalid = ColorAsset(name: "Colors/TextField/invalid")
|
internal static let invalid = ColorAsset(name: "Colors/TextField/invalid")
|
||||||
internal static let valid = ColorAsset(name: "Colors/TextField/valid")
|
internal static let valid = ColorAsset(name: "Colors/TextField/valid")
|
||||||
}
|
}
|
||||||
|
internal static let backgroundLight = ColorAsset(name: "Colors/backgroundLight")
|
||||||
|
internal static let buttonDefault = ColorAsset(name: "Colors/buttonDefault")
|
||||||
|
internal static let buttonDisabled = ColorAsset(name: "Colors/buttonDisabled")
|
||||||
|
internal static let buttonInactive = ColorAsset(name: "Colors/buttonInactive")
|
||||||
internal static let lightAlertYellow = ColorAsset(name: "Colors/lightAlertYellow")
|
internal static let lightAlertYellow = ColorAsset(name: "Colors/lightAlertYellow")
|
||||||
internal static let lightBackground = ColorAsset(name: "Colors/lightBackground")
|
internal static let lightBackground = ColorAsset(name: "Colors/lightBackground")
|
||||||
internal static let lightBrandBlue = ColorAsset(name: "Colors/lightBrandBlue")
|
internal static let lightBrandBlue = ColorAsset(name: "Colors/lightBrandBlue")
|
||||||
|
@ -85,16 +89,13 @@ internal enum Asset {
|
||||||
internal enum Illustration {
|
internal enum Illustration {
|
||||||
internal static let backgroundCyan = ColorAsset(name: "Welcome/illustration/background.cyan")
|
internal static let backgroundCyan = ColorAsset(name: "Welcome/illustration/background.cyan")
|
||||||
internal static let cloudBase = ImageAsset(name: "Welcome/illustration/cloud.base")
|
internal static let cloudBase = ImageAsset(name: "Welcome/illustration/cloud.base")
|
||||||
internal static let cloudFirst = ImageAsset(name: "Welcome/illustration/cloud.first")
|
|
||||||
internal static let cloudSecond = ImageAsset(name: "Welcome/illustration/cloud.second")
|
|
||||||
internal static let cloudThird = ImageAsset(name: "Welcome/illustration/cloud.third")
|
|
||||||
internal static let elephantFourOnGrassWithTreeTwo = ImageAsset(name: "Welcome/illustration/elephant.four.on.grass.with.tree.two")
|
|
||||||
internal static let elephantOnAirplaneWithContrail = ImageAsset(name: "Welcome/illustration/elephant.on.airplane.with.contrail")
|
internal static let elephantOnAirplaneWithContrail = ImageAsset(name: "Welcome/illustration/elephant.on.airplane.with.contrail")
|
||||||
internal static let elephantThreeOnGrass = ImageAsset(name: "Welcome/illustration/elephant.three.on.grass")
|
internal static let elephantThreeOnGrass = ImageAsset(name: "Welcome/illustration/elephant.three.on.grass")
|
||||||
internal static let elephantThreeOnGrassWithTreeFour = ImageAsset(name: "Welcome/illustration/elephant.three.on.grass.with.tree.four")
|
internal static let elephantThreeOnGrassWithTreeThree = ImageAsset(name: "Welcome/illustration/elephant.three.on.grass.with.tree.three")
|
||||||
internal static let elephantTwo = ImageAsset(name: "Welcome/illustration/elephant.two")
|
internal static let elephantThreeOnGrassWithTreeTwo = ImageAsset(name: "Welcome/illustration/elephant.three.on.grass.with.tree.two")
|
||||||
internal static let lineDashTwo = ImageAsset(name: "Welcome/illustration/line.dash.two")
|
|
||||||
}
|
}
|
||||||
|
internal static let mastodonLogoBlack = ImageAsset(name: "Welcome/mastodon.logo.black")
|
||||||
|
internal static let mastodonLogoBlackLarge = ImageAsset(name: "Welcome/mastodon.logo.black.large")
|
||||||
internal static let mastodonLogo = ImageAsset(name: "Welcome/mastodon.logo")
|
internal static let mastodonLogo = ImageAsset(name: "Welcome/mastodon.logo")
|
||||||
internal static let mastodonLogoLarge = ImageAsset(name: "Welcome/mastodon.logo.large")
|
internal static let mastodonLogoLarge = ImageAsset(name: "Welcome/mastodon.logo.large")
|
||||||
}
|
}
|
||||||
|
|
|
@ -162,6 +162,16 @@ internal enum L10n {
|
||||||
internal enum HomeTimeline {
|
internal enum HomeTimeline {
|
||||||
/// Home
|
/// Home
|
||||||
internal static let title = L10n.tr("Localizable", "Scene.HomeTimeline.Title")
|
internal static let title = L10n.tr("Localizable", "Scene.HomeTimeline.Title")
|
||||||
|
internal enum NavigationBarState {
|
||||||
|
/// See new posts
|
||||||
|
internal static let newPosts = L10n.tr("Localizable", "Scene.HomeTimeline.NavigationBarState.NewPosts")
|
||||||
|
/// Offline
|
||||||
|
internal static let offline = L10n.tr("Localizable", "Scene.HomeTimeline.NavigationBarState.Offline")
|
||||||
|
/// Published!
|
||||||
|
internal static let published = L10n.tr("Localizable", "Scene.HomeTimeline.NavigationBarState.Published")
|
||||||
|
/// Publishing post...
|
||||||
|
internal static let publishing = L10n.tr("Localizable", "Scene.HomeTimeline.NavigationBarState.Publishing")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
internal enum PublicTimeline {
|
internal enum PublicTimeline {
|
||||||
/// Public
|
/// Public
|
||||||
|
|
|
@ -0,0 +1,20 @@
|
||||||
|
{
|
||||||
|
"colors" : [
|
||||||
|
{
|
||||||
|
"color" : {
|
||||||
|
"color-space" : "srgb",
|
||||||
|
"components" : {
|
||||||
|
"alpha" : "1.000",
|
||||||
|
"blue" : "0.910",
|
||||||
|
"green" : "0.882",
|
||||||
|
"red" : "0.851"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"idiom" : "universal"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"author" : "xcode",
|
||||||
|
"version" : 1
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,20 @@
|
||||||
|
{
|
||||||
|
"colors" : [
|
||||||
|
{
|
||||||
|
"color" : {
|
||||||
|
"color-space" : "srgb",
|
||||||
|
"components" : {
|
||||||
|
"alpha" : "1.000",
|
||||||
|
"blue" : "0.851",
|
||||||
|
"green" : "0.565",
|
||||||
|
"red" : "0.169"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"idiom" : "universal"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"author" : "xcode",
|
||||||
|
"version" : 1
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,20 @@
|
||||||
|
{
|
||||||
|
"colors" : [
|
||||||
|
{
|
||||||
|
"color" : {
|
||||||
|
"color-space" : "srgb",
|
||||||
|
"components" : {
|
||||||
|
"alpha" : "1.000",
|
||||||
|
"blue" : "0.784",
|
||||||
|
"green" : "0.682",
|
||||||
|
"red" : "0.608"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"idiom" : "universal"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"author" : "xcode",
|
||||||
|
"version" : 1
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,20 @@
|
||||||
|
{
|
||||||
|
"colors" : [
|
||||||
|
{
|
||||||
|
"color" : {
|
||||||
|
"color-space" : "srgb",
|
||||||
|
"components" : {
|
||||||
|
"alpha" : "1.000",
|
||||||
|
"blue" : "0.549",
|
||||||
|
"green" : "0.510",
|
||||||
|
"red" : "0.431"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"idiom" : "universal"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"author" : "xcode",
|
||||||
|
"version" : 1
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,20 +1,20 @@
|
||||||
{
|
{
|
||||||
"colors" : [
|
"colors" : [
|
||||||
{
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
"color" : {
|
"color" : {
|
||||||
"color-space" : "srgb",
|
"color-space" : "srgb",
|
||||||
"components" : {
|
"components" : {
|
||||||
"alpha" : "1.000",
|
"red" : "0.792",
|
||||||
"blue" : "0.016",
|
"blue" : "0.016",
|
||||||
"green" : "0.561",
|
"green" : "0.561",
|
||||||
"red" : "0.792"
|
"alpha" : "1.000"
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
"idiom" : "universal"
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"info" : {
|
"info" : {
|
||||||
"author" : "xcode",
|
"version" : 1,
|
||||||
"version" : 1
|
"author" : "xcode"
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -1,20 +1,20 @@
|
||||||
{
|
{
|
||||||
|
"info" : {
|
||||||
|
"version" : 1,
|
||||||
|
"author" : "xcode"
|
||||||
|
},
|
||||||
"colors" : [
|
"colors" : [
|
||||||
{
|
{
|
||||||
"color" : {
|
"color" : {
|
||||||
"color-space" : "srgb",
|
"color-space" : "srgb",
|
||||||
"components" : {
|
"components" : {
|
||||||
"alpha" : "1.000",
|
"alpha" : "1.000",
|
||||||
|
"red" : "0.875",
|
||||||
"blue" : "0.353",
|
"blue" : "0.353",
|
||||||
"green" : "0.251",
|
"green" : "0.251"
|
||||||
"red" : "0.875"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"idiom" : "universal"
|
"idiom" : "universal"
|
||||||
}
|
}
|
||||||
],
|
]
|
||||||
"info" : {
|
}
|
||||||
"author" : "xcode",
|
|
||||||
"version" : 1
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,6 +1,11 @@
|
||||||
{
|
{
|
||||||
|
"info" : {
|
||||||
|
"version" : 1,
|
||||||
|
"author" : "xcode"
|
||||||
|
},
|
||||||
"colors" : [
|
"colors" : [
|
||||||
{
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
"color" : {
|
"color" : {
|
||||||
"color-space" : "srgb",
|
"color-space" : "srgb",
|
||||||
"components" : {
|
"components" : {
|
||||||
|
@ -9,12 +14,7 @@
|
||||||
"green" : "0.137",
|
"green" : "0.137",
|
||||||
"red" : "0.122"
|
"red" : "0.122"
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
"idiom" : "universal"
|
|
||||||
}
|
}
|
||||||
],
|
]
|
||||||
"info" : {
|
}
|
||||||
"author" : "xcode",
|
|
||||||
"version" : 1
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,20 +1,20 @@
|
||||||
{
|
{
|
||||||
|
"info" : {
|
||||||
|
"version" : 1,
|
||||||
|
"author" : "xcode"
|
||||||
|
},
|
||||||
"colors" : [
|
"colors" : [
|
||||||
{
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
"color" : {
|
"color" : {
|
||||||
"color-space" : "srgb",
|
|
||||||
"components" : {
|
"components" : {
|
||||||
|
"blue" : "0.263",
|
||||||
|
"green" : "0.235",
|
||||||
"alpha" : "0.600",
|
"alpha" : "0.600",
|
||||||
"blue" : "67",
|
"red" : "0.235"
|
||||||
"green" : "60",
|
},
|
||||||
"red" : "60"
|
"color-space" : "srgb"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"idiom" : "universal"
|
|
||||||
}
|
}
|
||||||
],
|
]
|
||||||
"info" : {
|
}
|
||||||
"author" : "xcode",
|
|
||||||
"version" : 1
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,20 +1,20 @@
|
||||||
{
|
{
|
||||||
|
"info" : {
|
||||||
|
"version" : 1,
|
||||||
|
"author" : "xcode"
|
||||||
|
},
|
||||||
"colors" : [
|
"colors" : [
|
||||||
{
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
"color" : {
|
"color" : {
|
||||||
"color-space" : "srgb",
|
"color-space" : "srgb",
|
||||||
"components" : {
|
"components" : {
|
||||||
"alpha" : "1.000",
|
"alpha" : "1.000",
|
||||||
"blue" : "0.604",
|
|
||||||
"green" : "0.741",
|
"green" : "0.741",
|
||||||
"red" : "0.475"
|
"red" : "0.475",
|
||||||
|
"blue" : "0.604"
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
"idiom" : "universal"
|
|
||||||
}
|
}
|
||||||
],
|
]
|
||||||
"info" : {
|
}
|
||||||
"author" : "xcode",
|
|
||||||
"version" : 1
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,20 +1,20 @@
|
||||||
{
|
{
|
||||||
"colors" : [
|
"colors" : [
|
||||||
{
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
"color" : {
|
"color" : {
|
||||||
"color-space" : "srgb",
|
|
||||||
"components" : {
|
"components" : {
|
||||||
|
"red" : "0.996",
|
||||||
"alpha" : "1.000",
|
"alpha" : "1.000",
|
||||||
"blue" : "0.996",
|
"blue" : "0.996",
|
||||||
"green" : "1.000",
|
"green" : "1.000"
|
||||||
"red" : "0.996"
|
},
|
||||||
}
|
"color-space" : "srgb"
|
||||||
},
|
}
|
||||||
"idiom" : "universal"
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"info" : {
|
"info" : {
|
||||||
"author" : "xcode",
|
"version" : 1,
|
||||||
"version" : 1
|
"author" : "xcode"
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -1,15 +1,17 @@
|
||||||
{
|
{
|
||||||
"images" : [
|
"images" : [
|
||||||
{
|
{
|
||||||
"filename" : "Untitled-1_0007_Group-6.png",
|
"filename" : "untitled10007Group61.png",
|
||||||
"idiom" : "universal",
|
"idiom" : "universal",
|
||||||
"scale" : "1x"
|
"scale" : "1x"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
"filename" : "untitled10007Group61@2x.png",
|
||||||
"idiom" : "universal",
|
"idiom" : "universal",
|
||||||
"scale" : "2x"
|
"scale" : "2x"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
"filename" : "untitled10007Group61@3x.png",
|
||||||
"idiom" : "universal",
|
"idiom" : "universal",
|
||||||
"scale" : "3x"
|
"scale" : "3x"
|
||||||
}
|
}
|
||||||
|
|
Before Width: | Height: | Size: 31 KiB |
BIN
Mastodon/Resources/Assets.xcassets/Welcome/illustration/cloud.base.imageset/untitled10007Group61.png
vendored
Normal file
After Width: | Height: | Size: 12 KiB |
After Width: | Height: | Size: 32 KiB |
After Width: | Height: | Size: 58 KiB |
Before Width: | Height: | Size: 6.8 KiB |
|
@ -1,21 +0,0 @@
|
||||||
{
|
|
||||||
"images" : [
|
|
||||||
{
|
|
||||||
"filename" : "Untitled-1_0009_Group-4.png",
|
|
||||||
"idiom" : "universal",
|
|
||||||
"scale" : "1x"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"idiom" : "universal",
|
|
||||||
"scale" : "2x"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"idiom" : "universal",
|
|
||||||
"scale" : "3x"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"info" : {
|
|
||||||
"author" : "xcode",
|
|
||||||
"version" : 1
|
|
||||||
}
|
|
||||||
}
|
|
Before Width: | Height: | Size: 6.6 KiB |
Before Width: | Height: | Size: 6.5 KiB |
|
@ -1,21 +0,0 @@
|
||||||
{
|
|
||||||
"images" : [
|
|
||||||
{
|
|
||||||
"filename" : "Untitled-1_0004_Group-11.png",
|
|
||||||
"idiom" : "universal",
|
|
||||||
"scale" : "1x"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"idiom" : "universal",
|
|
||||||
"scale" : "2x"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"idiom" : "universal",
|
|
||||||
"scale" : "3x"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"info" : {
|
|
||||||
"author" : "xcode",
|
|
||||||
"version" : 1
|
|
||||||
}
|
|
||||||
}
|
|
Before Width: | Height: | Size: 66 KiB |
|
@ -1,15 +1,17 @@
|
||||||
{
|
{
|
||||||
"images" : [
|
"images" : [
|
||||||
{
|
{
|
||||||
"filename" : "Untitled-1_0006_Group-2.png",
|
"filename" : "untitled10006Group21.png",
|
||||||
"idiom" : "universal",
|
"idiom" : "universal",
|
||||||
"scale" : "1x"
|
"scale" : "1x"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
"filename" : "untitled10006Group21@2x.png",
|
||||||
"idiom" : "universal",
|
"idiom" : "universal",
|
||||||
"scale" : "2x"
|
"scale" : "2x"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
"filename" : "untitled10006Group21@3x.png",
|
||||||
"idiom" : "universal",
|
"idiom" : "universal",
|
||||||
"scale" : "3x"
|
"scale" : "3x"
|
||||||
}
|
}
|
||||||
|
|
Before Width: | Height: | Size: 39 KiB |
After Width: | Height: | Size: 16 KiB |
After Width: | Height: | Size: 44 KiB |
After Width: | Height: | Size: 82 KiB |
|
@ -1,15 +1,17 @@
|
||||||
{
|
{
|
||||||
"images" : [
|
"images" : [
|
||||||
{
|
{
|
||||||
"filename" : "Untitled-1_0003_Group-1.png",
|
"filename" : "untitled10003Group11.png",
|
||||||
"idiom" : "universal",
|
"idiom" : "universal",
|
||||||
"scale" : "1x"
|
"scale" : "1x"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
"filename" : "untitled10003Group11@2x.png",
|
||||||
"idiom" : "universal",
|
"idiom" : "universal",
|
||||||
"scale" : "2x"
|
"scale" : "2x"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
"filename" : "untitled10003Group11@3x.png",
|
||||||
"idiom" : "universal",
|
"idiom" : "universal",
|
||||||
"scale" : "3x"
|
"scale" : "3x"
|
||||||
}
|
}
|
||||||
|
|
Before Width: | Height: | Size: 124 KiB |
After Width: | Height: | Size: 46 KiB |
After Width: | Height: | Size: 130 KiB |
After Width: | Height: | Size: 238 KiB |
|
@ -1,21 +0,0 @@
|
||||||
{
|
|
||||||
"images" : [
|
|
||||||
{
|
|
||||||
"filename" : "Untitled-1_0005_Group-10.png",
|
|
||||||
"idiom" : "universal",
|
|
||||||
"scale" : "1x"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"idiom" : "universal",
|
|
||||||
"scale" : "2x"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"idiom" : "universal",
|
|
||||||
"scale" : "3x"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"info" : {
|
|
||||||
"author" : "xcode",
|
|
||||||
"version" : 1
|
|
||||||
}
|
|
||||||
}
|
|
Before Width: | Height: | Size: 69 KiB |
|
@ -1,15 +1,17 @@
|
||||||
{
|
{
|
||||||
"images" : [
|
"images" : [
|
||||||
{
|
{
|
||||||
"filename" : "Untitled-1_0008_Group-3.png",
|
"filename" : "untitled10005Group101.png",
|
||||||
"idiom" : "universal",
|
"idiom" : "universal",
|
||||||
"scale" : "1x"
|
"scale" : "1x"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
"filename" : "untitled10005Group101@2x.png",
|
||||||
"idiom" : "universal",
|
"idiom" : "universal",
|
||||||
"scale" : "2x"
|
"scale" : "2x"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
"filename" : "untitled10005Group101@3x.png",
|
||||||
"idiom" : "universal",
|
"idiom" : "universal",
|
||||||
"scale" : "3x"
|
"scale" : "3x"
|
||||||
}
|
}
|
After Width: | Height: | Size: 23 KiB |
After Width: | Height: | Size: 64 KiB |
After Width: | Height: | Size: 116 KiB |
|
@ -1,15 +1,17 @@
|
||||||
{
|
{
|
||||||
"images" : [
|
"images" : [
|
||||||
{
|
{
|
||||||
"filename" : "Untitled-1_0010_Group-5.png",
|
"filename" : "untitled10004Group111.png",
|
||||||
"idiom" : "universal",
|
"idiom" : "universal",
|
||||||
"scale" : "1x"
|
"scale" : "1x"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
"filename" : "untitled10004Group111@2x.png",
|
||||||
"idiom" : "universal",
|
"idiom" : "universal",
|
||||||
"scale" : "2x"
|
"scale" : "2x"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
"filename" : "untitled10004Group111@3x.png",
|
||||||
"idiom" : "universal",
|
"idiom" : "universal",
|
||||||
"scale" : "3x"
|
"scale" : "3x"
|
||||||
}
|
}
|
After Width: | Height: | Size: 23 KiB |
After Width: | Height: | Size: 64 KiB |
After Width: | Height: | Size: 118 KiB |
|
@ -1,21 +0,0 @@
|
||||||
{
|
|
||||||
"images" : [
|
|
||||||
{
|
|
||||||
"filename" : "Untitled-1_0001_Group-9.png",
|
|
||||||
"idiom" : "universal",
|
|
||||||
"scale" : "1x"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"idiom" : "universal",
|
|
||||||
"scale" : "2x"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"idiom" : "universal",
|
|
||||||
"scale" : "3x"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"info" : {
|
|
||||||
"author" : "xcode",
|
|
||||||
"version" : 1
|
|
||||||
}
|
|
||||||
}
|
|
Before Width: | Height: | Size: 64 KiB |
|
@ -1,21 +0,0 @@
|
||||||
{
|
|
||||||
"images" : [
|
|
||||||
{
|
|
||||||
"filename" : "Untitled-1_0002_Layer-25.png",
|
|
||||||
"idiom" : "universal",
|
|
||||||
"scale" : "1x"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"idiom" : "universal",
|
|
||||||
"scale" : "2x"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"idiom" : "universal",
|
|
||||||
"scale" : "3x"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"info" : {
|
|
||||||
"author" : "xcode",
|
|
||||||
"version" : 1
|
|
||||||
}
|
|
||||||
}
|
|
Before Width: | Height: | Size: 5.4 KiB |
12
Mastodon/Resources/Assets.xcassets/Welcome/mastodon.logo.black.imageset/Contents.json
vendored
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"filename" : "mastodon.logo.black.pdf",
|
||||||
|
"idiom" : "universal"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"author" : "xcode",
|
||||||
|
"version" : 1
|
||||||
|
}
|
||||||
|
}
|
12
Mastodon/Resources/Assets.xcassets/Welcome/mastodon.logo.black.large.imageset/Contents.json
vendored
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"filename" : "mastodon.logo.black.large.pdf",
|
||||||
|
"idiom" : "universal"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"author" : "xcode",
|
||||||
|
"version" : 1
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"images" : [
|
"images" : [
|
||||||
{
|
{
|
||||||
"filename" : "mastodon.logo.pdf",
|
"filename" : "logotypeFull1.pdf",
|
||||||
"idiom" : "universal"
|
"idiom" : "universal"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
|
513
Mastodon/Resources/Assets.xcassets/Welcome/mastodon.logo.imageset/logotypeFull1.pdf
vendored
Normal file
|
@ -0,0 +1,513 @@
|
||||||
|
%PDF-1.7
|
||||||
|
|
||||||
|
1 0 obj
|
||||||
|
<< /BBox [ 0.000000 0.000000 261.000000 67.000000 ]
|
||||||
|
/Resources << >>
|
||||||
|
/Subtype /Form
|
||||||
|
/Length 2 0 R
|
||||||
|
/Group << /Type /Group
|
||||||
|
/S /Transparency
|
||||||
|
>>
|
||||||
|
/Type /XObject
|
||||||
|
>>
|
||||||
|
stream
|
||||||
|
/DeviceRGB CS
|
||||||
|
/DeviceRGB cs
|
||||||
|
q
|
||||||
|
1.000000 0.000000 -0.000000 1.000000 2.000000 2.000000 cm
|
||||||
|
0.000000 0.000000 0.000000 scn
|
||||||
|
0.000000 63.000000 m
|
||||||
|
257.000000 63.000000 l
|
||||||
|
257.000000 0.000000 l
|
||||||
|
0.000000 0.000000 l
|
||||||
|
0.000000 63.000000 l
|
||||||
|
h
|
||||||
|
f
|
||||||
|
n
|
||||||
|
Q
|
||||||
|
|
||||||
|
endstream
|
||||||
|
endobj
|
||||||
|
|
||||||
|
2 0 obj
|
||||||
|
234
|
||||||
|
endobj
|
||||||
|
|
||||||
|
3 0 obj
|
||||||
|
<< /BBox [ 0.000000 0.000000 261.000000 67.000000 ]
|
||||||
|
/Resources << >>
|
||||||
|
/Subtype /Form
|
||||||
|
/Length 4 0 R
|
||||||
|
/Group << /Type /Group
|
||||||
|
/S /Transparency
|
||||||
|
>>
|
||||||
|
/Type /XObject
|
||||||
|
>>
|
||||||
|
stream
|
||||||
|
/DeviceRGB CS
|
||||||
|
/DeviceRGB cs
|
||||||
|
q
|
||||||
|
1.000000 0.000000 -0.000000 1.000000 2.000000 1.844727 cm
|
||||||
|
0.168627 0.564706 0.850980 scn
|
||||||
|
57.842663 25.387310 m
|
||||||
|
56.973518 20.943096 50.061783 16.079765 42.122841 15.137188 c
|
||||||
|
37.982918 14.645527 33.907391 14.194614 29.561213 14.392532 c
|
||||||
|
22.453136 14.716278 16.844669 16.079762 16.844669 16.079762 c
|
||||||
|
16.844669 15.391525 16.887453 14.736427 16.972567 14.123863 c
|
||||||
|
17.896652 7.149250 23.928431 6.731026 29.641823 6.536243 c
|
||||||
|
35.408352 6.340115 40.542614 7.950329 40.542614 7.950329 c
|
||||||
|
40.779942 2.765934 l
|
||||||
|
40.779942 2.765934 36.746300 0.612568 29.561213 0.216728 c
|
||||||
|
25.598721 0.000004 20.679268 0.315689 14.948763 1.823364 c
|
||||||
|
2.521337 5.094391 0.384049 18.266270 0.057106 31.631596 c
|
||||||
|
-0.042868 35.599815 0.018828 39.341911 0.018828 42.470993 c
|
||||||
|
0.018828 56.138123 9.024163 60.143955 9.024163 60.143955 c
|
||||||
|
13.564885 62.217625 21.356571 63.089451 29.456736 63.155273 c
|
||||||
|
29.655783 63.155273 l
|
||||||
|
37.755947 63.089451 45.552582 62.217625 50.093304 60.143955 c
|
||||||
|
50.093304 60.143955 59.098644 56.138123 59.098644 42.470993 c
|
||||||
|
59.098644 42.470993 59.211227 32.387894 57.842663 25.387310 c
|
||||||
|
h
|
||||||
|
f
|
||||||
|
n
|
||||||
|
Q
|
||||||
|
q
|
||||||
|
1.000000 0.000000 -0.000000 1.000000 14.485992 26.452484 cm
|
||||||
|
0.996078 1.000000 0.996078 scn
|
||||||
|
0.000000 21.175804 m
|
||||||
|
0.000000 23.165289 1.622104 24.777744 3.622489 24.777744 c
|
||||||
|
5.623325 24.777744 7.244979 23.165289 7.244979 21.175804 c
|
||||||
|
7.244979 19.186768 5.623325 17.573866 3.622489 17.573866 c
|
||||||
|
1.622104 17.573866 0.000000 19.186768 0.000000 21.175804 c
|
||||||
|
h
|
||||||
|
51.953178 16.803417 m
|
||||||
|
51.953178 0.255280 l
|
||||||
|
45.359833 0.255280 l
|
||||||
|
45.359833 16.317129 l
|
||||||
|
45.359833 19.703238 43.926872 21.421368 41.060944 21.421368 c
|
||||||
|
37.892841 21.421368 36.304512 19.382627 36.304512 15.351715 c
|
||||||
|
36.304512 6.560461 l
|
||||||
|
29.749895 6.560461 l
|
||||||
|
29.749895 15.351715 l
|
||||||
|
29.749895 19.382627 28.161566 21.421368 24.993464 21.421368 c
|
||||||
|
22.127537 21.421368 20.694574 19.703238 20.694574 16.317129 c
|
||||||
|
20.694574 0.255280 l
|
||||||
|
14.101229 0.255280 l
|
||||||
|
14.101229 16.803417 l
|
||||||
|
14.101229 20.185495 14.967223 22.873068 16.706865 24.861656 c
|
||||||
|
18.500998 26.849798 20.850389 27.868944 23.766304 27.868944 c
|
||||||
|
27.140659 27.868944 29.695858 26.579786 31.384611 24.000576 c
|
||||||
|
33.027431 21.262854 l
|
||||||
|
34.669796 24.000576 l
|
||||||
|
36.359001 26.579786 38.913750 27.868944 42.288555 27.868944 c
|
||||||
|
45.204472 27.868944 47.553417 26.849798 49.347549 24.861656 c
|
||||||
|
51.087193 22.873068 51.953178 20.185495 51.953178 16.803417 c
|
||||||
|
51.953178 16.803417 l
|
||||||
|
h
|
||||||
|
74.667320 8.577215 m
|
||||||
|
76.027779 10.006529 76.683022 11.806602 76.683022 13.977438 c
|
||||||
|
76.683022 16.148273 76.027779 17.948345 74.667320 19.324818 c
|
||||||
|
73.357300 20.754578 71.693764 21.442368 69.678070 21.442368 c
|
||||||
|
67.661919 21.442368 65.998833 20.754578 64.688812 19.324818 c
|
||||||
|
63.378338 17.948345 62.723106 16.148273 62.723106 13.977438 c
|
||||||
|
62.723106 11.806602 63.378338 10.006529 64.688812 8.577215 c
|
||||||
|
65.998833 7.200743 67.661919 6.512505 69.678070 6.512505 c
|
||||||
|
71.693764 6.512505 73.357300 7.200743 74.667320 8.577215 c
|
||||||
|
h
|
||||||
|
76.683022 27.213799 m
|
||||||
|
83.184502 27.213799 l
|
||||||
|
83.184502 0.741074 l
|
||||||
|
76.683022 0.741074 l
|
||||||
|
76.683022 3.865234 l
|
||||||
|
74.717758 1.270798 71.995941 0.000000 68.468475 0.000000 c
|
||||||
|
65.091866 0.000000 62.219185 1.323635 59.799988 4.024193 c
|
||||||
|
57.431683 6.724304 56.222076 10.059816 56.222076 13.977438 c
|
||||||
|
56.222076 17.842222 57.431683 21.178179 59.799988 23.878288 c
|
||||||
|
62.219185 26.578400 65.091866 27.954872 68.468475 27.954872 c
|
||||||
|
71.995941 27.954872 74.717758 26.684074 76.683022 24.090088 c
|
||||||
|
76.683022 27.213799 l
|
||||||
|
76.683022 27.213799 l
|
||||||
|
h
|
||||||
|
105.058311 14.453876 m
|
||||||
|
106.973137 13.024565 107.931007 11.012690 107.880569 8.471540 c
|
||||||
|
107.880569 5.770981 106.922699 3.653431 104.957443 2.170834 c
|
||||||
|
102.991730 0.741074 100.623421 0.000000 97.750740 0.000000 c
|
||||||
|
92.559738 0.000000 89.031815 2.118000 87.166977 6.300707 c
|
||||||
|
92.811928 9.635767 l
|
||||||
|
93.567589 7.359705 95.230667 6.194584 97.750740 6.194584 c
|
||||||
|
100.068611 6.194584 101.228233 6.936104 101.228233 8.471540 c
|
||||||
|
101.228233 9.583378 99.716003 10.589090 96.642021 11.383003 c
|
||||||
|
95.482407 11.700928 94.524994 12.018402 93.769333 12.283487 c
|
||||||
|
92.711052 12.706638 91.804077 13.183523 91.047966 13.765636 c
|
||||||
|
89.183136 15.194948 88.225716 17.101593 88.225716 19.536619 c
|
||||||
|
88.225716 22.131054 89.132698 24.195765 90.947098 25.678362 c
|
||||||
|
92.811928 27.213799 95.079361 27.954872 97.801178 27.954872 c
|
||||||
|
102.135201 27.954872 105.310501 26.101961 107.376183 22.342852 c
|
||||||
|
101.833023 19.166304 l
|
||||||
|
101.026474 20.965929 99.666016 21.865967 97.801178 21.865967 c
|
||||||
|
95.835472 21.865967 94.878067 21.124891 94.878067 19.695580 c
|
||||||
|
94.878067 18.583744 96.389832 17.578032 99.464264 16.783670 c
|
||||||
|
101.833023 16.254395 103.697403 15.460037 105.058311 14.453876 c
|
||||||
|
105.058311 14.453876 l
|
||||||
|
h
|
||||||
|
125.722229 20.648455 m
|
||||||
|
120.027290 20.648455 l
|
||||||
|
120.027290 9.635767 l
|
||||||
|
120.027290 8.312132 120.531677 7.518219 121.489082 7.147905 c
|
||||||
|
122.194763 6.882818 123.605659 6.829983 125.722229 6.936106 c
|
||||||
|
125.722229 0.741074 l
|
||||||
|
121.338226 0.211800 118.162918 0.635399 116.298080 2.065159 c
|
||||||
|
114.433701 3.441635 113.526268 5.982782 113.526268 9.635767 c
|
||||||
|
113.526268 20.648455 l
|
||||||
|
109.141808 20.648455 l
|
||||||
|
109.141808 27.213799 l
|
||||||
|
113.526268 27.213799 l
|
||||||
|
113.526268 32.561180 l
|
||||||
|
120.027290 34.625893 l
|
||||||
|
120.027290 27.213799 l
|
||||||
|
125.722229 27.213799 l
|
||||||
|
125.722229 20.648455 l
|
||||||
|
125.722229 20.648455 l
|
||||||
|
h
|
||||||
|
146.436966 8.735956 m
|
||||||
|
147.747437 10.112877 148.402237 11.860113 148.402237 13.977663 c
|
||||||
|
148.402237 16.095211 147.747437 17.842445 146.436966 19.218920 c
|
||||||
|
145.126495 20.595840 143.513840 21.283630 141.548141 21.283630 c
|
||||||
|
139.582886 21.283630 137.970245 20.595840 136.659760 19.218920 c
|
||||||
|
135.399734 17.789608 134.744492 16.042374 134.744492 13.977663 c
|
||||||
|
134.744492 11.912504 135.399734 10.165268 136.659760 8.735956 c
|
||||||
|
137.970245 7.359482 139.582886 6.671242 141.548141 6.671242 c
|
||||||
|
143.513840 6.671242 145.126495 7.359482 146.436966 8.735956 c
|
||||||
|
146.436966 8.735956 l
|
||||||
|
h
|
||||||
|
132.073563 4.023972 m
|
||||||
|
129.503494 6.724081 128.243469 10.006754 128.243469 13.977663 c
|
||||||
|
128.243469 17.895733 129.503494 21.177954 132.073563 23.878063 c
|
||||||
|
134.643616 26.578175 137.818924 27.954649 141.548141 27.954649 c
|
||||||
|
145.277802 27.954649 148.452667 26.578175 151.023178 23.878063 c
|
||||||
|
153.593689 21.177954 154.903702 17.842447 154.903702 13.977663 c
|
||||||
|
154.903702 10.059591 153.593689 6.724081 151.023178 4.023972 c
|
||||||
|
148.452667 1.323414 145.328247 0.000225 141.548141 0.000225 c
|
||||||
|
137.768478 0.000225 134.643616 1.323414 132.073563 4.023972 c
|
||||||
|
h
|
||||||
|
176.626083 8.577215 m
|
||||||
|
177.936554 10.006529 178.591339 11.806602 178.591339 13.977438 c
|
||||||
|
178.591339 16.148273 177.936554 17.948345 176.626083 19.324818 c
|
||||||
|
175.316055 20.754578 173.652527 21.442368 171.636826 21.442368 c
|
||||||
|
169.620682 21.442368 167.957596 20.754578 166.597137 19.324818 c
|
||||||
|
165.287109 17.948345 164.631424 16.148273 164.631424 13.977438 c
|
||||||
|
164.631424 11.806602 165.287109 10.006529 166.597137 8.577215 c
|
||||||
|
167.957596 7.200743 169.671112 6.512505 171.636826 6.512505 c
|
||||||
|
173.652527 6.512505 175.316055 7.200743 176.626083 8.577215 c
|
||||||
|
h
|
||||||
|
178.591339 37.802887 m
|
||||||
|
185.092789 37.802887 l
|
||||||
|
185.092789 0.741074 l
|
||||||
|
178.591339 0.741074 l
|
||||||
|
178.591339 3.865234 l
|
||||||
|
176.676529 1.270798 173.954697 0.000000 170.427216 0.000000 c
|
||||||
|
167.050613 0.000000 164.127945 1.323635 161.708755 4.024193 c
|
||||||
|
159.339996 6.724304 158.130402 10.059816 158.130402 13.977438 c
|
||||||
|
158.130402 17.842222 159.339996 21.178179 161.708755 23.878288 c
|
||||||
|
164.127945 26.578400 167.050613 27.954872 170.427216 27.954872 c
|
||||||
|
173.954697 27.954872 176.676529 26.684074 178.591339 24.090088 c
|
||||||
|
178.591339 37.802887 l
|
||||||
|
178.591339 37.802887 l
|
||||||
|
h
|
||||||
|
207.924301 8.735956 m
|
||||||
|
209.234329 10.112877 209.889572 11.860113 209.889572 13.977663 c
|
||||||
|
209.889572 16.095211 209.234329 17.842445 207.924301 19.218920 c
|
||||||
|
206.613831 20.595840 205.001190 21.283630 203.035477 21.283630 c
|
||||||
|
201.070221 21.283630 199.457123 20.595840 198.147110 19.218920 c
|
||||||
|
196.886612 17.789608 196.231812 16.042374 196.231812 13.977663 c
|
||||||
|
196.231812 11.912504 196.886612 10.165268 198.147110 8.735956 c
|
||||||
|
199.457123 7.359482 201.070221 6.671242 203.035477 6.671242 c
|
||||||
|
205.001190 6.671242 206.613831 7.359482 207.924301 8.735956 c
|
||||||
|
207.924301 8.735956 l
|
||||||
|
h
|
||||||
|
193.560883 4.023972 m
|
||||||
|
190.990372 6.724081 189.730804 10.006754 189.730804 13.977663 c
|
||||||
|
189.730804 17.895733 190.990372 21.177954 193.560883 23.878063 c
|
||||||
|
196.131393 26.578175 199.306259 27.954649 203.035477 27.954649 c
|
||||||
|
206.765137 27.954649 209.940002 26.578175 212.510498 23.878063 c
|
||||||
|
215.081009 21.177954 216.391037 17.842447 216.391037 13.977663 c
|
||||||
|
216.391037 10.059591 215.081009 6.724081 212.510498 4.023972 c
|
||||||
|
209.940002 1.323414 206.815582 0.000225 203.035477 0.000225 c
|
||||||
|
199.255814 0.000225 196.131393 1.323414 193.560883 4.023972 c
|
||||||
|
h
|
||||||
|
244.513977 16.995380 m
|
||||||
|
244.513977 0.741432 l
|
||||||
|
238.012482 0.741432 l
|
||||||
|
238.012482 16.148182 l
|
||||||
|
238.012482 17.895418 237.559006 19.219053 236.652023 20.224766 c
|
||||||
|
235.795044 21.124802 234.585434 21.601686 233.023239 21.601686 c
|
||||||
|
229.343994 21.601686 227.479614 19.430855 227.479614 15.036346 c
|
||||||
|
227.479614 0.741432 l
|
||||||
|
220.978149 0.741432 l
|
||||||
|
220.978149 27.213709 l
|
||||||
|
227.479614 27.213709 l
|
||||||
|
227.479614 24.248959 l
|
||||||
|
229.041824 26.737270 231.511002 27.954782 234.988937 27.954782 c
|
||||||
|
237.760742 27.954782 240.028625 27.001907 241.792587 25.042873 c
|
||||||
|
243.606537 23.083838 244.513977 20.436565 244.513977 16.995380 c
|
||||||
|
f
|
||||||
|
n
|
||||||
|
Q
|
||||||
|
|
||||||
|
endstream
|
||||||
|
endobj
|
||||||
|
|
||||||
|
4 0 obj
|
||||||
|
8970
|
||||||
|
endobj
|
||||||
|
|
||||||
|
5 0 obj
|
||||||
|
<< /Filter [ /FlateDecode ]
|
||||||
|
/ColorSpace /DeviceGray
|
||||||
|
/Width 522
|
||||||
|
/Length 6 0 R
|
||||||
|
/Height 134
|
||||||
|
/BitsPerComponent 8
|
||||||
|
/Subtype /Image
|
||||||
|
/Type /XObject
|
||||||
|
>>
|
||||||
|
stream
|
||||||
|
xí½…_TÝ6ìÌÀ1tw‡”€Hˆ„…€<E280A6> ¢Hˆ€-¡"ÝÒÝÃàó§}×½Öž <ç¼ïïû=Çç¼\³÷Zk¯Ž{Ýë^±÷9ò‘b±X‚[, ¶p>Äÿ:Ð®®T*Ó700”É<><C389>ŒMMMMLŒ<4C><C592>är¹¡¾¾žL
|
||||||
|
ÐÄ!Qüç@e¡ÂGþèjCÏ—HÐü†rSsKk;'W7wO/o___o/Ow77'G{[kKsSc#C}™®ŽœâÿÔÁt¤*èJ$bXþ<58>‹utõŒLÌl<1D>ݽýŽ…žˆ:Ÿxæ̹óÉÉ/¦¤$'Ÿ?w6))!.6:òDhp Ÿ<C2A0>‡«£<C2AB>µ¹©‘<C2A9>LzHÿb}#k;KS}Ý?<3F>D }¹©•½³‡O@Hxôé3É—®ÝJ¿ÿ '7¿ðyQQqqIiiÙë²²ÒWÅEE/žæ?Éy<C389>™qëÚ¥‹gâc"B<03>z8ÛY™Êõ1\RÃï ’è[¸ø…œ<0F>ˆ
p·6Ôý³jÌ@ÏÐÔÚÁýhpÄ©3)×îd>*(*}û±âË·º†Æ–¶öÎήîîÞÞÞ¾ÞÞžîöÖ榆ÚêÏß•<κ{-õl\dˆŸ‡“µ©\OGògïÏ<C3AF>®™[Ä…[÷³2³²²2ï¤Åz[êýAU…¡K&7³uõ
‰JL¹™ùäEÙ‡ªo
-=ßû‡FFÇ''§gçæ<C3A7>…Å…¥¥ÅÅ……ù¹ÙÙÙ™©ÉñÑáÁþïÝ-<2D>5Ÿ?¾.Ê˺<C38B>–sÜ×ÕÆL.Õùó¸Þ |