1.2 release

djshaji · Jun 29, 2024 · d793539 · d793539
1 parent 5efd15e
commit d793539
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 9 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "org.acoustixaudio.axvoicerecorder.video"
         minSdk 29
         targetSdk 34
-        versionCode 4
-        versionName '1.1b'
+        versionCode 7
+        versionName '1.2'
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
@@ -49,7 +49,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.google.oboe:oboe:1.8.1'
+    implementation 'com.google.oboe:oboe:1.9.0'
     implementation 'com.google.android.exoplayer:exoplayer-core:2.19.1'
     implementation "com.android.billingclient:billing:7.0.0"
 

diff --git a/app/release/app-release.aab b/app/release/app-release.aab
diff --git a/app/src/main/java/org/acoustixaudio/axvoicerecorder/video/MainActivity.java b/app/src/main/java/org/acoustixaudio/axvoicerecorder/video/MainActivity.java
@@ -118,7 +118,7 @@ public class MainActivity extends AppCompatActivity implements TextureView.Surfa
     public ToggleButton orientationSwap;
     private int screenWidth;
     private int screenHeight;
-    private boolean nag = true;
+    private int nag = 0;
 
     @Override
     public void onSurfaceTextureAvailable(@NonNull SurfaceTexture surface, int width, int height) {
@@ -236,7 +236,7 @@ protected void onCreate(Bundle savedInstanceState) {
         swapCamera.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                if (running) {
+                if (record.isChecked()) {
                     Toast.makeText(MainActivity.this, "Cannot switch camera while recording", Toast.LENGTH_SHORT).show();
                     return;
                 }
@@ -489,10 +489,11 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                     camera2 = new Camera2(mainActivity);
                     camera2.openCamera();
 
-                    if (nag && ! proVersion) {
-                        nag = false ;
+                    if (nag == 2 && ! proVersion) {
                         startActivity(new Intent(mainActivity, org.acoustixaudio.axvoicerecorder.video.Purchase.class));
                     }
+
+                    nag ++ ;
                 }
             }
         });

diff --git a/app/src/main/java/org/acoustixaudio/axvoicerecorder/video/Purchase.java b/app/src/main/java/org/acoustixaudio/axvoicerecorder/video/Purchase.java
@@ -2,6 +2,7 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.preference.PreferenceManager;
 
@@ -54,6 +55,15 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_purchase);
         TextView priceView = findViewById(R.id.price);
         context = this;
+
+        TextView close = findViewById(R.id.close);
+        close.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                ((Activity) context).finish ();
+            }
+        });
+
         TextView oldPrice = findViewById(R.id.old_price);
         oldPrice.setPaintFlags(oldPrice.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG);
         acknowledgePurchaseResponseListener = new AcknowledgePurchaseResponseListener() {

diff --git a/app/src/main/res/drawable/baseline_close_24.xml b/app/src/main/res/drawable/baseline_close_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+
+    <path android:fillColor="@android:color/white" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
+
+</vector>
diff --git a/app/src/main/res/layout/activity_purchase.xml b/app/src/main/res/layout/activity_purchase.xml
@@ -37,6 +37,8 @@
                 android:text="@string/limit"
                 android:textColor="@color/white"
                 android:fontFamily="@font/comfortaa"
+                android:id="@+id/close"
+                android:drawableRight="@drawable/baseline_close_24"
                 android:background="@drawable/rounded_corners_transparent"/>
             <LinearLayout
                 app:layout_constraintTop_toTopOf="parent"

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.3.0"
+agp = "8.5.0"
 junit = "4.13.2"
 junitVersion = "1.1.5"
 espressoCore = "3.5.1"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Wed Jun 12 10:53:08 IST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists