chore: change applicationId/package to solutions.tretter.mindmachine
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
package com.mindmachine.mvp
|
||||
package solutions.tretter.mindmachine
|
||||
|
||||
import android.app.Activity
|
||||
import android.content.pm.ActivityInfo
|
||||
@@ -9,8 +9,8 @@ import androidx.activity.compose.BackHandler
|
||||
import androidx.activity.compose.setContent
|
||||
import androidx.activity.viewModels
|
||||
import androidx.compose.foundation.background
|
||||
import com.mindmachine.mvp.session.DurationSliderCard
|
||||
import com.mindmachine.mvp.session.SetupTimelineEditor
|
||||
import solutions.tretter.mindmachine.session.DurationSliderCard
|
||||
import solutions.tretter.mindmachine.session.SetupTimelineEditor
|
||||
import androidx.compose.foundation.clickable
|
||||
import androidx.compose.foundation.gestures.detectTapGestures
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
@@ -98,24 +98,24 @@ import androidx.navigation.compose.composable
|
||||
import androidx.navigation.compose.rememberNavController
|
||||
import androidx.navigation.navArgument
|
||||
import com.google.android.gms.ads.MobileAds
|
||||
import com.mindmachine.mvp.audio.BinauralAudioEngine
|
||||
import com.mindmachine.mvp.audio.HeadsetMonitor
|
||||
import com.mindmachine.mvp.ads.AdBanner
|
||||
import com.mindmachine.mvp.ads.rememberInterstitialController
|
||||
import com.mindmachine.mvp.data.SettingsRepository
|
||||
import com.mindmachine.mvp.data.UserProgramRepository
|
||||
import com.mindmachine.mvp.domain.RuntimeState
|
||||
import com.mindmachine.mvp.session.FlashColor
|
||||
import com.mindmachine.mvp.session.MainViewModel
|
||||
import com.mindmachine.mvp.session.SplitFlashFrame
|
||||
import solutions.tretter.mindmachine.audio.BinauralAudioEngine
|
||||
import solutions.tretter.mindmachine.audio.HeadsetMonitor
|
||||
import solutions.tretter.mindmachine.ads.AdBanner
|
||||
import solutions.tretter.mindmachine.ads.rememberInterstitialController
|
||||
import solutions.tretter.mindmachine.data.SettingsRepository
|
||||
import solutions.tretter.mindmachine.data.UserProgramRepository
|
||||
import solutions.tretter.mindmachine.domain.RuntimeState
|
||||
import solutions.tretter.mindmachine.session.FlashColor
|
||||
import solutions.tretter.mindmachine.session.MainViewModel
|
||||
import solutions.tretter.mindmachine.session.SplitFlashFrame
|
||||
import kotlinx.coroutines.launch
|
||||
import com.mindmachine.mvp.session.SplitFlashSequencer
|
||||
import com.mindmachine.mvp.session.flashIntervalMsToSeconds
|
||||
import com.mindmachine.mvp.session.flashIntervalSecondsToMs
|
||||
import com.mindmachine.mvp.session.formatDuration
|
||||
import com.mindmachine.mvp.session.sessionProgressFraction
|
||||
import com.mindmachine.mvp.session.shouldShowActiveControlsByDefault
|
||||
import com.mindmachine.mvp.session.shouldUseImmersiveFullscreen
|
||||
import solutions.tretter.mindmachine.session.SplitFlashSequencer
|
||||
import solutions.tretter.mindmachine.session.flashIntervalMsToSeconds
|
||||
import solutions.tretter.mindmachine.session.flashIntervalSecondsToMs
|
||||
import solutions.tretter.mindmachine.session.formatDuration
|
||||
import solutions.tretter.mindmachine.session.sessionProgressFraction
|
||||
import solutions.tretter.mindmachine.session.shouldShowActiveControlsByDefault
|
||||
import solutions.tretter.mindmachine.session.shouldUseImmersiveFullscreen
|
||||
import kotlinx.coroutines.delay
|
||||
import kotlin.math.roundToInt
|
||||
import java.util.Locale
|
||||
@@ -142,7 +142,7 @@ private val MindMachineColors = darkColorScheme(
|
||||
class MainActivity : ComponentActivity() {
|
||||
private val settingsRepo by lazy { SettingsRepository(applicationContext) }
|
||||
private val billingManager by lazy {
|
||||
com.mindmachine.mvp.billing.BillingManager(
|
||||
solutions.tretter.mindmachine.billing.BillingManager(
|
||||
applicationContext,
|
||||
onNoAdsEntitlementChanged = { hasNoAds ->
|
||||
lifecycleScope.launch { settingsRepo.updateNoAds(hasNoAds) }
|
||||
@@ -173,7 +173,7 @@ class MainActivity : ComponentActivity() {
|
||||
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
fun App(vm: MainViewModel = viewModel(), billingManager: com.mindmachine.mvp.billing.BillingManager) {
|
||||
fun App(vm: MainViewModel = viewModel(), billingManager: solutions.tretter.mindmachine.billing.BillingManager) {
|
||||
val nav = rememberNavController()
|
||||
val ui by vm.ui.collectAsStateWithLifecycle()
|
||||
val lifecycle = LocalLifecycleOwner.current.lifecycle
|
||||
@@ -876,7 +876,7 @@ fun SettingsScreen(vm: MainViewModel, onRemoveAds: () -> Unit) {
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun RemoveAdsScreen(billingManager: com.mindmachine.mvp.billing.BillingManager, vm: MainViewModel) {
|
||||
fun RemoveAdsScreen(billingManager: solutions.tretter.mindmachine.billing.BillingManager, vm: MainViewModel) {
|
||||
val ui by vm.ui.collectAsStateWithLifecycle()
|
||||
val activity = LocalContext.current as? Activity
|
||||
val details by billingManager.productDetails.collectAsStateWithLifecycle()
|
||||
@@ -898,19 +898,19 @@ fun RemoveAdsScreen(billingManager: com.mindmachine.mvp.billing.BillingManager,
|
||||
Button(
|
||||
enabled = activity != null && !ui.settings.noAds,
|
||||
onClick = {
|
||||
activity?.let { billingManager.launchPurchase(it, com.mindmachine.mvp.billing.BillingProducts.SUB_REMOVE_ADS_MONTHLY) }
|
||||
activity?.let { billingManager.launchPurchase(it, solutions.tretter.mindmachine.billing.BillingProducts.SUB_REMOVE_ADS_MONTHLY) }
|
||||
}
|
||||
) {
|
||||
Text(details[com.mindmachine.mvp.billing.BillingProducts.SUB_REMOVE_ADS_MONTHLY]?.name ?: "Subscribe: $1/month")
|
||||
Text(details[solutions.tretter.mindmachine.billing.BillingProducts.SUB_REMOVE_ADS_MONTHLY]?.name ?: "Subscribe: $1/month")
|
||||
}
|
||||
|
||||
Button(
|
||||
enabled = activity != null && !ui.settings.noAds,
|
||||
onClick = {
|
||||
activity?.let { billingManager.launchPurchase(it, com.mindmachine.mvp.billing.BillingProducts.INAPP_REMOVE_ADS_FOREVER) }
|
||||
activity?.let { billingManager.launchPurchase(it, solutions.tretter.mindmachine.billing.BillingProducts.INAPP_REMOVE_ADS_FOREVER) }
|
||||
}
|
||||
) {
|
||||
Text(details[com.mindmachine.mvp.billing.BillingProducts.INAPP_REMOVE_ADS_FOREVER]?.name ?: "Buy: $20 one-time")
|
||||
Text(details[solutions.tretter.mindmachine.billing.BillingProducts.INAPP_REMOVE_ADS_FOREVER]?.name ?: "Buy: $20 one-time")
|
||||
}
|
||||
|
||||
TextButton(onClick = { billingManager.refresh() }) { Text("Restore / Refresh purchases") }
|
||||
|
||||
Reference in New Issue
Block a user