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

Hasan #3

Open
wants to merge 27 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
0b166f7
.
lorenzo-vecchio Mar 11, 2024
fa6c7f1
Working on Calendar screen
HasanTahir24 Apr 7, 2024
de5bab8
Working on Session Flow
HasanTahir24 Apr 14, 2024
0fcc689
Working on To Do Screen
HasanTahir24 Apr 15, 2024
a7a6f0f
Delete functionality added
HasanTahir24 Apr 15, 2024
736b4f1
Replacing subcategory with activity
HasanTahir24 Apr 16, 2024
497682f
Working on To do screen
HasanTahir24 Apr 17, 2024
93dd0a4
Working on ToDo Screen
HasanTahir24 Apr 18, 2024
d30b051
Working on to do screen
HasanTahir24 Apr 18, 2024
11673db
Changes for light and dark mode
giovanni-ercolano Apr 18, 2024
e393106
aggiunta light/dark mode al 80%
giovanni-ercolano Apr 20, 2024
5541c4a
implementata lista attività nel calendario
giovanni-ercolano Apr 20, 2024
b75abe5
Graph added
lorenzo-vecchio Apr 21, 2024
a0632d2
Select activity fix
lorenzo-vecchio Apr 21, 2024
c13ad43
homescreen dark light mode selector
lorenzo-vecchio Apr 21, 2024
04848a3
Inserito calendario in pagina profile sotto al grafico dell'efficienza
giovanni-ercolano Apr 21, 2024
41a9c7b
add Ai analysis component
lorenzo-vecchio Apr 21, 2024
b36b99e
aggiunto colore di sfondo diverso per i giorni precedenti a quello od…
giovanni-ercolano Apr 21, 2024
e79adf7
.
giovanni-ercolano Apr 21, 2024
7ef5ae6
Category Detail
lorenzo-vecchio Apr 21, 2024
c2a5543
Merge branch 'Hasan' of https://github.com/Radical-fwr/project-pegasu…
lorenzo-vecchio Apr 21, 2024
9fc478f
create categoryBox for toDoScreen
giovanni-ercolano Apr 22, 2024
b80ed32
fix bug categoryBox
giovanni-ercolano Apr 22, 2024
88a810f
aggiunta possibilità di modificare il nome di una categoria
giovanni-ercolano Apr 22, 2024
592f41a
mixed fixes
lorenzo-vecchio Apr 23, 2024
b215769
Update Gif
ilbuoncardi Apr 24, 2024
d3a27b1
fixes
lorenzo-vecchio Apr 25, 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
Binary file modified .DS_Store
Binary file not shown.
Binary file modified Project Pegasus/.DS_Store
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -8,29 +8,36 @@
import MobileCoreServices
import ManagedSettings
import DeviceActivity
import SwiftUI

