Skip to content

Independent Categories and Cross-posting panels #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mbradley wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Independent Categories and Cross-posting panels #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions Source/RFPostController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@
@property (strong, nonatomic) IBOutlet NSLayoutConstraint* textTopConstraint;
@property (strong, nonatomic) IBOutlet NSLayoutConstraint* photosHeightConstraint;
@property (strong, nonatomic) IBOutlet NSLayoutConstraint* categoriesHeightConstraint;
@property (strong, nonatomic) NSCollectionView* crosspostCollectionView;
@property (strong, nonatomic) NSLayoutConstraint* crosspostHeightConstraint;
@property (strong, nonatomic) IBOutlet NSLayoutConstraint* summaryHeightConstraint;
@property (strong, nonatomic) IBOutlet NSLayoutConstraint* summaryTextHeightConstraint;
@property (strong, nonatomic) IBOutlet NSLayoutConstraint* photoButtonLeftConstraint;
Expand Down
186 changes: 142 additions & 44 deletions Source/RFPostController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,12 @@ - (void) viewDidLoad
[self setupNotifications];

[self updateTitleHeaderWithAnimation:NO];

if (!self.editingPost && !self.isReply) {
self.isShowingCategories = [[NSUserDefaults standardUserDefaults] boolForKey:kIsShowingCategories];
self.isShowingCrosspostServices = [[NSUserDefaults standardUserDefaults] boolForKey:kIsShowingCrosspostServices];
}

[self downloadCategories];
[self downloadBlogs];
}
Expand Down Expand Up @@ -268,7 +274,7 @@ - (void) setupCollectionView
{
self.photosCollectionView.delegate = self;
self.photosCollectionView.dataSource = self;

[self.photosCollectionView registerNib:[[NSNib alloc] initWithNibNamed:@"PhotoCell" bundle:nil] forItemWithIdentifier:kPhotoCellIdentifier];

if (self.attachedPhotos.count > 0) {
Expand All @@ -278,9 +284,61 @@ - (void) setupCollectionView
self.photosHeightConstraint.constant = 0;
}

// Categories collection view (from XIB) — categories only
NSCollectionViewFlowLayout* categoriesLayout = [[NSCollectionViewFlowLayout alloc] init];
categoriesLayout.minimumInteritemSpacing = 4;
categoriesLayout.minimumLineSpacing = 0;
self.categoriesCollectionView.collectionViewLayout = categoriesLayout;
[self.categoriesCollectionView registerNib:[[NSNib alloc] initWithNibNamed:@"CategoryCell" bundle:nil] forItemWithIdentifier:kCategoryCellIdentifier];
[self.categoriesCollectionView registerNib:[[NSNib alloc] initWithNibNamed:@"CrosspostCell" bundle:nil] forItemWithIdentifier:kCrosspostCellIdentifier];
self.categoriesHeightConstraint.constant = 0;

NSScrollView* categoriesScrollView = self.categoriesCollectionView.enclosingScrollView;
categoriesScrollView.hasVerticalScroller = YES;
categoriesScrollView.autohidesScrollers = YES;

// Crosspost collection view (programmatic)
NSScrollView* photosScrollView = self.photosCollectionView.enclosingScrollView;
NSView* superview = categoriesScrollView.superview;

NSCollectionViewFlowLayout* layout = [[NSCollectionViewFlowLayout alloc] init];
layout.itemSize = NSMakeSize(120, 30);
layout.minimumInteritemSpacing = 4;
layout.minimumLineSpacing = 0;

NSCollectionView* crosspostCV = [[NSCollectionView alloc] initWithFrame:NSZeroRect];
crosspostCV.collectionViewLayout = layout;
crosspostCV.delegate = self;
crosspostCV.dataSource = self;
crosspostCV.backgroundColors = @[[NSColor clearColor]];
[crosspostCV registerNib:[[NSNib alloc] initWithNibNamed:@"CrosspostCell" bundle:nil] forItemWithIdentifier:kCrosspostCellIdentifier];
self.crosspostCollectionView = crosspostCV;

NSScrollView* crosspostScrollView = [[NSScrollView alloc] initWithFrame:NSZeroRect];
crosspostScrollView.documentView = crosspostCV;
crosspostScrollView.drawsBackground = NO;
crosspostScrollView.hasVerticalScroller = YES;
crosspostScrollView.autohidesScrollers = YES;
crosspostScrollView.translatesAutoresizingMaskIntoConstraints = NO;
[superview addSubview:crosspostScrollView];

// Remove existing constraint between categories and photos scroll views
for (NSLayoutConstraint* constraint in [superview.constraints copy]) {
if ((constraint.firstItem == photosScrollView && constraint.firstAttribute == NSLayoutAttributeTop && constraint.secondItem == categoriesScrollView) ||
(constraint.secondItem == photosScrollView && constraint.secondAttribute == NSLayoutAttributeTop && constraint.firstItem == categoriesScrollView)) {
[superview removeConstraint:constraint];
break;
}
}

// Insert crosspost scroll view between categories and photos
self.crosspostHeightConstraint = [crosspostScrollView.heightAnchor constraintEqualToConstant:0];
[NSLayoutConstraint activateConstraints:@[
[crosspostScrollView.leadingAnchor constraintEqualToAnchor:superview.leadingAnchor],
[crosspostScrollView.trailingAnchor constraintEqualToAnchor:superview.trailingAnchor],
[crosspostScrollView.topAnchor constraintEqualToAnchor:categoriesScrollView.bottomAnchor constant:4],
[photosScrollView.topAnchor constraintEqualToAnchor:crosspostScrollView.bottomAnchor constant:4],
self.crosspostHeightConstraint
]];
}

