Bug fix

fix title, content misplace in editor
move Cavern to a dependent module
use custom error instead of volleyError

Author: secminhr

android-Cavern.iml

@@ -8,7 +8,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />

app/app.iml

@@ -13,8 +13,8 @@ android {
         applicationId "tech.stoneapp.secminhr.cavern"
         minSdkVersion 19
         targetSdkVersion 28
-        versionCode 5
-        versionName "3.0.1"
+        versionCode 6
+        versionName "3.1.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true
@@ -66,10 +66,9 @@ dependencies {
     androidTestImplementation 'androidx.test:runner:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
     implementation "androidx.lifecycle:lifecycle-extensions:2.0.0"
-    implementation 'org.jsoup:jsoup:1.11.3'
     implementation "android.arch.navigation:navigation-fragment-ktx:1.0.0"
     implementation "android.arch.navigation:navigation-ui-ktx:1.0.0"
-    implementation 'androidx.core:core-ktx:1.0.1'
+    implementation 'androidx.core:core-ktx:1.0.2'
     implementation "ru.noties.markwon:core:3.0.0"
     implementation "ru.noties.markwon:ext-latex:3.0.0"
     implementation "ru.noties.markwon:ext-strikethrough:3.0.0"
@@ -88,15 +87,11 @@ dependencies {
     implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
     implementation 'com.google.firebase:firebase-firestore:20.0.0'
     implementation 'com.google.firebase:firebase-messaging:19.0.0'
-    implementation 'com.android.volley:volley:1.1.1'
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'com.squareup.picasso:picasso:2.71828'
-    implementation "androidx.room:room-runtime:2.1.0-alpha06"
-    kapt "androidx.room:room-compiler:2.1.0-alpha06"
     implementation "com.atlassian.commonmark:commonmark-ext-autolink:0.12.1"
     implementation 'com.squareup.retrofit2:retrofit:2.5.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.4.0'
     implementation 'androidx.recyclerview:recyclerview:1.0.0'
-    implementation 'com.google.firebase:firebase-database:18.0.0'
-    implementation 'com.google.firebase:firebase-functions:18.0.0'
+    implementation project(":cavern")
 }

app/build.gradle

@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":4,"versionName":"3.0.0","enabled":true,"outputFile":"app-debug.apk","fullName":"debug","baseName":"debug"},"path":"app-debug.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":5,"versionName":"3.0.1","enabled":true,"outputFile":"app-debug.apk","fullName":"debug","baseName":"debug"},"path":"app-debug.apk","properties":{}}]

app/debug/app-debug.apk

@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":4,"versionName":"3.0.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":6,"versionName":"3.1.1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]

app/debug/output.json

@@ -1,7 +1,7 @@
 package tech.stoneapp.secminhr.cavern
 
 import androidx.multidex.MultiDexApplication
-import tech.stoneapp.secminhr.cavern.cavernService.CavernCookieStore
+import stoneapp.secminhr.cavern.cavernService.CavernCookieStore
 import java.net.CookieHandler
 import java.net.CookieManager
 import java.net.CookiePolicy

app/release/Cavern.apk

@@ -6,7 +6,6 @@ import android.text.method.LinkMovementMethod
 import android.util.AttributeSet
 import android.widget.TextView
 import androidx.annotation.RequiresApi
-import com.android.volley.VolleyError
 import ru.noties.markwon.Markwon
 import ru.noties.markwon.ext.latex.JLatexMathPlugin
 import ru.noties.markwon.ext.strikethrough.StrikethroughPlugin
@@ -15,7 +14,8 @@ import ru.noties.markwon.ext.tasklist.TaskListPlugin
 import ru.noties.markwon.html.HtmlPlugin
 import ru.noties.markwon.image.ImagesPlugin
 import ru.noties.markwon.image.okhttp.OkHttpImagesPlugin
-import tech.stoneapp.secminhr.cavern.api.results.Author
+import stoneapp.secminhr.cavern.api.results.Author
+import stoneapp.secminhr.cavern.cavernError.CavernError
 import tech.stoneapp.secminhr.cavern.articlecontent.AtUsernameSpan.AtUsernamePlugin
 import tech.stoneapp.secminhr.cavern.articlecontent.AtUsernameSpan.AtUsernameVisitor
 import tech.stoneapp.secminhr.cavern.articlecontent.markwonUtils.CavernPlugin
@@ -40,14 +40,14 @@ class CavernMarkdownTextView: TextView {
     }
 
     private var onUsernameClickedListeners: ((Author) -> Unit)? = null
-    private var errorListeners: ((VolleyError) -> Unit)? = null
+    private var errorListeners: ((CavernError) -> Unit)? = null
 
     fun addOnUsernameClickedListener(listener: (Author) -> Unit): CavernMarkdownTextView {
         onUsernameClickedListeners = listener
         return this
     }
 
-    fun addErrorListener(listener: (VolleyError) -> Unit): CavernMarkdownTextView {
+    fun addErrorListener(listener: (CavernError) -> Unit): CavernMarkdownTextView {
         errorListeners = listener
         return this
     }