Skip to content

Commit

Permalink
Merge branch 'develop' into saved_comments
Browse files Browse the repository at this point in the history
# Conflicts:
#	lib/community/widgets/community_sidebar.dart
#	lib/user/widgets/user_sidebar.dart
  • Loading branch information
CTalvio committed Aug 16, 2023
2 parents f7c1dbd + 987a82e commit 132f0db
Show file tree
Hide file tree
Showing 82 changed files with 5,680 additions and 2,438 deletions.
19 changes: 19 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
## Pull Request Description

<!--- Please describe what was changed -->

## Issue Being Fixed

<!-- Please describe the problem that is being fixed and, if applicable, reference a GitHub issue -->

Issue Number: N/A

## Screenshots / Recordings

<!-- This section is optional but highly recommended to show off your changes! -->

## Checklist

- [ ] Did you update CHANGELOG.md?
- [ ] Did you use localized strings where applicable?
- [ ] Did you add `semanticLabel`s where applicable for accessibility?
54 changes: 54 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,24 @@
## Unreleased
### Added
- Show OP identification first before self/mod/admin - contribution from @micahmo
- Show full text of a URL when activating tooltip on post in feed - contribution from @micahmo
- Added identifier for bot accounts - contribution from @micahmo

### Changed
- Prioritize and label the default accent color - contribution from @micahmo
- Hide the gesture customize hint when the gestures are disabled - contribution from @micahmo
- Improvements to text post indicator preview - contribution from @micahmo

### Fixed
- Handle issue where some deferred comments won't load - contribution from @micahmo

## 0.2.3+16 - 2023-08-15
### Fixed
- Fixed issue with reply FAB action - contribution from @micahmo

## 0.2.2+15 - 2023-08-14
### Added
- Added long press on profile icon to bring up profile modal @zdzoz
- Added spinning circle animation on comment card while waiting for comment to be deleted/restored - contribution from @ajsosa
- Added vote count to comment card in comment list for the user profile - contribution from @ajsosa
- Show instance taglines in the feed - contribution from @micahmo
Expand All @@ -14,6 +33,18 @@
- Added moderator identifier to comments - contribution from @micahmo
- Added ability to navigate to user's profile from comment body - contribution from @micahmo
- Added support for exact community name search - contribution from @micahmo
- Overhauled floating action button with expandable and customizable actions - contribution from @CTalvio
- Added additional localization strings to Thunder, and added temporary language files for Swedish/Finnish
- Added manual refreshing to the user account page - contribution from @micahmo
- Added inkwell effect when tapping on usernames in comments - contribution from @micahmo
- Added additional font scaling options for comments and metadata
- Long-pressing on FAB shows extended actions - contribution from @micahmo
- Added support for customziable short-press and long-press FAB actions - contribution from @micahmo
- Added thumbnail badges to posts for more clarity - contribution from @CTalvio
- Added domain for posts linking to external websites - contribution from @CTalvio
- Added comment navigation buttons - contribution from @micahmo
- Added full screen swipe to go back on main pages
- Added new option scrape missing external link previews which is off by default. Its purpose is to attempt to find an image when an external link thumbnail is not available - contribution @ajsosa

### Changed
- Removed tap zones for author/community on compact post cards - contribution from @CTalvio
Expand All @@ -22,6 +53,16 @@
- Respect comment deleted in reply modal, and inbox - contribution from @ajsosa
- Improvements to sort picker to allow for navigating back when selecting top option - contribution from @micahmo
- Minor UI improvements to comment images, community image banners, and image viewer - contribution from @CTalvio
- Minor sidebar shadow adjustment - contribution from @CTalvio
- Snappier image load transition - contribution from @micahmo
- Align back button in image preview with the back button in the main pages - contribution from @micahmo
- Moved location of comment button within image preview - contribution from @micahmo
- Adjusted font scaling to be platform specific
- Improve behavior of deferred comment indicator - contribution from @micahmo
- Text scaling now respects system's font scaling. Text scaling is based off of the system font
- Improved contrast on user chips and badges - contribution from @CTalvio
- Show external link previews option is now scrape missing external link previews and off by default for performance reasons - contribution from @ajsosa
- Make it easier to distinguish different post types in the Compact List View - contribution from @tom-james-watson

