This repository has been archived by the owner on May 24, 2024. It is now read-only.
Messagecontroller #216
Closed
Messagecontroller #216
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit fb3a037.
new file: examples/BasicMessageController/BasicMessageController/BasicMessageController.xcodeproj/project.pbxproj new file: examples/BasicMessageController/BasicMessageController/BasicMessageController/resources/BasicMessageController-Info.plist new file: examples/BasicMessageController/BasicMessageController/BasicMessageController/resources/CSS/NIPickerCell.css new file: examples/BasicMessageController/BasicMessageController/BasicMessageController/resources/CSS/root.css new file: examples/BasicMessageController/BasicMessageController/BasicMessageController/src/AppDelegate.h new file: examples/BasicMessageController/BasicMessageController/BasicMessageController/src/AppDelegate.m new file: examples/BasicMessageController/BasicMessageController/BasicMessageController/src/BasicMessageController_Prefix.pch new file: examples/BasicMessageController/BasicMessageController/BasicMessageController/src/MainViewController.h new file: examples/BasicMessageController/BasicMessageController/BasicMessageController/src/MainViewController.m new file: examples/BasicMessageController/BasicMessageController/BasicMessageController/src/SearchTableViewModel.h new file: examples/BasicMessageController/BasicMessageController/BasicMessageController/src/SearchTableViewModel.m new file: examples/BasicMessageController/BasicMessageController/BasicMessageController/src/SearchViewController.h new file: examples/BasicMessageController/BasicMessageController/BasicMessageController/src/SearchViewController.m new file: examples/BasicMessageController/BasicMessageController/BasicMessageController/src/main.m modified: examples/webcontroller/BasicWebController/BasicWebController.xcodeproj/project.pbxproj modified: src/core/src/NICommonMetrics.h modified: src/core/src/NICommonMetrics.m modified: src/core/src/UIView+NimbusCore.h modified: src/core/src/UIView+NimbusCore.m new file: src/messagecontroller/NIActivityLabel.h new file: src/messagecontroller/NIActivityLabel.m new file: src/messagecontroller/NIGradientView.h new file: src/messagecontroller/NIGradientView.m new file: src/messagecontroller/NIMessageController.h new file: src/messagecontroller/NIMessageController.m new file: src/messagecontroller/NIMessageField.h new file: src/messagecontroller/NIMessageField.m new file: src/messagecontroller/NIMessageRecipientField.h new file: src/messagecontroller/NIMessageRecipientField.m new file: src/messagecontroller/NIMessageSubjectField.h new file: src/messagecontroller/NIMessageSubjectField.m new file: src/messagecontroller/NIMessageTextField.h new file: src/messagecontroller/NIMessageTextField.m new file: src/messagecontroller/NIPickerTextField.h new file: src/messagecontroller/NIPickerTextField.m new file: src/messagecontroller/NIPickerViewCell.h new file: src/messagecontroller/NIPickerViewCell.m new file: src/messagecontroller/NISearchTextField.h new file: src/messagecontroller/NISearchTextField.m new file: src/messagecontroller/NISearchTextFieldInternal.h new file: src/messagecontroller/NISearchTextFieldInternal.m new file: src/messagecontroller/NITableViewSearchModel.h new file: src/messagecontroller/NITableViewSearchModel.m new file: src/messagecontroller/NimbusMessageController+Namespace.h new file: src/messagecontroller/NimbusMessageController.h
modified: examples/BasicMessageController/BasicMessageController/BasicMessageController.xcodeproj/project.pbxproj modified: examples/css/CSSDemo/resources/css/root/root.css deleted: src/messagecontroller/NIActivityLabel.h deleted: src/messagecontroller/NIActivityLabel.m deleted: src/messagecontroller/NIGradientView.h deleted: src/messagecontroller/NIGradientView.m deleted: src/messagecontroller/NIMessageController.h deleted: src/messagecontroller/NIMessageController.m deleted: src/messagecontroller/NIMessageField.h deleted: src/messagecontroller/NIMessageField.m deleted: src/messagecontroller/NIMessageRecipientField.h deleted: src/messagecontroller/NIMessageRecipientField.m deleted: src/messagecontroller/NIMessageSubjectField.h deleted: src/messagecontroller/NIMessageSubjectField.m deleted: src/messagecontroller/NIMessageTextField.h deleted: src/messagecontroller/NIMessageTextField.m deleted: src/messagecontroller/NIPickerTextField.h deleted: src/messagecontroller/NIPickerTextField.m deleted: src/messagecontroller/NIPickerViewCell.h deleted: src/messagecontroller/NIPickerViewCell.m deleted: src/messagecontroller/NISearchTextField.h deleted: src/messagecontroller/NISearchTextField.m deleted: src/messagecontroller/NISearchTextFieldInternal.h deleted: src/messagecontroller/NISearchTextFieldInternal.m deleted: src/messagecontroller/NITableViewSearchModel.h deleted: src/messagecontroller/NITableViewSearchModel.m deleted: src/messagecontroller/NimbusMessageController+Namespace.h deleted: src/messagecontroller/NimbusMessageController.h
new file: src/messagecontroller/deps new file: src/messagecontroller/src/NIActivityLabel.h new file: src/messagecontroller/src/NIActivityLabel.m new file: src/messagecontroller/src/NIGradientView.h new file: src/messagecontroller/src/NIGradientView.m new file: src/messagecontroller/src/NIMessageController.h new file: src/messagecontroller/src/NIMessageController.m new file: src/messagecontroller/src/NIMessageField.h new file: src/messagecontroller/src/NIMessageField.m new file: src/messagecontroller/src/NIMessageRecipientField.h new file: src/messagecontroller/src/NIMessageRecipientField.m new file: src/messagecontroller/src/NIMessageSubjectField.h new file: src/messagecontroller/src/NIMessageSubjectField.m new file: src/messagecontroller/src/NIMessageTextField.h new file: src/messagecontroller/src/NIMessageTextField.m new file: src/messagecontroller/src/NIPickerTextField.h new file: src/messagecontroller/src/NIPickerTextField.m new file: src/messagecontroller/src/NIPickerViewCell.h new file: src/messagecontroller/src/NIPickerViewCell.m new file: src/messagecontroller/src/NISearchTextField.h new file: src/messagecontroller/src/NISearchTextField.m new file: src/messagecontroller/src/NISearchTextFieldInternal.h new file: src/messagecontroller/src/NISearchTextFieldInternal.m new file: src/messagecontroller/src/NITableViewSearchModel.h new file: src/messagecontroller/src/NITableViewSearchModel.m new file: src/messagecontroller/src/NimbusMessageController+Namespace.h new file: src/messagecontroller/src/NimbusMessageController.h
A few bug fixes for NimbusMessageController modified: src/messagecontroller/src/NIActivityLabel.h modified: src/messagecontroller/src/NIActivityLabel.m new file: src/messagecontroller/src/NIPostController.h new file: src/messagecontroller/src/NIPostController.m modified: src/messagecontroller/src/NimbusMessageController.h modified: src/webcontroller/src/NIWebController.h modified: src/webcontroller/src/NIWebController.m
modified: src/messagecontroller/src/NIPostController.h modified: src/messagecontroller/src/NIPostController.m
…proj/project.pbxproj new file: examples/photos/NetworkPhotoAlbums/src/JSONKit.h new file: examples/photos/NetworkPhotoAlbums/src/JSONKit.m
Conflicts: examples/photos/NetworkPhotoAlbums/NetworkPhotoAlbum.xcodeproj/project.pbxproj src/webcontroller/src/NIWebController.h src/webcontroller/src/NIWebController.m
modified: examples/BasicMessageController/BasicMessageController/BasicMessageController.xcodeproj/project.pbxproj modified: examples/BasicMessageController/BasicMessageController/BasicMessageController/src/AppDelegate.h modified: examples/BasicMessageController/BasicMessageController/BasicMessageController/src/AppDelegate.m modified: examples/BasicMessageController/BasicMessageController/BasicMessageController/src/MainViewController.m modified: examples/BasicMessageController/BasicMessageController/BasicMessageController/src/SearchViewController.h modified: examples/BasicMessageController/BasicMessageController/BasicMessageController/src/SearchViewController.m modified: examples/BasicMessageController/BasicMessageController/BasicMessageController/src/main.m modified: src/core/src/NIDataStructures.m modified: src/core/src/NIInMemoryCache.m modified: src/core/src/NIOperations+Subclassing.h modified: src/core/src/NIOperations.h modified: src/core/src/NIViewRecycler.m modified: src/messagecontroller/src/NIActivityLabel.h modified: src/messagecontroller/src/NIActivityLabel.m modified: src/messagecontroller/src/NIGradientView.h modified: src/messagecontroller/src/NIGradientView.m modified: src/messagecontroller/src/NIMessageController.h modified: src/messagecontroller/src/NIMessageController.m modified: src/messagecontroller/src/NIMessageField.m modified: src/messagecontroller/src/NIMessageRecipientField.m modified: src/messagecontroller/src/NIMessageTextField.m modified: src/messagecontroller/src/NIPickerTextField.h modified: src/messagecontroller/src/NIPickerTextField.m modified: src/messagecontroller/src/NIPickerViewCell.h modified: src/messagecontroller/src/NIPickerViewCell.m modified: src/messagecontroller/src/NISearchTextField.h modified: src/messagecontroller/src/NISearchTextField.m modified: src/messagecontroller/src/NISearchTextFieldInternal.h modified: src/models/src/NICellFactory.h modified: src/models/src/NICellFactory.m modified: src/models/src/NIFormCellCatalog.h modified: src/models/src/NITableViewModel.h
…into messagecontroller
…into messagecontroller
| @@ -52,7 +52,7 @@ - (void)loadThumbnails { | |||
|
|
|||
| /////////////////////////////////////////////////////////////////////////////////////////////////// | |||
| - (void (^)(NSURLRequest *request, NSHTTPURLResponse *response, id JSON))blockForAlbumProcessing { | |||
| return ^(NSURLRequest *request, NSHTTPURLResponse *response, id object) { | |||
| return [^(NSURLRequest *request, NSHTTPURLResponse *response, id object) { | |||
There was a problem hiding this comment.
This should be separated out into a separate pull request.
Conflicts: examples/catalog/Catalog/ActionsTableModelViewController.h src/core/src/UIView+NimbusCore.m
modified: src/messagecontroller/src/NIPickerTextField.h modified: src/messagecontroller/src/NIPostController.m modified: src/messagecontroller/src/NISearchTextField.h
Conflicts: src/models/src/NICellFactory.m src/models/src/NIFormCellCatalog.h src/models/src/NITableViewModel.h modified: src/attributedlabel/src/NIAttributedLabel.h modified: src/attributedlabel/src/NIAttributedLabel.m modified: src/core/src/NISDKAvailability.m modified: src/core/src/NimbusCore+Namespace.h modified: src/launcher/src/NILauncherView.h modified: src/launcher/src/NILauncherViewController.h modified: src/models/src/NICellBackgrounds.h modified: src/models/src/NICellBackgrounds.m modified: src/models/src/NICellCatalog.h modified: src/models/src/NICellCatalog.m modified: src/models/src/NICellFactory.m modified: src/models/src/NIFormCellCatalog.h modified: src/models/src/NIRadioGroup.h modified: src/models/src/NIRadioGroup.m modified: src/models/src/NITableViewActions.m modified: src/models/src/NITableViewModel+Private.h modified: src/models/src/NITableViewModel.h modified: src/models/unittests/NICellFactoryTests.m modified: src/pagingscrollview/src/NIPagingScrollView.h modified: src/pagingscrollview/src/NIPagingScrollView.m modified: thirdparty/AFNetworking (untracked content)
| @@ -175,8 +175,13 @@ + (id)objectFromKeyClass:(Class)keyClass map:(NSMutableDictionary *)map { | |||
| /////////////////////////////////////////////////////////////////////////////////////////////////// | |||
| /////////////////////////////////////////////////////////////////////////////////////////////////// | |||
| @interface NICellObject() | |||
| <<<<<<< HEAD | |||
Conflicts: examples/photos/NetworkPhotoAlbums/src/DribbblePhotoAlbumViewController.m examples/photos/NetworkPhotoAlbums/src/FacebookPhotoAlbumViewController.m
|
Any update on this pull request? We're very interested in this feature. Let me know if there's anything you need to get it merged. |
|
I'm also interested in this pull request. Any reason why it's not merged? |
|
There are too many non-related changes in this pull request for me to be able to cleanly merge it into Nimbus. I need to scale my time spent on Nimbus in a reasonable way and redoing pull requests is not a scalable task for me. |
|
If anyone is interested in taking a look at making this fork more compliant I am open to that. I have been keeping it up to date with changes to the main repository so I can continue to use in my projects but I also do not have time to make this compliant with the requested changes to integrate with the main repository. |
|
FYI, I also have a TableViewModel that works with CoreData in my GitHub if anyone is interested in that. |
| @@ -16,6 +16,15 @@ | |||
|
|
|||
| #import <UIKit/UIKit.h> | |||
|
|
|||
| <<<<<<< HEAD:src/core/src/UIView+NimbusCore.h | |||
|
This pull request has 59 commits including a large number of merge commits and merge conflicts. If you wish to continue with the proposed change please fix the build problems and, to ease review, organize the proposed changes in a more structured fashion. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Port of Three20 MessageController for Issue #12 in https://github.com/jverkoey/nimbus
#12