3.2.0 Release

3.2.0
upgrade library

Author: secminhr

app/app.iml

@@ -15,8 +15,8 @@ android {
         applicationId "tech.stoneapp.secminhr.cavern"
         minSdkVersion 19
         targetSdkVersion 28
-        versionCode 7
-        versionName "3.1.2"
+        versionCode 8
+        versionName "3.2.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true
@@ -49,56 +49,58 @@ android {
         }
     }
     buildToolsVersion = '28.0.3'
+    configurations {
+        all*.exclude group:'org.intellij.lang.annotations', module:"jetified-annotaions-13.0.jar"
+        all*.exclude group:'org.intellij.lang.annotations', module:"jetified-annotations-java5-17.0.0.jar"
+        all*.exclude group:'org.jetbrains.annotations', module:"jetified-annotations-13.0.jar"
+        all*.exclude group:'org.jetbrains.annotations', module:"jetified-annotations-java5-17.0.0.jar"
+    }
 }
-
 dependencies {
+    final def markwon_version = '3.1.0'
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'com.google.android.material:material:1.0.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta2'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta3'
     implementation 'androidx.multidex:multidex:2.0.1'
-    implementation 'androidx.vectordrawable:vectordrawable:1.0.1'
+    implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.robolectric:robolectric:4.1'
     testImplementation "org.mockito:mockito-all:1.10.19"
     testImplementation "org.powermock:powermock-module-junit4:1.6.2"
     testImplementation "org.powermock:powermock-api-mockito:1.6.2"
-    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 "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.2'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    implementation "androidx.lifecycle:lifecycle-extensions:2.1.0"
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.2.0-rc02'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.2.0-rc02'
+    implementation 'androidx.core:core-ktx:1.1.0'
     implementation "androidx.paging:paging-runtime-ktx:2.1.0"
-    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"
-    implementation "ru.noties.markwon:ext-tables:3.0.0"
-    implementation "ru.noties.markwon:ext-tasklist:3.0.0"
-    implementation "ru.noties.markwon:html:3.0.0"
-    implementation "ru.noties.markwon:image-gif:3.0.0"
-    implementation "ru.noties.markwon:image-okhttp:3.0.0"
-    implementation "ru.noties.markwon:image-svg:3.0.0"
-    implementation "ru.noties.markwon:recycler:3.0.0"
-    implementation "ru.noties.markwon:recycler-table:3.0.0"
-    implementation "ru.noties.markwon:syntax-highlight:3.0.0"
+
+    implementation "ru.noties.markwon:core:$markwon_version"
+    implementation "ru.noties.markwon:ext-latex:$markwon_version"
+    implementation "ru.noties.markwon:ext-strikethrough:$markwon_version"
+    implementation "ru.noties.markwon:ext-tables:$markwon_version"
+    implementation "ru.noties.markwon:ext-tasklist:$markwon_version"
+    implementation "ru.noties.markwon:html:$markwon_version"
+    implementation "ru.noties.markwon:image-gif:$markwon_version"
+    implementation "ru.noties.markwon:image-okhttp:$markwon_version"
+    implementation "ru.noties.markwon:recycler:$markwon_version"
+    implementation "ru.noties.markwon:recycler-table:$markwon_version"
+    implementation "ru.noties.markwon:syntax-highlight:$markwon_version"
+
     implementation "ru.noties:prism4j:1.1.0"
-    implementation 'com.google.firebase:firebase-core:17.0.0'
-    implementation 'com.google.firebase:firebase-config:18.0.0'
+    implementation 'com.google.firebase:firebase-core:17.2.1'
+    implementation 'com.google.firebase:firebase-config:19.0.3'
     implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
-    implementation 'com.google.firebase:firebase-firestore:20.1.0'
-    implementation 'com.google.firebase:firebase-messaging:19.0.1'
-    implementation 'com.google.firebase:firebase-auth:18.0.0'
-    implementation 'androidx.multidex:multidex:2.0.1'
+    implementation 'com.google.firebase:firebase-firestore:21.2.1'
+    implementation 'com.google.firebase:firebase-messaging:20.0.0'
+    implementation 'com.google.firebase:firebase-auth:19.1.0'
     implementation 'com.squareup.picasso:picasso:2.71828'
     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.zzhoujay.richtext:richtext:3.0.8'
-    implementation 'com.zzhoujay.glideimagegetter:glideimagegetter:1.0.5'
     implementation 'org.jsoup:jsoup:1.12.1'
     implementation "com.android.volley:volley:1.1.1"
     implementation project(":cavern")

app/build.gradle

@@ -7,8 +7,6 @@ import android.text.Spanned
 import android.text.method.LinkMovementMethod
 import android.util.AttributeSet
 import android.util.Log
-import android.widget.TextView
-import androidx.annotation.RequiresApi
 import ru.noties.markwon.Markwon
 import ru.noties.markwon.ext.latex.JLatexMathPlugin
 import ru.noties.markwon.ext.strikethrough.StrikethroughPlugin
@@ -17,14 +15,15 @@ import ru.noties.markwon.ext.tasklist.TaskListPlugin
 import ru.noties.markwon.html.HtmlPlugin
 import ru.noties.markwon.image.AsyncDrawableSpan
 import ru.noties.markwon.image.ImagesPlugin
+import ru.noties.markwon.image.gif.GifPlugin
 import ru.noties.markwon.image.okhttp.OkHttpImagesPlugin
 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
 
-class CavernMarkdownTextView: TextView {
+class CavernMarkdownTextView: androidx.appcompat.widget.AppCompatTextView {
 
     constructor(context: Context): super(context) {
         initialize()
@@ -37,12 +36,6 @@ class CavernMarkdownTextView: TextView {
         initialize()
     }
 
-    @RequiresApi(Build.VERSION_CODES.LOLLIPOP)
-    constructor(context: Context, attrs: AttributeSet, defStyleArr: Int, defStyleRes: Int):
-            super(context, attrs, defStyleArr, defStyleRes) {
-        initialize()
-    }
-
     private var onUsernameClickedListeners: ((Author) -> Unit)? = null
     private var errorListeners: ((CavernError) -> Unit)? = null
 
@@ -61,7 +54,6 @@ class CavernMarkdownTextView: TextView {
 
     private fun initialize() {
         parser = markdownBasicBuilder()
-//        RichText.initCacheDir(context)
     }
 
     private fun markdownBasicBuilder(): Markwon.Builder =
@@ -71,6 +63,7 @@ class CavernMarkdownTextView: TextView {
                     .usePlugin(TaskListPlugin.create(context))
                     .usePlugin(HtmlPlugin.create())
                     .usePlugin(ImagesPlugin.create(context))
+                    .usePlugin(GifPlugin.create(true))
                     .usePlugin(OkHttpImagesPlugin.create())
                     .usePlugin(JLatexMathPlugin.create(70f))
                     .usePlugin(CavernPlugin(resources, context))
@@ -88,12 +81,6 @@ class CavernMarkdownTextView: TextView {
         }
         this.movementMethod = LinkMovementMethod.getInstance()
         parser.build().setMarkdown(this, text)
-//        RichText.fromMarkdown(text)
-//                .imageDownloader(DefaultImageDownloader())
-//                .autoPlay(true)
-//                .cache(CacheType.none)
-//                .placeHolder(ImagePlaceHolder())
-//                .into(this)
     }
 
     override fun setText(text: CharSequence?, type: BufferType?) {
@@ -107,7 +94,6 @@ class CavernMarkdownTextView: TextView {
         if(text is Spanned) {
             val drawableSpans = (text as Spanned).getSpans(0, text.length -1, AsyncDrawableSpan::class.java)
             Log.e("CavernTextView", drawableSpans.toString())
-//            Log.e("CavernTextView", drawableSpans[0].drawable.result.toString())
             val drawables = drawableSpans.map { it.drawable }
             Log.e("CavernTextView", drawables.size.toString())
             for(drawable in drawables) {

app/src/main/java/tech/stoneapp/secminhr/cavern/CavernMarkdownTextView.kt

@@ -9,12 +9,14 @@ import android.widget.Toast
 import androidx.databinding.ObservableField
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
+import androidx.navigation.Navigation
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.squareup.picasso.Picasso
 import kotlinx.android.synthetic.main.fragment_bottom_author_dialog.*
 import stoneapp.secminhr.cavern.cavernObject.Account
 import stoneapp.secminhr.cavern.cavernObject.Role
+import tech.stoneapp.secminhr.cavern.R
 import tech.stoneapp.secminhr.cavern.accountInfo.AccountInfoHolder
 import tech.stoneapp.secminhr.cavern.databinding.FragmentBottomAuthorDialogBinding
 
@@ -54,6 +56,9 @@ class BottomAuthorDialog : BottomSheetDialogFragment, AccountInfoHolder {
         closeButton.setOnClickListener {
             this.dismiss()
         }
+        viewArticleButton.setOnClickListener {
+            Navigation.findNavController(it).navigate(R.id.navigation_article)
+        }
         val behavior = BottomSheetBehavior.from(binding.root.parent as View)
         behavior.state = BottomSheetBehavior.STATE_EXPANDED
     }

app/src/main/java/tech/stoneapp/secminhr/cavern/ImagePlaceHolder.kt

@@ -13,7 +13,7 @@ import stoneapp.secminhr.cavern.cavernObject.Role
 import tech.stoneapp.secminhr.cavern.R
 import tech.stoneapp.secminhr.cavern.accountInfo.AccountInfoHolder
 import tech.stoneapp.secminhr.cavern.activity.LoggedUserModelHolder
-import tech.stoneapp.secminhr.cavern.databinding.FragmentBottomAuthorDialogBinding
+import tech.stoneapp.secminhr.cavern.databinding.FragmentAuthorBinding
 
 class UserFragment : Fragment(), AccountInfoHolder {
 
@@ -22,7 +22,7 @@ class UserFragment : Fragment(), AccountInfoHolder {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
-        val binding = FragmentBottomAuthorDialogBinding.inflate(inflater)
+        val binding = FragmentAuthorBinding.inflate(inflater)
         binding.holder = this
         return binding.root
     }
@@ -33,21 +33,17 @@ class UserFragment : Fragment(), AccountInfoHolder {
         val sharedViewModel = (activity as LoggedUserModelHolder).loggedUserModel
         account.set(sharedViewModel.user.get()!!)
         setHasOptionsMenu(true)
-        loadingProgressBar.visibility = View.GONE
-        mainContentLayout.visibility = View.VISIBLE
-        closeButton.visibility = View.GONE
-        viewArticleButton.visibility = View.GONE
         Picasso.get().load(account.get()!!.avatarLink).into(avatarImageView)
     }
 
-    override fun onCreateOptionsMenu(menu: Menu?, inflater: MenuInflater?) {
-        inflater?.inflate(R.menu.user_fragment_menu, menu)
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        inflater.inflate(R.menu.user_fragment_menu, menu)
     }
 
-    override fun onOptionsItemSelected(item: MenuItem?): Boolean {
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
         val selector:HashMap<Int, () -> Unit> = hashMapOf(R.id.logout_item to ::logout)
-        selector[item?.itemId]?.invoke()
-        return selector.keys.contains(item?.itemId)
+        selector[item.itemId]?.invoke()
+        return selector.keys.contains(item.itemId)
     }
 
     private fun logout() {

app/src/main/java/tech/stoneapp/secminhr/cavern/accountInfo/bottomAuthorDialog/BottomAuthorDialog.kt

@@ -127,6 +127,6 @@ class ArticleContentFragment : Fragment() {
 
     private fun showUserDialog(username: String) {
         val bottomFragment = BottomAuthorDialog.newInstance(username)
-        bottomFragment.show(fragmentManager, "Author")
+        bottomFragment.show(fragmentManager!!, "Author")
     }
 }

app/src/main/java/tech/stoneapp/secminhr/cavern/accountInfo/user/UserFragment.kt

@@ -3,6 +3,7 @@ package tech.stoneapp.secminhr.cavern.articlecontent.AtUsernameSpan
 import ru.noties.markwon.AbstractMarkwonPlugin
 import ru.noties.markwon.MarkwonVisitor
 
+
 class AtUsernamePlugin(val visitor: AtUsernameVisitor): AbstractMarkwonPlugin() {
     override fun configureVisitor(builder: MarkwonVisitor.Builder) {
         builder.on(AtUsernameNode::class.java, visitor)

app/src/main/java/tech/stoneapp/secminhr/cavern/articlecontent/ArticleContentFragment.kt

@@ -10,6 +10,7 @@ import ru.noties.markwon.html.MarkwonHtmlRenderer
 import ru.noties.markwon.html.TagHandler
 
 class FontTagHandler(val resource: Resources, val packageName: String): TagHandler() {
+
     override fun handle(visitor: MarkwonVisitor, renderer: MarkwonHtmlRenderer, tag: HtmlTag) {
         if(tag.isBlock) {
             visitChildren(visitor, renderer, tag.asBlock)

app/src/main/java/tech/stoneapp/secminhr/cavern/articlecontent/AtUsernameSpan/AtUsernamePlugin.kt

@@ -3,6 +3,7 @@ package tech.stoneapp.secminhr.cavern.articlecontent.markwonUtils
 import ru.noties.prism4j.GrammarLocator
 import ru.noties.prism4j.Prism4j
 
+
 class CavernGrammarLocator: GrammarLocator {
 
     private val supportedLanguages = mutableSetOf(