### Fixed
- Fixed issue where the community post feed was missing the last post - contribution from @ajsosa
Expand All @@ -31,6 +72,19 @@
- Fixed infinite spinning circle when loading a user's posts in the user profile - contribution from @ajsosa
- Fixed issue where toast notifications were not showing up in the post page - contribution from @ajsosa
- Removed sliver of border color that was present on root comments for both thick and thin style comments - contribution from @ajsosa
- Fixed issue where saving an image on Android would save to Pictures/Pictures/Thunder instead of Pictures/Thunder
- Fixed comment highlighting for comment context regression - contribution from @ajsosa
- Fixed another instance of infinite spin for comment loading - contribution from @ajsosa
- Fixed mis-aligned previews in comfort cards for edge-to-edge links from @Fmstrat
- Fixed missing community icons in feed - contribution from @sant0s12
- Fixed issue where more posts would not load if initial posts fit the screen
- Fixed issue where compact feed would not load properly when "Enable Link Preview" setting was turned on
- Fixed semantic issue where user comments would read the improper value for downvotes
- Fixed issue where you could not vote/save comments in quick succession
- Fix improper back button handling - contribution from @micahmo
- Fixed feed page reaching the end in some cases where NSFW content is turned on
- Fixed issue where external link thumbnails weren't being displayed due to show external link previews option being off which was only intended to prevent html scraping - contribution from @ajsosa
- Fixed community/user link handling from posts - contribution from @micahmo

## 0.2.1+13 - 2023-07-25
### Added
Expand Down
Binary file modified fonts/Thunder.ttf
Binary file not shown.
6 changes: 6 additions & 0 deletions fonts/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@
"shield"
]
},
{
"uid": "4d2fa63100b37049b9a283d624cbf3ab",
"css": "robot",
"code": 62788,
"src": "fontawesome5"
},
{
"uid": "f2088d40faba7c348aa6284425f43501",
"css": "shield-account",
Expand Down
3 changes: 2 additions & 1 deletion lib/account/widgets/profile_modal_body.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
import 'package:cached_network_image/cached_network_image.dart';
import 'package:swipeable_page_route/swipeable_page_route.dart';

import 'package:thunder/account/models/account.dart';
import 'package:thunder/account/pages/login_page.dart';
Expand Down Expand Up @@ -43,7 +44,7 @@ class ProfileModalBody extends StatelessWidget {
page = LoginPage(popRegister: popRegister);
break;
}
return MaterialPageRoute<dynamic>(
return SwipeablePageRoute<dynamic>(
builder: (context) {
return page;
},
Expand Down
16 changes: 15 additions & 1 deletion lib/community/bloc/community_bloc.dart
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ class CommunityBloc extends Bloc<CommunityEvent, CommunityState> {
_blockCommunityEvent,
transformer: throttleDroppable(throttleDuration),
);
on<DismissReadEvent>(
_dismissReadEvent,
transformer: throttleDroppable(throttleDuration),
);
}

Future<void> _updatePostEvent(UpdatePostEvent event, Emitter<CommunityState> emit) async {
Expand Down Expand Up @@ -253,7 +257,7 @@ class CommunityBloc extends Bloc<CommunityEvent, CommunityState> {
listingType: listingType,
communityId: communityId,
communityName: event.communityName,
hasReachedEnd: posts.isEmpty || posts.length < limit,
hasReachedEnd: batch.isEmpty || batch.length < limit,
subscribedType: subscribedType,
sortType: sortType,
communityInfo: getCommunityResponse,
Expand Down Expand Up @@ -478,4 +482,14 @@ class CommunityBloc extends Bloc<CommunityEvent, CommunityState> {
);
}
}

Future<void> _dismissReadEvent(DismissReadEvent event, Emitter<CommunityState> emit) async {
// Take existing post list, and remove read entries, then emit, I think

try {
return;
} catch (e) {
emit(state.copyWith(status: CommunityStatus.failure, errorMessage: e.toString()));
}
}
}
4 changes: 4 additions & 0 deletions lib/community/bloc/community_event.dart
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,7 @@ class BlockCommunityEvent extends CommunityEvent {

const BlockCommunityEvent({required this.communityId, this.block = false});
}

class DismissReadEvent extends CommunityEvent {
const DismissReadEvent();
}
Loading

0 comments on commit 132f0db

Please sign in to comment.