Skip to content

difference between "MVC" and "Flux" #3

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

Open
wants to merge 70 commits into
base: mvc
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
f298266
add DataSources and Presenters
marty-suzuki Jan 23, 2018
e16f4d2
add viewModels
marty-suzuki Jan 23, 2018
82f3e80
add Actions, Dispatcher, Stores
marty-suzuki Jan 23, 2018
c45ad67
fix syntax
marty-suzuki Feb 17, 2018
44bcb71
sort project
marty-suzuki Feb 28, 2019
adeec19
Merge branch 'mvc' into mvp
marty-suzuki Feb 28, 2019
1678d8f
fix conflict
marty-suzuki Feb 28, 2019
9bde5a1
fix Main.storyboard
marty-suzuki Mar 1, 2019
41ac4a8
Merge branch 'mvc' into mvp
marty-suzuki Mar 1, 2019
04b397c
fix conflict
marty-suzuki Mar 1, 2019
af026a7
Merge branch 'mvc' into mvp
marty-suzuki Mar 1, 2019
dabba37
fix initializer
marty-suzuki Mar 1, 2019
52705ee
Merge branch 'mvp' into mvvm
marty-suzuki Mar 1, 2019
e6e2ba9
fix conflict
marty-suzuki Mar 2, 2019
9bb5b8e
Merge branch 'mvc' into mvp
marty-suzuki Mar 2, 2019
ec7f9e2
Merge branch 'mvp' into mvvm
marty-suzuki Mar 2, 2019
1149765
fix project
marty-suzuki Mar 2, 2019
a54c3d6
fix FavoriteModel
marty-suzuki Mar 3, 2019
42af1c9
fix SearchModel
marty-suzuki Mar 3, 2019
0dfe9fe
fix RepositoryModel
marty-suzuki Mar 3, 2019
65ac8f4
fix diff
marty-suzuki Mar 3, 2019
92a8c4d
Merge branch 'mvvm' into flux
marty-suzuki Mar 3, 2019
614e65c
fix conflict
marty-suzuki Mar 4, 2019
0882440
add Flux
marty-suzuki Mar 4, 2019
c09a019
Merge branch 'mvc' into mvp
marty-suzuki Mar 4, 2019
e2bd594
Merge branch 'mvp' into mvvm
marty-suzuki Mar 4, 2019
8734125
Merge branch 'mvvm' into flux
marty-suzuki Mar 4, 2019
afd129a
fix diff
marty-suzuki Mar 4, 2019
4aaf7e5
remove extra files
marty-suzuki Mar 4, 2019
40358f6
Merge branch 'mvc' into mvp
marty-suzuki Feb 11, 2021
a099ef1
Fix UserRepositoryViewPresenter
marty-suzuki Feb 11, 2021
fd6ab91
Fix RepositoryViewPresenter
marty-suzuki Feb 11, 2021
b9bcd11
Fix FavoriteViewPresenter
marty-suzuki Feb 11, 2021
ddade5a
Fix SearchViewPresenter
marty-suzuki Feb 11, 2021
f519cc1
Fix injection
marty-suzuki Feb 11, 2021
3437684
Merge branch 'mvc' into mvp
marty-suzuki Feb 11, 2021
f437c3c
Merge branch 'mvp' into mvvm
marty-suzuki Feb 12, 2021
e271174
Fix ApiSession
marty-suzuki Feb 12, 2021
82f4104
Fix FavoriteModel
marty-suzuki Feb 12, 2021
fc26e10
Fix RepositoryModel
marty-suzuki Feb 12, 2021
ee8508a
Fix SearchModel
marty-suzuki Feb 12, 2021
4b28c0d
Fix Favorite
marty-suzuki Feb 12, 2021
74b9128
Fix Repository
marty-suzuki Feb 12, 2021
6e17dd2
Fix UserRepository
marty-suzuki Feb 12, 2021
acc7832
Fix Search
marty-suzuki Feb 12, 2021
51087f4
Fix injection
marty-suzuki Feb 12, 2021
4cc53eb
Fix xcodeproj
marty-suzuki Feb 12, 2021
4f3d146
Fix FavoriteViewPresenter
marty-suzuki Feb 12, 2021
ac28868
Merge branch 'mvc' into mvp
marty-suzuki Feb 12, 2021
745d7ed
Fix images
marty-suzuki Feb 12, 2021
efee15f
Merge branch 'mvc' into mvp
marty-suzuki Feb 12, 2021
c40298b
Fix images
marty-suzuki Feb 12, 2021
d0dbf62
Merge branch 'mvp' into mvvm
marty-suzuki Feb 12, 2021
ad63067
Fix images
marty-suzuki Feb 12, 2021
ef603e2
Fix images
marty-suzuki Feb 12, 2021
0016cc6
Merge branch 'mvp' into mvvm
marty-suzuki Feb 12, 2021
151c60e
Merge branch 'mvvm' into flux
marty-suzuki Feb 13, 2021
c99bf0c
Remove common flux
marty-suzuki Feb 14, 2021
9ee9f50
Add favorite flux
marty-suzuki Feb 14, 2021
1aea403
Add repository flux
marty-suzuki Feb 14, 2021
e6576ef
Add user repository flux
marty-suzuki Feb 14, 2021
ecbd20e
Add search flux
marty-suzuki Feb 14, 2021
4809ec9
Fix injection
marty-suzuki Feb 14, 2021
2eea7d7
Fix xcodeproj
marty-suzuki Feb 14, 2021
422e543
Fix injection
marty-suzuki Feb 14, 2021
43bb448
Merge branch 'mvvm' into flux
marty-suzuki Feb 14, 2021
b061a08
Fix xcodeproject
marty-suzuki Feb 14, 2021
588e4c6
Fix AppDelegate
marty-suzuki Feb 14, 2021
bb4ab4a
Update README
marty-suzuki Feb 14, 2021
46318b8
Fix images
marty-suzuki Feb 14, 2021
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
Prev Previous commit
Next Next commit
fix Main.storyboard
  • Loading branch information
