Use file based copyright notices so its more clear whats originating …

…from which project
MohammedBelkacem · Sep 20, 2017 · 40e2337 · 40e2337
1 parent c32afb8
commit 40e2337
Show file tree

Hide file tree

Showing 37 changed files with 291 additions and 111 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,7 +1,8 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2016 Jeff Martin, Pedro Lafuente and writeily contributors
-Copyright (c) 2017 Gregor Santner and markor contributors
+Copyright (c) 2014 Jeff Martin
+Copyright (c) 2015 Pedro Lafuente
+Copyright (c) 2017 Gregor Santner and Markor contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -8,7 +8,8 @@
 
 # Markor
 <img src="/app/src/main/ic_launcher-web.png" align="left" width="100" hspace="10" vspace="10">
-Minimalist Markdown editor for Android<br/>Fork of the unmaintained project writeily-pro.<br/><br/>
+<b>Markdown Texteditor for Android</b> for notes and files. Simple and lightweight.
+<br/> Write down your notes and ideas!<br/><br/>
 
 <div style="display:flex;" >
 <a href="https://f-droid.org/repository/browse/?fdid=net.gsantner.markor">
@@ -21,17 +22,17 @@ Minimalist Markdown editor for Android<br/>Fork of the unmaintained project writ
 
 
 ## Description
-<b>Markdown Editor</b> for notes and files. Simple and lightweight.
-<br/>📝 Edit markdown with highlighting
-<br/>👀 Preview rendered markdown
+<b>Markdown Texteditor</b> for notes and files. Simple and lightweight.
+<br/>📝 Write down notes and ideas
+<br/>🖍 Edit textfiles in markdown format
 <br/>📚 Notebook in Documents or custom folder
 <br/>📖 Notebook with subfolder support
-<br/>📄 Edit markdown files from e.g. filemanager
+<br/>📄 Edit markdown files from other apps
+<br/>👀 Preview rendered markdown
 <br/>🔲 Dark and Light theme
 <br/>📜 Allows to set language other than system setting
 <br/>
 
-
 ### Privacy<a name="privacy"></a>
 The app doesn't use your internet connection unless external resources (e.g. pictures) are referenced in the user created markdown (text) document files. Otherwise it's working completly offline. No personal data, like calendar or contacts information are requested or shared. The created markdown documents can be shared to other apps (text only) from inside the app by pressing the share button. Document will be stored locally in the device public documents folder or a custom folder.
 
