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
6 changes: 1 addition & 5 deletions lib/src/app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,7 @@ class App extends StatelessWidget {
darkIsTrueBlack: ac.profile.enableTrueBlack,
),
themeMode: ac.profile.themeMode,
themeAnimationDuration: ac.profile.animationSpeed == 0
? Duration.zero
: Duration(
milliseconds: (300 / ac.profile.animationSpeed).toInt(),
),
themeAnimationDuration: ac.calcAnimationDuration(),
scaffoldMessengerKey: scaffoldMessengerKey,
home: AppHome(),
),
Expand Down
12 changes: 12 additions & 0 deletions lib/src/controller/controller.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1125,4 +1125,16 @@ class AppController with ChangeNotifier {
final query = database.select(database.tags);
return query.get();
}

Duration calcAnimationDuration({
Duration initialDuration = const Duration(milliseconds: 300),
}) {
return profile.animationSpeed == 0
? Duration.zero
: Duration(
milliseconds:
(initialDuration.inMilliseconds / profile.animationSpeed)
.toInt(),
);
}
}
25 changes: 25 additions & 0 deletions lib/src/screens/explore/explore_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ import 'package:interstellar/src/controller/server.dart';
import 'package:interstellar/src/screens/explore/explore_screen_item.dart';
import 'package:interstellar/src/utils/debouncer.dart';
import 'package:interstellar/src/utils/utils.dart';
import 'package:interstellar/src/widgets/hide_on_scroll.dart';
import 'package:interstellar/src/widgets/paging.dart';
import 'package:interstellar/src/widgets/selection_menu.dart';
import 'package:interstellar/src/widgets/wrapper.dart';
import 'package:material_symbols_icons/symbols.dart';
import 'package:provider/provider.dart';

Expand Down Expand Up @@ -121,13 +123,16 @@ class _ExploreScreenState extends State<ExploreScreen>
}
},
);
late final ScrollController _scrollController;

@override
bool get wantKeepAlive => true;

@override
void initState() {
super.initState();

_scrollController = ScrollController();
_focusNode = widget.focusNode ?? FocusNode();

_selected = widget.selected;
Expand Down Expand Up @@ -170,6 +175,7 @@ class _ExploreScreenState extends State<ExploreScreen>
),
body: AdvancedPagedScrollView(
controller: _pagingController,
scrollController: _scrollController,
leadingSlivers: [
if (!widget.subOnly &&
widget.mode != ExploreType.feeds &&
Expand Down Expand Up @@ -464,6 +470,25 @@ class _ExploreScreenState extends State<ExploreScreen>
);
},
),
floatingActionButton: Wrapper(
shouldWrap: ac.profile.hideFeedUIOnScroll,
parentBuilder: (child) => HideOnScroll(
controller: _scrollController,
hiddenOffset: Offset(0, 1.5),
duration: ac.calcAnimationDuration(),
child: child,
),
child: FloatingActionButton(
onPressed: () {
_scrollController.animateTo(
_scrollController.position.minScrollExtent,
duration: Durations.long1,
curve: Curves.easeInOut,
);
},
child: const Icon(Symbols.keyboard_double_arrow_up_rounded),
),
),
);
}

Expand Down
40 changes: 31 additions & 9 deletions lib/src/screens/explore/user_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import 'package:interstellar/src/screens/feed/post_item.dart';
import 'package:interstellar/src/screens/feed/post_page.dart';
import 'package:interstellar/src/utils/utils.dart';
import 'package:interstellar/src/widgets/avatar.dart';
import 'package:interstellar/src/widgets/hide_on_scroll.dart';
import 'package:interstellar/src/widgets/image.dart';
import 'package:interstellar/src/widgets/loading_button.dart';
import 'package:interstellar/src/widgets/loading_template.dart';
Expand All @@ -31,6 +32,7 @@ import 'package:interstellar/src/widgets/subscription_button.dart';
import 'package:interstellar/src/widgets/tags/tag_widget.dart';
import 'package:interstellar/src/widgets/user_status_icons.dart';
import 'package:interstellar/src/widgets/menus/user_menu.dart';
import 'package:interstellar/src/widgets/wrapper.dart';
import 'package:material_symbols_icons/symbols.dart';
import 'package:provider/provider.dart';

Expand All @@ -50,7 +52,7 @@ class UserScreen extends StatefulWidget {
class _UserScreenState extends State<UserScreen> {
DetailedUserModel? _data;
late FeedSort _sort;
final ScrollController _scrollController = ScrollController();
late final ScrollController _scrollController;
final List<GlobalKey<_UserScreenBodyState>> _feedKeyList = [];

GlobalKey<_UserScreenBodyState> _getFeedKey(int index) {
Expand All @@ -64,6 +66,8 @@ class _UserScreenState extends State<UserScreen> {
void initState() {
super.initState();

_scrollController = ScrollController();

_data = widget.initData;
_sort = context.read<AppController>().profile.feedDefaultExploreSort;

Expand All @@ -81,14 +85,12 @@ class _UserScreenState extends State<UserScreen> {

return value.copyWith(tags: [...value.tags, ...tags]);
})
.then(
(value) {
if (!mounted) return;
setState(() {
_data = value;
});
}
);
.then((value) {
if (!mounted) return;
setState(() {
_data = value;
});
});
}
}

Expand Down Expand Up @@ -166,6 +168,7 @@ class _UserScreenState extends State<UserScreen> {
onTabSelected: (newIndex) => setState(() {}),
child: NestedScrollView(
controller: _scrollController,
floatHeaderSlivers: true,
headerSliverBuilder: (context, innerBoxIsScrolled) => [
SliverToBoxAdapter(
child: Column(
Expand Down Expand Up @@ -481,6 +484,25 @@ class _UserScreenState extends State<UserScreen> {
),
),
),
floatingActionButton: Wrapper(
shouldWrap: ac.profile.hideFeedUIOnScroll,
parentBuilder: (child) => HideOnScroll(
controller: _scrollController,
hiddenOffset: Offset(0, 2),
duration: ac.calcAnimationDuration(),
child: child,
),
child: FloatingActionButton(
onPressed: () {
_scrollController.animateTo(
_scrollController.position.minScrollExtent,
duration: Durations.long1,
curve: Curves.easeInOut,
);
},
child: const Icon(Symbols.keyboard_double_arrow_up_rounded),
),
),
);
}
}
Expand Down
Loading