Merge pull request #51 from JLindemann42/development

2.4.0

Author: JLindemann42

app/build.gradle

@@ -15,14 +15,14 @@ android {
     lint {
         baseline = file("lint-baseline.xml")
     }
-    compileSdkVersion 34
-    buildToolsVersion "34.0.0"
+    compileSdkVersion 35
+    buildToolsVersion "35.0.0"
     defaultConfig {
         applicationId "com.jlindemann.science"
         minSdkVersion 23
-        targetSdkVersion 34
-        versionCode 84
-        versionName "2.3.0"
+        targetSdkVersion 35
+        versionCode 86
+        versionName "2.4.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

app/src/main/assets/lithium.json

@@ -2,7 +2,7 @@
   {
 "element_code": "AApc4YAhpQABJGKpZZZ",
     "wikilink": "https://en.wikipedia.org/wiki/Lithium",
-    "link": "https://www.power-technology.com/wp-content/uploads/sites/7/2019/11/lithium.png",
+    "link": "https://upload.wikimedia.org/wikipedia/commons/2/21/Limetal.JPG",
     "description": "Lithium (from Greek: λίθος, romanized: lithos, lit. 'stone') is a chemical element with the symbol Li and atomic number 3. It is a soft, silvery-white alkali metal. Under standard conditions, it is the lightest metal and the lightest solid element. Like all alkali metals, lithium is highly reactive and flammable, and must be stored in mineral oil. When cut, it exhibits a metallic luster, but moist air corrodes it quickly to a dull silvery gray, then black tarnish. It never occurs freely in nature, but only in (usually ionic) compounds, such as pegmatitic minerals, which were once the main source of lithium. Due to its solubility as an ion, it is present in ocean water and is commonly obtained from brines. Lithium metal is isolated electrolytically from a mixture of lithium chloride and potassium chloride.",
 
     "element": "Lithium",

app/src/main/java/com/jlindemann/science/activities/settings/ProActivity.kt

@@ -45,6 +45,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.json.JSONObject
+import java.io.IOException
 import java.util.concurrent.Executors
 
 
@@ -97,7 +98,12 @@ class ProActivity : BaseActivity(), BillingClientStateListener {
             this.onBackPressed()
         }
         findViewById<TextView>(R.id.buy_btn).setOnClickListener {
-            launchBillingFlow(productDetailList[0])
+            try {
+                launchBillingFlow(productDetailList[0])
+            }
+            catch (e: IOException) {
+                ToastUtil.showToast(this, "Try again")
+            }
         }
         val purchasesUpdateListener =
             PurchasesUpdatedListener { billingResult, purchases ->
@@ -227,7 +233,7 @@ class ProActivity : BaseActivity(), BillingClientStateListener {
                     { billingResult ->
                         when (val responseCode = billingResult.responseCode) {
                             BillingClient.BillingResponseCode.OK -> {
-                                showMemberInfo()
+                                showMemberInfo() //purschase accepted
                             }
                             else -> {
                                 ToastUtil.showToast(this@ProActivity, "Error")
@@ -244,25 +250,30 @@ class ProActivity : BaseActivity(), BillingClientStateListener {
     }
 
     private fun launchBillingFlow(productDetails: ProductDetails) {
-        val productDetailsParamsList =
-            listOf(
-                BillingFlowParams.ProductDetailsParams.newBuilder()
-                    .setProductDetails(productDetails)
-                    .build()
-            )
-        val billingFlowParams = BillingFlowParams.newBuilder()
-            .setProductDetailsParamsList(productDetailsParamsList)
-            .build()
-        if (billingClient?.isReady == false) {
-            ToastUtil.showToast(this, "Billing client not ready, try again!")
-        }
-        val billingResult = billingClient?.launchBillingFlow(this, billingFlowParams)
-
-        when (val responseCode = billingResult?.responseCode) {
-            BillingClient.BillingResponseCode.OK -> {
-                val proPref = ProVersion(this@ProActivity)
-                var proPrefValue = proPref.getValue()
+        try {
+            val productDetailsParamsList =
+                listOf(
+                    BillingFlowParams.ProductDetailsParams.newBuilder()
+                        .setProductDetails(productDetails)
+                        .build()
+                )
+            val billingFlowParams = BillingFlowParams.newBuilder()
+                .setProductDetailsParamsList(productDetailsParamsList)
+                .build()
+            if (billingClient?.isReady == false) {
+                ToastUtil.showToast(this, "Billing client not ready, try again!")
             }
+            val billingResult = billingClient?.launchBillingFlow(this, billingFlowParams)
+
+            when (val responseCode = billingResult?.responseCode) {
+                BillingClient.BillingResponseCode.OK -> {
+                    val proPref = ProVersion(this@ProActivity)
+                    var proPrefValue = proPref.getValue()
+                }
+        }
+        }
+        catch (e: IOException) {
+            ToastUtil.showToast(this, "Try again")
         }
     }
 

app/src/main/java/com/jlindemann/science/activities/tables/PoissonActivity.kt

@@ -2,6 +2,7 @@ package com.jlindemann.science.activities.tables
 
 import android.content.Context
 import android.content.res.Configuration
+import android.graphics.ColorMatrixColorFilter
 import android.os.Bundle
 import android.os.Handler
 import android.text.Editable
@@ -13,29 +14,36 @@ import android.widget.Button
 import android.widget.EditText
 import android.widget.FrameLayout
 import android.widget.ImageButton
+import android.widget.ImageView
 import android.widget.LinearLayout
+import android.widget.ProgressBar
 import android.widget.TextView
+import androidx.cardview.widget.CardView
+import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.jlindemann.science.R
 import com.jlindemann.science.activities.BaseActivity
 import com.jlindemann.science.adapter.ElectrodeAdapter
+import com.jlindemann.science.adapter.EquationsAdapter
 import com.jlindemann.science.adapter.PoissonAdapter
 import com.jlindemann.science.animations.Anim
 import com.jlindemann.science.model.Dictionary
 import com.jlindemann.science.model.DictionaryModel
+import com.jlindemann.science.model.Equation
 import com.jlindemann.science.model.Poisson
 import com.jlindemann.science.model.PoissonModel
 import com.jlindemann.science.preferences.DictionaryPreferences
 import com.jlindemann.science.preferences.PoissonPreferences
 import com.jlindemann.science.preferences.ProVersion
 import com.jlindemann.science.preferences.ThemePreference
+import com.jlindemann.science.utils.ToastUtil
 import com.jlindemann.science.utils.Utils
 import java.util.*
 import kotlin.collections.ArrayList
 
 
-class PoissonActivity : BaseActivity() {
+class PoissonActivity : BaseActivity(), PoissonAdapter.OnPoissonClickListener {
     private var poissonList = ArrayList<Poisson>()
     var mAdapter = PoissonAdapter(poissonList, this, this)
 
@@ -62,6 +70,8 @@ class PoissonActivity : BaseActivity() {
         clickSearch()
         chipListeners(itempoi, recyclerView)
         findViewById<Button>(R.id.clear_btn).visibility = View.GONE
+        findViewById<FrameLayout>(R.id.poi_det_inc_background).setOnClickListener { hideInfoPanel() }
+        findViewById<ImageButton>(R.id.close_detail_poisson_btn).setOnClickListener { hideInfoPanel() }
 
         findViewById<FrameLayout>(R.id.view_poi).systemUiVisibility = View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
         findViewById<ImageButton>(R.id.back_btn_poi).setOnClickListener {
@@ -100,6 +110,28 @@ class PoissonActivity : BaseActivity() {
         })
     }
 
+    //Overrides the clickListener from PoissonAdapter to show InfoPanel when clicking on elments
+    override fun poissonClickListener(item: Poisson, position: Int) {
+        showInfoPanel(item.name, item.start, item.end, item.type)
+    }
+
+    //Show the info panel with detailed information about poisson interavls for materials
+    private fun showInfoPanel(title: String, start: Double, end: Double, type: String) {
+        Anim.fadeIn(findViewById<ConstraintLayout>(R.id.poi_det_inc), 150)
+        findViewById<FrameLayout>(R.id.poi_det_inc_background).visibility = View.VISIBLE
+
+        findViewById<ProgressBar>(R.id.pb_poisson_detail).progress = (start*100*2).toInt() //*2 as 100% is 0.5
+        findViewById<ProgressBar>(R.id.pb_poisson_detail).secondaryProgress = (end*100*2).toInt() //*2 as 100% is 0.5
+        findViewById<TextView>(R.id.detail_poisson_title).text = title
+    }
+
+    //function for hiding info panel
+    private fun hideInfoPanel() {
+        Anim.fadeOutAnim(findViewById<ConstraintLayout>(R.id.poi_det_inc), 150)
+        findViewById<FrameLayout>(R.id.poi_det_inc_background).visibility = View.GONE
+    }
+
+    //Filters the listView by different sorts of material by using the PoissonPreference to filter by the stringValue.
     private fun filter(text: String, list: ArrayList<Poisson>, recyclerView: RecyclerView) {
         val filteredList: ArrayList<Poisson> = ArrayList()
         for (item in list) {
@@ -198,6 +230,14 @@ class PoissonActivity : BaseActivity() {
             findViewById<Button>(R.id.clear_btn).visibility = View.GONE
         }
     }
+
+    //handle back action
+    override fun onBackPressed() {
+        if (findViewById<CardView>(R.id.poi_det_inc).visibility == View.VISIBLE) {
+            hideInfoPanel()
+            return
+        } else { super.onBackPressed() }
+    }
 }
 
 

app/src/main/java/com/jlindemann/science/adapter/PoissonAdapter.kt

@@ -9,12 +9,13 @@ import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.jlindemann.science.R
 import com.jlindemann.science.activities.tables.PoissonActivity
+import com.jlindemann.science.model.Equation
 import com.jlindemann.science.model.Poisson
 import com.jlindemann.science.model.Series
 
 class PoissonAdapter(var list: ArrayList<Poisson>, var clickListener: PoissonActivity, val context: Context) : RecyclerView.Adapter<PoissonAdapter.ViewHolder>() {
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        holder.initialize(list[position], context)
+        holder.initialize(list[position], clickListener, context)
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
@@ -34,7 +35,7 @@ class PoissonAdapter(var list: ArrayList<Poisson>, var clickListener: PoissonAct
         private val textViewBetween = itemView.findViewById(R.id.tv_poi_between) as TextView
         private val textViewType = itemView.findViewById(R.id.tv_poi_type) as TextView
 
-        fun initialize(item: Poisson, context: Context) {
+        fun initialize(item: Poisson, action: OnPoissonClickListener, context: Context) {
             textViewName.text = item.name
             textViewName.text = item.name.capitalize()
             textViewShort.text = item.name.substring(0,2)
@@ -57,7 +58,9 @@ class PoissonAdapter(var list: ArrayList<Poisson>, var clickListener: PoissonAct
             itemView.foreground = ContextCompat.getDrawable(context, R.drawable.toast_card_ripple)
             itemView.isClickable = true
             itemView.isFocusable = true
-
+            itemView.setOnClickListener {
+                action.poissonClickListener(item, adapterPosition)
+            }
         }
     }
 
@@ -66,6 +69,10 @@ class PoissonAdapter(var list: ArrayList<Poisson>, var clickListener: PoissonAct
         notifyDataSetChanged()
     }
 
+    interface OnPoissonClickListener {
+        fun poissonClickListener(item: Poisson, position: Int)
+    }
+
 }
 
 

app/src/main/java/com/jlindemann/science/model/Poisson.kt

@@ -1,4 +1,4 @@
 package com.jlindemann.science.model
 
-data class Poisson(val name: String, val start: Number, val end: Number, val type: String)
+data class Poisson(val name: String, val start: Double, val end: Double, val type: String)
 

app/src/main/res/layout/activity_poisson.xml

@@ -278,6 +278,23 @@
         layout="@layout/detail_poisson"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:visibility="gone" />
+        android:layout_marginStart="30dp"
+        android:layout_marginTop="130dp"
+        android:layout_marginEnd="30dp"
+        android:layout_marginBottom="130dp"
+        android:elevation="112dp"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <FrameLayout
+        android:id="@+id/poi_det_inc_background"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:alpha="0.6"
+        android:visibility="gone"
+        android:background="@color/colorLightText" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>