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

feat: camera preview with photometric evaluation #13

Open
wants to merge 81 commits into
base: development
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
1d62f8a
fix: change the minimum deployment from 8 to 11 to fix the build error
GTripathee Sep 7, 2023
3ed8db1
Translated using Weblate (Georgian)
Staacks Aug 8, 2023
98c2f23
Translated using Weblate (Greek)
chalkia Aug 16, 2023
60519c9
Translated using Weblate (Greek)
chalkia Aug 16, 2023
fd4dfa3
Translated using Weblate (Czech)
mohjezevec Sep 17, 2023
95ce2ab
Added translation using Weblate (Tamil)
Staacks Oct 9, 2023
44766e8
Added translation using Weblate (Tamil)
Staacks Oct 9, 2023
eda5940
Added translation using Weblate (Tamil)
Staacks Oct 9, 2023
1de9b5e
Translated using Weblate (Czech)
mohjezevec Nov 29, 2023
bd5632a
Translated using Weblate (Czech)
mohjezevec Nov 29, 2023
a1e92ed
Added translation using Weblate (Bengali)
Staacks Dec 4, 2023
e5767d2
Added translation using Weblate (Bengali)
Staacks Dec 4, 2023
9d1bd4a
Added translation using Weblate (Bengali)
Staacks Dec 4, 2023
a6b43a9
Translated using Weblate (Bengali)
Dec 4, 2023
36bc4a1
Translated using Weblate (Bengali)
Dec 5, 2023
e666cea
Show battery info when connected with the bluetooth devices (#12)
GTripathee Sep 6, 2023
2c81de8
Replace our CocoaMQTT fork with upstream version to fix incompatibili…
Staacks Sep 27, 2023
a3c4a85
Adapt BLE status bar icons to color mode.
Staacks Sep 28, 2023
4742013
Increase minimum iOS version to 12 (XCode requirement) and Adjust cal…
Staacks Jan 5, 2024
684f54b
Simplify three-dot menu color on main screen to simple black/white an…
Staacks Jan 5, 2024
1e13926
Fix crash on renaming saved state.
Staacks Jan 10, 2024
eabb898
Switch repository for Swift-packaged version of GCDWebServer
Staacks Jan 12, 2024
da8c6c7
fix: clear the connected devices list when bluetooth disconnected
GTripathee Jan 17, 2024
0ce3822
fix: refresh the theme in experiment view as per the system appearance
GTripathee Jan 17, 2024
137a4ac
fix: rebase to development
GTripathee Jan 17, 2024
5e723e2
Added translation using Weblate (Bengali)
Staacks Dec 4, 2023
0884a94
Translated using Weblate (Bengali)
Dec 4, 2023
2674004
Show battery info when connected with the bluetooth devices (#12)
GTripathee Sep 6, 2023
4070c10
Replace our CocoaMQTT fork with upstream version to fix incompatibili…
Staacks Sep 27, 2023
eefc8da
Adapt BLE status bar icons to color mode.
Staacks Sep 28, 2023
4ae0162
Increase minimum iOS version to 12 (XCode requirement) and Adjust cal…
Staacks Jan 5, 2024
d46eab4
Simplify three-dot menu color on main screen to simple black/white an…
Staacks Jan 5, 2024
7239bb8
Fix crash on renaming saved state.
Staacks Jan 10, 2024
98c2ec3
Switch repository for Swift-packaged version of GCDWebServer
Staacks Jan 12, 2024
6886d50
fix: clear the connected devices list when bluetooth disconnected
GTripathee Jan 17, 2024
83a05e4
fix: refresh the theme in experiment view as per the system appearance
GTripathee Jan 17, 2024
662f809
fix: rebase to development
GTripathee Jan 17, 2024
684e09d
ix: change the minimum deployment from 8 to 11 to fix the build error
GTripathee Sep 7, 2023
588fdc4
it status
GTripathee Sep 11, 2023
8d59faa
feature: setup and show camera (preview not displaying)
GTripathee Jan 2, 2024
767cf31
ix: add project file
GTripathee Jan 2, 2024
962a5dd
fix: remove multiple instance creation of metalRenderer
GTripathee Jan 3, 2024
028bafb
fix: adjust the drawableSize of MTKView to resolve frame dropping issue
GTripathee Jan 8, 2024
a05f415
fix: resolve the video preview orientation
GTripathee Jan 8, 2024
95d7884
fix: stop the session after the view is closed and add the gesture to…
GTripathee Jan 10, 2024
f895a97
fix: make the drag gesture work on camera preview and resolve the fra…
GTripathee Jan 10, 2024
59482dc
Translated using Weblate (Bengali)
Dec 4, 2023
06c54a7
Translated using Weblate (Bengali)
Dec 5, 2023
a2a891d
Show battery info when connected with the bluetooth devices (#12)
GTripathee Sep 6, 2023
00bc338
Replace our CocoaMQTT fork with upstream version to fix incompatibili…
Staacks Sep 27, 2023
9a6acf9
Increase minimum iOS version to 12 (XCode requirement) and Adjust cal…
Staacks Jan 5, 2024
393c5d3
Simplify three-dot menu color on main screen to simple black/white an…
Staacks Jan 5, 2024
8defd30
Fix crash on renaming saved state.
Staacks Jan 10, 2024
02f4e0b
Switch repository for Swift-packaged version of GCDWebServer
Staacks Jan 12, 2024
c5c529a
fix: clear the connected devices list when bluetooth disconnected
GTripathee Jan 17, 2024
00623b5
fix: refresh the theme in experiment view as per the system appearance
GTripathee Jan 17, 2024
861d072
fix: rebase to development
GTripathee Jan 17, 2024
306b9e0
ix: change the minimum deployment from 8 to 11 to fix the build error
GTripathee Sep 7, 2023
4707245
it status
GTripathee Sep 11, 2023
e32d68c
feature: setup and show camera (preview not displaying)
GTripathee Jan 2, 2024
4b50c34
ix: add project file
GTripathee Jan 2, 2024
1f6c878
fix: remove multiple instance creation of metalRenderer
GTripathee Jan 3, 2024
1bfdd16
fix: adjust the drawableSize of MTKView to resolve frame dropping issue
GTripathee Jan 8, 2024
fd5a46d
ix: resolve the video preview orientation
GTripathee Jan 8, 2024
5a3ec14
ix: stop the session after the view is closed and add the gesture to …
GTripathee Jan 10, 2024
835bcb6
fix: make the drag gesture work on camera preview and resolve the fra…
GTripathee Jan 10, 2024
1e394d6
feat: show exposure values and able to change it manually
GTripathee Feb 5, 2024
652f98c
fix: merge conflict
GTripathee Feb 6, 2024
d97efbe
feat: show luma value after averaging over all the pixels
GTripathee Feb 13, 2024
1525ef4
feat: show the luma value in the simple tab and also make the camera …
GTripathee Feb 21, 2024
d220e08
feat: control the camera session and analysis of the camera frame
GTripathee Feb 22, 2024
800b169
fix: show the continuous values of lum in the graph and value field
GTripathee Feb 27, 2024
1b5a314
feat: show the camera setting buttons as per the exposure setting levels
GTripathee Feb 29, 2024
e9ab2a6
fix: disable the dragging gesture when the preview is minimized
GTripathee Mar 13, 2024
bead665
fix: remove the ios16 dependency by using uiview as the main parent f…
GTripathee Apr 4, 2024
2091b46
fix: resolve camera setting hiding logic
GTripathee Apr 7, 2024
20ed198
feat: show and change the exposure value when the exposure setting ha…
GTripathee Apr 8, 2024
f2456ca
fix: resolve the front camera not changing the camera setting
GTripathee Apr 8, 2024
c20b634
fix: show only the predefined value of the iso in current iso
GTripathee Apr 9, 2024
ba0b863
fix: update the value of camera setting in ui when camera is switched
GTripathee Apr 10, 2024
9cb31d6
fix: resolve the color for dark and light theme
GTripathee Apr 11, 2024
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
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
[submodule "phyphox-webinterface"]
path = phyphox-webinterface
url = https://github.com/Kuhlen/phyphox-webinterface
[submodule "phyphox-iOS/CocoaMQTT"]
path = phyphox-iOS/CocoaMQTT
url = https://github.com/phyphox/CocoaMQTT.git
[submodule "phyphox-iOS/ZipZap"]
path = phyphox-iOS/ZipZap
url = https://github.com/pixelglow/ZipZap.git
Expand Down
211 changes: 108 additions & 103 deletions phyphox-iOS/phyphox.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions phyphox-iOS/phyphox/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ let ResignActiveNotification = "ResignActiveNotification"
let DidBecomeActiveNotification = "DidBecomeActiveNotification"

@UIApplicationMain

final class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow?

Expand Down
20 changes: 20 additions & 0 deletions phyphox-iOS/phyphox/Assets.xcassets/Image 1.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "cellularbars.level.0.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "cellularbars.level.1.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "cellularbars.level.2.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "cellularbars.level.3.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "cellularbars.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"images" : [
{
"filename" : "ic_flip_camera_android-4 1.svg",
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"filename" : "ic_flip_camera_android.svg",
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "ic_flip_camera_android-4.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"images" : [
{
"filename" : "ic_auto_exposure-3 1.svg",
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"filename" : "ic_auto_exposure.svg",
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "ic_auto_exposure-3.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"images" : [
{
"filename" : "ic_camera_iso-2.svg",
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "light"
}
],
"filename" : "ic_camera_iso.svg",
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "ic_camera_iso-2 1.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading