diff --git a/mobile/build.gradle b/mobile/build.gradle index aeef141a..6b0aed57 100644 --- a/mobile/build.gradle +++ b/mobile/build.gradle @@ -76,6 +76,7 @@ dependencies { implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion" implementation 'androidx.preference:preference:1.1.0-alpha03' implementation "androidx.room:room-coroutines:$roomVersion" + implementation 'com.android.billingclient:billing:1.2' implementation 'com.github.luongvo:BadgeView:1.1.5' implementation 'com.github.topjohnwu.libsu:core:2.3.1' implementation 'com.google.android.material:material:1.0.0' @@ -84,7 +85,6 @@ dependencies { implementation 'com.takisoft.preferencex:preferencex-simplemenu:1.0.0' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion" implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.1.1' - baseImplementation 'com.android.billingclient:billing:1.2' baseImplementation 'com.crashlytics.sdk.android:crashlytics:2.9.8' baseImplementation 'com.google.firebase:firebase-core:16.0.7' testImplementation "androidx.arch.core:core-testing:$lifecycleVersion" diff --git a/mobile/src/fdroid/java/be/mygod/vpnhotspot/EBegFragment.kt b/mobile/src/fdroid/java/be/mygod/vpnhotspot/EBegFragment.kt deleted file mode 100644 index 01ef2fb8..00000000 --- a/mobile/src/fdroid/java/be/mygod/vpnhotspot/EBegFragment.kt +++ /dev/null @@ -1,26 +0,0 @@ -package be.mygod.vpnhotspot - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.Button -import androidx.appcompat.app.AppCompatDialogFragment -import be.mygod.vpnhotspot.util.launchUrl -import kotlinx.android.synthetic.main.fragment_ebeg.view.* - -/** - * Based on: https://github.com/PrivacyApps/donations/blob/747d36a18433c7e9329691054122a8ad337a62d2/Donations/src/main/java/org/sufficientlysecure/donations/DonationsFragment.java - */ -class EBegFragment : AppCompatDialogFragment() { - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View = - inflater.inflate(R.layout.fragment_ebeg, container, false) - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - view.donations__google.visibility = View.GONE - (view.donations__more_stub.inflate() as Button).setOnClickListener { - requireContext().launchUrl("https://mygod.be/donate/") - } - } -} diff --git a/mobile/src/base/java/be/mygod/vpnhotspot/EBegFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/EBegFragment.kt similarity index 100% rename from mobile/src/base/java/be/mygod/vpnhotspot/EBegFragment.kt rename to mobile/src/main/java/be/mygod/vpnhotspot/EBegFragment.kt