mirror of
https://github.com/leonboe1/QuickDrop.git
synced 2026-11-19 04:46:08 +00:00
Fix empty device name
This commit is contained in:
1 parent
3fb926ce52
commit
3e8accaade
2 files changed
+15
-17
No files matched your search
@@ -109,7 +109,7 @@ Gw
|
|||||||
</connections>
|
</connections>
|
||||||
</button>
|
</button>
|
||||||
<customView id="ACO-U2-AZj">
|
<customView id="ACO-U2-AZj">
|
||||||
<rect key="frame" x="0.0" y="48" width="404" height="146"/>
|
<rect key="frame" x="0.0" y="39" width="404" height="146"/>
|
||||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
|
||||||
</customView>
|
</customView>
|
||||||
</subviews>
|
</subviews>
|
||||||
@@ -130,42 +130,33 @@ Gw
|
|||||||
<point key="canvasLocation" x="140" y="-36"/>
|
<point key="canvasLocation" x="140" y="-36"/>
|
||||||
</customView>
|
</customView>
|
||||||
<stackView wantsLayer="YES" distribution="equalSpacing" orientation="vertical" alignment="centerX" spacing="0.0" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" id="fLZ-IA-bPS">
|
<stackView wantsLayer="YES" distribution="equalSpacing" orientation="vertical" alignment="centerX" spacing="0.0" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" id="fLZ-IA-bPS">
|
||||||
<rect key="frame" x="0.0" y="0.0" width="521" height="100"/>
|
<rect key="frame" x="0.0" y="0.0" width="521" height="130"/>
|
||||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
|
||||||
<subviews>
|
<subviews>
|
||||||
<progressIndicator wantsLayer="YES" maxValue="100" indeterminate="YES" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="fCj-wF-rEj">
|
<progressIndicator wantsLayer="YES" maxValue="100" indeterminate="YES" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="fCj-wF-rEj">
|
||||||
<rect key="frame" x="245" y="68" width="32" height="32"/>
|
<rect key="frame" x="245" y="61" width="32" height="39"/>
|
||||||
</progressIndicator>
|
</progressIndicator>
|
||||||
<textField wantsLayer="YES" focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="27P-yf-gUd">
|
<textField wantsLayer="YES" focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="27P-yf-gUd">
|
||||||
<rect key="frame" x="189" y="42" width="144" height="16"/>
|
<rect key="frame" x="189" y="35" width="144" height="16"/>
|
||||||
<textFieldCell key="cell" lineBreakMode="clipping" title="Looking for devices..." id="NaJ-Wx-Pim">
|
<textFieldCell key="cell" lineBreakMode="clipping" title="Looking for devices..." id="NaJ-Wx-Pim">
|
||||||
<font key="font" textStyle="headline" name=".SFNS-Bold"/>
|
<font key="font" textStyle="headline" name=".SFNS-Bold"/>
|
||||||
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
|
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
|
||||||
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
|
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
|
||||||
</textFieldCell>
|
</textFieldCell>
|
||||||
</textField>
|
</textField>
|
||||||
<textField wantsLayer="YES" focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="V5W-Rm-YVM">
|
|
||||||
<rect key="frame" x="-2" y="0.0" width="525" height="32"/>
|
|
||||||
<textFieldCell key="cell" alignment="center" title="If you don't see your device, open the "Google Files" app and tap "Receive" on the Nearby Share tab." id="vla-gF-eJo">
|
|
||||||
<font key="font" metaFont="system"/>
|
|
||||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
|
|
||||||
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
|
|
||||||
</textFieldCell>
|
|
||||||
</textField>
|
|
||||||
</subviews>
|
</subviews>
|
||||||
<constraints>
|
<constraints>
|
||||||
<constraint firstItem="27P-yf-gUd" firstAttribute="top" secondItem="fCj-wF-rEj" secondAttribute="bottom" constant="10" id="87W-ec-fMh"/>
|
<constraint firstItem="27P-yf-gUd" firstAttribute="top" secondItem="fCj-wF-rEj" secondAttribute="bottom" constant="10" id="87W-ec-fMh"/>
|
||||||
<constraint firstItem="V5W-Rm-YVM" firstAttribute="top" secondItem="27P-yf-gUd" secondAttribute="bottom" constant="10" id="OSI-wI-LcY"/>
|
<constraint firstAttribute="bottom" secondItem="27P-yf-gUd" secondAttribute="bottom" constant="35" id="L3k-0X-y8j"/>
|
||||||
|
<constraint firstItem="fCj-wF-rEj" firstAttribute="top" secondItem="fLZ-IA-bPS" secondAttribute="top" constant="30" id="Uon-lo-9kV"/>
|
||||||
</constraints>
|
</constraints>
|
||||||
<visibilityPriorities>
|
<visibilityPriorities>
|
||||||
<integer value="1000"/>
|
<integer value="1000"/>
|
||||||
<integer value="1000"/>
|
<integer value="1000"/>
|
||||||
<integer value="1000"/>
|
|
||||||
</visibilityPriorities>
|
</visibilityPriorities>
|
||||||
<customSpacing>
|
<customSpacing>
|
||||||
<real value="3.4028234663852886e+38"/>
|
<real value="3.4028234663852886e+38"/>
|
||||||
<real value="3.4028234663852886e+38"/>
|
<real value="3.4028234663852886e+38"/>
|
||||||
<real value="3.4028234663852886e+38"/>
|
|
||||||
</customSpacing>
|
</customSpacing>
|
||||||
<point key="canvasLocation" x="660.5" y="-1.5"/>
|
<point key="canvasLocation" x="660.5" y="-1.5"/>
|
||||||
</stackView>
|
</stackView>
|
||||||
|
|||||||
@@ -263,7 +263,7 @@ class ShareViewController: NSViewController, ShareExtensionDelegate{
|
|||||||
NearbyConnectionManager.shared.stopDeviceDiscovery()
|
NearbyConnectionManager.shared.stopDeviceDiscovery()
|
||||||
listViewWrapper?.animator().isHidden=true
|
listViewWrapper?.animator().isHidden=true
|
||||||
progressView?.animator().isHidden=false
|
progressView?.animator().isHidden=false
|
||||||
progressDeviceName?.stringValue=device.name
|
progressDeviceName?.stringValue=getDeviceName(device: device)
|
||||||
progressDeviceIcon?.image=imageForDeviceType(type: device.type)
|
progressDeviceIcon?.image=imageForDeviceType(type: device.type)
|
||||||
progressProgressBar?.startAnimation(nil)
|
progressProgressBar?.startAnimation(nil)
|
||||||
progressState?.stringValue=NSLocalizedString("Connecting", value: "Connecting...", comment: "")
|
progressState?.stringValue=NSLocalizedString("Connecting", value: "Connecting...", comment: "")
|
||||||
@@ -308,7 +308,7 @@ extension ShareViewController:NSCollectionViewDataSource{
|
|||||||
let item=collectionView.makeItem(withIdentifier: NSUserInterfaceItemIdentifier(rawValue: "DeviceListCell"), for: indexPath)
|
let item=collectionView.makeItem(withIdentifier: NSUserInterfaceItemIdentifier(rawValue: "DeviceListCell"), for: indexPath)
|
||||||
guard let collectionViewItem = item as? DeviceListCell else {return item}
|
guard let collectionViewItem = item as? DeviceListCell else {return item}
|
||||||
let device=foundDevices[indexPath[1]]
|
let device=foundDevices[indexPath[1]]
|
||||||
collectionViewItem.textField?.stringValue=device.name
|
collectionViewItem.textField?.stringValue=getDeviceName(device: device)
|
||||||
collectionViewItem.imageView?.image=imageForDeviceType(type: device.type)
|
collectionViewItem.imageView?.image=imageForDeviceType(type: device.type)
|
||||||
// TODO maybe there's a better way to handle clicks on collection view items? I'm still new to Apple's way of doing UIs so I may do dumb shit occasionally
|
// TODO maybe there's a better way to handle clicks on collection view items? I'm still new to Apple's way of doing UIs so I may do dumb shit occasionally
|
||||||
collectionViewItem.clickHandler={
|
collectionViewItem.clickHandler={
|
||||||
@@ -316,4 +316,11 @@ extension ShareViewController:NSCollectionViewDataSource{
|
|||||||
}
|
}
|
||||||
return collectionViewItem
|
return collectionViewItem
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func getDeviceName(device: RemoteDeviceInfo) -> String {
|
||||||
|
if device.name.count <= 1 {
|
||||||
|
return "Android"
|
||||||
|
}
|
||||||
|
return device.name
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user