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

Commit 99ecfb1c authored by Ricki Hirner's avatar Ricki Hirner
Browse files

WebDAV mounts: add empty view; add navigation drawer entry for Managed DAVx5... 

WebDAV mounts: add empty view; add navigation drawer entry for Managed DAVx5 (closes bitfireAT/davx5#23)
parent f1a441c2

app/src/main/java/at/bitfire/davdroid/ui/webdav/WebdavMountsActivity.kt

+5 −1
Original line number Diff line number Diff line
@@ -48,6 +48,10 @@ class WebdavMountsActivity: AppCompatActivity() { 
        binding.list.layoutManager = LinearLayoutManager(this)

        model.mountInfos.observe(this, Observer { mounts ->

            adapter.submitList(ArrayList(mounts))



            val hasMounts = mounts.isNotEmpty()

            binding.list.visibility = if (hasMounts) View.VISIBLE else View.GONE

            binding.empty.visibility = if (hasMounts) View.GONE else View.VISIBLE

        })



        val browser = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
@@ -59,7 +63,7 @@ class WebdavMountsActivity: AppCompatActivity() { 
                    addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)

                }

                contentResolver.takePersistableUriPermission(uri, Intent.FLAG_GRANT_READ_URI_PERMISSION)

                startActivity(Intent.createChooser(shareIntent, "Choose using app"))

                startActivity(Intent.createChooser(shareIntent, null))

            }

        }

        model.browseIntent.observe(this, Observer { intent ->

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

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
                        <com.google.android.material.textfield.TextInputEditText

                            android:layout_width="match_parent"

                            android:layout_height="wrap_content"

                            android:maxLines="1"

                            android:text="@={model.displayName}" />

                    </com.google.android.material.textfield.TextInputLayout>

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

+12 −4
Original line number Diff line number Diff line
@@ -8,14 +8,22 @@ 


    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical">

        android:layout_height="match_parent"

        android:orientation="vertical"

        android:layout_margin="@dimen/activity_margin">



        <androidx.recyclerview.widget.RecyclerView

            android:id="@+id/list"

            android:layout_width="match_parent"

            android:layout_height="0dp"

            android:layout_weight="1" />

            android:layout_height="match_parent" />



        <TextView

            android:id="@+id/empty"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:gravity="center"

            style="@style/TextAppearance.MaterialComponents.Headline6"

            android:text="@string/webdav_add_mount_empty" />



    </LinearLayout>

app/src/main/res/values/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -432,6 +432,7 @@ 
    <string name="webdav_mounts_share_content">Share content</string>

    <string name="webdav_mounts_unmount">Unmount</string>

    <string name="webdav_add_mount_title">Add WebDAV mount</string>

    <string name="webdav_add_mount_empty">Directly access your cloud files by adding a WebDAV mount!</string>

    <string name="webdav_add_mount_display_name">Display name</string>

    <string name="webdav_add_mount_url">WebDAV URL</string>

    <string name="webdav_add_mount_url_invalid">Invalid URL</string>