@@ -45,11 +46,12 @@ Translations can be contributed on GitHub or via [E-Mail](https://gsantner.githu
 #### Resources
 * Project: [Changelog](/CHANGELOG.md) | [Issues level/beginner](https://github.com/gsantner/markor/issues?q=is%3Aissue+is%3Aopen+label%3Alevel%2Fbeginner) | [License](/LICENSE.txt) | [CoC](/CODE_OF_CONDUCT.md)
 * App on F-Droid: [Metadata](https://gitlab.com/fdroid/fdroiddata/blob/master/metadata/net.gsantner.markor.txt) | [Page](https://f-droid.org/packages/net.gsantner.markor/) | [Wiki](https://f-droid.org/wiki/page/net.gsantner.markor) | [Build log](https://f-droid.org/wiki/page/net.gsantner.markor/lastbuild)
- 
+
 ## Licensing
-The code of the app is licensed MIT. Localization files and resources (string\*.xml) are licensed CC0 1.0. It is based on unmaintained projects writeily and writeily-pro.  
-Copyright (c) 2014-2016 Jeff Martin, Pedro Lafuente and writeily contributors  
-Copyright (c) 2017 Gregor Santner and markor contributors  
+The code of the app is licensed MIT (See [LICENSE](/LICENSE.txt) for details).  
+Localization files and resources (string\*.xml) are licensed CC0 1.0.  
+Project is based on unmaintained projects writeily and writeily-pro.
+
 
 ## Screenshots
 <div style="display:flex;" >

diff --git a/app/src/main/java/net/gsantner/markor/App.java b/app/src/main/java/net/gsantner/markor/App.java
@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) 2017 Gregor Santner and Markor contributors
+ *
+ * Licensed under the MIT license. See LICENSE file in the project root for details.
+ */
 package net.gsantner.markor;
 
 import android.app.Application;

diff --git a/app/src/main/java/net/gsantner/markor/activity/FilesystemListFragment.java b/app/src/main/java/net/gsantner/markor/activity/FilesystemListFragment.java
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2014 Jeff Martin
+ * Copyright (c) 2015 Pedro Lafuente
+ * Copyright (c) 2017 Gregor Santner and Markor contributors
+ *
+ * Licensed under the MIT license. See LICENSE file in the project root for details.
+ */
 package net.gsantner.markor.activity;
 
 import android.content.Context;
@@ -44,8 +51,6 @@
 
 public class FilesystemListFragment extends Fragment {
 
-    public static final int RENAME_CONTEXT_BUTTON_ID = 103;
-
     @BindView(R.id.filesystemlist__fragment__listview)
     public ListView _filesListView;
 

diff --git a/app/src/main/java/net/gsantner/markor/activity/MainActivity.java b/app/src/main/java/net/gsantner/markor/activity/MainActivity.java
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2014 Jeff Martin
+ * Copyright (c) 2015 Pedro Lafuente
+ * Copyright (c) 2017 Gregor Santner and Markor contributors
+ *
+ * Licensed under the MIT license. See LICENSE file in the project root for details.
+ */
 package net.gsantner.markor.activity;
 
 import android.app.SearchManager;

diff --git a/app/src/main/java/net/gsantner/markor/activity/NoteActivity.java b/app/src/main/java/net/gsantner/markor/activity/NoteActivity.java
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2014 Jeff Martin
+ * Copyright (c) 2015 Pedro Lafuente
+ * Copyright (c) 2017 Gregor Santner and Markor contributors
+ *
+ * Licensed under the MIT license. See LICENSE file in the project root for details.
+ */
 package net.gsantner.markor.activity;
 
 import android.appwidget.AppWidgetManager;
@@ -29,7 +36,6 @@
 import net.gsantner.markor.util.AppSettings;
 import net.gsantner.markor.util.ContextUtils;
 import net.gsantner.markor.widget.MarkorWidgetProvider;
-import net.gsantner.markor.util.Utils;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -309,7 +315,7 @@ private void saveNote() {
                 _note = new File(parent, filename);
             }
             else if (!filename.equals(_initialFileName)) {
-                Utils.renameFileInSameFolder(_note, filename, parent);
+                net.gsantner.opoc.util.ContextUtils.renameFileInSameFolder(_note, filename, parent);
                 _note = new File(parent, filename);
             }
 

diff --git a/app/src/main/java/net/gsantner/markor/activity/PreviewActivity.java b/app/src/main/java/net/gsantner/markor/activity/PreviewActivity.java
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2014 Jeff Martin
+ * Copyright (c) 2015 Pedro Lafuente
+ * Copyright (c) 2017 Gregor Santner and Markor contributors
+ *
+ * Licensed under the MIT license. See LICENSE file in the project root for details.
+ */
 package net.gsantner.markor.activity;
 
 import android.content.Intent;

diff --git a/app/src/main/java/net/gsantner/markor/activity/SettingsActivity.java b/app/src/main/java/net/gsantner/markor/activity/SettingsActivity.java
@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) 2017 Gregor Santner and Markor contributors
+ *
+ * Licensed under the MIT license. See LICENSE file in the project root for details.
+ */
 package net.gsantner.markor.activity;
 
 import android.app.FragmentTransaction;

diff --git a/app/src/main/java/net/gsantner/markor/adapter/NotesAdapter.java b/app/src/main/java/net/gsantner/markor/adapter/NotesAdapter.java
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2014 Jeff Martin
+ * Copyright (c) 2015 Pedro Lafuente
+ * Copyright (c) 2017 Gregor Santner and Markor contributors
+ *
+ * Licensed under the MIT license. See LICENSE file in the project root for details.
+ */
 package net.gsantner.markor.adapter;
 
 import android.content.Context;

diff --git a/app/src/main/java/net/gsantner/markor/dialog/ConfirmDialog.java b/app/src/main/java/net/gsantner/markor/dialog/ConfirmDialog.java
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2014 Jeff Martin
+ * Copyright (c) 2015 Pedro Lafuente
+ * Copyright (c) 2017 Gregor Santner and Markor contributors
+ *
+ * Licensed under the MIT license. See LICENSE file in the project root for details.
+ */
 package net.gsantner.markor.dialog;
 
 import android.app.Dialog;

diff --git a/app/src/main/java/net/gsantner/markor/dialog/CreateFolderDialog.java b/app/src/main/java/net/gsantner/markor/dialog/CreateFolderDialog.java
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2014 Jeff Martin
+ * Copyright (c) 2015 Pedro Lafuente
+ * Copyright (c) 2017 Gregor Santner and Markor contributors
+ *
+ * Licensed under the MIT license. See LICENSE file in the project root for details.
+ */
 package net.gsantner.markor.dialog;
 
 import android.app.Dialog;

diff --git a/app/src/main/java/net/gsantner/markor/dialog/RenameDialog.java b/app/src/main/java/net/gsantner/markor/dialog/RenameDialog.java
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2014 Jeff Martin
+ * Copyright (c) 2015 Pedro Lafuente
+ * Copyright (c) 2017 Gregor Santner and Markor contributors
+ *
+ * Licensed under the MIT license. See LICENSE file in the project root for details.
+ */
 package net.gsantner.markor.dialog;
 
 import android.app.Dialog;
@@ -14,7 +21,7 @@
 import net.gsantner.markor.R;
 import net.gsantner.markor.util.AppCast;
 import net.gsantner.markor.util.AppSettings;
-import net.gsantner.markor.util.Utils;
+import net.gsantner.opoc.util.ContextUtils;
 
 import java.io.File;
 
@@ -66,7 +73,7 @@ private AlertDialog.Builder setUpDialog(final File file, LayoutInflater inflater
         dialogBuilder.setPositiveButton(getString(android.R.string.ok), new
                 DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int which) {
-                        if (Utils.renameFileInSameFolder(file, _newNameField.getText().toString(), getActivity().getCacheDir().toString())) {
+                        if (ContextUtils.renameFileInSameFolder(file, _newNameField.getText().toString(), getActivity().getCacheDir().toString())) {
                             AppCast.VIEW_FOLDER_CHANGED.send(getContext(), file.getParent(), true);
                         }
                     }

diff --git a/app/src/main/java/net/gsantner/markor/editor/HeaderSpanCreator.java b/app/src/main/java/net/gsantner/markor/editor/HeaderSpanCreator.java
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2014 Jeff Martin
+ * Copyright (c) 2015 Pedro Lafuente
+ * Copyright (c) 2017 Gregor Santner and Markor contributors
+ *
+ * Licensed under the MIT license. See LICENSE file in the project root for details.
+ */
 package net.gsantner.markor.editor;
 
 import android.content.res.ColorStateList;

diff --git a/app/src/main/java/net/gsantner/markor/editor/Highlighter.java b/app/src/main/java/net/gsantner/markor/editor/Highlighter.java
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2014 Jeff Martin
+ * Copyright (c) 2015 Pedro Lafuente
+ * Copyright (c) 2017 Gregor Santner and Markor contributors
+ *
+ * Licensed under the MIT license. See LICENSE file in the project root for details.
+ */
 package net.gsantner.markor.editor;
 
 import android.graphics.Typeface;

diff --git a/app/src/main/java/net/gsantner/markor/editor/HighlighterColors.java b/app/src/main/java/net/gsantner/markor/editor/HighlighterColors.java
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2014 Jeff Martin
+ * Copyright (c) 2015 Pedro Lafuente
+ * Copyright (c) 2017 Gregor Santner and Markor contributors
+ *
+ * Licensed under the MIT license. See LICENSE file in the project root for details.
+ */
 package net.gsantner.markor.editor;
 
 public interface HighlighterColors {

diff --git a/app/src/main/java/net/gsantner/markor/editor/HighlighterPattern.java b/app/src/main/java/net/gsantner/markor/editor/HighlighterPattern.java
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2014 Jeff Martin
+ * Copyright (c) 2015 Pedro Lafuente
+ * Copyright (c) 2017 Gregor Santner and Markor contributors
+ *
+ * Licensed under the MIT license. See LICENSE file in the project root for details.
+ */
 package net.gsantner.markor.editor;
 
 import java.util.regex.Pattern;

diff --git a/app/src/main/java/net/gsantner/markor/editor/HighlightingEditor.java b/app/src/main/java/net/gsantner/markor/editor/HighlightingEditor.java
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2014 Jeff Martin
+ * Copyright (c) 2015 Pedro Lafuente
+ * Copyright (c) 2017 Gregor Santner and Markor contributors
+ *
+ * Licensed under the MIT license. See LICENSE file in the project root for details.
+ */
 package net.gsantner.markor.editor;
 
 import android.content.Context;

diff --git a/app/src/main/java/net/gsantner/markor/editor/MyHighlighterColorsNeutral.java b/app/src/main/java/net/gsantner/markor/editor/MyHighlighterColorsNeutral.java
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2014 Jeff Martin
+ * Copyright (c) 2015 Pedro Lafuente
+ * Copyright (c) 2017 Gregor Santner and Markor contributors
+ *
+ * Licensed under the MIT license. See LICENSE file in the project root for details.
+ */
 package net.gsantner.markor.editor;
 
 class MyHighlighterColorsNeutral implements HighlighterColors {

diff --git a/app/src/main/java/net/gsantner/markor/editor/SpanCreator.java b/app/src/main/java/net/gsantner/markor/editor/SpanCreator.java
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2014 Jeff Martin
+ * Copyright (c) 2015 Pedro Lafuente
+ * Copyright (c) 2017 Gregor Santner and Markor contributors
+ *
+ * Licensed under the MIT license. See LICENSE file in the project root for details.
+ */
 package net.gsantner.markor.editor;
 
 import android.text.ParcelableSpan;

diff --git a/app/src/main/java/net/gsantner/markor/model/Constants.java b/app/src/main/java/net/gsantner/markor/model/Constants.java
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2014 Jeff Martin
+ * Copyright (c) 2015 Pedro Lafuente
+ * Copyright (c) 2017 Gregor Santner and Markor contributors
+ *
+ * Licensed under the MIT license. See LICENSE file in the project root for details.
+ */
 package net.gsantner.markor.model;
 
 import java.util.regex.Pattern;
@@ -20,15 +27,12 @@ public class Constants {
     public static final String FILESYSTEM_IMPORT_DIALOG_TAG = "filesystem_import_dialog_tag";
     public static final String FILESYSTEM_MOVE_DIALOG_TAG = "filesystem_move_dialog_tag";
     public static final String FILESYSTEM_SELECT_FOLDER_TAG = "filesystem_select_folder_dialog_tag";
-    public static final String RENAME_DIALOG_TAG = "RENAME_DIALOG_TAG";
 
     // ----- KEYS -----
     public static final String CURRENT_DIRECTORY_DIALOG_KEY = "current_dir_folder_key";
     public static final String NOTE_KEY = "note_key";
     public static final String MD_PREVIEW_BASE = "md_preview_base";
     public static final String MD_PREVIEW_KEY = "md_preview_key";
-    public static final String RENAME_NEW_NAME = "RENAME_NEW_NAME";
-    public static final String SOURCE_FILE = "SOURCE_FILE";
 
     // ----- HTML PREFIX AND SUFFIXES -----
     public static final String UNSTYLED_HTML_PREFIX = "<html><body>";

diff --git a/app/src/main/java/net/gsantner/markor/model/MarkorSingleton.java b/app/src/main/java/net/gsantner/markor/model/MarkorSingleton.java
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2014 Jeff Martin
+ * Copyright (c) 2015 Pedro Lafuente
+ * Copyright (c) 2017 Gregor Santner and Markor contributors
+ *
+ * Licensed under the MIT license. See LICENSE file in the project root for details.
+ */
 package net.gsantner.markor.model;
 
 import android.content.Context;

diff --git a/app/src/main/java/net/gsantner/markor/renderer/MarkDownRenderer.java b/app/src/main/java/net/gsantner/markor/renderer/MarkDownRenderer.java
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2014 Jeff Martin
+ * Copyright (c) 2015 Pedro Lafuente
+ * Copyright (c) 2017 Gregor Santner and Markor contributors
+ *
+ * Licensed under the MIT license. See LICENSE file in the project root for details.
+ */
 package net.gsantner.markor.renderer;
 
 import android.content.Context;

diff --git a/app/src/main/java/net/gsantner/markor/util/AndroidBug5497Workaround.java b/app/src/main/java/net/gsantner/markor/util/AndroidBug5497Workaround.java
@@ -1,13 +1,17 @@
+/*
+ * Copyright (c) 2013-2017 Joseph Johnson https://stackoverflow.com/a/19494006
+ * Copyright (c) 2017 Gregor Santner and Markor contributors
+ *
+ * Licensed under the MIT license. See LICENSE file in the project root for details.
+ */
 package net.gsantner.markor.util;
 
-
 import android.app.Activity;
 import android.graphics.Rect;
 import android.view.View;
 import android.view.ViewTreeObserver;
 import android.widget.FrameLayout;
 
-// From https://stackoverflow.com/a/19494006
 public class AndroidBug5497Workaround {
 
     // For more information, see https://code.google.com/p/android/issues/detail?id=5497

diff --git a/app/src/main/java/net/gsantner/markor/util/AppCast.java b/app/src/main/java/net/gsantner/markor/util/AppCast.java
@@ -1,6 +1,10 @@
+/*
+ * Copyright (c) 2017 Gregor Santner and Markor contributors
+ *
+ * Licensed under the MIT license. See LICENSE file in the project root for details.
+ */
 package net.gsantner.markor.util;
 
-
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;

diff --git a/app/src/main/java/net/gsantner/markor/util/AppSettings.java b/app/src/main/java/net/gsantner/markor/util/AppSettings.java
@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) 2017 Gregor Santner and Markor contributors
+ *
+ * Licensed under the MIT license. See LICENSE file in the project root for details.
+ */
 package net.gsantner.markor.util;
 
 import android.content.Context;

diff --git a/app/src/main/java/net/gsantner/markor/util/ContextUtils.java b/app/src/main/java/net/gsantner/markor/util/ContextUtils.java
@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) 2017 Gregor Santner and Markor contributors
+ *
+ * Licensed under the MIT license. See LICENSE file in the project root for details.
+ */
 package net.gsantner.markor.util;
 
 import android.content.Context;

diff --git a/app/src/main/java/net/gsantner/markor/util/PermissionChecker.java b/app/src/main/java/net/gsantner/markor/util/PermissionChecker.java
@@ -1,3 +1,8 @@
+/*
+ * Copyright (c) 2017 Gregor Santner and Markor contributors
+ *
+ * Licensed under the MIT license. See LICENSE file in the project root for details.
+ */
 package net.gsantner.markor.util;
 
 import android.Manifest;