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

Commit a11a127f authored by Stefan Niedermann's avatar Stefan Niedermann
Browse files

#174 ➕ Allow to share into exiting note

parent dfc39431

app/src/main/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
        </activity>



        <activity

            android:name=".android.activity.SelectNoteActivity"

            android:name=".android.activity.AppendToNoteActivity"

            android:label="@string/append_to_note">



            <intent-filter>

app/src/main/java/it/niedermann/owncloud/notes/android/activity/SelectNoteActivity.java→app/src/main/java/it/niedermann/owncloud/notes/android/activity/AppendToNoteActivity.java

+5 −3
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ import android.widget.Toast; 
import it.niedermann.owncloud.notes.R;

import it.niedermann.owncloud.notes.model.DBNote;



public class SelectNoteActivity extends NotesListViewActivity {

public class AppendToNoteActivity extends NotesListViewActivity {



    private static final String TAG = SelectNoteActivity.class.getSimpleName();

    private static final String TAG = AppendToNoteActivity.class.getSimpleName();



    String receivedText = "";
@@ -20,6 +20,8 @@ public class SelectNoteActivity extends NotesListViewActivity { 
        super.onCreate(savedInstanceState);

        final Intent receivedIntent = getIntent();

        receivedText = receivedIntent.getStringExtra(Intent.EXTRA_TEXT);

        binding.activityNotesListView.toolbar.setTitle(R.string.append_to_note);

        binding.activityNotesListView.toolbar.setSubtitle(receivedText);

    }



    @Override

app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ public class NotesListViewActivity extends LockedActivity implements ItemAdapter 
    }



    private void setupActionBar() {

        Toolbar toolbar = binding.activityNotesListView.notesListActivityActionBar;

        Toolbar toolbar = binding.activityNotesListView.toolbar;

        setSupportActionBar(toolbar);

        drawerToggle = new ActionBarDrawerToggle(this, binding.drawerLayout, toolbar, R.string.action_drawer_open, R.string.action_drawer_close);

        drawerToggle.setDrawerIndicatorEnabled(true);

app/src/main/java/it/niedermann/owncloud/notes/android/activity/SelectSingleNoteActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ public class SelectSingleNoteActivity extends NotesListViewActivity { 
        setResult(Activity.RESULT_CANCELED);



        fabCreate.setVisibility(View.GONE);

        Toolbar toolbar = binding.activityNotesListView.notesListActivityActionBar;

        Toolbar toolbar = binding.activityNotesListView.toolbar;

        SwipeRefreshLayout swipeRefreshLayout = binding.activityNotesListView.swiperefreshlayout;

        toolbar.setTitle(R.string.activity_select_single_note);

        swipeRefreshLayout.setEnabled(false);

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

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
        android:orientation="vertical">



        <androidx.appcompat.widget.Toolbar

            android:id="@+id/notesListActivityActionBar"

            android:id="@+id/toolbar"

            android:layout_width="match_parent"

            android:layout_height="?attr/actionBarSize"

            android:background="?attr/colorPrimary"