Merge remote-tracking branch 'origin/hotfix/5.4.2'

federicoiosue · Jan 8, 2018 · b52b71e · b52b71e
2 parents 074a171 + d9d9987
commit b52b71e
Show file tree

Hide file tree

Showing 41 changed files with 282 additions and 291 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -15,8 +15,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-VERSION_NAME=5.4.1
-VERSION_CODE=236
+VERSION_NAME=5.4.2
+VERSION_CODE=237
 PACKAGE=it.feio.android.omninotes
 
 MIN_SDK=16

diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/MainActivity.java b/omniNotes/src/main/java/it/feio/android/omninotes/MainActivity.java
@@ -157,10 +157,10 @@ protected void onNewIntent(Intent intent) {
         if (intent.getAction() == null) {
             intent.setAction(Constants.ACTION_START_APP);
         }
+        super.onNewIntent(intent);
         setIntent(intent);
         handleIntents();
         Log.d(Constants.TAG, "onNewIntent");
-        super.onNewIntent(intent);
     }
 
 
@@ -409,11 +409,14 @@ public void switchToDetail(Note note) {
         b.putParcelable(Constants.INTENT_NOTE, note);
         mDetailFragment.setArguments(b);
         if (mFragmentManager.findFragmentByTag(FRAGMENT_DETAIL_TAG) == null) {
-            transaction.replace(R.id.fragment_container, mDetailFragment, FRAGMENT_DETAIL_TAG).addToBackStack
-                    (FRAGMENT_LIST_TAG).commitAllowingStateLoss();
+            transaction.replace(R.id.fragment_container, mDetailFragment, FRAGMENT_DETAIL_TAG)
+                    .addToBackStack(FRAGMENT_LIST_TAG)
+                    .commitAllowingStateLoss();
         } else {
-            transaction.replace(R.id.fragment_container, mDetailFragment, FRAGMENT_DETAIL_TAG).addToBackStack
-                    (FRAGMENT_DETAIL_TAG).commitAllowingStateLoss();
+            mFragmentManager.popBackStackImmediate();
+            transaction.replace(R.id.fragment_container, mDetailFragment, FRAGMENT_DETAIL_TAG)
+                    .addToBackStack(FRAGMENT_DETAIL_TAG)
+                    .commitAllowingStateLoss();
         }
     }
 

diff --git a/omniNotes/src/main/res/layout/note_layout_widget.xml b/omniNotes/src/main/res/layout/note_layout_widget.xml
@@ -43,7 +43,7 @@
             android:paddingBottom="12dp"
             android:paddingLeft="6dp"
             android:paddingRight="16dp"
-            android:paddingTop="12dp" >
+            android:paddingTop="4dp" >
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -66,7 +66,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom|right"
-                android:singleLine="true"
+                android:maxLines="2"
                 android:textAppearance="@style/Text.Normal.Widget"
                 android:textColor="@color/list_note_title" />
 
@@ -79,58 +79,6 @@
                 android:singleLine="true"
                 android:textAppearance="@style/Text.Small.Widget" />
 
-            <!-- <LinearLayout -->
-            <!-- android:layout_width="match_parent" -->
-            <!-- android:layout_height="wrap_content" -->
-            <!-- android:layout_marginTop="5dp" -->
-            <!-- android:orientation="horizontal" > -->
-
-
-            <!-- <TextView -->
-            <!-- android:id="@+id/note_date" -->
-            <!-- android:layout_width="wrap_content" -->
-            <!-- android:layout_height="wrap_content" -->
-            <!-- android:layout_gravity="bottom|right" -->
-            <!-- android:gravity="bottom|right" -->
-            <!-- android:textAppearance="@style/Text.Small.Widget" /> -->
-
-
-            <!-- <ImageView -->
-            <!-- android:id="@+id/alarmIcon" -->
-            <!-- android:layout_width="15dp" -->
-            <!-- android:layout_height="15dp" -->
-            <!-- android:layout_gravity="bottom|right" -->
-            <!-- android:contentDescription="@string/note_reminder_symbol" -->
-            <!-- android:src="@drawable/ic_alarm_grey600_48dp" -->
-            <!-- android:visibility="gone" /> -->
-
-
-            <!-- <ImageView -->
-            <!-- android:id="@+id/locationIcon" -->
-            <!-- android:layout_width="15dp" -->
-            <!-- android:layout_height="15dp" -->
-            <!-- android:layout_gravity="bottom|right" -->
-            <!-- android:src="@drawable/ic_location_dark" -->
-            <!-- android:visibility="gone" /> -->
-
-
-            <!-- <ImageView -->
-            <!-- android:id="@+id/archivedIcon" -->
-            <!-- android:layout_width="15dp" -->
-            <!-- android:layout_height="15dp" -->
-            <!-- android:layout_gravity="bottom|right" -->
-            <!-- android:src="@drawable/ic_archive_black_48dp" -->
-            <!-- android:visibility="gone" /> -->
-
-
-            <!-- <ImageView -->
-            <!-- android:id="@+id/lockedIcon" -->
-            <!-- android:layout_width="15dp" -->
-            <!-- android:layout_height="15dp" -->
-            <!-- android:layout_gravity="bottom|right" -->
-            <!-- android:src="@drawable/ic_lock_black_24dp" -->
-            <!-- android:visibility="gone" /> -->
-            <!-- </LinearLayout> -->
         </LinearLayout>
 
         <ImageView
