dwayne
/
elpha-ios
1
0
Fork 0
Code Releases Activity
Browse Source

Project updates

master
Dwayne Harris 6 years ago
parent
9b5793c443
commit
859eaf4dea
11 changed files with 62 additions and 68 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 116
      elpha-ios.xcodeproj/project.pbxproj
  2. 1
      elpha-ios/AccountTableViewController.swift
  3. 1
      elpha-ios/AttachmentManager.swift
  4. 1
      elpha-ios/AttachmentPageViewController.swift
  5. 3
      elpha-ios/InstanceViewController.swift
  6. 1
      elpha-ios/InstancesTableViewCell.swift
  7. 3
      elpha-ios/InstancesTableViewController.swift
  8. 1
      elpha-ios/SettingsTableViewController.swift
  9. 1
      elpha-ios/StatusTableViewController.swift
  10. 1
      elpha-ios/StatusView.swift
  11. 1
      elpha-ios/TimelineTableViewController.swift

116
elpha-ios.xcodeproj/project.pbxproj
View File

@ -13,8 +13,6 @@
15131EF2216D8D570092B252 /* StatusView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15131EF1216D8D570092B252 /* StatusView.swift */; };
15131EF4216DB8B90092B252 /* AccountTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15131EF3216DB8B90092B252 /* AccountTableViewController.swift */; };
15131EF6216DBA820092B252 /* AccountNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15131EF5216DBA820092B252 /* AccountNavigationController.swift */; };
151AD4D9216899AD00F07403 /* AlamofireImage.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 1517EA842159D72200DE80D6 /* AlamofireImage.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
151AD4E621689A0F00F07403 /* Alamofire.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 157405C3215890BC00EEAAEB /* Alamofire.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
15222807219D37A500D2E5A6 /* ComposeAccessoryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15222806219D37A500D2E5A6 /* ComposeAccessoryView.swift */; };
152734D22186DC74003DB3C8 /* TimelinesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 152734D12186DC74003DB3C8 /* TimelinesViewController.swift */; };
152FB0F8218ADC1A001D6574 /* AttachmentPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 152FB0F7218ADC1A001D6574 /* AttachmentPageViewController.swift */; };
@ -29,8 +27,14 @@
153418A221A0EEAC002F5F8A /* AttachmentInputView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 153418A121A0EEAC002F5F8A /* AttachmentInputView.swift */; };
153418A421A0EEED002F5F8A /* AttachmentInputView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 153418A321A0EEED002F5F8A /* AttachmentInputView.xib */; };
1539509121894A38009BA6E7 /* AlertManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1539509021894A38009BA6E7 /* AlertManager.swift */; };
156370BD219FE24200D51D42 /* Kingfisher.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 156370B0219FE22E00D51D42 /* Kingfisher.framework */; };
156370BE219FE24200D51D42 /* Kingfisher.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 156370B0219FE22E00D51D42 /* Kingfisher.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1564316521A15B2E00816382 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 157405C3215890BC00EEAAEB /* Alamofire.framework */; };
1564316621A15B2E00816382 /* Alamofire.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 157405C3215890BC00EEAAEB /* Alamofire.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1564316A21A15B4500816382 /* AlamofireNetworkActivityIndicator.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1522EC7C2193EBA10082C3FA /* AlamofireNetworkActivityIndicator.framework */; };
1564316B21A15B4500816382 /* AlamofireNetworkActivityIndicator.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 1522EC7C2193EBA10082C3FA /* AlamofireNetworkActivityIndicator.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1564316E21A15B5400816382 /* Kingfisher.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 156370B0219FE22E00D51D42 /* Kingfisher.framework */; };
1564316F21A15B5400816382 /* Kingfisher.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 156370B0219FE22E00D51D42 /* Kingfisher.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1564317221A15CF300816382 /* AlamofireImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1517EA842159D72200DE80D6 /* AlamofireImage.framework */; };
1564317321A15CF300816382 /* AlamofireImage.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 1517EA842159D72200DE80D6 /* AlamofireImage.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
156902A0219A7D75002BF61F /* ComposeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1569029F219A7D75002BF61F /* ComposeViewController.swift */; };
156FF015217289380074D9CA /* AccountTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 156FF014217289380074D9CA /* AccountTableViewCell.swift */; };
156FF0312174797E0074D9CA /* StatusTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 156FF0302174797E0074D9CA /* StatusTableViewController.swift */; };
@ -41,7 +45,6 @@
157405A82150588A00EEAAEB /* InstanceViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 157405A72150588A00EEAAEB /* InstanceViewController.swift */; };
157405B12151A5DA00EEAAEB /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 157405AF2151A5DA00EEAAEB /* README.md */; };
157405B42151A93E00EEAAEB /* InstancesDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 157405B32151A93E00EEAAEB /* InstancesDataManager.swift */; };
157405D1215890D700EEAAEB /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 157405C3215890BC00EEAAEB /* Alamofire.framework */; };
1574148D2169AD0100C841BD /* AttachmentManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1574148C2169AD0100C841BD /* AttachmentManager.swift */; };
159026AE2162CF5600D362DD /* TimelineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 159026AD2162CF5600D362DD /* TimelineTableViewCell.swift */; };
159026D02163069600D362DD /* Date+TimeAgo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 159026CF2163069600D362DD /* Date+TimeAgo.swift */; };
@ -60,7 +63,6 @@
15960E822136668500C38CE9 /* TimelinesNavigationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15960E812136668500C38CE9 /* TimelinesNavigationController.swift */; };
15960E84213774FC00C38CE9 /* InstancesTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15960E83213774FC00C38CE9 /* InstancesTableViewController.swift */; };
159B553A219D11E600964AC0 /* ComposeAccessoryView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 159B5539219D11E600964AC0 /* ComposeAccessoryView.xib */; };
15A79B2E215C63B6007A326E /* AlamofireImage.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1517EA842159D72200DE80D6 /* AlamofireImage.framework */; };
15A79B43215EB959007A326E /* CoreDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15A79B42215EB959007A326E /* CoreDataManager.swift */; };
15B127922192467F00F4EF1D /* String+HtmlAttributed.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15B127912192467F00F4EF1D /* String+HtmlAttributed.swift */; };
15B127A32192486200F4EF1D /* UIColor+HexString.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15B127A22192486200F4EF1D /* UIColor+HexString.swift */; };
@ -70,8 +72,6 @@
15CF7244219282AF00E6BF19 /* UITextViewFixed.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15CF7243219282AF00E6BF19 /* UITextViewFixed.swift */; };
15F9981721629965009E58DA /* TimelineTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15F9981621629965009E58DA /* TimelineTableViewController.swift */; };
15F998352162C0E8009E58DA /* MastodonDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15F998342162C0E8009E58DA /* MastodonDataManager.swift */; };
EAD1445C219A6CAF002C5338 /* AlamofireNetworkActivityIndicator.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1522EC7C2193EBA10082C3FA /* AlamofireNetworkActivityIndicator.framework */; };
EAD1445D219A6CAF002C5338 /* AlamofireNetworkActivityIndicator.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 1522EC7C2193EBA10082C3FA /* AlamofireNetworkActivityIndicator.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@ -131,20 +131,6 @@
remoteGlobalIDString = 4C11830B2150517E007A8298;
remoteInfo = "iOS Example";
};
151AD4DA216899AD00F07403 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1517EA6F2159D72200DE80D6 /* AlamofireImage.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 4C9043761AABBFC5001B4E60;
remoteInfo = "AlamofireImage iOS";
};
151AD4E721689A0F00F07403 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 157405B7215890BC00EEAAEB /* Alamofire.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = F8111E3219A95C8B0040E7D1;
remoteInfo = "Alamofire iOS";
};
1522EC7B2193EBA10082C3FA /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1522EC752193EBA10082C3FA /* AlamofireNetworkActivityIndicator.xcodeproj */;
@ -208,13 +194,34 @@
remoteGlobalIDString = D10EC2311C3D632300A4211C;
remoteInfo = "KingfisherTests-macOS";
};
156370BF219FE24200D51D42 /* PBXContainerItemProxy */ = {
1564316721A15B2E00816382 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 157405B7215890BC00EEAAEB /* Alamofire.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = F8111E3219A95C8B0040E7D1;
remoteInfo = "Alamofire iOS";
};
1564316C21A15B4500816382 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1522EC752193EBA10082C3FA /* AlamofireNetworkActivityIndicator.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 4CB928381C66E1A600CE5F08;
remoteInfo = AlamofireNetworkActivityIndicator;
};
1564317021A15B5400816382 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 15637094219FE22E00D51D42 /* Kingfisher.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = D1ED2D341AD2D09F00CFC3EB;
remoteInfo = "Kingfisher-iOS";
};
1564317421A15CF300816382 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1517EA6F2159D72200DE80D6 /* AlamofireImage.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 4C9043761AABBFC5001B4E60;
remoteInfo = "AlamofireImage iOS";
};
157405C2215890BC00EEAAEB /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 157405B7215890BC00EEAAEB /* Alamofire.xcodeproj */;
@ -264,26 +271,19 @@
remoteGlobalIDString = E4202FE01B667AA100C997FB;
remoteInfo = "Alamofire watchOS";
};
EAD1445E219A6CAF002C5338 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 1522EC752193EBA10082C3FA /* AlamofireNetworkActivityIndicator.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 4CB928381C66E1A600CE5F08;
remoteInfo = AlamofireNetworkActivityIndicator;
};
/* End PBXContainerItemProxy section */
/* Begin PBXCopyFilesBuildPhase section */
151AD4DC216899AD00F07403 /* Embed Frameworks */ = {
1564316921A15B2E00816382 /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
156370BE219FE24200D51D42 /* Kingfisher.framework in Embed Frameworks */,
151AD4D9216899AD00F07403 /* AlamofireImage.framework in Embed Frameworks */,
151AD4E621689A0F00F07403 /* Alamofire.framework in Embed Frameworks */,
EAD1445D219A6CAF002C5338 /* AlamofireNetworkActivityIndicator.framework in Embed Frameworks */,
1564316621A15B2E00816382 /* Alamofire.framework in Embed Frameworks */,
1564316F21A15B5400816382 /* Kingfisher.framework in Embed Frameworks */,
1564316B21A15B4500816382 /* AlamofireNetworkActivityIndicator.framework in Embed Frameworks */,
1564317321A15CF300816382 /* AlamofireImage.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
@ -361,10 +361,10 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
157405D1215890D700EEAAEB /* Alamofire.framework in Frameworks */,
15A79B2E215C63B6007A326E /* AlamofireImage.framework in Frameworks */,
EAD1445C219A6CAF002C5338 /* AlamofireNetworkActivityIndicator.framework in Frameworks */,
156370BD219FE24200D51D42 /* Kingfisher.framework in Frameworks */,
1564316521A15B2E00816382 /* Alamofire.framework in Frameworks */,
1564317221A15CF300816382 /* AlamofireImage.framework in Frameworks */,
1564316A21A15B4500816382 /* AlamofireNetworkActivityIndicator.framework in Frameworks */,
1564316E21A15B5400816382 /* Kingfisher.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -598,15 +598,15 @@
15960E53213145E100C38CE9 /* Sources */,
15960E54213145E100C38CE9 /* Frameworks */,
15960E55213145E100C38CE9 /* Resources */,
151AD4DC216899AD00F07403 /* Embed Frameworks */,
1564316921A15B2E00816382 /* Embed Frameworks */,
);
buildRules = (
);
dependencies = (
151AD4DB216899AD00F07403 /* PBXTargetDependency */,
151AD4E821689A0F00F07403 /* PBXTargetDependency */,
EAD1445F219A6CAF002C5338 /* PBXTargetDependency */,
156370C0219FE24200D51D42 /* PBXTargetDependency */,
1564316821A15B2E00816382 /* PBXTargetDependency */,
1564316D21A15B4500816382 /* PBXTargetDependency */,
1564317121A15B5400816382 /* PBXTargetDependency */,
1564317521A15CF300816382 /* PBXTargetDependency */,
);
name = "elpha-ios";
productName = "elpha-ios";
@ -914,25 +914,25 @@
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
151AD4DB216899AD00F07403 /* PBXTargetDependency */ = {
1564316821A15B2E00816382 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "AlamofireImage iOS";
targetProxy = 151AD4DA216899AD00F07403 /* PBXContainerItemProxy */;
name = "Alamofire iOS";
targetProxy = 1564316721A15B2E00816382 /* PBXContainerItemProxy */;
};
151AD4E821689A0F00F07403 /* PBXTargetDependency */ = {
1564316D21A15B4500816382 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "Alamofire iOS";
targetProxy = 151AD4E721689A0F00F07403 /* PBXContainerItemProxy */;
name = AlamofireNetworkActivityIndicator;
targetProxy = 1564316C21A15B4500816382 /* PBXContainerItemProxy */;
};
156370C0219FE24200D51D42 /* PBXTargetDependency */ = {
1564317121A15B5400816382 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "Kingfisher-iOS";
targetProxy = 156370BF219FE24200D51D42 /* PBXContainerItemProxy */;
targetProxy = 1564317021A15B5400816382 /* PBXContainerItemProxy */;
};
EAD1445F219A6CAF002C5338 /* PBXTargetDependency */ = {
1564317521A15CF300816382 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = AlamofireNetworkActivityIndicator;
targetProxy = EAD1445E219A6CAF002C5338 /* PBXContainerItemProxy */;
name = "AlamofireImage iOS";
targetProxy = 1564317421A15CF300816382 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
@ -1097,9 +1097,9 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = "";
DEVELOPMENT_TEAM = 4HV9QP2X8X;
INFOPLIST_FILE = "elpha-ios/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 12.1;
LD_RUNPATH_SEARCH_PATHS = (
@ -1108,7 +1108,7 @@
);
PRODUCT_BUNDLE_IDENTIFIER = "xyz.elpha.elpha-ios";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
PROVISIONING_PROFILE_SPECIFIER = "Elpha Distribution";
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = 1;
};

