Skip to content

Commit

Permalink
Merge branch 'master' into use/system-websocket-api
Browse files Browse the repository at this point in the history
  • Loading branch information
@rinsuki
rinsuki committed Dec 1, 2019
2 parents 8387074 + 9cc32bb commit bbaa64e
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 129 deletions.
54 changes: 0 additions & 54 deletions Sources/iOS/App/OtherMenu/OtherMenuHelpAndFeedbackView.swift
View file

This file was deleted.

3 changes: 1 addition & 2 deletions Sources/iOS/App/OtherMenu/OtherMenuViewController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import UIKit
import Eureka
import EurekaFormBuilder
import SafariServices
import SwiftUI
import Mew
import iMastiOSCore

Expand Down Expand Up @@ -99,7 +98,7 @@ class OtherMenuViewController: FormViewController, Instantiatable {

private lazy var helpAndFeedbackRow = ButtonRow { row in
row.title = R.string.localizable.helpAndFeedback()
row.presentationMode = .show(controllerProvider: .callback(builder: { UIHostingController(rootView: OtherMenuHelpAndFeedbackView()) }), onDismiss: nil)
row.presentationMode = .show(controllerProvider: .callback(builder: { HelpAndFeedbackTableViewController() }), onDismiss: nil)
}

required init(with input: Input, environment: Environment) {
Expand Down
65 changes: 0 additions & 65 deletions Sources/iOS/Core_NonLib/OpenSafariCellView.swift
View file

This file was deleted.

8 changes: 0 additions & 8 deletions iMast.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@
CE2D2B072110686A003B92B8 /* UNUserNotificationCenter.requestAuthorization+Hydra.Promise.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE2D2B062110686A003B92B8 /* UNUserNotificationCenter.requestAuthorization+Hydra.Promise.swift */; };
CE321EC622F411AE00BFC86F /* MastodonPostDetailPollViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE321EC522F411AE00BFC86F /* MastodonPostDetailPollViewController.swift */; };
CE367DFA2186F97F0068EBE7 /* Search.strings in Resources */ = {isa = PBXBuildFile; fileRef = CE367DFC2186F97F0068EBE7 /* Search.strings */; };
CE38C8DF1F853438004C4C9B /* OtherMenuHelpAndFeedbackView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE38C8DE1F853438004C4C9B /* OtherMenuHelpAndFeedbackView.swift */; };
CE3DB68620FB07FE005CFD77 /* PushService.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE3DB68520FB07FE005CFD77 /* PushService.swift */; };
CE3DFEE01FEE4C51005A480D /* UserDefaultsDict.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE3DFEDF1FEE4C51005A480D /* UserDefaultsDict.swift */; };
CE3DFEE11FEE5ACD005A480D /* UserDefaultsDict.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE3DFEDF1FEE4C51005A480D /* UserDefaultsDict.swift */; };
Expand Down Expand Up @@ -125,7 +124,6 @@
CE571B2F216E01B1003F1062 /* FeedbackViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE571B2E216E01B1003F1062 /* FeedbackViewController.swift */; };
CE58956022408BCA0024FDBF /* ColorSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE58955F22408BCA0024FDBF /* ColorSet.swift */; };
CE5895622240D2A50024FDBF /* AttachedMediaListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE5895612240D2A50024FDBF /* AttachedMediaListViewController.swift */; };
CE59166B22BA328900F0EFB3 /* OpenSafariCellView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE59166A22BA328900F0EFB3 /* OpenSafariCellView.swift */; };
CE5DE87B21F4FF9D0008D437 /* UIViewController+presentPromise.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE5DE87A21F4FF9D0008D437 /* UIViewController+presentPromise.swift */; };
CE5DE8B721F513B40008D437 /* AVAssetExportSession+exportPromise.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE5DE8B621F513B40008D437 /* AVAssetExportSession+exportPromise.swift */; };
CE5DE8B921F5CB6D0008D437 /* UIViewController+dismissPromise.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE5DE8B821F5CB6D0008D437 /* UIViewController+dismissPromise.swift */; };
Expand Down Expand Up @@ -573,7 +571,6 @@
CE321EC522F411AE00BFC86F /* MastodonPostDetailPollViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MastodonPostDetailPollViewController.swift; sourceTree = "<group>"; };
CE367DFB2186F97F0068EBE7 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Search.strings; sourceTree = "<group>"; };
CE367DFD2186F9800068EBE7 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Search.strings; sourceTree = "<group>"; };
CE38C8DE1F853438004C4C9B /* OtherMenuHelpAndFeedbackView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OtherMenuHelpAndFeedbackView.swift; sourceTree = "<group>"; };
CE3DB68520FB07FE005CFD77 /* PushService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PushService.swift; sourceTree = "<group>"; };
CE3DFEDF1FEE4C51005A480D /* UserDefaultsDict.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefaultsDict.swift; sourceTree = "<group>"; };
CE415F5521D6E41300DA9A33 /* AddAccountSuccessViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AddAccountSuccessViewController.xib; sourceTree = "<group>"; };
Expand Down Expand Up @@ -614,7 +611,6 @@
CE571B2E216E01B1003F1062 /* FeedbackViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedbackViewController.swift; sourceTree = "<group>"; };
CE58955F22408BCA0024FDBF /* ColorSet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorSet.swift; sourceTree = "<group>"; };
CE5895612240D2A50024FDBF /* AttachedMediaListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AttachedMediaListViewController.swift; sourceTree = "<group>"; };
CE59166A22BA328900F0EFB3 /* OpenSafariCellView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OpenSafariCellView.swift; sourceTree = "<group>"; };
CE5DE87A21F4FF9D0008D437 /* UIViewController+presentPromise.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+presentPromise.swift"; sourceTree = "<group>"; };
CE5DE8B621F513B40008D437 /* AVAssetExportSession+exportPromise.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AVAssetExportSession+exportPromise.swift"; sourceTree = "<group>"; };
CE5DE8B821F5CB6D0008D437 /* UIViewController+dismissPromise.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+dismissPromise.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1472,7 +1468,6 @@
CE1002D7200683B00041B636 /* ReportError_AppExtension.swift */,
CE3DFEDF1FEE4C51005A480D /* UserDefaultsDict.swift */,
CEE357211FF5E0B300675DFC /* EventListener.swift */,
CE59166A22BA328900F0EFB3 /* OpenSafariCellView.swift */,
CE102BD22313FB2A007CB778 /* ModalLoadingIndicatorViewController.swift */,
);
path = Core_NonLib;
Expand Down Expand Up @@ -1511,7 +1506,6 @@
CECD756620FD92C1000D059A /* OtherMenuPushSettingsTableViewController.swift */,
CE8209972150EC390064FC93 /* OtherMenuPushSettingsGroupNotifyTableViewController.swift */,
CE2D2AEF210C5CAF003B92B8 /* OtherMenuPushSettingsAccountTableViewController.swift */,
CE38C8DE1F853438004C4C9B /* OtherMenuHelpAndFeedbackView.swift */,
CE7ABB411FC5C1610087B387 /* ListsTableViewController.swift */,
CE571B2E216E01B1003F1062 /* FeedbackViewController.swift */,
CE3DB68520FB07FE005CFD77 /* PushService.swift */,
Expand Down Expand Up @@ -2622,7 +2616,6 @@
CE2D2AF4210C6D22003B92B8 /* FollowTableViewController.swift in Sources */,
CE10A1572229BDCB00E93D5A /* UIViewController+fakeSafeAreaLayoutGuide.swift in Sources */,
CE9A69A022CBEBED009F51C6 /* NSDiffableDataSourceSnapshot+prependItems.swift in Sources */,
CE38C8DF1F853438004C4C9B /* OtherMenuHelpAndFeedbackView.swift in Sources */,
CE6977891F0F086E00C1B234 /* UserTimeLineTableViewController.swift in Sources */,
CEC19B961F49540D00CEDCE2 /* PostAndUserViewController.swift in Sources */,
CE2C9804210A54F200A4FECF /* UIView+ignoreSmartInvert.swift in Sources */,
Expand Down Expand Up @@ -2674,7 +2667,6 @@
CE97DB6022D4B9D900D2BDC6 /* MastodonPostWrapperViewController.swift in Sources */,
CE71AF4E224221090054A008 /* NSAttributedString+emojify.swift in Sources */,
CE5099BB21BE60A700C09C16 /* CreateSiriShortcutsViewController.swift in Sources */,
CE59166B22BA328900F0EFB3 /* OpenSafariCellView.swift in Sources */,
CE7DBED021843141008727D4 /* SearchViewController.swift in Sources */,
CE070646233F9A41007F9F69 /* CustomLinkBehaviourTextView.swift in Sources */,
CE5895622240D2A50024FDBF /* AttachedMediaListViewController.swift in Sources */,
Expand Down

0 comments on commit bbaa64e

Please sign in to comment.