Skip to content

Commit c33ee94

Browse files
committed
For android 15 fix overflow
1 parent ca25119 commit c33ee94

File tree

7 files changed

+31
-19
lines changed

7 files changed

+31
-19
lines changed

android/app/src/main/res/values/styles.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@
1414
This Theme is only used starting with V2 of Flutter's Android embedding. -->
1515
<style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
1616
<item name="android:windowBackground">?android:colorBackground</item>
17+
<item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
1718
</style>
1819
</resources>

lib/features/library/item_components/library_item_widget.dart

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import 'dart:convert';
2+
13
import 'package:abs_flutter/api/library/collapsed_series.dart';
24
import 'package:abs_flutter/features/library/item_components/top_label.dart';
35
import 'package:abs_flutter/generated/l10n.dart';
@@ -39,8 +41,10 @@ class LibraryItemWidget extends StatelessWidget {
3941
? null
4042
: () {
4143
if (collapseSeries != null) {
44+
String base64Id = Uri.encodeComponent(base64.encode(utf8.encode(collapseSeries!.id)));
45+
String base64Name = Uri.encodeComponent(base64.encode(utf8.encode(collapseSeries!.name ?? '')));
4246
context.push(
43-
'/series-view/${collapseSeries!.name}/${collapseSeries!.id}');
47+
'/series-view/$base64Name/$base64Id');
4448
} else {
4549
context.push('/view/${item!.mediaType}/${item!.id}');
4650
}

lib/features/library/series/single_series_view.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,9 @@ class _SingleSeriesViewState extends ConsumerState<SingleSeriesView> {
121121

122122
const double screenWidth = 800;
123123

124+
String base64Id = Uri.encodeComponent(base64.encode(utf8.encode(seriesPreview.id)));
125+
String base64Name = Uri.encodeComponent(base64.encode(utf8.encode(seriesPreview.name)));
126+
124127
return PlatformScaffold(
125128
appBar: PlatformAppBar(
126129
title: PlatformText(seriesPreview.name),
@@ -142,7 +145,7 @@ class _SingleSeriesViewState extends ConsumerState<SingleSeriesView> {
142145
Container(
143146
constraints: const BoxConstraints(maxWidth: 300),
144147
child: MultiItem(
145-
'/series-view/${seriesPreview.name}/${seriesPreview.id}',
148+
'/series-view/$base64Name/$base64Id',
146149
series: seriesPreview,
147150
clickable: false)),
148151
const Divider(),

lib/features/library/shelf_items.dart

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import 'dart:convert';
12
import 'dart:ui';
23

34
import 'package:abs_api/abs_api.dart';
@@ -202,9 +203,11 @@ class ShelfItems extends ConsumerWidget {
202203
name: item.name!,
203204
description: item.description,
204205
);
206+
String base64Id = Uri.encodeComponent(base64.encode(utf8.encode(series.id)));
207+
String base64Name = Uri.encodeComponent(base64.encode(utf8.encode(series.name ?? '')));
205208
return Container(
206209
constraints: const BoxConstraints(maxWidth: 350),
207-
child: MultiItem('/series-view/${series.name}/${series.id}',
210+
child: MultiItem('/series-view/$base64Name/$base64Id',
208211
series: series));
209212
}).toList();
210213
}

lib/main.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import 'package:audio_service/audio_service.dart';
1515
import 'package:device_info_plus/device_info_plus.dart';
1616
import 'package:flutter/foundation.dart';
1717
import 'package:flutter/material.dart';
18+
import 'package:flutter/services.dart';
1819
import 'package:flutter_riverpod/flutter_riverpod.dart';
1920
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
2021
import 'package:flutter_settings_screens/flutter_settings_screens.dart';

pubspec.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -445,10 +445,10 @@ packages:
445445
dependency: "direct main"
446446
description:
447447
name: file_picker
448-
sha256: "6f6bfa8797f296965bdc3e1f702574ab49a540c19b9237b401e7c2b25dfe594c"
448+
sha256: "36a1652d99cb6bf8ccc8b9f43aded1fd60b234d23ce78af422c07f950a436ef7"
449449
url: "https://pub.dev"
450450
source: hosted
451-
version: "9.0.0"
451+
version: "10.0.0"
452452
fixnum:
453453
dependency: transitive
454454
description:
@@ -1241,18 +1241,18 @@ packages:
12411241
dependency: "direct main"
12421242
description:
12431243
name: saf_stream
1244-
sha256: f9258bc3b39256e0af3de7c05a70a4c7ac846d186a3ea8c1e5bef7b53876c566
1244+
sha256: f48b9f134d0cd1047a0f58539e967400f3a15846482911a2d892b1851385ce27
12451245
url: "https://pub.dev"
12461246
source: hosted
1247-
version: "0.11.1"
1247+
version: "0.11.2"
12481248
saf_util:
12491249
dependency: "direct main"
12501250
description:
12511251
name: saf_util
1252-
sha256: "4e07d11463a97cd3feecb66192e423e6d17f082f16f1acf2ce923a538cacced0"
1252+
sha256: "0f85e65770c0906fc38181deef93da375dabd957abaa5e8569b6984f6298cd84"
12531253
url: "https://pub.dev"
12541254
source: hosted
1255-
version: "0.6.2"
1255+
version: "0.7.0"
12561256
safe_local_storage:
12571257
dependency: transitive
12581258
description:
@@ -1582,10 +1582,10 @@ packages:
15821582
dependency: "direct main"
15831583
description:
15841584
name: tray_manager
1585-
sha256: "80be6c508159a6f3c57983de795209ac13453e9832fd574143b06dceee188ed2"
1585+
sha256: c2da0f0f1ddb455e721cf68d05d1281fec75cf5df0a1d3cb67b6ca0bdfd5709d
15861586
url: "https://pub.dev"
15871587
source: hosted
1588-
version: "0.3.2"
1588+
version: "0.4.0"
15891589
typed_data:
15901590
dependency: transitive
15911591
description:

pubspec.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dependencies:
1818
intl: ^0.19.0
1919
go_router: ^12.1.3 # 13.x and up not working due to https://github.com/flutter/flutter/issues/140586
2020
quickalert: ^1.1.0
21-
flutter_riverpod: ^2.5.1
21+
flutter_riverpod: ^2.6.1
2222
riverpod_annotation: ^2.3.5
2323
abs_api:
2424
path: ./api/abs_api
@@ -30,7 +30,7 @@ dependencies:
3030
cached_network_image: ^3.3.1
3131
flutter_staggered_grid_view: ^0.7.0
3232
connectivity_plus: ^6.0.3
33-
just_audio: ^0.9.39
33+
just_audio: ^0.9.46
3434
audio_service: ^0.18.15
3535
package_info_plus: ^8.0.1
3636
just_audio_windows: ^0.2.2
@@ -43,8 +43,8 @@ dependencies:
4343
background_downloader: ^9.0.0
4444
permission_handler: ^11.3.1 # Nuget not found
4545
path: ^1.9.0
46-
hooks_riverpod: ^2.5.1
47-
sensors_plus: ^6.0.1
46+
hooks_riverpod: ^2.6.1
47+
sensors_plus: ^6.1.1
4848
vibration: ^3.1.3
4949
url_launcher: ^6.3.0
5050
flutter_widget_from_html_core: ^0.16.0
@@ -55,10 +55,10 @@ dependencies:
5555
sembast_web: ^2.4.0+2
5656
icons_plus: ^5.0.0
5757
settings_ui: ^2.0.2
58-
tray_manager: ^0.3.2
59-
file_picker: ^9.0.0
60-
saf_stream: ^0.11.1
61-
saf_util: ^0.6.1
58+
tray_manager: ^0.4.0
59+
file_picker: ^10.0.0
60+
saf_stream: ^0.11.2
61+
saf_util: ^0.7.0
6262
epubx:
6363
git:
6464
url: https://github.com/ScerIO/epubx.dart

0 commit comments

Comments
 (0)