disable fading

Author: newhinton

app/src/main/java/de/felixnuesse/disky/MainActivity.kt

@@ -246,6 +246,7 @@ class MainActivity : AppCompatActivity(), ChangeFolderCallback, ScanCompleteCall
                     showFolder(rootElement!!)
                 } else {
                     rootElement?.mergePartialTree(internalRootElement)
+                    rootElement?.getCalculatedSize(true)
                     currentElement?.let { changeFolder(it) }
                 }
                 updateStaticElements(rootElement!!, result.total, result.free)
@@ -419,13 +420,15 @@ class MainActivity : AppCompatActivity(), ChangeFolderCallback, ScanCompleteCall
             if(base == 0L) {
                 base = 1L
             }
-            val currentlyUsed = currentRoot.getCalculatedSize().div(base.toDouble())
+            val used = currentRoot.getCalculatedSize(true)
+            val currentlyUsedPerc = used.div(base.toDouble())
+            Timber.tag("updateStaticElements").e("rfs used: ${readableFileSize(used)}")
             fadeTextview(
-                readableFileSize(currentRoot.getCalculatedSize()),
+                readableFileSize(used),
                 binding.usedText
             )
             ObjectAnimator
-                .ofInt(binding.dataUsage, "progress", (currentlyUsed * 100).toInt())
+                .ofInt(binding.dataUsage, "progress", (currentlyUsedPerc * 100).toInt())
                 .setDuration(300)
                 .start()
             Timber.e("updateStaticElements: CurrentRoot not null!")
@@ -435,6 +438,7 @@ class MainActivity : AppCompatActivity(), ChangeFolderCallback, ScanCompleteCall
         }
 
         fadeTextview(readableFileSize(rootUnused), binding.freeText)
+        Timber.tag("updateStaticElements").e("rfs rootUnused: ${readableFileSize(rootUnused)}")
     }
 
     fun showFolder(currentRoot: StoragePrototype) {

app/src/main/java/de/felixnuesse/disky/model/StoragePrototype.kt

@@ -73,7 +73,7 @@ sealed class StoragePrototype(var name: String, var storageType: StorageType = S
 
     /**
      * This merges a partial storage tree into this one.
-     * Its a breath-first approach.
+     * It's a breath-first approach.
      *
      * For generic items, children are replaced for the found root-partial-tree.
      * For other items, special handling is applied. (Apps are replaced in-place)

app/src/main/java/de/felixnuesse/disky/ui/utils/TextFading.kt

@@ -1,34 +1,18 @@
 package de.felixnuesse.disky.ui.utils
 
 import android.view.View
-import android.view.animation.AlphaAnimation
-import android.view.animation.Animation
 import android.widget.TextView
 
 class TextFading {
 
     companion object {
         fun fadeTextview(text: String, view: TextView) {
-            if(view.text == text) {
-                return
-            }
-            view.visibility = View.VISIBLE
-
-            val fadeIn = AlphaAnimation(0.0f, 1.0f)
-            val fadeOut = AlphaAnimation(1.0f, 0.0f)
-            fadeIn.duration = 300
-            fadeOut.duration = 300
 
-            fadeOut.setAnimationListener(object : Animation.AnimationListener {
-                override fun onAnimationStart(animation: Animation?) {}
-                override fun onAnimationRepeat(animation: Animation?) {}
-                override fun onAnimationEnd(animation: Animation) {
-                    view.text = text
-                    view.startAnimation(fadeIn)
-                }
+            view.visibility = View.VISIBLE
+            view.text = text
 
-            })
-            view.startAnimation(fadeOut)
+            // it is likely, that the animators are broken and interfering with each other.
+         // use singletons to manage them, when readding this function
         }
     }
 }