Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@theInternauts
theInternauts committed May 18, 2020
1 parent fd016b1 commit 7a358ac
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 28 deletions.
8 changes: 0 additions & 8 deletions PlasticBullet/PlasticBullet.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
6D00463B23CC6A3D00401B4D /* BTN_Info.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D00463A23CC6A3D00401B4D /* BTN_Info.swift */; };
6D00463D23CC6A4C00401B4D /* BTN_Camera.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D00463C23CC6A4C00401B4D /* BTN_Camera.swift */; };
6D00463F23CC6A5B00401B4D /* BTN_Library.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D00463E23CC6A5B00401B4D /* BTN_Library.swift */; };
6D00464123CC6A7800401B4D /* Image_Backsplash.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D00464023CC6A7800401B4D /* Image_Backsplash.swift */; };
6D00464323CC711500401B4D /* Panel_Info.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D00464223CC711500401B4D /* Panel_Info.swift */; };
6D3F3C8423F30EC8000980FF /* ImagePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D3F3C8323F30EC8000980FF /* ImagePicker.swift */; };
6D3F3C8623FC22EA000980FF /* FilterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D3F3C8523FC22EA000980FF /* FilterView.swift */; };
Expand All @@ -26,7 +25,6 @@
6DA3374923CAF5360082B22C /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6DA3374723CAF5360082B22C /* LaunchScreen.storyboard */; };
6DA3375423CAF5370082B22C /* PlasticBulletTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DA3375323CAF5370082B22C /* PlasticBulletTests.swift */; };
6DA3375F23CAF5370082B22C /* PlasticBulletUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DA3375E23CAF5370082B22C /* PlasticBulletUITests.swift */; };
6DDD106523CDBB7D004C0492 /* CameraControls.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DDD106423CDBB7D004C0492 /* CameraControls.swift */; };
6DDF152423E06AE800C711D3 /* info-text1.md in Resources */ = {isa = PBXBuildFile; fileRef = 6DDF152223E06AE800C711D3 /* info-text1.md */; };
6DDF152523E06AE800C711D3 /* info-text2.md in Resources */ = {isa = PBXBuildFile; fileRef = 6DDF152323E06AE800C711D3 /* info-text2.md */; };
E7FE0A8882B35122815262A7 /* Pods_PlasticBullet.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6B60106FE405CB61C169818F /* Pods_PlasticBullet.framework */; };
Expand Down Expand Up @@ -56,7 +54,6 @@
6D00463A23CC6A3D00401B4D /* BTN_Info.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BTN_Info.swift; sourceTree = "<group>"; };
6D00463C23CC6A4C00401B4D /* BTN_Camera.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BTN_Camera.swift; sourceTree = "<group>"; };
6D00463E23CC6A5B00401B4D /* BTN_Library.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BTN_Library.swift; sourceTree = "<group>"; };
6D00464023CC6A7800401B4D /* Image_Backsplash.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Image_Backsplash.swift; sourceTree = "<group>"; };
6D00464223CC711500401B4D /* Panel_Info.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Panel_Info.swift; sourceTree = "<group>"; };
6D3F3C8323F30EC8000980FF /* ImagePicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagePicker.swift; sourceTree = "<group>"; };
6D3F3C8523FC22EA000980FF /* FilterView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FilterView.swift; sourceTree = "<group>"; };
Expand All @@ -77,7 +74,6 @@
6DA3375A23CAF5370082B22C /* PlasticBulletUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PlasticBulletUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
6DA3375E23CAF5370082B22C /* PlasticBulletUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlasticBulletUITests.swift; sourceTree = "<group>"; };
6DA3376023CAF5370082B22C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
6DDD106423CDBB7D004C0492 /* CameraControls.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraControls.swift; sourceTree = "<group>"; };
6DDF152223E06AE800C711D3 /* info-text1.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = "info-text1.md"; sourceTree = "<group>"; };
6DDF152323E06AE800C711D3 /* info-text2.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = "info-text2.md"; sourceTree = "<group>"; };
E70D544BA218E3745A81B039 /* Pods-PlasticBullet.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-PlasticBullet.release.xcconfig"; path = "Target Support Files/Pods-PlasticBullet/Pods-PlasticBullet.release.xcconfig"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -158,8 +154,6 @@
6D00463A23CC6A3D00401B4D /* BTN_Info.swift */,
6D00463C23CC6A4C00401B4D /* BTN_Camera.swift */,
6D00463E23CC6A5B00401B4D /* BTN_Library.swift */,
6D00464023CC6A7800401B4D /* Image_Backsplash.swift */,
6DDD106423CDBB7D004C0492 /* CameraControls.swift */,
6D3F3C8523FC22EA000980FF /* FilterView.swift */,
6D00464223CC711500401B4D /* Panel_Info.swift */,
6DA3374423CAF5360082B22C /* Preview Content */,
Expand Down Expand Up @@ -395,13 +389,11 @@
6DA3373D23CAF5350082B22C /* AppDelegate.swift in Sources */,
6D00463B23CC6A3D00401B4D /* BTN_Info.swift in Sources */,
6D00463F23CC6A5B00401B4D /* BTN_Library.swift in Sources */,
6DDD106523CDBB7D004C0492 /* CameraControls.swift in Sources */,
6D00463D23CC6A4C00401B4D /* BTN_Camera.swift in Sources */,
6DA3373F23CAF5350082B22C /* SceneDelegate.swift in Sources */,
6D00464323CC711500401B4D /* Panel_Info.swift in Sources */,
6D3F3C8423F30EC8000980FF /* ImagePicker.swift in Sources */,
6DA3374123CAF5350082B22C /* ContentView.swift in Sources */,
6D00464123CC6A7800401B4D /* Image_Backsplash.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
46 changes: 26 additions & 20 deletions PlasticBullet/PlasticBullet/ContentView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,31 +52,37 @@ struct ContentView: View {

var body: some View {

return VStack {

Spacer()
Image("logo-round")
Image("splash-logo")
.offset(y: -45)
Spacer()
HStack {
return NavigationView {
VStack {
Spacer()
BTN_Camera(isShowingSheet: $isShowingSheet, sheetType: $sheetType, source: $source)
Image("logo-round")
Image("splash-logo")
.offset(y: -45)
Spacer()
BTN_Library(isShowingSheet: $isShowingSheet, sheetType: $sheetType, source: $source)
HStack{
NavigationLink(destination: FilterView(isShowingImagePicker: self.$isShowingImagePicker, selectedImage: self.$selectedImage)) {
Text("4 up view")
}
}
Spacer()
HStack {
Spacer()
BTN_Camera(isShowingSheet: $isShowingSheet, sheetType: $sheetType, source: $source)
Spacer()
BTN_Library(isShowingSheet: $isShowingSheet, sheetType: $sheetType, source: $source)
Spacer()
}
Spacer()
BTN_Info(isShowingSheet: $isShowingSheet, sheetType: $sheetType)
.offset(y: -20)
}
Spacer()
BTN_Info(isShowingSheet: $isShowingSheet, sheetType: $sheetType)
.offset(y: -20)

.padding()
.background(bgImage
.resizable()
.scaledToFill()
.clipped())
.edgesIgnoringSafeArea([.top, .bottom])
}
.padding()
.background(bgImage
.resizable()
.scaledToFill()
.clipped())
.edgesIgnoringSafeArea([.top, .bottom])
.sheet(isPresented: self.$isShowingSheet){
if(self.sheetType == .camera){
ImagePicker(image: self.$selectedImage, source: self.source)
Expand Down

0 comments on commit 7a358ac

Please sign in to comment.