- (void) setupSummary
Expand Down Expand Up @@ -506,21 +564,33 @@ - (void) updateTitleHeaderWithAnimation:(BOOL)animate
- (void) updateCategoriesPane
{
if (self.isShowingCategories) {
NSInteger estimated_rows = ceil (self.categories.count / [self bestCheckboxColumnsCount]);
if (estimated_rows == 0) {
estimated_rows = 1;
}
self.categoriesHeightConstraint.animator.constant = estimated_rows * 30.0;
CGFloat w = self.categoriesCollectionView.enclosingScrollView.bounds.size.width;
CGFloat contentHeight = [self calculatedPaneHeightForTitles:self.categories inWidth:w];
CGFloat maxHeight = 120.0;
self.categoriesHeightConstraint.animator.constant = MIN(contentHeight, maxHeight);
}
else {
self.categoriesHeightConstraint.animator.constant = 0;
}
else if (self.isShowingCrosspostServices) {
NSInteger estimated_rows = ceil (self.crosspostServices.count / [self bestCheckboxColumnsCount]);
if (estimated_rows == 0) {
estimated_rows = 1;
}

- (void) updateCrosspostPane
{
if (self.isShowingCrosspostServices) {
NSMutableArray* titles = [NSMutableArray array];
for (NSDictionary* info in self.crosspostServices) {
NSString* name = info[@"name"];
if (name) {
[titles addObject:name];
}
}
self.categoriesHeightConstraint.animator.constant = estimated_rows * 30.0;
CGFloat w = self.crosspostCollectionView.enclosingScrollView.bounds.size.width;
CGFloat contentHeight = [self calculatedPaneHeightForTitles:titles inWidth:w];
CGFloat maxHeight = 120.0;
self.crosspostHeightConstraint.animator.constant = MIN(contentHeight, maxHeight);
}
else {
self.categoriesHeightConstraint.animator.constant = 0;
self.crosspostHeightConstraint.animator.constant = 0;
}
}

Expand Down Expand Up @@ -576,23 +646,47 @@ - (void) updateSelectedCheckboxes
if (self.isShowingCategories) {
self.selectedCategories = [self currentSelectedCategories];
}
else if (self.isShowingCrosspostServices) {
if (self.isShowingCrosspostServices) {
self.selectedCrosspostUIDs = [self currentSelectedCrossposting];
}
}

- (NSInteger) bestCheckboxColumnsCount
- (CGFloat) widthForCheckboxTitle:(NSString *)title
{
CGFloat w = self.categoriesCollectionView.bounds.size.width;
if (w > 600.0) {
return 4;
NSDictionary* attrs = @{NSFontAttributeName: [NSFont systemFontOfSize:13]};
CGFloat textWidth = ceil([title sizeWithAttributes:attrs].width);
return textWidth + 40; // checkbox indicator + margins
}

- (CGFloat) calculatedPaneHeightForTitles:(NSArray *)titles inWidth:(CGFloat)availableWidth
{
if (titles.count == 0) {
return 30.0;
}
else if (w > 400.0) {
return 3;
if (availableWidth <= 0) {
availableWidth = 400;
}
else {
return 2;

CGFloat spacing = 4;
CGFloat currentRowWidth = 0;
NSInteger rows = 1;

for (NSString* title in titles) {
CGFloat itemWidth = [self widthForCheckboxTitle:title];

if (currentRowWidth > 0 && currentRowWidth + spacing + itemWidth > availableWidth) {
rows++;
currentRowWidth = itemWidth;
}
else {
if (currentRowWidth > 0) {
currentRowWidth += spacing;
}
currentRowWidth += itemWidth;
}
}

return rows * 30.0;
}

#pragma mark -
Expand Down Expand Up @@ -643,13 +737,11 @@ - (IBAction) toggleTitleField:(id)sender
- (IBAction) toggleCategories:(id)sender
{
[self updateSelectedCheckboxes];

self.isShowingCategories = !self.isShowingCategories;
self.isShowingCrosspostServices = NO;
self.isShowingSummary = NO;
[[NSUserDefaults standardUserDefaults] setBool:self.isShowingCategories forKey:kIsShowingCategories];

[self updateCategoriesPane];
[self updateSummaryPane];
[self.categoriesCollectionView reloadData];
}

Expand All @@ -658,25 +750,19 @@ - (IBAction) toggleCrossposting:(id)sender
[self updateSelectedCheckboxes];

self.isShowingCrosspostServices = !self.isShowingCrosspostServices;
self.isShowingCategories = NO;
self.isShowingSummary = NO;
[[NSUserDefaults standardUserDefaults] setBool:self.isShowingCrosspostServices forKey:kIsShowingCrosspostServices];

[self updateCategoriesPane];
[self updateSummaryPane];
[self.categoriesCollectionView reloadData];
[self updateCrosspostPane];
[self.crosspostCollectionView reloadData];
}

- (IBAction) toggleSummary:(id)sender
{
[self updateSelectedCheckboxes];

self.isShowingSummary = !self.isShowingSummary;
self.isShowingCategories = NO;
self.isShowingCrosspostServices = NO;

[self updateCategoriesPane];
[self updateSummaryPane];
[self.categoriesCollectionView reloadData];
}

//- (IBAction) close:(id)sender
Expand Down Expand Up @@ -988,7 +1074,7 @@ - (NSInteger) collectionView:(NSCollectionView *)collectionView numberOfItemsInS
if (collectionView == self.photosCollectionView) {
return self.attachedPhotos.count;
}
else if (self.isShowingCrosspostServices) {
else if (collectionView == self.crosspostCollectionView) {
return self.crosspostServices.count;
}
else {
Expand Down Expand Up @@ -1029,7 +1115,7 @@ - (NSCollectionViewItem *) collectionView:(NSCollectionView *)collectionView ite

return item;
}
else if (self.isShowingCrosspostServices) {
else if (collectionView == self.crosspostCollectionView) {
NSDictionary* info = [self.crosspostServices objectAtIndex:indexPath.item];
NSString* service_uid = info[@"uid"];
NSString* service_name = info[@"name"];
Expand All @@ -1038,7 +1124,7 @@ - (NSCollectionViewItem *) collectionView:(NSCollectionView *)collectionView ite
item.uid = service_uid;
item.nameCheckbox.title = service_name;
item.nameCheckbox.state = [self.selectedCrosspostUIDs containsObject:service_uid];

return item;
}
else {
Expand Down Expand Up @@ -1069,8 +1155,15 @@ - (NSSize) collectionView:(NSCollectionView *)collectionView layout:(NSCollectio
cell_size.width = 100;
cell_size.height = 100;
}
else if (collectionView == self.crosspostCollectionView) {
NSDictionary* info = [self.crosspostServices objectAtIndex:indexPath.item];
NSString* name = info[@"name"] ?: @"";
cell_size.width = [self widthForCheckboxTitle:name];
cell_size.height = 30;
}
else {
cell_size.width = collectionView.bounds.size.width / [self bestCheckboxColumnsCount];
NSString* name = [self.categories objectAtIndex:indexPath.item];
cell_size.width = [self widthForCheckboxTitle:name];
cell_size.height = 30;
}

Expand Down Expand Up @@ -1174,12 +1267,12 @@ - (NSArray *) currentSelectedCategories
- (NSArray *) currentSelectedCrossposting
{
NSMutableArray* uids = [NSMutableArray array];

if (self.isShowingCrosspostServices) {
NSUInteger num = [self.categoriesCollectionView numberOfItemsInSection:0];
NSUInteger num = [self.crosspostCollectionView numberOfItemsInSection:0];
for (NSUInteger i = 0; i < num; i++) {
NSIndexPath* index_path = [NSIndexPath indexPathForItem:i inSection:0];
NSCollectionViewItem* item = [self.categoriesCollectionView itemAtIndexPath:index_path];
NSCollectionViewItem* item = [self.crosspostCollectionView itemAtIndexPath:index_path];
if ([item isKindOfClass:[MBCrosspostCell class]]) {
MBCrosspostCell* cell = (MBCrosspostCell *)item;
if (cell.nameCheckbox.state == NSControlStateValueOn) {
Expand All @@ -1188,7 +1281,7 @@ - (NSArray *) currentSelectedCrossposting
}
}
}

return uids;
}

Expand Down Expand Up @@ -2260,6 +2353,8 @@ - (void) downloadCategories
RFDispatchMain (^{
if (self.editingPost && ([self.editingPost.categories count] > 0)) {
self.isShowingCategories = YES;
}
if (self.isShowingCategories) {
[self updateCategoriesPane];
}
[self.categoriesCollectionView reloadData];
Expand Down Expand Up @@ -2299,7 +2394,10 @@ - (void) downloadBlogs
}
self.selectedCrosspostUIDs = selected_uids;
RFDispatchMain (^{
[self.categoriesCollectionView reloadData];
if (self.isShowingCrosspostServices) {
[self updateCrosspostPane];
}
[self.crosspostCollectionView reloadData];
});
}
}
Expand Down
2 changes: 2 additions & 0 deletions Source/RFSettings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ static NSString* const kDayOneJournalName = @"DayOneJournalName";
static NSString* const kTemporaryFoldersPrefKey = @"TemporaryFolders";
static NSString* const kIsShowingBookmarkSummaries = @"IsShowingBookmarkSummaries";
static NSString* const kIsUsingBlogThemePreview = @"IsUsingBlogThemePreview";
static NSString* const kIsShowingCategories = @"IsShowingCategories";
static NSString* const kIsShowingCrosspostServices = @"IsShowingCrosspostServices";

@interface RFSettings : NSObject

Expand Down