Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-12-23 17:11:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed weird changing size of the fab in browse source view

Browse Source 
Co-Authored-By: Soitora <simon.mattila@protonmail.com>
This commit is contained in:
Jay 2020-04-22 20:32:54 -04:00
parent a0859148e0
commit af3fadd62a
5 changed files with 9 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
app/src/main/java/eu/kanade/tachiyomi/widget/FABMoveBehaviour.kt
View File

@ -1,41 +0,0 @@
package eu.kanade.tachiyomi.widget
import android.content.Context
import android.content.res.Configuration
import android.util.AttributeSet
import android.view.View
import androidx.coordinatorlayout.widget.CoordinatorLayout
import com.google.android.material.floatingactionbutton.FloatingActionButton
import com.google.android.material.snackbar.Snackbar
import kotlin.math.min
class FABMoveBehaviour(context: Context, attrs: AttributeSet) :
CoordinatorLayout.Behavior<FloatingActionButton>(context, attrs) {
override fun layoutDependsOn(parent: CoordinatorLayout, child: FloatingActionButton, dependency: View): Boolean {
return dependency is Snackbar.SnackbarLayout
}
override fun onDependentViewChanged(parent: CoordinatorLayout, child: FloatingActionButton, dependency: View): Boolean {
if (isTablet(child.context)) return true
val translationY = getFabTranslationYForSnackbar(parent, child)
child.translationY = translationY
return true
}
private fun isTablet(context: Context): Boolean {
return (context.resources.configuration.screenLayout and Configuration
.SCREENLAYOUT_SIZE_MASK) >= Configuration.SCREENLAYOUT_SIZE_LARGE
}
private fun getFabTranslationYForSnackbar(parent: CoordinatorLayout, fab: FloatingActionButton): Float {
var minOffset = 0f
val dependencies = parent.getDependencies(fab)
for (i in 0 until dependencies.size) {
val view = dependencies[i]
if (view is Snackbar.SnackbarLayout && view.isShown) {
minOffset = min(minOffset, view.translationY - view.height)
}
}
return minOffset
}
}

12
app/src/main/res/layout/browse_source_controller.xml
View File

@ -26,16 +26,8 @@
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
app:backgroundTint="?colorAccent"
style="@style/Theme.Widget.FAB"
android:text="@string/filter"
android:layout_gravity="bottom|end"
app:icon="@drawable/ic_filter_list_white_24dp"
app:iconTint="@color/md_white_1000"
android:textColor="@color/md_white_1000"
android:textAllCaps="false"
android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"
android:layout_height="wrap_content"/>
app:icon="@drawable/ic_filter_list_white_24dp"/>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

14
app/src/main/res/layout/library_list_controller.xml
View File

@ -42,6 +42,7 @@
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:paddingStart="3dp"
android:paddingEnd="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
@ -82,19 +83,6 @@
<!-- Adding bottom sheet after main content -->
<include layout="@layout/filter_bottom_sheet" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab"
style="@style/Theme.Widget.FABFixed"
android:layout_gravity="center"
android:clickable="false"
android:focusable="false"
android:scaleX="0"
android:scaleY="0"
android:visibility="gone"
app:layout_anchor="@id/bottom_sheet"
app:layout_anchorGravity="end|top"
app:srcCompat="@drawable/ic_file_download_white_24dp" />
<View
android:id="@+id/shadow2"
android:layout_width="match_parent"

8
app/src/main/res/layout/pre_migration_controller.xml
View File

@ -22,14 +22,10 @@
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab"
style="@style/Theme.Widget.FABFixed"
android:clickable="true"
android:focusable="true"
style="@style/Theme.Widget.FAB"
android:src="@drawable/ic_arrow_forward_white_24dp"
app:layout_anchor="@id/recycler"
app:layout_anchorGravity="bottom|right|end"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:backgroundTint="?attr/colorAccent" />
app:layout_constraintEnd_toEndOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

17
app/src/main/res/values/styles.xml
View File

@ -119,21 +119,12 @@
<item name="android:scaleType">fitCenter</item>
<item name="layout_anchorGravity">bottom|right|end</item>
<item name="tint">@color/md_white_1000</item>
<item name="android:minHeight">@dimen/fab_size</item>
<item name="backgroundTint">?attr/colorAccent</item>
<item name="android:tint">@color/md_white_1000</item>
</style>
<style name="Theme.Widget.FABFixed">
<item name="android:layout_height">@dimen/fab_size</item>
<item name="android:layout_width">@dimen/fab_size</item>
<item name="android:layout_gravity">bottom|end</item>
<item name="android:layout_margin">@dimen/fab_margin</item>
<item name="android:scaleType">fitCenter</item>
<item name="layout_anchorGravity">bottom|right|end</item>
<item name="android:tint">@color/md_white_1000</item>
<item name="tint">@color/md_white_1000</item>
<item name="backgroundTint">?attr/colorAccent</item>
<item name="layout_behavior">eu.kanade.tachiyomi.widget.FABMoveBehaviour</item>
<item name="iconTint">@android:color/white</item>
<item name="textAllCaps">false</item>
<item name="android:textColor">@android:color/white</item>
</style>
<style name="Theme.Widget.CardView" parent="Widget.MaterialComponents.CardView">