1
elpha-ios/AccountTableViewController.swift
View File

@ -6,7 +6,6 @@
// Copyright © 2018 Elpha. All rights reserved.
//
import AlamofireImage
import CoreData
import Kingfisher
import UIKit

1
elpha-ios/AttachmentManager.swift
View File

@ -6,7 +6,6 @@
// Copyright © 2018 Elpha. All rights reserved.
//
import AlamofireImage
import Kingfisher
import UIKit

1
elpha-ios/AttachmentPageViewController.swift
View File

@ -6,7 +6,6 @@
// Copyright © 2018 Elpha. All rights reserved.
//
import AlamofireImage
import UIKit
class AttachmentPageViewController: UIPageViewController {

3
elpha-ios/InstanceViewController.swift
View File

@ -7,6 +7,7 @@
//
import AlamofireImage
import Kingfisher
import UIKit
import SafariServices
@ -75,7 +76,7 @@ class InstanceViewController: UIViewController {
uptimeLabel.text = String(instance.uptime)
if let thumbnail = instance.thumbnail {
thumbnailImageView.af_setImage(withURL: thumbnail)
thumbnailImageView.kf.setImage(with: thumbnail)
}
}
}

1
elpha-ios/InstancesTableViewCell.swift
View File

@ -6,7 +6,6 @@
// Copyright © 2018 Elpha. All rights reserved.
//
import AlamofireImage
import UIKit
class InstancesTableViewCell: UITableViewCell {

3
elpha-ios/InstancesTableViewController.swift
View File

@ -8,6 +8,7 @@
import Alamofire
import CoreData
import Kingfisher
import UIKit
class InstancesTableViewController: UITableViewController {
@ -117,7 +118,7 @@ class InstancesTableViewController: UITableViewController {
cell.usersLabel.text = NumberFormatter.localizedString(from: NSNumber(value: instance.users), number: .decimal)
if let thumbnail = instance.thumbnail {
cell.thumbnailImageView.af_setImage(withURL: thumbnail)
cell.thumbnailImageView.kf.setImage(with: thumbnail)
}
if indexPath.row > 0 && indexPath.row % fetchLimit == 0 && !loading {

1
elpha-ios/SettingsTableViewController.swift
View File

@ -6,7 +6,6 @@
// Copyright © 2018 Elpha. All rights reserved.
//
import AlamofireImage
import Kingfisher
import UIKit

1
elpha-ios/StatusTableViewController.swift
View File

@ -6,7 +6,6 @@
// Copyright © 2018 Elpha. All rights reserved.
//
import AlamofireImage
import CoreData
import Kingfisher
import UIKit

1
elpha-ios/StatusView.swift
View File

@ -6,7 +6,6 @@
// Copyright © 2018 Elpha. All rights reserved.
//
import AlamofireImage
import Kingfisher
import UIKit

1
elpha-ios/TimelineTableViewController.swift
View File

@ -7,7 +7,6 @@
//
import Alamofire
import AlamofireImage
import CoreData
import UIKit
import SafariServices

Write Preview
Loading…
Cancel
Save