リファクタリング (#46)

* ViewModelのonCleared()でCompositeDisposable#clear()を呼び出すように修正 * リスト系アイテムのレイアウトファイル名をitem_〇〇.xmlに変更 * Lint警告の解決
jageishi · Nov 3, 2019 · 346181d · 346181d
1 parent c809707
commit 346181d
Show file tree

Hide file tree

Showing 17 changed files with 65 additions and 41 deletions.
diff --git a/app/src/main/java/org/ageage/eggplant/bookmarks/BookmarksAdapter.kt b/app/src/main/java/org/ageage/eggplant/bookmarks/BookmarksAdapter.kt
@@ -9,7 +9,7 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 import com.bumptech.glide.request.RequestOptions
 import org.ageage.eggplant.R
 import org.ageage.eggplant.common.model.Bookmark
-import org.ageage.eggplant.databinding.BookmarkItemBinding
+import org.ageage.eggplant.databinding.ItemBookmarkBinding
 import java.text.SimpleDateFormat
 import java.util.*
 
@@ -19,9 +19,9 @@ class BookmarksAdapter(
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BookmarksHolder {
         val binding =
-            DataBindingUtil.inflate<BookmarkItemBinding>(
+            DataBindingUtil.inflate<ItemBookmarkBinding>(
                 LayoutInflater.from(parent.context),
-                R.layout.bookmark_item,
+                R.layout.item_bookmark,
                 parent,
                 false
             )

diff --git a/app/src/main/java/org/ageage/eggplant/bookmarks/BookmarksHolder.kt b/app/src/main/java/org/ageage/eggplant/bookmarks/BookmarksHolder.kt
@@ -1,6 +1,6 @@
 package org.ageage.eggplant.bookmarks
 
 import androidx.recyclerview.widget.RecyclerView
-import org.ageage.eggplant.databinding.BookmarkItemBinding
+import org.ageage.eggplant.databinding.ItemBookmarkBinding
 
-class BookmarksHolder(val binding: BookmarkItemBinding) : RecyclerView.ViewHolder(binding.root)
+class BookmarksHolder(val binding: ItemBookmarkBinding) : RecyclerView.ViewHolder(binding.root)
diff --git a/app/src/main/java/org/ageage/eggplant/bookmarks/BookmarksViewModel.kt b/app/src/main/java/org/ageage/eggplant/bookmarks/BookmarksViewModel.kt
@@ -1,9 +1,10 @@
 package org.ageage.eggplant.bookmarks
 
-import android.annotation.SuppressLint
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxkotlin.addTo
 import org.ageage.eggplant.common.enums.SortType
 import org.ageage.eggplant.common.model.Bookmark
 import org.ageage.eggplant.common.repository.BookmarkRepository
@@ -14,6 +15,8 @@ class BookmarksViewModel(
     private val schedulerProvider: BaseSchedulerProvider
 ) : ViewModel() {
 
+    private val disposable = CompositeDisposable()
+
     private val _isLoading = MutableLiveData<Boolean>()
     val isLoading: MutableLiveData<Boolean>
         get() = _isLoading
@@ -24,7 +27,11 @@ class BookmarksViewModel(
 
     private var isAlreadyLoaded = false
 
-    @SuppressLint("CheckResult")
+    override fun onCleared() {
+        super.onCleared()
+        disposable.clear()
+    }
+
     fun loadBookmarks(url: String, sortType: SortType, forceLoad: Boolean = false) {
         if (isAlreadyLoaded && !forceLoad) {
             return
@@ -57,5 +64,6 @@ class BookmarksViewModel(
             }, {
                 _isLoading.value = false
             })
+            .addTo(disposable)
     }
 }
diff --git a/app/src/main/java/org/ageage/eggplant/common/repository/FeedRepository.kt b/app/src/main/java/org/ageage/eggplant/common/repository/FeedRepository.kt
@@ -108,21 +108,30 @@ class FeedRepository {
                     text = xpp.text ?: ""
                 }
                 XmlPullParser.END_TAG -> {
-                    if (tagName == "item") {
-                        item?.let { items.add(it) }
-                    } else if (tagName == "title") {
-                        item?.let { it.title = text }
-                    } else if (tagName == "link") {
-                        item?.let {
-                            it.link = text
-                            it.faviconUrl = "http://favicon.hatena.ne.jp/?url=$text"
+                    item?.let {
+                        when (tagName) {
+                            "item" -> {
+                                items.add(it)
+                            }
+                            "title" -> {
+                                it.title = text
+                            }
+                            "link" -> {
+                                it.link = text
+                                it.faviconUrl = "http://favicon.hatena.ne.jp/?url=$text"
+                            }
+                            "description" -> {
+                                it.description = text
+                            }
+                            "bookmarkcount" -> {
+                                it.bookmarkCount = text
+                            }
+                            "imageurl" -> {
+                                it.imageUrl = text
+                            }
+                            else -> {
+                            }
                         }
-                    } else if (tagName == "description") {
-                        item?.let { it.description = text }
-                    } else if (tagName == "bookmarkcount") {
-                        item?.let { it.bookmarkCount = text }
-                    } else if (tagName == "imageurl") {
-                        item?.let { it.imageUrl = text }
                     }
                 }
                 else -> {

diff --git a/app/src/main/java/org/ageage/eggplant/common/ui/adapter/FeedItemAdapter.kt b/app/src/main/java/org/ageage/eggplant/common/ui/adapter/FeedItemAdapter.kt
@@ -13,8 +13,7 @@ import org.ageage.eggplant.R
 import org.ageage.eggplant.common.api.response.Item
 import org.ageage.eggplant.common.ui.adapter.viewholder.FeedItemHolder
 import org.ageage.eggplant.common.ui.adapter.viewholder.FeedLoadingItemHolder
-import org.ageage.eggplant.databinding.FeedItemBinding
-import org.ageage.eggplant.databinding.FeedLoadingItemBinding
+import org.ageage.eggplant.databinding.ItemFeedBinding
 
 class FeedItemAdapter(
     private val context: Context,
@@ -29,9 +28,9 @@ class FeedItemAdapter(
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
         when (viewType) {
             VIEW_TYPE_FEED -> {
-                val binding = DataBindingUtil.inflate<FeedItemBinding>(
+                val binding = DataBindingUtil.inflate<ItemFeedBinding>(
                     LayoutInflater.from(parent.context),
-                    R.layout.feed_item,
+                    R.layout.item_feed,
                     parent,
                     false
                 )
@@ -60,9 +59,9 @@ class FeedItemAdapter(
 
             VIEW_TYPE_PROGRESS -> {
                 return FeedLoadingItemHolder(
-                    DataBindingUtil.inflate<FeedLoadingItemBinding>(
+                    DataBindingUtil.inflate(
                         LayoutInflater.from(parent.context),
-                        R.layout.feed_loading_item,
+                        R.layout.item_feed_loading,
                         parent,
                         false
                     )

diff --git a/app/src/main/java/org/ageage/eggplant/common/ui/adapter/viewholder/FeedItemHolder.kt b/app/src/main/java/org/ageage/eggplant/common/ui/adapter/viewholder/FeedItemHolder.kt
@@ -1,6 +1,6 @@
 package org.ageage.eggplant.common.ui.adapter.viewholder
 
 import androidx.recyclerview.widget.RecyclerView
-import org.ageage.eggplant.databinding.FeedItemBinding
+import org.ageage.eggplant.databinding.ItemFeedBinding
 
-class FeedItemHolder(val binding: FeedItemBinding) : RecyclerView.ViewHolder(binding.root)
+class FeedItemHolder(val binding: ItemFeedBinding) : RecyclerView.ViewHolder(binding.root)
diff --git a/app/src/main/java/org/ageage/eggplant/common/ui/adapter/viewholder/FeedLoadingItemHolder.kt b/app/src/main/java/org/ageage/eggplant/common/ui/adapter/viewholder/FeedLoadingItemHolder.kt
@@ -1,8 +1,8 @@
 package org.ageage.eggplant.common.ui.adapter.viewholder
 
 import androidx.recyclerview.widget.RecyclerView
-import org.ageage.eggplant.databinding.FeedLoadingItemBinding
+import org.ageage.eggplant.databinding.ItemFeedLoadingBinding
 
 class FeedLoadingItemHolder(
-    binding: FeedLoadingItemBinding
+    binding: ItemFeedLoadingBinding
 ) : RecyclerView.ViewHolder(binding.root)
diff --git a/app/src/main/java/org/ageage/eggplant/feed/FeedItemsViewModel.kt b/app/src/main/java/org/ageage/eggplant/feed/FeedItemsViewModel.kt
@@ -1,9 +1,10 @@
 package org.ageage.eggplant.feed
 
-import android.annotation.SuppressLint
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxkotlin.addTo
 import org.ageage.eggplant.common.api.response.Item
 import org.ageage.eggplant.common.enums.Category
 import org.ageage.eggplant.common.enums.Mode
@@ -15,6 +16,8 @@ class FeedItemsViewModel(
     private val schedulerProvider: BaseSchedulerProvider
 ) : ViewModel() {
 
+    private val disposable = CompositeDisposable()
+
     private val _items = MutableLiveData<List<Item>>()
     val items: LiveData<List<Item>>
         get() = _items
@@ -25,7 +28,11 @@ class FeedItemsViewModel(
 
     private var isAlreadyLoaded = false
 
-    @SuppressLint("CheckResult")
+    override fun onCleared() {
+        super.onCleared()
+        disposable.clear()
+    }
+
     fun loadRss(mode: Mode, category: Category, forceLoad: Boolean = false) {
         if (isAlreadyLoaded && !forceLoad) {
             return
@@ -45,5 +52,6 @@ class FeedItemsViewModel(
                     _isLoading.postValue(false)
                 }
             )
+            .addTo(disposable)
     }
 }
diff --git a/app/src/main/java/org/ageage/eggplant/search/SearchResultViewModel.kt b/app/src/main/java/org/ageage/eggplant/search/SearchResultViewModel.kt
@@ -55,8 +55,8 @@ class SearchResultViewModel(
     )
 
     override fun onCleared() {
-        disposable.clear()
         super.onCleared()
+        disposable.clear()
     }
 
     fun search(forceLoad: Boolean = false) {
@@ -69,7 +69,7 @@ class SearchResultViewModel(
             .doOnSubscribe {
                 _status.postValue(Status.Loading)
             }
-            .doOnSuccess() {
+            .doOnSuccess {
                 _status.postValue(Status.Success)
             }
             .doOnError {

diff --git a/app/src/main/res/drawable/category_tab_background.xml b/app/src/main/res/drawable/category_tab_background.xml
@@ -2,7 +2,7 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_pressed="false" android:state_selected="false">
         <layer-list>
-            <item android:end="-2dp" android:start="-2dp" android:top="-2dp">
+            <item android:left="-2dp" android:right="-2dp" android:top="-2dp">
                 <shape android:shape="rectangle">
                     <stroke android:width="1dp" android:color="@color/gray" />
                     <gradient android:angle="270" android:endColor="@color/colorSurface" android:startColor="@color/gray" />

diff --git a/app/src/main/res/layout/activity_bookmarks.xml b/app/src/main/res/layout/activity_bookmarks.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -27,4 +27,4 @@
 
     </androidx.viewpager.widget.ViewPager>
 
-</FrameLayout>
+</merge>
diff --git a/app/src/main/res/layout/fragment_bookmarks.xml b/app/src/main/res/layout/fragment_bookmarks.xml
@@ -27,7 +27,7 @@
                 android:layout_height="match_parent"
                 android:orientation="vertical"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                tools:listitem="@layout/bookmark_item" />
+                tools:listitem="@layout/item_bookmark" />
 
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 

diff --git a/app/src/main/res/layout/fragment_feed_items.xml b/app/src/main/res/layout/fragment_feed_items.xml
@@ -27,7 +27,7 @@
                 android:layout_height="match_parent"
                 android:scrollbars="vertical"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                tools:listitem="@layout/feed_item" />
+                tools:listitem="@layout/item_feed" />
 
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 

diff --git a/app/src/main/res/layout/fragment_search_result.xml b/app/src/main/res/layout/fragment_search_result.xml
@@ -35,7 +35,7 @@
                 android:layout_height="match_parent"
                 android:scrollbars="vertical"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                tools:listitem="@layout/feed_item" />
+                tools:listitem="@layout/item_feed" />
 
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 

diff --git a/app/src/main/res/layout/bookmark_item.xml → app/src/main/res/layout/item_bookmark.xml b/app/src/main/res/layout/bookmark_item.xml → app/src/main/res/layout/item_bookmark.xml
diff --git a/app/src/main/res/layout/feed_item.xml → app/src/main/res/layout/item_feed.xml b/app/src/main/res/layout/feed_item.xml → app/src/main/res/layout/item_feed.xml
diff --git a/...src/main/res/layout/feed_loading_item.xml → ...src/main/res/layout/item_feed_loading.xml b/...src/main/res/layout/feed_loading_item.xml → ...src/main/res/layout/item_feed_loading.xml