1941

GetBetterApps · Mar 4, 2024 · 9592f23 · 9592f23
1 parent c59bf77
commit 9592f23
Show file tree

Hide file tree

Showing 7 changed files with 9,322 additions and 9,415 deletions.
diff --git a/androidApp/app/release/v8(1.3.0)-release.aab b/androidApp/app/release/v8(1.3.0)-release.aab
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -11,8 +11,8 @@ java = "18"
 minSdk = "26"
 targetSdk = "34"
 compileSdk = "34"
-versionCode = "7"
-versionName = "1.2.2-alpha"
+versionCode = "8"
+versionName = "1.3.0"
 
 # Dependencies
 firebase-android-bom = "32.3.1"

diff --git a/iosApp/Pods/Pods.xcodeproj/project.pbxproj b/iosApp/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/iosApp/iosApp.xcodeproj/project.pbxproj b/iosApp/iosApp.xcodeproj/project.pbxproj
@@ -1600,7 +1600,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_ENTITLEMENTS = iosApp/iosApp.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_ASSET_PATHS = iosApp/Assets.xcassets;
 				DEVELOPMENT_TEAM = 2Y83RX392R;
 				ENABLE_PREVIEWS = YES;
@@ -1611,7 +1611,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = "1.2-DEBUG";
+				MARKETING_VERSION = "1.3-DEBUG";
 				PRODUCT_BUNDLE_IDENTIFIER = com.velkonost.getbetter;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -1632,7 +1632,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_ENTITLEMENTS = iosApp/iosApp.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_ASSET_PATHS = iosApp/Assets.xcassets;
 				DEVELOPMENT_TEAM = 2Y83RX392R;
 				ENABLE_PREVIEWS = YES;
@@ -1643,7 +1643,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.2;
+				MARKETING_VERSION = 1.3;
 				PRODUCT_BUNDLE_IDENTIFIER = com.velkonost.getbetter;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

diff --git a/iosApp/iosApp.xcworkspace/xcuserdata/velkonost.xcuserdatad/UserInterfaceState.xcuserstate b/iosApp/iosApp.xcworkspace/xcuserdata/velkonost.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/iosApp/iosApp/Info.plist b/iosApp/iosApp/Info.plist
@@ -19,10 +19,8 @@
 	<string>GetBetter</string>
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
-	<key>CFBundleShortVersionString</key>
-	<string>4</string>
 	<key>CFBundleVersion</key>
-	<string>4</string>
+	<string>5</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

diff --git a/...n/src/commonMain/kotlin/com/velkonost/getbetter/shared/features/social/SocialViewModel.kt b/...n/src/commonMain/kotlin/com/velkonost/getbetter/shared/features/social/SocialViewModel.kt
@@ -68,7 +68,6 @@ internal constructor(
 
     private fun checkSubscription() {
         launchJob {
-
             val shouldSuggestResumeSubscription =
                 subscriptionRepository.shouldSuggestResumeSubscription()
 
@@ -78,15 +77,13 @@ internal constructor(
                         emit(viewState.value.copy(showAds = !it.isActive || it.fake))
 
                         if (
-//                            !it.isActive
-//                            && !it.fake
-//                            && it.trialUsed
-//                            && !it.autoRenewal
-//                            && it.expiredAt != -1L
-//                            && !it.isUnlimited
-//                            &&
-//                            shouldSuggestResumeSubscription
-                            true
+                            !it.isActive
+                            && !it.fake
+                            && it.trialUsed
+                            && !it.autoRenewal
+                            && it.expiredAt != -1L
+                            && !it.isUnlimited
+                            && shouldSuggestResumeSubscription
                         ) {
                             obtainResumeSubscriptionSuggested()
                             emit(SocialEvent.SuggestResumeSubscription)