class Monitor: DeviceActivityMonitor {
let store = ManagedSettingsStore()
override func intervalDidStart(for activity: DeviceActivityName) {
super.intervalDidStart(for: activity)
let model = BlockManager.shared
let applications = model.selectionToDiscourage.applicationTokens
store.shield.applications = applications.isEmpty ? nil : applications
// let model = BlockManager.shared
// let applications = model.selectionToDiscourage.applicationTokens
// store.shield.applications = applications.isEmpty ? nil : applications
}
// modificato da nil a Optional.none da gio 06/03/2024
override func intervalDidEnd(for activity: DeviceActivityName) {
super.intervalDidEnd(for: activity)
store.shield.applications = nil
store.shield.applicationCategories = ShieldSettings.ActivityCategoryPolicy.none
store.shield.webDomainCategories = ShieldSettings.ActivityCategoryPolicy.none
store.shield.webDomains = .none
// store.shield.applications = nil
// store.shield.applicationCategories = ShieldSettings.ActivityCategoryPolicy.none
// store.shield.webDomainCategories = ShieldSettings.ActivityCategoryPolicy.none
// store.shield.webDomains = .none
// BlockManager.shared.stopMonitoring()
// let center = DeviceActivityCenter()
// center.stopMonitoring()
}
// modificato da nil a Optional.none da gio 06/03/2024
override func eventDidReachThreshold(_ event: DeviceActivityEvent.Name, activity: DeviceActivityName) {
super.eventDidReachThreshold(event, activity: activity)
store.shield.applications = nil
store.shield.applicationCategories = ShieldSettings.ActivityCategoryPolicy.none
store.shield.webDomainCategories = ShieldSettings.ActivityCategoryPolicy.none
store.shield.webDomains = .none
// store.shield.applications = nil
// store.shield.applicationCategories = ShieldSettings.ActivityCategoryPolicy.none
// store.shield.webDomainCategories = ShieldSettings.ActivityCategoryPolicy.none
// store.shield.webDomains = .none
// BlockManager.shared.stopMonitoring()
// let center = DeviceActivityCenter()
// center.stopMonitoring()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.developer.family-controls</key>
<true/>
<key>com.apple.security.application-groups</key>
<array>
<string>group.radical_group</string>
</array>
</dict>
</plist>
170 changes: 151 additions & 19 deletions Project Pegasus/Project Pegasus.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
{
"originHash" : "6255d773d71a4b1fea46d8c60599353c3b9436146b8b3f63ccc0045f7c71b697",
"pins" : [
{
"identity" : "swiftui-gif",
"kind" : "remoteSourceControl",
"location" : "https://github.com/globulus/swiftui-gif",
"state" : {
"revision" : "471d37db548e79bdd62e7702dbceaf28ea1103f9",
"version" : "1.1.0"
}
},
{
"identity" : "swiftui-introspect",
"kind" : "remoteSourceControl",
Expand All @@ -19,5 +29,5 @@
}
}
],
"version" : 2
"version" : 3
}
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1530"
wasCreatedForAppExtension = "YES"
version = "2.0">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES"
buildArchitectures = "Automatic">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "16B6EECF2B976A15006988FF"
BuildableName = "MonitorExtension.appex"
BlueprintName = "MonitorExtension"
ReferencedContainer = "container:Project Pegasus.xcodeproj">
</BuildableReference>
</BuildActionEntry>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "16A9E02D2AED51AB000C8EA8"
BuildableName = "Project Pegasus.app"
BlueprintName = "Project Pegasus"
ReferencedContainer = "container:Project Pegasus.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
shouldAutocreateTestPlan = "YES">
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = ""
selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
launchStyle = "0"
askForAppToLaunch = "Yes"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES"
launchAutomaticallySubstyle = "2">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "16A9E02D2AED51AB000C8EA8"
BuildableName = "Project Pegasus.app"
BlueprintName = "Project Pegasus"
ReferencedContainer = "container:Project Pegasus.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES"
askForAppToLaunch = "Yes"
launchAutomaticallySubstyle = "2">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "16A9E02D2AED51AB000C8EA8"
BuildableName = "Project Pegasus.app"
BlueprintName = "Project Pegasus"
ReferencedContainer = "container:Project Pegasus.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
<key>MonitorExtension.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>1</integer>
<integer>0</integer>
</dict>
<key>Project Pegasus.xcscheme_^#shared#^_</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
<integer>1</integer>
</dict>
</dict>
</dict>
Expand Down
Binary file modified Project Pegasus/Project Pegasus/Assets.xcassets/.DS_Store
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "Icon-1024.png",
"filename" : "Frame 5.png",
"idiom" : "universal",
"platform" : "ios",
"size" : "1024x1024"
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "display-p3",
"components" : {
"alpha" : "1.000",
"blue" : "93",
"green" : "107",
"red" : "110"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "display-p3",
"components" : {
"alpha" : "1.000",
"blue" : "135",
"green" : "135",
"red" : "135"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "appLockDarkMode.svg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"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,21 @@
{
"images" : [
{
"filename" : "appLockLightMode.svg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading