Skip to content

Commit 9030ced

Browse files
authored
Merge pull request #775 from ooni/donate-screen
Donate screen
2 parents 3a019b5 + fc45f64 commit 9030ced

File tree

20 files changed

+451
-2
lines changed

20 files changed

+451
-2
lines changed
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11

22
ooni_logo.xml
3-
logo_probe.xml
3+
logo_probe.xml
4+
donate_octopus_1.xml
5+
donate_octopus_2.xml
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="960"
5+
android:viewportHeight="960"
6+
android:tint="?attr/colorControlNormal">
7+
<path
8+
android:fillColor="#FF000000"
9+
android:pathData="M480,840L422,788Q321,697 255,631Q189,565 150,512.5Q111,460 95.5,416Q80,372 80,326Q80,232 143,169Q206,106 300,106Q352,106 399,128Q446,150 480,190Q514,150 561,128Q608,106 660,106Q754,106 817,169Q880,232 880,326Q880,372 864.5,416Q849,460 810,512.5Q771,565 705,631Q639,697 538,788L480,840ZM480,732Q576,646 638,584.5Q700,523 736,477.5Q772,432 786,396.5Q800,361 800,326Q800,266 760,226Q720,186 660,186Q613,186 573,212.5Q533,239 518,280L518,280L442,280L442,280Q427,239 387,212.5Q347,186 300,186Q240,186 200,226Q160,266 160,326Q160,361 174,396.5Q188,432 224,477.5Q260,523 322,584.5Q384,646 480,732ZM480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459L480,459L480,459L480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Q480,459 480,459Z"/>
10+
</vector>

composeApp/src/commonMain/kotlin/org/ooni/probe/config/OrganizationConfig.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ interface OrganizationConfigInterface {
99
val onboardingImages: OnboardingImages
1010
val updateDescriptorTaskId: String
1111
val hasWebsitesDescriptor: Boolean
12+
val donateUrl: String?
1213

1314
val ooniApiBaseUrl get() = BuildTypeDefaults.ooniApiBaseUrl
1415
val ooniRunDomain get() = BuildTypeDefaults.ooniRunDomain

composeApp/src/commonMain/kotlin/org/ooni/probe/data/models/PreferenceItem.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ enum class PreferenceCategoryKey(val value: String) {
6464
LANGUAGE("language"),
6565
ADVANCED("advanced"),
6666
SEND_EMAIL("send_email"),
67+
DONATE("donate"),
6768
ABOUT_OONI("about_ooni"),
6869

6970
WEBSITES_CATEGORIES("websites_categories"),

composeApp/src/commonMain/kotlin/org/ooni/probe/di/Dependencies.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ class Dependencies(
130130
val startDescriptorsUpdate: suspend (List<InstalledTestDescriptorModel>?) -> Unit,
131131
val localeDirection: (() -> LayoutDirection)? = null,
132132
private val isWebViewAvailable: () -> Boolean,
133-
private val launchAction: (PlatformAction) -> Boolean,
133+
val launchAction: (PlatformAction) -> Boolean,
134134
private val batteryOptimization: BatteryOptimization,
135135
val flavorConfig: FlavorConfigInterface,
136136
) {

0 commit comments

Comments
 (0)