Merge pull request #66 from DominicWrege/master

hotfix 2.0.4

Author: Thorsten1

Ladefuchs/app/build.gradle

@@ -11,8 +11,8 @@ android {
         applicationId "app.ladefuchs.android"
         minSdkVersion 26
         targetSdkVersion 33
-        versionCode 203
-        versionName "2.0.3"
+        versionCode 204
+        versionName "2.0.4"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

Ladefuchs/app/src/main/java/app/ladefuchs/android/helper/drawHelper.kt

@@ -187,11 +187,14 @@ fun fillCards(
             cardView.addView(imageView)
 
             if (currentCard.note.isNotEmpty() || currentCard.blockingFee > 0) {
-                addHuedchen(parentView.context, cardView, frameLayout)
+                addHuetchen(parentView.context, cardView, frameLayout)
             }
 
             cell.addView(frameLayout)
-            val (imageDrawable, downloaded) = getCardImageDrawable(currentCard, parentView.context)
+            val (imageDrawable, downloaded) = downloadOrGetImageDrawable(
+                currentCard.image,
+                parentView.context
+            )
             cardsDownloaded = downloaded
             if (imageDrawable != null) {
                 imageView.setImageDrawable(imageDrawable)
@@ -286,7 +289,7 @@ private fun fillEmptyCells(
     }
 }
 
-private fun addHuedchen(
+private fun addHuetchen(
     context: Context,
     cardView: CardView,
     frameLayout: FrameLayout
@@ -389,7 +392,7 @@ fun createCardDetailPopup(
         }
 
     // Set card Image
-    val (image, _) = getCardImageDrawable(currentCard, view.context)
+    val (image, _) = downloadOrGetImageDrawable(currentCard.image, view.context)
     if (image != null) {
         val imageView = popupView.findViewById<ImageView>(R.id.card_logo)
         imageView.setImageDrawable(image)
@@ -443,27 +446,23 @@ fun createCardDetailPopup(
         popupView.findViewById<Button>(R.id.getCard).visibility = View.INVISIBLE
     }
 
-    // Retrieve Operator Image
-    var operatorImage: Drawable? = null
-    if (!operator.image.isNullOrEmpty()) {
-        val imgPath = getImagePath(URL(operator.image), view.context, true)
-        if (!imgPath.exists())
-            downloadImageToInternalStorage(imageURL = URL(operator.image), view.context, cpo = true)
-        try {
-            operatorImage = Drawable.createFromPath(imgPath.absolutePath)!!
-        } catch (e: Exception) {
-            //Download was to slow or failed no need for error handling because generated image will be used
-            if (BuildConfig.DEBUG) {
-                e.printStackTrace()
-            }
-        }
-    }
+    // retrieve operator image
+    val (operatorImage, _) = downloadOrGetImageDrawable(operator.image, view.context)
     val operatorImageView = popupView.findViewById<ImageView>(R.id.cpo_logo)
-//     creating an own image
+
     if (operatorImage == null) {
-        operatorImage = AppCompatResources.getDrawable(view.context, R.drawable.cpo_generic)
+        // set operator placeholder image
+        operatorImageView.setImageDrawable(
+            AppCompatResources.getDrawable(
+                view.context,
+                R.drawable.cpo_generic
+            )
+        )
+    } else {
+        // set operator image
         operatorImageView.setImageDrawable(operatorImage)
     }
+
 }
 
 @SuppressLint("DiscouragedApi")
@@ -500,25 +499,26 @@ private fun createDialog(
 }
 
 
-fun getCardImageDrawable(card: ChargeCards, context: Context): Pair<Drawable?, Boolean> {
+fun downloadOrGetImageDrawable(imageUriStr: String?, context: Context): Pair<Drawable?, Boolean> {
 
-    if (card.image.isNullOrEmpty()) {
+    if (imageUriStr.isNullOrEmpty()) {
         return null to false
     }
-    val cardUri = URL(card.image)
-    var cardImagePath: File? = getImagePath(cardUri, context)
 
-    if (cardImagePath?.exists() == false) {
+    val uri = URL(imageUriStr)
+    var imagePath: File? = getImagePath(uri, context)
+
+    if (imagePath?.exists() == false) {
         downloadImageToInternalStorage(
-            cardUri,
+            uri,
             context
         )
     }
 
-    if (cardImagePath?.exists() == true) {
+    if (imagePath?.exists() == true) {
         try {
-            cardImagePath = getImagePath(cardUri, context)
-            return Drawable.createFromPath(cardImagePath.absolutePath) to false
+            imagePath = getImagePath(uri, context)
+            return Drawable.createFromPath(imagePath.absolutePath) to false
         } catch (e: Exception) {
             if (BuildConfig.DEBUG) {
                 e.printStackTrace()

Ladefuchs/app/src/main/java/app/ladefuchs/android/ui/chargecards/ChargeCardFragment.kt

@@ -1,14 +1,12 @@
 package app.ladefuchs.android.ui.chargecards
 
 import android.app.AlertDialog
-import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.graphics.Color
 import android.graphics.drawable.BitmapDrawable
-import android.graphics.drawable.Drawable
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
@@ -31,9 +29,6 @@ import app.ladefuchs.android.dataClasses.Banner
 import app.ladefuchs.android.dataClasses.Operator
 import app.ladefuchs.android.helper.*
 import com.aigestudio.wheelpicker.WheelPicker
-import java.io.File
-import java.nio.file.Files
-import java.nio.file.Path
 import java.nio.file.Paths
 import kotlin.io.path.exists
 
@@ -267,34 +262,34 @@ class ChargeCardFragment : Fragment() {
      */
     @RequiresApi(Build.VERSION_CODES.R)
     private fun retrieveFooterContent(view: View) {
-
         if (!showBanner) {
             return
         }
+        drawBanner(view, retrieveBanners(view.context))
+    }
 
-        val banner = retrieveBanners(view.context) ?: return
-        val bannerFilePath = Paths.get("${view.context.filesDir}/${banner.filename}")
-        if (!bannerFilePath.exists()) {
-            val phrases =
-                view.context.assets.open("phrases.txt").bufferedReader()
-                    .readLines()
-            printLog("Falling back on your mom", "debug")
-            phraseView.text = phrases.randomOrNull() ?: ""
-            return
-        }
-
-        drawPromoBanner(view, banner, bannerFilePath)
+    private fun drawPhrasesBanner(view: View) {
+        val phrases =
+            view.context.assets.open("phrases.txt").bufferedReader()
+                .readLines()
+        printLog("Falling back on your mom", "debug")
+        phraseView.text = phrases.randomOrNull() ?: ""
     }
 
     /**
      * This function draws the banner content
      */
     @RequiresApi(Build.VERSION_CODES.R)
-    private fun drawPromoBanner(
+    private fun drawBanner(
         view: View,
-        banner: Banner,
-        filename: Path
+        banner: Banner?,
     ) {
+        val bannerFilePath = Paths.get("${view.context.filesDir}/${banner?.filename ?: "banner"}")
+        if (!bannerFilePath.exists() || banner == null) {
+            drawPhrasesBanner(view)
+            return
+        }
+
         val viewWidth = getScreenWidth()
         val viewHeight = 240 * viewWidth / 1100
         val phraseContainer = view.findViewById(R.id.phraseContainer) as LinearLayout
@@ -306,7 +301,7 @@ class ChargeCardFragment : Fragment() {
 
         val bannerButton = view.findViewById<ImageButton>(R.id.bannerImage)
 
-        val bitmapImage = BitmapFactory.decodeFile(filename.toString())
+        val bitmapImage = BitmapFactory.decodeFile(bannerFilePath.toString())
         val drawable = BitmapDrawable(resources, bitmapImage)
         bannerButton.setImageDrawable(drawable)
         val drawableImage = BitmapDrawable(

Ladefuchs/app/src/main/res/layout/fragment_chargecards.xml

@@ -249,7 +249,7 @@
     <com.aigestudio.wheelpicker.WheelPicker
         android:id="@+id/pocSelector"
         android:layout_width="0dp"
-        android:layout_height="140dp"
+        android:layout_height="145dp"
         android:background="@drawable/border_light_bg_left"
         android:paddingTop="10dp"
         android:paddingBottom="10dp"