marty-suzuki committed Mar 1, 2019
commit 9bde5a10035170bdd499fc1ed5391e67081f5e9c
24 changes: 12 additions & 12 deletions iOSDesignPatternSamples/Resources/Base.lproj/Main.storyboard
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="pPO-zw-ZSW" firstAttribute="trailing" secondItem="hXN-GY-eDF" secondAttribute="trailing" id="3cd-vM-eQa"/>
<constraint firstItem="hXN-GY-eDF" firstAttribute="leading" secondItem="pPO-zw-ZSW" secondAttribute="leading" id="64o-gN-lPo"/>
<constraint firstItem="pPO-zw-ZSW" firstAttribute="bottom" secondItem="hXN-GY-eDF" secondAttribute="bottom" id="8wA-YL-go0"/>
<constraint firstItem="hXN-GY-eDF" firstAttribute="top" secondItem="pPO-zw-ZSW" secondAttribute="top" id="Obu-xQ-QgL"/>
<constraint firstItem="pvz-qk-lgd" firstAttribute="trailing" secondItem="hXN-GY-eDF" secondAttribute="trailing" id="3cd-vM-eQa"/>
<constraint firstItem="hXN-GY-eDF" firstAttribute="leading" secondItem="pvz-qk-lgd" secondAttribute="leading" id="64o-gN-lPo"/>
<constraint firstItem="pvz-qk-lgd" firstAttribute="bottom" secondItem="hXN-GY-eDF" secondAttribute="bottom" id="8wA-YL-go0"/>
<constraint firstItem="hXN-GY-eDF" firstAttribute="top" secondItem="pvz-qk-lgd" secondAttribute="top" id="Obu-xQ-QgL"/>
</constraints>
<viewLayoutGuide key="safeArea" id="pPO-zw-ZSW"/>
<viewLayoutGuide key="safeArea" id="pvz-qk-lgd"/>
</view>
<navigationItem key="navigationItem" id="cVF-Oh-r4H"/>
<connections>
Expand Down Expand Up @@ -118,15 +118,15 @@
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="ZKg-MR-Ccd" firstAttribute="top" secondItem="nRh-Zl-98i" secondAttribute="top" id="0HA-zC-ahq"/>
<constraint firstItem="nRh-Zl-98i" firstAttribute="bottom" secondItem="7NS-lN-HF0" secondAttribute="bottom" id="5jV-Up-2nz"/>
<constraint firstItem="nRh-Zl-98i" firstAttribute="trailing" secondItem="ZKg-MR-Ccd" secondAttribute="trailing" id="6dG-KY-xf8"/>
<constraint firstItem="7NS-lN-HF0" firstAttribute="leading" secondItem="nRh-Zl-98i" secondAttribute="leading" id="XN4-ka-rwu"/>
<constraint firstItem="ZKg-MR-Ccd" firstAttribute="top" secondItem="OBv-xB-n9y" secondAttribute="top" id="0HA-zC-ahq"/>
<constraint firstItem="OBv-xB-n9y" firstAttribute="bottom" secondItem="7NS-lN-HF0" secondAttribute="bottom" id="5jV-Up-2nz"/>
<constraint firstItem="OBv-xB-n9y" firstAttribute="trailing" secondItem="ZKg-MR-Ccd" secondAttribute="trailing" id="6dG-KY-xf8"/>
<constraint firstItem="7NS-lN-HF0" firstAttribute="leading" secondItem="OBv-xB-n9y" secondAttribute="leading" id="XN4-ka-rwu"/>
<constraint firstItem="7NS-lN-HF0" firstAttribute="top" secondItem="ZKg-MR-Ccd" secondAttribute="bottom" id="ixB-sU-4S2"/>
<constraint firstItem="nRh-Zl-98i" firstAttribute="trailing" secondItem="7NS-lN-HF0" secondAttribute="trailing" id="mYh-fj-l3a"/>
<constraint firstItem="ZKg-MR-Ccd" firstAttribute="leading" secondItem="nRh-Zl-98i" secondAttribute="leading" id="nbZ-e7-ZtR"/>
<constraint firstItem="OBv-xB-n9y" firstAttribute="trailing" secondItem="7NS-lN-HF0" secondAttribute="trailing" id="mYh-fj-l3a"/>
<constraint firstItem="ZKg-MR-Ccd" firstAttribute="leading" secondItem="OBv-xB-n9y" secondAttribute="leading" id="nbZ-e7-ZtR"/>
</constraints>
<viewLayoutGuide key="safeArea" id="nRh-Zl-98i"/>
<viewLayoutGuide key="safeArea" id="OBv-xB-n9y"/>
</view>
<navigationItem key="navigationItem" id="qil-DS-Lhy"/>
<connections>
Expand Down