felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-18 13:42:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

HomeVC: Started HomeViewController that will replace RecentsVC as the main app page

Browse Source
This commit is contained in:
manuroe
2015-12-09 10:12:08 +01:00
parent aad25ca2a7
commit e6e086d9fc
3 changed files with 261 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Vector/Base.lproj/Main.storyboard
+42 -5
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9059" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="H1p-Uh-vWS">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9060" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="H1p-Uh-vWS">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9049"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9051"/>
</dependencies>
<scenes>
<!--RecentsNav-->
@@ -14,7 +14,7 @@
<animations/>
</navigationBar>
<connections>
<segue destination="Foe-o5-6Ud" kind="relationship" relationship="rootViewController" id="TOG-zb-B44"/>
<segue destination="Zhm-Yz-mrT" kind="relationship" relationship="rootViewController" id="OEv-Oh-v9s"/>
</connections>
</navigationController>
<placeholder placeholderIdentifier="IBFirstResponder" id="8fS-aE-onr" sceneMemberID="firstResponder"/>
@@ -176,6 +176,41 @@
</objects>
<point key="canvasLocation" x="4081" y="-3522"/>
</scene>
<!--Home View Controller-->
<scene sceneID="O3K-sK-0fA">
<objects>
<viewController id="Zhm-Yz-mrT" customClass="HomeViewController" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="NTL-bt-4A3"/>
<viewControllerLayoutGuide type="bottom" id="dim-1V-Mdx"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="jgV-fC-DUP">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<animations/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
<navigationItem key="navigationItem" id="lkL-Yi-y5i">
<barButtonItem key="leftBarButtonItem" image="settings_icon.png" id="RwK-LB-3ML">
<connections>
<segue destination="1TJ-Md-cjN" kind="show" id="rCU-QE-kdQ"/>
</connections>
</barButtonItem>
<barButtonItem key="rightBarButtonItem" image="search_icon.png" id="mxO-nq-rJ1">
<connections>
<action selector="onButtonPressed:" destination="Zhm-Yz-mrT" id="JyE-Bk-xvr"/>
</connections>
</barButtonItem>
</navigationItem>
<connections>
<outlet property="searchBarButtonIem" destination="mxO-nq-rJ1" id="J1s-2g-XGk"/>
<outlet property="settingsBarButtonItem" destination="RwK-LB-3ML" id="T3b-ii-7fa"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="pF2-9z-Wl6" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="1404" y="-2374"/>
</scene>
<!--Recents View Controller-->
<scene sceneID="EAJ-Vu-76j">
<objects>
@@ -219,7 +254,7 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Po3-cj-dhS" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="1452" y="-2350"/>
<point key="canvasLocation" x="2188" y="-2350"/>
</scene>
<!--Search View Controller-->
<scene sceneID="8iN-4m-YPt">
@@ -238,7 +273,7 @@
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="C8X-sk-odI" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="2260" y="-2287"/>
<point key="canvasLocation" x="2796" y="-2319"/>
</scene>
<!--RoomNav-->
<scene sceneID="r7l-gg-dq7">
@@ -277,9 +312,11 @@
</scene>
</scenes>
<resources>
<image name="search_icon.png" width="11" height="11"/>
<image name="settings_icon.png" width="22" height="22"/>
</resources>
<inferredMetricsTieBreakers>
<segue reference="rCU-QE-kdQ"/>
<segue reference="Vo4-8x-dtH"/>
<segue reference="vqM-5M-ctF"/>
</inferredMetricsTieBreakers>
Vector/ViewController/HomeViewController.h
+32
View File
@@ -0,0 +1,32 @@
/*
Copyright 2015 OpenMarket Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
#import "SegmentedViewController.h"
@interface HomeViewController : SegmentedViewController <UISearchBarDelegate>
@property (weak, nonatomic) IBOutlet UIBarButtonItem *settingsBarButtonItem;
@property (weak, nonatomic) IBOutlet UIBarButtonItem *searchBarButtonIem;
- (void)displayWithSession:(MXSession*)session;
/**
Action registered on `UIControlEventTouchUpInside` event for both buttons.
*/
- (IBAction)onButtonPressed:(id)sender;
@end
Vector/ViewController/HomeViewController.m
+187
View File
@@ -0,0 +1,187 @@
/*
Copyright 2015 OpenMarket Ltd
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
#import "HomeViewController.h"
#import "RecentsDataSource.h"
#import "RecentsViewController.h"
@interface HomeViewController ()
{
// The search bar
UISearchBar *searchBar;
RecentsViewController *recentsViewController;
RecentsDataSource *recentsDataSource;
// Backup of view when displaying search
UIView *backupTitleView;
UIBarButtonItem *backupLeftBarButtonItem;
UIBarButtonItem *backupRightBarButtonItem;
}
@end
@implementation HomeViewController
- (void)viewDidLoad
{
// Set up the SegmentedVC tabs before calling [super viewDidLoad]
MXSession *session = self.mxSessions[0];
NSMutableArray* viewControllers = [[NSMutableArray alloc] init];
NSMutableArray* titles = [[NSMutableArray alloc] init];
[titles addObject: NSLocalizedStringFromTable(@"Rooms", @"Vector", nil)];
recentsViewController = [RecentsViewController recentListViewController];
recentsDataSource = [[RecentsDataSource alloc] initWithMatrixSession:session];
[recentsViewController displayList:recentsDataSource];
[viewControllers addObject:recentsViewController];
[titles addObject: NSLocalizedStringFromTable(@"Messages", @"Vector", nil)];
MXKViewController *tempMessagesVC = [[MXKViewController alloc] init];
[viewControllers addObject:tempMessagesVC];
[titles addObject: NSLocalizedStringFromTable(@"People", @"Vector", nil)];
MXKViewController *tempPeopleVC = [[MXKViewController alloc] init];
[viewControllers addObject:tempPeopleVC];
[self initWithTitles:titles viewControllers:viewControllers defaultSelected:0];
[super viewDidLoad];
self.navigationItem.title = NSLocalizedStringFromTable(@"recents", @"Vector", nil);
// Search bar
searchBar = [[UISearchBar alloc] init];
searchBar.showsCancelButton = YES;
searchBar.delegate = self;
}
- (void)viewWillAppear:(BOOL)animated
{
[super viewWillAppear:animated];
[self hideSearch:NO];
// TODO: dedicated segmented viewWillAppear
[self.displayedViewController viewWillAppear:animated];
}
- (void)displayWithSession:(MXSession *)session
{
// to display a red navbar when the home server cannot be reached.
[self addMatrixSession:session];
}
- (void)showSearch:(BOOL)animated
{
backupTitleView = self.navigationItem.titleView;
backupLeftBarButtonItem = self.navigationItem.leftBarButtonItem;
backupRightBarButtonItem = self.navigationItem.rightBarButtonItem;
// Remove navigation buttons
self.navigationItem.rightBarButtonItem = nil;
self.navigationItem.leftBarButtonItem = nil;
// Add the search bar and
self.navigationItem.titleView = searchBar;
[searchBar becomeFirstResponder];
// Show the tabs header
if (animated)
{
[UIView animateWithDuration:.3 delay:0 options:UIViewAnimationOptionBeginFromCurrentState | UIViewAnimationOptionCurveEaseIn
animations:^{
self.selectionContainerHeightConstraint.constant = 44;
[self.view layoutIfNeeded];
}
completion:^(BOOL finished){
}];
}
else
{
self.selectionContainerHeightConstraint.constant = 44;
[self.view layoutIfNeeded];
}
}
- (void)hideSearch:(BOOL)animated
{
if (backupLeftBarButtonItem)
{
self.navigationItem.titleView = backupTitleView;
self.navigationItem.leftBarButtonItem = backupLeftBarButtonItem;
self.navigationItem.rightBarButtonItem = backupRightBarButtonItem;
}
// Hide the tabs header
if (animated)
{
[UIView animateWithDuration:.3 delay:0 options:UIViewAnimationOptionBeginFromCurrentState | UIViewAnimationOptionCurveEaseIn
animations:^{
self.selectionContainerHeightConstraint.constant = 0;
[self.view layoutIfNeeded];
}
completion:^(BOOL finished){
// Go back under the recents tab
// TODO: Open the feature in SegmentedVC
}];
}
else
{
self.selectionContainerHeightConstraint.constant = 0;
[self.view layoutIfNeeded];
// Go back under the recents tab
// TODO: Open the feature in SegmentedVC
}
}
/*
#pragma mark - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
// Get the new view controller using [segue destinationViewController].
// Pass the selected object to the new view controller.
}
*/
#pragma mark - User's actions
- (IBAction)onButtonPressed:(id)sender
{
if (sender == _searchBarButtonIem)
{
[self showSearch:YES];
}
}
#pragma mark - UISearchBarDelegate
- (void)searchBarCancelButtonClicked:(UISearchBar *)searchBar
{
[self hideSearch:YES];
}
@end