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

Unverified Commit 2d00a241 authored by alperozturk's avatar alperozturk
Browse files

add previous functionality 



Signed-off-by: default avataralperozturk <alper_ozturk@proton.me>
parent 6224f499

app/src/main/java/it/niedermann/owncloud/notes/main/MultiSelectedActionModeCallback.java

+0 −19
Original line number Diff line number Diff line
@@ -180,25 +180,6 @@ public class MultiSelectedActionModeCallback implements Callback { 
                        mainViewModel.collectNoteContents(selection));

            }



            /*

             final var selection = new ArrayList<Long>(tracker.getSelection().size());

            for (final var sel : tracker.getSelection()) {

                selection.add(sel);

            }

            tracker.clearSelection();



            executor.submit(() -> {

                if (selection.size() == 1) {

                    final var note = mainViewModel.getFullNote(selection.get(0));

                    ShareUtil.openShareDialog(context, note.getTitle(), note.getContent());

                } else {

                    ShareUtil.openShareDialog(context,

                            context.getResources().getQuantityString(R.plurals.share_multiple, selection.size(), selection.size()),

                            mainViewModel.collectNoteContents(selection));

                }

            });

             */



            return true;

        } else if (itemId == R.id.menu_category) {// TODO detect whether all selected notes do have the same category - in this case preselect it

            final var accountLiveData = mainViewModel.getCurrentAccount();

app/src/main/java/it/niedermann/owncloud/notes/share/NoteShareActivity.java

+2 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ import it.niedermann.owncloud.notes.share.operations.ClientFactoryImpl; 
import it.niedermann.owncloud.notes.share.operations.RetrieveHoverCardAsyncTask;

import it.niedermann.owncloud.notes.shared.user.User;

import it.niedermann.owncloud.notes.shared.util.DisplayUtils;

import it.niedermann.owncloud.notes.shared.util.ShareUtil;

import it.niedermann.owncloud.notes.shared.util.extensions.BundleExtensionsKt;



public class NoteShareActivity extends BrandedActivity implements ShareeListAdapterListener, FileDetailsSharingMenuBottomSheetActions, QuickSharingPermissionsBottomSheetDialog.QuickPermissionSharingBottomSheetActions {
@@ -87,6 +88,7 @@ public class NoteShareActivity extends BrandedActivity implements ShareeListAdap 
        binding.sharesList.setAdapter(new ShareeListAdapter(this, new ArrayList<>(), this, account));

        binding.sharesList.setLayoutManager(new LinearLayoutManager(this));

        binding.pickContactEmailBtn.setOnClickListener(v -> checkContactPermission());

        binding.btnShareButton.setOnClickListener(v -> ShareUtil.openShareDialog(this, note.getTitle(), note.getContent()));



        setupView();

        refreshCapabilitiesFromDB();

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

+15 −0
Original line number Diff line number Diff line
@@ -15,6 +15,21 @@ 
    android:orientation="vertical"

    android:paddingTop="@dimen/spacer_1hx">



    <com.google.android.material.button.MaterialButton

        android:id="@+id/btnShareButton"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

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

        android:paddingStart="@dimen/spacer_3x"

        android:paddingEnd="@dimen/zero"

        android:text="@string/note_share_fragment_share_note"

        android:textAlignment="textStart"

        android:textColor="@color/text_color"

        app:iconPadding="@dimen/share_button_padding"

        app:iconTint="@color/text_color"

        app:icon="@drawable/ic_share_white_24dp"

        app:iconGravity="start" />



    <LinearLayout

        android:id="@+id/search_container"

        android:layout_width="match_parent"

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

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
    <dimen name="bottom_sheet_text_size">16sp</dimen>

    <dimen name="bottom_sheet_item_height">56dp</dimen>

    <dimen name="dialog_padding">24dp</dimen>

    <dimen name="share_button_padding">28dp</dimen>



    <dimen name="spacer_activity_sides">0dp</dimen>

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

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ 
    <string name="note_share_fragment_user_icon_content_description">note share user icon</string>

    <string name="note_share_fragment_contact_icon_content_description">note share contact icon</string>

    <string name="note_share_fragment_shared_with_you">Shared with you by %1$s</string>

    <string name="note_share_fragment_share_note">Share note</string>

    <string name="note_share_fragment_search_text">Name, Federated Cloud ID or email address…</string>

    <string name="note_share_fragment_share_link">Share link</string>

    <string name="note_share_fragment_resharing_not_allowed">Policy or permissions prevent resharing</string>