Skip to content
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.

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

App 樣式調整及首頁 UI #41

Merged
merged 9 commits into from
Jul 25, 2019
Merged

App 樣式調整及首頁 UI #41

merged 9 commits into from
Jul 25, 2019

Conversation

Wuchiwei
Copy link
Collaborator

@Wuchiwei Wuchiwei commented Jul 19, 2019

  • 建立以 Tab bar 為基礎的新版介面
  • 根據新版 UI 調整首頁樣式
  • 新增 SelectionView,作為 view component

keith222 and others added 7 commits July 10, 2019 00:49
modified:   Mopcon/Mopcon.xcodeproj/project.pbxproj
[Reason] Add new file Lobby.Storyboard, TabViewController and ColorSet folder in Assets.

new file:   Mopcon/Mopcon/Assets.xcassets/Color/Contents.json
renamed:    Mopcon/Mopcon/Assets.xcassets/themeColor.colorset/Contents.json -> Mopcon/Mopcon/Assets.xcassets/Color/themeColor.colorset/Contents.json
[Reason] Add Color folder in asset for manage color theme.

new file:   Mopcon/Mopcon/Controller/TabBar/TabViewController.swift
renamed:    Mopcon/Mopcon/Storyboard/Base.lproj/Main.storyboard -> Mopcon/Mopcon/Storyboard/Base.lproj/Lobby.storyboard
new file:   Mopcon/Mopcon/Storyboard/Main.storyboard
[Reason] Add new Storyboard for new UI requirement.
2. Add tab relative image in Assets
3. Add UIImage extension for image usage.
4. Add UIColor extension for color usage.
2. Add icon for LobbyCollectionViewCell
3. Manipulate UICollectionView collecitonViewLayout object in LobbyViewController.
4. Adject item size by UICollectionView's frame and UICollectionViewDelegateFlowLayout.
…lections will be cut.

modified:   Mopcon/Storyboard/Base.lproj/Lobby.storyboard
Copy link
Collaborator

@keith222 keith222 left a comment

Choose a reason for hiding this comment

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

阿...不是 PR 到這個 branch,是 develop 唷(我之前也眼殘推錯幾次 QQ

@bbandydd 想問 developer 這個 branch 還有留存的需要嗎?不然偶爾會眼殘按錯 XD

@Wuchiwei Wuchiwei changed the base branch from developer to develop July 19, 2019 03:38
@Wuchiwei
Copy link
Collaborator Author

Sorry, 已修正。

2. Add UIView extension.

modified:   Mopcon/Mopcon.xcodeproj/project.pbxproj
new file:   Mopcon/Mopcon/Helper/Exntension/UIViewExtension.swift
new file:   Mopcon/Mopcon/View/Common/SelectionView.swift
@Wuchiwei
Copy link
Collaborator Author

Hi @bbandydd , 不知道這個 PR 是否還有要修正的地方呢?

@bbandydd
Copy link
Contributor

阿...不是 PR 到這個 branch,是 develop 唷(我之前也眼殘推錯幾次 QQ

@bbandydd 想問 developer 這個 branch 還有留存的需要嗎?不然偶爾會眼殘按錯 XD

developer砍掉吧

@bbandydd bbandydd merged commit d54d418 into develop Jul 25, 2019
@keith222 keith222 deleted the feature/home-page branch July 25, 2019 15:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants