diff --git a/.travis.yml b/.travis.yml index 8879c0b002..0bbf572f33 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,14 +20,16 @@ android: - tools - tools - platform-tools - - build-tools-26.0.2 - - android-23 + - build-tools-27.0.3 + - android-27 - extra-google-m2repository - extra-android-m2repository licenses: - android-sdk-preview-license-.+ - android-sdk-license-.+ - google-gdk-license-.+ +before_install: + - yes | sdkmanager "platforms;android-27" script: - ./gradlew clean build jacocoTestReport sonarqube after_success: diff --git a/README.md b/README.md index 33cc7e5729..3f343c51c7 100644 --- a/README.md +++ b/README.md @@ -146,14 +146,14 @@ They're all listed into the [build.gradle](https://github.com/federicoiosue/Omni * Federico Iosue - [Website](http://www.iosue.it/federico) -* [Other contributors](https://github.com/federicoiosue/Omni-Notes/blob/master/contributors.md) +* [Other contributors](https://github.com/federicoiosue/Omni-Notes/blob/master/https://github.com/federicoiosue/Omni-Notes/blob/master/CONTRIBUTORS.md) ## License - Copyright 2015 Federico Iosue + Copyright 2013-2018 Federico Iosue This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/build.gradle b/build.gradle index 9853c3c590..8679eef6dc 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,7 +21,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.1.1' classpath 'me.tatarka:gradle-retrolambda:3.2.5' classpath 'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2' classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.6" diff --git a/etc/translations/arrays.xml b/etc/translations/arrays.xml index 38233db88d..81ffa8992b 100644 --- a/etc/translations/arrays.xml +++ b/etc/translations/arrays.xml @@ -1,6 +1,6 @@ Displays some statistics and expiring reminders from Omni Notes @@ -364,9 +367,9 @@ Actions Create new notes, sort them, access to preferences Navigate - Navigation menu allows you to move through notes with filters and tags + Navigation menu allows you to move through notes with filters and categories Tags - Add colored tags to find notes at-a-glance + Add colored categories to organize notes at-a-glance Improve Add attachment of several kinds to your notes! Do more @@ -374,7 +377,7 @@ Just press Long pression have different effects on an object (attachment, location, reminder) than short pression! Links - Click on an URL or e-mail address to copy or open it + URL, e-mail addresses and telephone numbers recognition Swipe Create new notes without \n leaving the one you\'re editing Save diff --git a/gradle.properties b/gradle.properties index a076b14e25..09675fdef5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,9 @@ -#se -# Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) +# +# Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundatibehaon, either version 3 of the License, or +# the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -15,13 +15,14 @@ # along with this program. If not, see . # -VERSION_NAME=5.4.5 -VERSION_CODE=240 +VERSION_NAME=5.5.0 +VERSION_CODE=245 PACKAGE=it.feio.android.omninotes MIN_SDK=16 +# Upgrading this to 24+ will need ContentProvider for sharing and camera attachments TARGET_SDK=23 -BUILD_TOOLS=26.0.2 +BUILD_TOOLS=27.0.3 # The following properties are empty defaults to allow build and can EVENTUALLY be overridden to allow: diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 55e446ccc9..c70ea431ed 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,23 @@ -#Wed Nov 08 17:59:56 CET 2017 +# +# Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +#Wed Apr 04 22:14:12 CEST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip diff --git a/omniNotes/build.gradle b/omniNotes/build.gradle index ba04c41b1b..4782f68029 100644 --- a/omniNotes/build.gradle +++ b/omniNotes/build.gradle @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/lint.xml b/omniNotes/lint.xml index b6d08ad7ed..d7d11ae3be 100644 --- a/omniNotes/lint.xml +++ b/omniNotes/lint.xml @@ -1,10 +1,10 @@ . + */ + package it.feio.android.omninotes; import android.support.v4.app.Fragment; diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/CategoryActivity.java b/omniNotes/src/main/java/it/feio/android/omninotes/CategoryActivity.java index 6d3acce1bc..8e2ca00250 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/CategoryActivity.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/CategoryActivity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/DetailFragment.java b/omniNotes/src/main/java/it/feio/android/omninotes/DetailFragment.java index d60683c100..9809106ac4 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/DetailFragment.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/DetailFragment.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -42,23 +42,20 @@ import android.os.Bundle; import android.os.Handler; import android.provider.MediaStore; -import android.support.annotation.NonNull; import android.support.annotation.Nullable; -import android.support.v4.app.ActivityCompat; import android.support.v4.app.FragmentTransaction; import android.support.v4.content.ContextCompat; import android.support.v4.util.Pair; import android.support.v4.view.MenuItemCompat; import android.support.v4.widget.DrawerLayout; import android.text.Editable; +import android.text.Selection; import android.text.TextUtils; import android.text.TextWatcher; -import android.util.DisplayMetrics; import android.util.Log; import android.view.*; import android.view.View.OnClickListener; import android.view.View.OnTouchListener; -import android.view.ViewTreeObserver.OnGlobalLayoutListener; import android.view.animation.Animation; import android.view.animation.Animation.AnimationListener; import android.view.animation.AnimationUtils; @@ -75,9 +72,9 @@ import de.keyboardsurfer.android.widget.crouton.Style; import it.feio.android.checklistview.exceptions.ViewNotSupportedException; import it.feio.android.checklistview.interfaces.CheckListChangedListener; +import it.feio.android.checklistview.models.CheckListView; import it.feio.android.checklistview.models.CheckListViewItem; import it.feio.android.checklistview.models.ChecklistManager; -import it.feio.android.checklistview.utils.DensityUtil; import it.feio.android.omninotes.async.AttachmentTask; import it.feio.android.omninotes.async.bus.NotesUpdatedEvent; import it.feio.android.omninotes.async.bus.PushbulletReplyEvent; @@ -107,10 +104,8 @@ import java.io.File; import java.io.IOException; import java.lang.ref.WeakReference; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Calendar; -import java.util.List; +import java.text.DateFormat; +import java.util.*; import static com.nineoldandroids.view.ViewPropertyAnimator.animate; import static java.lang.Integer.parseInt; @@ -118,7 +113,7 @@ public class DetailFragment extends BaseFragment implements OnReminderPickedListener, OnTouchListener, - OnGlobalLayoutListener, OnAttachingFileListener, TextWatcher, CheckListChangedListener, OnNoteSaved, + OnAttachingFileListener, TextWatcher, CheckListChangedListener, OnNoteSaved, OnGeoUtilResultListener { private static final int TAKE_PHOTO = 1; @@ -176,7 +171,7 @@ public class DetailFragment extends BaseFragment implements OnReminderPickedList View toggleChecklistView; private Uri attachmentUri; private AttachmentAdapter mAttachmentAdapter; - private PopupWindow attachmentDialog; + private MaterialDialog attachmentDialog; private Note note; private Note noteTmp; private Note noteOriginal; @@ -198,7 +193,6 @@ public class DetailFragment extends BaseFragment implements OnReminderPickedList private boolean swiping; private int startSwipeX; private SharedPreferences prefs; - private View keyboardPlaceholder; private boolean orientationChanged; private long audioRecordingTimeStart; private long audioRecordingTime; @@ -210,14 +204,12 @@ public class DetailFragment extends BaseFragment implements OnReminderPickedList private MainActivity mainActivity; private boolean activityPausing; - @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); mFragment = this; } - @Override public void onStart() { super.onStart(); @@ -225,7 +217,6 @@ public void onStart() { EventBus.getDefault().register(this); } - @Override public void onStop() { super.onStop(); @@ -233,31 +224,19 @@ public void onStop() { GeocodeHelper.stop(); } - @Override public void onResume() { super.onResume(); - // Adding a layout observer to perform calculus when showing keyboard - if (root != null) { - root.getViewTreeObserver().addOnGlobalLayoutListener(this); - } - activityPausing = false; } - @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View view = inflater.inflate(R.layout.fragment_detail, container, false); - // Bottom padding set for translucent navigation bar since Kitkat - int softButtonHeight=Display.getSoftButtonsBarHeight( getActivity()); - view.setPadding(view.getPaddingLeft(), view.getPaddingTop(), view.getPaddingRight(), - view.getPaddingBottom() + softButtonHeight); ButterKnife.bind(this, view); return view; } - @Override public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); @@ -303,7 +282,6 @@ public void onActivityCreated(Bundle savedInstanceState) { setRetainInstance(false); } - @Override public void onSaveInstanceState(Bundle outState) { if (noteTmp != null) { @@ -318,9 +296,6 @@ public void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); } - - @SuppressLint("NewApi") - @SuppressWarnings("deprecation") @Override public void onPause() { super.onPause(); @@ -332,22 +307,12 @@ public void onPause() { saveNote(this); } - if (mRecorder != null) { - mRecorder.release(); - mRecorder = null; - } - - if (root != null) { - root.getViewTreeObserver().removeOnGlobalLayoutListener(this); - } - if (toggleChecklistView != null) { KeyboardUtils.hideKeyboard(toggleChecklistView); content.clearFocus(); } } - @Override public void onConfigurationChanged(Configuration newConfig) { super.onConfigurationChanged(newConfig); @@ -356,7 +321,6 @@ public void onConfigurationChanged(Configuration newConfig) { } } - private void init() { // Handling of Intent actions @@ -382,7 +346,6 @@ private void init() { initViews(); } - /** * Checks note lock and password before showing note content */ @@ -406,7 +369,6 @@ private void checkNoteLock(Note note) { } } - private void handleIntents() { Intent i = mainActivity.getIntent(); @@ -468,10 +430,7 @@ private void handleIntents() { takePhoto(); } - - /** - * Handles third party apps requests of sharing - */ + // Handles third party apps requests of sharing if (IntentChecker.checkAction(i, Intent.ACTION_SEND, Intent.ACTION_SEND_MULTIPLE, Constants.INTENT_GOOGLE_NOW) && i.getType() != null) { @@ -518,7 +477,6 @@ private void handleIntents() { i.setAction(null); } - @SuppressLint("NewApi") private void initViews() { @@ -544,7 +502,6 @@ private void initViews() { initViewFooter(); } - private void initViewFooter() { // Footer dates of creation... String creation = DateHelper.getFormattedDate(noteTmp.getCreation(), prefs.getBoolean(Constants @@ -562,7 +519,6 @@ private void initViewFooter() { lastModificationTextView.setVisibility(View.GONE); } - private void initViewReminder() { // Preparation for reminder icon @@ -601,7 +557,6 @@ public void onPositive(MaterialDialog materialDialog) { } } - private void initViewLocation() { DetailFragment detailFragment = this; @@ -621,7 +576,6 @@ private void initViewLocation() { getLocation(detailFragment); } - locationTextView.setOnClickListener(v -> { String uriString = "geo:" + noteTmp.getLatitude() + ',' + noteTmp.getLongitude() + "?q=" + noteTmp.getLatitude() + ',' + noteTmp.getLongitude(); @@ -651,13 +605,12 @@ public void onPositive(MaterialDialog materialDialog) { }); } - private void getLocation(OnGeoUtilResultListener onGeoUtilResultListener) { PermissionsHelper.requestPermission(getActivity(), Manifest.permission.ACCESS_COARSE_LOCATION, R.string - .permission_coarse_location, snackBarPlaceholder, () -> GeocodeHelper.getLocation(onGeoUtilResultListener)); + .permission_coarse_location, snackBarPlaceholder, () -> GeocodeHelper.getLocation + (onGeoUtilResultListener)); } - private void initViewAttachments() { // Attachments position based on preferences @@ -747,7 +700,6 @@ private void initViewAttachments() { }); } - /** * Performs an action when long-click option is selected * @@ -788,9 +740,8 @@ private void performAttachmentAction(int attachmentPosition, int i) { } } - private void initViewTitle() { - title.setText(noteTmp.getTitle()); + title.setText(noteTmp.getTitle()); title.gatherLinksForText(); title.setOnTextLinkClickListener(textLinkClickListener); // To avoid dropping here the dragged checklist items @@ -807,7 +758,6 @@ private void initViewTitle() { requestFocus(title); } - private void initViewContent() { content.setText(noteTmp.getContent()); @@ -825,18 +775,17 @@ private void initViewContent() { } } - /** * Force focus and shows soft keyboard. Only happens if it's a new note, without shared content. * {@link showKeyboard} is used to check if the note is created from shared content. */ + @SuppressWarnings("JavadocReference") private void requestFocus(final EditText view) { if (note.get_id() == null && !noteTmp.isChanged(note) && showKeyboard) { KeyboardUtils.showKeyboard(view); } } - /** * Colors tag marker in note's title and content elements */ @@ -869,7 +818,6 @@ private void setTagMarkerColor(Category tag) { } } - private void displayLocationDialog() { getLocation(new OnGeoUtilResultListenerImpl(mainActivity, mFragment, noteTmp)); } @@ -880,7 +828,6 @@ private static class OnGeoUtilResultListenerImpl implements OnGeoUtilResultListe private final WeakReference detailFragmentWeakReference; private final WeakReference noteTmpWeakReference; - OnGeoUtilResultListenerImpl(MainActivity activity, DetailFragment mFragment, Note noteTmp) { this.mainActivityWeakReference = new WeakReference<>(activity); this.detailFragmentWeakReference = new WeakReference<>(mFragment); @@ -891,18 +838,15 @@ private static class OnGeoUtilResultListenerImpl implements OnGeoUtilResultListe public void onAddressResolved(String address) { } - @Override public void onCoordinatesResolved(Location location, String address) { } - @Override public void onLocationUnavailable() { mainActivityWeakReference.get().showMessage(R.string.location_not_found, ONStyle.ALERT); } - @Override public void onLocationRetrieved(Location location) { @@ -948,18 +892,18 @@ public void onPositive(MaterialDialog materialDialog) { public void beforeTextChanged(CharSequence s, int start, int count, int after) { } - @Override public void onTextChanged(CharSequence s, int start, int before, int count) { if (s.length() != 0) { - dialog.setActionButton(DialogAction.POSITIVE, mainActivityWeakReference.get().getString(R.string.confirm)); + dialog.setActionButton(DialogAction.POSITIVE, mainActivityWeakReference.get().getString(R + .string.confirm)); } else { - dialog.setActionButton(DialogAction.POSITIVE, mainActivityWeakReference.get().getString(R.string + dialog.setActionButton(DialogAction.POSITIVE, mainActivityWeakReference.get().getString(R + .string .use_current_location)); } } - @Override public void afterTextChanged(Editable s) { } @@ -967,14 +911,12 @@ public void afterTextChanged(Editable s) { dialog.show(); } - private boolean checkWeakReferences() { return mainActivityWeakReference.get() != null && !mainActivityWeakReference.get().isFinishing() && detailFragmentWeakReference.get() != null && noteTmpWeakReference.get() != null; } } - @Override public void onLocationRetrieved(Location location) { if (location == null) { @@ -992,13 +934,11 @@ public void onLocationRetrieved(Location location) { } } - @Override public void onLocationUnavailable() { mainActivity.showMessage(R.string.location_not_found, ONStyle.ALERT); } - @Override public void onAddressResolved(String address) { if (TextUtils.isEmpty(address)) { @@ -1016,7 +956,6 @@ public void onAddressResolved(String address) { fade(locationTextView, true); } - @Override public void onCoordinatesResolved(Location location, String address) { if (location != null) { @@ -1031,14 +970,12 @@ public void onCoordinatesResolved(Location location, String address) { } } - @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { inflater.inflate(R.menu.menu_detail, menu); super.onCreateOptionsMenu(menu, inflater); } - @Override public void onPrepareOptionsMenu(Menu menu) { @@ -1067,7 +1004,6 @@ public void onPrepareOptionsMenu(Menu menu) { } } - @SuppressLint("NewApi") public boolean goHome() { stopPlaying(); @@ -1102,12 +1038,11 @@ public boolean goHome() { return true; } - @Override public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { case R.id.menu_attachment: - showPopup(mainActivity.findViewById(R.id.menu_attachment)); + showAttachmentsPopup(); break; case R.id.menu_tag: addTags(); @@ -1151,21 +1086,33 @@ public boolean onOptionsItemSelected(MenuItem item) { case R.id.menu_delete: deleteNote(); break; - default: Log.w(Constants.TAG, "Invalid menu option selected"); + case R.id.menu_note_info: + showNoteInfo(); + break; + default: + Log.w(Constants.TAG, "Invalid menu option selected"); } - ((OmniNotes)getActivity().getApplication()).getAnalyticsHelper().trackActionFromResourceId(getActivity(), item.getItemId()); + ((OmniNotes) getActivity().getApplication()).getAnalyticsHelper().trackActionFromResourceId(getActivity(), + item.getItemId()); return super.onOptionsItemSelected(item); } + private void showNoteInfo() { + noteTmp.setTitle(getNoteTitle()); + noteTmp.setContent(getNoteContent()); + Intent intent = new Intent(getContext(), NoteInfosActivity.class); + intent.putExtra(Constants.INTENT_NOTE, (android.os.Parcelable) noteTmp); + startActivity(intent); + + } private void navigateUp() { afterSavedReturnsToList = true; saveAndExit(this); } - /** * */ @@ -1211,7 +1158,6 @@ public void onPositive(MaterialDialog materialDialog) { }).build().show(); } - /** * Toggles checklist view */ @@ -1221,7 +1167,6 @@ private void toggleChecklist2() { toggleChecklist2(keepChecked, showChecks); } - @SuppressLint("NewApi") private void toggleChecklist2(final boolean keepChecked, final boolean showChecks) { // Get instance and set options to convert EditText to CheckListView @@ -1258,7 +1203,6 @@ private void toggleChecklist2(final boolean keepChecked, final boolean showCheck } } - /** * Categorize note choosing from a list of previously created categories */ @@ -1283,7 +1227,6 @@ public void onPositive(MaterialDialog dialog) { startActivityForResult(intent, CATEGORY); } - @Override public void onNegative(MaterialDialog dialog) { noteTmp.setCategory(null); @@ -1301,38 +1244,22 @@ public void onNegative(MaterialDialog dialog) { dialog.show(); } + private void showAttachmentsPopup() { + LayoutInflater inflater = mainActivity.getLayoutInflater(); + final View layout = inflater.inflate(R.layout.attachment_dialog, null); - // The method that displays the popup. - @SuppressWarnings("deprecation") - private void showPopup(View anchor) { - DisplayMetrics metrics = new DisplayMetrics(); - mainActivity.getWindowManager().getDefaultDisplay().getMetrics(metrics); - - // Inflate the popup_layout.xml - LayoutInflater inflater = (LayoutInflater) mainActivity.getSystemService(Activity.LAYOUT_INFLATER_SERVICE); - View layout = inflater.inflate(R.layout.attachment_dialog, null); - - // Creating the PopupWindow - attachmentDialog = new PopupWindow(mainActivity); - attachmentDialog.setContentView(layout); - attachmentDialog.setWidth(WindowManager.LayoutParams.WRAP_CONTENT); - attachmentDialog.setHeight(WindowManager.LayoutParams.WRAP_CONTENT); - attachmentDialog.setFocusable(true); - attachmentDialog.setOnDismissListener(() -> { - if (isRecording) { - isRecording = false; - stopRecording(); - } - }); - - // Clear the default translucent background - attachmentDialog.setBackgroundDrawable(new BitmapDrawable()); + attachmentDialog = new MaterialDialog.Builder(mainActivity) + .autoDismiss(false) + .customView(layout, false) + .build(); + attachmentDialog.show(); // Camera android.widget.TextView cameraSelection = (android.widget.TextView) layout.findViewById(R.id.camera); cameraSelection.setOnClickListener(new AttachmentOnClickListener()); // Audio recording android.widget.TextView recordingSelection = (android.widget.TextView) layout.findViewById(R.id.recording); + toggleAudioRecordingStop(recordingSelection); recordingSelection.setOnClickListener(new AttachmentOnClickListener()); // Video recording android.widget.TextView videoSelection = (android.widget.TextView) layout.findViewById(R.id.video); @@ -1346,23 +1273,15 @@ private void showPopup(View anchor) { // Location android.widget.TextView locationSelection = (android.widget.TextView) layout.findViewById(R.id.location); locationSelection.setOnClickListener(new AttachmentOnClickListener()); + // Time + android.widget.TextView timeStampSelection = (android.widget.TextView) layout.findViewById(R.id.timestamp); + timeStampSelection.setOnClickListener(new AttachmentOnClickListener()); // Desktop note with PushBullet - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) { - android.widget.TextView pushbulletSelection = (android.widget.TextView) layout.findViewById(R.id - .pushbullet); - pushbulletSelection.setVisibility(View.VISIBLE); - pushbulletSelection.setOnClickListener(new AttachmentOnClickListener()); - } - - try { - attachmentDialog.showAsDropDown(anchor); - } catch (Exception e) { - mainActivity.showMessage(R.string.error, ONStyle.ALERT); - - } + android.widget.TextView pushbulletSelection = (android.widget.TextView) layout.findViewById(R.id.pushbullet); + pushbulletSelection.setVisibility(View.VISIBLE); + pushbulletSelection.setOnClickListener(new AttachmentOnClickListener()); } - private void takePhoto() { // Checks for camera app available Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); @@ -1383,7 +1302,6 @@ private void takePhoto() { startActivityForResult(intent, TAKE_PHOTO); } - private void takeVideo() { Intent takeVideoIntent = new Intent(MediaStore.ACTION_VIDEO_CAPTURE); if (!IntentChecker.isAvailable(mainActivity, takeVideoIntent, new String[]{PackageManager.FEATURE_CAMERA})) { @@ -1392,16 +1310,13 @@ private void takeVideo() { return; } // File is stored in custom ON folder to speedup the attachment - if (Build.VERSION.SDK_INT > Build.VERSION_CODES.GINGERBREAD_MR1) { - File f = StorageHelper.createNewAttachmentFile(mainActivity, Constants.MIME_TYPE_VIDEO_EXT); - if (f == null) { - mainActivity.showMessage(R.string.error, ONStyle.ALERT); - - return; - } - attachmentUri = Uri.fromFile(f); - takeVideoIntent.putExtra(MediaStore.EXTRA_OUTPUT, attachmentUri); + File f = StorageHelper.createNewAttachmentFile(mainActivity, Constants.MIME_TYPE_VIDEO_EXT); + if (f == null) { + mainActivity.showMessage(R.string.error, ONStyle.ALERT); + return; } + attachmentUri = Uri.fromFile(f); + takeVideoIntent.putExtra(MediaStore.EXTRA_OUTPUT, attachmentUri); String maxVideoSizeStr = "".equals(prefs.getString("settings_max_video_size", "")) ? "0" : prefs.getString("settings_max_video_size", ""); long maxVideoSize = parseLong(maxVideoSizeStr) * 1024L * 1024L; @@ -1409,7 +1324,6 @@ private void takeVideo() { startActivityForResult(takeVideoIntent, TAKE_VIDEO); } - private void takeSketch(Attachment attachment) { File f = StorageHelper.createNewAttachmentFile(mainActivity, Constants.MIME_TYPE_SKETCH_EXT); @@ -1436,6 +1350,25 @@ private void takeSketch(Attachment attachment) { .addToBackStack(mainActivity.FRAGMENT_DETAIL_TAG).commit(); } + private void addTimestamp() { + Editable editable = content.getText(); + int position = content.getSelectionStart(); + DateFormat dateFormat = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT); + String dateStamp = dateFormat.format(new Date().getTime()) + " "; + if (noteTmp.isChecklist()) { + if (mChecklistManager.getFocusedItemView() != null) { + editable = mChecklistManager.getFocusedItemView().getEditText().getEditableText(); + position = mChecklistManager.getFocusedItemView().getEditText().getSelectionStart(); + } else { + ((CheckListView) toggleChecklistView) + .addItem(dateStamp, false, mChecklistManager.getCount()); + } + } + String leadSpace = position == 0 ? "" : " "; + dateStamp = leadSpace + dateStamp; + editable.insert(position, dateStamp); + Selection.setSelection(editable, position + dateStamp.length()); + } @SuppressLint("NewApi") @Override @@ -1489,7 +1422,6 @@ public void onActivityResult(int requestCode, int resultCode, Intent intent) { } } - private void onActivityResultManageReceivedFiles(Intent intent) { List uris = new ArrayList<>(); if (Build.VERSION.SDK_INT > 16 && intent.getClipData() != null) { @@ -1534,7 +1466,6 @@ private void discard() { } } - @SuppressLint("NewApi") private void archiveNote(boolean archive) { // Simply go back if is a new note @@ -1550,7 +1481,6 @@ private void archiveNote(boolean archive) { saveNote(this); } - @SuppressLint("NewApi") private void trashNote(boolean trash) { // Simply go back if is a new note @@ -1572,7 +1502,6 @@ private void trashNote(boolean trash) { saveNote(this); } - private void deleteNote() { new MaterialDialog.Builder(mainActivity) .content(R.string.delete_note_confirmation) @@ -1588,7 +1517,6 @@ public void onPositive(MaterialDialog materialDialog) { }).build().show(); } - public void saveAndExit(OnNoteSaved mOnNoteSaved) { if (isAdded()) { exitMessage = getString(R.string.note_updated); @@ -1598,7 +1526,6 @@ public void saveAndExit(OnNoteSaved mOnNoteSaved) { } } - /** * Save new notes, modify them or archive */ @@ -1632,7 +1559,6 @@ void saveNote(OnNoteSaved mOnNoteSaved) { .THREAD_POOL_EXECUTOR, noteTmp); } - /** * Checks if nothing is changed to avoid committing if possible (check) */ @@ -1644,7 +1570,6 @@ private boolean saveNotNeeded() { return !noteTmp.isChanged(note) || (noteTmp.isLocked() && !noteTmp.isPasswordChecked()); } - /** * Checks if only tag, archive or trash status have been changed * and then force to not update last modification date* @@ -1657,7 +1582,6 @@ private boolean lastModificationUpdatedNeeded() { return noteTmp.isChanged(note); } - @Override public void onNoteSaved(Note noteSaved) { MainActivity.notifyAppWidgets(OmniNotes.getAppContext()); @@ -1674,7 +1598,6 @@ public void onNoteSaved(Note noteSaved) { } } - private void deleteMergedNotes(List mergedNotesIds) { ArrayList notesToDelete = new ArrayList(); if (mergedNotesIds != null) { @@ -1687,7 +1610,6 @@ private void deleteMergedNotes(List mergedNotesIds) { } } - private String getNoteTitle() { if (title != null && !TextUtils.isEmpty(title.getText())) { return title.getText().toString(); @@ -1696,7 +1618,6 @@ private String getNoteTitle() { } } - private String getNoteContent() { String contentText = ""; if (!noteTmp.isChecklist()) { @@ -1717,7 +1638,6 @@ private String getNoteContent() { return contentText; } - /** * Updates share intent */ @@ -1728,7 +1648,6 @@ private void shareNote() { mainActivity.shareNote(sharedNote); } - /** * Notes locking with security password to avoid viewing, editing or deleting from unauthorized */ @@ -1756,7 +1675,6 @@ private void lockNote() { }); } - private void lockUnlock() { // Empty password has been set if (prefs.getString(Constants.PREF_PASSWORD, null) == null) { @@ -1769,7 +1687,6 @@ private void lockUnlock() { noteTmp.setPasswordChecked(true); } - /** * Used to set actual reminder state when initializing a note to be edited */ @@ -1786,7 +1703,6 @@ private String initReminder(Note note) { } } - /** * Audio recordings playback */ @@ -1811,7 +1727,6 @@ private void playback(View v, Uri uri) { } } - private void replacePlayingAudioBitmap(View v) { Drawable d = ((ImageView) v.findViewById(R.id.gridview_item_picture)).getDrawable(); if (BitmapDrawable.class.isAssignableFrom(d.getClass())) { @@ -1824,7 +1739,6 @@ private void replacePlayingAudioBitmap(View v) { R.drawable.stop), Constants.THUMBNAIL_SIZE, Constants.THUMBNAIL_SIZE)); } - private void startPlaying(Uri uri) { if (mPlayer == null) { mPlayer = new MediaPlayer(); @@ -1848,7 +1762,6 @@ private void startPlaying(Uri uri) { } } - private void stopPlaying() { if (mPlayer != null) { if (isPlayingView != null) { @@ -1861,15 +1774,12 @@ private void stopPlaying() { } } - private void startRecording(View v) { PermissionsHelper.requestPermission(getActivity(), Manifest.permission.RECORD_AUDIO, R.string.permission_audio_recording, snackBarPlaceholder, () -> { isRecording = true; - android.widget.TextView mTextView = (android.widget.TextView) v; - mTextView.setText(getString(R.string.stop)); - mTextView.setTextColor(Color.parseColor("#ff0000")); + toggleAudioRecordingStop(v); File f = StorageHelper.createNewAttachmentFile(mainActivity, Constants.MIME_TYPE_AUDIO_EXT); if (f == null) { @@ -1898,8 +1808,15 @@ private void startRecording(View v) { }); } + private void toggleAudioRecordingStop(View v) { + if (isRecording) { + ((android.widget.TextView) v).setText(getString(R.string.stop)); + ((android.widget.TextView) v).setTextColor(Color.parseColor("#ff0000")); + } + } private void stopRecording() { + isRecording = false; if (mRecorder != null) { mRecorder.stop(); audioRecordingTime = Calendar.getInstance().getTimeInMillis() - audioRecordingTimeStart; @@ -1908,13 +1825,11 @@ private void stopRecording() { } } - private void fade(final View v, boolean fadeIn) { int anim = R.animator.fade_out_support; int visibilityTemp = View.GONE; - if (fadeIn) { anim = R.animator.fade_in_support; visibilityTemp = View.VISIBLE; @@ -1931,13 +1846,11 @@ public void onAnimationStart(Animation animation) { // Nothing to do } - @Override public void onAnimationRepeat(Animation animation) { // Nothing to do } - @Override public void onAnimationEnd(Animation animation) { v.setVisibility(visibility); @@ -1947,7 +1860,6 @@ public void onAnimationEnd(Animation animation) { } } - /** * Adding shortcut on Home screen */ @@ -1956,7 +1868,6 @@ private void addShortcut() { mainActivity.showMessage(R.string.shortcut_added, ONStyle.INFO); } - TextLinkClickListener textLinkClickListener = new TextLinkClickListener() { @Override public void onTextLinkClick(View view, final String clickedString, final String url) { @@ -1993,7 +1904,6 @@ public void onPositive(MaterialDialog dialog) { } } - @Override public void onNegative(MaterialDialog dialog) { android.content.ClipboardManager clipboard = (android.content.ClipboardManager) @@ -2014,7 +1924,6 @@ public void onNegative(MaterialDialog dialog) { } }; - @SuppressLint("NewApi") @Override public boolean onTouch(View v, MotionEvent event) { @@ -2068,48 +1977,6 @@ public boolean onTouch(View v, MotionEvent event) { return true; } - - @Override - public void onGlobalLayout() { - int screenHeight = Display.getUsableSize(mainActivity).y; - int navBarOffset = Display.orientationLandscape(mainActivity) ? 0 : DensityUtil.pxToDp(Display - .getNavigationBarHeight(mainActivity.getWindow().getDecorView()), mainActivity); - int heightDiff = screenHeight - Display.getVisibleSize(mainActivity).y + navBarOffset; - boolean keyboardVisible = heightDiff > 150; - if (keyboardVisible && keyboardPlaceholder == null) { - shrinkLayouts(heightDiff); - } else if (!keyboardVisible && keyboardPlaceholder != null) { - restoreLayouts(); - } - } - - - private void shrinkLayouts(int heightDiff) { - detailWrapperView.removeView(timestampsView); - keyboardPlaceholder = new View(mainActivity); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { - if (!(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && Display.orientationLandscape(mainActivity) - )) { - root.addView(keyboardPlaceholder, LinearLayout.LayoutParams.MATCH_PARENT, heightDiff); - } - } - } - - - private void restoreLayouts() { - if (root != null) { - ViewGroup wrapper = (ViewGroup) root.findViewById(R.id.detail_wrapper); - if (root.indexOfChild(keyboardPlaceholder) != -1) { - root.removeView(keyboardPlaceholder); - } - keyboardPlaceholder = null; - if (wrapper.indexOfChild(timestampsView) == -1) { - wrapper.addView(timestampsView); - } - } - } - - @Override public void onAttachingFileErrorOccurred(Attachment mAttachment) { mainActivity.showMessage(R.string.error_saving_attachments, ONStyle.ALERT); @@ -2120,22 +1987,18 @@ public void onAttachingFileErrorOccurred(Attachment mAttachment) { } } - private void addAttachment(Attachment attachment) { noteTmp.addAttachment(attachment); } - private void removeAttachment(Attachment mAttachment) { noteTmp.removeAttachment(mAttachment); } - private void removeAttachment(int position) { noteTmp.removeAttachment(noteTmp.getAttachmentsList().get(position)); } - private void removeAllAttachments() { noteTmp.setAttachmentsList(new ArrayList<>()); mAttachmentAdapter = new AttachmentAdapter(mainActivity, new ArrayList<>(), mGridView); @@ -2143,7 +2006,6 @@ private void removeAllAttachments() { mGridView.setAdapter(mAttachmentAdapter); } - @Override public void onAttachingFileFinished(Attachment mAttachment) { addAttachment(mAttachment); @@ -2151,7 +2013,6 @@ public void onAttachingFileFinished(Attachment mAttachment) { mGridView.autoresize(); } - @Override public void onReminderPicked(long reminder) { noteTmp.setAlarm(reminder); @@ -2161,7 +2022,6 @@ public void onReminderPicked(long reminder) { } } - @Override public void onRecurrenceReminderPicked(String recurrenceRule) { noteTmp.setRecurrenceRule(recurrenceRule); @@ -2172,31 +2032,26 @@ public void onRecurrenceReminderPicked(String recurrenceRule) { } } - @Override public void onTextChanged(CharSequence s, int start, int before, int count) { scrollContent(); } - @Override public void beforeTextChanged(CharSequence s, int start, int count, int after) { // Nothing to do } - @Override public void afterTextChanged(Editable s) { // Nothing to do } - @Override public void onCheckListChanged() { scrollContent(); } - private void scrollContent() { if (noteTmp.isChecklist()) { if (mChecklistManager.getCount() > contentLineCounter) { @@ -2211,7 +2066,6 @@ private void scrollContent() { } } - /** * Add previously created tags to content */ @@ -2245,7 +2099,6 @@ private void addTags() { dialog.show(); } - private void tagNote(List tags, Integer[] selectedTags, Note note) { Pair> taggingResult = TagsHelper.addTagToNote(tags, selectedTags, note); @@ -2292,7 +2145,6 @@ private void tagNote(List tags, Integer[] selectedTags, Note note) { } } - private int getCursorIndex() { if (!noteTmp.isChecklist()) { return content.getSelectionStart(); @@ -2306,7 +2158,6 @@ private int getCursorIndex() { } } - /** * Used to check currently opened note from activity to avoid openind multiple times the same one */ @@ -2314,7 +2165,6 @@ public Note getCurrentNote() { return note; } - private boolean isNoteLocationValid() { return noteTmp.getLatitude() != null && noteTmp.getLatitude() != 0 @@ -2322,7 +2172,6 @@ private boolean isNoteLocationValid() { && noteTmp.getLongitude() != 0; } - /** * Manages clicks on attachment dialog */ @@ -2336,25 +2185,22 @@ public void onClick(View v) { // Photo from camera case R.id.camera: takePhoto(); - attachmentDialog.dismiss(); break; case R.id.recording: if (!isRecording) { startRecording(v); } else { - isRecording = false; stopRecording(); - Attachment attachment = new Attachment(Uri.fromFile(new File(recordName)), Constants.MIME_TYPE_AUDIO); + Attachment attachment = new Attachment(Uri.fromFile(new File(recordName)), Constants + .MIME_TYPE_AUDIO); attachment.setLength(audioRecordingTime); addAttachment(attachment); mAttachmentAdapter.notifyDataSetChanged(); mGridView.autoresize(); - attachmentDialog.dismiss(); } break; case R.id.video: takeVideo(); - attachmentDialog.dismiss(); break; case R.id.files: if (ContextCompat.checkSelfPermission(getActivity(), Manifest.permission.READ_EXTERNAL_STORAGE) == @@ -2363,15 +2209,15 @@ public void onClick(View v) { } else { askReadExternalStoragePermission(); } - attachmentDialog.dismiss(); break; case R.id.sketch: takeSketch(null); - attachmentDialog.dismiss(); break; case R.id.location: displayLocationDialog(); - attachmentDialog.dismiss(); + break; + case R.id.timestamp: + addTimestamp(); break; case R.id.pushbullet: MessagingExtension.mirrorMessage(mainActivity, getString(R.string.app_name), @@ -2379,11 +2225,11 @@ public void onClick(View v) { getNoteContent(), BitmapFactory.decodeResource(getResources(), R.drawable.ic_stat_literal_icon), null, 0); - attachmentDialog.dismiss(); break; default: Log.e(Constants.TAG, "Wrong element choosen: " + v.getId()); } + if (!isRecording) attachmentDialog.dismiss(); } } @@ -2396,13 +2242,12 @@ public void startGetContentAction() { startActivityForResult(filesIntent, FILES); } - private void askReadExternalStoragePermission(){ + private void askReadExternalStoragePermission() { PermissionsHelper.requestPermission(getActivity(), Manifest.permission.READ_EXTERNAL_STORAGE, R.string.permission_external_storage_detail_attachment, snackBarPlaceholder, this::startGetContentAction); } - public void onEventMainThread(PushbulletReplyEvent pushbulletReplyEvent) { String text = getNoteContent() + System.getProperty("line.separator") + pushbulletReplyEvent.message; content.setText(text); diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/FontSizeListPreference.java b/omniNotes/src/main/java/it/feio/android/omninotes/FontSizeListPreference.java index 2070797f5b..537c0ecb3f 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/FontSizeListPreference.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/FontSizeListPreference.java @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package it.feio.android.omninotes; import android.app.AlertDialog; diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/GalleryActivity.java b/omniNotes/src/main/java/it/feio/android/omninotes/GalleryActivity.java index 063b34e108..5a4d3cddb3 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/GalleryActivity.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/GalleryActivity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/ListFragment.java b/omniNotes/src/main/java/it/feio/android/omninotes/ListFragment.java index 1f79894b7e..cacf11be17 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/ListFragment.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/ListFragment.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,7 +28,6 @@ import android.graphics.Color; import android.graphics.drawable.AnimationDrawable; import android.os.AsyncTask; -import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.Looper; @@ -60,6 +59,8 @@ import com.nhaarman.listviewanimations.itemmanipulation.DynamicListView; import com.pnikosis.materialishprogress.ProgressWheel; +import it.feio.android.omninotes.async.bus.*; +import it.feio.android.omninotes.utils.*; import org.apache.commons.lang.ObjectUtils; import java.util.ArrayList; @@ -75,10 +76,6 @@ import de.greenrobot.event.EventBus; import de.keyboardsurfer.android.widget.crouton.Crouton; import de.keyboardsurfer.android.widget.crouton.Style; -import it.feio.android.omninotes.async.bus.CategoriesUpdatedEvent; -import it.feio.android.omninotes.async.bus.NavigationUpdatedNavDrawerClosedEvent; -import it.feio.android.omninotes.async.bus.NotesLoadedEvent; -import it.feio.android.omninotes.async.bus.NotesMergeEvent; import it.feio.android.omninotes.async.notes.NoteLoaderTask; import it.feio.android.omninotes.async.notes.NoteProcessorArchive; import it.feio.android.omninotes.async.notes.NoteProcessorCategorize; @@ -97,15 +94,6 @@ import it.feio.android.omninotes.models.listeners.OnViewTouchedListener; import it.feio.android.omninotes.models.views.Fab; import it.feio.android.omninotes.models.views.InterceptorLinearLayout; -import it.feio.android.omninotes.utils.AnimationsHelper; -import it.feio.android.omninotes.utils.Constants; -import it.feio.android.omninotes.utils.Display; -import it.feio.android.omninotes.utils.KeyboardUtils; -import it.feio.android.omninotes.utils.Navigation; -import it.feio.android.omninotes.utils.PasswordHelper; -import it.feio.android.omninotes.utils.ReminderHelper; -import it.feio.android.omninotes.utils.TagsHelper; -import it.feio.android.omninotes.utils.TextHelper; import it.feio.android.pixlui.links.UrlCompleter; import it.feio.android.simplegallery.util.BitmapUtils; @@ -144,7 +132,6 @@ public class ListFragment extends BaseFragment implements OnViewTouchedListener, private ListFragment mFragment; private android.support.v7.view.ActionMode actionMode; private boolean keepActionMode = false; - private TextView listFooter; // Undo archive/trash private boolean undoTrash = false; @@ -161,6 +148,7 @@ public class ListFragment extends BaseFragment implements OnViewTouchedListener, private String searchQuery; private String searchQueryInstant; private String searchTags; + private boolean searchUncompleteChecklists; private boolean goBackOnToggleSearchLabel = false; private boolean searchLabelActive = false; @@ -260,7 +248,6 @@ private void initFab() { break; } }); - fab.setOverlay(R.color.white_overlay); } @@ -475,20 +462,8 @@ private void initListView() { list.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE); list.setItemsCanFocus(false); - // If device runs KitKat a footer is added to list to avoid - // navigation bar transparency covering items - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { - int navBarHeight = Display.getNavigationBarHeightKitkat(mainActivity); - listFooter = new TextView(mainActivity.getApplicationContext()); - listFooter.setHeight(navBarHeight); - // To avoid useless events on footer - listFooter.setOnClickListener(null); - list.addFooterView(listFooter); - } - // Note long click to start CAB mode list.setOnItemLongClickListener((arg0, view, position, arg3) -> { - if (view.equals(listFooter)) return true; if (getActionMode() != null) { return false; } @@ -501,7 +476,6 @@ private void initListView() { // Note single click listener managed by the activity itself list.setOnItemClickListener((arg0, view, position, arg3) -> { - if (view.equals(listFooter)) return; if (getActionMode() == null) { editNote(listAdapter.getItem(position), view); return; @@ -621,6 +595,7 @@ private void prepareActionModeMenu() { } menu.findItem(R.id.menu_add_reminder).setVisible(true); menu.findItem(R.id.menu_category).setVisible(true); + menu.findItem(R.id.menu_uncomplete_checklists).setVisible(false); menu.findItem(R.id.menu_tags).setVisible(true); menu.findItem(R.id.menu_trash).setVisible(true); } @@ -752,6 +727,7 @@ private void setActionItemsVisibility(Menu menu, boolean searchViewHasFocus) { menu.findItem(R.id.menu_expanded_view).setVisible(!drawerOpen && !expandedView && !searchViewHasFocus); menu.findItem(R.id.menu_contracted_view).setVisible(!drawerOpen && expandedView && !searchViewHasFocus); menu.findItem(R.id.menu_empty_trash).setVisible(!drawerOpen && navigationTrash); + menu.findItem(R.id.menu_uncomplete_checklists).setVisible(searchViewHasFocus); menu.findItem(R.id.menu_tags).setVisible(searchViewHasFocus); } @@ -796,6 +772,8 @@ public boolean performAction(MenuItem item, ActionMode actionMode) { break; case R.id.menu_filter_category_remove: filterCategoryArchived(false); + case R.id.menu_uncomplete_checklists: + filterByUncompleteChecklists(); break; case R.id.menu_tags: filterByTags(); @@ -1017,6 +995,7 @@ public void onPositive(MaterialDialog materialDialog) { /** * Notes list adapter initialization and association to view + * @FIXME: This method is a divine opprobrium and MUST be refactored. I'm ashamed by myself. */ void initNotesList(Intent intent) { Log.d(Constants.TAG, "initNotesList intent: " + intent.getAction()); @@ -1039,13 +1018,18 @@ void initNotesList(Intent intent) { // Searching searchQuery = searchQueryInstant; searchQueryInstant = null; - if (searchTags != null || searchQuery != null || Intent.ACTION_SEARCH.equals(intent.getAction())) { + if (searchTags != null || searchQuery != null || searchUncompleteChecklists + || IntentChecker.checkAction(intent, Intent.ACTION_SEARCH, Constants.ACTION_SEARCH_UNCOMPLETE_CHECKLISTS)) { // Using tags if (searchTags != null && intent.getStringExtra(SearchManager.QUERY) == null) { searchQuery = searchTags; NoteLoaderTask.getInstance().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, "getNotesByTag", searchQuery); + } else if (searchUncompleteChecklists || Constants.ACTION_SEARCH_UNCOMPLETE_CHECKLISTS.equals(intent.getAction())) { + searchQuery = getContext().getResources().getString(R.string.uncompleted_checklists); + searchUncompleteChecklists = true; + NoteLoaderTask.getInstance().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, "getNotesByUncompleteChecklist"); } else { // Get the intent, verify the action and get the query if (intent.getStringExtra(SearchManager.QUERY) != null) { @@ -1098,6 +1082,7 @@ public void toggleSearchLabel(boolean activate) { AnimationsHelper.expandOrCollapse(searchLayout, false); searchTags = null; searchQuery = null; + searchUncompleteChecklists = false; if (!goBackOnToggleSearchLabel) { mainActivity.getIntent().setAction(Intent.ACTION_MAIN); if (searchView != null) { @@ -1204,6 +1189,9 @@ else if (Navigation.checkNavigation(Navigation.CATEGORY)) { closeFab(); } + public void onEvent(PasswordRemovedEvent passwordRemovedEvent) { + initNotesList(mainActivity.getIntent()); + } private void animateListView() { if (!OmniNotes.isDebugBuild()) { @@ -1293,10 +1281,7 @@ protected void trashNote(List notes, boolean trash) { private void selectAllNotes() { for (int i = 0; i < list.getChildCount(); i++) { LinearLayout v = (LinearLayout) list.getChildAt(i).findViewById(R.id.card_layout); - // Checks null to avoid the footer - if (v != null) { - v.setBackgroundColor(getResources().getColor(R.color.list_bg_selected)); - } + v.setBackgroundColor(getResources().getColor(R.color.list_bg_selected)); } selectedNotes.clear(); for (int i = 0; i < listAdapter.getCount(); i++) { @@ -1777,9 +1762,10 @@ private void filterCategoryArchived(boolean filter) { } - /** - * Search notes by tags - */ + private void filterByUncompleteChecklists() { + initNotesList(new Intent(Constants.ACTION_SEARCH_UNCOMPLETE_CHECKLISTS)); + } + private void filterByTags() { // Retrieves all available categories diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/MainActivity.java b/omniNotes/src/main/java/it/feio/android/omninotes/MainActivity.java index 737e8618eb..b59c804b82 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/MainActivity.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/MainActivity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -148,27 +148,32 @@ public void onEvent(PasswordRemovedEvent passwordRemovedEvent) { private void init() { isPasswordAccepted = true; - mFragmentManager = getSupportFragmentManager(); - - NavigationDrawerFragment mNavigationDrawerFragment = (NavigationDrawerFragment) mFragmentManager + getFragmentManagerInstance(); + + NavigationDrawerFragment mNavigationDrawerFragment = (NavigationDrawerFragment) getFragmentManagerInstance() .findFragmentById(R.id.navigation_drawer); if (mNavigationDrawerFragment == null) { - FragmentTransaction fragmentTransaction = mFragmentManager.beginTransaction(); + FragmentTransaction fragmentTransaction = getFragmentManagerInstance().beginTransaction(); fragmentTransaction.replace(R.id.navigation_drawer, new NavigationDrawerFragment(), FRAGMENT_DRAWER_TAG).commit(); } - if (mFragmentManager.findFragmentByTag(FRAGMENT_LIST_TAG) == null) { - FragmentTransaction fragmentTransaction = mFragmentManager.beginTransaction(); + if (getFragmentManagerInstance().findFragmentByTag(FRAGMENT_LIST_TAG) == null) { + FragmentTransaction fragmentTransaction = getFragmentManagerInstance().beginTransaction(); fragmentTransaction.add(R.id.fragment_container, new ListFragment(), FRAGMENT_LIST_TAG).commit(); } - // Handling of Intent actions handleIntents(); } + private FragmentManager getFragmentManagerInstance() { + if (mFragmentManager == null) { + mFragmentManager = getSupportFragmentManager(); + } + return mFragmentManager; + } - @Override + @Override protected void onNewIntent(Intent intent) { if (intent.getAction() == null) { intent.setAction(Constants.ACTION_START_APP); @@ -220,12 +225,10 @@ public void commitPending() { */ private Fragment checkFragmentInstance(int id, Object instanceClass) { Fragment result = null; - if (mFragmentManager != null) { - Fragment fragment = mFragmentManager.findFragmentById(id); - if (instanceClass.equals(fragment.getClass())) { - result = fragment; - } - } + Fragment fragment = getFragmentManagerInstance().findFragmentById(id); + if (instanceClass.equals(fragment.getClass())) { + result = fragment; + } return result; } @@ -247,7 +250,7 @@ public void onBackPressed() { setRequestedOrientation( ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED); - mFragmentManager.popBackStack(); + getFragmentManagerInstance().popBackStack(); return; } @@ -301,8 +304,8 @@ public DrawerLayout getDrawerLayout() { public ActionBarDrawerToggle getDrawerToggle() { - if (mFragmentManager != null && mFragmentManager.findFragmentById(R.id.navigation_drawer) != null) { - return ((NavigationDrawerFragment) mFragmentManager.findFragmentById(R.id.navigation_drawer)).mDrawerToggle; + if (getFragmentManagerInstance().findFragmentById(R.id.navigation_drawer) != null) { + return ((NavigationDrawerFragment) getFragmentManagerInstance().findFragmentById(R.id.navigation_drawer)).mDrawerToggle; } else { return null; } @@ -313,7 +316,7 @@ public ActionBarDrawerToggle getDrawerToggle() { * Finishes multiselection mode started by ListFragment */ public void finishActionMode() { - ListFragment fragment = (ListFragment) mFragmentManager.findFragmentByTag(FRAGMENT_LIST_TAG); + ListFragment fragment = (ListFragment) getFragmentManagerInstance().findFragmentByTag(FRAGMENT_LIST_TAG); if (fragment != null) { fragment.finishActionMode(); } @@ -397,13 +400,13 @@ private boolean receivedIntent(Intent i) { private boolean noteAlreadyOpened(Note note) { - DetailFragment detailFragment = (DetailFragment) mFragmentManager.findFragmentByTag(FRAGMENT_DETAIL_TAG); + DetailFragment detailFragment = (DetailFragment) getFragmentManagerInstance().findFragmentByTag(FRAGMENT_DETAIL_TAG); return detailFragment != null && NotesHelper.haveSameId(note, detailFragment.getCurrentNote()); } public void switchToList() { - FragmentTransaction transaction = mFragmentManager.beginTransaction(); + FragmentTransaction transaction = getFragmentManagerInstance().beginTransaction(); animateTransition(transaction, TRANSITION_HORIZONTAL); ListFragment mListFragment = new ListFragment(); transaction.replace(R.id.fragment_container, mListFragment, FRAGMENT_LIST_TAG).addToBackStack @@ -411,24 +414,24 @@ public void switchToList() { if (getDrawerToggle() != null) { getDrawerToggle().setDrawerIndicatorEnabled(false); } - mFragmentManager.getFragments(); + getFragmentManagerInstance().getFragments(); EventBus.getDefault().post(new SwitchFragmentEvent(SwitchFragmentEvent.Direction.PARENT)); } public void switchToDetail(Note note) { - FragmentTransaction transaction = mFragmentManager.beginTransaction(); + FragmentTransaction transaction = getFragmentManagerInstance().beginTransaction(); animateTransition(transaction, TRANSITION_HORIZONTAL); DetailFragment mDetailFragment = new DetailFragment(); Bundle b = new Bundle(); b.putParcelable(Constants.INTENT_NOTE, note); mDetailFragment.setArguments(b); - if (mFragmentManager.findFragmentByTag(FRAGMENT_DETAIL_TAG) == null) { + if (getFragmentManagerInstance().findFragmentByTag(FRAGMENT_DETAIL_TAG) == null) { transaction.replace(R.id.fragment_container, mDetailFragment, FRAGMENT_DETAIL_TAG) .addToBackStack(FRAGMENT_LIST_TAG) .commitAllowingStateLoss(); } else { - mFragmentManager.popBackStackImmediate(); + getFragmentManagerInstance().popBackStackImmediate(); transaction.replace(R.id.fragment_container, mDetailFragment, FRAGMENT_DETAIL_TAG) .addToBackStack(FRAGMENT_DETAIL_TAG) .commitAllowingStateLoss(); @@ -517,7 +520,7 @@ public void showMessage(String message, Style style) { @Override public void onTimeSet(TimePicker view, int hourOfDay, int minute) { - DetailFragment f = (DetailFragment) mFragmentManager.findFragmentByTag(FRAGMENT_DETAIL_TAG); + DetailFragment f = (DetailFragment) getFragmentManagerInstance().findFragmentByTag(FRAGMENT_DETAIL_TAG); if (f != null && f.isAdded()) { f.onTimeSetListener.onTimeSet(view, hourOfDay, minute); } @@ -527,7 +530,7 @@ public void onTimeSet(TimePicker view, int hourOfDay, int minute) { @Override public void onDateSet(DatePicker view, int year, int monthOfYear, int dayOfMonth) { - DetailFragment f = (DetailFragment) mFragmentManager.findFragmentByTag(FRAGMENT_DETAIL_TAG); + DetailFragment f = (DetailFragment) getFragmentManagerInstance().findFragmentByTag(FRAGMENT_DETAIL_TAG); if (f != null && f.isAdded() && f.onDateSetListener != null) { f.onDateSetListener.onDateSet(view, year, monthOfYear, dayOfMonth); } diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/NavigationDrawerFragment.java b/omniNotes/src/main/java/it/feio/android/omninotes/NavigationDrawerFragment.java index 42765dcdb9..d812d2dc0e 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/NavigationDrawerFragment.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/NavigationDrawerFragment.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -12,7 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program. If not, see . + * along with this program. If not, see . */ package it.feio.android.omninotes; diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/NoteInfosActivity.java b/omniNotes/src/main/java/it/feio/android/omninotes/NoteInfosActivity.java new file mode 100644 index 0000000000..a09052b3ac --- /dev/null +++ b/omniNotes/src/main/java/it/feio/android/omninotes/NoteInfosActivity.java @@ -0,0 +1,97 @@ +/* + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package it.feio.android.omninotes; + +import android.app.Activity; +import android.os.Bundle; +import android.view.View; +import android.widget.TextView; +import butterknife.BindView; +import butterknife.ButterKnife; +import it.feio.android.omninotes.helpers.NotesHelper; +import it.feio.android.omninotes.models.Note; +import it.feio.android.omninotes.models.StatsSingleNote; +import it.feio.android.omninotes.utils.Constants; +import org.apache.commons.lang.StringUtils; + +import java.util.Objects; + + +public class NoteInfosActivity extends Activity { + + @BindView(R.id.note_infos_category) + TextView category; + @BindView(R.id.note_infos_tags) + TextView tags; + @BindView(R.id.note_infos_chars) + TextView chars; + @BindView(R.id.note_infos_words) + TextView words; + @BindView(R.id.note_infos_checklist_items) + TextView checklistItems; + @BindView(R.id.note_infos_completed_checklist_items) + TextView checklistCompletedItems; + @BindView(R.id.note_infos_images) + TextView images; + @BindView(R.id.note_infos_videos) + TextView videos; + @BindView(R.id.note_infos_audiorecordings) + TextView audioRecordings; + @BindView(R.id.note_infos_sketches) + TextView sketches; + @BindView(R.id.note_infos_files) + TextView files; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_note_infos); + ButterKnife.bind(this); + Note note = Objects.requireNonNull(getIntent().getExtras()).getParcelable(Constants.INTENT_NOTE); + populateViews(note); + } + + private void populateViews(Note note) { + StatsSingleNote infos = NotesHelper.getNoteInfos(note); + populateView(category, infos.getCategoryName()); + populateView(tags, infos.getTags()); + populateView(chars, infos.getChars()); + populateView(words, infos.getWords()); + populateView(checklistItems, infos.getChecklistItemsNumber()); + populateView(checklistCompletedItems, infos.getChecklistCompletedItemsNumber()); + populateView(images, infos.getImages()); + populateView(videos, infos.getVideos()); + populateView(audioRecordings, infos.getAudioRecordings()); + populateView(sketches, infos.getSketches()); + populateView(files, infos.getFiles()); + } + + private void populateView(TextView textView, int numberValue) { + String stringValue = numberValue > 0 ? String.valueOf(numberValue) : ""; + populateView(textView, stringValue); + } + + private void populateView(TextView textView, String value) { + if (!StringUtils.isEmpty(value)) { + textView.setText(value); + } else { + ((View) textView.getParent()).setVisibility(View.GONE); + } + } + +} diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/OmniNotes.java b/omniNotes/src/main/java/it/feio/android/omninotes/OmniNotes.java index 67ef2084ed..ebe7a8edcd 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/OmniNotes.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/OmniNotes.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -64,9 +64,6 @@ public void onCreate() { initAcra(this); initLeakCanary(); - - // Checks selected locale or default one - LanguageHelper.updateLanguage(this, null); } private void initLeakCanary() { @@ -92,11 +89,9 @@ public static boolean isDebugBuild() { } @Override - // Used to restore user selected locale when configuration changes public void onConfigurationChanged(Configuration newConfig) { super.onConfigurationChanged(newConfig); String language = prefs.getString(Constants.PREF_LANG, ""); - super.onConfigurationChanged(newConfig); LanguageHelper.updateLanguage(this, language); } diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/PasswordActivity.java b/omniNotes/src/main/java/it/feio/android/omninotes/PasswordActivity.java index 1a3dc66134..d01d71cac3 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/PasswordActivity.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/PasswordActivity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/SettingsActivity.java b/omniNotes/src/main/java/it/feio/android/omninotes/SettingsActivity.java index 0a552891cf..59089876c2 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/SettingsActivity.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/SettingsActivity.java @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package it.feio.android.omninotes; import android.app.Fragment; diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/SettingsFragment.java b/omniNotes/src/main/java/it/feio/android/omninotes/SettingsFragment.java index 2021d10286..ad4031eea4 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/SettingsFragment.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/SettingsFragment.java @@ -1,18 +1,19 @@ -/******************************************************************************* - * Copyright 2014 Federico Iosue (federico.iosue@gmail.com) +/* + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * http://www.apache.org/licenses/LICENSE-2.0 + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - ******************************************************************************/ + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ package it.feio.android.omninotes; import android.Manifest; diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/ShortcutActivity.java b/omniNotes/src/main/java/it/feio/android/omninotes/ShortcutActivity.java index c47f2c0e7d..dda486e225 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/ShortcutActivity.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/ShortcutActivity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -42,4 +42,4 @@ protected void onCreate(Bundle savedInstanceState) { finish(); } -} \ No newline at end of file +} diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/SketchFragment.java b/omniNotes/src/main/java/it/feio/android/omninotes/SketchFragment.java index 7fd9999336..58a2e5e10d 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/SketchFragment.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/SketchFragment.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/SnoozeActivity.java b/omniNotes/src/main/java/it/feio/android/omninotes/SnoozeActivity.java index ca687575b8..c7ea89cb2c 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/SnoozeActivity.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/SnoozeActivity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/StatsActivity.java b/omniNotes/src/main/java/it/feio/android/omninotes/StatsActivity.java index 0d68f2fc1c..be62b1a6aa 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/StatsActivity.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/StatsActivity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/async/AlarmRestoreOnRebootService.java b/omniNotes/src/main/java/it/feio/android/omninotes/async/AlarmRestoreOnRebootService.java index d8aa2e5e53..5c9b4303f5 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/async/AlarmRestoreOnRebootService.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/async/AlarmRestoreOnRebootService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/async/AttachmentTask.java b/omniNotes/src/main/java/it/feio/android/omninotes/async/AttachmentTask.java index 30f10b59f3..65f9bb8b1a 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/async/AttachmentTask.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/async/AttachmentTask.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -81,4 +81,4 @@ private boolean isAlive() { && !mFragmentWeakReference.get().getActivity().isFinishing(); } -} \ No newline at end of file +} diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/async/CategoryMenuTask.java b/omniNotes/src/main/java/it/feio/android/omninotes/async/CategoryMenuTask.java index 70c707e085..5884ce5da7 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/async/CategoryMenuTask.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/async/CategoryMenuTask.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -163,4 +163,4 @@ private List buildCategoryMenu() { return categories; } -} \ No newline at end of file +} diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/async/DataBackupIntentService.java b/omniNotes/src/main/java/it/feio/android/omninotes/async/DataBackupIntentService.java index 59722bcb47..993bbc8581 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/async/DataBackupIntentService.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/async/DataBackupIntentService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/async/MainMenuTask.java b/omniNotes/src/main/java/it/feio/android/omninotes/async/MainMenuTask.java index 980c9449b5..323bdd4292 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/async/MainMenuTask.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/async/MainMenuTask.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -146,4 +146,4 @@ private boolean checkSkippableItem(int i) { return skippable; } -} \ No newline at end of file +} diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/async/TextWorkerTask.java b/omniNotes/src/main/java/it/feio/android/omninotes/async/TextWorkerTask.java index ca4ade2c2a..f342b8788b 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/async/TextWorkerTask.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/async/TextWorkerTask.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -83,4 +83,4 @@ private boolean isAlive() { } -} \ No newline at end of file +} diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/async/UpdateWidgetsTask.java b/omniNotes/src/main/java/it/feio/android/omninotes/async/UpdateWidgetsTask.java index adf3dd7ada..75e8a98016 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/async/UpdateWidgetsTask.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/async/UpdateWidgetsTask.java @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package it.feio.android.omninotes.async; import android.content.Context; diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/async/UpdaterTask.java b/omniNotes/src/main/java/it/feio/android/omninotes/async/UpdaterTask.java index f336e4b45c..922c2763f1 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/async/UpdaterTask.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/async/UpdaterTask.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/CategoriesUpdatedEvent.java b/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/CategoriesUpdatedEvent.java index f45a3d540f..6676bba9ec 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/CategoriesUpdatedEvent.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/CategoriesUpdatedEvent.java @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package it.feio.android.omninotes.async.bus; /** diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/DynamicNavigationReadyEvent.java b/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/DynamicNavigationReadyEvent.java index 5989a3df91..f7c47f87c2 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/DynamicNavigationReadyEvent.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/DynamicNavigationReadyEvent.java @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package it.feio.android.omninotes.async.bus; /** diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/NavigationUpdatedEvent.java b/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/NavigationUpdatedEvent.java index f77db7049d..187a77be93 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/NavigationUpdatedEvent.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/NavigationUpdatedEvent.java @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package it.feio.android.omninotes.async.bus; import android.util.Log; diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/NavigationUpdatedNavDrawerClosedEvent.java b/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/NavigationUpdatedNavDrawerClosedEvent.java index 7717bee1cf..9d968f95af 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/NavigationUpdatedNavDrawerClosedEvent.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/NavigationUpdatedNavDrawerClosedEvent.java @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package it.feio.android.omninotes.async.bus; import android.util.Log; diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/NotesLoadedEvent.java b/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/NotesLoadedEvent.java index b848479cbd..0b8f49bc8a 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/NotesLoadedEvent.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/NotesLoadedEvent.java @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package it.feio.android.omninotes.async.bus; import android.util.Log; diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/NotesMergeEvent.java b/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/NotesMergeEvent.java index 1b57718a2e..973827797f 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/NotesMergeEvent.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/NotesMergeEvent.java @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package it.feio.android.omninotes.async.bus; import android.util.Log; diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/NotesUpdatedEvent.java b/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/NotesUpdatedEvent.java index 18dedc9d4d..3503673f58 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/NotesUpdatedEvent.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/NotesUpdatedEvent.java @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package it.feio.android.omninotes.async.bus; import android.util.Log; diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/NotificationRemovedEvent.java b/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/NotificationRemovedEvent.java index d1c4f9688c..a31bece88e 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/NotificationRemovedEvent.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/NotificationRemovedEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/PasswordRemovedEvent.java b/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/PasswordRemovedEvent.java index 6a6e65e93b..44f7d7b103 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/PasswordRemovedEvent.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/PasswordRemovedEvent.java @@ -1,9 +1,9 @@ /* - * Copyright (C) 2016 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundatibehaon, either version 3 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/PushbulletReplyEvent.java b/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/PushbulletReplyEvent.java index caca953998..79332395a3 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/PushbulletReplyEvent.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/PushbulletReplyEvent.java @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package it.feio.android.omninotes.async.bus; import android.util.Log; diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/SwitchFragmentEvent.java b/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/SwitchFragmentEvent.java index 5c88f08be4..5562a3eae3 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/SwitchFragmentEvent.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/async/bus/SwitchFragmentEvent.java @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package it.feio.android.omninotes.async.bus; import android.util.Log; diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/async/notes/NoteLoaderTask.java b/omniNotes/src/main/java/it/feio/android/omninotes/async/notes/NoteLoaderTask.java index f9a6f61849..a24c769bbc 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/async/notes/NoteLoaderTask.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/async/notes/NoteLoaderTask.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,9 +21,11 @@ import de.greenrobot.event.EventBus; import it.feio.android.omninotes.async.bus.NotesLoadedEvent; import it.feio.android.omninotes.db.DbHelper; +import it.feio.android.omninotes.exceptions.NotesLoadingException; import it.feio.android.omninotes.models.Note; import it.feio.android.omninotes.utils.Constants; +import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.ArrayList; @@ -55,23 +57,28 @@ protected ArrayList doInBackground(Object... params) { ArrayList notes = new ArrayList<>(); String methodName = params[0].toString(); - Object methodArgs = params[1]; DbHelper db = DbHelper.getInstance(); - // If null argument an empty list will be returned - if (methodArgs == null) { - return notes; - } - - // Checks the argument class with reflection - Class[] paramClass = new Class[]{methodArgs.getClass()}; - - // Retrieves and calls the right method - try { - Method method = db.getClass().getDeclaredMethod(methodName, paramClass); - notes = (ArrayList) method.invoke(db, paramClass[0].cast(methodArgs)); - } catch (Exception e) { - Log.e(Constants.TAG, "Error retrieving notes", e); + if (params.length < 2 || params[1] == null) { + try { + Method method = db.getClass().getDeclaredMethod(methodName); + notes = (ArrayList)method.invoke(db); + } catch (NoSuchMethodException e) { + return notes; + } catch (IllegalAccessException e) { + throw new NotesLoadingException("Error retrieving notes", e); + } catch (InvocationTargetException e) { + throw new NotesLoadingException("Error retrieving notes", e); + } + } else { + Object methodArgs = params[1]; + Class[] paramClass = new Class[]{methodArgs.getClass()}; + try { + Method method = db.getClass().getDeclaredMethod(methodName, paramClass); + notes = (ArrayList) method.invoke(db, paramClass[0].cast(methodArgs)); + } catch (Exception e) { + throw new NotesLoadingException("Error retrieving notes", e); + } } return notes; @@ -84,4 +91,4 @@ protected void onPostExecute(ArrayList notes) { super.onPostExecute(notes); EventBus.getDefault().post(new NotesLoadedEvent(notes)); } -} \ No newline at end of file +} diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/async/notes/NoteProcessor.java b/omniNotes/src/main/java/it/feio/android/omninotes/async/notes/NoteProcessor.java index fad9cb83d0..b42477f137 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/async/notes/NoteProcessor.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/async/notes/NoteProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/async/notes/NoteProcessorArchive.java b/omniNotes/src/main/java/it/feio/android/omninotes/async/notes/NoteProcessorArchive.java index ece5af22dd..67469bd5c2 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/async/notes/NoteProcessorArchive.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/async/notes/NoteProcessorArchive.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/async/notes/NoteProcessorCategorize.java b/omniNotes/src/main/java/it/feio/android/omninotes/async/notes/NoteProcessorCategorize.java index 1219f55bea..708d49e111 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/async/notes/NoteProcessorCategorize.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/async/notes/NoteProcessorCategorize.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/async/notes/NoteProcessorDelete.java b/omniNotes/src/main/java/it/feio/android/omninotes/async/notes/NoteProcessorDelete.java index ec519e6a68..0bf9fab858 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/async/notes/NoteProcessorDelete.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/async/notes/NoteProcessorDelete.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/async/notes/NoteProcessorTrash.java b/omniNotes/src/main/java/it/feio/android/omninotes/async/notes/NoteProcessorTrash.java index 2b758d3ea5..5dc9d47cb9 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/async/notes/NoteProcessorTrash.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/async/notes/NoteProcessorTrash.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/async/notes/SaveNoteTask.java b/omniNotes/src/main/java/it/feio/android/omninotes/async/notes/SaveNoteTask.java index 5dd04db8c9..4e6b17563b 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/async/notes/SaveNoteTask.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/async/notes/SaveNoteTask.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/async/upgrade/UpgradeProcessor.java b/omniNotes/src/main/java/it/feio/android/omninotes/async/upgrade/UpgradeProcessor.java index a8d8f09994..bc83ad8418 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/async/upgrade/UpgradeProcessor.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/async/upgrade/UpgradeProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/db/DbHelper.java b/omniNotes/src/main/java/it/feio/android/omninotes/db/DbHelper.java index 7d20db80af..1c53cead2d 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/db/DbHelper.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/db/DbHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,11 +23,11 @@ import android.database.SQLException; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; -import android.database.sqlite.SQLiteReadOnlyDatabaseException; import android.net.Uri; import android.util.Log; import it.feio.android.omninotes.OmniNotes; import it.feio.android.omninotes.async.upgrade.UpgradeProcessor; +import it.feio.android.omninotes.helpers.NotesHelper; import it.feio.android.omninotes.models.*; import it.feio.android.omninotes.utils.*; @@ -363,46 +363,6 @@ public List getNotesWithLocation() { } - /** - * Counts words in a note - */ - public int getWords(Note note) { - int count = 0; - String[] fields = {note.getTitle(), note.getContent()}; - for (String field : fields) { - boolean word = false; - int endOfLine = field.length() - 1; - for (int i = 0; i < field.length(); i++) { - // if the char is a letter, word = true. - if (Character.isLetter(field.charAt(i)) && i != endOfLine) { - word = true; - // if char isn't a letter and there have been letters before, - // counter goes up. - } else if (!Character.isLetter(field.charAt(i)) && word) { - count++; - word = false; - // last word of String; if it doesn't end with a non letter, it - // wouldn't count without this. - } else if (Character.isLetter(field.charAt(i)) && i == endOfLine) { - count++; - } - } - } - return count; - } - - - /** - * Counts chars in a note - */ - public int getChars(Note note) { - int count = 0; - count += note.getTitle().length(); - count += note.getContent().length(); - return count; - } - - /** * Common method for notes retrieval. It accepts a query to perform and returns matching records. */ @@ -768,6 +728,15 @@ public List getNotesByTag(String[] tags) { .toList().toBlocking().single(); } + /** + * Retrieves all uncompleted checklists + */ + public List getNotesByUncompleteChecklist() { + String whereCondition = " WHERE " + KEY_CHECKLIST + " = 1 AND " + KEY_CONTENT + " LIKE '%" + it.feio.android + .checklistview.interfaces.Constants.UNCHECKED_SYM + "%'"; + return getNotes(whereCondition, true); + } + /** * Retrieves all attachments @@ -1004,8 +973,8 @@ public Stats getStats() { if (note.getLongitude() != null && note.getLongitude() != 0) { locations++; } - words = getWords(note); - chars = getChars(note); + words = NotesHelper.getWords(note); + chars = NotesHelper.getChars(note); if (words > maxWords) { maxWords = words; } diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/db/SqlParser.java b/omniNotes/src/main/java/it/feio/android/omninotes/db/SqlParser.java index 2d5c905bb3..688afcadcc 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/db/SqlParser.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/db/SqlParser.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/exceptions/NotesLoadingException.java b/omniNotes/src/main/java/it/feio/android/omninotes/exceptions/NotesLoadingException.java new file mode 100644 index 0000000000..589f16993b --- /dev/null +++ b/omniNotes/src/main/java/it/feio/android/omninotes/exceptions/NotesLoadingException.java @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package it.feio.android.omninotes.exceptions; + +public class NotesLoadingException extends RuntimeException { + + private static final long serialVersionUID = 1288015037660807104L; + + public NotesLoadingException(String message, Exception e) { + super(message, e); + } + +} diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/extensions/ONDashClockExtension.java b/omniNotes/src/main/java/it/feio/android/omninotes/extensions/ONDashClockExtension.java index 23444f2278..e93470decd 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/extensions/ONDashClockExtension.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/extensions/ONDashClockExtension.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/extensions/PushBulletExtension.java b/omniNotes/src/main/java/it/feio/android/omninotes/extensions/PushBulletExtension.java index 15240939ac..6111a2ddc1 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/extensions/PushBulletExtension.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/extensions/PushBulletExtension.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/factory/MediaStoreFactory.java b/omniNotes/src/main/java/it/feio/android/omninotes/factory/MediaStoreFactory.java index aab8885a2b..2447a14edf 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/factory/MediaStoreFactory.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/factory/MediaStoreFactory.java @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package it.feio.android.omninotes.factory; import android.provider.MediaStore; diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/helpers/AppVersionHelper.java b/omniNotes/src/main/java/it/feio/android/omninotes/helpers/AppVersionHelper.java index 3897949064..0cdf234e4a 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/helpers/AppVersionHelper.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/helpers/AppVersionHelper.java @@ -1,9 +1,9 @@ /* - * Copyright (C) 2017 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundatibehaon, either version 3 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/helpers/AttachmentsHelper.java b/omniNotes/src/main/java/it/feio/android/omninotes/helpers/AttachmentsHelper.java index 47a79d733f..5fb2020777 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/helpers/AttachmentsHelper.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/helpers/AttachmentsHelper.java @@ -1,9 +1,9 @@ /* - * Copyright (C) 2016 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundatibehaon, either version 3 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/helpers/LanguageHelper.java b/omniNotes/src/main/java/it/feio/android/omninotes/helpers/LanguageHelper.java index 095a1619a5..195382a328 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/helpers/LanguageHelper.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/helpers/LanguageHelper.java @@ -1,9 +1,9 @@ /* - * Copyright (C) 2017 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundatibehaon, either version 3 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -22,37 +22,51 @@ import android.content.Context; import android.content.SharedPreferences; import android.content.res.Configuration; -import android.content.res.Resources; import android.os.Build; import android.support.annotation.NonNull; -import android.support.multidex.MultiDexApplication; import android.text.TextUtils; import it.feio.android.omninotes.utils.Constants; import java.util.Locale; +import static android.content.Context.MODE_MULTI_PROCESS; -public class LanguageHelper extends MultiDexApplication { + +public class LanguageHelper { /** * Updates default language with forced one */ - @SuppressLint("CommitPrefEdits") - public static void updateLanguage(Context ctx, String lang) { - Configuration cfg = new Configuration(); + @SuppressLint("ApplySharedPref") + public static Context updateLanguage(Context ctx, String lang) { SharedPreferences prefs = ctx.getSharedPreferences(Constants.PREFS_NAME, MODE_MULTI_PROCESS); String language = prefs.getString(Constants.PREF_LANG, ""); + Locale locale = null; if (TextUtils.isEmpty(language) && lang == null) { - cfg.locale = Locale.getDefault(); - prefs.edit().putString(Constants.PREF_LANG, cfg.locale.toString()).commit(); + locale = Locale.getDefault(); + prefs.edit().putString(Constants.PREF_LANG, locale.toString()).commit(); } else if (lang != null) { - cfg.locale = getLocale(lang); + locale = getLocale(lang); prefs.edit().putString(Constants.PREF_LANG, lang).commit(); } else if (!TextUtils.isEmpty(language)) { - cfg.locale = getLocale(language); + locale = getLocale(language); + } + + return setLocale(ctx, locale); + } + + private static Context setLocale(Context context, Locale locale) { + Configuration configuration = context.getResources().getConfiguration(); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { + configuration.setLocale(locale); + context.createConfigurationContext(configuration); + + } else { + configuration.locale = locale; + context.getResources().updateConfiguration(configuration, context.getResources().getDisplayMetrics()); } - ctx.getResources().updateConfiguration(cfg, null); + return context; } /** diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/helpers/NotesHelper.java b/omniNotes/src/main/java/it/feio/android/omninotes/helpers/NotesHelper.java index 416b5b5683..acb3d1efce 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/helpers/NotesHelper.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/helpers/NotesHelper.java @@ -1,16 +1,36 @@ +/* + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package it.feio.android.omninotes.helpers; -import android.text.TextUtils; import it.feio.android.omninotes.OmniNotes; import it.feio.android.omninotes.models.Attachment; import it.feio.android.omninotes.models.Category; import it.feio.android.omninotes.models.Note; +import it.feio.android.omninotes.models.StatsSingleNote; import it.feio.android.omninotes.utils.Constants; import it.feio.android.omninotes.utils.StorageHelper; +import it.feio.android.omninotes.utils.TagsHelper; import org.apache.commons.lang.ObjectUtils; +import org.apache.commons.lang.StringUtils; import java.util.ArrayList; import java.util.List; +import java.util.regex.Pattern; public class NotesHelper { @@ -22,20 +42,20 @@ public static boolean haveSameId(Note note, Note currentNote) { } - public static StringBuilder appendContent(Note note, StringBuilder content) { + public static StringBuilder appendContent(Note note, StringBuilder content, boolean includeTitle) { if (content.length() > 0 - && (!TextUtils.isEmpty(note.getTitle()) || !TextUtils.isEmpty(note.getContent()))) { + && (!StringUtils.isEmpty(note.getTitle()) || !StringUtils.isEmpty(note.getContent()))) { content.append(System.getProperty("line.separator")).append(System.getProperty("line.separator")) .append(Constants.MERGED_NOTES_SEPARATOR).append(System.getProperty("line.separator")) .append(System.getProperty("line.separator")); } - if (!TextUtils.isEmpty(note.getTitle())) { + if (includeTitle && !StringUtils.isEmpty(note.getTitle())) { content.append(note.getTitle()); } - if (!TextUtils.isEmpty(note.getTitle()) && !TextUtils.isEmpty(note.getContent())) { + if (!StringUtils.isEmpty(note.getTitle()) && !StringUtils.isEmpty(note.getContent())) { content.append(System.getProperty("line.separator")).append(System.getProperty("line.separator")); } - if (!TextUtils.isEmpty(note.getContent())) { + if (!StringUtils.isEmpty(note.getContent())) { content.append(note.getContent()); } return content; @@ -63,19 +83,22 @@ public static Note mergeNotes(List notes, boolean keepMergedNotes) { Note mergedNote = new Note(); mergedNote.setTitle(notes.get(0).getTitle()); StringBuilder content = new StringBuilder(); + // Just first note title must not be included into the content + boolean includeTitle = false; for (Note note : notes) { - appendContent(note, content); + appendContent(note, content, includeTitle); locked = locked || note.isLocked(); category = (Category) ObjectUtils.defaultIfNull(category, note.getCategory()); String currentReminder = note.getAlarm(); - if (!TextUtils.isEmpty(currentReminder) && reminder == null) { + if (!StringUtils.isEmpty(currentReminder) && reminder == null) { reminder = currentReminder; reminderRecurrenceRule = note.getRecurrenceRule(); } latitude = (Double) ObjectUtils.defaultIfNull(latitude, note.getLatitude()); longitude = (Double) ObjectUtils.defaultIfNull(longitude, note.getLongitude()); addAttachments(keepMergedNotes, note, attachments); + includeTitle = true; } mergedNote.setContent(content.toString()); @@ -90,4 +113,98 @@ public static Note mergeNotes(List notes, boolean keepMergedNotes) { return mergedNote; } + /** + * Retrieves statistics data for a single note + */ + public static StatsSingleNote getNoteInfos(Note note) { + StatsSingleNote infos = new StatsSingleNote(); + + int words, chars; + if (note.isChecklist()) { + infos.setChecklistCompletedItemsNumber(StringUtils.countMatches(note.getContent(), it.feio.android.checklistview + .interfaces.Constants.CHECKED_SYM)); + infos.setChecklistItemsNumber(infos.getChecklistCompletedItemsNumber() + + StringUtils.countMatches(note.getContent(), it.feio.android.checklistview.interfaces.Constants.UNCHECKED_SYM)); + } + infos.setTags(TagsHelper.retrieveTags(note).size()); + words = getWords(note); + chars = getChars(note); + infos.setWords(words); + infos.setChars(chars); + + int attachmentsAll = 0, images = 0, videos = 0, audioRecordings = 0, sketches = 0, files = 0; + for (Attachment attachment : note.getAttachmentsList()) { + if (Constants.MIME_TYPE_IMAGE.equals(attachment.getMime_type())) { + images++; + } else if (Constants.MIME_TYPE_VIDEO.equals(attachment.getMime_type())) { + videos++; + } else if (Constants.MIME_TYPE_AUDIO.equals(attachment.getMime_type())) { + audioRecordings++; + } else if (Constants.MIME_TYPE_SKETCH.equals(attachment.getMime_type())) { + sketches++; + } else if (Constants.MIME_TYPE_FILES.equals(attachment.getMime_type())) { + files++; + } + } + infos.setAttachments(attachmentsAll); + infos.setImages(images); + infos.setVideos(videos); + infos.setAudioRecordings(audioRecordings); + infos.setSketches(sketches); + infos.setFiles(files); + + if (note.getCategory() != null) { + infos.setCategoryName(note.getCategory().getName()); + } + + return infos; + } + + /** + * Counts words in a note + */ + public static int getWords(Note note) { + int count = 0; + String[] fields = {note.getTitle(), note.getContent()}; + for (String field : fields) { + field = sanitizeTextForWordsAndCharsCount(note, field); + boolean word = false; + int endOfLine = field.length() - 1; + for (int i = 0; i < field.length(); i++) { + // if the char is a letter, word = true. + if (Character.isLetter(field.charAt(i)) && i != endOfLine) { + word = true; + // if char isn't a letter and there have been letters before, + // counter goes up. + } else if (!Character.isLetter(field.charAt(i)) && word) { + count++; + word = false; + // last word of String; if it doesn't end with a non letter, it + // wouldn't count without this. + } else if (Character.isLetter(field.charAt(i)) && i == endOfLine) { + count++; + } + } + } + return count; + } + + private static String sanitizeTextForWordsAndCharsCount(Note note, String field) { + if (note.isChecklist()) { + String regex = "(" + Pattern.quote(it.feio.android.checklistview.interfaces.Constants.CHECKED_SYM) + "|" + + Pattern.quote(it.feio.android.checklistview.interfaces.Constants.UNCHECKED_SYM) + ")"; + field = field.replaceAll(regex, ""); + } + return field; + } + + /** + * Counts chars in a note + */ + public static int getChars(Note note) { + int count = sanitizeTextForWordsAndCharsCount(note, note.getTitle()).length(); + count += sanitizeTextForWordsAndCharsCount(note, note.getContent()).length(); + return count; + } + } diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/helpers/PermissionsHelper.java b/omniNotes/src/main/java/it/feio/android/omninotes/helpers/PermissionsHelper.java index 3d839f226c..1ca372f7ac 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/helpers/PermissionsHelper.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/helpers/PermissionsHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -64,4 +64,4 @@ private static void requestPermissionExecute(Activity activity, String permissio } }); } -} \ No newline at end of file +} diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/helpers/date/DateHelper.java b/omniNotes/src/main/java/it/feio/android/omninotes/helpers/date/DateHelper.java index 53f5d45e4b..6ad819b003 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/helpers/date/DateHelper.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/helpers/date/DateHelper.java @@ -1,9 +1,9 @@ /* - * Copyright (C) 2016 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundatibehaon, either version 3 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -91,17 +91,9 @@ public static String onTimeSet(int hour, int minute, String format) { * @return */ public static String getDateTimeShort(Context mContext, Long date) { - if (date == null) - return ""; - - Calendar now = Calendar.getInstance(); - Calendar c = Calendar.getInstance(); - c.setTimeInMillis(date); - - int flags = DateUtils.FORMAT_ABBREV_MONTH; - if (c.get(Calendar.YEAR) != now.get(Calendar.YEAR)) - flags = flags | DateUtils.FORMAT_SHOW_YEAR; - return DateUtils.formatDateTime(mContext, date, flags) + int flags = DateUtils.FORMAT_ABBREV_WEEKDAY | DateUtils.FORMAT_SHOW_WEEKDAY + | DateUtils.FORMAT_ABBREV_MONTH | DateUtils.FORMAT_SHOW_DATE; + return (date == null) ? "" : DateUtils.formatDateTime(mContext, date, flags) + " " + DateUtils.formatDateTime(mContext, date, DateUtils.FORMAT_SHOW_TIME); } diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/intro/IntroActivity.java b/omniNotes/src/main/java/it/feio/android/omninotes/intro/IntroActivity.java index 7a5d35844a..9eaee65572 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/intro/IntroActivity.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/intro/IntroActivity.java @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package it.feio.android.omninotes.intro; import android.content.Context; @@ -38,4 +55,4 @@ public static boolean mustRun() { public void onBackPressed() { // Does nothing, you HAVE TO SEE THE INTRO! } -} \ No newline at end of file +} diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/intro/IntroFragment.java b/omniNotes/src/main/java/it/feio/android/omninotes/intro/IntroFragment.java index baee23efbd..7d7e64a5da 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/intro/IntroFragment.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/intro/IntroFragment.java @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package it.feio.android.omninotes.intro; import android.os.Bundle; @@ -37,4 +54,4 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa ButterKnife.bind(this, v); return v; } -} \ No newline at end of file +} diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/intro/IntroSlide1.java b/omniNotes/src/main/java/it/feio/android/omninotes/intro/IntroSlide1.java index 491a712a1e..46be4a5adf 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/intro/IntroSlide1.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/intro/IntroSlide1.java @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package it.feio.android.omninotes.intro; import android.graphics.Color; @@ -18,4 +35,4 @@ public void onActivityCreated(Bundle savedInstanceState) { image_small.setVisibility(View.VISIBLE); description.setText(R.string.tour_listactivity_final_detail); } -} \ No newline at end of file +} diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/intro/IntroSlide2.java b/omniNotes/src/main/java/it/feio/android/omninotes/intro/IntroSlide2.java index 7b334d65b4..454aa47fae 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/intro/IntroSlide2.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/intro/IntroSlide2.java @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package it.feio.android.omninotes.intro; import android.graphics.Color; @@ -15,4 +32,4 @@ public void onActivityCreated(Bundle savedInstanceState) { image.setImageResource(R.drawable.slide2); description.setText(R.string.tour_listactivity_home_detail); } -} \ No newline at end of file +} diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/intro/IntroSlide3.java b/omniNotes/src/main/java/it/feio/android/omninotes/intro/IntroSlide3.java index 6392efc8d7..cc14833a80 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/intro/IntroSlide3.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/intro/IntroSlide3.java @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package it.feio.android.omninotes.intro; import android.graphics.Color; @@ -15,4 +32,4 @@ public void onActivityCreated(Bundle savedInstanceState) { image.setImageResource(R.drawable.slide3); description.setText(R.string.tour_listactivity_tag_detail); } -} \ No newline at end of file +} diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/intro/IntroSlide4.java b/omniNotes/src/main/java/it/feio/android/omninotes/intro/IntroSlide4.java index 0e13ea6d59..521462fa6d 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/intro/IntroSlide4.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/intro/IntroSlide4.java @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package it.feio.android.omninotes.intro; import android.graphics.Color; @@ -15,4 +32,4 @@ public void onActivityCreated(Bundle savedInstanceState) { image.setImageResource(R.drawable.slide4); description.setText(R.string.tour_detailactivity_attachment_detail); } -} \ No newline at end of file +} diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/intro/IntroSlide5.java b/omniNotes/src/main/java/it/feio/android/omninotes/intro/IntroSlide5.java index 9c39f1a72e..6298a0d57f 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/intro/IntroSlide5.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/intro/IntroSlide5.java @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package it.feio.android.omninotes.intro; import android.graphics.Color; @@ -15,4 +32,4 @@ public void onActivityCreated(Bundle savedInstanceState) { image.setImageResource(R.drawable.slide5); description.setText(R.string.tour_detailactivity_links_detail); } -} \ No newline at end of file +} diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/intro/IntroSlide6.java b/omniNotes/src/main/java/it/feio/android/omninotes/intro/IntroSlide6.java index 6f336b9219..9b472b660a 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/intro/IntroSlide6.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/intro/IntroSlide6.java @@ -1,28 +1,77 @@ +/* + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package it.feio.android.omninotes.intro; import android.content.Intent; import android.graphics.Color; import android.net.Uri; import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; +import butterknife.BindView; +import butterknife.ButterKnife; import it.feio.android.omninotes.R; +import it.feio.android.omninotes.utils.Constants; + + +public class IntroSlide6 extends Fragment { + + @BindView(R.id.intro_background) + View background; + + @BindView(R.id.intro_title) + TextView title; + + @BindView(R.id.intro_image_community_googleplus) + ImageView image_gplus; + @BindView(R.id.intro_image_community_facebook) + ImageView image_facebook; -public class IntroSlide6 extends IntroFragment { + @BindView(R.id.intro_description) + TextView description; + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + View v = inflater.inflate(R.layout.intro_slide_communities, container, false); + ButterKnife.bind(this, v); + return v; + } @Override public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); background.setBackgroundColor(Color.parseColor("#222222")); title.setText(R.string.tour_listactivity_final_title); - image.setVisibility(View.GONE); - image_small.setImageResource(R.drawable.gplus); - image_small.setVisibility(View.VISIBLE); - image_small.setOnClickListener(v -> { + image_gplus.setOnClickListener(v -> { + Intent intent = new Intent(Intent.ACTION_VIEW); + intent.setData(Uri.parse(Constants.GOOGLE_PLUS_COMMUNITY)); + startActivity(intent); + }); + image_facebook.setOnClickListener(v -> { Intent intent = new Intent(Intent.ACTION_VIEW); - intent.setData(Uri.parse(getString(R.string.gplus_community))); + intent.setData(Uri.parse(Constants.FACEBOOK_COMMUNITY)); startActivity(intent); }); description.setText(R.string.tour_community); } -} \ No newline at end of file +} diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/models/Attachment.java b/omniNotes/src/main/java/it/feio/android/omninotes/models/Attachment.java index 4ef9d7b9af..f376a77202 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/models/Attachment.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/models/Attachment.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/models/Category.java b/omniNotes/src/main/java/it/feio/android/omninotes/models/Category.java index f7e6d75331..02be0f5a9b 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/models/Category.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/models/Category.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/models/NavigationItem.java b/omniNotes/src/main/java/it/feio/android/omninotes/models/NavigationItem.java index ab56187bec..0f27b80ad1 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/models/NavigationItem.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/models/NavigationItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/models/Note.java b/omniNotes/src/main/java/it/feio/android/omninotes/models/Note.java index 6042f46944..46c2df4304 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/models/Note.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/models/Note.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/models/ONStyle.java b/omniNotes/src/main/java/it/feio/android/omninotes/models/ONStyle.java index 776e6b89c4..ed1c36d6c7 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/models/ONStyle.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/models/ONStyle.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -78,4 +78,4 @@ public class ONStyle { .setConfiguration(CONFIGURATION) .build(); } -} \ No newline at end of file +} diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/models/PasswordValidator.java b/omniNotes/src/main/java/it/feio/android/omninotes/models/PasswordValidator.java index b9f46e9456..abcdc37628 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/models/PasswordValidator.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/models/PasswordValidator.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,5 +19,5 @@ public interface PasswordValidator { - public void onPasswordValidated(boolean passwordConfirmed); + void onPasswordValidated(boolean passwordConfirmed); } diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/models/PushBulletMessage.java b/omniNotes/src/main/java/it/feio/android/omninotes/models/PushBulletMessage.java index cd0b263321..6b530da5e9 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/models/PushBulletMessage.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/models/PushBulletMessage.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,4 +25,4 @@ public class PushBulletMessage { public PushBulletMessage(final String message) { this.message = message; } -} \ No newline at end of file +} diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/models/Stats.java b/omniNotes/src/main/java/it/feio/android/omninotes/models/Stats.java index d009919043..2fdc071d03 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/models/Stats.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/models/Stats.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,33 +17,24 @@ package it.feio.android.omninotes.models; -public class Stats { - - int notesActive; - int notesArchived; - int notesTrashed; - int reminders; - int remindersFutures; - int notesChecklist; - int notesMasked; - int categories; - int tags; - - int attachments; - int images; - int videos; - int audioRecordings; - int sketches; - int files; - int location; - - int words; - int wordsMax; - int wordsAvg; - int chars; - int charsMax; - int charsAvg; - long usageTime; +public class Stats extends StatsSingleNote { + + private int notesActive; + private int notesArchived; + private int notesTrashed; + private int reminders; + private int remindersFutures; + private int notesChecklist; + private int notesMasked; + private int categories; + + private int location; + + private int wordsMax; + private int wordsAvg; + private int charsMax; + private int charsAvg; + private long usageTime; public int getNotesTotalNumber() { @@ -201,72 +192,12 @@ public void setCharsAvg(int charsAvg) { } - public int getAttachments() { - return attachments; - } - - - public void setAttachments(int attachments) { - this.attachments = attachments; - } - - - public int getImages() { - return images; - } - - - public void setImages(int images) { - this.images = images; - } - - - public int getVideos() { - return videos; - } - - - public void setVideos(int videos) { - this.videos = videos; - } - - - public int getAudioRecordings() { - return audioRecordings; - } - - - public void setAudioRecordings(int audioRecordings) { - this.audioRecordings = audioRecordings; - } - - - public int getSketches() { - return sketches; - } - - - public void setSketches(int sketches) { - this.sketches = sketches; - } - - - public int getFiles() { - return files; - } - - - public void setFiles(int files) { - this.files = files; - } - - - public int getLocation() { - return location; - } + public int getLocation() { + return location; + } - public void setLocation(int location) { + public void setLocation(int location) { this.location = location; } diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/models/StatsSingleNote.java b/omniNotes/src/main/java/it/feio/android/omninotes/models/StatsSingleNote.java new file mode 100644 index 0000000000..a094f1dec2 --- /dev/null +++ b/omniNotes/src/main/java/it/feio/android/omninotes/models/StatsSingleNote.java @@ -0,0 +1,133 @@ + +/* + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package it.feio.android.omninotes.models; + +public class StatsSingleNote { + + protected int tags; + protected int attachments; + protected int images; + protected int videos; + protected int audioRecordings; + protected int sketches; + protected int files; + protected String categoryName; + + protected int words; + protected int chars; + + protected int checklistItemsNumber; + protected int checklistCompletedItemsNumber; + + public int getTags() { + return tags; + } + + public void setTags(int tags) { + this.tags = tags; + } + + public int getWords() { + return words; + } + + public void setWords(int words) { + this.words = words; + } + + public int getChars() { + return chars; + } + + public void setChars(int chars) { + this.chars = chars; + } + + public int getAttachments() { + return attachments; + } + + public void setAttachments(int attachments) { + this.attachments = attachments; + } + + public int getImages() { + return images; + } + + public void setImages(int images) { + this.images = images; + } + + public int getVideos() { + return videos; + } + + public void setVideos(int videos) { + this.videos = videos; + } + + public int getAudioRecordings() { + return audioRecordings; + } + + public void setAudioRecordings(int audioRecordings) { + this.audioRecordings = audioRecordings; + } + + public int getSketches() { + return sketches; + } + + public void setSketches(int sketches) { + this.sketches = sketches; + } + + public int getFiles() { + return files; + } + + public void setFiles(int files) { + this.files = files; + } + + public String getCategoryName() { + return categoryName; + } + + public void setCategoryName(String categoryName) { + this.categoryName = categoryName; + } + + public int getChecklistItemsNumber() { + return checklistItemsNumber; + } + + public void setChecklistItemsNumber(int checklistItemsNumber) { + this.checklistItemsNumber = checklistItemsNumber; + } + + public int getChecklistCompletedItemsNumber() { + return checklistCompletedItemsNumber; + } + + public void setChecklistCompletedItemsNumber(int checklistCompletedItemsNumber) { + this.checklistCompletedItemsNumber = checklistCompletedItemsNumber; + } +} diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/models/Tag.java b/omniNotes/src/main/java/it/feio/android/omninotes/models/Tag.java index 6c88bf306c..a37c5aa516 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/models/Tag.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/models/Tag.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/models/ThumbnailLruCache.java b/omniNotes/src/main/java/it/feio/android/omninotes/models/ThumbnailLruCache.java index 41494e4d56..48a955535a 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/models/ThumbnailLruCache.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/models/ThumbnailLruCache.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/models/UndoBarController.java b/omniNotes/src/main/java/it/feio/android/omninotes/models/UndoBarController.java index 7d2bc124bb..ca395c18fa 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/models/UndoBarController.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/models/UndoBarController.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/models/adapters/AttachmentAdapter.java b/omniNotes/src/main/java/it/feio/android/omninotes/models/adapters/AttachmentAdapter.java index 1128973aff..4e6e2519b2 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/models/adapters/AttachmentAdapter.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/models/adapters/AttachmentAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/models/adapters/ImageAndTextAdapter.java b/omniNotes/src/main/java/it/feio/android/omninotes/models/adapters/ImageAndTextAdapter.java index 1b79e7c26f..5cfbee939b 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/models/adapters/ImageAndTextAdapter.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/models/adapters/ImageAndTextAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/models/adapters/NavDrawerAdapter.java b/omniNotes/src/main/java/it/feio/android/omninotes/models/adapters/NavDrawerAdapter.java index f5dfb5cf70..e31096709b 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/models/adapters/NavDrawerAdapter.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/models/adapters/NavDrawerAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/models/adapters/NavDrawerCategoryAdapter.java b/omniNotes/src/main/java/it/feio/android/omninotes/models/adapters/NavDrawerCategoryAdapter.java index ceea7bea5d..14e87e699c 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/models/adapters/NavDrawerCategoryAdapter.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/models/adapters/NavDrawerCategoryAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/models/adapters/NoteAdapter.java b/omniNotes/src/main/java/it/feio/android/omninotes/models/adapters/NoteAdapter.java index ab560eca97..228e11d42b 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/models/adapters/NoteAdapter.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/models/adapters/NoteAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/models/adapters/PlacesAutoCompleteAdapter.java b/omniNotes/src/main/java/it/feio/android/omninotes/models/adapters/PlacesAutoCompleteAdapter.java index 20c0990989..61fed5116c 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/models/adapters/PlacesAutoCompleteAdapter.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/models/adapters/PlacesAutoCompleteAdapter.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -77,4 +77,4 @@ protected void publishResults(CharSequence constraint, FilterResults results) { } }; } -} \ No newline at end of file +} diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/models/holders/ImageAndTextItem.java b/omniNotes/src/main/java/it/feio/android/omninotes/models/holders/ImageAndTextItem.java index 4aa512e947..825b550dc1 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/models/holders/ImageAndTextItem.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/models/holders/ImageAndTextItem.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/models/holders/NoteViewHolder.java b/omniNotes/src/main/java/it/feio/android/omninotes/models/holders/NoteViewHolder.java index ffeeb2ada8..4de6ebe9bb 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/models/holders/NoteViewHolder.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/models/holders/NoteViewHolder.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -49,4 +49,4 @@ public NoteViewHolder(View view) { @BindView(R.id.lockedIcon) public ImageView lockedIcon; @Nullable @BindView(R.id.attachmentIcon) public ImageView attachmentIcon; @Nullable @BindView(R.id.attachmentThumbnail) public SquareImageView attachmentThumbnail; -} \ No newline at end of file +} diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/models/listeners/AbsListViewScrollDetector.java b/omniNotes/src/main/java/it/feio/android/omninotes/models/listeners/AbsListViewScrollDetector.java index 32878852de..c66d701294 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/models/listeners/AbsListViewScrollDetector.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/models/listeners/AbsListViewScrollDetector.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/models/listeners/OnAttachingFileListener.java b/omniNotes/src/main/java/it/feio/android/omninotes/models/listeners/OnAttachingFileListener.java index 1a136f35d4..da66c2bf5b 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/models/listeners/OnAttachingFileListener.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/models/listeners/OnAttachingFileListener.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/models/listeners/OnCABItemClickedListener.java b/omniNotes/src/main/java/it/feio/android/omninotes/models/listeners/OnCABItemClickedListener.java index f00076ccaa..8a077457bd 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/models/listeners/OnCABItemClickedListener.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/models/listeners/OnCABItemClickedListener.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/models/listeners/OnDrawChangedListener.java b/omniNotes/src/main/java/it/feio/android/omninotes/models/listeners/OnDrawChangedListener.java index f3a09e4f05..d266700696 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/models/listeners/OnDrawChangedListener.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/models/listeners/OnDrawChangedListener.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/models/listeners/OnFabItemClickedListener.java b/omniNotes/src/main/java/it/feio/android/omninotes/models/listeners/OnFabItemClickedListener.java index 2738e3b8b6..356f58c643 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/models/listeners/OnFabItemClickedListener.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/models/listeners/OnFabItemClickedListener.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/models/listeners/OnGeoUtilResultListener.java b/omniNotes/src/main/java/it/feio/android/omninotes/models/listeners/OnGeoUtilResultListener.java index e0b1602919..04d80373c9 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/models/listeners/OnGeoUtilResultListener.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/models/listeners/OnGeoUtilResultListener.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -30,4 +30,4 @@ public interface OnGeoUtilResultListener { public void onLocationRetrieved(Location location); public void onLocationUnavailable(); -} \ No newline at end of file +} diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/models/listeners/OnNoteSaved.java b/omniNotes/src/main/java/it/feio/android/omninotes/models/listeners/OnNoteSaved.java index 428086f8c0..90bf8c92b4 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/models/listeners/OnNoteSaved.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/models/listeners/OnNoteSaved.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/models/listeners/OnPermissionRequestedListener.java b/omniNotes/src/main/java/it/feio/android/omninotes/models/listeners/OnPermissionRequestedListener.java index 4da72d9733..72f37a5fb6 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/models/listeners/OnPermissionRequestedListener.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/models/listeners/OnPermissionRequestedListener.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/models/listeners/OnReminderPickedListener.java b/omniNotes/src/main/java/it/feio/android/omninotes/models/listeners/OnReminderPickedListener.java index 636361045b..348bf8bd87 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/models/listeners/OnReminderPickedListener.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/models/listeners/OnReminderPickedListener.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/models/listeners/OnViewTouchedListener.java b/omniNotes/src/main/java/it/feio/android/omninotes/models/listeners/OnViewTouchedListener.java index 7ee5b43151..a2a9007590 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/models/listeners/OnViewTouchedListener.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/models/listeners/OnViewTouchedListener.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/models/misc/DynamicNavigationLookupTable.java b/omniNotes/src/main/java/it/feio/android/omninotes/models/misc/DynamicNavigationLookupTable.java index 2d28f68248..1584a3c04c 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/models/misc/DynamicNavigationLookupTable.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/models/misc/DynamicNavigationLookupTable.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -94,4 +94,4 @@ public int getUncategorized() { return uncategorized; } -} \ No newline at end of file +} diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/models/misc/PlayStoreMetadataFetcherResult.java b/omniNotes/src/main/java/it/feio/android/omninotes/models/misc/PlayStoreMetadataFetcherResult.java index cd357c6f42..037808981b 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/models/misc/PlayStoreMetadataFetcherResult.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/models/misc/PlayStoreMetadataFetcherResult.java @@ -1,9 +1,9 @@ /* - * Copyright (C) 2017 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundatibehaon, either version 3 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/models/views/ExpandableHeightGridView.java b/omniNotes/src/main/java/it/feio/android/omninotes/models/views/ExpandableHeightGridView.java index 47463517c7..e407454a26 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/models/views/ExpandableHeightGridView.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/models/views/ExpandableHeightGridView.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/models/views/Fab.java b/omniNotes/src/main/java/it/feio/android/omninotes/models/views/Fab.java index 2f18498fa0..104258cdff 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/models/views/Fab.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/models/views/Fab.java @@ -1,24 +1,35 @@ +/* + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package it.feio.android.omninotes.models.views; -import android.os.Build; import android.support.v4.view.ViewPropertyAnimatorListener; import android.view.View; import android.view.ViewGroup; import android.view.animation.AccelerateDecelerateInterpolator; -import android.widget.FrameLayout; import android.widget.ListView; import android.widget.RelativeLayout; - import com.getbase.floatingactionbutton.AddFloatingActionButton; import com.getbase.floatingactionbutton.FloatingActionsMenu; - -import it.feio.android.checklistview.utils.DensityUtil; import it.feio.android.omninotes.OmniNotes; import it.feio.android.omninotes.R; import it.feio.android.omninotes.models.listeners.AbsListViewScrollDetector; import it.feio.android.omninotes.models.listeners.OnFabItemClickedListener; import it.feio.android.omninotes.utils.Constants; -import it.feio.android.omninotes.utils.Display; import static android.support.v4.view.ViewCompat.animate; @@ -89,14 +100,6 @@ public void onScrollDown() { noteBtn.setOnClickListener(onClickListener); } - // In KitKat bottom padding is added by navbar height - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { - int navBarHeight = Display.getNavigationBarHeightKitkat(OmniNotes.getAppContext()); - FrameLayout.LayoutParams params = (FrameLayout.LayoutParams) fab.getLayoutParams(); - params.setMargins(params.leftMargin, params.topMargin, params.rightMargin, - navBarHeight + DensityUtil.pxToDp(params.bottomMargin, OmniNotes.getAppContext())); - fab.setLayoutParams(params); - } } @@ -110,7 +113,6 @@ public void onClick(View v) { public void performToggle() { fabExpanded = !fabExpanded; fab.toggle(); - toggleOverlay(); } @@ -148,7 +150,6 @@ public void hideFab() { animateFab(fab.getHeight() + getMarginBottom(fab), View.VISIBLE, View.INVISIBLE); fabHidden = true; fabExpanded = false; - toggleOverlay(); } } diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/models/views/InterceptorFrameLayout.java b/omniNotes/src/main/java/it/feio/android/omninotes/models/views/InterceptorFrameLayout.java index 3b46cacc1a..125893b7bb 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/models/views/InterceptorFrameLayout.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/models/views/InterceptorFrameLayout.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/models/views/InterceptorLinearLayout.java b/omniNotes/src/main/java/it/feio/android/omninotes/models/views/InterceptorLinearLayout.java index 1c19b867d0..5473546e1b 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/models/views/InterceptorLinearLayout.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/models/views/InterceptorLinearLayout.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/models/views/NonScrollableListView.java b/omniNotes/src/main/java/it/feio/android/omninotes/models/views/NonScrollableListView.java index eb20901035..e9b47a0504 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/models/views/NonScrollableListView.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/models/views/NonScrollableListView.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/models/views/SketchView.java b/omniNotes/src/main/java/it/feio/android/omninotes/models/views/SketchView.java index c67bc3fb3a..1d9e0ccec7 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/models/views/SketchView.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/models/views/SketchView.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -310,4 +310,4 @@ public void erase() { public void setOnDrawChangedListener(OnDrawChangedListener listener) { this.onDrawChangedListener = listener; } -} \ No newline at end of file +} diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/models/views/SquareImageView.java b/omniNotes/src/main/java/it/feio/android/omninotes/models/views/SquareImageView.java index 15c3564c1e..aec0431b55 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/models/views/SquareImageView.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/models/views/SquareImageView.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -65,4 +65,4 @@ public void setAsyncTask(AsyncTask mAsyncTask) { return null; } } -} \ No newline at end of file +} diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/models/views/VerticalSeekBar.java b/omniNotes/src/main/java/it/feio/android/omninotes/models/views/VerticalSeekBar.java index 3d75819cc9..a0fc1a5ccd 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/models/views/VerticalSeekBar.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/models/views/VerticalSeekBar.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -125,4 +125,4 @@ public synchronized void setProgress(int progress) { if (changeListener != null) changeListener.onProgressChanged(this, progress, false); } -} \ No newline at end of file +} diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/receiver/AlarmReceiver.java b/omniNotes/src/main/java/it/feio/android/omninotes/receiver/AlarmReceiver.java index 7b0bd9d350..f97e850e1b 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/receiver/AlarmReceiver.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/receiver/AlarmReceiver.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/receiver/BootCompleteReceiver.java b/omniNotes/src/main/java/it/feio/android/omninotes/receiver/BootCompleteReceiver.java index c1bfb9c71c..4183b7ea66 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/receiver/BootCompleteReceiver.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/receiver/BootCompleteReceiver.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/services/NotificationListener.java b/omniNotes/src/main/java/it/feio/android/omninotes/services/NotificationListener.java index 1d1f2960c0..75d9e61484 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/services/NotificationListener.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/services/NotificationListener.java @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package it.feio.android.omninotes.services; import android.annotation.TargetApi; @@ -67,4 +84,4 @@ public static boolean isRunning() { .class.getSimpleName()); } -} \ No newline at end of file +} diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/utils/AlphaManager.java b/omniNotes/src/main/java/it/feio/android/omninotes/utils/AlphaManager.java index 6af3e3fabb..4aa0a52319 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/utils/AlphaManager.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/utils/AlphaManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/utils/AnimationsHelper.java b/omniNotes/src/main/java/it/feio/android/omninotes/utils/AnimationsHelper.java index cda0f51801..648e0b0432 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/utils/AnimationsHelper.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/utils/AnimationsHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/utils/AssetUtils.java b/omniNotes/src/main/java/it/feio/android/omninotes/utils/AssetUtils.java index 9ea1066171..a4f18aa3fc 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/utils/AssetUtils.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/utils/AssetUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/utils/BitmapHelper.java b/omniNotes/src/main/java/it/feio/android/omninotes/utils/BitmapHelper.java index a638fdab2b..87888716ba 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/utils/BitmapHelper.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/utils/BitmapHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/utils/ColorsUtil.java b/omniNotes/src/main/java/it/feio/android/omninotes/utils/ColorsUtil.java index 7d1e51b562..ee993e9813 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/utils/ColorsUtil.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/utils/ColorsUtil.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/utils/ConnectionManager.java b/omniNotes/src/main/java/it/feio/android/omninotes/utils/ConnectionManager.java index 64c4dadd17..d7cbc4d48a 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/utils/ConnectionManager.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/utils/ConnectionManager.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/utils/ConstantsBase.java b/omniNotes/src/main/java/it/feio/android/omninotes/utils/ConstantsBase.java index ecf7fc8c85..111c116582 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/utils/ConstantsBase.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/utils/ConstantsBase.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,6 +22,8 @@ public interface ConstantsBase { String APP_STORAGE_DIRECTORY_SB_SYNC = "db_sync"; String DEV_EMAIL = "omninotes@iosue.it"; + String GOOGLE_PLUS_COMMUNITY = "https://plus.google.com/communities/112276053772152071903"; + String FACEBOOK_COMMUNITY = "https://www.facebook.com/OmniNotes/"; // Used for updates retrieval long UPDATE_MIN_FREQUENCY = 24L * 60L * 60L * 1000L; // 1 day @@ -71,6 +73,7 @@ public interface ConstantsBase { * Used to quickly add a note, save, and perform backPress (eg. Tasker+Pushbullet) * */ String ACTION_SEND_AND_EXIT = "action_send_and_exit"; + String ACTION_SEARCH_UNCOMPLETE_CHECKLISTS = "action_search_uncomplete_checklists"; String PREF_LANG = "settings_language"; String PREF_LAST_UPDATE_CHECK = "last_update_check"; diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/utils/Display.java b/omniNotes/src/main/java/it/feio/android/omninotes/utils/Display.java index aea1b63a61..70c76c1046 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/utils/Display.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/utils/Display.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/utils/FileHelper.java b/omniNotes/src/main/java/it/feio/android/omninotes/utils/FileHelper.java index a49d44f06c..e79c5ce30a 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/utils/FileHelper.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/utils/FileHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/utils/Fonts.java b/omniNotes/src/main/java/it/feio/android/omninotes/utils/Fonts.java index 4b02c3b3a5..a1190f3969 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/utils/Fonts.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/utils/Fonts.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/utils/GeocodeHelper.java b/omniNotes/src/main/java/it/feio/android/omninotes/utils/GeocodeHelper.java index 0d9f88edfb..7ddf66fca2 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/utils/GeocodeHelper.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/utils/GeocodeHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/utils/IntentChecker.java b/omniNotes/src/main/java/it/feio/android/omninotes/utils/IntentChecker.java index eab7fadbb5..4497f9b76b 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/utils/IntentChecker.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/utils/IntentChecker.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/utils/KeyboardUtils.java b/omniNotes/src/main/java/it/feio/android/omninotes/utils/KeyboardUtils.java index b37c8ee4bd..ba3d5de477 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/utils/KeyboardUtils.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/utils/KeyboardUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/utils/LoadingDialog.java b/omniNotes/src/main/java/it/feio/android/omninotes/utils/LoadingDialog.java index dddcb7cee4..7dab601e46 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/utils/LoadingDialog.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/utils/LoadingDialog.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/utils/Navigation.java b/omniNotes/src/main/java/it/feio/android/omninotes/utils/Navigation.java index cd0502c5f4..d63352e3e8 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/utils/Navigation.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/utils/Navigation.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/utils/NotificationsHelper.java b/omniNotes/src/main/java/it/feio/android/omninotes/utils/NotificationsHelper.java index 15002f0194..d7e1b1bfe4 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/utils/NotificationsHelper.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/utils/NotificationsHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/utils/ParcelableUtil.java b/omniNotes/src/main/java/it/feio/android/omninotes/utils/ParcelableUtil.java index aa3cb332b9..f15c797433 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/utils/ParcelableUtil.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/utils/ParcelableUtil.java @@ -1,9 +1,9 @@ /* - * Copyright (C) 2016 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundatibehaon, either version 3 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/utils/PasswordHelper.java b/omniNotes/src/main/java/it/feio/android/omninotes/utils/PasswordHelper.java index 1d56b535b0..73bbd62ffb 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/utils/PasswordHelper.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/utils/PasswordHelper.java @@ -1,9 +1,9 @@ /* - * Copyright (C) 2016 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundatibehaon, either version 3 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -22,7 +22,9 @@ import android.os.Handler; import android.view.LayoutInflater; import android.view.View; +import android.view.inputmethod.EditorInfo; import android.widget.EditText; +import com.afollestad.materialdialogs.DialogAction; import com.afollestad.materialdialogs.MaterialDialog; import de.greenrobot.event.EventBus; import it.feio.android.omninotes.OmniNotes; @@ -71,6 +73,7 @@ public static void requestPassword(final Activity mActivity, final PasswordValid .neutralText(mActivity.getResources().getString(R.string.password_forgot)) .onNeutral((dialog13, which) -> { PasswordHelper.resetPassword(mActivity); + mPasswordValidator.onPasswordValidated(false); dialog13.dismiss(); }) .build(); @@ -81,9 +84,16 @@ public static void requestPassword(final Activity mActivity, final PasswordValid mPasswordValidator.onPasswordValidated(false); }); + passwordEditText.setOnEditorActionListener((textView, actionId, keyEvent) -> { + if (actionId == EditorInfo.IME_ACTION_DONE) { + dialog.getActionButton(DialogAction.POSITIVE).callOnClick(); + return true; + } + return false; + }); + dialog.show(); - // Force focus and shows soft keyboard new Handler().postDelayed(() -> KeyboardUtils.showKeyboard(passwordEditText), 100); } @@ -92,25 +102,36 @@ public static void resetPassword(final Activity mActivity) { View layout = mActivity.getLayoutInflater().inflate(R.layout.password_reset_dialog_layout, null); final EditText answerEditText = (EditText) layout.findViewById(R.id.reset_password_answer); - new MaterialDialog.Builder(mActivity) + MaterialDialog dialog = new MaterialDialog.Builder(mActivity) .title(OmniNotes.getSharedPreferences().getString(Constants.PREF_PASSWORD_QUESTION, "")) .customView(layout, false) .autoDismiss(false) .contentColorRes(R.color.text_color) .positiveText(R.string.ok) - .onPositive((dialog, which) -> { + .onPositive((dialogElement, which) -> { // When positive button is pressed answer correctness is checked String oldAnswer = OmniNotes.getSharedPreferences().getString(Constants.PREF_PASSWORD_ANSWER, ""); String answer1 = answerEditText.getText().toString(); // The check is done on password's hash stored in preferences boolean result = Security.md5(answer1).equals(oldAnswer); if (result) { - dialog.dismiss(); + dialogElement.dismiss(); removePassword(); } else { answerEditText.setError(mActivity.getString(R.string.wrong_answer)); } - }).build().show(); + }).build(); + dialog.show(); + + answerEditText.setOnEditorActionListener((textView, actionId, keyEvent) -> { + if (actionId == EditorInfo.IME_ACTION_DONE) { + dialog.getActionButton(DialogAction.POSITIVE).callOnClick(); + return true; + } + return false; + }); + + new Handler().postDelayed(() -> KeyboardUtils.showKeyboard(answerEditText), 100); } diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/utils/ReminderHelper.java b/omniNotes/src/main/java/it/feio/android/omninotes/utils/ReminderHelper.java index 75c59cdbdf..b7170f960c 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/utils/ReminderHelper.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/utils/ReminderHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/utils/ResourcesUtils.java b/omniNotes/src/main/java/it/feio/android/omninotes/utils/ResourcesUtils.java index e9185a5a87..e71c034588 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/utils/ResourcesUtils.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/utils/ResourcesUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/utils/Security.java b/omniNotes/src/main/java/it/feio/android/omninotes/utils/Security.java index 8edc166c61..6c0ba217b4 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/utils/Security.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/utils/Security.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/utils/ShortcutHelper.java b/omniNotes/src/main/java/it/feio/android/omninotes/utils/ShortcutHelper.java index ea3b42e2b7..0249dbdee7 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/utils/ShortcutHelper.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/utils/ShortcutHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/utils/StorageHelper.java b/omniNotes/src/main/java/it/feio/android/omninotes/utils/StorageHelper.java index e42918b40d..652d83e38e 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/utils/StorageHelper.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/utils/StorageHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/utils/SystemHelper.java b/omniNotes/src/main/java/it/feio/android/omninotes/utils/SystemHelper.java index 6cf2835c82..9e9328e779 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/utils/SystemHelper.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/utils/SystemHelper.java @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + package it.feio.android.omninotes.utils; import android.content.Context; diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/utils/TagsHelper.java b/omniNotes/src/main/java/it/feio/android/omninotes/utils/TagsHelper.java index ab2b4fd0b8..ac68bb50f2 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/utils/TagsHelper.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/utils/TagsHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/utils/TextHelper.java b/omniNotes/src/main/java/it/feio/android/omninotes/utils/TextHelper.java index 158fcc18da..b111a1ba2f 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/utils/TextHelper.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/utils/TextHelper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/utils/date/DatePickerDialogFragment.java b/omniNotes/src/main/java/it/feio/android/omninotes/utils/date/DatePickerDialogFragment.java index d36473bf64..6ea6745021 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/utils/date/DatePickerDialogFragment.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/utils/date/DatePickerDialogFragment.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/utils/date/DateUtils.java b/omniNotes/src/main/java/it/feio/android/omninotes/utils/date/DateUtils.java index fba4f50a30..27af5dfced 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/utils/date/DateUtils.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/utils/date/DateUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/utils/date/ReminderPickers.java b/omniNotes/src/main/java/it/feio/android/omninotes/utils/date/ReminderPickers.java index 8e5eaf896e..f7256eefbc 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/utils/date/ReminderPickers.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/utils/date/ReminderPickers.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -177,4 +177,4 @@ public void onRecurrenceSet(final String rrule) { mOnReminderPickedListener.onRecurrenceReminderPicked(rrule); } } -} \ No newline at end of file +} diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/utils/date/TimePickerFragment.java b/omniNotes/src/main/java/it/feio/android/omninotes/utils/date/TimePickerFragment.java index d3c97e613b..13b9d37a28 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/utils/date/TimePickerFragment.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/utils/date/TimePickerFragment.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/widget/ListRemoteViewsFactory.java b/omniNotes/src/main/java/it/feio/android/omninotes/widget/ListRemoteViewsFactory.java index b6de33860c..9297d2ca6e 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/widget/ListRemoteViewsFactory.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/widget/ListRemoteViewsFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/widget/ListWidgetProvider.java b/omniNotes/src/main/java/it/feio/android/omninotes/widget/ListWidgetProvider.java index e210227f01..cb50cc489b 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/widget/ListWidgetProvider.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/widget/ListWidgetProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/widget/ListWidgetService.java b/omniNotes/src/main/java/it/feio/android/omninotes/widget/ListWidgetService.java index 0c249ad6b5..758106f5f9 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/widget/ListWidgetService.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/widget/ListWidgetService.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/widget/SimpleWidgetProvider.java b/omniNotes/src/main/java/it/feio/android/omninotes/widget/SimpleWidgetProvider.java index 78e91cc5af..7e5a4b5b27 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/widget/SimpleWidgetProvider.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/widget/SimpleWidgetProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -44,4 +44,4 @@ protected RemoteViews getRemoteViews(Context mContext, int widgetId, boolean isS } return views; } -} \ No newline at end of file +} diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/widget/WidgetConfigurationActivity.java b/omniNotes/src/main/java/it/feio/android/omninotes/widget/WidgetConfigurationActivity.java index 08e82bea4c..8b33119a81 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/widget/WidgetConfigurationActivity.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/widget/WidgetConfigurationActivity.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/java/it/feio/android/omninotes/widget/WidgetProvider.java b/omniNotes/src/main/java/it/feio/android/omninotes/widget/WidgetProvider.java index 108101e1d4..0475ef5b2a 100644 --- a/omniNotes/src/main/java/it/feio/android/omninotes/widget/WidgetProvider.java +++ b/omniNotes/src/main/java/it/feio/android/omninotes/widget/WidgetProvider.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Federico Iosue (federico.iosue@gmail.com) + * Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/omniNotes/src/main/res/anim/anim_in.xml b/omniNotes/src/main/res/anim/anim_in.xml index 3e5c33108d..0117074b72 100644 --- a/omniNotes/src/main/res/anim/anim_in.xml +++ b/omniNotes/src/main/res/anim/anim_in.xml @@ -1,6 +1,6 @@ + - \ No newline at end of file + diff --git a/omniNotes/src/main/res/drawable/circle.xml b/omniNotes/src/main/res/drawable/circle.xml index 0fbf0bf911..2d78ced982 100644 --- a/omniNotes/src/main/res/drawable/circle.xml +++ b/omniNotes/src/main/res/drawable/circle.xml @@ -1,6 +1,6 @@ + - \ No newline at end of file + diff --git a/omniNotes/src/main/res/values-land-v19/dimens.xml b/omniNotes/src/main/res/drawable/ic_access_time_black_24px.xml similarity index 51% rename from omniNotes/src/main/res/values-land-v19/dimens.xml rename to omniNotes/src/main/res/drawable/ic_access_time_black_24px.xml index a6bf433909..06fe2a8647 100644 --- a/omniNotes/src/main/res/values-land-v19/dimens.xml +++ b/omniNotes/src/main/res/drawable/ic_access_time_black_24px.xml @@ -1,5 +1,5 @@ - - 25dp - 0dp - 10dp - - \ No newline at end of file + + + + diff --git a/omniNotes/src/main/res/drawable/icon_selector.xml b/omniNotes/src/main/res/drawable/icon_selector.xml index 60601d8db7..fa21bbb9f5 100644 --- a/omniNotes/src/main/res/drawable/icon_selector.xml +++ b/omniNotes/src/main/res/drawable/icon_selector.xml @@ -1,5 +1,5 @@ > - \ No newline at end of file + diff --git a/omniNotes/src/main/res/drawable/list_selector_pressed.xml b/omniNotes/src/main/res/drawable/list_selector_pressed.xml index 2203dd5fad..7faddee9f3 100644 --- a/omniNotes/src/main/res/drawable/list_selector_pressed.xml +++ b/omniNotes/src/main/res/drawable/list_selector_pressed.xml @@ -1,5 +1,5 @@ > - \ No newline at end of file + diff --git a/omniNotes/src/main/res/drawable/note_selector.xml b/omniNotes/src/main/res/drawable/note_selector.xml index 8eeea8e2ef..92a4a4d99d 100644 --- a/omniNotes/src/main/res/drawable/note_selector.xml +++ b/omniNotes/src/main/res/drawable/note_selector.xml @@ -1,6 +1,6 @@ - \ No newline at end of file + diff --git a/omniNotes/src/main/res/drawable/square.xml b/omniNotes/src/main/res/drawable/square.xml index 5b29c17da2..83e56778c4 100644 --- a/omniNotes/src/main/res/drawable/square.xml +++ b/omniNotes/src/main/res/drawable/square.xml @@ -1,6 +1,6 @@ + \ No newline at end of file + android:textAppearance="?android:attr/textAppearanceListItemSmall" /> diff --git a/omniNotes/src/main/res/layout/activity_about.xml b/omniNotes/src/main/res/layout/activity_about.xml index 76333c3094..d7c8b8d84a 100644 --- a/omniNotes/src/main/res/layout/activity_about.xml +++ b/omniNotes/src/main/res/layout/activity_about.xml @@ -1,6 +1,6 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/omniNotes/src/main/res/layout/activity_password.xml b/omniNotes/src/main/res/layout/activity_password.xml index c1712c1355..7d5389a3fc 100644 --- a/omniNotes/src/main/res/layout/activity_password.xml +++ b/omniNotes/src/main/res/layout/activity_password.xml @@ -1,5 +1,5 @@ + - \ No newline at end of file + diff --git a/omniNotes/src/main/res/layout/activity_stats.xml b/omniNotes/src/main/res/layout/activity_stats.xml index 2fcde673ad..22d960db9d 100644 --- a/omniNotes/src/main/res/layout/activity_stats.xml +++ b/omniNotes/src/main/res/layout/activity_stats.xml @@ -1,6 +1,6 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/omniNotes/src/main/res/layout/activity_widget_configuration.xml b/omniNotes/src/main/res/layout/activity_widget_configuration.xml index aa6c35ab66..2fa81ae501 100644 --- a/omniNotes/src/main/res/layout/activity_widget_configuration.xml +++ b/omniNotes/src/main/res/layout/activity_widget_configuration.xml @@ -1,5 +1,5 @@ - + - - - + android:textColor="@color/text_gray"/> - + android:textColor="@color/text_gray"/> - + android:textColor="@color/text_gray"/> - + android:textColor="@color/text_gray"/> - + android:textColor="@color/text_gray"/> - + android:textColor="@color/text_gray"/> + + - - + android:textColor="@color/text_gray"/> - \ No newline at end of file + diff --git a/omniNotes/src/main/res/layout/crouton_handle.xml b/omniNotes/src/main/res/layout/crouton_handle.xml index 85a980a4aa..cf42d1b9b7 100644 --- a/omniNotes/src/main/res/layout/crouton_handle.xml +++ b/omniNotes/src/main/res/layout/crouton_handle.xml @@ -1,6 +1,6 @@ + - \ No newline at end of file + diff --git a/omniNotes/src/main/res/layout/fragment_list.xml b/omniNotes/src/main/res/layout/fragment_list.xml index fb3160247b..c2572d754b 100644 --- a/omniNotes/src/main/res/layout/fragment_list.xml +++ b/omniNotes/src/main/res/layout/fragment_list.xml @@ -1,5 +1,5 @@ + - \ No newline at end of file + diff --git a/omniNotes/src/main/res/layout/intro_slide_communities.xml b/omniNotes/src/main/res/layout/intro_slide_communities.xml new file mode 100644 index 0000000000..3cde5b74d3 --- /dev/null +++ b/omniNotes/src/main/res/layout/intro_slide_communities.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + diff --git a/omniNotes/src/main/res/layout/note_layout.xml b/omniNotes/src/main/res/layout/note_layout.xml index 7617f600c9..52e49a16bd 100644 --- a/omniNotes/src/main/res/layout/note_layout.xml +++ b/omniNotes/src/main/res/layout/note_layout.xml @@ -1,6 +1,6 @@ + + + + + [b]New![/b] Rapidly search your unfinished to-do lists + [b]New![/b] New "attachment" available to easily add the current timestamp + [b]New![/b] Now an option is available into the editor to check currently edited note's informations + [b]New![/b] Persian translation + [i]Improved![/i] Attachment's menu graphical overhaul + [i]Improved![/i] Removed outdated transparent navigation bar: this will save a lot of CPU avoiding calculating dynamic layout, after all today all devides are very much bigger than when this optimization has been introduced + [i]Improved![/i] Removed semi-transparent overlay when using floating action button to speed-up the flow + [i]Improved![/i] Faster password and security question validations by using the keyboard "done" button + [u]Fix[/u] Notes list update after password reset and password request bypass using swipe actions + [u]Fix[/u] Language switching on Android Oreo and later versions + [u]Fix[/u] First title duplication during notes' merging + + [i]Improved![/i] Updated translations [i]Improved![/i] Added full description and screenshots for F-Droid users diff --git a/omniNotes/src/main/res/values-ar-rSA/arrays.xml b/omniNotes/src/main/res/values-ar-rSA/arrays.xml index 39261fd087..c15d9dd014 100644 --- a/omniNotes/src/main/res/values-ar-rSA/arrays.xml +++ b/omniNotes/src/main/res/values-ar-rSA/arrays.xml @@ -1,7 +1,7 @@ عرض بعض الاحصائيات و المذكرات المنتهية من مدونات أومني إعدادات @@ -337,7 +340,7 @@ ملاحظات محذوفة التنبيهات تذكيرات مستقبلية - قوائم مرجعية + قوائم التدقيق ملاحظات مقفلة فئات الوسوم @@ -361,17 +364,17 @@ الإجراءات أنشئ ملاحظات جديدة ، رتبها أو تصفح الخيارات الملاحة - قائمة التصفح تتيح لك التنقل بين الملاحظات واستخدام المرشحات والوسوم + Navigation menu allows you to move through notes with filters and categories الوسوم - إضافة علامات ملونة للعثور على الملاحظات في لمحة + أضف تلوين الفئات لتنظيم الملاحظات بلمحة تحسين إضافة مرفق من عدة أنواع لملاحظاتك! القيام بالمزيد مشاركة، علامة، أرشيف، حماية، والمزيد… أنقر فقط - تحتلف الضغطة القصيرة على عنصر ما (المرفق ، المكان أو التنبيه) عن الضغطة الطويلة! + تختلف الضغطة القصيرة على عنصر ما (المرفق ، المكان أو التنبيه) عن الضغطة الطويلة! روابط - انقر فوق عنوان الويب أو البريد, لنسخه أو لفتحه + URL, e-mail addresses and telephone numbers recognition تمرير أنشئ ملاحظات جديدة\nدون ترك الملاحظة التي تحررها حالياً حفظ diff --git a/omniNotes/src/main/res/values-ca-rES/arrays.xml b/omniNotes/src/main/res/values-ca-rES/arrays.xml index 8e61fe84ae..72728382ec 100644 --- a/omniNotes/src/main/res/values-ca-rES/arrays.xml +++ b/omniNotes/src/main/res/values-ca-rES/arrays.xml @@ -1,7 +1,7 @@ Mostra algunes estadístiques i recordatoris expirats de l\'Omni Notes Configuració @@ -359,9 +362,9 @@ Accions Creeu notes noves, ordeneu-les, accediu a les preferències Navega - El menú de navegació us permet moure per les notes amb filtres i etiquetes + El menú de navegació us permet moure per les notes amb filtres i categories Etiquetes - Afegiu etiquetes de colros per trobar les notes fàcilment + Afegiu categories amb colors per organitzar les notes fàcilment Millora Afegiu adjunts de diferents tipus a les notes! Feu més @@ -369,7 +372,7 @@ Només cal que pitgeu Un toc llarg té efectes diferents en un objecte (adjunt, ubicació, recordatori) que no pas un toc cur! Enllaços - Feu clic a l\'URL o adreça de correu, per copiar-lo o obrir-lo + Reconeixement d\'URL, correus electrònics i números de telèfon Llisqueu Crea notes noves sense \n deixar la que esteu editant Desa diff --git a/omniNotes/src/main/res/values-cs-rCZ/arrays.xml b/omniNotes/src/main/res/values-cs-rCZ/arrays.xml index f7264c73a7..2e6b7b251c 100644 --- a/omniNotes/src/main/res/values-cs-rCZ/arrays.xml +++ b/omniNotes/src/main/res/values-cs-rCZ/arrays.xml @@ -1,7 +1,7 @@ Zobrazí statistiky a připomenutí kterým brzy vyprší platnost z Omni Notes Nastavení @@ -359,9 +362,9 @@ Akce Vytváření nových poznámek, řazení a vlastnosti Navigace - Navigační menu umožňuje procházení poznámek pomocí filtrů a značek + Navigation menu allows you to move through notes with filters and categories Značky - Přidáním barevných značek najdete poznámky na první pohled + Add colored categories to organize notes at-a-glance Vylepšení Přidejte do Vašich poznámek různé druhy příloh! Více @@ -369,7 +372,7 @@ Stačí stisknout Podržení má na objekt (příloha, poloha, připomenutí) jiné účinky, než krátké stisknutí! Odkazy - Kliknout na URL, nebo emailovou adresu pro její zkopírování, nebo otevření + URL, e-mail addresses and telephone numbers recognition Tažení prstem Vytvořte novou poznámku \nbez opuštění té, kterou \nprávě upravujete Uložit diff --git a/omniNotes/src/main/res/values-de-rDE/arrays.xml b/omniNotes/src/main/res/values-de-rDE/arrays.xml index 0062b8243d..54e81b1ebd 100644 --- a/omniNotes/src/main/res/values-de-rDE/arrays.xml +++ b/omniNotes/src/main/res/values-de-rDE/arrays.xml @@ -1,7 +1,7 @@ Zeige Statistiken und sich nähernde Errinerungen Einstellungen @@ -245,7 +248,7 @@ Neues Passwort eingeben Passwort bestätigen Passwort erfolgreich geändert - Password removed: all notes have been unlocked + Passwort entfernt: Alle Notizen wurden entschlüsselt Passwort falsch! Passwort ist leer Passwort entfernen\nund alle gesperrten Notizen freischalten? @@ -359,9 +362,9 @@ Aktionsleiste Neue Notizen erstellen, sortieren und suchen. Zugang zu den Einstellungen Navigationsmenü - Das Navigationsmenü erlaubt es Ihnen zwischen Stichwortlisten zu wechseln, archivierte Notizen und angelegte Erinnerungen aufzurufen + Navigation menu allows you to move through notes with filters and categories Stichwort hinzufügen - Zur besseren Übersicht, fügen Sie Ihren Gedanken und Ideen Stichworte und Farben hinzu + Fügen Sie Farben zu Kategorien hinzu, um Ihre Notizen besser sortieren zu können Anhänge Fügen Sie verschiedene Anhänge Ihren Notizen hinzu! Weitere Aktionen... @@ -369,7 +372,7 @@ Spezielle Aktionen Kurzes oder langes Drücken auf ein Objekt (Anhänge, Standort, Erinnerung) haben unterschiedliche Effekte! Links - Klicken Sie auf einen Link oder E-Mail-Adresse zum kopieren oder öffnen + URL, E-Mail und Telefonnummern Erkennung Wischgesten Neue Notiz erstellen, ohne\ndie Aktuelle zu verlassen Speichern diff --git a/omniNotes/src/main/res/values-el-rGR/arrays.xml b/omniNotes/src/main/res/values-el-rGR/arrays.xml index c325869484..008bd0834b 100644 --- a/omniNotes/src/main/res/values-el-rGR/arrays.xml +++ b/omniNotes/src/main/res/values-el-rGR/arrays.xml @@ -1,7 +1,7 @@ Εμφανίζει κάποια στατιστικά στοιχεία και ληγμένες υπενθυμίσεις από τις σημειώσεις Omni Ρυθμίσεις @@ -245,7 +248,7 @@ Εισαγάγετε ένα νέο κωδικό πρόσβασης Επιβεβαιώστε το νέο κωδικό πρόσβασης Ο κωδικός πρόσβασης άλλαξε επιτυχώς - Password removed: all notes have been unlocked + Ο κωδικός αφαιρέθηκε: Όλες οι σημειώσεις έχουν ξεκλειδωθεί Λάθος κωδικός Ο κωδικός πρόσβασης είναι κενός Αφαίρεση κωδικού και\n ξεκλείδωμα όλων των κλειδωμένων σημειώσεων; @@ -359,9 +362,9 @@ Ενέργειες Δημιουργία νέων σημειώσεων, ταξινόμησή τους, πρόσβαση στις προτιμήσεις Πλοήγηση - Το μενού πλοήγησης σας επιτρέπει να μετακινηθείτε μεταξύ σημειώσεων με φίλτρα και Ετικετών + Το μενού πλοήγησης σας επιτρέπει να μετακινηθείτε μεταξύ σημειώσεων με φίλτρα και κατηγοριών Ετικέτες - Προσθήκη έγχρωμων ετικετών για να βρίσκετε σημειώσεις με μια ματιά + Προσθήκη έγχρωμων κατηγοριών για να βρίσκετε σημειώσεις με μια ματιά Βελτίωση Προσθήκη συνημμένων διαφόρων ειδών στις σημειώσεις σας! Κάντε περισσότερα @@ -369,7 +372,7 @@ Απλά πατήστε το πλήκτρο Το παρατεταμένο πάτημα έχει διαφορετικό αποτέλεσμα σε ένα αντικείμενο(συννημένο, τοποθεσία, υπενθύμιση) από το απλό πάτημα! Σύνδεσμοι - Κάντε κλικ σε μια διεύθυνση URL ή ηλεκτρονικού ταχυδρομείου για αντιγραφή ή άνοιγμα + Αναγνώριση διευθύνσεων URL, email και τηλεφ. αριθμών Σύρσιμο Δημιουργία νέων σημειώσεων χωρίς \n να αφήσετε αυτο που επεξεργάζεστε Αποθήκευση diff --git a/omniNotes/src/main/res/values-en-rUS/arrays.xml b/omniNotes/src/main/res/values-en-rUS/arrays.xml index 700cb9cc69..b5107f4441 100644 --- a/omniNotes/src/main/res/values-en-rUS/arrays.xml +++ b/omniNotes/src/main/res/values-en-rUS/arrays.xml @@ -1,7 +1,7 @@ Displays some statistics and expiring reminders from Omni Notes Settings @@ -359,9 +362,9 @@ Actions Create new notes, sort them, access to preferences Navigate - Navigation menu allows you to move through notes with filters and tags + Navigation menu allows you to move through notes with filters and categories Tags - Add colored tags to find notes at-a-glance + Add colored categories to organize notes at-a-glance Improve Add attachment of several kinds to your notes! Do more @@ -369,7 +372,7 @@ Just press Long presses have different effects on an object (attachment, location, reminder) than short ones! Links - Click on an URL or e-mail address to copy or open it + URL, e-mail addresses and telephone numbers recognition Swipe Create new notes without \n leaving the one you\'re editing Save diff --git a/omniNotes/src/main/res/values-es-rES/arrays.xml b/omniNotes/src/main/res/values-es-rES/arrays.xml index 07efa04d9f..325ebdde54 100644 --- a/omniNotes/src/main/res/values-es-rES/arrays.xml +++ b/omniNotes/src/main/res/values-es-rES/arrays.xml @@ -1,7 +1,7 @@ Muestra algunas estadísticas y recordatorios cercanos de Omni Notes Configuración @@ -360,9 +363,9 @@ Acciones Crear nuevas notas, ordenarlas, acceder a las preferencias Navegar - El menú de navegación le permite moverse a través de las notas con etiquetas y filtros + Navigation menu allows you to move through notes with filters and categories Etiquetas - Agregar etiquetas de color para mantener sus pensamientos siempre eficientes + Add colored categories to organize notes at-a-glance Mejorar Añadir un montón de tipos diferentes de archivos adjuntos a sus notas! Hacer más @@ -370,7 +373,7 @@ Solo presione Presiones cortas o largas en los objetos (archivos adjuntos, ubicación, recordatorio) tienen efecto diferente! Enlaces - Haga clic en una URL o correo electrónico para copiar o abrirlo + URL, e-mail addresses and telephone numbers recognition Deslizar Crear notas sin dejar \n la que estás editando Guardar diff --git a/omniNotes/src/main/res/values-es-rXA/arrays.xml b/omniNotes/src/main/res/values-es-rXA/arrays.xml index 25651e90ae..6753a69e05 100644 --- a/omniNotes/src/main/res/values-es-rXA/arrays.xml +++ b/omniNotes/src/main/res/values-es-rXA/arrays.xml @@ -1,7 +1,7 @@ Amuesa dalgunes estadístiques y avisos cercanos d\'Omni Notes Axustes @@ -359,9 +362,9 @@ Aiciones Crear notes nueves, ordenales, acceder a les preferencies Navegar - El menú de navegación permítete movete al traviés de les notes con etiquetes y filtros + Navigation menu allows you to move through notes with filters and categories Etiquetes - Amiesta etiquetes de color pa caltener los pensamientos d\'un xeitu eficiente + Add colored categories to organize notes at-a-glance Ameyora Puedes amestar axuntos de distintos tipos a les notes! Facer más @@ -369,7 +372,7 @@ Namái toca Presiones curties o llargues nos oxetos (axuntos, allugamientos, avisos) tienen efeutos distintos! Enllaces - Fai clic nuna URL o corréu-e pa copiar o abrilu + URL, e-mail addresses and telephone numbers recognition Eslizar Crea notes nueves ensin \ndexar la que tas editando Guardar diff --git a/omniNotes/src/main/res/values-eu-rES/arrays.xml b/omniNotes/src/main/res/values-eu-rES/arrays.xml index 12372170cf..6879913dab 100644 --- a/omniNotes/src/main/res/values-eu-rES/arrays.xml +++ b/omniNotes/src/main/res/values-eu-rES/arrays.xml @@ -1,7 +1,7 @@ Erakutsi Omni Notes aplikazioko estatistika batzuk eta iraungitze datak Ezarpenak @@ -359,9 +362,9 @@ Ekintzak Sortu ohar berriak, ordenatu itzazu, sartu hobespenetan Nabigatu - Nabigazio menuak oharretatik mugitzea ahalbidetzen dizu iragazki eta etiketen bidez + Nabigazio menuak oharretatik mugitzea ahalbidetzen dizu iragazki eta kategorien bidez Etiketak - Gehitu kolorezko etiketak oharrak berehala aurkitzeko + Gehitu kolorezko kategoriak oharrak atoan antolatzeko Hobetu Gehitu mota desberdinetako eranskinak zure oharretara! Egin gehiago @@ -369,7 +372,7 @@ Sakatu besterik gabe Objektu batean (eranskina, kokalekua, oroigarria) luze sakatzeak eta labur sakatzeak emaitza desberdinak dute! Estekak - Sakatu URL edo e-mail helbide bat kopiatu edo irekitzeko + URL, e-mail helbideak eta telefono zenbakiak antzematea Pasatu hatza Sortu ohar berriak \naldatzen ari zarena utzi gabe Gorde diff --git a/omniNotes/src/main/res/values-fa-rIR/arrays.xml b/omniNotes/src/main/res/values-fa-rIR/arrays.xml new file mode 100644 index 0000000000..dbe8eb66fd --- /dev/null +++ b/omniNotes/src/main/res/values-fa-rIR/arrays.xml @@ -0,0 +1,62 @@ + + + + + + \"یادداشت‌ها\" + آرشیو + یادآورها + سطل زباله + دسته بندی نشده + + + عنوان + تاریخ ایجاد + آخرین تغییرات + تاریخ یادآور + + + حفظ موقعیت + انتقال به انتهای فهرست + انتقال به انتهای موارد انتخاب نشده + + + غیر فعال + فقط نوار + فقط لیست یادداشت ها + تکمیل شد + + + غیر فعال + فقط نوار + فهرست یادداشتها + + + کوچکترین + کوچک + پیش‌فرض + بزرگ + بزرگترین + + + اشتراک + زدودن + زدودن همه + ویرایش + + diff --git a/omniNotes/src/main/res/values-fa-rIR/strings.xml b/omniNotes/src/main/res/values-fa-rIR/strings.xml new file mode 100644 index 0000000000..384c12fe3e --- /dev/null +++ b/omniNotes/src/main/res/values-fa-rIR/strings.xml @@ -0,0 +1,392 @@ + + + + + + یادداشت‌ها + اضافه کردن یادداشت + عنوان + Omni Notes + جستجو + جستجو در یادداشت ها + محتوا + ذخیره + اشتراک + برگردان + سطل زباله + به سطل زباله منتقل شد + یاداشت (های) سطل زباله + یاداشت‌(ها) از سطل زباله بازیابی شدند + بازیابی از سطل زباله + زدودن + زدودن همیشگی یاداشت(ها) + آرشیو + بازیابی از آرشیو + ایجاد شد: + بروز شد: + پاکسازی یاداشت را تایید می‌کنید؟ + تایید + باشه + نه + لغو + یادداشت بروز شد + نمی‌توان یک یادداشت خالی را ذخیره کرد + نمی‌توان یک یادداشت خالی را به اشتراک گذاشت + یادداشت آرشیو شد + یادداشت از آرشیو بازیابی شد + یادداشت + اشتراک با + \n【by Omni Notes】 + مرتب‌سازی + مرتب سازی بر اساس + برای بازگردانی لمس کنید + تنظیم یادآور برای + شروع از + در + انصراف از تغییرات + پیوست + دوربین + پیوست انتخاب شده را حذف کنید؟ + همه پیوست ها را حذف کنید؟ + گالری + مکان + Pushbullet + مکان حذف شود؟ + یادآوری حذف شود؟ + افزودن یادآور + مکان پیدا نشد + ضبط + توقف + برنامه ای برای اجرای فایل نیست + فضای ذخیره سازی کافی نیست + ویدیو + قابلیت بر روی این دستگاه موجود نیست + خطایی هنگام حذف یادداشت رخ داد + نسخه پشتیبانی موجود نیست + نام پشتیبان را وارد کنید + لمس -> بازیابی\nلمس طولانی -> حذف + هشدار: این جایگزین همه داده کنونی میشود! + پشتیبان گیری کامل شد + بازیابی داده کامل شد + برای تازه‌سازی برنامه لمس کنید + پشتیبان درحال حاضر موجود است. روی آن بازنوشت می‌شود + برچسب + برچسب‌ها + افزودن برچسب‌ها + برچسب(های) انتخاب شده + دسته بندی‌ها + ویرایش دسته‌بندی + افزودن دسته بندی + عنوان + توضیحات + رنگ + دسته بندی ذخیره شد + دسته‌بندی حذف شد + عنوان دسته بندی وارد نشده + حذف دسته بندی + دسته بندی + طبقه بندی شده بعنوان + ویرایش دسته‌بندی + پاکسازی دسته‌بندی را تایید می‌کنید؟ + این دسته‌بندی بوسیله برخی یادداشت ها استفاده شده.\n تایید میکنید درصورت حذف دسته‌بندی بدون دسته‌بندی شوند؟ + نپذیرفتن + حذف دسته‌بندی + هنوز برچسبی وجود ندارد\n با نوشتن هشتگ \"#\" در یادداشت‌ها آن را ایجاد کنید + هیچ دسته‌بندی هنوز ایجاد نشده است + دسته‌بندی از یادداشت‌ها حذف شد + یادداشت‌ها دسته بندی شدند بعنوان + گذرواژه را وارد کنید + قفل + برای قفل کردن یادداشت را ذخیره کنید + برای بازگشایی یادداشت را ذخیره کنید + بازگشایی + ویرایش گذرواژه امنیتی + اطلاعات + حذف شده + اینجا چیزی نیست! + فعال کردن فهرست + غیر فعال کردن فهرست + مورد جدید + چک لیست حذف شود؟ + موارد انتخاب شده را نگه دارید + نگه داشتن علامت + حالت طراحی + اشتباهی رخ داده در Omni Notes\n گزارش بصورت خودکار برای توسعه دهندگان ارسال شود؟ + درج نظر در اینجا (اختیاری): + اشتباهی رخ داده در Omni Notes\n گزارشی برای توسعه دهندگان ارسال شد! + نسخه جدید Omni Notes موجود است مایل به بروزرسانی هستید؟ + بروزرسانی و امتیازدهی! + الآن نه + حالت طراحی + از سر + رنگ ها + ضربه + پاک کردن طرح؟ + یادآوری تنظیم نشده + اشباع رنگ + شفافیت + نپذیرفتن + بعدا یادآوری کن + خطای وارد کردن پیوست + خطا در ذخیره پیوست ها + ادامه + نمای کوچک + نمای گسترده + نمای شبکه + افزودن میان‌بر + میانبر به صفحه اصلی اضافه شد + میانبر به یادداشت حذف شده اشاره میکند + ویدجت ساده با دکمه + پیمایش لیست با دکمه + یادداشت‌ها + تصاویر بندانگشتی پیوست‌ها را نشان بده + نمایش timestamps + انتخاب عملکرد + ویرایش + یادآورها + منقضی نشده + منقضی شده + امروز + فردا + بازکردن + رونوشت‌ + هیچ برنامه کاربردی برای این عملکرد یافت نشد + پاک کن + تصویر + خطا + آرشیو شد + فایل ها + ادغام + یادداشت های اصلی را پس از ادغام حذف میکنید؟ + تنظیم نشده + خالی کردن سطل زباله + تایید حذف تمام یادداشت های سطل آشغال؟ + کمک + کتابچه راهنمای کاربر آنلاین + برچسب ها اضافه شدند + درحال کار... + وارد شد + همگام سازی + استخراج صورت گرفت + انتخاب همه + جستجوی مکان + استفاده از مکان فعلی + فیلتر + حذف فیلتر + پنهان کردن یادآورهای قدیمی + نمایش یادآورهای قدیمی + پنهان کردن یادداشت های بایگانی شده + نشان دادن یادداشت های بایگانی شده + مجوز برای نوشتن بر روی ذخیره سازی خارجی لازم است برای پشتیبان گیری در پوشه های عمومی + مجوز برای خواندن در ذخیره سازی خارجی لازم است برای اجازه پیوست کردن فایل ها از آنجا + اجازه استفاده از میکروفون برای ضبط یادداشت های صوتی مورد نیاز است + اجازه دسترسی به مکان لازم است اطلاعات موقعیت را به یادداشت های خود را اضافه کنید + اجازه داده نشده + چک لیست + یادداشت متنی + تصویر + چک لیست‌های کامل نشده + اطلاعات + کامل شد + + برخی آمارها و یادآورهای منقضی از یادداشت های Omni را نمایش می دهد + تنظیمات + اطلاعات + دیگر + پاک کردن تمام داده ها + پاک کردن تمام داده های نرم افزار? (نسخه های پشتیبان حفظ خواهد شد) + تنظیمات + همگام سازی و پشتیبان گیری + پشتیبان گیری + همگام سازی و پشتیبان گیری + بازیابی یا حذف نسخه های پشتیبان + وارد کردن یادداشت ها از Springpad + آرشیو خروجی Springpad را انتخاب کنید و مطمئن شوید به اینترنت وصل هستید + همگام با گوگل درایو + ثبت نام برنامه برای همگام سازی داده ها در سرویس ذخیره سازی گوگل درایو + پرونده صادر شد با موفقیت به پوشه + صادرات فایل ناموفق بود + پرونده با موفقیت وارد شد + واردات فایل ناموفق بود + فایلی که باید وارد شود وجود ندارد + وارد کردن داده ممکن است باعث رونوشت یادداشت کنونی شود. ادامه میدهید؟ + پرونده صادر شده موجود را رونویسی می کند. ادامه می دهید؟ + حرکات + فعال سازی swype + رابط کاربری + انیمیشن + پشتیبان گیری + اعلان‌ها + لرزش + فعال کردن تداوم اعلان ها + به برنامه اجازه دسترسی به اعلان ها را میدهد می دهد برای زنده ماندن بعد راه اندازی مجدد + پیمایش + گزارش تغییرات + شناسایی لینک + پیوست های ویدئو + داده‌ + پشتیبان گیری + گذرواژه + درخواست گذرواژه در دسترسی + گذرواژه تضمین می کند که یادداشت نمی شود یا تغییر نمی‌یابد توسط شخص دیگر.\n\nWhen زمان تنظیم گذرواژه جدید، قبلی درخواست می شود. + گذرواژه اشتباه است و یا گم شده + درج یک گذرواژه‌ی جدید + تایید گذرواژه جدید + گذرواژه با موفقیت تغییر یافت + حذف گذرواژه: همه یادداشت ها باز شده اند + گذرواژه اشتباه است + گذرواژه خالی است + گذرواژه حذف \n و یادداشت های قفل شده را باز شود؟ + نشانگر دسته‌بندی + واردات و صادرات داده ها برنامه + اندازه های مجاز در مگابایت + ویرایش گذرواژه امنیتی + فعال/غیر فعال کردن انیمیشن ها در لیست یادداشت ها + نمایش/پنهان کردن نشانگر برای دسته‌بندی‌ها + آدرس ها و ایمیل‌های تایپ شده را خودکار قابل کلیک کن + واقعا نسخه پشتیبان را حذف میکنید؟ + واقعا از نسخه پشتیبان بازیابی کنم؟ + پاک کردن اطلاعات کامل شد + چک لیست + چه باید بکنید هنگامی که یک مورد انتخاب شده است؟ + تنظیمات + آزمایشی + درباره + گوگل پلاس + مشترک شدن در برنامه بتا برای بروز بودن با آخرین امکانات + کمک مالی + حمایت از توسعه این برنامه با کمک مالی غیر انتفاعی + زبان + صدای زنگ + رنگ کامل + یادداشت های کاملا رنگی در نمای لیست و مشاهده جزئیات + فقط فهرست + فعالسازی تمام رنگ در نمای لیست. در لیست جزئیات فقط نشانگر تگ رنگی خواهد بود + تأخیر دوم یادآوری + دقیقه + تقویم و زمان ساده + استفاده از (آسانتر) رابط کاربری اندروید برای انتخاب ساعت و تاریخ،بجای رابط کاربری گوگل + اولین روز هفته + تور برنامه + تور برنامه را دوباره به من نشان بده + افزودن تنظیمات و گذرواژه + تنظیمات افزوده شد + یک سوال و پاسخ امنیتی را وارد کنید برای زمانی که گذرواژه را فراموش کردید + سوال + پاسخ + تایید پاسخ + فراموشی گذرواژه + حذف گذرواژه + پاسخ اشتباه است و یا گم شده + گذرواژه تنظیم نشده + پاسخ اشتباه + تطبیق رنگ برنامه + تطبیق رنگ ویدجت + جستجوی آنی + منو راهبری در خروج + با فشار دادن \"بازگشت\" هنگامی که در لیست یادداشت به جای خروج منوی ناوبری باز می شود + اندازه متن + رفتار + کشیدن یادداشت‌ها + کشیدن در یادداشت‌ها برای انجام یک عمل + کشیدن برای انتقال به سطل زباله + کشیدن یادداشت‌ها با انگشت انها را آرشیو میکند + کشیدن یادداشت‌ها با انگشت انها را به سطل زباله منتقل میکند + گروه دسته بندی نشده است + یک آیتم جدید در فهرست ناوبری برای یادداشت های طبقه بندی نشده اضافه می کند + شمارنده یادداشت + تعداد یادداشت های مربوط به دسته بندی را نشان می دهد + مکان خودکار + به صورت خودکار مکان را به یادداشت های جدید اضافه می کند + منو پویا + آیتم های منو استفاده نشده به صورت خودکار پنهان می شوند + دکمه عملکرد شناور + لمس کوتاه انجام عمل + گزینه های کوتاه لمس را تغییر می دهد + فایل پیوست در پایین + پیوست ها را در زیر مطالب یادداشت نشان می دهد + پیوست ها را در بالای مطالب یادداشت نشان می دهد + تاریخ های متقاعد شده + تاریخ ها در قالب ساده تری نمایش داده میشوند + تاریخ در قالب با جزئيات بیشتر نشان داده شده میشود + حریم خصوصی + گزارش خطا + وقتی برنامه متوقف شد توسعه دهنده مطلع میشود تا به شما کمک کند + هیچ گزارش خرابی ارسال نخواهد شد. اگر شک ندارید اشتباهی رخ نمیدهد! + ارسال داده ناشناس + با ارسال اطلاعات غیر حساس مانند مدل دستگاه، زبان، ویژگی های برنامه اغلب استفاده شده، به توسعه دهنده کمک کنید. این داده ها فقط برای بهبود برنامه منبع باز استفاده می شوند. + آمار + + کل یادداشت ها + یادداشت های فعال + یادداشت های بایگانی شده + یادداشت های سطل زباله + یادآورها + یادآورهای آینده + چک لیست + یادداشت های قفل شده + دسته بندی‌ها + برچسب‌ها + پیوست‌‌‌‌‌‌ها + تصاویر + ویدیوها + ضبط صدا + طرح ها + فایل ها + مکانها + کلمه ها + حداکثر کلمات + میانگین کلمات + کاراکتر ها + حداکثر کاراکترها + میانگین کاراکترها + + شما برای اولین بار Omni Note را راه اندازی کردید، آیا میخواهید تور برنامه را بگیرید؟ + خوش آمدید به Omni Omni! + برای ادامه تور روی \"ادامه\" کلیک کنید + عملیات + ایجاد یادداشت جدید، مرتب کردن آنها، دسترسی به تنظیمات + پیمایش + منو امکان جابجایی بین یادداشت با فیلترها و موضوع‌ها را میدهد + برچسب‌ها + افزودن دسته های رنگی برای سازماندهی یادداشت در--نگاه + بهبود + قادر به افزودن انواع مختلفی پیوست برای یادداشت های خود هستید! + بیشتر + اشتراک، تگ آرشیو، حفاظت، و بیشتر… + فقط بفشارید + لمس طولانی تاثیر متفاوتی روی هر شی(پیوست،مکان،یادآور) در قیاس با لمس کوتاه دارد! + پیوند‌ها + تشخیص آدرس سایت ،شماره تلفن و آدرس های ایمیل + کشیدن + ایجاد یادداشت جدید بدون \n ترک یادداشتی که در حال ویرایش هستید + ذخیره + برای برگشت ،دکمه ناوبری \"بالا\" را از دکمه های دستگاه خود بزنید + لذت ببرید + با تشکر برای استفاده از / n Omni Notes جایگزین متن‌باز برای بهره وری از اوقات فراغت یادداشت برداری! + برای مشارکت در اجتماع عضو شوید! + + کشو باز است + کشو بسته شد + یادآور + اندازه ضخامت + یادداشت بندانگشتی + نماد یادآور یادداشت + بازکردن کشو ناوبری + بستن کشوی ناوبری + diff --git a/omniNotes/src/main/res/values-fr-rFR/arrays.xml b/omniNotes/src/main/res/values-fr-rFR/arrays.xml index 2009e4e44f..cf5b411570 100644 --- a/omniNotes/src/main/res/values-fr-rFR/arrays.xml +++ b/omniNotes/src/main/res/values-fr-rFR/arrays.xml @@ -1,7 +1,7 @@ Affiche des statistiques et des rappels à venir de Omni Notes. Paramètres @@ -245,7 +248,7 @@ Entrer un nouveau mot de passe Confirmer le nouveau mot de passe Mot de passe modifié avec succès - Password removed: all notes have been unlocked + Mot de passe supprimé : toutes les notes ont été déverrouillées Mot de passe incorrect Mot de passe vide Supprimer le mot de passe\net déverrouiller toutes les notes ? @@ -359,9 +362,9 @@ Actions Créer de nouvelles notes, les trier, accès aux préférences Naviguer - Le menu de navigation vous permet de parcourir les notes grâce aux filtres et aux mots-clés + Le menu de navigation vous permet de parcourir les notes grâce aux filtres et aux catégories Mots-clés - Ajouter des mots-clés colorés pour trouver vos notes en un clin d’œil + Ajouter des catégories colorées pour organiser vos notes en un coup d\'œil Améliorer Ajouter différents types de pièces jointes à vos notes ! Faire plus @@ -369,7 +372,7 @@ Appuyez juste Des appuis courts ou longs sur un élément (pièce jointe, localisation, rappel) ont des effets différents ! Liens - Appuyer sur une adresse internet ou courriel pour la copier ou l\'ouvrir + URL, adresses courriel et reconnaissance de numéros de téléphone Glisser Créer de nouvelles notes sans \nquitter celle que vous modifiez Enregistrer diff --git a/omniNotes/src/main/res/values-gl-rES/arrays.xml b/omniNotes/src/main/res/values-gl-rES/arrays.xml index 106aab0b2c..f6c7b28b0f 100644 --- a/omniNotes/src/main/res/values-gl-rES/arrays.xml +++ b/omniNotes/src/main/res/values-gl-rES/arrays.xml @@ -1,7 +1,7 @@ Mostrar algunhas estatísticas e recordatorios próximos de Omni Notes Axustes @@ -245,7 +248,7 @@ Inserir un novo contrasinal Confirmar o novo contrasinal O contrasinal cambiouse correctamente - Password removed: all notes have been unlocked + Contrasinal eliminado: todas as notas foron desbloqueadas Contrasinal incorrecto O contrasinal está baleiro Queres eliminar o contrasinal\ne desbloquear todas as notas bloqueadas? @@ -359,9 +362,9 @@ Accións Crear novas notas, ordenalas, acceder ás preferencias Navegar - O menú de navegación permite moverse a través das notas con etiquetas e filtros + O menú de navegación permite moverse polas notas con filtros e categorías Etiquetas - Engadir cores ás notas para manter os pensamentos dun xeito eficiente + Engadir categorías de cores para organizar as notas cunha ollada Melloras Engade unha morea de anexos de diferentes tipos ás túas notas! Facer máis @@ -369,7 +372,7 @@ Abonda con tocar Un toque normal ou longo nos diferentes obxectos (anexos, localización, recordatorio) ten efectos diferentes! Ligazóns - Toca no URL ou no enderezo electrónico para copialo ou abrilo + Recoñecemento de URL, enderezos electrónicos e números de teléfono Pasar o dedo Crear novas notas sen\n deixar a que estás a editar Gardar diff --git a/omniNotes/src/main/res/values-hdpi/dimens.xml b/omniNotes/src/main/res/values-hdpi/dimens.xml index 8e311cc060..626b2b0b37 100644 --- a/omniNotes/src/main/res/values-hdpi/dimens.xml +++ b/omniNotes/src/main/res/values-hdpi/dimens.xml @@ -1,5 +1,5 @@ रिमाइंडर और कुछ आंकड़े ओमनी नोटस कि और से दिखाए सेटिंग्स @@ -362,9 +365,9 @@ क्रियाएँ नए नोट्स बनाये, उन्हें सॉर्ट करे, जरुरत अनुसार इस्तेमाल करे नेविगेट करें - नेविगेशन मेनू आप नोट्स के माध्यम से फिल्टर और टैग के साथ ले जाने के लिए अनुमति देता है + Navigation menu allows you to move through notes with filters and categories टैग - आपके विचार हमेशा कुशल रखने के लिए रंग का टैग जोड़ें + Add colored categories to organize notes at-a-glance सुधार अलग अलग प्रकारों कीअ टैचमेंट अपने नोट् से जोड़ें! अधिक करो @@ -372,7 +375,7 @@ बस दबाये छोटे या बड़े प्रेशन्स का वस्तु(अटैचमेंट, जगह, रिमाइंडर) पर अलग प्रभाव होता हे कड़ियाँ - यूआरएल या ई-मेल पते पर कॉपी या खोलने के लिए क्लिक करें + URL, e-mail addresses and telephone numbers recognition उंगली गुमाईए नयी नोट बनाये \nअभी खुली नोट को छोड़े बिना सेव diff --git a/omniNotes/src/main/res/values-hr-rHR/arrays.xml b/omniNotes/src/main/res/values-hr-rHR/arrays.xml index 7e28aa5d2e..bc3e6895b3 100644 --- a/omniNotes/src/main/res/values-hr-rHR/arrays.xml +++ b/omniNotes/src/main/res/values-hr-rHR/arrays.xml @@ -1,7 +1,7 @@ Prikazuje neke statistike i podsjetnike koji istječu u aplikaciji Omni bilješke Postavke @@ -359,9 +362,9 @@ Radnje Stvorite nove bilješke, sortirajte ih, prema osobnim postavkama Navigacija - Navigacijski izbornik omogućuje vam navigaciju kroz bilješke pomoću filtera i tagova + Navigation menu allows you to move through notes with filters and categories Tagovi - Dodajte obojene tagove kako biste lakše pronašli bilješke + Add colored categories to organize notes at-a-glance Poboljšanja Dodajte privitke različitih vrsta svojim bilješkama! Napravite više @@ -369,7 +372,7 @@ Samo pritisnite Dugi pritisak prstom ima različite efekte na stavku (privitak, lokacija, podsjetnik) nego kratak pritisak! Linkovi - Kliknite na URL link ili e-mail adresu kako biste ih kopirali ili otvorili + URL, e-mail addresses and telephone numbers recognition Swipe Stvori novu bilješku bez \n napuštanja trenutne Spremi diff --git a/omniNotes/src/main/res/values-hu-rHU/arrays.xml b/omniNotes/src/main/res/values-hu-rHU/arrays.xml index 64c6151d1f..ec72e6f131 100644 --- a/omniNotes/src/main/res/values-hu-rHU/arrays.xml +++ b/omniNotes/src/main/res/values-hu-rHU/arrays.xml @@ -1,7 +1,7 @@ Statisztikák és lejáró emlékeztetők megjelenítése az Omni Notes-ból Beállítások @@ -245,7 +248,7 @@ Írjon be új jelszavat Az új jelszó megerősítése Jelszó módosítása sikerült - Password removed: all notes have been unlocked + A jelszó eltávolítva: minden jegyzet elérhető jelszó nélkül Hibás jelszó A jelszó üres Eltávolítja a jelszavat\nés feloldja az összes zárolt jegyzetet? @@ -359,9 +362,9 @@ Műveletek Hozzon létre új jegyzeteket, rendezze őket, férjen hozzá a beállításokhoz Navigáció - A navigációs menü lehetővé teszi a jegyzetek közötti mozgást kategóriák és címkék segítségével + A navigációs menü lehetővé teszi a jegyzetek átnézését szűrők és kategóriák segítségével Címkék - Használjon színes címkéket a jegyzetek könnyebb megtalálásához + Használjon színekkel jelölt kategóriákat a jegyzetek villámgyors szervezéséhez Javítás Adjon különböző mellékleteket a jegyzeteihez! Többet @@ -369,7 +372,7 @@ Csak nyomja meg A hosszú érintés más műveletet eredményez az objektumokon (csatolmány, hely, emlékeztető), mint a rövid érintés! Linkek - Kattintson egy URL-re vagy e-mail címre a másolásához vagy megnyitásához + URL címek, e-mail címek és telefonszámok felismerése Húzás Hozzon létre új jegyzeteket\n az éppen szerkesztett elhagyása nélkül diff --git a/omniNotes/src/main/res/values-in-rID/arrays.xml b/omniNotes/src/main/res/values-in-rID/arrays.xml index b3ee152e21..c823d28a84 100644 --- a/omniNotes/src/main/res/values-in-rID/arrays.xml +++ b/omniNotes/src/main/res/values-in-rID/arrays.xml @@ -1,7 +1,7 @@ Tampilkan beberapa statistik dan mengakhiri pengingat dari Omni Notes Setelan @@ -359,9 +362,9 @@ Tindakan Buat catatan baru, urutkan, dan akses ke preferensi Navigasi - Menu navigasi memungkinkan anda untuk bergerak di catatan dengan filter dan tag + Navigation menu allows you to move through notes with filters and categories Tag - Tambah tag berwarna untuk mencari catatan at-a-glance + Add colored categories to organize notes at-a-glance Tingkatkan Tambahkan lampiran dari beberapa jenis untuk catatan anda! Lakukan lebih banyak @@ -369,7 +372,7 @@ Hanya klik Menekan lama mempunyai banyak fungsi pada sebuah objek (lampiran, lokasi, pengingat) daripada menekan singkat! Tautan - Klik di URL atau alamat surel untuk menyalin atau membukanya + URL, e-mail addresses and telephone numbers recognition Geser Buat catatan baru tanpa \n meninggalkan apa yang anda ubah Simpan diff --git a/omniNotes/src/main/res/values-it-rIT/arrays.xml b/omniNotes/src/main/res/values-it-rIT/arrays.xml index c64d798fad..ce6f349d14 100644 --- a/omniNotes/src/main/res/values-it-rIT/arrays.xml +++ b/omniNotes/src/main/res/values-it-rIT/arrays.xml @@ -1,7 +1,7 @@ Mostra alcune statistiche e i promemoria di Omni Notes Impostazioni @@ -360,9 +363,9 @@ Vuoi inviare una segnalazione allo sviluppatore? Azioni Crea nuove note, ordinale, accedi alle preferenze Naviga - Il menu di navigazione consente di spostarsi attraverso le note con filtri e tag + Il menu di navigazione consente di spostarsi attraverso le note con filtri e categorie Tag - Aggiungi tag colorati per mantenere sempre efficienti i tuoi pensieri + Aggiungi categorie colorate per mantenere sempre organizzati i tuoi pensieri Migliora Aggiungi molti diversi tipi di allegato alle tue note! Fai di più @@ -370,7 +373,7 @@ Vuoi inviare una segnalazione allo sviluppatore? Basta premere Pressioni brevi o lunghe sugli oggetti (allegati, località, promemoria) hanno effetti diverso! Links - Fai click su un URL o un indirizzo e-mail per copiarlo o aprirlo + Riconoscimento di URL, indirizzi di posta elettronica e il numeri di telefono Scorrimento Crea nuove note senza \n lasciare quella che stai modificando Salva diff --git a/omniNotes/src/main/res/values-iw-rIL/arrays.xml b/omniNotes/src/main/res/values-iw-rIL/arrays.xml index b1e200687b..fd9dfd5c91 100644 --- a/omniNotes/src/main/res/values-iw-rIL/arrays.xml +++ b/omniNotes/src/main/res/values-iw-rIL/arrays.xml @@ -1,7 +1,7 @@ הצגת נתונים סטטיסטיים ותזכורות שתוקפן עומד לפוג מ-Omni Notes הגדרות @@ -359,9 +362,9 @@ פעולות יצירת הערות חדשות, סידורן, גישה להעדפות ניווט - תפריט ניווט מאפשר לכם לנוע מבעד להערות עם מסננים ותגיות + Navigation menu allows you to move through notes with filters and categories תגיות - הוספת צבע לתגיות כדי שרעיונותיכם יהיו מאורגנים + Add colored categories to organize notes at-a-glance שיפור הוספת מספר סוגים של קבצים מצורפים להערות שלכם! עשו עוד @@ -369,7 +372,7 @@ פשוט לחצו ללחיצה ארוכה ישנה השפעה שונה על אובייקטים (קבצים מצורפים, מיקום, תזכורות) מאשר לחיצה קצרה! קישורים - Click on an URL or e-mail address to copy or open it + URL, e-mail addresses and telephone numbers recognition סחיבה (swipe) יצירת הערות חדשות מבלי \n לעזוב את אלו שאתם עורכים שמירה diff --git a/omniNotes/src/main/res/values-ja-rJP/arrays.xml b/omniNotes/src/main/res/values-ja-rJP/arrays.xml index 103624ad3c..1e0d708d30 100644 --- a/omniNotes/src/main/res/values-ja-rJP/arrays.xml +++ b/omniNotes/src/main/res/values-ja-rJP/arrays.xml @@ -1,7 +1,7 @@ 統計情報と Omni Notes から期限切れのアラームを表示します 設定 @@ -359,9 +362,9 @@ アクション 新しいノートの作成、並べ替え、プリファレンスにアクセス ナビゲーション - ナビゲーション メニューでは、フィルターとタグでノートを移動することができます + ナビゲーション メニューでは、フィルターとカテゴリーでノートを移動することができます タグ - ノートに一目でわかる色のタグを追加します + 色付きのカテゴリーを追加してノートを一目で整理します 改善 ノートにいくつかの種類の添付ファイルを追加します! さらに @@ -369,7 +372,7 @@ 押すだけで オブジェクトで長押しすると、短く押した時と異なる効果があります (添付、場所、アラーム) リンク - URL や電子メール アドレスををクリックすると、コピーまたは開きます + URL、メールアドレス、電話番号の認識 スワイプ 編集中のノートから離れることなく\n新しいノートを作成することができます 保存 diff --git a/omniNotes/src/main/res/values-km-rKH/arrays.xml b/omniNotes/src/main/res/values-km-rKH/arrays.xml index 2d974ac518..3bbd668b4b 100644 --- a/omniNotes/src/main/res/values-km-rKH/arrays.xml +++ b/omniNotes/src/main/res/values-km-rKH/arrays.xml @@ -1,7 +1,7 @@ Displays some statistics and expiring reminders from Khmer Notes ការកំណត់ @@ -362,9 +365,9 @@ Send automatic report to developer?\" Actions Create new notes, sort them, access to preferences Navigate - Navigation menu allows you to move through notes with filters and tags + Navigation menu allows you to move through notes with filters and categories ពាក្យគន្លឺះ - Add colored tags to find notes at-a-glance + Add colored categories to organize notes at-a-glance Improve Add attachment of several kinds to your notes! Do more @@ -372,7 +375,7 @@ Send automatic report to developer?\" Just press Long pression have different effects on an object (attachment, location, reminder) than short pression! Links - Click on an URL or e-mail address to copy or open it + URL, e-mail addresses and telephone numbers recognition Swipe \"Create new notes without leaving the one you\'re editing\" diff --git a/omniNotes/src/main/res/values-land-v19/bools.xml b/omniNotes/src/main/res/values-land-v19/bools.xml index ef58e34eac..9ff55f6cb2 100644 --- a/omniNotes/src/main/res/values-land-v19/bools.xml +++ b/omniNotes/src/main/res/values-land-v19/bools.xml @@ -1,6 +1,6 @@ - - - 0dp - - \ No newline at end of file diff --git a/omniNotes/src/main/res/values-land/dimens.xml b/omniNotes/src/main/res/values-land/dimens.xml index 5270974ee7..08c2e263db 100644 --- a/omniNotes/src/main/res/values-land/dimens.xml +++ b/omniNotes/src/main/res/values-land/dimens.xml @@ -1,5 +1,5 @@ ສະແດງສະຖິຕິຈຳນວນໜຶ່ງ ແລະ ເຂົ້າເຖິງໂຕເຕືອນຄວາມຈຳຈາກ Omni Notes ການ​ຕັ້ງຄ່າ @@ -359,9 +362,9 @@ ການດຳເນີນການ ສ້າວບັນທຶກໃໝ່, ຈັດລຽງ, ເຂົ້າສູ່ການຕັ້ງຄ່າ ການຄວບຄຸມ - ເມນູການຄວບຄຸມເຮັດໃຫ້ທ່ານສາມາດຈັດການບັນທຶກດ້ວຍໂຕຄັດກອງ ແລະ ປ້າຍ + Navigation menu allows you to move through notes with filters and categories ປ້າຍ - ເພີ່ມປ້າຍສີເພື່ອເຮັດໃຫ້ຄວາມຈື່ຈຳຂອງທ່ານມີປະສິດທິຜົນ + Add colored categories to organize notes at-a-glance ປັບປຸງ ເພີ່ມຮຟລ໌ແນບຫຼາກຫຼາຍຮູບແບບໃສ່ບັນທຶກຂອງທ່ານ! ເຮັດໄດ້ອີກຫຼາຍຢ່າງ @@ -369,7 +372,7 @@ ກົດເລີຍ ການກົດໄລຍະສັ້ນ ຫຼື ຍາວໃສ່ສິ່ງຕ່າງໆ (ໄຟລ໌ແນບ, ສະຖານທີ່, ໂຕເຕືອນຄວາມຈຳ) ມີຜົນໄດ້ຮັບແຕກຕ່າງກັນ! ລິ້ງ - Click on an URL or e-mail address to copy or open it + URL, e-mail addresses and telephone numbers recognition Swipe Create new notes without \n leaving the one you\'re editing ຈັດເກັບ diff --git a/omniNotes/src/main/res/values-lv-rLV/arrays.xml b/omniNotes/src/main/res/values-lv-rLV/arrays.xml index 60688d2878..9ce577c5e1 100644 --- a/omniNotes/src/main/res/values-lv-rLV/arrays.xml +++ b/omniNotes/src/main/res/values-lv-rLV/arrays.xml @@ -1,7 +1,7 @@ Parāda nedaudz statistikas un izbeigušos atgādinājumus no Omni Notes Iestatījumi @@ -359,9 +362,9 @@ Darbības Veidojiet jaunas piezīmes, kārtojiet tās, piekļūstiet iestatījumiem Navigate - Navigation menu allows you to move through notes with filters and tags + Navigation menu allows you to move through notes with filters and categories Birkas - Add colored tags to find notes at-a-glance + Add colored categories to organize notes at-a-glance Improve Add attachment of several kinds to your notes! Do more @@ -369,7 +372,7 @@ Just press Long pression have different effects on an object (attachment, location, reminder) than short pression! Links - Click on an URL or e-mail address to copy or open it + URL, e-mail addresses and telephone numbers recognition Swipe Create new notes without \n leaving the one you\'re editing Saglabāt diff --git a/omniNotes/src/main/res/values-nl-rNL/arrays.xml b/omniNotes/src/main/res/values-nl-rNL/arrays.xml index 53a448145a..9f5b6e3b4c 100644 --- a/omniNotes/src/main/res/values-nl-rNL/arrays.xml +++ b/omniNotes/src/main/res/values-nl-rNL/arrays.xml @@ -1,7 +1,7 @@ Sommige statistieken en de naderende herinneringen van Omni notities worden weergegeven Instellingen @@ -359,9 +362,9 @@ acties Nieuwe notities maken, ze sorteren, toegang tot Voorkeuren Navigatie - Navigatie-menu laat toe u te verplaatsen door notities met filters en labels + Navigation menu allows you to move through notes with filters and categories Tags - Voeg gekleurde tags toe om uw bedenkingen efficiënt bij te houden + Add colored categories to organize notes at-a-glance Verbeteren Een heleboel verschillende bijlagentypen aan uw notities toevoegen! Meer doen @@ -369,7 +372,7 @@ Druk gewoon op Korte of lange drukken op objecten (bijlagen, locatie, herinnering) hebben verschillende effecten! Links - Klik op een URL of e-mailadres om het te kopiëren of te openen + URL, e-mail addresses and telephone numbers recognition Veeg Nieuwe notities maken zonder\ndegene die u aan het bewerken\n bent te verlaten Opslaan diff --git a/omniNotes/src/main/res/values-pl-rPL/arrays.xml b/omniNotes/src/main/res/values-pl-rPL/arrays.xml index e3367ed028..585c712683 100644 --- a/omniNotes/src/main/res/values-pl-rPL/arrays.xml +++ b/omniNotes/src/main/res/values-pl-rPL/arrays.xml @@ -1,7 +1,7 @@ Wyświetla niektóre statystyki i wygasłe przypomnienia z Omni Notes Ustawienia @@ -359,9 +362,9 @@ Działania Tworzenie nowych notatek, sortowanie ich, dostęp do preferencji Nawiguj - Menu nawigacji pozwala poruszać się wśród notatek z filtrami i znacznikami + Navigation menu allows you to move through notes with filters and categories Znaczniki - Dodaj kolorowe znaczniki, aby ułatwić wyszukiwanie notatki + Add colored categories to organize notes at-a-glance Ulepszenia Dodaj załącznik do kilku rodzajów notatek! Więcej @@ -369,7 +372,7 @@ Po prostu naciśnij Długi nacisk ma inne działanie na obiekt (załącznik, lokalizacja, przypomnienie) niż krótki nacisk! Linki - Kliknij na adres URL lub e-mail, aby go skopiować lub otworzyć + URL, e-mail addresses and telephone numbers recognition Przeciągnij Tworzenie nowych notatek bez \n pozostawiając jedną, którą edytujesz Zapisz diff --git a/omniNotes/src/main/res/values-pt-rBR/arrays.xml b/omniNotes/src/main/res/values-pt-rBR/arrays.xml index d7f281975d..403692e436 100644 --- a/omniNotes/src/main/res/values-pt-rBR/arrays.xml +++ b/omniNotes/src/main/res/values-pt-rBR/arrays.xml @@ -1,7 +1,7 @@ Mostra algumas estatísticas e próximos alertas do Omni Notes Configurações @@ -245,7 +248,7 @@ Insira uma nova senha Confirme a nova senha Senha alterada com sucesso - Password removed: all notes have been unlocked + Palavra-passe removida: todas as notas foram desbloqueadas Senha incorreta A senha está vazia Remover senha\ne desbloquear todas as notas bloqueadas? @@ -359,9 +362,9 @@ Ações Crie novas notas, ordene-as, acesse as preferências Navegar - O menu de navegação permite que você se mova através de notas com marcas e filtros + O menu de navegação permite-lhe mover-se entre notas usando filtros e categorias Marcas - Adicione marcas coloridas para manter seus pensamentos sempre organizados + Defina cores para as categorias para organizar notas facilmente Aprimore Adicione vários tipos diferentes de anexos a suas notas! Faça mais @@ -369,7 +372,7 @@ Basta tocar Toques curtos ou longos em objetos (anexos, locais, lembretes) têm funções diferentes! Links - Clique em uma URL ou endereço de email para copiar ou abrir + Reconhecimento de URLs, endereços de correio electrónico e números de telefone Deslize Crie novas notas sem \n sair daquela que você \n diff --git a/omniNotes/src/main/res/values-pt-rPT/arrays.xml b/omniNotes/src/main/res/values-pt-rPT/arrays.xml index d09adf2a4b..0b68f22a2a 100644 --- a/omniNotes/src/main/res/values-pt-rPT/arrays.xml +++ b/omniNotes/src/main/res/values-pt-rPT/arrays.xml @@ -1,7 +1,7 @@ Mostra algumas estatísticas e próximos alertas do Omni Notes Definições @@ -245,7 +248,7 @@ Insira uma nova palavra-passe Confirme a nova palavra-passe Palavra-passe alterada com sucesso - Password removed: all notes have been unlocked + Palavra-passe removida: todas as notas foram desbloqueadas Palavra-passe errada A palavra-passe está vazia Remover a palavra-passe\ne desbloquear todas as notas? @@ -359,9 +362,9 @@ Acções Criar novas notas, ordená-las, aceder às preferências Navegue - O menu de navegação permite-lhe mover-se entre notas com filtros e etiquetas + O menu de navegação permite-lhe mover-se entre notas usando filtros e categorias Classifique - Adicione etiquetas coloridas para manter os seus pensamentos sempre eficientes + Defina cores para as categorias para organizar notas facilmente Melhore Adicione muitos anexos de diferentes tipos às suas notas! Faça mais @@ -369,7 +372,7 @@ Basta pressionar Um toque curto ou longo em objectos (anexos, localização, alerta) tem efeitos diferentes! Ligações - Clique num URL ou endereço de email para o copiar ou abrir + Reconhecimento de URLs, endereços de correio electrónico e números de telefone Deslizar Crie novas notas sem sair \n daquela que está a editar Guarde diff --git a/omniNotes/src/main/res/values-ru-rRU/arrays.xml b/omniNotes/src/main/res/values-ru-rRU/arrays.xml index 5510dc8857..cb7fcf9588 100644 --- a/omniNotes/src/main/res/values-ru-rRU/arrays.xml +++ b/omniNotes/src/main/res/values-ru-rRU/arrays.xml @@ -1,7 +1,7 @@ Отображает некоторую статистику и ближайшие напоминания из Omni Notes Настройки @@ -245,7 +248,7 @@ Введите новый пароль Подтвердите новый пароль Пароль успешно изменен - Password removed: all notes have been unlocked + Пароль убран: все заметки разблокированы Пароль набран неправильно Пароль не установлен Удалить пароль и разблокировать заметки? @@ -359,7 +362,7 @@ Операции Создавайте новые заметки, сортируйте их и настраивайте под себя Навигация - Меню навигации позволит перейти к группированным и помеченным заметкам + Меню навигации упрощает переход между заметками по фильтрам и категориям Категории Создайте цветные категории, чтобы не терять заметки из виду Дополняйте @@ -369,7 +372,7 @@ Просто коснитесь Короткие или длительные нажатия на объектах (вложениях, размещениях, напоминаниях) действуют по-разному! Ссылки - Нажмите на URL или почтовый адрес, чтобы скопировать или открыть его + Распознавание ссылок, эл. адресов и телефонных номеров Жесты Создавайте новые заметки, не прекращая изменять предыдущие Сохранение diff --git a/omniNotes/src/main/res/values-sk-rSK/arrays.xml b/omniNotes/src/main/res/values-sk-rSK/arrays.xml index 3fe4ed3ee6..b4c0f3136b 100644 --- a/omniNotes/src/main/res/values-sk-rSK/arrays.xml +++ b/omniNotes/src/main/res/values-sk-rSK/arrays.xml @@ -1,7 +1,7 @@ Zobrazí niektoré štatistiky a blížiace sa pripomienky z Omni Notes Nastavenia @@ -359,9 +362,9 @@ Akcie Vytvárajte nové poznámky, zoradujte ich, pristupujte k nastaveniam Navigujte - Navigačná ponuka umožňuje prechádzať medzi poznámkami pomocou filtrov a značiek + Navigation menu allows you to move through notes with filters and categories Značky - Pridávajte farebné značky pre rýchle nájdenie poznámok + Add colored categories to organize notes at-a-glance Zlepšite Pridajte mnoho rôznych typov príloh do vašich poznámok! Urobte viac @@ -369,7 +372,7 @@ Stačí stlačiť Krátke alebo dlhé stlačenie objektov (prílohy, poloha, pripomienky) má odlišný efekt! Odkazy - Kliknite na URL alebo e-mailovú adresu pre jej skopírovanie alebo otvorenie + URL, e-mail addresses and telephone numbers recognition Potiahnite Vytvorte nové poznámky bez \n opustenia tej, ktorú upravujete Ukladajte diff --git a/omniNotes/src/main/res/values-sl-rSI/arrays.xml b/omniNotes/src/main/res/values-sl-rSI/arrays.xml index 702f6640ec..3b1d85b443 100644 --- a/omniNotes/src/main/res/values-sl-rSI/arrays.xml +++ b/omniNotes/src/main/res/values-sl-rSI/arrays.xml @@ -1,7 +1,7 @@ Prikaz nekaterih statistik in bližnjih opomnikov iz Omni Notes Nastavitve @@ -231,7 +234,7 @@ Obvestila Vibriranje Omogoči obstojnost obvestil - Allow the app to access notifications to make they survive to reboots + Aplikaciji omogočite dostop do obvestil, da se bodo ta ohranila po vnovičnem zagonu Krmarjenje Seznam sprememb Potrditev povezav @@ -245,7 +248,7 @@ Vnseite novo geslo Potrdite izbrano geslo Geslo uspešno spremenjeno - Password removed: all notes have been unlocked + Geslo odstranjeno: vse beležke so odklenjene Napačno geslo Geslo je prazno Odstranite geslo \n in odkleniti vse zaklenjeno ugotavlja? @@ -265,7 +268,7 @@ Beta O aplikaciji Google+ - Subscribe to the beta program to keep up to date with the latest features + Naročite se na beta program za uporabo najnovejših funkcij Doniraj Podpirati razvoj te vloge z neprofitno darovanja Jezik @@ -299,9 +302,9 @@ Nujen \"nazaj\" v seznam zapiskov odpira menije namesto izhoda Velikost pisave Vedenje - Swipe notes - Swipe on notes to perform actions - Swipe to trash + Podrsaj po beležkah + Podrsajte po beležkah za izvedbo dejanja + Podrsaj za izbris Drsna ugotavlja s prstom, bo shranjevanje Drsna beležke s prstom, bodo premaknjeni v koš Skupina ni kategorizirana @@ -315,43 +318,43 @@ Plavajočo vrstico z dejanji Kratek dotik izvede dejanje Kratek stik vklopi možnosti - Attachments on bottom - Shows attachments below note content - Shows attachments above note content - Prettified dates - Dates are shown in a simplier format - Dates are shown in a more detailed format - Privacy + Priponke na dnu + Priloge prikaži na dnu beležke + Priloge prikaži na vrhu beležke + Olepšani datumi + Datumi so prikazani v preprostejši obliki + Datumi so prikazani v bolj podrobni obliki + Zasebnost Poročanje o napakah Čas uporaba tresk razvijalec boste obveščeni, da vam pomaga Poročila ne tresk hoteti obstati odposlati. Se ne pritožujejo, če gre kaj narobe! - Share anonymous data - Help the developer by sending non-sensitive data like device model, language, frequently used app\'s features. This data are used only to improve the open-source app. + Deli anonimne podatke + Pomagajte razvijalcem s pošiljanjem neobčutljivih podatkov kot na primer model naprave, jezik, pogosto uporabljene funkcije. Ti podatki so uporabljeni izključno za izboljšanje odprtokodne aplikacije. Statistika - Total notes - Active notes - Archived notes - Trashed notes + Skupaj beležk + Aktivne beležke + Arhivirane beležke + Izbrisane beležke Opomniki - Future reminders + Opomniki v prihodnosti Seznami - Locked notes + Zaklenjene opombe Kategorije Značke Priključki Slike Videi - Audio recordings + Zvočni posnetki Skice Datoteke - Locations - Words - Max words - Average words - Chars - Max chars - Average chars + Lokacije + Besede + Največ besed + Povprečno besed + Znakov + Največ znakov + Povprečno znakov Si želite ob prvem zagonu ogledati krajšo predstavitev aplikacije? Dobrodošli v Omni Notes! @@ -359,9 +362,9 @@ Ravnanja Ustvarjanje beležk, razvrščanje, dostop do nastavitev Navigacija - Navigacijski meni omogoča premikanje med beležkami s filtri in značkami + Navigacijski meni vam omogoča, da se po beležkah premikate preko filtrov in kategorij Značke - Za boljšo preglednost dodaj obarvene značke + Dodajte barvne kategorije za pregledno organizacijo Izboljšave Vašim beležkam lahko dodate več vrst priponk! Še več @@ -369,14 +372,14 @@ Samo pritisnite Kratki in dolgi pritiski na objekte (priponke, lokacije, opomnike) učinkujejo različno! Povezave - Click on an URL or e-mail address to copy or open it + Prepoznava telefonskih številk, e-poštnih in URL naslovov Močan Ustvarite nove opombe brez \n zapušča tistega, ki ga urejate Shranjevanje Preprosto pritisnite navigacijsko ikono \"gor\" ali pojdite nazaj z navigacijsko tipko Uživajte - Thanks for using Omni Notes \nThe opensource alternative for productivity and leisure note-taking! - Subscribe to the community to participate! + Zahvaljujemo se vam za uporabo Omni Notes\nOdprtokodne alternative za produktivnost in shranjevanje raznih beležk! + Prijavite se v skupnost, da boste sodelovali! poteznik odprt poteznik zaprt diff --git a/omniNotes/src/main/res/values-sr-rSP/arrays.xml b/omniNotes/src/main/res/values-sr-rSP/arrays.xml index 402c168232..300d59b7f7 100644 --- a/omniNotes/src/main/res/values-sr-rSP/arrays.xml +++ b/omniNotes/src/main/res/values-sr-rSP/arrays.xml @@ -1,7 +1,7 @@ Приказује статистику и истекле подсетнике из Омни белешки Поставке @@ -359,9 +362,9 @@ Радње Направи нове белешке, сортирај, приступи подешавањима Крећите се - Навигациони мени омогућава кретање кроз белешке помоћу филтера и ознака + Навигациони мени омогућава кретање кроз белешке помоћу филтера и категорија Ознаке - Обојите ознаке да бисте препознали белешке на први поглед + Обојене категорије помажу у организовању белешки Побољшајте Додајте разноврсне прилоге вашим белешкама! Урадите више @@ -369,7 +372,7 @@ Само притисните Дуг додир има различито деловање на објекте (прилоге, локацију, подсетник) од кратког додира! Везе - Додирните УРЛ или адресу е-поште да је копирате или отворите + Препознавање УРЛ, е-поште и телефонских бројева Превлачење Направите нове белешке\nбез напуштања текуће Сачувај diff --git a/omniNotes/src/main/res/values-sv-rSE/arrays.xml b/omniNotes/src/main/res/values-sv-rSE/arrays.xml index 3978239008..c21eeca0b9 100644 --- a/omniNotes/src/main/res/values-sv-rSE/arrays.xml +++ b/omniNotes/src/main/res/values-sv-rSE/arrays.xml @@ -1,7 +1,7 @@ Visar statistik och närliggande påminnelser från Omni Tools Inställningar @@ -359,9 +362,9 @@ Val Skapa nya anteckningar, sortera dem, kom åt preferenserna Navigera - Navigeringsmenyn låter dig bläddra igenom anteckningar med filter och etiketter + Navigation menu allows you to move through notes with filters and categories Ettiktetter - Lägg till färgade etiketter göra dina tankar alltid effektiva + Add colored categories to organize notes at-a-glance Förbättra Lägg till en mängd olika typer av bifogningar till dina anteckningar! Gör mer @@ -369,7 +372,7 @@ Bara tryck Korta eller långa funktioner på objekt (bifogningar, plats, påminnelse) har ny effekt! Länkar - Klicka på en URL eller e-postadress för att kopiera eller öppna den + URL, e-mail addresses and telephone numbers recognition Dra Skapa nya anteckningar \n utan att stänga den du skriver Spara diff --git a/omniNotes/src/main/res/values-sw360dp/dimens.xml b/omniNotes/src/main/res/values-sw360dp/dimens.xml index a3d1d52a14..5ee10dd7ac 100644 --- a/omniNotes/src/main/res/values-sw360dp/dimens.xml +++ b/omniNotes/src/main/res/values-sw360dp/dimens.xml @@ -1,4 +1,21 @@ + + 304dp - \ No newline at end of file + diff --git a/omniNotes/src/main/res/values-sw384dp/dimens.xml b/omniNotes/src/main/res/values-sw384dp/dimens.xml index e2b38dc8a5..4314fd6519 100644 --- a/omniNotes/src/main/res/values-sw384dp/dimens.xml +++ b/omniNotes/src/main/res/values-sw384dp/dimens.xml @@ -1,4 +1,21 @@ + + 320dp - \ No newline at end of file + diff --git a/omniNotes/src/main/res/values-sw600dp-land/dimens.xml b/omniNotes/src/main/res/values-sw600dp-land/dimens.xml index 54db344508..b6d42c5d18 100644 --- a/omniNotes/src/main/res/values-sw600dp-land/dimens.xml +++ b/omniNotes/src/main/res/values-sw600dp-land/dimens.xml @@ -1,5 +1,5 @@ Yaklaşan hatırlatmalarınızı ve not sayılarınızı görüntüleyebirsiniz Ayarlar @@ -359,9 +362,9 @@ Eylemler Yeni not oluştur, sırala ve tercihlere git Ana Menü - Ana Menü sayesinde not ve etiketlere kolayca ulaşabilirsiniz + Navigation menu allows you to move through notes with filters and categories Etiketler - Notlarını verimli kullanmak için etiketle ve renklindir + Add colored categories to organize notes at-a-glance Geliştir Notlarınıza farklı ekler ekliyebilirsiniz Daha fazla @@ -369,7 +372,7 @@ Sadece dokunun Uzun veya kısa dokunuşlar farklı işlevlere sahiptir(konum, hatırlatma) Bağlantılar - URL veya e-posta adresini kopyalamak veya açmak için tıklayın + URL, e-mail addresses and telephone numbers recognition Kaydır Düzenlediğiniz bir nottan ayrılmadan \n yeni notlar oluştur Kaydet diff --git a/omniNotes/src/main/res/values-uk-rUA/arrays.xml b/omniNotes/src/main/res/values-uk-rUA/arrays.xml index b582a2bc20..1f76eab17c 100644 --- a/omniNotes/src/main/res/values-uk-rUA/arrays.xml +++ b/omniNotes/src/main/res/values-uk-rUA/arrays.xml @@ -1,7 +1,7 @@ Відображає деяку статистику і найближчі події в Omni Notes Налаштування @@ -364,9 +367,9 @@ Дії Створюйте нові нотатки, сортуйте їх, налаштовуйте Навігація - Меню навігації дозволяє вам переглядати нотатки за допомогою фільтрів та ярличків + Navigation menu allows you to move through notes with filters and categories Ярлички - Додавайте кольорові ярлички, щоб зберігати ваші думки ефективно + Add colored categories to organize notes at-a-glance Покращення Додавайте різноманітні вкладення до ваших нотаток! Ще більше @@ -374,7 +377,7 @@ Просто натисніть Короткі або тривалі натискання по елементах (вкладення, розташування, нагадування) мають різний ефект! Посилання - Двічі торкніться веб-посилання чи адреси електронної пошти, щоб скопіювати чи відкрити їх + URL, e-mail addresses and telephone numbers recognition Провести пальцем Створюйте нові нататки \n без потреби збереження попередньої Збереження diff --git a/omniNotes/src/main/res/values-v19/bools.xml b/omniNotes/src/main/res/values-v19/bools.xml index 696941b504..c2fcb6d7a6 100644 --- a/omniNotes/src/main/res/values-v19/bools.xml +++ b/omniNotes/src/main/res/values-v19/bools.xml @@ -1,6 +1,6 @@ - - - - - \ No newline at end of file + diff --git a/omniNotes/src/main/res/values-v21/styles.xml b/omniNotes/src/main/res/values-v21/styles.xml index 4c7e2222a5..6a4be0c3e8 100644 --- a/omniNotes/src/main/res/values-v21/styles.xml +++ b/omniNotes/src/main/res/values-v21/styles.xml @@ -1,5 +1,5 @@ - - - - \ No newline at end of file + diff --git a/omniNotes/src/main/res/values-v23/styles.xml b/omniNotes/src/main/res/values-v23/styles.xml index 3a384ba6f7..648708fb0c 100644 --- a/omniNotes/src/main/res/values-v23/styles.xml +++ b/omniNotes/src/main/res/values-v23/styles.xml @@ -1,7 +1,7 @@ 显示Omni Notes统计数据及最近提醒 设置 @@ -359,9 +362,9 @@ 操作 创建新记事并排序，访问首选项 导航 - 使用导航菜单筛选并分类查看记事 + Navigation menu allows you to move through notes with filters and categories 标签 - 添加不同颜色的标签以便更加有效的管理您的记事 + Add colored categories to organize notes at-a-glance 改进 为您的记事添加不同类型的附件！ 更多功能 @@ -369,7 +372,7 @@ 只需点击 在附件，地点及提醒上点击或长按会有不同的效果！ 链接 - 点击网址或邮箱链接来复制或者打开它 + URL, e-mail addresses and telephone numbers recognition 滑动手势 在当前记事编辑视图下 \n 创建新记事 保存 diff --git a/omniNotes/src/main/res/values-zh-rTW/arrays.xml b/omniNotes/src/main/res/values-zh-rTW/arrays.xml index ccd508e49b..8e92643f5f 100644 --- a/omniNotes/src/main/res/values-zh-rTW/arrays.xml +++ b/omniNotes/src/main/res/values-zh-rTW/arrays.xml @@ -1,7 +1,7 @@ 显示Omni Notes统计数据及最近提醒 设置 @@ -359,9 +362,9 @@ 操作 创建新记事并排序，访问首选项 导航 - 使用导航菜单筛选并分类查看记事 + Navigation menu allows you to move through notes with filters and categories 标签 - 添加不同颜色的标签以便更加有效的管理您的记事 + Add colored categories to organize notes at-a-glance 改进 为您的记事添加不同类型的附件！ 更多功能 @@ -369,7 +372,7 @@ 只需点击 在附件，地点及提醒上点击或长按会有不同的效果！ 链接 - 點擊網址或電子郵件地址來複製或打開它 + URL, e-mail addresses and telephone numbers recognition 滑动手势 在当前记事编辑视图下 \n 创建新记事 保存 diff --git a/omniNotes/src/main/res/values/analytics.xml b/omniNotes/src/main/res/values/analytics.xml index a612686c23..2e30e0a06e 100644 --- a/omniNotes/src/main/res/values/analytics.xml +++ b/omniNotes/src/main/res/values/analytics.xml @@ -1,6 +1,6 @@ 24dp - - 48dp - - 42dp @@ -66,8 +62,8 @@ 16sp - 10dp - 10dp + 12dp + 12dp 8dp @@ -77,4 +73,4 @@ 24dp 64dp - \ No newline at end of file + diff --git a/omniNotes/src/main/res/values/integers.xml b/omniNotes/src/main/res/values/integers.xml index 66afa522d8..4af7e5e9ea 100644 --- a/omniNotes/src/main/res/values/integers.xml +++ b/omniNotes/src/main/res/values/integers.xml @@ -1,5 +1,5 @@ Displays some statistics and expiring reminders from Omni Notes @@ -378,9 +381,9 @@ Actions Create new notes, sort them, access to preferences Navigate - Navigation menu allows you to move through notes with filters and tags + Navigation menu allows you to move through notes with filters and categories Tags - Add colored tags to find notes at-a-glance + Add colored categories to organize notes at-a-glance Improve Add attachment of several kinds to your notes! Do more @@ -388,14 +391,14 @@ Just press Long pression have different effects on an object (attachment, location, reminder) than short pression! Links - Click on an URL or e-mail address to copy or open it + URL, e-mail addresses and telephone numbers recognition Swipe Create new notes without \n leaving the one you\'re editing Save To go back, press the \"up\" navigation icon, or your device button Enjoy Thanks for using Omni Notes \nThe opensource alternative for productivity and leisure note-taking! - Subscribe to the community to participate! + Subscribe to the communities to participate! drawer open diff --git a/omniNotes/src/main/res/values/styles.xml b/omniNotes/src/main/res/values/styles.xml index e964e53b9f..461fd6af07 100644 --- a/omniNotes/src/main/res/values/styles.xml +++ b/omniNotes/src/main/res/values/styles.xml @@ -1,7 +1,7 @@ + ~ Copyright (C) 2018 Federico Iosue (federico.iosue@gmail.com) + ~ + ~ This program is free software: you can redistribute it and/or modify + ~ it under the terms of the GNU General Public License as published by + ~ the Free Software Foundation, either version 3 of the License, or + ~ (at your option) any later version. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ~ GNU General Public License for more details. + ~ + ~ You should have received a copy of the GNU General Public License + ~ along with this program. If not, see . + --> diff --git a/omniNotes/src/main/res/xml/settings_interface.xml b/omniNotes/src/main/res/xml/settings_interface.xml index e46942d619..24c834ee53 100644 --- a/omniNotes/src/main/res/xml/settings_interface.xml +++ b/omniNotes/src/main/res/xml/settings_interface.xml @@ -1,5 +1,5 @@