Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a375a16e authored by Arnau Mora's avatar Arnau Mora Committed by Ricki Hirner
Browse files

Added tooltip to sync collections FAB (bitfireAT/davx5#340) 



* Added tooltip to sync collections fab

Signed-off-by: default avatarArnau Mora <arnyminerz@proton.me>

* Greyscale tint for collections sync FAB

* Always use TooltipCompat for FAB tooltips

Closes bitfireAT/davx5#339

---------

Signed-off-by: default avatarArnau Mora <arnyminerz@proton.me>
Co-authored-by: default avatarSunik Kupfer <kupfer@bitfire.at>
Co-authored-by: default avatarRicki Hirner <hirner@bitfire.at>
parent 4ce33e94

app/src/main/java/at/bitfire/davdroid/ui/AccountsActivity.kt

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ import android.view.MenuItem 
import androidx.activity.viewModels

import androidx.appcompat.app.ActionBarDrawerToggle

import androidx.appcompat.app.AppCompatActivity

import androidx.appcompat.widget.TooltipCompat

import androidx.core.content.getSystemService

import androidx.core.view.GravityCompat

import androidx.lifecycle.AndroidViewModel
@@ -62,6 +63,7 @@ class AccountsActivity: AppCompatActivity(), NavigationView.OnNavigationItemSele 
        binding = ActivityAccountsBinding.inflate(layoutInflater)

        setContentView(binding.root)



        TooltipCompat.setTooltipText(binding.content.fab, binding.content.fab.contentDescription)

        binding.content.fab.setOnClickListener {

            startActivity(Intent(this, LoginActivity::class.java))

        }

app/src/main/java/at/bitfire/davdroid/ui/account/AccountActivity.kt

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ class AccountActivity: AppCompatActivity() { 
        }



        // "Sync now" fab

        TooltipCompat.setTooltipText(binding.sync, binding.sync.contentDescription)

        model.networkAvailable.observe(this) { networkAvailable ->

            binding.sync.setOnClickListener {

                if (!networkAvailable)

app/src/main/res/layout/accounts_content.xml

+1 −2
Original line number Diff line number Diff line
@@ -30,13 +30,12 @@ 
        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"/>



    <com.google.android.material.floatingactionbutton.FloatingActionButton

        style="@style/Widget.MaterialComponents.ExtendedFloatingActionButton.Icon"

        android:id="@+id/fab"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="bottom|end"

        android:layout_margin="@dimen/fab_margin"

        android:tooltipText="@string/login_create_account"

        android:contentDescription="@string/login_create_account"

        app:srcCompat="@drawable/ic_add_white"/>



</androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/activity_account.xml

+4 −5
Original line number Diff line number Diff line
@@ -39,26 +39,25 @@ 
    </LinearLayout>



    <com.google.android.material.floatingactionbutton.FloatingActionButton

        style="@style/Widget.MaterialComponents.ExtendedFloatingActionButton.Icon"

        android:id="@+id/refresh"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="top|end"

        android:layout_margin="@dimen/fab_margin"

        android:contentDescription="@string/account_synchronize_collections"

        app:backgroundTint="@android:color/white"

        app:tint="@color/grey900"

        app:srcCompat="@drawable/ic_folder_refresh_outline"

        app:layout_anchor="@id/sync"

        app:layout_anchorGravity="top|center"/>

        app:layout_anchorGravity="top|center"

        tools:ignore="ContentDescription" />



    <com.google.android.material.floatingactionbutton.FloatingActionButton

        style="@style/Widget.MaterialComponents.ExtendedFloatingActionButton.Icon"

        android:id="@+id/sync"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="bottom|end"

        android:layout_margin="@dimen/fab_margin"

        android:contentDescription="@string/account_synchronize_now"

        android:tooltipText="@string/account_synchronize_now"

        app:useCompatPadding="true"

        app:srcCompat="@drawable/ic_sync" />

app/src/main/res/layout/activity_webdav_mounts.xml

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
        android:layout_height="wrap_content"

        android:layout_margin="@dimen/fab_margin"

        android:layout_gravity="right|end|bottom"

        android:contentDescription="@string/webdav_add_mount_add"

        app:srcCompat="@drawable/ic_add_white" />



</androidx.coordinatorlayout.widget.CoordinatorLayout>
 
 No newline at end of file