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.

Sign up for GitHub

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

Jump to bottom

feat (OONI Run v2): Update Test overview to remove run button and implement new components #565

Draft
wants to merge 5 commits into
base: dev/ooni-run-v2
Choose a base branch
from
Draft

feat (OONI Run v2): Update Test overview to remove run button and implement new components #565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3d68abe
feat: update overview screen
aanorbel Jun 28, 2024
714c201
chore: fix click events emitter for overview page
aanorbel Jul 25, 2024
42db697
feat: Add new files for input and nettest status in RunTest view
aanorbel Jul 26, 2024
c6335b3
feat: Refactor RunTest view to improve input and nettest status handling
aanorbel Jul 26, 2024
0509bbf
chore: start run tests
aanorbel Jul 30, 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
32 changes: 30 additions & 2 deletions ooniprobe.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,18 @@
17E7EDC021BFEE0C001961C7 /* SnapshotHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 17E7EDBF21BFEE0C001961C7 /* SnapshotHelper.swift */; };
526C702A25C99AB200C7A164 /* Colors.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 526C702925C99AB100C7A164 /* Colors.xcassets */; };
58E18F9EBF4FAD4EFCE020F3 /* Pods_ooniprobe.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BB32DF3D6FC174AA1AF76009 /* Pods_ooniprobe.framework */; };
793587D32B8E081600038F88 /* Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 793587D22B8E081600038F88 /* Utils.swift */; };
793587BA2B852EDD00038F88 /* OoniRunViewUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 793587B92B852EDD00038F88 /* OoniRunViewUITests.swift */; };
793587D32B8E081600038F88 /* Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 793587D22B8E081600038F88 /* Utils.swift */; };
7940AA8B28117E9000C0EB5D /* ShareViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7940AA8A28117E9000C0EB5D /* ShareViewController.swift */; };
7940AA8E28117E9000C0EB5D /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7940AA8C28117E9000C0EB5D /* MainInterface.storyboard */; };
7940AA9228117E9000C0EB5D /* share.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 7940AA8828117E9000C0EB5D /* share.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
7945903D2C21BFB1008116BF /* OONIDescriptor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7945903C2C21BFB1008116BF /* OONIDescriptor.swift */; };
79780FCF27E9F18E002A38B1 /* Languages.plist in Resources */ = {isa = PBXBuildFile; fileRef = 79780FCE27E9F18E002A38B1 /* Languages.plist */; };
79BC192B2C53AD890017B7EC /* InputTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79BC192A2C53AD890017B7EC /* InputTableViewCell.swift */; };
79BC192D2C53ADC20017B7EC /* NettestTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79BC192C2C53ADC20017B7EC /* NettestTableViewCell.swift */; };
79BC192F2C53B3D10017B7EC /* NettestStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79BC192E2C53B3D10017B7EC /* NettestStatus.swift */; };
79BC19312C53C24E0017B7EC /* DashboardTableViewController+Actions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79BC19302C53C24E0017B7EC /* DashboardTableViewController+Actions.swift */; };
79DB62342C2D8F020076FA0C /* TestOverviewViewController+TableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79DB62332C2D8F020076FA0C /* TestOverviewViewController+TableView.swift */; };
7AED19812A6EC9A2003B265A /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 7AED19802A6EC9A2003B265A /* libresolv.tbd */; };
7AED19832A6EC9C7003B265A /* libresolv.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 7AED19822A6EC9C7003B265A /* libresolv.tbd */; };
D4A2F5DF1A6C3244001B8460 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = D4A2F5DE1A6C3244001B8460 /* main.m */; };
Expand Down Expand Up @@ -221,8 +226,8 @@
17E7EDBF21BFEE0C001961C7 /* SnapshotHelper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SnapshotHelper.swift; path = fastlane/SnapshotHelper.swift; sourceTree = SOURCE_ROOT; };
526C702925C99AB100C7A164 /* Colors.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Colors.xcassets; sourceTree = "<group>"; };
588219FACC9F793A15BDEA33 /* Pods_OONIProbeUnitTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_OONIProbeUnitTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
793587D22B8E081600038F88 /* Utils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Utils.swift; sourceTree = "<group>"; };
793587B92B852EDD00038F88 /* OoniRunViewUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OoniRunViewUITests.swift; sourceTree = "<group>"; };
793587D22B8E081600038F88 /* Utils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Utils.swift; sourceTree = "<group>"; };
7940AA8828117E9000C0EB5D /* share.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = share.appex; sourceTree = BUILT_PRODUCTS_DIR; };
7940AA8A28117E9000C0EB5D /* ShareViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareViewController.swift; sourceTree = "<group>"; };
7940AA8D28117E9000C0EB5D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/MainInterface.storyboard; sourceTree = "<group>"; };
Expand All @@ -233,6 +238,11 @@
79780FCE27E9F18E002A38B1 /* Languages.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Languages.plist; sourceTree = "<group>"; };
79AA093C2A86E44400C23E27 /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/Localizable.strings; sourceTree = "<group>"; };
79AA093D2A86E47600C23E27 /* my */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = my; path = my.lproj/Localizable.strings; sourceTree = "<group>"; };
79BC192A2C53AD890017B7EC /* InputTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InputTableViewCell.swift; sourceTree = "<group>"; };
79BC192C2C53ADC20017B7EC /* NettestTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NettestTableViewCell.swift; sourceTree = "<group>"; };
79BC192E2C53B3D10017B7EC /* NettestStatus.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NettestStatus.swift; sourceTree = "<group>"; };
79BC19302C53C24E0017B7EC /* DashboardTableViewController+Actions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DashboardTableViewController+Actions.swift"; sourceTree = "<group>"; };
79DB62332C2D8F020076FA0C /* TestOverviewViewController+TableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "TestOverviewViewController+TableView.swift"; sourceTree = "<group>"; };
7A8CB0932ADDDAC1005AB2BC /* libcrypto.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = libcrypto.xcframework; path = Pods/libcrypto/libcrypto.xcframework; sourceTree = "<group>"; };
7A8CB0942ADDDAC1005AB2BC /* libevent.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = libevent.xcframework; path = Pods/libevent/libevent.xcframework; sourceTree = "<group>"; };
7A8CB0952ADDDAC1005AB2BC /* libssl.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = libssl.xcframework; path = Pods/libssl/libssl.xcframework; sourceTree = "<group>"; };
Expand Down Expand Up @@ -606,6 +616,16 @@
path = share;
sourceTree = "<group>";
};
79BC19292C53AD470017B7EC /* Rows */ = {
isa = PBXGroup;
children = (
79BC192A2C53AD890017B7EC /* InputTableViewCell.swift */,
79BC192C2C53ADC20017B7EC /* NettestTableViewCell.swift */,
79BC192E2C53B3D10017B7EC /* NettestStatus.swift */,
);
path = Rows;
sourceTree = "<group>";
};
A226141514CB239FFA382514 /* Pods */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -714,12 +734,14 @@
ED0D8D6D201866D8003DDF23 /* RunTest */ = {
isa = PBXGroup;
children = (
79BC19292C53AD470017B7EC /* Rows */,
ED1CC80020159D970041089A /* TestRunningViewController.h */,
ED1CC80120159D970041089A /* TestRunningViewController.m */,
ED0D8D6E20186742003DDF23 /* TestOverviewViewController.h */,
ED0D8D6F20186742003DDF23 /* TestOverviewViewController.m */,
ED21D090269C93B900BB09D8 /* ProgressViewController.h */,
ED21D091269C93B900BB09D8 /* ProgressViewController.m */,
79DB62332C2D8F020076FA0C /* TestOverviewViewController+TableView.swift */,
);
path = RunTest;
sourceTree = "<group>";
Expand Down Expand Up @@ -747,6 +769,7 @@
ED0A61FF200B52A300235E70 /* OONIRun */,
EDDB0B561FFF32B900EFD9C8 /* Settings */,
EDDB0B631FFF6C8B00EFD9C8 /* Onboarding */,
79BC19302C53C24E0017B7EC /* DashboardTableViewController+Actions.swift */,
);
path = View;
sourceTree = "<group>";
Expand Down Expand Up @@ -1585,6 +1608,7 @@
EDBBB2DF203D2EF200B84F6F /* TestResultTableViewCell.m in Sources */,
ED90A92D2198DE5100204B46 /* Options.m in Sources */,
ED4D1E5D24629A870087B36D /* OONIApi.m in Sources */,
79BC19312C53C24E0017B7EC /* DashboardTableViewController+Actions.swift in Sources */,
D4A2F5DF1A6C3244001B8460 /* main.m in Sources */,
ED5F8A2A1F77C4AA0093C8F5 /* VersionUtility.m in Sources */,
ED4F77F5265E3C5A00C28AC0 /* ProxySettings.m in Sources */,
Expand Down Expand Up @@ -1612,11 +1636,13 @@
ED41D8B82089E9C500543191 /* WebsitesDetailsViewController.m in Sources */,
ED3AE9F020341C8600DAAF36 /* ResultsHeaderViewController.m in Sources */,
EDDB0B761FFF6C8B00EFD9C8 /* Onboarding3ViewController.m in Sources */,
79BC192F2C53B3D10017B7EC /* NettestStatus.swift in Sources */,
EDF4ED20248A8B50001A5406 /* EventResult.m in Sources */,
ED4D1E60246315EF0087B36D /* BasicTableViewCell.m in Sources */,
EDF4ED31248FBFEC001A5406 /* CircumventionDetailsViewController.m in Sources */,
EDB3D64926203DC000724ECF /* ExperimentalSuite.m in Sources */,
EDB33B7E21838824002CEC34 /* CustomURLViewController.m in Sources */,
79BC192B2C53AD890017B7EC /* InputTableViewCell.swift in Sources */,
ED14B2342465411E009AA906 /* Psiphon.m in Sources */,
ED2E067121D4867B00E9B9EE /* NdtTest.m in Sources */,
ED9CCEF7252B3298004F8420 /* OONISessionConfig.m in Sources */,
Expand All @@ -1637,6 +1663,7 @@
ED2E066F21D4867B00E9B9EE /* HttpInvalidRequestLine.m in Sources */,
ED4DF7DA2609F0ED00521C5B /* BackgroundTask.m in Sources */,
ED4A00B526494F140083C8F6 /* ProxyViewController.m in Sources */,
79BC192D2C53ADC20017B7EC /* NettestTableViewCell.swift in Sources */,
ED9CCEE8252B30D3004F8420 /* OONIContext.m in Sources */,
ED21D092269C93B900BB09D8 /* ProgressViewController.m in Sources */,
ED58CF7E1FEBBE2800E3C415 /* TestUtility.m in Sources */,
Expand All @@ -1648,6 +1675,7 @@
EDA9F21E224255E7003D40E8 /* TestSummaryViewController.m in Sources */,
EDFE073D1F375E3C00960AF2 /* DictionaryUtility.m in Sources */,
ED2E066D21D4867B00E9B9EE /* WebConnectivity.m in Sources */,
79DB62342C2D8F020076FA0C /* TestOverviewViewController+TableView.swift in Sources */,
EDF4ED27248A9A64001A5406 /* Simple.m in Sources */,
EDF4ECF4248549BD001A5406 /* Engine.m in Sources */,
ED58CF7A1FEBB9A900E3C415 /* DashboardTableViewController.m in Sources */,
Expand Down
14 changes: 12 additions & 2 deletions ooniprobe/OONIDescriptor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public class Nettest: NSObject {
/// The class also provides a method to get the OONI descriptors for the OONI dashboard.
/// The class also provides a method to get the test suite for the current descriptor.
@objc(OONIDescriptor)
public class OONIDescriptor: NSObject {
public class OONIDescriptor: NSObject,Identifiable {

// MARK: Initializers
init(name: String,
Expand Down Expand Up @@ -192,7 +192,17 @@ public class OONIDescriptor: NSObject {
name: "experimental",
title: NSLocalizedString("Test.Experimental.Fullname", comment: ""),
shortDescription: NSLocalizedString("Dashboard.Experimental.Card.Description", comment: ""),
longDescription: NSLocalizedString("Dashboard.Experimental.Overview.Paragraph", comment: ""),
longDescription: String.localizedStringWithFormat(
NSLocalizedString("Dashboard.Experimental.Overview.Paragraph", comment: ""),
"""
\n- [STUN Reachability](https://github.com/ooni/spec/blob/master/nettests/ts-025-stun-reachability.md)
\n- [DNS Check](https://github.com/ooni/spec/blob/master/nettests/ts-028-dnscheck.md)
\n- [RiseupVPN](https://ooni.org/nettest/riseupvpn/)
\n- [ECH Check](https://github.com/ooni/spec/blob/master/nettests/ts-039-echcheck.md)
\(String(format: "%@ (%@)", "\n- [Tor Snowflake](https://ooni.org/nettest/tor-snowflake/)", NSLocalizedString("Settings.TestOptions.LongRunningTest", comment: "")))
\(String(format: "%@ (%@)", "\n- [Vanilla Tor](https://github.com/ooni/spec/blob/master/nettests/ts-016-vanilla-tor.md)", NSLocalizedString("Settings.TestOptions.LongRunningTest", comment: "")))
"""
) ,
icon: "experimental",
color: UIColor(named: "color_indigo1")!,
animation: "experimental",
Expand Down
Loading
Loading