Skip to content
Open
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 solutions/devsprint-mychelle-rocha-2/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ dependencies {
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'

implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
implementation 'androidx.navigation:navigation-ui-ktx:2.3.5'

//Glide
implementation 'com.github.bumptech.glide:glide:4.13.2'
annotationProcessor 'com.github.bumptech.glide:compiler:4.13.2'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
package com.devpass.spaceapp.model.repository

import com.devpass.spaceapp.data.api.Results
import com.devpass.spaceapp.data.api.SpaceXAPIService
import com.devpass.spaceapp.model.LaunchDetails
import com.devpass.spaceapp.repository.FetchLaunchDetailsRepository

class FetchLaunchDetailsRepositoryImpl(private val api: SpaceXAPIService): FetchLaunchDetailsRepository {
override suspend fun getLaunchDetails(id: String) = api.fetchLaunchDetails(id)
override suspend fun getLaunchDetails(id: String) : Results<LaunchDetails> {
return try {
Results.Success(api.fetchLaunchDetails(id))
} catch (e: Exception) {
Results.Error(Throwable())
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,9 @@ import android.os.Bundle
import com.devpass.spaceapp.databinding.ActivityTabBinding

class LaunchActivity : AppCompatActivity() {

private lateinit var binding: ActivityTabBinding

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

val fragments = listOf(FragmentDetails(), RocketFragment(), FragmentLaunchpad())
val fragmentsPageTitle = listOf("Details", "Rocket", "Launchpad")
val viewPagerAdapter = ViewPagerAdapter(
fragments = fragments,
fragmentManager = supportFragmentManager,
tittles = fragmentsPageTitle
)

binding.viewPager.adapter = viewPagerAdapter
binding.tabLayout.setupWithViewPager(binding.viewPager)
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package com.devpass.spaceapp.presentation

import androidx.appcompat.app.AppCompatActivity
import androidx.fragment.app.Fragment
import androidx.viewpager2.adapter.FragmentStateAdapter

class TabLayoutAdapter (private val numOfTabs: Int, val list: List<Fragment>, activity:
AppCompatActivity): FragmentStateAdapter(activity) {
override fun getItemCount(): Int = numOfTabs

override fun createFragment(position: Int): Fragment {
return list[position]
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.devpass.spaceapp.presentation
package com.devpass.spaceapp.presentation.launchDetails

import android.os.Bundle
import android.view.LayoutInflater
Expand All @@ -13,5 +13,4 @@ class LaunchDetailsActivity : AppCompatActivity() {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_launch_details)
}

}
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package com.devpass.spaceapp.repository

import com.devpass.spaceapp.data.api.Results
import com.devpass.spaceapp.model.LaunchDetails

interface FetchLaunchDetailsRepository {
suspend fun getLaunchDetails(id: String): LaunchDetails
suspend fun getLaunchDetails(id: String): Results<LaunchDetails>
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import com.devpass.spaceapp.data.api.SpaceXAPIService
import com.devpass.spaceapp.data.api.Results
import com.devpass.spaceapp.repository.FetchLaunchesRepository

private const val NUMBER_ROCKETS = 20
private const val NUMBER_ROCKETS = 91

class FetchLaunchesRepositoryImpl(private val api: SpaceXAPIService) : FetchLaunchesRepository {
override suspend fun fetchLaunches(): Results<NextLaunchesModel> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".presentation.LaunchDetailsActivity">
tools:context=".presentation.launchDetails.LaunchDetailsActivity">

<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,27 +71,24 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvDate" />

<com.google.android.material.tabs.TabLayout
android:id="@+id/tabLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_tabLayout"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvStatus">
</com.google.android.material.tabs.TabLayout>

<androidx.viewpager.widget.ViewPager
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/viewPager"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvStatus">

<com.google.android.material.tabs.TabLayout
android:id="@+id/tabLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/margin_tabLayout"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvStatus">

</com.google.android.material.tabs.TabLayout>

</androidx.viewpager.widget.ViewPager>
app:layout_constraintTop_toBottomOf="@id/tabLayout">
</androidx.viewpager2.widget.ViewPager2>

</androidx.constraintlayout.widget.ConstraintLayout>