Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,14 @@ dependencies {
implementation("androidx.constraintlayout:constraintlayout:1.1.3")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.2.0")
implementation("androidx.recyclerview:recyclerview:1.1.0")
implementation("androidx.navigation:navigation-runtime-ktx:2.3.0")
implementation("androidx.navigation:navigation-fragment-ktx:2.3.0")
implementation("androidx.navigation:navigation-ui-ktx:2.3.0")
implementation("com.google.android.material:material:1.3.0-alpha01")
implementation("com.apollographql.apollo:apollo-runtime:2.2.2")
implementation("com.apollographql.apollo:apollo-coroutines-support:2.2.2")
implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.2.0")

}

apollo {
Expand Down
80 changes: 0 additions & 80 deletions app/src/main/java/guide/graphql/toc/ChaptersFragment.kt

This file was deleted.

19 changes: 18 additions & 1 deletion app/src/main/java/guide/graphql/toc/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,29 @@ package guide.graphql.toc

import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import androidx.navigation.NavController
import androidx.navigation.findNavController
import androidx.navigation.ui.AppBarConfiguration
import androidx.navigation.ui.NavigationUI
import guide.graphql.toc.databinding.ActivityMainBinding

class MainActivity : AppCompatActivity() {

private lateinit var binding: ActivityMainBinding


override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
binding = ActivityMainBinding.inflate(layoutInflater)
val view = binding.root
setContentView(view)

setSupportActionBar(binding.toolbar)
NavigationUI.setupActionBarWithNavController(this, findNavController(R.id.nav_host_fragment))

}

setContentView(R.layout.activity_main)
override fun onSupportNavigateUp(): Boolean {
return findNavController(R.id.nav_host_fragment).navigateUp() || super.onSupportNavigateUp()
}
}
23 changes: 23 additions & 0 deletions app/src/main/java/guide/graphql/toc/Resource.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package guide.graphql.toc

//https://github.com/android/architecture-components-samples/blob/master/GithubBrowserSample/app/src/main/java/com/android/example/github/vo/Resource.kt
data class Resource<out T>(val status: Status, val data: T?, val message: String?) {
companion object {
fun <T> success(data: T?): Resource<T> {
return Resource(Status.SUCCESS, data, null)
}

fun <T> error(msg: String, data: T?): Resource<T> {
return Resource(Status.ERROR, data, msg)
}

fun <T> loading(data: T?): Resource<T> {
return Resource(Status.LOADING, data, null)
}
}
}
enum class Status {
SUCCESS,
ERROR,
LOADING
}
103 changes: 0 additions & 103 deletions app/src/main/java/guide/graphql/toc/SectionsFragment.kt

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,21 +1,28 @@
package guide.graphql.toc
package guide.graphql.toc.ui.chapters

import android.content.Context
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.recyclerview.widget.RecyclerView
import guide.graphql.toc.ChaptersQuery
import guide.graphql.toc.R
import guide.graphql.toc.databinding.ChapterBinding

class ChaptersAdapter(
private val chapters: List<ChaptersQuery.Chapter>,
private val context: Context,
private var chapters: List<ChaptersQuery.Chapter> = listOf(),
private val onItemClicked: ((ChaptersQuery.Chapter) -> Unit)
) :
RecyclerView.Adapter<ChaptersAdapter.ViewHolder>() {

class ViewHolder(val binding: ChapterBinding) : RecyclerView.ViewHolder(binding.root)

fun updateChapters(chapters: List<ChaptersQuery.Chapter>) {
this.chapters = chapters
notifyDataSetChanged()
}

override fun getItemCount(): Int {
return chapters.size
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
package guide.graphql.toc.ui.chapters

import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels
import androidx.lifecycle.Observer
import androidx.navigation.fragment.findNavController
import androidx.recyclerview.widget.DividerItemDecoration
import androidx.recyclerview.widget.LinearLayoutManager
import com.google.android.material.transition.MaterialFade
import com.google.android.material.transition.MaterialSharedAxis
import guide.graphql.toc.R
import guide.graphql.toc.Status
import guide.graphql.toc.databinding.ChaptersFragmentBinding

class ChaptersFragment : Fragment() {

private val viewModel: ChaptersViewModel by viewModels()

private lateinit var binding: ChaptersFragmentBinding

override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View? {
binding = ChaptersFragmentBinding.inflate(inflater)
return binding.root
}

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)

val backward = MaterialSharedAxis(MaterialSharedAxis.X, false)
reenterTransition = backward

val forward = MaterialSharedAxis(MaterialSharedAxis.X, true)
exitTransition = forward
}

override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)

requireActivity()
val adapter =
ChaptersAdapter(
requireContext()
) { chapter ->
findNavController().navigate(
ChaptersFragmentDirections.viewSections(
chapterId = chapter.id,
chapterNumber = chapter.number?.toInt() ?: -1,
chapterTitle = if (chapter.number == null) chapter.title else getString(
Copy link
Collaborator Author

@daniel-stoneuk daniel-stoneuk Jul 13, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of passing in the chapter title, we generate it here before passing it to the second fragment. This means we can use this argument in the nav editor.

R.string.chapter_title,
chapter.number.toInt().toString(),
chapter.title
)
)
)
}
val layoutManager = LinearLayoutManager(requireContext())
binding.chapters.layoutManager = layoutManager
val itemDivider = DividerItemDecoration(requireContext(), layoutManager.orientation)
binding.chapters.addItemDecoration(itemDivider)
binding.chapters.adapter = adapter

viewModel.chapterList.observe(viewLifecycleOwner, Observer { chapterListResponse ->
when (chapterListResponse.status) {
Status.SUCCESS -> {
chapterListResponse.data?.let {
adapter.updateChapters(it)
}
}
Status.ERROR -> Toast.makeText(
requireContext(),
"Error: ${chapterListResponse.message}",
Toast.LENGTH_SHORT
).show()
}
})

}
}
Loading