@@ -140,4 +88,4 @@
             android:contentDescription="@string/note_thumbnail" />
     </LinearLayout>
 
-</FrameLayout>
+</FrameLayout>
diff --git a/omniNotes/src/main/res/layout/widget_layout_list.xml b/omniNotes/src/main/res/layout/widget_layout_list.xml
@@ -18,7 +18,7 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="match_parent"
     android:orientation="vertical">
 
     <include

diff --git a/omniNotes/src/main/res/raw/changelog.xml b/omniNotes/src/main/res/raw/changelog.xml
@@ -17,6 +17,12 @@
   -->
 <changelog bulletedList="true">
 
+    <changelogversion versionName="5.4.2" changeDate="Jan 6, 2018">
+        <changelogtext>[i]Improved![/i] Updated translations</changelogtext>
+        <changelogtext>[i]Improved![/i] Widget showing two lines of content and top-aligned</changelogtext>
+        <changelogtext>[u]Fix[/u] Misbehavior with coming back to notes list after multiple updates</changelogtext>
+    </changelogversion>
+
     <changelogversion versionName="5.4.1" changeDate="Dec 16, 2017">
         <changelogtext>[u]Fix[/u] Navigation drawer stuck opened on tablets and phablets</changelogtext>
         <changelogtext>[u]Fix[/u] Crash when trying to restore backup when no backups are available</changelogtext>

diff --git a/omniNotes/src/main/res/values-ar-rSA/strings.xml b/omniNotes/src/main/res/values-ar-rSA/strings.xml
@@ -107,7 +107,7 @@
   <string name="delete_category_confirmation">This category is used by some notes.\nConfirm notes un-categorization and category deletion?</string>
   <string name="discard">رفض</string>
   <string name="remove_category">ازالة فئة</string>
-  <string name="no_tags_created">لم يتم إنشاء وسوم بعد</string>
+  <string name="no_tags_created">لايوجد أي وسوم حتى الآن\nأنشئ وسوماً بكتابتها مسبوقة بعلامة المربع ضمن ملاحظاتك</string>
   <string name="no_categories_created">لم يتم انشاء اي فئات حتي الآن</string>
   <string name="notes_category_removed">تم ازالة الفئة من المدونات</string>
   <string name="notes_categorized_as">تم تصنيف المدونات باسم</string>
@@ -156,6 +156,7 @@
   <string name="widget_list_description">اداة بتمرير القائمة مع ازرار</string>
   <string name="notes">مدونات</string>
   <string name="show_thumbnails">اظهر الصور المصغرة للملفات</string>
+  <string name="show_timestamps">عرض الختم الزمني</string>
   <string name="choose_action">اختر العمل</string>
   <string name="edit">صحح</string>
   <string name="reminders">مذكرات</string>
@@ -348,31 +349,31 @@
   <string name="stats_files">ملفات</string>
   <string name="stats_locations">المواقع</string>
   <string name="stats_words">الكلمات</string>
-  <string name="stats_max_words">Max words</string>
-  <string name="stats_avg_words">Average words</string>
+  <string name="stats_max_words">الحد الأقصى للكلمات</string>
+  <string name="stats_avg_words">متوسط الكلمات</string>
   <string name="stats_characters">حروف</string>
-  <string name="stats_max_characters">Max chars</string>
-  <string name="stats_avg_characters">Average chars</string>
+  <string name="stats_max_characters">الحد الأقصى للأحرُف</string>
+  <string name="stats_avg_characters">متوسط الأحرُف</string>
   <!-- Instructions -->
   <string name="tour_request_start">هذه أول مرة تشغّل فيها تطبيق Omni Note ، هل تود أخذ جولة التطبيق ؟</string>
   <string name="tour_listactivity_intro_title">مرحباً بك في Omni Notes!</string>
   <string name="tour_listactivity_intro_detail">إلمس \"متابعة\" لتكمل الجولة</string>
   <string name="tour_listactivity_actions_title">الإجراءات</string>
