Skip to content

Move role picker before scanner and complete localization #95

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

Merged
darioalessandro merged 8 commits into from
Mar 21, 2026
Merged

Move role picker before scanner and complete localization #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1243a1f
move scanner up
darioalessandro Mar 21, 2026
5d8877a
fix tests
darioalessandro Mar 21, 2026
f33804d
changed up tutorial to follow new flow
darioalessandro Mar 21, 2026
81abb25
save
darioalessandro Mar 21, 2026
7380827
save
darioalessandro Mar 21, 2026
9705c53
adding a ton of strings
darioalessandro Mar 21, 2026
cc5bd5b
add translations
darioalessandro Mar 21, 2026
5c2ebe0
save
darioalessandro Mar 21, 2026
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
1 change: 0 additions & 1 deletion RemoteCam/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import Photos

@UIApplicationMain
class AppDelegate: UIResponder, UIApplicationDelegate {

var window: UIWindow?

func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool {
Expand Down
21 changes: 21 additions & 0 deletions RemoteCam/CameraViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,9 +148,30 @@ public class CameraViewController: UIViewController,
navigationController?.navigationBar.scrollEdgeAppearance = appearance
navigationController?.navigationBar.tintColor = .white

navigationItem.rightBarButtonItem = UIBarButtonItem(
image: UIImage(systemName: "questionmark.circle"),
style: .plain,
target: self,
action: #selector(showHelpModal)
)

orientation = getOrientation()
}

@objc private func showHelpModal() {
let helpView = RemoteShutterHelpView(onDismiss: { [weak self] in
self?.dismiss(animated: true)
})
let hostingController = UIHostingController(rootView: helpView)
hostingController.modalPresentationStyle = .pageSheet
if let sheet = hostingController.sheetPresentationController {
sheet.detents = [.large()]
sheet.prefersGrabberVisible = true
sheet.preferredCornerRadius = 20
}
present(hostingController, animated: true)
}

override public func viewDidAppear(_ animated: Bool) {
super.viewDidAppear(animated)
checkPermissionsAndSetupCamera()
Expand Down
253 changes: 202 additions & 51 deletions RemoteCam/DeviceScannerView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ struct DeviceScannerView: View {
ZStack {
AppTheme.backgroundGradient

if viewModel.hasPeers {
if viewModel.role == .camera {
cameraWaitingState
} else if viewModel.hasPeers {
peerList
} else {
emptyState
Expand Down Expand Up @@ -80,75 +82,159 @@ struct DeviceScannerView: View {
}
}

// MARK: - Empty State
// MARK: - Camera Waiting State

private var emptyState: some View {
VStack(spacing: 24) {
Spacer()
private var cameraWaitingState: some View {
ScrollView {
VStack(spacing: 20) {
// Camera icon
ZStack {
Circle()
.fill(AppTheme.accent.opacity(0.12))
.frame(width: 100, height: 100)

Circle()
.strokeBorder(AppTheme.accent.opacity(0.25), lineWidth: 1.5)
.frame(width: 100, height: 100)

Image(systemName: "camera.fill")
.font(.system(size: 40, weight: .medium))
.foregroundColor(AppTheme.accent)
}
.padding(.top, 24)

VStack(spacing: 8) {
Text(NSLocalizedString("Camera Mode", comment: ""))
.font(.title2)
.fontWeight(.bold)
.foregroundColor(.primary)

Text(NSLocalizedString("On another device, open Remote Shutter and select Remote. This camera will appear in their device list.", comment: ""))
.font(.subheadline)
.foregroundColor(.secondary)
.multilineTextAlignment(.center)
.lineLimit(nil)
.fixedSize(horizontal: false, vertical: true)
}
.padding(.horizontal, 20)

// QR code
VStack(spacing: 16) {
if let qrImage = qrCodeImage {
Image(uiImage: qrImage)
.interpolation(.none)
.resizable()
.aspectRatio(contentMode: .fit)
.frame(width: 160, height: 160)
.padding(12)
.background(.ultraThinMaterial)
.clipShape(RoundedRectangle(cornerRadius: 18))
.overlay(
RoundedRectangle(cornerRadius: 18)
.strokeBorder(AppTheme.glassBorder, lineWidth: 0.5)
)
} else {
Image("AppLogo")
.resizable()
.aspectRatio(contentMode: .fit)
.frame(width: 80, height: 80)
.clipShape(RoundedRectangle(cornerRadius: 18))
.shadow(color: .black.opacity(0.1), radius: 8, y: 4)
// Status
statusBadge

// Actions
VStack(spacing: 12) {
if !viewModel.hasLocalNetworkAccess {
settingsButton
} else if viewModel.isScanning {
cameraAdvertisingIndicator
goOfflineButton
} else {
goOnlineButton
}

shareButton
}
.padding(.horizontal, 20)

Text(NSLocalizedString("You need at least 2 devices running Remote Shutter", comment: ""))
.font(.subheadline)
.foregroundColor(.secondary)
.multilineTextAlignment(.center)
.padding(.horizontal, 40)
// QR code + tip
qrCodeSection
}
}
}

// Status
statusBadge
// MARK: - Empty State

// Actions
VStack(spacing: 12) {
if !viewModel.hasLocalNetworkAccess {
settingsButton
} else if viewModel.isScanning {
scanningIndicator
stopScanButton
} else {
startScanButton
private var emptyState: some View {
ScrollView {
VStack(spacing: 20) {
// Remote icon
ZStack {
Circle()
.fill(AppTheme.secondary.opacity(0.12))
.frame(width: 100, height: 100)

Circle()
.strokeBorder(AppTheme.secondary.opacity(0.25), lineWidth: 1.5)
.frame(width: 100, height: 100)

Image(systemName: "antenna.radiowaves.left.and.right")
.font(.system(size: 40, weight: .medium))
.foregroundColor(AppTheme.secondary)
}
.padding(.top, 24)

VStack(spacing: 8) {
Text(NSLocalizedString("Remote Mode", comment: ""))
.font(.title2)
.fontWeight(.bold)
.foregroundColor(.primary)

Text(NSLocalizedString("You need at least 2 devices running Remote Shutter", comment: ""))
.font(.subheadline)
.foregroundColor(.secondary)
.multilineTextAlignment(.center)
.lineLimit(nil)
.fixedSize(horizontal: false, vertical: true)
}
.padding(.horizontal, 20)

// Status
statusBadge

// Actions
VStack(spacing: 12) {
if !viewModel.hasLocalNetworkAccess {
settingsButton
} else if viewModel.isScanning {
scanningIndicator
stopScanButton
} else {
startScanButton
}

shareButton
shareButton
}
.padding(.horizontal, 20)

// QR code + tip
qrCodeSection
}
.padding(.horizontal, 20)
}
}

Spacer()
// MARK: - QR Code Section

private var qrCodeSection: some View {
VStack(spacing: 12) {
if let qrImage = qrCodeImage {
Image(uiImage: qrImage)
.interpolation(.none)
.resizable()
.aspectRatio(contentMode: .fit)
.frame(width: 120, height: 120)
.padding(8)
.background(.ultraThinMaterial)
.clipShape(RoundedRectangle(cornerRadius: 14))
.overlay(
RoundedRectangle(cornerRadius: 14)
.strokeBorder(AppTheme.glassBorder, lineWidth: 0.5)
)
}

// Tip
HStack(spacing: 8) {
HStack(alignment: .top, spacing: 8) {
Image(systemName: "qrcode")
.font(.caption)
.foregroundColor(AppTheme.accent)
.padding(.top, 2)
Text(NSLocalizedString("Scan the QR code on another device to download Remote Shutter", comment: ""))
.font(.caption)
.foregroundColor(.secondary)
.lineLimit(nil)
.fixedSize(horizontal: false, vertical: true)
}
.padding(.horizontal, 20)
.padding(.bottom, 20)
}
.padding(.bottom, 20)
}

// MARK: - Components
Expand Down Expand Up @@ -225,12 +311,16 @@ struct DeviceScannerView: View {
private var scanningIndicator: some View {
HStack(spacing: 12) {
ProgressView()
Text(NSLocalizedString("Scanning for nearby devices...", comment: ""))
Text(NSLocalizedString("Scanning for nearby cameras...", comment: ""))
.font(.subheadline)
.foregroundColor(.secondary)
.lineLimit(nil)
.fixedSize(horizontal: false, vertical: true)
}
.frame(maxWidth: .infinity)
.frame(height: 54)
.frame(minHeight: 54)
.padding(.vertical, 8)
.padding(.horizontal, 16)
.background(.ultraThinMaterial)
.clipShape(RoundedRectangle(cornerRadius: 14))
.overlay(
Expand All @@ -239,6 +329,67 @@ struct DeviceScannerView: View {
)
}

private var cameraAdvertisingIndicator: some View {
HStack(spacing: 12) {
ProgressView()
Text(NSLocalizedString("Waiting for a remote to connect...", comment: ""))
.font(.subheadline)
.foregroundColor(.secondary)
.lineLimit(nil)
.fixedSize(horizontal: false, vertical: true)
}
.frame(maxWidth: .infinity)
.frame(minHeight: 54)
.padding(.vertical, 8)
.padding(.horizontal, 16)
.background(.ultraThinMaterial)
.clipShape(RoundedRectangle(cornerRadius: 14))
.overlay(
RoundedRectangle(cornerRadius: 14)
.strokeBorder(AppTheme.glassBorder, lineWidth: 0.5)
)
}

private var goOnlineButton: some View {
Button(action: onStartScanning) {
HStack {
Image(systemName: "antenna.radiowaves.left.and.right")
.font(.headline)
Text(NSLocalizedString("Go Online", comment: ""))
.font(.headline)
}
.foregroundColor(.black)
.frame(maxWidth: .infinity)
.frame(height: 54)
.background(
LinearGradient(
colors: [AppTheme.accent, AppTheme.accentLight],
startPoint: .leading,
endPoint: .trailing
)
)
.clipShape(RoundedRectangle(cornerRadius: 14))
.shadow(color: AppTheme.accent.opacity(0.3), radius: 8, y: 4)
}
}

private var goOfflineButton: some View {
Button(action: onStopScanning) {
HStack {
Image(systemName: "stop.fill")
.font(.subheadline)
Text(NSLocalizedString("Go Offline", comment: ""))
.font(.subheadline)
.fontWeight(.medium)
}
.foregroundColor(.secondary)
.frame(maxWidth: .infinity)
.frame(height: 44)
.background(Color(.secondarySystemGroupedBackground))
.clipShape(RoundedRectangle(cornerRadius: 12))
}
}

private var settingsButton: some View {
Button(action: onOpenSettings) {
HStack {
Expand Down
Loading
Loading