2.2.0 Build 78

Author: JLindemann42

app/build.gradle

@@ -21,7 +21,7 @@ android {
         applicationId "com.jlindemann.science"
         minSdkVersion 23
         targetSdkVersion 34
-        versionCode 66
+        versionCode 78
         versionName "2.2.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -59,7 +59,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'androidx.core:core-ktx:1.3.2'
+    implementation 'androidx.core:core-ktx:1.13.1'
     implementation 'com.github.ultimate-deej:twowaynestedscrollview:0.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'com.google.code.gson:gson:2.8.6'
@@ -73,16 +73,17 @@ dependencies {
     implementation 'com.beust:klaxon:5.0.1'
     implementation 'com.github.mmin18:realtimeblurview:1.2.1'
     implementation 'com.google.android.material:material:1.5.0-alpha04'
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.7"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.4"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1"
     implementation 'androidx.browser:browser:1.3.0'
     implementation 'com.ernestoyaquello.dragdropswiperecyclerview:drag-drop-swipe-recyclerview:1.0.2'
     implementation 'com.otaliastudios:zoomlayout:1.8.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.3.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.0'
     annotationProcessor 'com.jakewharton:butterknife-compiler:10.1.0'
 
     def billing_version = "7.0.0"
     implementation "com.android.billingclient:billing-ktx:$billing_version"
+    implementation 'com.google.firebase:firebase-crashlytics-buildtools:2.9.1'
 }

app/release/app-release.aab

@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 63,
-      "versionName": "2.1.1",
+      "versionCode": 66,
+      "versionName": "2.2.0",
       "outputFile": "app-release.apk"
     }
   ],

app/release/app-release.apk

@@ -2,6 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="com.android.vending.BILLING" />
 
     <application
         android:allowBackup="true"
@@ -181,6 +182,17 @@
                 <action android:name="package.OtherActivity" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".activities.settings.ProActivity"
+            android:label="SUBMITPAGE"
+            android:exported="true"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme"
+            android:windowSoftInputMode="adjustNothing">
+            <intent-filter>
+                <action android:name="package.OtherActivity" />
+            </intent-filter>
+        </activity>
         <activity
             android:name=".activities.settings.LicensesActivity"
             android:label="LICENSESPAGE"
@@ -214,6 +226,17 @@
                 <action android:name="package.OtherActivity" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".activities.tables.PoissonActivity"
+            android:label="POISSONACTIVITY"
+            android:exported="true"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme"
+            android:windowSoftInputMode="adjustNothing">
+            <intent-filter>
+                <action android:name="package.OtherActivity" />
+            </intent-filter>
+        </activity>
         <activity
             android:name=".activities.settings.UnitActivity"
             android:label="activity_unit"

app/release/output-metadata.json

@@ -12,6 +12,7 @@ import android.view.ViewGroup
 import android.widget.FrameLayout
 import android.widget.ImageButton
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.ScrollView
 import android.widget.Space
 import android.widget.TextView
@@ -24,7 +25,9 @@ import com.github.mmin18.widget.RealtimeBlurView
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.jlindemann.science.R
 import com.jlindemann.science.activities.settings.FavoritePageActivity
+import com.jlindemann.science.activities.settings.ProActivity
 import com.jlindemann.science.activities.settings.SubmitActivity
+import com.jlindemann.science.activities.tables.NuclideActivity
 import com.jlindemann.science.extensions.InfoExtension
 import com.jlindemann.science.model.Element
 import com.jlindemann.science.model.ElementModel
@@ -58,9 +61,10 @@ class ElementInfoActivity : InfoExtension() {
         var ElementSendAndLoadValue = ElementSendAndLoadPreference.getValue()
         setContentView(R.layout.activity_element_info)
         Utils.fadeInAnim(findViewById<ScrollView>(R.id.scr_view), 300)
+
         readJson()
         findViewById<CardView>(R.id.shell).visibility = View.GONE
-        findViewById<RealtimeBlurView>(R.id.detail_emission).visibility = View.GONE
+        findViewById<CardView>(R.id.detail_emission).visibility = View.GONE
         detailViews()
         offlineCheck()
         nextPrev()
@@ -77,6 +81,25 @@ class ElementInfoActivity : InfoExtension() {
             val intent = Intent(this, SubmitActivity::class.java)
             startActivity(intent)
         }
+        findViewById<TextView>(R.id.get_pro_btn).setOnClickListener {
+            val intent = Intent(this, ProActivity::class.java)
+            startActivity(intent)
+        }
+        //Check if PRO version and if make changes:
+        val proPref = ProVersion(this)
+        var proPrefValue = proPref.getValue()
+        if (proPrefValue==100) {
+            proChanges()
+        }
+        else {
+            findViewById<LinearLayout>(R.id.more_properties).visibility = View.INVISIBLE
+        }
+
+    }
+
+    private fun proChanges() {
+        findViewById<FrameLayout>(R.id.pro_box).visibility = View.GONE
+        findViewById<LinearLayout>(R.id.more_properties).visibility = View.VISIBLE
     }
 
     override fun onBackPressed() {