diff --git a/app/build.gradle b/app/build.gradle index efd0a33..1d7a1c8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,7 +20,7 @@ android { compileSdkVersion 24 buildToolsVersion "24.0.2" defaultConfig { - applicationId "org.houxg.leanotelite" + applicationId "org.houxg.leamonax" minSdkVersion 21 targetSdkVersion 23 versionCode 1 diff --git a/app/src/androidTest/java/org/houxg/leanotelite/ExampleInstrumentedTest.java b/app/src/androidTest/java/org/houxg/leamonax/ExampleInstrumentedTest.java similarity index 85% rename from app/src/androidTest/java/org/houxg/leanotelite/ExampleInstrumentedTest.java rename to app/src/androidTest/java/org/houxg/leamonax/ExampleInstrumentedTest.java index f64cdf4..a5b71d6 100644 --- a/app/src/androidTest/java/org/houxg/leanotelite/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/org/houxg/leamonax/ExampleInstrumentedTest.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite; +package org.houxg.leamonax; import android.content.Context; import android.support.test.InstrumentationRegistry; @@ -21,6 +21,6 @@ public class ExampleInstrumentedTest { // Context of the app under test. Context appContext = InstrumentationRegistry.getTargetContext(); - assertEquals("org.houxg.leanotelite", appContext.getPackageName()); + assertEquals("org.houxg.leamonax", appContext.getPackageName()); } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f0fe5b2..65711b6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="org.houxg.leamonax"> @@ -12,14 +12,14 @@ - + @@ -27,21 +27,21 @@ - + diff --git a/app/src/main/java/org/houxg/leanotelite/LeanoteLite.java b/app/src/main/java/org/houxg/leamonax/Leamonax.java similarity index 92% rename from app/src/main/java/org/houxg/leanotelite/LeanoteLite.java rename to app/src/main/java/org/houxg/leamonax/Leamonax.java index 0f78164..076ffaa 100644 --- a/app/src/main/java/org/houxg/leanotelite/LeanoteLite.java +++ b/app/src/main/java/org/houxg/leamonax/Leamonax.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite; +package org.houxg.leamonax; import android.app.Application; @@ -11,7 +11,7 @@ import com.raizlabs.android.dbflow.config.FlowManager; import org.greenrobot.eventbus.EventBus; -public class LeanoteLite extends Application { +public class Leamonax extends Application { private static Context mContext; diff --git a/app/src/main/java/org/houxg/leanotelite/adapter/NoteAdapter.java b/app/src/main/java/org/houxg/leamonax/adapter/NoteAdapter.java similarity index 94% rename from app/src/main/java/org/houxg/leanotelite/adapter/NoteAdapter.java rename to app/src/main/java/org/houxg/leamonax/adapter/NoteAdapter.java index 32015d2..2191386 100644 --- a/app/src/main/java/org/houxg/leanotelite/adapter/NoteAdapter.java +++ b/app/src/main/java/org/houxg/leamonax/adapter/NoteAdapter.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.adapter; +package org.houxg.leamonax.adapter; import android.content.Context; @@ -9,12 +9,12 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import org.houxg.leanotelite.R; -import org.houxg.leanotelite.database.AppDataBase; -import org.houxg.leanotelite.model.Note; -import org.houxg.leanotelite.model.Notebook; -import org.houxg.leanotelite.service.AccountService; -import org.houxg.leanotelite.utils.TimeUtils; +import org.houxg.leamonax.R; +import org.houxg.leamonax.database.AppDataBase; +import org.houxg.leamonax.model.Note; +import org.houxg.leamonax.model.Notebook; +import org.houxg.leamonax.service.AccountService; +import org.houxg.leamonax.utils.TimeUtils; import java.util.Collections; import java.util.Comparator; diff --git a/app/src/main/java/org/houxg/leanotelite/adapter/NotebookAdapter.java b/app/src/main/java/org/houxg/leamonax/adapter/NotebookAdapter.java similarity index 95% rename from app/src/main/java/org/houxg/leanotelite/adapter/NotebookAdapter.java rename to app/src/main/java/org/houxg/leamonax/adapter/NotebookAdapter.java index 5c98827..b076757 100644 --- a/app/src/main/java/org/houxg/leanotelite/adapter/NotebookAdapter.java +++ b/app/src/main/java/org/houxg/leamonax/adapter/NotebookAdapter.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.adapter; +package org.houxg.leamonax.adapter; import android.support.v7.widget.RecyclerView; @@ -7,11 +7,11 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import org.houxg.leanotelite.R; -import org.houxg.leanotelite.database.AppDataBase; -import org.houxg.leanotelite.model.Notebook; -import org.houxg.leanotelite.service.AccountService; -import org.houxg.leanotelite.utils.CollectionUtils; +import org.houxg.leamonax.R; +import org.houxg.leamonax.database.AppDataBase; +import org.houxg.leamonax.model.Notebook; +import org.houxg.leamonax.service.AccountService; +import org.houxg.leamonax.utils.CollectionUtils; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/org/houxg/leanotelite/background/NoteSyncService.java b/app/src/main/java/org/houxg/leamonax/background/NoteSyncService.java similarity index 92% rename from app/src/main/java/org/houxg/leanotelite/background/NoteSyncService.java rename to app/src/main/java/org/houxg/leamonax/background/NoteSyncService.java index eef587d..6add749 100644 --- a/app/src/main/java/org/houxg/leanotelite/background/NoteSyncService.java +++ b/app/src/main/java/org/houxg/leamonax/background/NoteSyncService.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.background; +package org.houxg.leamonax.background; import android.app.Service; import android.content.Context; @@ -8,9 +8,9 @@ import android.support.annotation.Nullable; import android.util.Log; import org.greenrobot.eventbus.EventBus; -import org.houxg.leanotelite.model.SyncEvent; -import org.houxg.leanotelite.service.AccountService; -import org.houxg.leanotelite.service.NoteService; +import org.houxg.leamonax.model.SyncEvent; +import org.houxg.leamonax.service.AccountService; +import org.houxg.leamonax.service.NoteService; import rx.Observable; import rx.Observer; diff --git a/app/src/main/java/org/houxg/leanotelite/database/AppDataBase.java b/app/src/main/java/org/houxg/leamonax/database/AppDataBase.java similarity index 94% rename from app/src/main/java/org/houxg/leanotelite/database/AppDataBase.java rename to app/src/main/java/org/houxg/leamonax/database/AppDataBase.java index 2cc84aa..55349c1 100644 --- a/app/src/main/java/org/houxg/leanotelite/database/AppDataBase.java +++ b/app/src/main/java/org/houxg/leamonax/database/AppDataBase.java @@ -1,18 +1,18 @@ -package org.houxg.leanotelite.database; +package org.houxg.leamonax.database; import android.util.Log; import com.raizlabs.android.dbflow.annotation.Database; import com.raizlabs.android.dbflow.sql.language.SQLite; -import org.houxg.leanotelite.model.Account; -import org.houxg.leanotelite.model.Account_Table; -import org.houxg.leanotelite.model.Note; -import org.houxg.leanotelite.model.NoteFile; -import org.houxg.leanotelite.model.NoteFile_Table; -import org.houxg.leanotelite.model.Note_Table; -import org.houxg.leanotelite.model.Notebook; -import org.houxg.leanotelite.model.Notebook_Table; +import org.houxg.leamonax.model.Account; +import org.houxg.leamonax.model.Account_Table; +import org.houxg.leamonax.model.Note; +import org.houxg.leamonax.model.NoteFile; +import org.houxg.leamonax.model.NoteFile_Table; +import org.houxg.leamonax.model.Note_Table; +import org.houxg.leamonax.model.Notebook; +import org.houxg.leamonax.model.Notebook_Table; import java.util.ArrayList; import java.util.Collection; diff --git a/app/src/main/java/org/houxg/leanotelite/editor/Editor.java b/app/src/main/java/org/houxg/leamonax/editor/Editor.java similarity index 97% rename from app/src/main/java/org/houxg/leanotelite/editor/Editor.java rename to app/src/main/java/org/houxg/leamonax/editor/Editor.java index 14ef1ca..007729a 100644 --- a/app/src/main/java/org/houxg/leanotelite/editor/Editor.java +++ b/app/src/main/java/org/houxg/leamonax/editor/Editor.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.editor; +package org.houxg.leamonax.editor; import android.net.Uri; @@ -10,7 +10,7 @@ import android.webkit.WebResourceResponse; import android.webkit.WebView; import android.webkit.WebViewClient; -import org.houxg.leanotelite.service.NoteFileService; +import org.houxg.leamonax.service.NoteFileService; public abstract class Editor { diff --git a/app/src/main/java/org/houxg/leanotelite/editor/JsCallbackHandler.java b/app/src/main/java/org/houxg/leamonax/editor/JsCallbackHandler.java similarity index 98% rename from app/src/main/java/org/houxg/leanotelite/editor/JsCallbackHandler.java rename to app/src/main/java/org/houxg/leamonax/editor/JsCallbackHandler.java index 88f1c14..8a33a00 100755 --- a/app/src/main/java/org/houxg/leanotelite/editor/JsCallbackHandler.java +++ b/app/src/main/java/org/houxg/leamonax/editor/JsCallbackHandler.java @@ -1,10 +1,10 @@ -package org.houxg.leanotelite.editor; +package org.houxg.leamonax.editor; import android.util.Log; import android.webkit.JavascriptInterface; -import org.houxg.leanotelite.utils.HtmlUtils; -import org.houxg.leanotelite.utils.JSONUtils; +import org.houxg.leamonax.utils.HtmlUtils; +import org.houxg.leamonax.utils.JSONUtils; import org.json.JSONException; import org.json.JSONObject; diff --git a/app/src/main/java/org/houxg/leanotelite/editor/JsRunner.java b/app/src/main/java/org/houxg/leamonax/editor/JsRunner.java similarity index 92% rename from app/src/main/java/org/houxg/leanotelite/editor/JsRunner.java rename to app/src/main/java/org/houxg/leamonax/editor/JsRunner.java index 5159450..825e274 100644 --- a/app/src/main/java/org/houxg/leanotelite/editor/JsRunner.java +++ b/app/src/main/java/org/houxg/leamonax/editor/JsRunner.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.editor; +package org.houxg.leamonax.editor; import android.os.Looper; @@ -6,7 +6,7 @@ import android.util.Log; import android.webkit.ValueCallback; import android.webkit.WebView; -import org.houxg.leanotelite.utils.StringUtils; +import org.houxg.leamonax.utils.StringUtils; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; diff --git a/app/src/main/java/org/houxg/leanotelite/editor/MarkdownEditor.java b/app/src/main/java/org/houxg/leamonax/editor/MarkdownEditor.java similarity index 97% rename from app/src/main/java/org/houxg/leanotelite/editor/MarkdownEditor.java rename to app/src/main/java/org/houxg/leamonax/editor/MarkdownEditor.java index df4086c..566fa16 100644 --- a/app/src/main/java/org/houxg/leanotelite/editor/MarkdownEditor.java +++ b/app/src/main/java/org/houxg/leamonax/editor/MarkdownEditor.java @@ -1,11 +1,11 @@ -package org.houxg.leanotelite.editor; +package org.houxg.leamonax.editor; import android.annotation.SuppressLint; import android.webkit.WebChromeClient; import android.webkit.WebView; -import org.houxg.leanotelite.utils.HtmlUtils; +import org.houxg.leamonax.utils.HtmlUtils; import java.util.Locale; diff --git a/app/src/main/java/org/houxg/leanotelite/editor/OnJsEditorStateChangedListener.java b/app/src/main/java/org/houxg/leamonax/editor/OnJsEditorStateChangedListener.java similarity index 92% rename from app/src/main/java/org/houxg/leanotelite/editor/OnJsEditorStateChangedListener.java rename to app/src/main/java/org/houxg/leamonax/editor/OnJsEditorStateChangedListener.java index edd7318..376f479 100755 --- a/app/src/main/java/org/houxg/leanotelite/editor/OnJsEditorStateChangedListener.java +++ b/app/src/main/java/org/houxg/leamonax/editor/OnJsEditorStateChangedListener.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.editor; +package org.houxg.leamonax.editor; import org.json.JSONObject; diff --git a/app/src/main/java/org/houxg/leanotelite/editor/RichTextEditor.java b/app/src/main/java/org/houxg/leamonax/editor/RichTextEditor.java similarity index 98% rename from app/src/main/java/org/houxg/leanotelite/editor/RichTextEditor.java rename to app/src/main/java/org/houxg/leamonax/editor/RichTextEditor.java index d1a7744..1f438b4 100644 --- a/app/src/main/java/org/houxg/leanotelite/editor/RichTextEditor.java +++ b/app/src/main/java/org/houxg/leamonax/editor/RichTextEditor.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.editor; +package org.houxg.leamonax.editor; import android.annotation.SuppressLint; @@ -9,7 +9,7 @@ import android.webkit.WebView; import com.google.gson.Gson; -import org.houxg.leanotelite.utils.HtmlUtils; +import org.houxg.leamonax.utils.HtmlUtils; import org.json.JSONObject; import java.util.Locale; diff --git a/app/src/main/java/org/houxg/leanotelite/model/Account.java b/app/src/main/java/org/houxg/leamonax/model/Account.java similarity index 97% rename from app/src/main/java/org/houxg/leanotelite/model/Account.java rename to app/src/main/java/org/houxg/leamonax/model/Account.java index 5b61fbf..79c3044 100644 --- a/app/src/main/java/org/houxg/leanotelite/model/Account.java +++ b/app/src/main/java/org/houxg/leamonax/model/Account.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.model; +package org.houxg.leamonax.model; import com.google.gson.annotations.SerializedName; import com.raizlabs.android.dbflow.annotation.Column; @@ -6,7 +6,7 @@ import com.raizlabs.android.dbflow.annotation.PrimaryKey; import com.raizlabs.android.dbflow.annotation.Table; import com.raizlabs.android.dbflow.structure.BaseModel; -import org.houxg.leanotelite.database.AppDataBase; +import org.houxg.leamonax.database.AppDataBase; @Table(name = "Account", database = AppDataBase.class) public class Account extends BaseModel { diff --git a/app/src/main/java/org/houxg/leanotelite/model/Authentication.java b/app/src/main/java/org/houxg/leamonax/model/Authentication.java similarity index 94% rename from app/src/main/java/org/houxg/leanotelite/model/Authentication.java rename to app/src/main/java/org/houxg/leamonax/model/Authentication.java index f772bd8..f13ad36 100644 --- a/app/src/main/java/org/houxg/leanotelite/model/Authentication.java +++ b/app/src/main/java/org/houxg/leamonax/model/Authentication.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.model; +package org.houxg.leamonax.model; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/org/houxg/leanotelite/model/BaseResponse.java b/app/src/main/java/org/houxg/leamonax/model/BaseResponse.java similarity index 92% rename from app/src/main/java/org/houxg/leanotelite/model/BaseResponse.java rename to app/src/main/java/org/houxg/leamonax/model/BaseResponse.java index 175d535..a07704c 100644 --- a/app/src/main/java/org/houxg/leanotelite/model/BaseResponse.java +++ b/app/src/main/java/org/houxg/leamonax/model/BaseResponse.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.model; +package org.houxg.leamonax.model; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/org/houxg/leanotelite/model/Note.java b/app/src/main/java/org/houxg/leamonax/model/Note.java similarity index 97% rename from app/src/main/java/org/houxg/leanotelite/model/Note.java rename to app/src/main/java/org/houxg/leamonax/model/Note.java index d96dd90..90aa29f 100644 --- a/app/src/main/java/org/houxg/leanotelite/model/Note.java +++ b/app/src/main/java/org/houxg/leamonax/model/Note.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.model; +package org.houxg.leamonax.model; import android.util.Log; @@ -8,9 +8,9 @@ import com.raizlabs.android.dbflow.annotation.PrimaryKey; import com.raizlabs.android.dbflow.annotation.Table; import com.raizlabs.android.dbflow.structure.BaseModel; -import org.houxg.leanotelite.database.AppDataBase; -import org.houxg.leanotelite.utils.CollectionUtils; -import org.houxg.leanotelite.utils.TimeUtils; +import org.houxg.leamonax.database.AppDataBase; +import org.houxg.leamonax.utils.CollectionUtils; +import org.houxg.leamonax.utils.TimeUtils; import java.io.Serializable; import java.util.List; diff --git a/app/src/main/java/org/houxg/leanotelite/model/NoteFile.java b/app/src/main/java/org/houxg/leamonax/model/NoteFile.java similarity index 95% rename from app/src/main/java/org/houxg/leanotelite/model/NoteFile.java rename to app/src/main/java/org/houxg/leamonax/model/NoteFile.java index 6013826..c42f6d2 100644 --- a/app/src/main/java/org/houxg/leanotelite/model/NoteFile.java +++ b/app/src/main/java/org/houxg/leamonax/model/NoteFile.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.model; +package org.houxg.leamonax.model; import com.google.gson.annotations.SerializedName; import com.raizlabs.android.dbflow.annotation.Column; @@ -6,7 +6,7 @@ import com.raizlabs.android.dbflow.annotation.PrimaryKey; import com.raizlabs.android.dbflow.annotation.Table; import com.raizlabs.android.dbflow.structure.BaseModel; -import org.houxg.leanotelite.database.AppDataBase; +import org.houxg.leamonax.database.AppDataBase; @Table(name = "NoteFile", database = AppDataBase.class) public class NoteFile extends BaseModel { diff --git a/app/src/main/java/org/houxg/leanotelite/model/Notebook.java b/app/src/main/java/org/houxg/leamonax/model/Notebook.java similarity index 97% rename from app/src/main/java/org/houxg/leanotelite/model/Notebook.java rename to app/src/main/java/org/houxg/leamonax/model/Notebook.java index d455764..b7d820c 100644 --- a/app/src/main/java/org/houxg/leanotelite/model/Notebook.java +++ b/app/src/main/java/org/houxg/leamonax/model/Notebook.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.model; +package org.houxg.leamonax.model; import com.google.gson.annotations.SerializedName; import com.raizlabs.android.dbflow.annotation.Column; @@ -6,7 +6,7 @@ import com.raizlabs.android.dbflow.annotation.PrimaryKey; import com.raizlabs.android.dbflow.annotation.Table; import com.raizlabs.android.dbflow.structure.BaseModel; -import org.houxg.leanotelite.database.AppDataBase; +import org.houxg.leamonax.database.AppDataBase; /** * Created by binnchx on 11/1/15. diff --git a/app/src/main/java/org/houxg/leanotelite/model/SyncEvent.java b/app/src/main/java/org/houxg/leamonax/model/SyncEvent.java similarity index 85% rename from app/src/main/java/org/houxg/leanotelite/model/SyncEvent.java rename to app/src/main/java/org/houxg/leamonax/model/SyncEvent.java index c9805d2..fe1fd98 100644 --- a/app/src/main/java/org/houxg/leanotelite/model/SyncEvent.java +++ b/app/src/main/java/org/houxg/leamonax/model/SyncEvent.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.model; +package org.houxg.leamonax.model; public class SyncEvent { diff --git a/app/src/main/java/org/houxg/leanotelite/model/SyncState.java b/app/src/main/java/org/houxg/leamonax/model/SyncState.java similarity index 91% rename from app/src/main/java/org/houxg/leanotelite/model/SyncState.java rename to app/src/main/java/org/houxg/leamonax/model/SyncState.java index 1f2fe5e..c8d53c9 100644 --- a/app/src/main/java/org/houxg/leanotelite/model/SyncState.java +++ b/app/src/main/java/org/houxg/leamonax/model/SyncState.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.model; +package org.houxg.leamonax.model; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/org/houxg/leanotelite/model/UpdateRe.java b/app/src/main/java/org/houxg/leamonax/model/UpdateRe.java similarity index 83% rename from app/src/main/java/org/houxg/leanotelite/model/UpdateRe.java rename to app/src/main/java/org/houxg/leamonax/model/UpdateRe.java index 36479e6..f223cd3 100644 --- a/app/src/main/java/org/houxg/leanotelite/model/UpdateRe.java +++ b/app/src/main/java/org/houxg/leamonax/model/UpdateRe.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.model; +package org.houxg.leamonax.model; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/org/houxg/leanotelite/model/User.java b/app/src/main/java/org/houxg/leamonax/model/User.java similarity index 95% rename from app/src/main/java/org/houxg/leanotelite/model/User.java rename to app/src/main/java/org/houxg/leamonax/model/User.java index bcc2953..2f3fcf7 100644 --- a/app/src/main/java/org/houxg/leanotelite/model/User.java +++ b/app/src/main/java/org/houxg/leamonax/model/User.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.model; +package org.houxg.leamonax.model; import com.google.gson.annotations.SerializedName; diff --git a/app/src/main/java/org/houxg/leanotelite/network/ApiProvider.java b/app/src/main/java/org/houxg/leamonax/network/ApiProvider.java similarity index 89% rename from app/src/main/java/org/houxg/leanotelite/network/ApiProvider.java rename to app/src/main/java/org/houxg/leamonax/network/ApiProvider.java index 20a8f79..46fb2ab 100644 --- a/app/src/main/java/org/houxg/leanotelite/network/ApiProvider.java +++ b/app/src/main/java/org/houxg/leamonax/network/ApiProvider.java @@ -1,11 +1,11 @@ -package org.houxg.leanotelite.network; +package org.houxg.leamonax.network; -import org.houxg.leanotelite.model.Account; -import org.houxg.leanotelite.network.api.AuthApi; -import org.houxg.leanotelite.network.api.NoteApi; -import org.houxg.leanotelite.network.api.NotebookApi; -import org.houxg.leanotelite.network.api.UserApi; -import org.houxg.leanotelite.service.AccountService; +import org.houxg.leamonax.model.Account; +import org.houxg.leamonax.network.api.AuthApi; +import org.houxg.leamonax.network.api.NoteApi; +import org.houxg.leamonax.network.api.NotebookApi; +import org.houxg.leamonax.network.api.UserApi; +import org.houxg.leamonax.service.AccountService; import java.io.IOException; diff --git a/app/src/main/java/org/houxg/leanotelite/network/LeaFailure.java b/app/src/main/java/org/houxg/leamonax/network/LeaFailure.java similarity index 79% rename from app/src/main/java/org/houxg/leanotelite/network/LeaFailure.java rename to app/src/main/java/org/houxg/leamonax/network/LeaFailure.java index f1b70ed..3920949 100644 --- a/app/src/main/java/org/houxg/leanotelite/network/LeaFailure.java +++ b/app/src/main/java/org/houxg/leamonax/network/LeaFailure.java @@ -1,7 +1,7 @@ -package org.houxg.leanotelite.network; +package org.houxg.leamonax.network; -import org.houxg.leanotelite.model.BaseResponse; +import org.houxg.leamonax.model.BaseResponse; public class LeaFailure extends IllegalStateException { diff --git a/app/src/main/java/org/houxg/leanotelite/network/LeaRequestBodyConverter.java b/app/src/main/java/org/houxg/leamonax/network/LeaRequestBodyConverter.java similarity index 96% rename from app/src/main/java/org/houxg/leanotelite/network/LeaRequestBodyConverter.java rename to app/src/main/java/org/houxg/leamonax/network/LeaRequestBodyConverter.java index de338e1..c883d78 100644 --- a/app/src/main/java/org/houxg/leanotelite/network/LeaRequestBodyConverter.java +++ b/app/src/main/java/org/houxg/leamonax/network/LeaRequestBodyConverter.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.network; +package org.houxg.leamonax.network; import com.google.gson.Gson; diff --git a/app/src/main/java/org/houxg/leanotelite/network/LeaResponseConverter.java b/app/src/main/java/org/houxg/leamonax/network/LeaResponseConverter.java similarity index 89% rename from app/src/main/java/org/houxg/leanotelite/network/LeaResponseConverter.java rename to app/src/main/java/org/houxg/leamonax/network/LeaResponseConverter.java index f2c8a33..90ec738 100644 --- a/app/src/main/java/org/houxg/leanotelite/network/LeaResponseConverter.java +++ b/app/src/main/java/org/houxg/leamonax/network/LeaResponseConverter.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.network; +package org.houxg.leamonax.network; import android.util.Log; @@ -6,9 +6,9 @@ import android.util.Log; import com.google.gson.Gson; import com.google.gson.TypeAdapter; -import org.houxg.leanotelite.model.BaseResponse; -import org.houxg.leanotelite.model.Note; -import org.houxg.leanotelite.utils.CollectionUtils; +import org.houxg.leamonax.model.BaseResponse; +import org.houxg.leamonax.model.Note; +import org.houxg.leamonax.utils.CollectionUtils; import java.io.IOException; import java.util.Collection; diff --git a/app/src/main/java/org/houxg/leanotelite/network/LeaResponseConverterFactory.java b/app/src/main/java/org/houxg/leamonax/network/LeaResponseConverterFactory.java similarity index 96% rename from app/src/main/java/org/houxg/leanotelite/network/LeaResponseConverterFactory.java rename to app/src/main/java/org/houxg/leamonax/network/LeaResponseConverterFactory.java index 7caba3c..4b541a8 100644 --- a/app/src/main/java/org/houxg/leanotelite/network/LeaResponseConverterFactory.java +++ b/app/src/main/java/org/houxg/leamonax/network/LeaResponseConverterFactory.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.network; +package org.houxg.leamonax.network; import com.google.gson.Gson; diff --git a/app/src/main/java/org/houxg/leanotelite/network/api/AuthApi.java b/app/src/main/java/org/houxg/leamonax/network/api/AuthApi.java similarity index 75% rename from app/src/main/java/org/houxg/leanotelite/network/api/AuthApi.java rename to app/src/main/java/org/houxg/leamonax/network/api/AuthApi.java index 5d0d9e6..2d239cf 100644 --- a/app/src/main/java/org/houxg/leanotelite/network/api/AuthApi.java +++ b/app/src/main/java/org/houxg/leamonax/network/api/AuthApi.java @@ -1,7 +1,7 @@ -package org.houxg.leanotelite.network.api; +package org.houxg.leamonax.network.api; -import org.houxg.leanotelite.model.Authentication; -import org.houxg.leanotelite.model.BaseResponse; +import org.houxg.leamonax.model.Authentication; +import org.houxg.leamonax.model.BaseResponse; import retrofit2.Call; import retrofit2.http.GET; diff --git a/app/src/main/java/org/houxg/leanotelite/network/api/NoteApi.java b/app/src/main/java/org/houxg/leamonax/network/api/NoteApi.java similarity index 89% rename from app/src/main/java/org/houxg/leanotelite/network/api/NoteApi.java rename to app/src/main/java/org/houxg/leamonax/network/api/NoteApi.java index 363c409..0df3afe 100644 --- a/app/src/main/java/org/houxg/leanotelite/network/api/NoteApi.java +++ b/app/src/main/java/org/houxg/leamonax/network/api/NoteApi.java @@ -1,7 +1,7 @@ -package org.houxg.leanotelite.network.api; +package org.houxg.leamonax.network.api; -import org.houxg.leanotelite.model.Note; -import org.houxg.leanotelite.model.UpdateRe; +import org.houxg.leamonax.model.Note; +import org.houxg.leamonax.model.UpdateRe; import java.util.List; import java.util.Map; diff --git a/app/src/main/java/org/houxg/leanotelite/network/api/NotebookApi.java b/app/src/main/java/org/houxg/leamonax/network/api/NotebookApi.java similarity index 85% rename from app/src/main/java/org/houxg/leanotelite/network/api/NotebookApi.java rename to app/src/main/java/org/houxg/leamonax/network/api/NotebookApi.java index 48edf3b..6e2de57 100644 --- a/app/src/main/java/org/houxg/leanotelite/network/api/NotebookApi.java +++ b/app/src/main/java/org/houxg/leamonax/network/api/NotebookApi.java @@ -1,6 +1,6 @@ -package org.houxg.leanotelite.network.api; +package org.houxg.leamonax.network.api; -import org.houxg.leanotelite.model.Notebook; +import org.houxg.leamonax.model.Notebook; import java.util.List; diff --git a/app/src/main/java/org/houxg/leanotelite/network/api/UserApi.java b/app/src/main/java/org/houxg/leamonax/network/api/UserApi.java similarity index 73% rename from app/src/main/java/org/houxg/leanotelite/network/api/UserApi.java rename to app/src/main/java/org/houxg/leamonax/network/api/UserApi.java index 0689b28..89139ba 100644 --- a/app/src/main/java/org/houxg/leanotelite/network/api/UserApi.java +++ b/app/src/main/java/org/houxg/leamonax/network/api/UserApi.java @@ -1,8 +1,8 @@ -package org.houxg.leanotelite.network.api; +package org.houxg.leamonax.network.api; -import org.houxg.leanotelite.model.BaseResponse; -import org.houxg.leanotelite.model.SyncState; -import org.houxg.leanotelite.model.User; +import org.houxg.leamonax.model.BaseResponse; +import org.houxg.leamonax.model.SyncState; +import org.houxg.leamonax.model.User; import retrofit2.Call; import retrofit2.http.GET; diff --git a/app/src/main/java/org/houxg/leanotelite/service/AccountService.java b/app/src/main/java/org/houxg/leamonax/service/AccountService.java similarity index 85% rename from app/src/main/java/org/houxg/leanotelite/service/AccountService.java rename to app/src/main/java/org/houxg/leamonax/service/AccountService.java index 9bbc4f0..d362fe8 100644 --- a/app/src/main/java/org/houxg/leanotelite/service/AccountService.java +++ b/app/src/main/java/org/houxg/leamonax/service/AccountService.java @@ -1,12 +1,12 @@ -package org.houxg.leanotelite.service; +package org.houxg.leamonax.service; -import org.houxg.leanotelite.database.AppDataBase; -import org.houxg.leanotelite.model.Account; -import org.houxg.leanotelite.model.Authentication; -import org.houxg.leanotelite.model.BaseResponse; -import org.houxg.leanotelite.model.User; -import org.houxg.leanotelite.network.ApiProvider; -import org.houxg.leanotelite.utils.RetrofitUtils; +import org.houxg.leamonax.database.AppDataBase; +import org.houxg.leamonax.model.Account; +import org.houxg.leamonax.model.Authentication; +import org.houxg.leamonax.model.BaseResponse; +import org.houxg.leamonax.model.User; +import org.houxg.leamonax.network.ApiProvider; +import org.houxg.leamonax.utils.RetrofitUtils; import rx.Observable; diff --git a/app/src/main/java/org/houxg/leanotelite/service/NoteFileService.java b/app/src/main/java/org/houxg/leamonax/service/NoteFileService.java similarity index 94% rename from app/src/main/java/org/houxg/leanotelite/service/NoteFileService.java rename to app/src/main/java/org/houxg/leamonax/service/NoteFileService.java index a2d6763..76ea443 100644 --- a/app/src/main/java/org/houxg/leanotelite/service/NoteFileService.java +++ b/app/src/main/java/org/houxg/leamonax/service/NoteFileService.java @@ -1,13 +1,13 @@ -package org.houxg.leanotelite.service; +package org.houxg.leamonax.service; import android.net.Uri; import android.text.TextUtils; import android.util.Log; import org.bson.types.ObjectId; -import org.houxg.leanotelite.LeanoteLite; -import org.houxg.leanotelite.database.AppDataBase; -import org.houxg.leanotelite.model.NoteFile; +import org.houxg.leamonax.Leamonax; +import org.houxg.leamonax.database.AppDataBase; +import org.houxg.leamonax.model.NoteFile; import java.io.File; import java.io.FileInputStream; @@ -70,7 +70,7 @@ public class NoteFileService { String url = NoteFileService.getUrl(AccountService.getCurrent().getHost(), noteFile.getServerId(), AccountService.getCurrent().getAccessToken()); Log.i(TAG, "use server image, url=" + url); try { - filePath = NoteFileService.getImageFromServer(Uri.parse(url), LeanoteLite.getContext().getCacheDir()); + filePath = NoteFileService.getImageFromServer(Uri.parse(url), Leamonax.getContext().getCacheDir()); noteFile.setLocalPath(filePath); Log.i(TAG, "download finished, path=" + filePath); noteFile.save(); diff --git a/app/src/main/java/org/houxg/leanotelite/service/NoteService.java b/app/src/main/java/org/houxg/leamonax/service/NoteService.java similarity index 97% rename from app/src/main/java/org/houxg/leanotelite/service/NoteService.java rename to app/src/main/java/org/houxg/leamonax/service/NoteService.java index bc3299d..ad7103f 100644 --- a/app/src/main/java/org/houxg/leanotelite/service/NoteService.java +++ b/app/src/main/java/org/houxg/leamonax/service/NoteService.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.service; +package org.houxg.leamonax.service; import android.net.Uri; @@ -7,17 +7,17 @@ import android.util.Log; import android.webkit.MimeTypeMap; import org.bson.types.ObjectId; -import org.houxg.leanotelite.database.AppDataBase; -import org.houxg.leanotelite.model.Account; -import org.houxg.leanotelite.model.Note; -import org.houxg.leanotelite.model.NoteFile; -import org.houxg.leanotelite.model.Notebook; -import org.houxg.leanotelite.model.UpdateRe; -import org.houxg.leanotelite.network.ApiProvider; -import org.houxg.leanotelite.utils.CollectionUtils; -import org.houxg.leanotelite.utils.RetrofitUtils; -import org.houxg.leanotelite.utils.StringUtils; -import org.houxg.leanotelite.utils.TimeUtils; +import org.houxg.leamonax.database.AppDataBase; +import org.houxg.leamonax.model.Account; +import org.houxg.leamonax.model.Note; +import org.houxg.leamonax.model.NoteFile; +import org.houxg.leamonax.model.Notebook; +import org.houxg.leamonax.model.UpdateRe; +import org.houxg.leamonax.network.ApiProvider; +import org.houxg.leamonax.utils.CollectionUtils; +import org.houxg.leamonax.utils.RetrofitUtils; +import org.houxg.leamonax.utils.StringUtils; +import org.houxg.leamonax.utils.TimeUtils; import java.io.File; import java.util.ArrayList; diff --git a/app/src/main/java/org/houxg/leanotelite/service/NotebookService.java b/app/src/main/java/org/houxg/leamonax/service/NotebookService.java similarity index 79% rename from app/src/main/java/org/houxg/leanotelite/service/NotebookService.java rename to app/src/main/java/org/houxg/leamonax/service/NotebookService.java index d9feb27..1d226b4 100644 --- a/app/src/main/java/org/houxg/leanotelite/service/NotebookService.java +++ b/app/src/main/java/org/houxg/leamonax/service/NotebookService.java @@ -1,12 +1,12 @@ -package org.houxg.leanotelite.service; +package org.houxg.leamonax.service; import android.util.Log; -import org.houxg.leanotelite.model.Account; -import org.houxg.leanotelite.model.Notebook; -import org.houxg.leanotelite.network.ApiProvider; -import org.houxg.leanotelite.utils.RetrofitUtils; +import org.houxg.leamonax.model.Account; +import org.houxg.leamonax.model.Notebook; +import org.houxg.leamonax.network.ApiProvider; +import org.houxg.leamonax.utils.RetrofitUtils; public class NotebookService { diff --git a/app/src/main/java/org/houxg/leanotelite/ui/BaseActivity.java b/app/src/main/java/org/houxg/leamonax/ui/BaseActivity.java similarity index 95% rename from app/src/main/java/org/houxg/leanotelite/ui/BaseActivity.java rename to app/src/main/java/org/houxg/leamonax/ui/BaseActivity.java index 3d9e7c3..35128a2 100644 --- a/app/src/main/java/org/houxg/leanotelite/ui/BaseActivity.java +++ b/app/src/main/java/org/houxg/leamonax/ui/BaseActivity.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.ui; +package org.houxg.leamonax.ui; import android.os.Build; import android.os.Bundle; @@ -8,7 +8,7 @@ import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.view.MenuItem; -import org.houxg.leanotelite.R; +import org.houxg.leamonax.R; public class BaseActivity extends AppCompatActivity { diff --git a/app/src/main/java/org/houxg/leanotelite/ui/LeaLaunchActivity.java b/app/src/main/java/org/houxg/leamonax/ui/LeaLaunchActivity.java similarity index 80% rename from app/src/main/java/org/houxg/leanotelite/ui/LeaLaunchActivity.java rename to app/src/main/java/org/houxg/leamonax/ui/LeaLaunchActivity.java index 3b1a748..971d24c 100644 --- a/app/src/main/java/org/houxg/leanotelite/ui/LeaLaunchActivity.java +++ b/app/src/main/java/org/houxg/leamonax/ui/LeaLaunchActivity.java @@ -1,12 +1,12 @@ -package org.houxg.leanotelite.ui; +package org.houxg.leamonax.ui; import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import org.houxg.leanotelite.model.Account; -import org.houxg.leanotelite.network.ApiProvider; -import org.houxg.leanotelite.service.AccountService; +import org.houxg.leamonax.model.Account; +import org.houxg.leamonax.network.ApiProvider; +import org.houxg.leamonax.service.AccountService; public class LeaLaunchActivity extends Activity { diff --git a/app/src/main/java/org/houxg/leanotelite/ui/MainActivity.java b/app/src/main/java/org/houxg/leamonax/ui/MainActivity.java similarity index 94% rename from app/src/main/java/org/houxg/leanotelite/ui/MainActivity.java rename to app/src/main/java/org/houxg/leamonax/ui/MainActivity.java index 0e2cc12..f38ee89 100644 --- a/app/src/main/java/org/houxg/leanotelite/ui/MainActivity.java +++ b/app/src/main/java/org/houxg/leamonax/ui/MainActivity.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.ui; +package org.houxg.leamonax.ui; import android.app.AlertDialog; @@ -27,17 +27,17 @@ import com.bumptech.glide.Glide; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; -import org.houxg.leanotelite.R; -import org.houxg.leanotelite.adapter.NotebookAdapter; -import org.houxg.leanotelite.database.AppDataBase; -import org.houxg.leanotelite.model.Account; -import org.houxg.leanotelite.model.Note; -import org.houxg.leanotelite.model.Notebook; -import org.houxg.leanotelite.model.SyncEvent; -import org.houxg.leanotelite.model.User; -import org.houxg.leanotelite.service.AccountService; -import org.houxg.leanotelite.service.NotebookService; -import org.houxg.leanotelite.ui.edit.NoteEditActivity; +import org.houxg.leamonax.R; +import org.houxg.leamonax.adapter.NotebookAdapter; +import org.houxg.leamonax.database.AppDataBase; +import org.houxg.leamonax.model.Account; +import org.houxg.leamonax.model.Note; +import org.houxg.leamonax.model.Notebook; +import org.houxg.leamonax.model.SyncEvent; +import org.houxg.leamonax.model.User; +import org.houxg.leamonax.service.AccountService; +import org.houxg.leamonax.service.NotebookService; +import org.houxg.leamonax.ui.edit.NoteEditActivity; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/org/houxg/leanotelite/ui/NoteFragment.java b/app/src/main/java/org/houxg/leamonax/ui/NoteFragment.java similarity index 95% rename from app/src/main/java/org/houxg/leanotelite/ui/NoteFragment.java rename to app/src/main/java/org/houxg/leamonax/ui/NoteFragment.java index 0235091..de1b2ed 100644 --- a/app/src/main/java/org/houxg/leanotelite/ui/NoteFragment.java +++ b/app/src/main/java/org/houxg/leamonax/ui/NoteFragment.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.ui; +package org.houxg.leamonax.ui; import android.app.AlertDialog; @@ -25,14 +25,14 @@ import android.view.ViewGroup; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; -import org.houxg.leanotelite.R; -import org.houxg.leanotelite.adapter.NoteAdapter; -import org.houxg.leanotelite.background.NoteSyncService; -import org.houxg.leanotelite.model.Note; -import org.houxg.leanotelite.model.SyncEvent; -import org.houxg.leanotelite.service.NoteService; -import org.houxg.leanotelite.utils.DisplayUtils; -import org.houxg.leanotelite.utils.ToastUtils; +import org.houxg.leamonax.R; +import org.houxg.leamonax.adapter.NoteAdapter; +import org.houxg.leamonax.background.NoteSyncService; +import org.houxg.leamonax.model.Note; +import org.houxg.leamonax.model.SyncEvent; +import org.houxg.leamonax.service.NoteService; +import org.houxg.leamonax.utils.DisplayUtils; +import org.houxg.leamonax.utils.ToastUtils; import java.util.Locale; diff --git a/app/src/main/java/org/houxg/leanotelite/ui/NotePreviewActivity.java b/app/src/main/java/org/houxg/leamonax/ui/NotePreviewActivity.java similarity index 94% rename from app/src/main/java/org/houxg/leanotelite/ui/NotePreviewActivity.java rename to app/src/main/java/org/houxg/leamonax/ui/NotePreviewActivity.java index a223782..50e0391 100644 --- a/app/src/main/java/org/houxg/leanotelite/ui/NotePreviewActivity.java +++ b/app/src/main/java/org/houxg/leamonax/ui/NotePreviewActivity.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.ui; +package org.houxg.leamonax.ui; import android.app.ProgressDialog; import android.content.Context; @@ -10,14 +10,14 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; -import org.houxg.leanotelite.R; -import org.houxg.leanotelite.database.AppDataBase; -import org.houxg.leanotelite.model.Note; -import org.houxg.leanotelite.service.NoteService; -import org.houxg.leanotelite.ui.edit.EditorFragment; -import org.houxg.leanotelite.ui.edit.NoteEditActivity; -import org.houxg.leanotelite.utils.NetworkUtils; -import org.houxg.leanotelite.utils.ToastUtils; +import org.houxg.leamonax.R; +import org.houxg.leamonax.database.AppDataBase; +import org.houxg.leamonax.model.Note; +import org.houxg.leamonax.service.NoteService; +import org.houxg.leamonax.ui.edit.EditorFragment; +import org.houxg.leamonax.ui.edit.NoteEditActivity; +import org.houxg.leamonax.utils.NetworkUtils; +import org.houxg.leamonax.utils.ToastUtils; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/org/houxg/leanotelite/ui/SettingsActivity.java b/app/src/main/java/org/houxg/leamonax/ui/SettingsActivity.java similarity index 95% rename from app/src/main/java/org/houxg/leanotelite/ui/SettingsActivity.java rename to app/src/main/java/org/houxg/leamonax/ui/SettingsActivity.java index cd78095..6a3a9f4 100644 --- a/app/src/main/java/org/houxg/leanotelite/ui/SettingsActivity.java +++ b/app/src/main/java/org/houxg/leamonax/ui/SettingsActivity.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.ui; +package org.houxg.leamonax.ui; import android.app.AlertDialog; @@ -16,16 +16,16 @@ import android.widget.TextView; import com.bumptech.glide.Glide; import com.raizlabs.android.dbflow.sql.language.SQLite; -import org.houxg.leanotelite.BuildConfig; -import org.houxg.leanotelite.R; -import org.houxg.leanotelite.model.Account; -import org.houxg.leanotelite.model.BaseResponse; -import org.houxg.leanotelite.model.Note; -import org.houxg.leanotelite.model.Note_Table; -import org.houxg.leanotelite.model.Notebook; -import org.houxg.leanotelite.model.Notebook_Table; -import org.houxg.leanotelite.service.AccountService; -import org.houxg.leanotelite.utils.ToastUtils; +import org.houxg.leamonax.BuildConfig; +import org.houxg.leamonax.R; +import org.houxg.leamonax.model.Account; +import org.houxg.leamonax.model.BaseResponse; +import org.houxg.leamonax.model.Note; +import org.houxg.leamonax.model.Note_Table; +import org.houxg.leamonax.model.Notebook; +import org.houxg.leamonax.model.Notebook_Table; +import org.houxg.leamonax.service.AccountService; +import org.houxg.leamonax.utils.ToastUtils; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/org/houxg/leanotelite/ui/SignInActivity.java b/app/src/main/java/org/houxg/leamonax/ui/SignInActivity.java similarity index 96% rename from app/src/main/java/org/houxg/leanotelite/ui/SignInActivity.java rename to app/src/main/java/org/houxg/leamonax/ui/SignInActivity.java index 17cb3ae..f6f750b 100644 --- a/app/src/main/java/org/houxg/leanotelite/ui/SignInActivity.java +++ b/app/src/main/java/org/houxg/leamonax/ui/SignInActivity.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.ui; +package org.houxg.leamonax.ui; import android.content.Intent; @@ -13,11 +13,11 @@ import android.widget.EditText; import android.widget.ProgressBar; import android.widget.TextView; -import org.houxg.leanotelite.R; -import org.houxg.leanotelite.model.Authentication; -import org.houxg.leanotelite.network.ApiProvider; -import org.houxg.leanotelite.service.AccountService; -import org.houxg.leanotelite.utils.ToastUtils; +import org.houxg.leamonax.R; +import org.houxg.leamonax.model.Authentication; +import org.houxg.leamonax.network.ApiProvider; +import org.houxg.leamonax.service.AccountService; +import org.houxg.leamonax.utils.ToastUtils; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/org/houxg/leanotelite/ui/edit/EditorFragment.java b/app/src/main/java/org/houxg/leamonax/ui/edit/EditorFragment.java similarity index 95% rename from app/src/main/java/org/houxg/leanotelite/ui/edit/EditorFragment.java rename to app/src/main/java/org/houxg/leamonax/ui/edit/EditorFragment.java index ce565d4..fd6dcdc 100644 --- a/app/src/main/java/org/houxg/leanotelite/ui/edit/EditorFragment.java +++ b/app/src/main/java/org/houxg/leamonax/ui/edit/EditorFragment.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.ui.edit; +package org.houxg.leamonax.ui.edit; import android.app.Activity; @@ -19,13 +19,13 @@ import com.bumptech.glide.Glide; import com.yuyh.library.imgsel.ImgSelActivity; import com.yuyh.library.imgsel.ImgSelConfig; -import org.houxg.leanotelite.R; -import org.houxg.leanotelite.editor.Editor; -import org.houxg.leanotelite.editor.MarkdownEditor; -import org.houxg.leanotelite.editor.RichTextEditor; -import org.houxg.leanotelite.utils.CollectionUtils; -import org.houxg.leanotelite.utils.DialogUtils; -import org.houxg.leanotelite.widget.ToggleImageButton; +import org.houxg.leamonax.R; +import org.houxg.leamonax.editor.Editor; +import org.houxg.leamonax.editor.MarkdownEditor; +import org.houxg.leamonax.editor.RichTextEditor; +import org.houxg.leamonax.utils.CollectionUtils; +import org.houxg.leamonax.utils.DialogUtils; +import org.houxg.leamonax.widget.ToggleImageButton; import java.util.List; diff --git a/app/src/main/java/org/houxg/leanotelite/ui/edit/NoteEditActivity.java b/app/src/main/java/org/houxg/leamonax/ui/edit/NoteEditActivity.java similarity index 95% rename from app/src/main/java/org/houxg/leanotelite/ui/edit/NoteEditActivity.java rename to app/src/main/java/org/houxg/leamonax/ui/edit/NoteEditActivity.java index 8de5d08..87541c9 100644 --- a/app/src/main/java/org/houxg/leanotelite/ui/edit/NoteEditActivity.java +++ b/app/src/main/java/org/houxg/leamonax/ui/edit/NoteEditActivity.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.ui.edit; +package org.houxg.leamonax.ui.edit; import android.app.Fragment; import android.app.FragmentManager; @@ -14,15 +14,15 @@ import android.view.Menu; import android.view.MenuItem; import android.view.ViewGroup; -import org.houxg.leanotelite.R; -import org.houxg.leanotelite.database.AppDataBase; -import org.houxg.leanotelite.model.Note; -import org.houxg.leanotelite.service.NoteFileService; -import org.houxg.leanotelite.service.NoteService; -import org.houxg.leanotelite.ui.BaseActivity; -import org.houxg.leanotelite.utils.NetworkUtils; -import org.houxg.leanotelite.utils.ToastUtils; -import org.houxg.leanotelite.widget.LeaViewPager; +import org.houxg.leamonax.R; +import org.houxg.leamonax.database.AppDataBase; +import org.houxg.leamonax.model.Note; +import org.houxg.leamonax.service.NoteFileService; +import org.houxg.leamonax.service.NoteService; +import org.houxg.leamonax.ui.BaseActivity; +import org.houxg.leamonax.utils.NetworkUtils; +import org.houxg.leamonax.utils.ToastUtils; +import org.houxg.leamonax.widget.LeaViewPager; import rx.Observable; import rx.Subscriber; diff --git a/app/src/main/java/org/houxg/leanotelite/ui/edit/SettingFragment.java b/app/src/main/java/org/houxg/leamonax/ui/edit/SettingFragment.java similarity index 94% rename from app/src/main/java/org/houxg/leanotelite/ui/edit/SettingFragment.java rename to app/src/main/java/org/houxg/leamonax/ui/edit/SettingFragment.java index 9f3fa8f..855e89a 100644 --- a/app/src/main/java/org/houxg/leanotelite/ui/edit/SettingFragment.java +++ b/app/src/main/java/org/houxg/leamonax/ui/edit/SettingFragment.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.ui.edit; +package org.houxg.leamonax.ui.edit; import android.app.AlertDialog; @@ -15,10 +15,10 @@ import android.widget.EditText; import android.widget.Switch; import android.widget.TextView; -import org.houxg.leanotelite.R; -import org.houxg.leanotelite.database.AppDataBase; -import org.houxg.leanotelite.model.Notebook; -import org.houxg.leanotelite.service.AccountService; +import org.houxg.leamonax.R; +import org.houxg.leamonax.database.AppDataBase; +import org.houxg.leamonax.model.Notebook; +import org.houxg.leamonax.service.AccountService; import java.util.List; diff --git a/app/src/main/java/org/houxg/leanotelite/utils/CollectionUtils.java b/app/src/main/java/org/houxg/leamonax/utils/CollectionUtils.java similarity index 89% rename from app/src/main/java/org/houxg/leanotelite/utils/CollectionUtils.java rename to app/src/main/java/org/houxg/leamonax/utils/CollectionUtils.java index f2e9cb3..b915ece 100644 --- a/app/src/main/java/org/houxg/leanotelite/utils/CollectionUtils.java +++ b/app/src/main/java/org/houxg/leamonax/utils/CollectionUtils.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.utils; +package org.houxg.leamonax.utils; import java.util.Collection; diff --git a/app/src/main/java/org/houxg/leanotelite/utils/DialogUtils.java b/app/src/main/java/org/houxg/leamonax/utils/DialogUtils.java similarity index 95% rename from app/src/main/java/org/houxg/leanotelite/utils/DialogUtils.java rename to app/src/main/java/org/houxg/leamonax/utils/DialogUtils.java index 788417e..88482d4 100644 --- a/app/src/main/java/org/houxg/leanotelite/utils/DialogUtils.java +++ b/app/src/main/java/org/houxg/leamonax/utils/DialogUtils.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.utils; +package org.houxg.leamonax.utils; import android.app.AlertDialog; @@ -9,7 +9,7 @@ import android.view.LayoutInflater; import android.view.View; import android.widget.EditText; -import org.houxg.leanotelite.R; +import org.houxg.leamonax.R; public class DialogUtils { diff --git a/app/src/main/java/org/houxg/leanotelite/utils/DisplayUtils.java b/app/src/main/java/org/houxg/leamonax/utils/DisplayUtils.java similarity index 92% rename from app/src/main/java/org/houxg/leanotelite/utils/DisplayUtils.java rename to app/src/main/java/org/houxg/leamonax/utils/DisplayUtils.java index 7d78186..9c961a7 100644 --- a/app/src/main/java/org/houxg/leanotelite/utils/DisplayUtils.java +++ b/app/src/main/java/org/houxg/leamonax/utils/DisplayUtils.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.utils; +package org.houxg.leamonax.utils; import android.content.Context; diff --git a/app/src/main/java/org/houxg/leanotelite/utils/HtmlUtils.java b/app/src/main/java/org/houxg/leamonax/utils/HtmlUtils.java similarity index 99% rename from app/src/main/java/org/houxg/leanotelite/utils/HtmlUtils.java rename to app/src/main/java/org/houxg/leamonax/utils/HtmlUtils.java index cf8bc49..a6c03e2 100644 --- a/app/src/main/java/org/houxg/leanotelite/utils/HtmlUtils.java +++ b/app/src/main/java/org/houxg/leamonax/utils/HtmlUtils.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.utils; +package org.houxg.leamonax.utils; import android.text.TextUtils; diff --git a/app/src/main/java/org/houxg/leanotelite/utils/JSONUtils.java b/app/src/main/java/org/houxg/leamonax/utils/JSONUtils.java similarity index 92% rename from app/src/main/java/org/houxg/leanotelite/utils/JSONUtils.java rename to app/src/main/java/org/houxg/leamonax/utils/JSONUtils.java index 1bf9a0c..7c3b8fa 100644 --- a/app/src/main/java/org/houxg/leanotelite/utils/JSONUtils.java +++ b/app/src/main/java/org/houxg/leamonax/utils/JSONUtils.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.utils; +package org.houxg.leamonax.utils; import org.json.JSONObject; diff --git a/app/src/main/java/org/houxg/leanotelite/utils/NetworkUtils.java b/app/src/main/java/org/houxg/leamonax/utils/NetworkUtils.java similarity index 95% rename from app/src/main/java/org/houxg/leanotelite/utils/NetworkUtils.java rename to app/src/main/java/org/houxg/leamonax/utils/NetworkUtils.java index 82edf52..fe877fa 100644 --- a/app/src/main/java/org/houxg/leanotelite/utils/NetworkUtils.java +++ b/app/src/main/java/org/houxg/leamonax/utils/NetworkUtils.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.utils; +package org.houxg.leamonax.utils; import android.content.Context; diff --git a/app/src/main/java/org/houxg/leanotelite/utils/RetrofitUtils.java b/app/src/main/java/org/houxg/leamonax/utils/RetrofitUtils.java similarity index 98% rename from app/src/main/java/org/houxg/leanotelite/utils/RetrofitUtils.java rename to app/src/main/java/org/houxg/leamonax/utils/RetrofitUtils.java index cc14a19..78e7803 100644 --- a/app/src/main/java/org/houxg/leanotelite/utils/RetrofitUtils.java +++ b/app/src/main/java/org/houxg/leamonax/utils/RetrofitUtils.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.utils; +package org.houxg.leamonax.utils; import java.io.IOException; diff --git a/app/src/main/java/org/houxg/leanotelite/utils/StringUtils.java b/app/src/main/java/org/houxg/leamonax/utils/StringUtils.java similarity index 98% rename from app/src/main/java/org/houxg/leanotelite/utils/StringUtils.java rename to app/src/main/java/org/houxg/leamonax/utils/StringUtils.java index cb194c9..18dd36a 100644 --- a/app/src/main/java/org/houxg/leanotelite/utils/StringUtils.java +++ b/app/src/main/java/org/houxg/leamonax/utils/StringUtils.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.utils; +package org.houxg.leamonax.utils; import java.util.regex.Matcher; diff --git a/app/src/main/java/org/houxg/leanotelite/utils/TimeUtils.java b/app/src/main/java/org/houxg/leamonax/utils/TimeUtils.java similarity index 98% rename from app/src/main/java/org/houxg/leanotelite/utils/TimeUtils.java rename to app/src/main/java/org/houxg/leamonax/utils/TimeUtils.java index 08df60f..7a6a6f9 100644 --- a/app/src/main/java/org/houxg/leanotelite/utils/TimeUtils.java +++ b/app/src/main/java/org/houxg/leamonax/utils/TimeUtils.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.utils; +package org.houxg.leamonax.utils; import java.text.ParseException; diff --git a/app/src/main/java/org/houxg/leanotelite/utils/ToastUtils.java b/app/src/main/java/org/houxg/leamonax/utils/ToastUtils.java similarity index 90% rename from app/src/main/java/org/houxg/leanotelite/utils/ToastUtils.java rename to app/src/main/java/org/houxg/leamonax/utils/ToastUtils.java index 9b78a8e..449e436 100644 --- a/app/src/main/java/org/houxg/leanotelite/utils/ToastUtils.java +++ b/app/src/main/java/org/houxg/leamonax/utils/ToastUtils.java @@ -1,11 +1,11 @@ -package org.houxg.leanotelite.utils; +package org.houxg.leamonax.utils; import android.content.Context; import android.support.annotation.StringRes; import android.widget.Toast; -import org.houxg.leanotelite.R; +import org.houxg.leamonax.R; public class ToastUtils { public static void show(Context context, String message) { diff --git a/app/src/main/java/org/houxg/leanotelite/widget/LeaViewPager.java b/app/src/main/java/org/houxg/leamonax/widget/LeaViewPager.java similarity index 97% rename from app/src/main/java/org/houxg/leanotelite/widget/LeaViewPager.java rename to app/src/main/java/org/houxg/leamonax/widget/LeaViewPager.java index 26c9e1e..f7b7536 100644 --- a/app/src/main/java/org/houxg/leanotelite/widget/LeaViewPager.java +++ b/app/src/main/java/org/houxg/leamonax/widget/LeaViewPager.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.widget; +package org.houxg.leamonax.widget; import android.content.Context; import android.support.v4.view.ViewPager; diff --git a/app/src/main/java/org/houxg/leanotelite/widget/LeaWebView.java b/app/src/main/java/org/houxg/leamonax/widget/LeaWebView.java similarity index 94% rename from app/src/main/java/org/houxg/leanotelite/widget/LeaWebView.java rename to app/src/main/java/org/houxg/leamonax/widget/LeaWebView.java index 1899a7c..0f2c1b3 100644 --- a/app/src/main/java/org/houxg/leanotelite/widget/LeaWebView.java +++ b/app/src/main/java/org/houxg/leamonax/widget/LeaWebView.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.widget; +package org.houxg.leamonax.widget; import android.content.Context; import android.util.AttributeSet; diff --git a/app/src/main/java/org/houxg/leanotelite/widget/ToggleImageButton.java b/app/src/main/java/org/houxg/leamonax/widget/ToggleImageButton.java similarity index 95% rename from app/src/main/java/org/houxg/leanotelite/widget/ToggleImageButton.java rename to app/src/main/java/org/houxg/leamonax/widget/ToggleImageButton.java index 1609487..90a8a60 100644 --- a/app/src/main/java/org/houxg/leanotelite/widget/ToggleImageButton.java +++ b/app/src/main/java/org/houxg/leamonax/widget/ToggleImageButton.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite.widget; +package org.houxg.leamonax.widget; import android.content.Context; import android.content.res.TypedArray; @@ -7,7 +7,7 @@ import android.util.AttributeSet; import android.widget.Checkable; import android.widget.ImageView; -import org.houxg.leanotelite.R; +import org.houxg.leamonax.R; public class ToggleImageButton extends ImageView implements Checkable { diff --git a/app/src/main/res/layout/activity_edit_note.xml b/app/src/main/res/layout/activity_edit_note.xml index c9c43ef..34db7bb 100644 --- a/app/src/main/res/layout/activity_edit_note.xml +++ b/app/src/main/res/layout/activity_edit_note.xml @@ -6,7 +6,7 @@ - diff --git a/app/src/main/res/layout/fragment_editor.xml b/app/src/main/res/layout/fragment_editor.xml index 5327c38..ccee21c 100755 --- a/app/src/main/res/layout/fragment_editor.xml +++ b/app/src/main/res/layout/fragment_editor.xml @@ -17,30 +17,30 @@ style="@style/FormatButton" android:src="@drawable/ic_insert_photo_black_disable" /> - - - - - - - Leanote Lite + Leamonax Network is unavailable Save note failed Sync notes failed diff --git a/app/src/test/java/org/houxg/leanotelite/ExampleUnitTest.java b/app/src/test/java/org/houxg/leamonax/ExampleUnitTest.java similarity index 92% rename from app/src/test/java/org/houxg/leanotelite/ExampleUnitTest.java rename to app/src/test/java/org/houxg/leamonax/ExampleUnitTest.java index c25e653..a27c7b5 100644 --- a/app/src/test/java/org/houxg/leanotelite/ExampleUnitTest.java +++ b/app/src/test/java/org/houxg/leamonax/ExampleUnitTest.java @@ -1,4 +1,4 @@ -package org.houxg.leanotelite; +package org.houxg.leamonax; import org.junit.Test;