Skip to content

Commit 569808e

Browse files
mikehardydavid-allison
authored andcommitted
fix: FAB multi-line layout margin adjust always cast to super-type
this way the adjustment will run every time so any problems like this will not be hidden in future, and the cast is to a wider type so that layout changes are less touchy
1 parent 72194a5 commit 569808e

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.kt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ import android.view.KeyEvent
4242
import android.view.Menu
4343
import android.view.MenuItem
4444
import android.view.View
45+
import android.view.ViewGroup
4546
import android.view.ViewPropertyAnimator
4647
import android.widget.ImageView
4748
import android.widget.LinearLayout
@@ -59,7 +60,6 @@ import androidx.appcompat.app.AlertDialog
5960
import androidx.appcompat.widget.SearchView
6061
import androidx.appcompat.widget.Toolbar
6162
import androidx.appcompat.widget.TooltipCompat
62-
import androidx.coordinatorlayout.widget.CoordinatorLayout
6363
import androidx.core.app.ActivityCompat
6464
import androidx.core.app.ActivityCompat.OnRequestPermissionsResultCallback
6565
import androidx.core.content.edit
@@ -2261,11 +2261,9 @@ open class DeckPicker :
22612261
val fabLinearLayout = findViewById<LinearLayout>(R.id.fabLinearLayout)
22622262
// Adjust bottom margin of fabLinearLayout based on reviewSummaryTextView height
22632263
reviewSummaryTextView.doOnLayout {
2264-
if (reviewSummaryTextView.lineCount > 1) {
2265-
val layoutParams = fabLinearLayout.layoutParams as CoordinatorLayout.LayoutParams
2266-
layoutParams.setMargins(0, 0, 0, reviewSummaryTextView.height / 2)
2267-
fabLinearLayout.layoutParams = layoutParams
2268-
}
2264+
val layoutParams = fabLinearLayout.layoutParams as ViewGroup.MarginLayoutParams
2265+
layoutParams.setMargins(0, 0, 0, reviewSummaryTextView.height / 2)
2266+
fabLinearLayout.layoutParams = layoutParams
22692267
}
22702268
}
22712269
Timber.d("Startup - Deck List UI Completed")

0 commit comments

Comments
 (0)