#174 ➕ Allow to share into exiting note

6 files changed, 10 insertions, 8 deletions

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f281f628..6180a1a6 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -48,7 +48,7 @@
         </activity>
 
         <activity
-            android:name=".android.activity.SelectNoteActivity"
+            android:name=".android.activity.AppendToNoteActivity"
             android:label="@string/append_to_note">
 
             <intent-filter>
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/SelectNoteActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/AppendToNoteActivity.java
index 6c28834e..3f286c1c 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/SelectNoteActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/AppendToNoteActivity.java
@@ -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,11 +20,13 @@ 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
     public void onNoteClick(int position, View v) {
-        if(receivedText != null && receivedText.length() > 0) {
+        if (receivedText != null && receivedText.length() > 0) {
             final DBNote note = db.getNote(localAccount.getId(), ((DBNote) adapter.getItem(position)).getId());
             final String oldContent = note.getContent();
             String newContent;
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java
index 04bfa159..e61bb2c2 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java
@@ -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);
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/SelectSingleNoteActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/SelectSingleNoteActivity.java
index 89fdf13a..e02fd67b 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/SelectSingleNoteActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/SelectSingleNoteActivity.java
@@ -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);
diff --git a/app/src/main/res/layout/activity_notes_list_view.xml b/app/src/main/res/layout/activity_notes_list_view.xml
index b1e37bde..2915f416 100644
--- a/app/src/main/res/layout/activity_notes_list_view.xml
+++ b/app/src/main/res/layout/activity_notes_list_view.xml
@@ -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"
diff --git a/fastlane/metadata/android/en-US/changelogs/2012000.txt b/fastlane/metadata/android/en-US/changelogs/2012000.txt
index ffec7341..52e34653 100644
--- a/fastlane/metadata/android/en-US/changelogs/2012000.txt
+++ b/fastlane/metadata/android/en-US/changelogs/2012000.txt
@@ -1,3 +1,3 @@
 - ⚡️ Speed up synchronization by supporting ETags for capabilities endpoint
+- ➕ Allow to share into exiting note (#174)
 - 🐞 Fix upgrading from version <= 1.0.1 to a current version
-- ➕ Allow to share into exiting note (#174)
\ No newline at end of file