Selaa lähdekoodia

Fixed compiler warnings

Vadik Sirekanyan 7 vuotta sitten
vanhempi
commit
b783f22f4e

+ 1 - 1
app/src/main/java/com/sirekanyan/knigopis/common/android/NetworkChecker.kt

@@ -14,6 +14,6 @@ class NetworkCheckerImpl(app: Application) : NetworkChecker {
     private val connectivityManager = app.systemConnectivityManager
 
     override fun isNetworkAvailable(): Boolean =
-        connectivityManager.activeNetworkInfo?.isConnectedOrConnecting ?: false
+        connectivityManager.activeNetworkInfo?.isConnected ?: false
 
 }

+ 4 - 2
app/src/main/java/com/sirekanyan/knigopis/common/extensions/String.kt

@@ -9,5 +9,7 @@ fun String.orDefault(default: String) = if (isEmpty()) default else this
 fun String.toUriOrNull() =
     Uri.parse(this).takeIf(Uri::isValidHttpLink)
 
-private fun Uri.isValidHttpLink() =
-    scheme in HTTP_SCHEMES && !host.isNullOrBlank()
+private fun Uri.isValidHttpLink(): Boolean {
+    val scheme: String? = scheme
+    return scheme in HTTP_SCHEMES && !host.isNullOrBlank()
+}

+ 9 - 8
app/src/main/java/com/sirekanyan/knigopis/feature/user/behavior/SimpleBehavior.kt

@@ -13,10 +13,10 @@ class SimpleBehavior(
 ) : CoordinatorLayout.Behavior<View>(context, attrs) {
 
     private val dependViewId: Int
-    private var behaviorHelper: BehaviorHelper? = null
     private val endState: SimpleViewState
     private val minHeight: Int
     private val maxHeight: Int
+    private var behaviorHelper: BehaviorHelper? = null
 
     init {
         val a = context.obtainStyledAttributes(attrs, ViewBehavior)
@@ -40,13 +40,14 @@ class SimpleBehavior(
         child: View,
         dependency: View
     ): Boolean {
-        behaviorHelper?.let { helper ->
-            val ratio = Math.abs(dependency.y) / (maxHeight - minHeight)
-            helper.updateDimensions(child, Math.min(1f, ratio))
-        } ?: run {
-            behaviorHelper =
-                    BehaviorHelper(child.simpleState, endState)
-        }
+        val ratio = Math.abs(dependency.y) / (maxHeight - minHeight)
+        getHelper(child.simpleState).updateDimensions(child, Math.min(1f, ratio))
         return false
     }
+
+    private fun getHelper(startState: SimpleViewState): BehaviorHelper =
+        behaviorHelper ?: BehaviorHelper(startState, endState).also {
+            behaviorHelper = it
+        }
+
 }

+ 1 - 1
app/src/main/res/values-ru/strings.xml

@@ -37,7 +37,7 @@
     <string name="profile.text.todo">%d\nв очереди</string>
     <string name="profile.text.doing">%d\nв процессе</string>
     <string name="profile.text.done">%d\nпрочитано</string>
-    <string name="profile.text.random">%s — %d%%</string>
+    <string name="profile.text.random">%1$s — %2$d%%</string>
 
     <!-- profile menu -->
     <string name="profile.option.edit">Изменить</string>

+ 1 - 1
app/src/main/res/values/strings.xml

@@ -36,7 +36,7 @@
     <string name="profile.text.todo">%d\ntodo</string>
     <string name="profile.text.doing">%d\nreading</string>
     <string name="profile.text.done">%d\ndone</string>
-    <string name="profile.text.random">%s — %d%%</string>
+    <string name="profile.text.random">%1$s — %2$d%%</string>
 
     <!-- profile menu -->
     <string name="profile.option.edit">Edit</string>