Skip to content
This repository has been archived by the owner on Jan 10, 2024. It is now read-only.

Release/1.3 #202

Merged
merged 148 commits into from
Nov 2, 2017
Merged

Release/1.3 #202

merged 148 commits into from
Nov 2, 2017

Conversation

tgymnich
Copy link
Member

@tgymnich tgymnich commented Oct 26, 2017

Please test this.

Fixes #190
Fixes #179
Fixes #118

Fixes #72
Fixes #109
Starts progress in #43 & #165
Fixes #156
Fixes #90
Fixes #195
Fixes #194
Fixes #121

nerdsupremacist and others added 30 commits April 28, 2017 21:58
…update

# Conflicts:
#	Pods/Pods.xcodeproj/project.pbxproj
#	Pods/Target Support Files/Pods-Campus/Pods-Campus.debug.xcconfig
#	Pods/Target Support Files/Pods-Campus/Pods-Campus.release.xcconfig
#	TUM Campus App.xcodeproj/project.pbxproj
# Conflicts:
#	Pods/Pods.xcodeproj/project.pbxproj
#	Pods/Target Support Files/Pods-Campus/Pods-Campus-resources.sh
#	Pods/Target Support Files/Pods-Campus/Pods-Campus.debug.xcconfig
#	Pods/Target Support Files/Pods-Campus/Pods-Campus.release.xcconfig
#	TUM Campus App/TumDataManager.swift
# Conflicts:
#	Pods/Pods.xcodeproj/project.pbxproj
# Conflicts:
#	Podfile.lock
#	TUM Campus App.xcodeproj/project.pbxproj
#	TUM Campus App/CalendarManager.swift
#	TUM Campus App/Extensions.swift
@nerdsupremacist
Copy link
Member

@TG908 Going to more and back makes the navbar in the card view have a large title. Even without text.

@nerdsupremacist
Copy link
Member

@TG908 is there anyway we can open the search results on the same navigation controller

@tgymnich
Copy link
Member Author

tgymnich commented Oct 26, 2017

@mathiasquintero I think the search results controller is opened in a whole new ui window. We could use the card table view to display our search results. But I think this should be low priority.

@nerdsupremacist
Copy link
Member

What if we keep a weak reference to the root vc and call push on those?

@tgymnich
Copy link
Member Author

tgymnich commented Oct 26, 2017

@TG908 Going to more and back makes the navbar in the card view have a large title. Even without text.

I cannot reproduce this

What if we keep a weak reference to the root vc and call push on those?

I'll try

@nerdsupremacist
Copy link
Member

Here you go! The text may not be there, but do you see the height difference?

simulator screen shot - iphone x - 2017-10-27 at 01 06 54
simulator screen shot - iphone x - 2017-10-27 at 01 06 58
simulator screen shot - iphone x - 2017-10-27 at 01 07 03

@tgymnich
Copy link
Member Author

@mathiasquintero is this the iphone x?

@nerdsupremacist
Copy link
Member

Yes. But can be reproduced on any iphone

@tgymnich
Copy link
Member Author

What if we keep a weak reference to the root vc and call push on those?

Would work will do a proper implementation tomorrow.

@nerdsupremacist
Copy link
Member

@TG908 looks great now! I think we're done with most of what we wanted to do here. I'd say we are only missing the extra cards you wanted to make for like MVV, Library, Lectures, etc... 😉

Perhaps you can get started on that in a separate branch starting from this one and we can later merge it back. So that we still follow the process

@tgymnich
Copy link
Member Author

tgymnich commented Oct 28, 2017

@mathiasquintero I think the new cards and improved ui might take a while, because I'm quite busy. What I still need to do is take a look at the BookRental Card. Otherwise we are good. 😄

Have you looked into the threading issues (race conditions, etc.)?

@tgymnich
Copy link
Member Author

tgymnich commented Oct 30, 2017

Fixed Book Rentals we are ready for launch 🚀 . I cannot upload because I don't have the permissions.

@nerdsupremacist
Copy link
Member

@mammuth have you checked this out?

@nerdsupremacist
Copy link
Member

We also have to update the bundle version

Copy link
Member

@mammuth mammuth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not reviewable...
So... I don't want to block this, so do what you want with it 😉

@nerdsupremacist
Copy link
Member

nerdsupremacist commented Oct 30, 2017

The build got stuck on CalendarViewController.swift�. Dafuq?!?!

keychainWrapper.writeToKeychain()
UserDefaults.standard.synchronize()
}
// TODO: Refactor use of keychain wrapper
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

INFO Complete the task associated to this "TODO" comment. rule

UserDefaults.standard.synchronize()
}
// TODO: Refactor use of keychain wrapper
// TODO: Move this to the manager. This is really the managers job.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

INFO Complete the task associated to this "TODO" comment. rule

@nerdsupremacist
Copy link
Member

Merging this now!

@nerdsupremacist nerdsupremacist merged commit e1a3db9 into master Nov 2, 2017
@tgymnich tgymnich deleted the release/1.3 branch November 9, 2017 14:24
@tgymnich tgymnich restored the release/1.3 branch November 9, 2017 14:26
@nerdsupremacist nerdsupremacist deleted the release/1.3 branch January 24, 2018 22:48
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants