Skip to content

NMC/2237 - More #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TSI-amrutwaghmare wants to merge 4 commits into
base: master
Choose a base branch
from
Open

NMC/2237 - More #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fbd4099
NMC 2237 - More option tab customisation changes
TSI-amrutwaghmare Nov 1, 2023
5eece29
NMC 2237 - More option tab customisation and UI changes
harshada-15-tsys Apr 10, 2025
cdc9441
NMC 2237 - More option tab customisation changes
harshada-15-tsys Oct 1, 2025
4fb8517
NMC 2237 - More option tab customisation changes
harshada-15-tsys Dec 15, 2025
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
17 changes: 17 additions & 0 deletions Nextcloud.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,12 @@
AFCE353527E4ED5900FEA6C2 /* DateFormatter+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFCE353427E4ED5900FEA6C2 /* DateFormatter+Extension.swift */; };
AFCE353727E4ED7B00FEA6C2 /* NCShareCells.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFCE353627E4ED7B00FEA6C2 /* NCShareCells.swift */; };
AFCE353927E5DE0500FEA6C2 /* Shareable.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFCE353827E5DE0400FEA6C2 /* Shareable.swift */; };
AFCE353927E5DE0500FEA6C2 /* NCShare+Helper.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFCE353827E5DE0400FEA6C2 /* NCShare+Helper.swift */; };
B568C2B12DA7AA5F0072FCB4 /* MoreTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B568C2B02DA7AA5F0072FCB4 /* MoreTests.swift */; };
B568C2B32DA7AAAE0072FCB4 /* NCMoreUserCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = B568C2B22DA7AAAE0072FCB4 /* NCMoreUserCell.xib */; };
B568C2B52DA7AADD0072FCB4 /* NCMoreUserCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B568C2B42DA7AADD0072FCB4 /* NCMoreUserCell.swift */; };
C04E2F232A17BB4D001BAD85 /* FilesIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C04E2F222A17BB4D001BAD85 /* FilesIntegrationTests.swift */; };
D575039F27146F93008DC9DC /* String+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = F7A0D1342591FBC5008F8A13 /* String+Extension.swift */; };
D5B6AA7827200C7200D49C24 /* NCActivityTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5B6AA7727200C7200D49C24 /* NCActivityTableViewCell.swift */; };
F310B1EF2BA862F1001C42F5 /* NCViewerMedia+VisionKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = F310B1EE2BA862F1001C42F5 /* NCViewerMedia+VisionKit.swift */; };
F321DA8A2B71205A00DDA0E6 /* NCTrashSelectTabBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = F321DA892B71205A00DDA0E6 /* NCTrashSelectTabBar.swift */; };
Expand Down Expand Up @@ -1221,6 +1227,10 @@
AFCE353427E4ED5900FEA6C2 /* DateFormatter+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DateFormatter+Extension.swift"; sourceTree = "<group>"; };
AFCE353627E4ED7B00FEA6C2 /* NCShareCells.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCShareCells.swift; sourceTree = "<group>"; };
AFCE353827E5DE0400FEA6C2 /* Shareable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Shareable.swift; sourceTree = "<group>"; };
AFCE353827E5DE0400FEA6C2 /* NCShare+Helper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NCShare+Helper.swift"; sourceTree = "<group>"; };
B568C2B02DA7AA5F0072FCB4 /* MoreTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoreTests.swift; sourceTree = "<group>"; };
B568C2B22DA7AAAE0072FCB4 /* NCMoreUserCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NCMoreUserCell.xib; sourceTree = "<group>"; };
B568C2B42DA7AADD0072FCB4 /* NCMoreUserCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCMoreUserCell.swift; sourceTree = "<group>"; };
C0046CDA2A17B98400D87C9D /* NextcloudUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NextcloudUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
C04E2F202A17BB4D001BAD85 /* NextcloudIntegrationTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NextcloudIntegrationTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
D5B6AA7727200C7200D49C24 /* NCActivityTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NCActivityTableViewCell.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2024,6 +2034,8 @@
isa = PBXGroup;
children = (
AA52EB452D42AC5A0089C348 /* Placeholder.swift */,
B568C2B02DA7AA5F0072FCB4 /* MoreTests.swift */,
AF8ED1FB2757821000B8DBC4 /* NextcloudUnitTests.swift */,
);
path = NextcloudUnitTests;
sourceTree = "<group>";
Expand Down Expand Up @@ -2165,6 +2177,8 @@
F3BB46502A39EC2D00461F6E /* Cells */ = {
isa = PBXGroup;
children = (
B568C2B42DA7AADD0072FCB4 /* NCMoreUserCell.swift */,
B568C2B22DA7AAAE0072FCB4 /* NCMoreUserCell.xib */,
F3BB464C2A39ADCC00461F6E /* NCMoreAppSuggestionsCell.xib */,
F3BB46512A39EC4900461F6E /* NCMoreAppSuggestionsCell.swift */,
F3BB46532A3A1E9D00461F6E /* CCCellMore.swift */,
Expand Down Expand Up @@ -3949,6 +3963,8 @@
F7381EE5218218C9000B1560 /* NCOffline.storyboard in Resources */,
F768822D2C0DD1E7001CF441 /* Acknowledgements.rtf in Resources */,
F76D3CF32428B94E005DFA87 /* NCViewerPDFSearchCell.xib in Resources */,
B568C2B32DA7AAAE0072FCB4 /* NCMoreUserCell.xib in Resources */,
F7CA212E25F1333300826ABB /* NCAccountRequest.storyboard in Resources */,
F717402D24F699A5000C87D5 /* NCFavorite.storyboard in Resources */,
F723B3DD22FC6D1D00301EFE /* NCShareCommentsCell.xib in Resources */,
F78ACD4B21903F850088454D /* NCTrashListCell.xib in Resources */,
Expand Down Expand Up @@ -4569,6 +4585,7 @@
F7816EF22C2C3E1F00A52517 /* NCPushNotification.swift in Sources */,
F76882342C0DD1E7001CF441 /* NCDisplayView.swift in Sources */,
F7C30DF6291BC0CA0017149B /* NCNetworkingE2EEUpload.swift in Sources */,
B568C2B52DA7AADD0072FCB4 /* NCMoreUserCell.swift in Sources */,
F7501C332212E57500FB1415 /* NCMedia.swift in Sources */,
F7411C552D7B26D700F57358 /* NCNetworking+ServerError.swift in Sources */,
F72944F22A84246400246839 /* NCEndToEndMetadataV20.swift in Sources */,
Expand Down
37 changes: 37 additions & 0 deletions Tests/NextcloudUnitTests/MoreTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
//
// MoreTests.swift
// NextcloudTests
//
// Created by A200020526 on 09/06/23.
// Copyright © 2023 Marino Faggiana. All rights reserved.
//

@testable import Nextcloud
import XCTest

final class MoreTests: XCTestCase {

override func setUpWithError() throws {
// Put setup code here. This method is called before the invocation of each test method in the class.
}

override func tearDownWithError() throws {
// Put teardown code here. This method is called after the invocation of each test method in the class.
}

func testExample() throws {
// This is an example of a functional test case.
// Use XCTAssert and related functions to verify your tests produce the correct results.
// Any test you write for XCTest can be annotated as throws and async.
// Mark your test throws to produce an unexpected failure when your test encounters an uncaught error.
// Mark your test async to allow awaiting for asynchronous code to complete. Check the results with assertions afterwards.
}

func testPerformanceExample() throws {
// This is an example of a performance test case.
self.measure {
// Put the code you want to measure the time of here.
}
}

}
44 changes: 44 additions & 0 deletions iOSClient/More/Cells/NCMoreUserCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
//
// NCMoreUserCell.swift
// Nextcloud
//
// Created by Milen on 14.06.23.
// Copyright © 2023 Marino Faggiana. All rights reserved.
//
// Author Marino Faggiana <[email protected]>
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//

import Foundation
import MarqueeLabel

class NCMoreUserCell: BaseNCMoreCell {
@IBOutlet weak var displayName: UILabel!
@IBOutlet weak var avatar: UIImageView!
@IBOutlet weak var icon: UIImageView!
@IBOutlet weak var status: MarqueeLabel!

static let reuseIdentifier = "NCMoreUserCell"

static func fromNib() -> UINib {
return UINib(nibName: "NCMoreUserCell", bundle: nil)
}

override func awakeFromNib() {
super.awakeFromNib()

icon.makeCircularBackground(withColor: .systemBackground)
}
}
76 changes: 76 additions & 0 deletions iOSClient/More/Cells/NCMoreUserCell.xib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="CustomCellFileAndDirectory"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="blue" indentationWidth="0.0" reuseIdentifier="NCMoreUserCell" rowHeight="107" id="0VH-qw-91P" customClass="NCMoreUserCell" customModule="Nextcloud" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="600" height="100"/>
<autoresizingMask key="autoresizingMask" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="0VH-qw-91P" id="4pi-Pg-ued">
<rect key="frame" x="0.0" y="0.0" width="600" height="100"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" tag="101" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="display name" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="J89-xX-7lg">
<rect key="frame" x="20" y="75" width="560" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" tag="102" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="status" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SdH-0A-9O6" customClass="MarqueeLabel" customModule="MarqueeLabel">
<rect key="frame" x="335" y="48" width="245" height="14.5"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="boolean" keyPath="tapToScroll" value="YES"/>
</userDefinedRuntimeAttributes>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" translatesAutoresizingMaskIntoConstraints="NO" id="dUr-pk-4wX">
<rect key="frame" x="275" y="10" width="50" height="50"/>
<constraints>
<constraint firstAttribute="width" constant="50" id="9C5-5m-lAr"/>
<constraint firstAttribute="height" constant="50" id="VlE-0P-IOr"/>
</constraints>
</imageView>
<imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="sm9-d7-dts">
<rect key="frame" x="310" y="45" width="20" height="20"/>
<constraints>
<constraint firstAttribute="height" constant="20" id="IpK-7E-i4i"/>
<constraint firstAttribute="width" constant="20" id="r0C-8x-wIr"/>
</constraints>
</imageView>
</subviews>
<color key="tintColor" red="1" green="0.5" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="J89-xX-7lg" firstAttribute="leading" secondItem="4pi-Pg-ued" secondAttribute="leading" constant="20" id="DCC-du-as5"/>
<constraint firstItem="SdH-0A-9O6" firstAttribute="leading" secondItem="sm9-d7-dts" secondAttribute="trailing" constant="5" id="Lp1-6o-q7T"/>
<constraint firstItem="SdH-0A-9O6" firstAttribute="centerY" secondItem="sm9-d7-dts" secondAttribute="centerY" id="VnZ-X7-57p"/>
<constraint firstItem="dUr-pk-4wX" firstAttribute="top" secondItem="4pi-Pg-ued" secondAttribute="top" constant="10" id="Vx2-v7-KCs"/>
<constraint firstItem="sm9-d7-dts" firstAttribute="bottom" secondItem="dUr-pk-4wX" secondAttribute="bottom" constant="5" id="aRc-GU-ZCm"/>
<constraint firstAttribute="trailing" secondItem="J89-xX-7lg" secondAttribute="trailing" constant="20" id="d19-Wh-bgV"/>
<constraint firstAttribute="trailing" secondItem="SdH-0A-9O6" secondAttribute="trailing" constant="20" id="fg4-t4-Vep"/>
<constraint firstItem="dUr-pk-4wX" firstAttribute="centerX" secondItem="4pi-Pg-ued" secondAttribute="centerX" id="gMl-mM-0eO"/>
<constraint firstItem="J89-xX-7lg" firstAttribute="top" secondItem="dUr-pk-4wX" secondAttribute="bottom" constant="15" id="lfD-T6-0xN"/>
<constraint firstItem="sm9-d7-dts" firstAttribute="trailing" secondItem="dUr-pk-4wX" secondAttribute="trailing" constant="5" id="tvX-69-E9h"/>
</constraints>
</tableViewCellContentView>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<connections>
<outlet property="avatar" destination="dUr-pk-4wX" id="9ox-by-4aj"/>
<outlet property="displayName" destination="J89-xX-7lg" id="jCD-MK-VQX"/>
<outlet property="icon" destination="sm9-d7-dts" id="TMU-pA-RdL"/>
<outlet property="status" destination="SdH-0A-9O6" id="CKj-9b-5R8"/>
</connections>
<point key="canvasLocation" x="662.39999999999998" y="189.3553223388306"/>
</tableViewCell>
</objects>
<designables>
<designable name="SdH-0A-9O6">
<size key="intrinsicContentSize" width="35" height="14.5"/>
</designable>
</designables>
</document>
Loading