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

Commit 22e4c750 authored by Ricki Hirner's avatar Ricki Hirner
Browse files

WebDAV mounts: add empty view manual link (resolves bitfireAT/davx5#29); update dependencies

parent c7fd893b

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

+11 −4
Original line number Diff line number Diff line
@@ -9,10 +9,12 @@ import android.content.Context 
import android.content.Intent

import android.os.Bundle

import android.provider.DocumentsContract

import android.text.method.LinkMovementMethod

import android.view.*

import androidx.activity.result.contract.ActivityResultContracts

import androidx.activity.viewModels

import androidx.appcompat.app.AppCompatActivity

import androidx.core.text.HtmlCompat

import androidx.lifecycle.AndroidViewModel

import androidx.lifecycle.MediatorLiveData

import androidx.lifecycle.MutableLiveData
@@ -47,6 +49,9 @@ class WebdavMountsActivity: AppCompatActivity() { 
        binding = ActivityWebdavMountsBinding.inflate(layoutInflater)

        setContentView(binding.root)



        binding.webdavMountsSeeManual.text = HtmlCompat.fromHtml(getString(R.string.webdav_add_mount_empty_more_info, helpUrl()), 0)

        binding.webdavMountsSeeManual.movementMethod = LinkMovementMethod.getInstance()



        val adapter = MountsAdapter(this, model)

        binding.list.adapter = adapter

        binding.list.layoutManager = LinearLayoutManager(this)
@@ -87,11 +92,13 @@ class WebdavMountsActivity: AppCompatActivity() { 
    }



    fun onShowHelp(item: MenuItem) {

        UiUtils.launchUri(this,

        UiUtils.launchUri(this, helpUrl())

    }



    private fun helpUrl() =

        App.homepageUrl(this).buildUpon()

            .appendEncodedPath("manual/webdav_mounts.html")

                .build())

    }

            .build()





    data class MountInfo(

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

+23 −4
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"

<androidx.coordinatorlayout.widget.CoordinatorLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    xmlns:tools="http://schemas.android.com/tools"



    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical"
@@ -14,16 +17,32 @@ 


        <androidx.recyclerview.widget.RecyclerView

            android:id="@+id/list"

            android:visibility="gone"

            android:layout_width="match_parent"

            android:layout_height="match_parent" />



        <TextView

        <LinearLayout

            android:id="@+id/empty"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:gravity="center"

            android:orientation="vertical">



            <TextView

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_marginBottom="16dp"

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

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

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



            <TextView

                android:id="@+id/webdav_mounts_see_manual"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

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

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



        </LinearLayout>



    </LinearLayout>

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

+2 −1
Original line number Diff line number Diff line
@@ -424,7 +424,8 @@ 
    <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_mounts_empty">Directly access your cloud files by adding a WebDAV mount!</string>

    <string name="webdav_add_mount_empty_more_info"><![CDATA[See the manual for <a href="%1$s">how WebDAV mounts work</a>.</string>]]></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>

build.gradle

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ buildscript { 
        aboutLibraries: '8.9.1',

        appIntro: '6.1.0',

        dav4jvm: 'fe62f70',

        kotlin: '1.6.0',

        kotlin: '1.6.10',

        okhttp: '4.9.1',

        // latest Apache Commons versions that don't require Java 8 (Android 7)

        commonsCollections: '4.2',