From f845202a501c202c853ddb9482e0735a9bed5514 Mon Sep 17 00:00:00 2001 From: oupson Date: Sat, 9 May 2020 20:43:51 +0200 Subject: [PATCH] Fixing a bug in the app --- apng_library/src/main/java/oupson/apng/ApngAnimator.kt | 6 ++++++ .../main/java/oupson/apngcreator/activities/MainActivity.kt | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/apng_library/src/main/java/oupson/apng/ApngAnimator.kt b/apng_library/src/main/java/oupson/apng/ApngAnimator.kt index 7d51e0f..1c94bd0 100644 --- a/apng_library/src/main/java/oupson/apng/ApngAnimator.kt +++ b/apng_library/src/main/java/oupson/apng/ApngAnimator.kt @@ -20,6 +20,11 @@ import java.io.File import java.net.URL // TODO REWRITE WITH CALLBACKS +// TODO REWRITE + +/** + * USE [ApngDecoder] instead of this class to load an APNG + */ /** * @param file The APNG to load @@ -422,6 +427,7 @@ class ApngAnimator(private val context: Context?) { GlobalScope.launch(Dispatchers.Main) { imageView?.apply { scaleType = this@ApngAnimator.scaleType ?: ImageView.ScaleType.FIT_CENTER + clearAnimation() setImageDrawable(activeAnimation) } activeAnimation?.start() diff --git a/app-test/src/main/java/oupson/apngcreator/activities/MainActivity.kt b/app-test/src/main/java/oupson/apngcreator/activities/MainActivity.kt index 36403c2..0fc92bb 100644 --- a/app-test/src/main/java/oupson/apngcreator/activities/MainActivity.kt +++ b/app-test/src/main/java/oupson/apngcreator/activities/MainActivity.kt @@ -4,6 +4,7 @@ import android.annotation.SuppressLint import android.content.Intent import android.net.http.HttpResponseCache import android.os.Bundle +import android.util.Log import android.view.MenuItem import androidx.appcompat.app.ActionBarDrawerToggle import androidx.appcompat.app.AppCompatActivity @@ -29,6 +30,7 @@ class MainActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + Log.i(TAG, "${supportFragmentManager.fragments.size}") setContentView(R.layout.activity_main) @@ -99,7 +101,7 @@ class MainActivity : AppCompatActivity() { return@setNavigationItemSelectedListener true } - if (intent.hasExtra("fragment")) { + if (intent.hasExtra("fragment") && supportFragmentManager.fragments.size == 0) { when(intent.getStringExtra("fragment")) { "kotlin" -> { supportFragmentManager.beginTransaction().apply { @@ -131,7 +133,7 @@ class MainActivity : AppCompatActivity() { selected = 2 } } - } else { + } else if (supportFragmentManager.fragments.size == 0) { supportFragmentManager.beginTransaction().apply { add( R.id.fragment_container,