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

Commit d83a4df5 authored by Ricki Hirner's avatar Ricki Hirner
Browse files

Account activity: update "force read only" responsively

parent afdfb735

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

+11 −6
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ class AccountActivity: AppCompatActivity(), Toolbar.OnMenuItemClickListener, Pop 
    }





    private val onActionOverflowListener = { anchor: View, info: CollectionInfo ->

    private val onActionOverflowListener = { anchor: View, info: CollectionInfo, adapter: RecyclerView.Adapter<*>, position: Int ->

        val popup = PopupMenu(this, anchor, Gravity.RIGHT)

        popup.inflate(R.menu.account_collection_operations)
@@ -228,9 +228,14 @@ class AccountActivity: AppCompatActivity(), Toolbar.OnMenuItemClickListener, Pop 
        popup.setOnMenuItemClickListener { item ->

            when (item.itemId) {

                R.id.force_read_only -> {

                    val nowChecked = !item.isChecked

                    model.updateCollectionReadOnly(info, nowChecked) {

                        reload()

                    info.uiEnabled = false

                    adapter.notifyItemChanged(position)



                    val nowForceReadOnly = !info.forceReadOnly

                    model.updateCollectionReadOnly(info, nowForceReadOnly) {

                        info.forceReadOnly = nowForceReadOnly

                        info.uiEnabled = true

                        adapter.notifyItemChanged(position)

                    }

                }

                R.id.delete_collection ->
@@ -317,7 +322,7 @@ class AccountActivity: AppCompatActivity(), Toolbar.OnMenuItemClickListener, Pop 
            v.findViewById<ImageView>(R.id.action_overflow).apply {

                if (info.uiEnabled)

                    setOnClickListener { view ->

                        activity.onActionOverflowListener(view, info)

                        activity.onActionOverflowListener(view, info, this@AddressBookAdapter, position)

                    }

                else

                    setOnClickListener(null)
@@ -399,7 +404,7 @@ class AccountActivity: AppCompatActivity(), Toolbar.OnMenuItemClickListener, Pop 
            else {

                if (info.uiEnabled)

                    overflow.setOnClickListener { view ->

                        activity.onActionOverflowListener(view, info)

                        activity.onActionOverflowListener(view, info, this@CalendarAdapter, position)

                    }

                else

                    overflow.setOnClickListener(null)

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

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

                android:layout_height="wrap_content"

                android:textAppearance="?android:attr/textAppearanceMedium"

                android:textColor="@color/primaryTextColor"

                tools:text="My Calendar"/>



            <TextView

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

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:textAppearance="?android:attr/textAppearanceMedium"

            android:textColor="@color/primaryTextColor"

            tools:text="My Address Book"/>



        <TextView

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

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



                </LinearLayout>



            </androidx.cardview.widget.CardView>



            <androidx.cardview.widget.CardView