Merge pull request #8334 from wmontwe/add-billing-client (4359c184) · Commits · e / os / Mail

app-thunderbird/build.gradle.kts

+1 −1

Original line number	Diff line number	Diff line
		@@ -220,7 +220,7 @@ dependencies {

		"fossImplementation"(projects.feature.funding.link)

		fullDebugImplementation(projects.feature.funding.link)
		fullDebugImplementation(projects.feature.funding.googleplay)
		fullDailyImplementation(projects.feature.funding.googleplay)
		fullBetaImplementation(projects.feature.funding.googleplay)
		fullReleaseImplementation(projects.feature.funding.googleplay)

app-thunderbird/src/main/kotlin/net/thunderbird/android/featureflag/TbFeatureFlagFactory.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@ class TbFeatureFlagFactory : FeatureFlagFactory {
		override fun createFeatureCatalog(): List<FeatureFlag> {
		return listOf(
		FeatureFlag(FeatureFlagKey("material3_navigation_drawer"), true),
		FeatureFlag(FeatureFlagKey("funding_google_play"), false),
		FeatureFlag(FeatureFlagKey("funding_google_play"), true),
		)
		}
		}

feature/funding/googleplay/build.gradle.kts

+2 −0

Original line number	Diff line number	Diff line
		@@ -10,10 +10,12 @@ android {
		dependencies {
		api(projects.feature.funding.api)

		implementation(projects.core.common)
		implementation(projects.core.ui.compose.designsystem)

		implementation(libs.android.billing)
		implementation(libs.android.billing.ktx)
		implementation(libs.timber)

		testImplementation(projects.core.ui.compose.testing)
		}

feature/funding/googleplay/src/debug/AndroidManifest.xml

0 → 100644

+18 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<manifest
		xmlns:android="http://schemas.android.com/apk/res/android">

		<application>

		<meta-data
		android:name="com.google.android.play.largest_release_audience.NONPRODUCTION"
		android:value=""
		/>
		<meta-data
		android:name="com.google.android.play.billingclient.enableBillingOverridesTesting"
		android:value="true"
		/>

		</application>

		</manifest>

feature/funding/googleplay/src/debug/kotlin/app/k9mail/feature/funding/googleplay/ui/contribution/ContributionFooterPreview.kt

+38 −2

Original line number	Diff line number	Diff line
		@@ -11,8 +11,10 @@ fun ContributionFooterPreview() {
		ContributionFooter(
		onPurchaseClick = {},
		onManagePurchaseClick = {},
		onShowContributionListClick = {},
		purchasedContribution = null,
		isPurchaseEnabled = true,
		isContributionListShown = true,
		)
		}
		}
		@@ -22,9 +24,11 @@ fun ContributionFooterPreview() {
		fun ContributionFooterDisabledPreview() {
		PreviewWithTheme {
		ContributionFooter(
		purchasedContribution = null,
		onPurchaseClick = {},
		onManagePurchaseClick = {},
		purchasedContribution = null,
		onShowContributionListClick = {},
		isContributionListShown = false,
		isPurchaseEnabled = false,
		)
		}
		@@ -35,10 +39,42 @@ fun ContributionFooterDisabledPreview() {
		fun ContributionFooterWithRecurringContributionPreview() {
		PreviewWithTheme {
		ContributionFooter(
		purchasedContribution = FakeData.recurringContribution,
		onPurchaseClick = {},
		onManagePurchaseClick = {},
		purchasedContribution = FakeData.recurringContribution,
		onShowContributionListClick = {},
		isPurchaseEnabled = true,
		isContributionListShown = false,
		)
		}
		}

		@Composable
		@Preview(showBackground = true)
		fun ContributionFooterWithOneTimeContributionPreview() {
		PreviewWithTheme {
		ContributionFooter(
		purchasedContribution = FakeData.oneTimeContribution,
		onPurchaseClick = {},
		onManagePurchaseClick = {},
		onShowContributionListClick = {},
		isPurchaseEnabled = true,
		isContributionListShown = false,
		)
		}
		}

		@Composable
		@Preview(showBackground = true)
		fun ContributionFooterWithOneTimeContributionAndListPreview() {
		PreviewWithTheme {
		ContributionFooter(
		purchasedContribution = FakeData.oneTimeContribution,
		onPurchaseClick = {},
		onManagePurchaseClick = {},
		onShowContributionListClick = {},
		isPurchaseEnabled = true,
		isContributionListShown = true,
		)
		}
		}