Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -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()
2 changes: 0 additions & 2 deletions mobile/android/app/src/main/res/values-night/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,5 @@
This Theme is only used starting with V2 of Flutter's Android embedding. -->
<style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
<item name="android:windowBackground">?android:colorBackground</item>
<item name="android:navigationBarColor">@android:color/transparent</item>
<item name="android:windowTranslucentNavigation">false</item>
</style>
</resources>
2 changes: 0 additions & 2 deletions mobile/android/app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,5 @@
This Theme is only used starting with V2 of Flutter's Android embedding. -->
<style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
<item name="android:windowBackground">?android:colorBackground</item>
<item name="android:navigationBarColor">@android:color/transparent</item>
<item name="android:windowTranslucentNavigation">false</item>
</style>
</resources>
6 changes: 0 additions & 6 deletions mobile/lib/main.dart
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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();
Expand Down
9 changes: 1 addition & 8 deletions mobile/lib/screens/edit_report_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1078,15 +1078,8 @@ class _EditReportScreenState extends State<EditReportScreen> {
}

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)),
Expand Down
9 changes: 1 addition & 8 deletions mobile/lib/screens/make_report_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1452,15 +1452,8 @@ class _MakeReportScreenState extends State<MakeReportScreen> {
// ─── 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)),
Expand Down
5 changes: 1 addition & 4 deletions mobile/lib/screens/profile_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -514,11 +514,8 @@ class _ProfileScreenState extends State<ProfileScreen> {

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(
Expand Down
9 changes: 1 addition & 8 deletions mobile/lib/screens/reports_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -556,9 +556,7 @@ class _ReportsScreenState extends State<ReportsScreen> {

@override
Widget build(BuildContext context) {
final keyboardInset = MediaQuery.viewInsetsOf(context).bottom;
return Scaffold(
resizeToAvoidBottomInset: false,
backgroundColor: AppColors.surface,
body: SafeArea(
child: Column(
Expand Down Expand Up @@ -599,12 +597,7 @@ class _ReportsScreenState extends State<ReportsScreen> {
);
_refresh();
}),
Expanded(
child: Padding(
padding: EdgeInsets.only(bottom: keyboardInset),
child: _buildBody(),
),
),
Expanded(child: _buildBody()),
],
),
),
Expand Down
Loading