Skip to content

Commit

Permalink
Remove unnecessary comments
Browse files Browse the repository at this point in the history
  • Loading branch information
Drjacky committed Sep 1, 2019
1 parent d2ef56e commit a1706d8
Show file tree
Hide file tree
Showing 8 changed files with 121 additions and 135 deletions.
Binary file modified .idea/caches/build_file_checksums.ser
Binary file not shown.
137 changes: 112 additions & 25 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .idea/encodings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.1'
classpath 'com.android.tools.build:gradle:3.5.0'
classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlinVersion"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
classpath "android.arch.navigation:navigation-safe-args-gradle-plugin:1.0.0-alpha06"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@ class AlbumsRepositoryImpl(
/**
* Perform implementation
*/
/*override fun getAlbums(pageSize: Int): Flowable<ResultState<PagedList<Entity.Album>>> =
performList(databaseSource.getAlbums(pageSize),
apiSource.getAlbums(pageSize),
persist = databaseSource::persist)*/
override fun getAlbums(): Flowable<ResultState<PagedList<Entity.Album>>> {
val dataSourceFactory = databaseSource.getAlbums()
val boundaryCallback = RepoBoundaryCallback(apiSource, databaseSource)
Expand All @@ -47,64 +43,15 @@ class AlbumsRepositoryImpl(
ResultState.Loading(d) as ResultState<PagedList<Entity.Album>>
}
.onErrorReturn { e -> ResultState.Error(e, null) }
//return data.compose(wrapResultFlowable())
}


/*override fun getAlbums(): BaseDataSource.Factory<Int, Entity.Album> = object : BaseDataSource.Factory<Int, Entity.Album>() {
override fun create(): BaseDataSource<Int, Entity.Album> = object : PageKeyedDataSource<Int, Entity.Album>() {
@SuppressLint("CheckResult")
override fun loadInitial(params: LoadInitialParams<Int>, callback: LoadInitialCallback<Int, Entity.Album>) {
databaseSource.getAlbums(params.requestedLoadSize)
.subscribe { list ->
callback.onResult(list, null, 2)
}
apiSource.getAlbums(params.requestedLoadSize).subscribe({
databaseSource.persist(it)
}, {})
}
@SuppressLint("CheckResult")
override fun loadAfter(params: LoadParams<Int>, callback: LoadCallback<Int, Entity.Album>) {
databaseSource.getAlbums(params.key, params.requestedLoadSize)
.subscribe { list ->
callback.onResult(list, if (list.isNotEmpty()) params.key + 1 else null)
}
apiSource.getAlbums(params.key, params.requestedLoadSize).subscribe({
databaseSource.persist(it)
}, {})
}
@SuppressLint("CheckResult")
override fun loadBefore(params: LoadParams<Int>, callback: LoadCallback<Int, Entity.Album>) {
databaseSource.getAlbums(params.key, params.requestedLoadSize)
.subscribe { list ->
callback.onResult(list, if (params.key > 1) params.key - 1 else null)
}
apiSource.getAlbums(params.key, params.requestedLoadSize).subscribe({
databaseSource.persist(it)
}, {})
}
}
*/
//override fun getAlbums(pageSize: Int) = databaseSource.getAlbums(pageSize)

override fun deleteAlbum(album: Entity.Album): Single<ResultState<Int>> =
databaseSource.deleteAlbum(album).map {
ResultState.Success(it) as ResultState<Int>
}.onErrorReturn {
ResultState.Error(it, null)
}

/* override fun loadAlbums(pageNumber: Int): Single<ResultState<List<Entity.Album>>> = apiSource.getAlbums(pageNumber).map {
databaseSource.persist(it)
ResultState.Success(it) as ResultState<List<Entity.Album>>
}.onErrorReturn {
ResultState.Error(it, null)
}*/

companion object {
private const val DATABASE_PAGE_SIZE = 20
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ import io.reactivex.CompletableTransformer
* Created by Dr.jacky on 10/15/2018.
*/
/**
* Transformer to io thread for completables.
* A transformer to io thread for completables.
*/
abstract class CTransformer : CompletableTransformer
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Sep 20 12:00:21 IRDT 2018
#Sun Sep 01 20:22:49 CEST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,12 @@ import javax.inject.Inject
/**
* Created by Dr.jacky on 9/7/2018.
*/
class HomeFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener/*, Paginate.Callbacks*/ {
class HomeFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener {

@Inject
lateinit var viewModelFactory: ViewModelProvider.Factory

private var isLoading = false
//private var hasLoadedAllItems = false

private val adapter: AlbumListAdapter by lazy {
AlbumListAdapter()
Expand All @@ -39,11 +38,6 @@ class HomeFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener/*, Pag
ViewModelProviders.of(this, viewModelFactory).get(HomeViewModel::class.java)
}

/* private val paginate: Paginate by lazy {
Paginate.with(fragmentHomeRcyMain, this).setLoadingTriggerThreshold(3)
.addLoadingListItem(true).build()
}*/

private fun onAlbumDeleted(resultState: ResultState<Int>) {
when (resultState) {
is ResultState.Success -> Toast.makeText(activity, "album ${resultState.data} deleted", Toast.LENGTH_SHORT).show()
Expand All @@ -52,10 +46,6 @@ class HomeFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener/*, Pag
}

private fun showAlbums(albums: ResultState<PagedList<Entity.Album>>) {
/*if (viewModel.page == 0) fragmentHomeRcyMain.scrollToPosition(0)
fragmentHomeSwp.isRefreshing = false
isLoading = false*/
//adapter.submitList(albums)
when (albums) {
is ResultState.Success -> {
hideLoading()
Expand All @@ -70,48 +60,25 @@ class HomeFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener/*, Pag
adapter.submitList(albums.data)
}
}
//if (viewModel.pageNumberLiveData.value == 0) fragmentHomeRcyMain.scrollToPosition(0)
isLoading = false
fragmentHomeSwp.isRefreshing = false
//if (hasLoadedAllItems) paginate.setHasMoreDataToLoad(false)
}

@SuppressLint("CheckResult")
private fun initView() {
fragmentHomeSwp.isRefreshing = true
fragmentHomeSwp.setOnRefreshListener(this)
fragmentHomeRcyMain.addItemDecoration(DividerItemDecoration(context, DividerItemDecoration.VERTICAL))
//fragmentHomeRcyMain.layoutManager = LinearLayoutManager(activity)
fragmentHomeRcyMain.setHasFixedSize(true)
fragmentHomeRcyMain.adapter = adapter

adapter.albumItemClickEvent.applyIoScheduler().subscribe { it ->
viewModel.deleteAlbum(it)
}

//paginate

showLoading()
}

/* private fun observeNetworkList() {
observe(viewModel.networkList) {
fragmentHomeSwp.isRefreshing = false
isLoading = false
when (it) {
is ResultState.Success -> {
if (it.data.lastOrNull()?.id == 100L) {
hasLoadedAllItems = true
if (hasLoadedAllItems) paginate.setHasMoreDataToLoad(false)
}
}
is ResultState.Error -> {
Toast.makeText(activity, it.throwable.message, Toast.LENGTH_SHORT).show()
}
}
}
}*/

override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?): View? = inflater.inflate(
Expand All @@ -123,27 +90,8 @@ class HomeFragment : BaseFragment(), SwipeRefreshLayout.OnRefreshListener/*, Pag
observe(viewModel.albumsLiveData, ::showAlbums)
observe(viewModel.deletedAlbumLiveData, ::onAlbumDeleted)
viewModel.getAlbums()
//observeNetworkList()
}

override fun onRefresh() {
/*fragmentHomeSwp.isRefreshing = true
hasLoadedAllItems = false
if (hasLoadedAllItems) paginate.setHasMoreDataToLoad(true)
isLoading = true
viewModel.refresh()*/
//observe(viewModel.albumsLiveData(true), ::showAlbums)
//observeNetworkList()
}

/*override fun onLoadMore() {
if (isLoading) return
isLoading = true
viewModel.getAlbums()
}
override fun isLoading(): Boolean = isLoading
override fun hasLoadedAllItems(): Boolean = hasLoadedAllItems*/
}

0 comments on commit a1706d8

Please sign in to comment.