Merge pull request #8 from RadiationX/develop

update 221 0.9.8
RadiationX · Sep 25, 2020 · 22c919f · 22c919f
2 parents 79260f2 + bf25454
commit 22c919f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -20,11 +20,11 @@ android {
 
     def fileNaming = "apk/ForPDA"
 
-    def versionNumber = 220
+    def versionNumber = 221
 
     def versionMajor = "0"
     def versionMinor = "9"
-    def versionPatch = "7"
+    def versionPatch = "8"
 
     def versionBuild = -1
     def versionPropsFile = file('version.properties')
@@ -199,7 +199,7 @@ dependencies {
 
     implementation "com.github.moxy-community:moxy:2.1.1"
     implementation 'com.github.moxy-community:moxy-androidx:2.1.1'
-    annotationProcessor 'com.github.moxy-community:moxy-androidx:2.1.1'
+    annotationProcessor 'com.github.moxy-community:moxy-compiler:2.1.1'
     kapt 'com.github.moxy-community:moxy-compiler:2.1.1'
 
     implementation "com.jakewharton.rxrelay2:rxrelay:2.1.0"

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -35,7 +35,7 @@
 -keep interface okhttp3.** { *; }
 -dontwarn okhttp3.**
 
--keep public class android.support.customtabs.ICustomTabsService
+-keep public class androidx.browser.customtabs.CustomTabsService
 
 # -keep сlass com.lapism.searchview.** { *; }
 
@@ -56,10 +56,10 @@
 
 -keep public class com.unnamed.b.atv.model.TreeNode
 -keep public class * extends com.unnamed.b.atv.model.TreeNode { *; }
--keep public class com.unnamed.b.atv.model.TreeNode$BaseNodeViewHolder
--keep public class * extends com.unnamed.b.atv.model.TreeNode$BaseNodeViewHolder { *; }
+-keep public class com.unnamed.b.atv.model.TreeNode.BaseNodeViewHolder
+-keep public class * extends com.unnamed.b.atv.model.TreeNode.BaseNodeViewHolder { *; }
 
 # В search fragment юзается с рефлексией, поэтому нужно исключить
--keep public class android.support.v4.widget.SwipeRefreshLayout { *; }
+-keep public class androidx.swiperefreshlayout.widget.SwipeRefreshLayout { *; }
 
 
diff --git a/app/src/main/java/forpdateam/ru/forpda/presentation/topics/TopicsPresenter.kt b/app/src/main/java/forpdateam/ru/forpda/presentation/topics/TopicsPresenter.kt
@@ -134,7 +134,7 @@ class TopicsPresenter(
             linkHandler.handle("https://4pda.ru/forum/index.php?showforum=${item.id}", router)
             return
         }
-        linkHandler.handle("https://4pda.ru/forum/index.php?showtopic=${item.id}&view=getnewpost", router, mapOf(
+        linkHandler.handle("https://4pda.ru/forum/index.php?showtopic=${item.id}", router, mapOf(
                 Screen.ARG_TITLE to item.title
         ))
     }

diff --git a/app/version.properties b/app/version.properties
@@ -1,3 +1,3 @@
-#Thu Sep 24 23:58:48 MSK 2020
-DATE_BUILD=24 сентября 2020 г.
-VERSION_BUILD=13581
+#Fri Sep 25 21:17:23 MSK 2020
+DATE_BUILD=25 сентября 2020 г.
+VERSION_BUILD=13597