Răsfoiți Sursa

Renamed show/hide extensions

sirekanyan 8 ani în urmă
părinte
comite
a4b8000b50

+ 2 - 2
app/src/main/java/me/vadik/knigopis/BookActivity.kt

@@ -102,11 +102,11 @@ class BookActivity : AppCompatActivity() {
               .doOnSubscribe {
                 saveMenuItem.isVisible = false
                 progressMenuItem.isVisible = true
-                progressMenuItem.actionView.fadeIn()
+                progressMenuItem.actionView.show()
               }
               .doOnError {
                 progressMenuItem.isVisible = false
-                progressMenuItem.actionView.fadeOut()
+                progressMenuItem.actionView.hide()
                 saveMenuItem.isVisible = true
               }
               .subscribe({

+ 5 - 5
app/src/main/java/me/vadik/knigopis/MainActivity.kt

@@ -248,16 +248,16 @@ class MainActivity : AppCompatActivity(), Router {
       }
     }.io2main()
         .doOnSubscribe {
-          progressBar.fadeIn()
-          booksPlaceholder.fadeOut()
+          progressBar.show()
+          booksPlaceholder.hide()
         }
         .doAfterTerminate {
-          progressBar.fadeOut()
+          progressBar.hide()
         }
         .subscribe({ books ->
           if (books.isEmpty()) {
             booksPlaceholder.setText(R.string.error_no_books)
-            booksPlaceholder.fadeIn()
+            booksPlaceholder.show()
           }
           allBooks.addAll(books)
           allBooksAdapter.notifyDataSetChanged()
@@ -271,7 +271,7 @@ class MainActivity : AppCompatActivity(), Router {
                 R.string.error_loading_books
               }
           )
-          booksPlaceholder.fadeIn()
+          booksPlaceholder.show()
         })
   }
 

+ 2 - 2
app/src/main/java/me/vadik/knigopis/adapters/BooksAdapter.kt

@@ -74,12 +74,12 @@ class BooksAdapter(
         }
       }
       .bind<ImageView>(R.id.book_image) {
-        hide()
+        hideNow()
         coverSearch.search(books[it])
             .subscribe({ coverUrl ->
               Glide.with(context)
                   .load(coverUrl)
-                  .doOnSuccess { fadeIn() }
+                  .doOnSuccess { show() }
                   .apply(RequestOptions.centerCropTransform())
                   .into(this)
             }, {

+ 4 - 4
app/src/main/java/me/vadik/knigopis/extensions.kt

@@ -69,21 +69,21 @@ fun <T> RequestBuilder<T>.doOnSuccess(onSuccess: () -> Unit): RequestBuilder<T>
       }
     })
 
-fun View.show() {
+fun View.showNow() {
   alpha = 1f
 }
 
-fun View.hide() {
+fun View.hideNow() {
   alpha = 0f
 }
 
-fun View.fadeIn() {
+fun View.show() {
   animate().alpha(1f).setDuration(200)
       .withStartAction { visibility = View.VISIBLE }
       .start()
 }
 
-fun View.fadeOut() {
+fun View.hide() {
   animate().alpha(0f).setDuration(200)
       .withEndAction { visibility = View.GONE }
       .start()