-  <string name="tour_listactivity_actions_detail">Create new notes, sort them, access to preferences</string>
+  <string name="tour_listactivity_actions_detail">أنشئ ملاحظات جديدة ، رتبها أو تصفح الخيارات</string>
   <string name="tour_listactivity_home_title">الملاحة</string>
-  <string name="tour_listactivity_home_detail">Navigation menu allows you to move through notes with filters and tags</string>
+  <string name="tour_listactivity_home_detail">قائمة التصفح تتيح لك التنقل بين الملاحظات واستخدام المرشحات والوسوم</string>
   <string name="tour_listactivity_tag_title">الوسوم</string>
   <string name="tour_listactivity_tag_detail">إضافة علامات ملونة للعثور على الملاحظات في لمحة</string>
   <string name="tour_detailactivity_attachment_title">تحسين</string>
   <string name="tour_detailactivity_attachment_detail">إضافة مرفق من عدة أنواع لملاحظاتك!</string>
   <string name="tour_detailactivity_action_title">القيام بالمزيد</string>
   <string name="tour_detailactivity_action_detail">مشاركة، علامة، أرشيف، حماية، والمزيد&#8230;</string>
   <string name="tour_detailactivity_reminder_title">أنقر فقط</string>
-  <string name="tour_detailactivity_reminder_detail">Long pression have different effects on an object (attachment, location, reminder) than short pression!</string>
+  <string name="tour_detailactivity_reminder_detail">تحتلف الضغطة القصيرة على عنصر ما (المرفق ، المكان أو التنبيه) عن الضغطة الطويلة!</string>
   <string name="tour_detailactivity_links_title">روابط</string>
   <string name="tour_detailactivity_links_detail">انقر فوق عنوان الويب أو البريد, لنسخه أو لفتحه</string>
   <string name="tour_detailactivity_swipe_title">تمرير</string>
-  <string name="tour_detailactivity_swipe_detail">Create new notes without \n leaving the one you\'re editing</string>
+  <string name="tour_detailactivity_swipe_detail">أنشئ ملاحظات جديدة\nدون ترك الملاحظة التي تحررها حالياً</string>
   <string name="tour_detailactivity_save_title">حفظ</string>
   <string name="tour_detailactivity_save_detail">للرجوع, أنقر على أيقونة الملاحة \"أعلى\" أو زر الشاشة الرئيسية</string>
   <string name="tour_listactivity_final_title">استمتع</string>

diff --git a/omniNotes/src/main/res/values-ca-rES/strings.xml b/omniNotes/src/main/res/values-ca-rES/strings.xml
@@ -107,7 +107,7 @@
   <string name="delete_category_confirmation">Aquesta categoria és usada per algunes notes.\nConfirmeu que voleu treure la categoria de les notes i suprimir la categoria?</string>
   <string name="discard">Descarta</string>
   <string name="remove_category">Suprimeix la categoria</string>
-  <string name="no_tags_created">Encara no s\'han creat etiquetes</string>
+  <string name="no_tags_created">No hi ha etiquetes disponibles\nCreeu-les inserint etiquetes a les vostres notes</string>
   <string name="no_categories_created">Encara no s\'han creat categories</string>
   <string name="notes_category_removed">S\'ha suprimit la categoria de les notes</string>
   <string name="notes_categorized_as">Notes categoritzades com a</string>
@@ -156,6 +156,7 @@
   <string name="widget_list_description">Giny de llistat desplaçable amb botons</string>
   <string name="notes">notes</string>
   <string name="show_thumbnails">Mostra les imatges en miniatura dels adjunts</string>
+  <string name="show_timestamps">Mostra l\'hora</string>
   <string name="choose_action">Trieu una acció</string>
   <string name="edit">Edita</string>
   <string name="reminders">recordatoris</string>

diff --git a/omniNotes/src/main/res/values-cs-rCZ/strings.xml b/omniNotes/src/main/res/values-cs-rCZ/strings.xml
@@ -104,10 +104,10 @@
   <string name="categorize_as">Zařadit jako</string>
   <string name="title_activity_category">Upravit kategorii</string>
   <string name="delete_unused_category_confirmation">Opravdu chcete kategorii smazat?</string>
-  <string name="delete_category_confirmation">This category is used by some notes.\nConfirm notes un-categorization and category deletion?</string>
+  <string name="delete_category_confirmation">Tato kategorie se používá pro některé poznámky. \nPotvrdit nekategorizované poznámky a kategorii odstraněných?</string>
   <string name="discard">Zahodit</string>
   <string name="remove_category">Odstranit kategorii</string>
-  <string name="no_tags_created">Ještě nebyly vytvořeny žádné značky</string>
+  <string name="no_tags_created">Nejsou k dispozici žádné značky. \n Vytvoř je napsáním hashtagů do poznámek</string>
   <string name="no_categories_created">Ještě nebyly vytvořeny žádné kategorie</string>
   <string name="notes_category_removed">Kategorie odstraněna z poznámek</string>
   <string name="notes_categorized_as">Poznámky zařazeny jako</string>
