diff --git a/mobile/android/app/src/main/kotlin/com/example/accessibility_map/MainActivity.kt b/mobile/android/app/src/main/kotlin/com/example/accessibility_map/MainActivity.kt index 61de59b5..763a228c 100644 --- a/mobile/android/app/src/main/kotlin/com/example/accessibility_map/MainActivity.kt +++ b/mobile/android/app/src/main/kotlin/com/example/accessibility_map/MainActivity.kt @@ -1,12 +1,5 @@ package com.example.accessibility_map -import android.os.Bundle -import androidx.core.view.WindowCompat import io.flutter.embedding.android.FlutterActivity -class MainActivity : FlutterActivity() { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - WindowCompat.setDecorFitsSystemWindows(window, false) - } -} +class MainActivity : FlutterActivity() diff --git a/mobile/android/app/src/main/res/values-night/styles.xml b/mobile/android/app/src/main/res/values-night/styles.xml index d1979e32..06952be7 100644 --- a/mobile/android/app/src/main/res/values-night/styles.xml +++ b/mobile/android/app/src/main/res/values-night/styles.xml @@ -14,7 +14,5 @@ This Theme is only used starting with V2 of Flutter's Android embedding. --> diff --git a/mobile/android/app/src/main/res/values/styles.xml b/mobile/android/app/src/main/res/values/styles.xml index 041ca364..cb1ef880 100644 --- a/mobile/android/app/src/main/res/values/styles.xml +++ b/mobile/android/app/src/main/res/values/styles.xml @@ -14,7 +14,5 @@ This Theme is only used starting with V2 of Flutter's Android embedding. --> diff --git a/mobile/lib/main.dart b/mobile/lib/main.dart index 6613ce85..ae2f4a0a 100644 --- a/mobile/lib/main.dart +++ b/mobile/lib/main.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:flutter/services.dart'; import 'package:provider/provider.dart'; import 'models/notification_model.dart'; import 'screens/login_screen.dart'; @@ -17,11 +16,6 @@ import 'theme/app_colors.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); - SystemChrome.setEnabledSystemUIMode(SystemUiMode.edgeToEdge); - SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle( - systemNavigationBarColor: Colors.transparent, - systemNavigationBarContrastEnforced: false, - )); final auth = AuthService(); await auth.init(); final theme = ThemeService(); diff --git a/mobile/lib/screens/edit_report_screen.dart b/mobile/lib/screens/edit_report_screen.dart index 56615edc..da1f96a6 100644 --- a/mobile/lib/screens/edit_report_screen.dart +++ b/mobile/lib/screens/edit_report_screen.dart @@ -1078,15 +1078,8 @@ class _EditReportScreenState extends State { } Widget _buildBottomBar() { - return SafeArea( - top: false, - child: _buildBottomBarContent(), - ); - } - - Widget _buildBottomBarContent() { return Container( - padding: const EdgeInsets.fromLTRB(20, 16, 20, 16), + padding: const EdgeInsets.fromLTRB(20, 16, 20, 36), decoration: BoxDecoration( color: AppColors.surfaceContainerLowest.withValues(alpha: 0.95), borderRadius: const BorderRadius.vertical(top: Radius.circular(32)), diff --git a/mobile/lib/screens/make_report_screen.dart b/mobile/lib/screens/make_report_screen.dart index 84b3f664..01e32677 100644 --- a/mobile/lib/screens/make_report_screen.dart +++ b/mobile/lib/screens/make_report_screen.dart @@ -1452,15 +1452,8 @@ class _MakeReportScreenState extends State { // ─── Bottom bar ─────────────────────────────────────────────────────────── Widget _buildBottomBar() { - return SafeArea( - top: false, - child: _buildBottomBarContent(), - ); - } - - Widget _buildBottomBarContent() { return Container( - padding: const EdgeInsets.fromLTRB(20, 16, 20, 16), + padding: const EdgeInsets.fromLTRB(20, 16, 20, 36), decoration: BoxDecoration( color: AppColors.surfaceContainerLowest.withOpacity(0.95), borderRadius: const BorderRadius.vertical(top: Radius.circular(32)), diff --git a/mobile/lib/screens/profile_screen.dart b/mobile/lib/screens/profile_screen.dart index e725215d..99c17fce 100644 --- a/mobile/lib/screens/profile_screen.dart +++ b/mobile/lib/screens/profile_screen.dart @@ -514,11 +514,8 @@ class _ProfileScreenState extends State { Widget _buildEditView() { final avatarUrl = _userInfo?['avatarUrl'] as String?; - final keyboardInset = MediaQuery.viewInsetsOf(context).bottom; - return SingleChildScrollView( - keyboardDismissBehavior: ScrollViewKeyboardDismissBehavior.onDrag, - padding: EdgeInsets.fromLTRB(20, 8, 20, 24 + keyboardInset), + padding: const EdgeInsets.fromLTRB(20, 8, 20, 24), child: Form( key: _formKey, child: Column( diff --git a/mobile/lib/screens/reports_screen.dart b/mobile/lib/screens/reports_screen.dart index 7b9ed061..7672bf2b 100644 --- a/mobile/lib/screens/reports_screen.dart +++ b/mobile/lib/screens/reports_screen.dart @@ -556,9 +556,7 @@ class _ReportsScreenState extends State { @override Widget build(BuildContext context) { - final keyboardInset = MediaQuery.viewInsetsOf(context).bottom; return Scaffold( - resizeToAvoidBottomInset: false, backgroundColor: AppColors.surface, body: SafeArea( child: Column( @@ -599,12 +597,7 @@ class _ReportsScreenState extends State { ); _refresh(); }), - Expanded( - child: Padding( - padding: EdgeInsets.only(bottom: keyboardInset), - child: _buildBody(), - ), - ), + Expanded(child: _buildBody()), ], ), ),