Merge branch 'master' of github.com:soapyigu/Swift30Projects

# Conflicts: # Project 07 - Scale/README.md
five-cats-ing · Feb 1, 2017 · 2e0a801 · 2e0a801
2 parents cc016bc + 7f79700
commit 2e0a801
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/Project 05 - Artistry/README.md b/Project 05 - Artistry/README.md
@@ -3,4 +3,4 @@ Artistry
 Artistry is a Swift App showing the way to set up height for table view cells dynamically based on its content. It is the demo app of Ray Wenderlich's tech blog. For details please reference [*Self-sizing Table View Cells*](https://www.raywenderlich.com/129059/self-sizing-table-view-cells)
 
 ## Screenshots
-![Artistry](https://github.com/soapyigu/30SwiftProjects/blob/master/Project%2024%20-%20Artistry/Artistry.gif)
+![Artistry](./Artistry.gif)
diff --git a/Project 07 - PokedexGo/README.md b/Project 07 - PokedexGo/README.md
@@ -4,4 +4,4 @@ PokedexGo
 PokedexGo is a swift iOS app displaying pokemons and their detail information. This app essentially demos the way to use UISplitViewController to implement an app on both iPhone and iPad platforms.
 
 ## Screenshots
-![PokedexGo](https://github.com/soapyigu/30SwiftProjects/blob/master/Project%2020%20-%20PokedexGo/PokedexGo.gif)
+![PokedexGo](./PokedexGo.gif)
diff --git a/Project 07 - Scale/README.md b/Project 07 - Scale/README.md
@@ -0,0 +1,11 @@
+Scale
+==========
+
+Scale is an iOS app demos the way to handle 3D Touch. This app is inspired by [*3D Touch Introduction: Building a Digital Scale App and Quick Actions*](http://www.appcoda.com/3d-touch-tutorial/) in tackling force touch and quick actions by Swift.
+
+## Screenshots
+![Scale](./Screenshots/shot1.png)
+
+![Scale](./Screenshots/shot2.png)
+
+![Scale](./Screenshots/shot3.png)
diff --git a/Project 19 - Pinterest/README.md b/Project 19 - Pinterest/README.md
@@ -4,4 +4,4 @@ Pinterest
 Pinterest is a simple app showing waterfall implementation rather than a real copy of that famous one. It is the demo app of Ray Wenderlich's blog: [UICollectionView Custom Layout Tutorial: Pinterest](https://www.raywenderlich.com/107439/uicollectionview-custom-layout-tutorial-pinterest). You could find how to implement a basic waterfall view by subclassing UICollectionView and dynamically adjust the height of each item using custom layout attributes.
 
 ## Screenshots
-![Pinterest](https://github.com/soapyigu/30SwiftProjects/blob/master/Project%2019%20-%20Pinterest/Pinterest.gif)
+![Pinterest](./Pinterest.gif)
diff --git a/Project 25 - WeatherExtension/README.md b/Project 25 - WeatherExtension/README.md
@@ -4,5 +4,5 @@ WeatherExtension
 WeatherExtension is an app demoing a weather app and its widget for today. It is tutorial from Appcoda.
 
 ## Screenshots
-![TodayWidget](https://github.com/soapyigu/30SwiftProjects/blob/master/Project%2017%20-%20WeatherExtension/TodayWidget.png)
-![ContainerApp](https://github.com/soapyigu/30SwiftProjects/blob/master/Project%2017%20-%20WeatherExtension/ContainerApp.png)
+![TodayWidget](./TodayWidget.png)
+![ContainerApp](./ContainerApp.png)