Skip to content

πŸ”€ :: (#269) - UX κ°œμ„  μž‘μ—… 진행 #270

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
aiden30015 wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

πŸ”€ :: (#269) - UX κ°œμ„  μž‘μ—… 진행 #270

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5c7770e
♻️ :: μ‹œμŠ€ν…œ λ°©ν–₯ 고정을 μœ„ν•œ SystemChrome μ„€μ • μΆ”κ°€
aiden30015 Sep 7, 2026
b7855bd
♻️ :: μ˜ˆμ•½ μ„Ήμ…˜μ—μ„œ μΈ΅ 선택 둜직 μ΅œμ ν™”
aiden30015 Sep 7, 2026
55c4f01
♻️ :: SystemChrome μ„€μ •μ—μ„œ DeviceOrientation.portraitDown 제거
aiden30015 Sep 7, 2026
2046053
πŸ› :: μΈ΅ λͺ©λ‘μ΄ λΉ„μ–΄ μžˆμ„ λ•Œ μ˜ˆμ•½ μ„Ήμ…˜μ΄ ν¬λž˜μ‹œν•˜λŠ” 문제 μˆ˜μ •
aiden30015 Sep 8, 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
8 changes: 2 additions & 6 deletions lib/features/reservation/presentation/widgets/reservation_section_widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,7 @@ class _ReservationSectionWidgetState
}

List<int> _floorsFrom(List<MachineModel> machines, int? userFloor) {
final floors = machines
.map((m) => m.floorNumber)
.whereType<int>()
.toSet();
final floors = machines.map((m) => m.floorNumber).whereType<int>().toSet();
if (userFloor != null) {
floors.add(userFloor);
}
Expand Down Expand Up @@ -220,8 +217,7 @@ class _ReservationSectionWidgetState
data: (data) {
final typedMachines = _machinesForType(data.machines);
final floors = _floorsFrom(typedMachines, userFloor);
final currentFloor =
_selectedFloor ?? (floors.isNotEmpty ? floors.first : 0);
final currentFloor = _selectedFloor ?? (userFloor ?? floors.first);
final items = _buildItems(
typedMachines,
activeReservations,
Expand Down
5 changes: 5 additions & 0 deletions lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import 'package:firebase_core/firebase_core.dart';
import 'package:firebase_crashlytics/firebase_crashlytics.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:washer/core/env/app_environment.dart';
Expand All @@ -18,6 +19,10 @@ void main() async {
// μ„œλ‘œ 독립적인 μ΄ˆκΈ°ν™”λŠ” λ³‘λ ¬λ‘œ μ²˜λ¦¬ν•œλ‹€.
await Future.wait([
AppEnvironment.initialize(),
SystemChrome.setPreferredOrientations([
Comment thread
aiden30015 marked this conversation as resolved.
DeviceOrientation.portraitUp, // μ„Έλ‘œ λ°©ν–₯으둜 κ³ μ •
Comment thread
aiden30015 marked this conversation as resolved.
DeviceOrientation.portraitDown,
]),
Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform),
]);
if (kDebugMode) {
Expand Down
Loading