summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Juick.xcodeproj/project.pbxproj10
-rw-r--r--Juick/ViewControllers/NewPostViewController.m3
-rw-r--r--Juick/Views/QuoteView.h13
-rw-r--r--Juick/Views/QuoteView.m17
-rw-r--r--Juick/Views/QuoteView.swift14
-rw-r--r--Juick/Views/QuoteView.xib27
6 files changed, 36 insertions, 48 deletions
diff --git a/Juick.xcodeproj/project.pbxproj b/Juick.xcodeproj/project.pbxproj
index 391edd6..3f5232d 100644
--- a/Juick.xcodeproj/project.pbxproj
+++ b/Juick.xcodeproj/project.pbxproj
@@ -44,6 +44,7 @@
776D4EE52A0FD4B500C8BD91 /* ConversationCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 776D4EE42A0FD4B500C8BD91 /* ConversationCell.swift */; };
776D4EE72A0FD96C00C8BD91 /* MessageInputView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 776D4EE62A0FD96C00C8BD91 /* MessageInputView.swift */; };
776D4EE92A0FDF5D00C8BD91 /* BubbleMessageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 776D4EE82A0FDF5D00C8BD91 /* BubbleMessageCell.swift */; };
+ 776D4EED2A0FE1F100C8BD91 /* QuoteView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 776D4EEC2A0FE1F100C8BD91 /* QuoteView.swift */; };
778560602343D24E00BB37A2 /* NSData+Hex.m in Sources */ = {isa = PBXBuildFile; fileRef = 7785605F2343D24E00BB37A2 /* NSData+Hex.m */; };
778560632344CF6F00BB37A2 /* JuickNavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 778560622344CF6F00BB37A2 /* JuickNavigationController.m */; };
77975A1D182B6E9A00410C2B /* NewPostViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 77975A1C182B6E9A00410C2B /* NewPostViewController.m */; };
@@ -62,7 +63,6 @@
77C6ADE41F7717BC000AEA8C /* ThreadViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 77C6ADE31F7717BC000AEA8C /* ThreadViewController.m */; };
77E35A82189A5B5A00B2D216 /* LoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 77E35A81189A5B5A00B2D216 /* LoginViewController.m */; };
77E61A5B1FD467FC00B4E304 /* QuoteView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 77E61A5A1FD467FC00B4E304 /* QuoteView.xib */; };
- 77E61A5E1FD4682B00B4E304 /* QuoteView.m in Sources */ = {isa = PBXBuildFile; fileRef = 77E61A5D1FD4682B00B4E304 /* QuoteView.m */; };
77F2B6A2251249F300E42F6F /* JuickTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 77F2B6A1251249F300E42F6F /* JuickTests.swift */; };
77FCADDF1D6A50DA00CBA649 /* API.m in Sources */ = {isa = PBXBuildFile; fileRef = 77FCADDE1D6A50DA00CBA649 /* API.m */; };
/* End PBXBuildFile section */
@@ -160,6 +160,7 @@
776D4EE42A0FD4B500C8BD91 /* ConversationCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationCell.swift; sourceTree = "<group>"; };
776D4EE62A0FD96C00C8BD91 /* MessageInputView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageInputView.swift; sourceTree = "<group>"; };
776D4EE82A0FDF5D00C8BD91 /* BubbleMessageCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BubbleMessageCell.swift; sourceTree = "<group>"; };
+ 776D4EEC2A0FE1F100C8BD91 /* QuoteView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuoteView.swift; sourceTree = "<group>"; };
7785605E2343D24E00BB37A2 /* NSData+Hex.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSData+Hex.h"; sourceTree = "<group>"; };
7785605F2343D24E00BB37A2 /* NSData+Hex.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSData+Hex.m"; sourceTree = "<group>"; };
778560612344CF6F00BB37A2 /* JuickNavigationController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JuickNavigationController.h; sourceTree = "<group>"; };
@@ -192,8 +193,6 @@
77E35A80189A5B5A00B2D216 /* LoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginViewController.h; sourceTree = "<group>"; };
77E35A81189A5B5A00B2D216 /* LoginViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginViewController.m; sourceTree = "<group>"; };
77E61A5A1FD467FC00B4E304 /* QuoteView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = QuoteView.xib; sourceTree = "<group>"; };
- 77E61A5C1FD4682B00B4E304 /* QuoteView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = QuoteView.h; sourceTree = "<group>"; };
- 77E61A5D1FD4682B00B4E304 /* QuoteView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QuoteView.m; sourceTree = "<group>"; };
77F2B69F251249F300E42F6F /* JuickTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = JuickTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
77F2B6A1251249F300E42F6F /* JuickTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JuickTests.swift; sourceTree = "<group>"; };
77F2B6A3251249F300E42F6F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -417,8 +416,7 @@
776C41BA1FD3EF180063B82E /* MessageCell.h */,
776C41BB1FD3EF180063B82E /* MessageCell.m */,
776C41BC1FD3EF180063B82E /* MessageCell.xib */,
- 77E61A5C1FD4682B00B4E304 /* QuoteView.h */,
- 77E61A5D1FD4682B00B4E304 /* QuoteView.m */,
+ 776D4EEC2A0FE1F100C8BD91 /* QuoteView.swift */,
77E61A5A1FD467FC00B4E304 /* QuoteView.xib */,
776D4EE62A0FD96C00C8BD91 /* MessageInputView.swift */,
77B8B398207A52BD005CB20C /* MessageInputView.xib */,
@@ -591,7 +589,6 @@
77C36498224417FC0017522C /* DiscussionsController.m in Sources */,
770C86E325117D78009B6404 /* UIView+Shimmer.m in Sources */,
776D4EE32A0FD1A300C8BD91 /* ContentLoadingCell.swift in Sources */,
- 77E61A5E1FD4682B00B4E304 /* QuoteView.m in Sources */,
77317BBC181BBE8500D60005 /* AppDelegate.m in Sources */,
776C41C11FD3FF6E0063B82E /* FeedViewController.m in Sources */,
77FCADDF1D6A50DA00CBA649 /* API.m in Sources */,
@@ -608,6 +605,7 @@
77C6ADE41F7717BC000AEA8C /* ThreadViewController.m in Sources */,
77975A1D182B6E9A00410C2B /* NewPostViewController.m in Sources */,
774746AD239F82A10001C7F9 /* NSDate+TimeAgo.m in Sources */,
+ 776D4EED2A0FE1F100C8BD91 /* QuoteView.swift in Sources */,
776D4EE72A0FD96C00C8BD91 /* MessageInputView.swift in Sources */,
77C36495224417E90017522C /* DiscoverViewController.m in Sources */,
77E35A82189A5B5A00B2D216 /* LoginViewController.m in Sources */,
diff --git a/Juick/ViewControllers/NewPostViewController.m b/Juick/ViewControllers/NewPostViewController.m
index 18ae15b..4ab1c0b 100644
--- a/Juick/ViewControllers/NewPostViewController.m
+++ b/Juick/ViewControllers/NewPostViewController.m
@@ -8,9 +8,10 @@
#import "NewPostViewController.h"
#import "MessagesViewController.h"
-#import "QuoteView.h"
#import "User+UIView.h"
+#import "Juick-Swift.h"
+
NSString * const NewMessageNotificationName = @"NewMessage";
NSString * const ReplyPostedNotificationName = @"ReplyPosted";
diff --git a/Juick/Views/QuoteView.h b/Juick/Views/QuoteView.h
deleted file mode 100644
index affc7ee..0000000
--- a/Juick/Views/QuoteView.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// MessageInputView.h
-// Juick
-//
-// Created by Vitaly Takmazov on 03/12/2017.
-// Copyright © 2017 com.juick. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface QuoteView : UIVisualEffectView
-@property (weak, nonatomic) IBOutlet UILabel *quoteText;
-@end
diff --git a/Juick/Views/QuoteView.m b/Juick/Views/QuoteView.m
deleted file mode 100644
index 5dd3d62..0000000
--- a/Juick/Views/QuoteView.m
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-// MessageInputView.m
-// Juick
-//
-// Created by Vitaly Takmazov on 03/12/2017.
-// Copyright © 2017 com.juick. All rights reserved.
-//
-
-#import "QuoteView.h"
-@implementation QuoteView
-
--(void) awakeFromNib {
- [super awakeFromNib];
- self.contentView.backgroundColor = [UIColor colorNamed:@"Background"];
-}
-
-@end
diff --git a/Juick/Views/QuoteView.swift b/Juick/Views/QuoteView.swift
new file mode 100644
index 0000000..3720e59
--- /dev/null
+++ b/Juick/Views/QuoteView.swift
@@ -0,0 +1,14 @@
+//
+// QuoteView.swift
+// Juick
+//
+// Created by Vitaly Takmazov on 13.05.2023.
+// Copyright © 2023 com.juick. All rights reserved.
+//
+
+import UIKit
+
+@objc
+class QuoteView: UIVisualEffectView {
+ @IBOutlet weak var quoteText: UILabel!
+}
diff --git a/Juick/Views/QuoteView.xib b/Juick/Views/QuoteView.xib
index 96a03fe..a8ebbdf 100644
--- a/Juick/Views/QuoteView.xib
+++ b/Juick/Views/QuoteView.xib
@@ -1,44 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
- <device id="retina4_7" orientation="portrait">
- <adaptation id="fullscreen"/>
- </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+ <device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
+ <capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
- <visualEffectView opaque="NO" contentMode="scaleToFill" id="8gV-Bq-kOk" customClass="QuoteView">
- <rect key="frame" x="0.0" y="0.0" width="368" height="31"/>
+ <visualEffectView opaque="NO" contentMode="scaleToFill" id="8gV-Bq-kOk" customClass="QuoteView" customModule="Juick" customModuleProvider="target">
+ <rect key="frame" x="0.0" y="0.0" width="382" height="96"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="imu-GT-9JL">
- <rect key="frame" x="0.0" y="0.0" width="368" height="31"/>
+ <rect key="frame" x="0.0" y="0.0" width="382" height="96"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="252" verticalCompressionResistancePriority="248" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Swn-59-jWb">
- <rect key="frame" x="6" y="6" width="356" height="19"/>
+ <rect key="frame" x="6" y="26" width="370" height="64"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
+ <viewLayoutGuide key="safeArea" id="ZiU-Ll-9jB"/>
+ <color key="backgroundColor" name="Background"/>
<constraints>
<constraint firstItem="Swn-59-jWb" firstAttribute="leading" secondItem="ZiU-Ll-9jB" secondAttribute="leading" constant="6" id="nTb-2n-vCy"/>
<constraint firstItem="ZiU-Ll-9jB" firstAttribute="bottom" secondItem="Swn-59-jWb" secondAttribute="bottom" priority="750" constant="6" id="snn-zN-hrV"/>
<constraint firstItem="ZiU-Ll-9jB" firstAttribute="trailing" secondItem="Swn-59-jWb" secondAttribute="trailing" constant="6" id="tyN-OL-Y06"/>
<constraint firstItem="Swn-59-jWb" firstAttribute="top" secondItem="ZiU-Ll-9jB" secondAttribute="top" priority="750" constant="6" id="vVV-Yt-s8Q"/>
</constraints>
- <viewLayoutGuide key="safeArea" id="ZiU-Ll-9jB"/>
</view>
<blurEffect style="light"/>
<connections>
<outlet property="quoteText" destination="Swn-59-jWb" id="tky-lv-tWn"/>
</connections>
- <point key="canvasLocation" x="-433" y="85.5"/>
+ <point key="canvasLocation" x="-681.60000000000002" y="106.14692653673164"/>
</visualEffectView>
</objects>
+ <resources>
+ <namedColor name="Background">
+ <color red="0.99215686274509807" green="0.99215686274509807" blue="0.99607843137254903" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ </namedColor>
+ </resources>
</document>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 02:07:36 +0000