@@ -148,14 +148,15 @@
   <string name="proceed">Pokračovat</string>
   <string name="contracted_view">Kompaktní zobrazení</string>
   <string name="expanded_view">Úplné zobrazení</string>
-  <string name="grid_view">Grid view</string>
+  <string name="grid_view">Mřížkové zobrazení</string>
   <string name="add_shortcut">Přidat zástupce</string>
   <string name="shortcut_added">Zástupce přidán na domovskou obrazovku</string>
   <string name="shortcut_note_deleted">Zástupce odkazuje na smazanou poznámku</string>
   <string name="widget_simple_description">Jednoduchý widget s tlačítky</string>
   <string name="widget_list_description">Rolovací seznam s tlačítky</string>
   <string name="notes">poznámky</string>
   <string name="show_thumbnails">Zobrazit náhledy příloh</string>
+  <string name="show_timestamps">Zobrazit časové údaje</string>
   <string name="choose_action">Zvolte akci</string>
   <string name="edit">Upravit</string>
   <string name="reminders">připomenutí</string>
@@ -277,7 +278,7 @@
   <string name="minutes">minuty</string>
   <string name="settings_simple_calendar">Jednoduchý kalendář a čas</string>
   <string name="settings_simple_calendar_summary">Používat jednodušší rozhraní pro výběr data a času, namísto rozhraní Google</string>
-  <string name="settings_first_day_of_week">First day of week</string>
+  <string name="settings_first_day_of_week">První den v týdnu</string>
   <string name="settings_tour_show_again">Prohlídka aplikace</string>
   <string name="settings_tour_show_again_summary">Ukaž mi znovu prohlídku aplikace</string>
   <string name="backup_include_settings">Zahrnout i nastavení a heslo</string>
@@ -328,29 +329,29 @@
   <string name="settings_send_analytics_summary">Pomoc vývojáři odesíláním dat bez citlivého obsahu jako je model zařízení, jazyk, často používané funkce aplikace. Tyto údaje se používají pouze pro zlepšení open-source aplikace.</string>
   <string name="settings_statistics">Statistika</string>
   <!-- Stats -->
-  <string name="stats_total_notes">Total notes</string>
-  <string name="stats_active_notes">Active notes</string>
-  <string name="stats_archived_notes">Archived notes</string>
-  <string name="stats_trashed_notes">Trashed notes</string>
+  <string name="stats_total_notes">Celkový počet poznámek</string>
+  <string name="stats_active_notes">Aktivní poznámky</string>
+  <string name="stats_archived_notes">Archivované poznámky</string>
+  <string name="stats_trashed_notes">Smazané poznámky</string>
   <string name="stats_reminders">Upomínky</string>
-  <string name="stats_future_reminders">Future reminders</string>
+  <string name="stats_future_reminders">Budoucí připomenutí</string>
   <string name="stats_checklists">Seznamy</string>
-  <string name="stats_locked_notes">Locked notes</string>
+  <string name="stats_locked_notes">Uzamčené poznámky</string>
   <string name="stats_categories">Kategorie</string>
   <string name="stats_tags">Značky</string>
   <string name="stats_attachments">Přílohy</string>
-  <string name="stats_images">Images</string>
-  <string name="stats_videos">Videos</string>
-  <string name="stats_audio_recordings">Audio recordings</string>
-  <string name="stats_sketches">Sketches</string>
+  <string name="stats_images">Obrázky</string>
+  <string name="stats_videos">Videa</string>
+  <string name="stats_audio_recordings">Zvukové záznamy</string>
+  <string name="stats_sketches">Náčrty</string>
   <string name="stats_files">Soubory</string>
-  <string name="stats_locations">Locations</string>
-  <string name="stats_words">Words</string>
-  <string name="stats_max_words">Max words</string>
-  <string name="stats_avg_words">Average words</string>
-  <string name="stats_characters">Chars</string>
-  <string name="stats_max_characters">Max chars</string>
-  <string name="stats_avg_characters">Average chars</string>
+  <string name="stats_locations">Místa</string>
+  <string name="stats_words">Slova</string>
+  <string name="stats_max_words">Maximum slov</string>
+  <string name="stats_avg_words">Průměrně slov</string>
+  <string name="stats_characters">Znaky</string>
+  <string name="stats_max_characters">Maximum znaků</string>
+  <string name="stats_avg_characters">Průměrně znaků</string>
   <!-- Instructions -->
   <string name="tour_request_start">Spustili jste Omni Notes poprvé. Chcete spustit prohlídku aplikace?</string>
   <string name="tour_listactivity_intro_title">Vítejte v Omni Notes!</string>