fixed things that were fucked up by pub upgrade
This commit is contained in:
parent
9f5e57eec6
commit
56500406e5
@ -1,7 +1,7 @@
|
|||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:tools="http://schemas.android.com/tools" package="hu.refilc.naplo">
|
xmlns:tools="http://schemas.android.com/tools" package="hu.refilc.naplo">
|
||||||
<application android:name="${applicationName}" android:label="reFilc" tools:replace="android:label" android:icon="@mipmap/ic_launcher"
|
<application android:name="${applicationName}" android:label="reFilc" tools:replace="android:label" android:icon="@mipmap/ic_launcher"
|
||||||
android:requestLegacyExternalStorage="true">
|
android:requestLegacyExternalStorage="true" android:enableOnBackInvokedCallback="true">
|
||||||
<activity android:exported="true" android:name="hu.refilc.naplo.MainActivity"
|
<activity android:exported="true" android:name="hu.refilc.naplo.MainActivity"
|
||||||
android:launchMode="singleTop" android:theme="@style/LaunchTheme"
|
android:launchMode="singleTop" android:theme="@style/LaunchTheme"
|
||||||
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
|
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
|
||||||
|
@ -17,7 +17,8 @@ import 'package:flutter_local_notifications/flutter_local_notifications.dart';
|
|||||||
void main() async {
|
void main() async {
|
||||||
// Initalize
|
// Initalize
|
||||||
WidgetsBinding binding = WidgetsFlutterBinding.ensureInitialized();
|
WidgetsBinding binding = WidgetsFlutterBinding.ensureInitialized();
|
||||||
binding.renderViews.first.automaticSystemUiAdjustment = false;
|
// ignore: deprecated_member_use
|
||||||
|
binding.renderView.automaticSystemUiAdjustment = false;
|
||||||
SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
|
SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
|
||||||
// Startup
|
// Startup
|
||||||
Startup startup = Startup();
|
Startup startup = Startup();
|
||||||
|
@ -13,6 +13,7 @@ class FilterBar extends StatefulWidget implements PreferredSizeWidget {
|
|||||||
this.disableFading = false,
|
this.disableFading = false,
|
||||||
this.scrollable = true,
|
this.scrollable = true,
|
||||||
this.censored = false,
|
this.censored = false,
|
||||||
|
this.tabAlignment = TabAlignment.start,
|
||||||
}) : assert(items.length == controller.length);
|
}) : assert(items.length == controller.length);
|
||||||
|
|
||||||
final List<Widget> items;
|
final List<Widget> items;
|
||||||
@ -22,6 +23,7 @@ class FilterBar extends StatefulWidget implements PreferredSizeWidget {
|
|||||||
final bool disableFading;
|
final bool disableFading;
|
||||||
final bool scrollable;
|
final bool scrollable;
|
||||||
final bool censored;
|
final bool censored;
|
||||||
|
final TabAlignment tabAlignment;
|
||||||
|
|
||||||
@override
|
@override
|
||||||
final Size preferredSize = const Size.fromHeight(42.0);
|
final Size preferredSize = const Size.fromHeight(42.0);
|
||||||
@ -36,7 +38,9 @@ class _FilterBarState extends State<FilterBar> {
|
|||||||
void initState() {
|
void initState() {
|
||||||
super.initState();
|
super.initState();
|
||||||
|
|
||||||
censoredItemsWidth = List.generate(widget.items.length, (index) => 25 + Random().nextDouble() * 50).toList();
|
censoredItemsWidth = List.generate(
|
||||||
|
widget.items.length, (index) => 25 + Random().nextDouble() * 50)
|
||||||
|
.toList();
|
||||||
}
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@ -66,7 +70,8 @@ class _FilterBarState extends State<FilterBar> {
|
|||||||
tabs: widget.censored
|
tabs: widget.censored
|
||||||
? censoredItemsWidth
|
? censoredItemsWidth
|
||||||
.map(
|
.map(
|
||||||
(e) => Container(
|
(e) => Tab(
|
||||||
|
child: Container(
|
||||||
width: e,
|
width: e,
|
||||||
height: 15,
|
height: 15,
|
||||||
decoration: BoxDecoration(
|
decoration: BoxDecoration(
|
||||||
@ -74,10 +79,12 @@ class _FilterBarState extends State<FilterBar> {
|
|||||||
borderRadius: BorderRadius.circular(8.0),
|
borderRadius: BorderRadius.circular(8.0),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
),
|
||||||
)
|
)
|
||||||
.toList()
|
.toList()
|
||||||
: widget.items,
|
: widget.items,
|
||||||
onTap: widget.onTap,
|
onTap: widget.onTap,
|
||||||
|
tabAlignment: widget.tabAlignment,
|
||||||
);
|
);
|
||||||
|
|
||||||
return Container(
|
return Container(
|
||||||
@ -92,14 +99,21 @@ class _FilterBarState extends State<FilterBar> {
|
|||||||
// avoid fading over selected tab
|
// avoid fading over selected tab
|
||||||
return ShaderMask(
|
return ShaderMask(
|
||||||
shaderCallback: (Rect bounds) {
|
shaderCallback: (Rect bounds) {
|
||||||
final Color bg = Theme.of(context).scaffoldBackgroundColor;
|
final Color bg =
|
||||||
|
Theme.of(context).scaffoldBackgroundColor;
|
||||||
final double index = widget.controller.animation!.value;
|
final double index = widget.controller.animation!.value;
|
||||||
return LinearGradient(begin: Alignment.topLeft, end: Alignment.bottomRight, colors: [
|
return LinearGradient(
|
||||||
|
begin: Alignment.topLeft,
|
||||||
|
end: Alignment.bottomRight,
|
||||||
|
colors: [
|
||||||
index < 0.2 ? Colors.transparent : bg,
|
index < 0.2 ? Colors.transparent : bg,
|
||||||
Colors.transparent,
|
Colors.transparent,
|
||||||
Colors.transparent,
|
Colors.transparent,
|
||||||
index > widget.controller.length - 1.2 ? Colors.transparent : bg
|
index > widget.controller.length - 1.2
|
||||||
], stops: const [
|
? Colors.transparent
|
||||||
|
: bg
|
||||||
|
],
|
||||||
|
stops: const [
|
||||||
0,
|
0,
|
||||||
0.1,
|
0.1,
|
||||||
0.9,
|
0.9,
|
||||||
|
@ -229,11 +229,9 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
|
|||||||
.where((e) => e.type == GradeType.midYear)
|
.where((e) => e.type == GradeType.midYear)
|
||||||
.isNotEmpty,
|
.isNotEmpty,
|
||||||
child: ExpandableFab(
|
child: ExpandableFab(
|
||||||
overlayStyle: ExpandableFabOverlayStyle(
|
|
||||||
color: Theme.of(context).colorScheme.secondary,
|
|
||||||
),
|
|
||||||
type: ExpandableFabType.up,
|
type: ExpandableFabType.up,
|
||||||
distance: 50,
|
distance: 50,
|
||||||
|
childrenOffset: const Offset(-3.8, 0.0),
|
||||||
children: [
|
children: [
|
||||||
FloatingActionButton.small(
|
FloatingActionButton.small(
|
||||||
heroTag: "btn_ghost_grades",
|
heroTag: "btn_ghost_grades",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user