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

Design changes

master
Dwayne Harris 6 years ago
parent
abb18921f7
commit
abb7eb6721
3 changed files with 23 additions and 20 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. 3
      elpha-ios/StatusView.swift
  2. 36
      elpha-ios/StatusView.xib
  3. 4
      elpha-ios/TimelineTableViewController.swift

3
elpha-ios/StatusView.swift
View File

@ -12,6 +12,9 @@ import UIKit
protocol StatusViewDelegate {
func accountTapped(account: AccountMO)
func statusTapped(status: StatusMO)
//func favoriteTapped(status: StatusMO)
//func reblogTapped(status: StatusMO)
//func loadMoreTapped(pagination: PaginationItem)
}
class StatusView: UIView {

36
elpha-ios/StatusView.xib
View File

@ -44,11 +44,11 @@
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="iN0-l3-epB">
<rect key="frame" x="0.0" y="0.0" width="375" height="844"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="885"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="7Og-IU-seR">
<rect key="frame" x="0.0" y="20" width="375" height="824"/>
<rect key="frame" x="0.0" y="20" width="375" height="865"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bg1-Q4-Ru5">
<rect key="frame" x="0.0" y="0.0" width="375" height="5"/>
@ -58,17 +58,17 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fjq-Ff-PVL">
<rect key="frame" x="0.0" y="5" width="375" height="40"/>
<rect key="frame" x="0.0" y="5" width="375" height="50"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Up" translatesAutoresizingMaskIntoConstraints="NO" id="701-8A-mp6">
<rect key="frame" x="340" y="10" width="20" height="20"/>
<rect key="frame" x="340" y="15" width="20" height="20"/>
<constraints>
<constraint firstAttribute="width" constant="20" id="BCi-a6-e9O"/>
<constraint firstAttribute="height" constant="20" id="cD5-It-mON"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Load More" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IRZ-QQ-s88">
<rect key="frame" x="261.5" y="11.5" width="68.5" height="17"/>
<rect key="frame" x="261.5" y="16.5" width="68.5" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" name="Text"/>
<nil key="highlightedColor"/>
@ -80,11 +80,11 @@
<constraint firstItem="701-8A-mp6" firstAttribute="leading" secondItem="IRZ-QQ-s88" secondAttribute="trailing" constant="10" id="GLS-PV-V9a"/>
<constraint firstAttribute="trailing" secondItem="701-8A-mp6" secondAttribute="trailing" constant="15" id="h6u-tF-dBt"/>
<constraint firstItem="IRZ-QQ-s88" firstAttribute="centerY" secondItem="fjq-Ff-PVL" secondAttribute="centerY" id="uiy-Kk-Nb7"/>
<constraint firstAttribute="height" priority="999" constant="40" id="zaz-CL-dbD"/>
<constraint firstAttribute="height" priority="999" constant="50" id="zaz-CL-dbD"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Gnt-jG-tVj">
<rect key="frame" x="0.0" y="45" width="375" height="100"/>
<rect key="frame" x="0.0" y="55" width="375" height="100"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="ecc-6t-6K0">
<rect key="frame" x="8" y="20" width="40" height="40"/>
@ -152,7 +152,7 @@
</connections>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="v8x-tf-zFb">
<rect key="frame" x="0.0" y="145" width="375" height="100"/>
<rect key="frame" x="0.0" y="155" width="375" height="100"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="wte-HK-KxR">
<rect key="frame" x="8" y="20" width="40" height="40"/>
@ -220,10 +220,10 @@
</connections>
</view>
<view contentMode="scaleToFill" verticalHuggingPriority="249" translatesAutoresizingMaskIntoConstraints="NO" id="cAR-YB-u2k">
<rect key="frame" x="0.0" y="245" width="375" height="109"/>
<rect key="frame" x="0.0" y="255" width="375" height="130"/>
<subviews>
<label opaque="NO" contentMode="left" verticalHuggingPriority="249" text="Content" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WPF-Oe-N2r">
<rect key="frame" x="8" y="86" width="359" height="15"/>
<rect key="frame" x="8" y="86" width="359" height="36"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" name="Text"/>
<nil key="highlightedColor"/>
@ -285,14 +285,14 @@
</connections>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XuS-iF-YYL">
<rect key="frame" x="0.0" y="354" width="375" height="375"/>
<rect key="frame" x="0.0" y="385" width="375" height="375"/>
<color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="width" secondItem="XuS-iF-YYL" secondAttribute="height" multiplier="1:1" priority="999" id="8CQ-GM-Un6"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="y5N-A7-27p">
<rect key="frame" x="0.0" y="729" width="375" height="50"/>
<rect key="frame" x="0.0" y="760" width="375" height="50"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pJk-g2-yyR">
<rect key="frame" x="8" y="10" width="155" height="30"/>
@ -439,17 +439,17 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0aT-X9-NYg">
<rect key="frame" x="0.0" y="779" width="375" height="40"/>
<rect key="frame" x="0.0" y="810" width="375" height="50"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Down" translatesAutoresizingMaskIntoConstraints="NO" id="zEk-jb-LHL">
<rect key="frame" x="15" y="10" width="20" height="20"/>
<rect key="frame" x="15" y="15" width="20" height="20"/>
<constraints>
<constraint firstAttribute="width" constant="20" id="6Un-al-jZp"/>
<constraint firstAttribute="height" constant="20" id="M2K-o2-1k4"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Load More" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="znl-Zz-bfs">
<rect key="frame" x="45" y="11.5" width="68.5" height="17"/>
<rect key="frame" x="45" y="16.5" width="68.5" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<color key="textColor" name="Text"/>
<nil key="highlightedColor"/>
@ -458,14 +458,14 @@
<color key="backgroundColor" name="Secondary"/>
<constraints>
<constraint firstItem="zEk-jb-LHL" firstAttribute="leading" secondItem="0aT-X9-NYg" secondAttribute="leading" constant="15" id="9Gu-BD-Bmd"/>
<constraint firstAttribute="height" priority="999" constant="40" id="QLd-0c-UI5"/>
<constraint firstAttribute="height" priority="999" constant="50" id="QLd-0c-UI5"/>
<constraint firstItem="zEk-jb-LHL" firstAttribute="centerY" secondItem="0aT-X9-NYg" secondAttribute="centerY" id="TBP-rL-Wuw"/>
<constraint firstItem="znl-Zz-bfs" firstAttribute="leading" secondItem="zEk-jb-LHL" secondAttribute="trailing" constant="10" id="a1v-10-RvI"/>
<constraint firstItem="znl-Zz-bfs" firstAttribute="centerY" secondItem="0aT-X9-NYg" secondAttribute="centerY" id="vyP-n3-i6x"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="m4t-ve-E78">
<rect key="frame" x="0.0" y="819" width="375" height="5"/>
<rect key="frame" x="0.0" y="860" width="375" height="5"/>
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.93725490199999995" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" priority="999" constant="5" id="QFa-Y9-r5a"/>
@ -489,7 +489,7 @@
<nil key="simulatedBottomBarMetrics"/>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
<point key="canvasLocation" x="53.600000000000001" y="127.736131934033"/>
<point key="canvasLocation" x="53.600000000000001" y="146.17691154422789"/>
</view>
<tapGestureRecognizer id="2h0-to-AXg">
<connections>

4
elpha-ios/TimelineTableViewController.swift
View File

@ -345,7 +345,7 @@ extension TimelineTableViewController {
if previousStatus.id! != marker.item.statusID && previousMarker != nil {
cell.statusView.topLoadMoreView.isHidden = false
cell.statusView.topDividerView.isHidden = true
//cell.statusView.topDividerView.isHidden = true
}
}
case .next:
@ -355,7 +355,7 @@ extension TimelineTableViewController {
if nextStatus.id! != marker.item.statusID && nextMarker != nil {
cell.statusView.bottomLoadMoreView.isHidden = false
cell.statusView.bottomDividerView.isHidden = true
//cell.statusView.bottomDividerView.isHidden = true
}
}
}

Write Preview
Loading…
Cancel
Save