From 37e031cfbf8813883d05f3162bc2966ffb4923a7 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 1 Oct 2016 22:10:36 +0200
Subject: [PATCH] display the current note at the top
---
app/src/main/res/layout/activity_main.xml | 43 ++++++++++++++++-------
app/src/main/res/values-de/strings.xml | 1 +
app/src/main/res/values-it/strings.xml | 1 +
app/src/main/res/values-ja/strings.xml | 1 +
app/src/main/res/values-sv/strings.xml | 1 +
app/src/main/res/values/strings.xml | 1 +
6 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 596d376b..67ef3a38 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -6,22 +6,39 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <ScrollView
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/notes_scrollview"
+ <RelativeLayout
+ android:id="@+id/notes_holder"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:fillViewport="true">
+ android:layout_height="match_parent">
- <EditText
- android:id="@+id/notes_view"
- android:layout_width="match_parent"
+ <TextView
+ android:id="@+id/current_note_label"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@null"
- android:gravity="top"
- android:inputType="textCapSentences|textMultiLine"
- android:padding="@dimen/activity_margin"/>
- </ScrollView>
+ android:layout_margin="@dimen/activity_margin"
+ android:alpha=".6"
+ android:text="@string/current_note"/>
+
+ <ScrollView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/notes_scrollview"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_below="@+id/current_note_label"
+ android:fillViewport="true">
+
+ <EditText
+ android:id="@+id/notes_view"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@null"
+ android:gravity="top"
+ android:inputType="textCapSentences|textMultiLine"
+ android:paddingBottom="@dimen/activity_margin"
+ android:paddingLeft="@dimen/activity_margin"
+ android:paddingRight="@dimen/activity_margin"/>
+ </ScrollView>
+ </RelativeLayout>
<android.support.design.widget.FloatingActionButton
android:id="@+id/notes_fab"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 04b32fb1..ef81c27b 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -18,6 +18,7 @@
<string name="delete_note_prompt_title">Delete note</string>
<string name="delete_note_prompt_message">Are you sure you want to delete note \"%1$s\"?</string>
<string name="pick_a_note">Pick a note</string>
+ <string name="current_note">Current note:</string>
<!-- Settings -->
<string name="settings">Einstellungen</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 0c52972c..1ac511c0 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -18,6 +18,7 @@
<string name="delete_note_prompt_title">Delete note</string>
<string name="delete_note_prompt_message">Are you sure you want to delete note \"%1$s\"?</string>
<string name="pick_a_note">Pick a note</string>
+ <string name="current_note">Current note:</string>
<!-- Settings -->
<string name="settings">Impostazioni</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 5e4490ae..193c043b 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -18,6 +18,7 @@
<string name="delete_note_prompt_title">Delete note</string>
<string name="delete_note_prompt_message">Are you sure you want to delete note \"%1$s\"?</string>
<string name="pick_a_note">Pick a note</string>
+ <string name="current_note">Current note:</string>
<!-- Settings -->
<string name="settings">設定</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 8d9950dc..bbf9e1ed 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -18,6 +18,7 @@
<string name="delete_note_prompt_title">Delete note</string>
<string name="delete_note_prompt_message">Are you sure you want to delete note \"%1$s\"?</string>
<string name="pick_a_note">Pick a note</string>
+ <string name="current_note">Current note:</string>
<!-- Settings -->
<string name="settings">Inställningar</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 187a7d87..8189cafc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -18,6 +18,7 @@
<string name="delete_note_prompt_title">Delete note</string>
<string name="delete_note_prompt_message">Are you sure you want to delete note \"%1$s\"?</string>
<string name="pick_a_note">Pick a note</string>
+ <string name="current_note">Current note:</string>
<!-- Settings -->
<string name="settings">Settings</string>