aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorHarsh Shandilya <me@msfjarvis.dev>2020-04-08 03:34:07 +0530
committerHarsh Shandilya <me@msfjarvis.dev>2020-04-08 03:34:07 +0530
commitba0f3ece04c8d1f8e8d3da8f1a2b5772bbc139e2 (patch)
tree4449554e466cc12cb08c8ed0b4198e01710544f1
parentui: codestyle nit (diff)
downloadwireguard-android-ba0f3ece04c8d1f8e8d3da8f1a2b5772bbc139e2.tar.xz
wireguard-android-ba0f3ece04c8d1f8e8d3da8f1a2b5772bbc139e2.zip
ui: tweak FABs to use the correct type
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
-rw-r--r--ui/src/main/java/com/wireguard/android/widget/EdgeToEdge.kt6
-rw-r--r--ui/src/main/res/layout/log_viewer_activity.xml5
-rw-r--r--ui/src/main/res/layout/tunnel_list_fragment.xml5
3 files changed, 7 insertions, 9 deletions
diff --git a/ui/src/main/java/com/wireguard/android/widget/EdgeToEdge.kt b/ui/src/main/java/com/wireguard/android/widget/EdgeToEdge.kt
index c31d1bb1..3f109b37 100644
--- a/ui/src/main/java/com/wireguard/android/widget/EdgeToEdge.kt
+++ b/ui/src/main/java/com/wireguard/android/widget/EdgeToEdge.kt
@@ -12,7 +12,7 @@ import androidx.core.view.marginRight
import androidx.core.view.marginTop
import androidx.core.view.updateLayoutParams
import androidx.core.view.updatePadding
-import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+import com.google.android.material.floatingactionbutton.FloatingActionButton
/**
* A utility for edge-to-edge display. It provides several features needed to make the app
@@ -27,7 +27,7 @@ object EdgeToEdge {
}
@JvmStatic
- fun setUpScrollingContent(scrollingContent: ViewGroup, fab: ExtendedFloatingActionButton?) {
+ fun setUpScrollingContent(scrollingContent: ViewGroup, fab: FloatingActionButton?) {
val originalPaddingLeft = scrollingContent.paddingLeft
val originalPaddingRight = scrollingContent.paddingRight
val originalPaddingBottom = scrollingContent.paddingBottom
@@ -50,7 +50,7 @@ object EdgeToEdge {
}
@JvmStatic
- fun setUpFAB(fab: ExtendedFloatingActionButton) {
+ fun setUpFAB(fab: FloatingActionButton) {
val originalMarginLeft = fab.marginLeft
val originalMarginRight = fab.marginRight
val originalMarginBottom = fab.marginBottom
diff --git a/ui/src/main/res/layout/log_viewer_activity.xml b/ui/src/main/res/layout/log_viewer_activity.xml
index 1d4a466e..b4451921 100644
--- a/ui/src/main/res/layout/log_viewer_activity.xml
+++ b/ui/src/main/res/layout/log_viewer_activity.xml
@@ -16,13 +16,12 @@
tools:itemCount="20"
tools:listitem="@layout/log_viewer_entry" />
- <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+ <com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/share_fab"
- style="@style/Widget.MaterialComponents.ExtendedFloatingActionButton.Icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
- app:icon="@drawable/ic_action_share_white" />
+ app:srcCompat="@drawable/ic_action_share_white" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/ui/src/main/res/layout/tunnel_list_fragment.xml b/ui/src/main/res/layout/tunnel_list_fragment.xml
index 7b7cb4b5..277ecd01 100644
--- a/ui/src/main/res/layout/tunnel_list_fragment.xml
+++ b/ui/src/main/res/layout/tunnel_list_fragment.xml
@@ -66,14 +66,13 @@
android:textSize="20sp" />
</LinearLayout>
- <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+ <com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/create_fab"
- style="@style/Widget.MaterialComponents.ExtendedFloatingActionButton.Icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
- app:icon="@drawable/ic_action_add_white" />
+ app:srcCompat="@drawable/ic_action_add_white" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</layout>