Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ytakzk/Fusuma
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.1.1
Choose a base ref
...
head repository: ytakzk/Fusuma
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing with 1,742 additions and 2,644 deletions.
  1. +1 −0 .swift-version
  2. +2 −2 .travis.yml
  3. +0 −23 Classes/Assets.xcassets/ic_videocam.imageset/Contents.json
  4. BIN Classes/Assets.xcassets/ic_videocam.imageset/ic_videocam_white_36dp-1.png
  5. BIN Classes/Assets.xcassets/ic_videocam.imageset/ic_videocam_white_36dp-2.png
  6. BIN Classes/Assets.xcassets/ic_videocam.imageset/ic_videocam_white_36dp.png
  7. +0 −23 Classes/Assets.xcassets/shutter_button.imageset/Contents.json
  8. BIN Classes/Assets.xcassets/shutter_button.imageset/ic_radio_button_checked_white_24px.png
  9. BIN Classes/Assets.xcassets/shutter_button.imageset/ic_radio_button_checked_white_24px@2x.png
  10. BIN Classes/Assets.xcassets/shutter_button.imageset/ic_radio_button_checked_white_24px@3x.png
  11. +0 −26 Classes/Assets.xcassets/video_button.imageset/Contents.json
  12. BIN Classes/Assets.xcassets/video_button.imageset/button copy 2.png
  13. BIN Classes/Assets.xcassets/video_button.imageset/button copy.png
  14. BIN Classes/Assets.xcassets/video_button.imageset/button.png
  15. +0 −26 Classes/Assets.xcassets/video_button_rec.imageset/Contents.json
  16. BIN Classes/Assets.xcassets/video_button_rec.imageset/button_recording copy 2.png
  17. BIN Classes/Assets.xcassets/video_button_rec.imageset/button_recording copy.png
  18. BIN Classes/Assets.xcassets/video_button_rec.imageset/button_recording.png
  19. +0 −350 Classes/FSVideoCameraView.swift
  20. +0 −98 Classes/FSVideoCameraView.xib
  21. BIN Demo/camera_roll.png
  22. BIN Demo/fusuma.gif
  23. BIN Demo/photo.png
  24. +230 −60 Example/FusumaExample.xcodeproj/project.pbxproj
  25. +11 −1 Example/FusumaExample.xcodeproj/xcshareddata/xcschemes/FusumaExample.xcscheme
  26. +28 −33 Example/FusumaExample/AppDelegate.swift
  27. +25 −0 Example/FusumaExample/Assets.xcassets/AppIcon.appiconset/Contents.json
  28. +19 −11 Example/FusumaExample/Base.lproj/Main.storyboard
  29. +0 −3 Example/FusumaExample/Info.plist
  30. +27 −57 Example/FusumaExample/ViewController.swift
  31. +75 −0 Example/FusumaUITesting/FusumaUITesting.swift
  32. +22 −0 Example/FusumaUITesting/Info.plist
  33. +3 −3 Fusuma.podspec
  34. +99 −62 Fusuma.xcodeproj/project.pbxproj
  35. +1 −1 Fusuma.xcodeproj/xcshareddata/xcschemes/Fusuma.xcscheme
  36. +8 −0 Fusuma.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
  37. +50 −22 README.md
  38. +12 −0 Sources/Assets.xcassets/ic_checkmark.imageset/Contents.json
  39. BIN Sources/Assets.xcassets/ic_checkmark.imageset/ic_checkmark.pdf
  40. +0 −23 Sources/Assets.xcassets/ic_insert_photo.imageset/Contents.json
  41. BIN Sources/Assets.xcassets/ic_insert_photo.imageset/ic_photo_white_36pt.png
  42. BIN Sources/Assets.xcassets/ic_insert_photo.imageset/ic_photo_white_36pt_2x.png
  43. BIN Sources/Assets.xcassets/ic_insert_photo.imageset/ic_photo_white_36pt_3x.png
  44. +0 −23 Sources/Assets.xcassets/ic_photo_camera.imageset/Contents.json
  45. BIN Sources/Assets.xcassets/ic_photo_camera.imageset/ic_photo_camera_white_36pt.png
  46. BIN Sources/Assets.xcassets/ic_photo_camera.imageset/ic_photo_camera_white_36pt_2x.png
  47. BIN Sources/Assets.xcassets/ic_photo_camera.imageset/ic_photo_camera_white_36pt_3x.png
  48. +0 −23 Sources/Assets.xcassets/ic_radio_button_checked.imageset/Contents.json
  49. BIN Sources/Assets.xcassets/ic_radio_button_checked.imageset/ic_radio_button_checked_white_24px.png
  50. BIN Sources/Assets.xcassets/ic_radio_button_checked.imageset/ic_radio_button_checked_white_24px@2x.png
  51. BIN Sources/Assets.xcassets/ic_radio_button_checked.imageset/ic_radio_button_checked_white_24px@3x.png
  52. +4 −4 Sources/Assets.xcassets/{video_button.imageset → ic_shutter.imageset}/Contents.json
  53. BIN Sources/Assets.xcassets/ic_shutter.imageset/ic_shutter.png
  54. BIN Sources/Assets.xcassets/ic_shutter.imageset/ic_shutter@2x.png
  55. BIN Sources/Assets.xcassets/ic_shutter.imageset/ic_shutter@3x.png
  56. +4 −4 Sources/Assets.xcassets/{video_button_rec.imageset → ic_shutter_recording.imageset}/Contents.json
  57. BIN Sources/Assets.xcassets/ic_shutter_recording.imageset/ic_shutter_recording.png
  58. BIN Sources/Assets.xcassets/ic_shutter_recording.imageset/ic_shutter_recording@2x.png
  59. BIN Sources/Assets.xcassets/ic_shutter_recording.imageset/ic_shutter_recording@3x.png
  60. +0 −23 Sources/Assets.xcassets/ic_videocam.imageset/Contents.json
  61. BIN Sources/Assets.xcassets/ic_videocam.imageset/ic_videocam_white_36dp-1.png
  62. BIN Sources/Assets.xcassets/ic_videocam.imageset/ic_videocam_white_36dp-2.png
  63. BIN Sources/Assets.xcassets/ic_videocam.imageset/ic_videocam_white_36dp.png
  64. +0 −23 Sources/Assets.xcassets/shutter_button.imageset/Contents.json
  65. BIN Sources/Assets.xcassets/shutter_button.imageset/ic_radio_button_checked_white_24px.png
  66. BIN Sources/Assets.xcassets/shutter_button.imageset/ic_radio_button_checked_white_24px@2x.png
  67. BIN Sources/Assets.xcassets/shutter_button.imageset/ic_radio_button_checked_white_24px@3x.png
  68. BIN Sources/Assets.xcassets/video_button.imageset/button copy 2.png
  69. BIN Sources/Assets.xcassets/video_button.imageset/button copy.png
  70. BIN Sources/Assets.xcassets/video_button.imageset/button.png
  71. BIN Sources/Assets.xcassets/video_button_rec.imageset/button_recording copy 2.png
  72. BIN Sources/Assets.xcassets/video_button_rec.imageset/button_recording copy.png
  73. BIN Sources/Assets.xcassets/video_button_rec.imageset/button_recording.png
  74. +26 −0 Sources/Extensions/UIColorExtensions.swift
  75. +19 −0 Sources/Extensions/UIViewExtensions.swift
  76. +241 −300 Sources/FSAlbumView.swift
  77. +24 −13 Sources/FSAlbumViewCell.swift
  78. +15 −2 Sources/FSAlbumViewCell.xib
  79. +171 −259 Sources/FSCameraView.swift
  80. +40 −13 Sources/FSCameraView.xib
  81. +0 −41 Sources/FSConstants.swift
  82. +43 −67 Sources/FSImageCropView.swift
  83. +158 −198 Sources/FSVideoCameraView.swift
  84. +4 −4 Sources/FSVideoCameraView.xib
  85. +307 −362 Sources/FusumaViewController.swift
  86. +0 −390 Sources/FusumaViewController.swift.orig
  87. +73 −71 Sources/FusumaViewController.xib
1 change: 1 addition & 0 deletions .swift-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4.2
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
language: objective-c
osx_image: xcode8
osx_image: xcode10.1
script:
- set -o pipefail
- xcodebuild -version
- xcodebuild -showsdks
- xcodebuild -workspace Fusuma.xcworkspace -scheme FusumaExample -sdk iphonesimulator -destination 'OS=10.0,name=iPhone 6S Plus' ONLY_ACTIVE_ARCH=NO build
- xcodebuild test -workspace Fusuma.xcworkspace -scheme FusumaExample -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 8' ONLY_ACTIVE_ARCH=NO build

#before_install:
# - brew update
23 changes: 0 additions & 23 deletions Classes/Assets.xcassets/ic_videocam.imageset/Contents.json

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
23 changes: 0 additions & 23 deletions Classes/Assets.xcassets/shutter_button.imageset/Contents.json

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
26 changes: 0 additions & 26 deletions Classes/Assets.xcassets/video_button.imageset/Contents.json

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
26 changes: 0 additions & 26 deletions Classes/Assets.xcassets/video_button_rec.imageset/Contents.json

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading