Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Podfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://github.com/CocoaPods/Specs.git'

platform :ios, '8.2'
platform :ios, '9.0'

inhibit_all_warnings!
use_frameworks!
Expand All @@ -14,6 +14,7 @@ abstract_target 'BasePods' do
pod 'Texture', '2.5.1'
pod 'TUSafariActivity', '1.0.4'
pod 'YapDatabase', '3.0.2'
pod 'MobileVLCKit', '~>3.3.0'
Copy link
Owner

Choose a reason for hiding this comment

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

Let's set the exact version here (without ~>) for stability, for now.


# targets
target 'dvach-browser'
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# 2ch-Browser-iOS

Source code of the 2ch Browser iOS application for iOS 8.2+.
Source code of the 2ch Browser iOS application for iOS 9.0+.

[2ch API](API-DOC/README.md)

Expand Down
45 changes: 43 additions & 2 deletions dvach-browser.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,11 @@
A1FC04441E5A0FF3008C3577 /* DVBPostPreparation.m in Sources */ = {isa = PBXBuildFile; fileRef = A1FC04431E5A0FF3008C3577 /* DVBPostPreparation.m */; };
A1FC044D1E5A1064008C3577 /* DVBBrowserViewControllerBuilder.m in Sources */ = {isa = PBXBuildFile; fileRef = A1FC044C1E5A1064008C3577 /* DVBBrowserViewControllerBuilder.m */; };
A1FC04501E5A10C2008C3577 /* DVBThreadUIGenerator.m in Sources */ = {isa = PBXBuildFile; fileRef = A1FC044F1E5A10C2008C3577 /* DVBThreadUIGenerator.m */; };
DA7E3C7423E8611400CED991 /* VLCPlayerViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = DA7E3C7323E8611400CED991 /* VLCPlayerViewController.storyboard */; };
DAB7210B23E821DE00B13218 /* VLCPlayerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAB7210A23E821DE00B13218 /* VLCPlayerViewController.swift */; };
DAB7210D23E8223900B13218 /* VLCPlayerInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAB7210C23E8223900B13218 /* VLCPlayerInteractor.swift */; };
DAB7210F23E8224300B13218 /* VLCPlayerScreenBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAB7210E23E8224300B13218 /* VLCPlayerScreenBuilder.swift */; };
DAB7211123E8224C00B13218 /* VLCPlayerViewIO.swift in Sources */ = {isa = PBXBuildFile; fileRef = DAB7211023E8224C00B13218 /* VLCPlayerViewIO.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -264,6 +269,12 @@
A1FC044E1E5A10C2008C3577 /* DVBThreadUIGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DVBThreadUIGenerator.h; path = Modules/ThreadScreen/DVBThreadUIGenerator.h; sourceTree = "<group>"; };
A1FC044F1E5A10C2008C3577 /* DVBThreadUIGenerator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DVBThreadUIGenerator.m; path = Modules/ThreadScreen/DVBThreadUIGenerator.m; sourceTree = "<group>"; };
DA6D360509028339F31549C7 /* Pods_BasePods_dvach_browser.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_BasePods_dvach_browser.framework; sourceTree = BUILT_PRODUCTS_DIR; };
DA7E3C7323E8611400CED991 /* VLCPlayerViewController.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = VLCPlayerViewController.storyboard; sourceTree = "<group>"; };
DAB7210523E8212E00B13218 /* dvach-browser-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "dvach-browser-Bridging-Header.h"; sourceTree = "<group>"; };
DAB7210A23E821DE00B13218 /* VLCPlayerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VLCPlayerViewController.swift; sourceTree = "<group>"; };
DAB7210C23E8223900B13218 /* VLCPlayerInteractor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VLCPlayerInteractor.swift; sourceTree = "<group>"; };
DAB7210E23E8224300B13218 /* VLCPlayerScreenBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VLCPlayerScreenBuilder.swift; sourceTree = "<group>"; };
DAB7211023E8224C00B13218 /* VLCPlayerViewIO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VLCPlayerViewIO.swift; sourceTree = "<group>"; };
DB2041C9957E17E7EBCCE65F /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
E1D12AA839B911E09F2CB2B6 /* Pods-BasePods-dvach-browserTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BasePods-dvach-browserTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-BasePods-dvach-browserTests/Pods-BasePods-dvach-browserTests.debug.xcconfig"; sourceTree = "<group>"; };
E2FB6DBFA4B0E60C9DC1E905 /* Pods-BasePods-dvach-browser.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-BasePods-dvach-browser.release.xcconfig"; path = "Pods/Target Support Files/Pods-BasePods-dvach-browser/Pods-BasePods-dvach-browser.release.xcconfig"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -538,6 +549,7 @@
A1155D1C1A26486400810321 /* Views */ = {
isa = PBXGroup;
children = (
DAB7210423E820D900B13218 /* VLCplayerController */,
A151D3591EBE5B1C0096E8B6 /* ViewGenerators */,
94A17DC71B335CD90009A002 /* Transitions */,
949B76281AF766EF00DDA65F /* Activities */,
Expand Down Expand Up @@ -711,6 +723,19 @@
name = CreateScreen;
sourceTree = "<group>";
};
DAB7210423E820D900B13218 /* VLCplayerController */ = {
isa = PBXGroup;
children = (
DAB7210523E8212E00B13218 /* dvach-browser-Bridging-Header.h */,
DAB7210A23E821DE00B13218 /* VLCPlayerViewController.swift */,
DAB7210C23E8223900B13218 /* VLCPlayerInteractor.swift */,
DAB7210E23E8224300B13218 /* VLCPlayerScreenBuilder.swift */,
DAB7211023E8224C00B13218 /* VLCPlayerViewIO.swift */,
DA7E3C7323E8611400CED991 /* VLCPlayerViewController.storyboard */,
);
name = VLCplayerController;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -766,6 +791,7 @@
84CFC50919E1526E004D0BB8 = {
CreatedOnToolsVersion = 6.0.1;
DevelopmentTeam = Q9324QX3V7;
LastSwiftMigration = 1130;
};
84CFC52219E1526E004D0BB8 = {
CreatedOnToolsVersion = 6.0.1;
Expand Down Expand Up @@ -812,6 +838,7 @@
A154DDA11EBE49640094ADF2 /* Settings.bundle in Resources */,
94A5E4651AF77E4500824347 /* ARChromeActivity.png in Resources */,
A154DD9D1EBE49640094ADF2 /* BadBoards.plist in Resources */,
DA7E3C7423E8611400CED991 /* VLCPlayerViewController.storyboard in Resources */,
94A5E4781AF7811D00824347 /* ARChromeActivity-7.png in Resources */,
9437FD251B90DFDF004FFB22 /* Localizable.strings in Resources */,
94A5E4671AF77E4500824347 /* ARChromeActivity@3x.png in Resources */,
Expand Down Expand Up @@ -967,21 +994,25 @@
94CF0CFC1DE08DB000AA3AC8 /* DVBCaptchaHelper.m in Sources */,
A1BDC0C01E6B649600ACBB36 /* DVBCreatePostViewController.m in Sources */,
A1BDC0D41E6B656600ACBB36 /* DVBMarkupButton.m in Sources */,
DAB7210D23E8223900B13218 /* VLCPlayerInteractor.swift in Sources */,
A1FC044D1E5A1064008C3577 /* DVBBrowserViewControllerBuilder.m in Sources */,
A1BDC0AB1E6B571700ACBB36 /* DVBThreadNode.m in Sources */,
9415B1421AF2BC7700C7EB7B /* UIImage+DVBImageExtention.m in Sources */,
9497D99D1D9EF368002B013A /* DVBUrls.m in Sources */,
A155FF181AB7362A00BE31F4 /* DVBThread.m in Sources */,
9432BEF61AC821B40015CA9F /* dvach-browser.xcdatamodeld in Sources */,
DAB7210B23E821DE00B13218 /* VLCPlayerViewController.swift in Sources */,
940BD54E1E0554D200D6BAF8 /* DVBPostViewModel.m in Sources */,
8497BF341AD3F98F001616C2 /* GTMNSString+HTML.m in Sources */,
A155FF051AB735DD00BE31F4 /* DVBBoardsModel.m in Sources */,
A1FC04411E5A0FA7008C3577 /* DVBThreadModel.m in Sources */,
94F454F81BF3E368001B8091 /* UIImage+DVBOpaqueImage.m in Sources */,
A1BDC0B31E6B639E00ACBB36 /* DVBMediaButtonNode.m in Sources */,
DAB7211123E8224C00B13218 /* VLCPlayerViewIO.swift in Sources */,
A151D35E1EBE5B1C0096E8B6 /* DVBAlertGenerator.m in Sources */,
A155FF071AB735DD00BE31F4 /* DVBConstants.m in Sources */,
A151D35F1EBE5B1C0096E8B6 /* DVBPostViewGenerator.m in Sources */,
DAB7210F23E8224300B13218 /* VLCPlayerScreenBuilder.swift in Sources */,
A1BDC0CD1E6B650400ACBB36 /* DVBCreatePostScrollView.m in Sources */,
94A17DCA1B335CE50009A002 /* DVBGalleryTransition.m in Sources */,
A1BDC0B41E6B639E00ACBB36 /* DVBPostNode.m in Sources */,
Expand Down Expand Up @@ -1175,17 +1206,21 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = Q9324QX3V7;
Copy link
Owner

Choose a reason for hiding this comment

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

Auto-change, let's remove it.

ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GCC_PRECOMPILE_PREFIX_HEADER = "$(inherited)";
GCC_PREFIX_HEADER = "";
INFOPLIST_FILE = "$(SRCROOT)/dvach-browser/Support/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.2;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = "com.8of.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
SWIFT_OBJC_BRIDGING_HEADER = "dvach-browser/dvach-browser-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 5.0;
};
name = Debug;
};
Expand All @@ -1197,23 +1232,28 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = Q9324QX3V7;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GCC_PRECOMPILE_PREFIX_HEADER = "$(inherited)";
GCC_PREFIX_HEADER = "";
INFOPLIST_FILE = "$(SRCROOT)/dvach-browser/Support/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.2;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = "com.8of.$(PRODUCT_NAME:rfc1034identifier)";
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
SWIFT_OBJC_BRIDGING_HEADER = "dvach-browser/dvach-browser-Bridging-Header.h";
SWIFT_VERSION = 5.0;
};
name = Release;
};
84CFC53119E1526E004D0BB8 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = E1D12AA839B911E09F2CB2B6 /* Pods-BasePods-dvach-browserTests.debug.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUNDLE_LOADER = "$(TEST_HOST)";
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
Expand All @@ -1235,6 +1275,7 @@
isa = XCBuildConfiguration;
baseConfigurationReference = F1530ABC30D521863753555A /* Pods-BasePods-dvach-browserTests.release.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUNDLE_LOADER = "$(TEST_HOST)";
FRAMEWORK_SEARCH_PATHS = (
"$(SDKROOT)/Developer/Library/Frameworks",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,11 @@
"idiom" : "ipad",
"filename" : "AppIcon-167.png",
"scale" : "2x"
},
{
"idiom" : "ios-marketing",
"size" : "1024x1024",
"scale" : "1x"
}
],
"info" : {
Expand Down
6 changes: 6 additions & 0 deletions dvach-browser/Images.xcassets/PlayerIcons/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "icons8-mute-100.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "icons8-pause-90.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "icons8-play-90.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "icons8-skip-15-seconds-back-90.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "icons8-skip-ahead-15-seconds-96.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "icons8-sound-100.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions dvach-browser/Models/DVBRouter.m
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@

#import "DVBConstants.h"
#import "DVBRouter.h"
#import "DVBAlertGenerator.h"

#import "DVBThread.h"
#import "DVBPostViewModel.h"
#import "DVBDefaultsManager.h"
#import "DVBAsyncBoardViewController.h"
#import "DVBAsyncThreadViewController.h"
#import "DVBCreatePostViewController.h"
#import "dvach_browser-Swift.h"

@implementation DVBRouter

Expand Down Expand Up @@ -77,9 +77,9 @@ + (void)showComposeFrom:(UIViewController *)vc boardCode:(NSString *)boardCode t

+ (void)openWebmFrom:(UIViewController *)vc url:(NSURL *)url
{
[vc presentViewController:[DVBAlertGenerator webmDeprecatedAlert]
animated:YES
completion:nil];
UIViewController * vlcVC = [VLCPlayerScreenBuilder buildWith:url];

[vc presentViewController:vlcVC animated:true completion:nil];
}

+ (void)openAVPlayerFrom:(UIViewController *)vc url:(NSURL *)url
Expand Down
28 changes: 28 additions & 0 deletions dvach-browser/VLCPlayerInteractor.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
//
// VLCPlayerInteractor.swift
// dvach-browser
//
// Created by Victor Cebanu on 2/3/20.
// Copyright © 2020 8of. All rights reserved.
//

import Foundation

final class VLCPlayerInteractor {
var videoURL: URL

private weak var view: VLCPlayerViewInput?

init(view: VLCPlayerViewInput?,
videoURL: URL) {
self.view = view
self.videoURL = videoURL

}
}

extension VLCPlayerInteractor: VLCPlayerViewOutput {
func viewDidLoad() {
view?.playVideo(from: videoURL)
}
}
Loading