Merge pull request #1 from mrcsxsiq/master

Updating project with base mrcsxsiq

Author: pedrofsn

.idea/codeStyles/Project.xml

@@ -39,21 +39,21 @@ Also available in Play Store
 ## Screenshots
 
 <p align="center">
-  <img src="screenshots/home.png" width="270" alt="Home">
-  <img src="screenshots/pokedex.png" width="270" alt="Pokedex">
-  <img src="screenshots/pokedex-fab.png" width="270" alt="Pokedex FAB">
+  <img src="screenshots/home.png" width="250" alt="Home">
+  <img src="screenshots/pokedex.png" width="250" alt="Pokedex">
+  <img src="screenshots/pokedex-fab.png" width="250" alt="Pokedex FAB">
 </p>
 
 <p align="center">
-  <img src="screenshots/pokedex-fab-search.png" width="270" alt="Pokedex Search">
-  <img src="screenshots/pokedex-fab-generation.png" width="270" alt="Pokedex Generation">
-  <img src="screenshots/pokemon-info-about.png" width="270" alt="Pokemon Info - About">
+  <img src="screenshots/pokedex-fab-search.png" width="250" alt="Pokedex Search">
+  <img src="screenshots/pokedex-fab-generation.png" width="250" alt="Pokedex Generation">
+  <img src="screenshots/pokemon-info-about.png" width="250" alt="Pokemon Info - About">
 </p>
 
 <p align="center">
-  <img src="screenshots/pokemon-info-base-stats.png" width="270" alt="Pokemon Info - Base Stats">
-  <img src="screenshots/pokemon-info-evolution.png" width="270" alt="Pokemon Info - Evolution">
-  <img src="screenshots/news-detail.png" width="270" alt="News Detail">
+  <img src="screenshots/pokemon-info-base-stats.png" width="250" alt="Pokemon Info - Base Stats">
+  <img src="screenshots/pokemon-info-evolution.png" width="250" alt="Pokemon Info - Evolution">
+  <img src="screenshots/news-detail.png" width="250" alt="News Detail">
 </p>
 
 ## Development Roadmap
@@ -105,12 +105,13 @@ Also available in Play Store
 
 ## Contributors
 
-| [<img src="https://avatars3.githubusercontent.com/u/12054216?s=115&v=4" width="48"><br><sub>@zsmb13</sub>](https://github.com/zsmb13) | [<img src="https://avatars0.githubusercontent.com/u/8435541?s=115&v=4" width="48"><br><sub>@aesean</sub>](https://github.com/aesean) | [<img src="https://avatars1.githubusercontent.com/u/988405?s=115&v=4" width="48"><br><sub>@STFBEE</sub>](https://github.com/STFBEE) | [<img src="https://avatars1.githubusercontent.com/u/25616312?s=115&v=4" width="48"><br><sub>@CorneilleEdi</sub>](https://github.com/CorneilleEdi) | [<img src="https://avatars2.githubusercontent.com/u/15768474?s=115&v=4" width="48"><br><sub>@naufalprakoso</sub>](https://github.com/naufalprakoso) | [<img src="https://user-images.githubusercontent.com/95717/60592969-5da81680-9d67-11e9-92a3-8664ee0e2eda.png" width="48"><br><sub>You</sub>](https://github.com/mrcsxsiq/Kotlin-Pokedex/pulls) |
+| [<img src="https://avatars3.githubusercontent.com/u/12054216?s=115&v=4" width="48"><br><sub>@zsmb13</sub>](https://github.com/zsmb13) | [<img src="https://avatars0.githubusercontent.com/u/8435541?s=115&v=4" width="48"><br><sub>@aesean</sub>](https://github.com/aesean) | [<img src="https://avatars1.githubusercontent.com/u/988405?s=115&v=4" width="48"><br><sub>@STFBEE</sub>](https://github.com/STFBEE) | [<img src="https://avatars1.githubusercontent.com/u/25616312?s=115&v=4" width="48"><br><sub>@CorneilleEdi</sub>](https://github.com/CorneilleEdi) | [<img src="https://avatars2.githubusercontent.com/u/15768474?s=115&v=4" width="48"><br><sub>@naufalprakoso</sub>](https://github.com/naufalprakoso) | [<img src="https://avatars0.githubusercontent.com/u/3823933?s=115&v=4" width="48"><br><sub>@szugyi</sub>](https://github.com/szugyi)|
 | :---: |  :---: |  :---: |  :---: |  :---: |  :---: |
+[<img src="https://avatars0.githubusercontent.com/u/43280759?s=115&v=4" width="48"><br><sub>@sudo-dev-pedro</sub>](https://github.com/sudo-dev-pedro) | [<img src="https://avatars0.githubusercontent.com/u/3484814?s=115&v=4" width="48"><br><sub>@pedrofsn</sub>](https://github.com/pedrofsn) | [<img src="https://user-images.githubusercontent.com/95717/60592969-5da81680-9d67-11e9-92a3-8664ee0e2eda.png" width="48"><br><sub>You</sub>](https://github.com/mrcsxsiq/Kotlin-Pokedex/pulls) |
 
 ## Author
 
-| [<img src="https://avatars3.githubusercontent.com/u/993608?s=115&v=4" width="48"><br><sub>@mrcsxsiq</sub>](https://github.com/mrcxsiq) |
+| [<img src="https://avatars3.githubusercontent.com/u/993608?s=115&v=4" width="48"><br><sub>@mrcsxsiq</sub>](https://github.com/mrcsxsiq) |
 | :---: |
 
 ## License

.idea/compiler.xml

@@ -11,7 +11,7 @@ android {
     compileSdkVersion(29)
     buildToolsVersion("29.0.3")
     defaultConfig {
-        applicationId =  "dev.marcosfarias.pokedex"
+        applicationId = "dev.marcosfarias.pokedex"
         minSdkVersion(23)
         targetSdkVersion(29)
         versionCode = 1
@@ -21,7 +21,10 @@ android {
     buildTypes {
         getByName("release") {
             isMinifyEnabled = false
-            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
         }
     }
     kotlinOptions {
@@ -36,10 +39,12 @@ dependencies {
     // Architecture
     implementation("androidx.core:core-ktx:1.2.0")
     implementation("androidx.appcompat:appcompat:1.1.0")
-    implementation("androidx.navigation:navigation-ui:2.2.2")
-    implementation("androidx.navigation:navigation-ui-ktx:2.2.2")
-    implementation("androidx.navigation:navigation-fragment:2.2.2")
-    implementation("androidx.navigation:navigation-fragment-ktx:2.2.2")
+
+    implementation("androidx.navigation:navigation-ui:2.3.5")
+    implementation("androidx.navigation:navigation-ui-ktx:2.3.5")
+    implementation("androidx.navigation:navigation-fragment:2.3.5")
+    implementation("androidx.navigation:navigation-fragment-ktx:2.3.5")
+
     implementation("androidx.lifecycle:lifecycle-extensions:2.2.0")
     implementation("androidx.constraintlayout:constraintlayout:1.1.3")
     implementation("androidx.coordinatorlayout:coordinatorlayout:1.1.0")
@@ -72,4 +77,9 @@ dependencies {
     testImplementation("junit:junit:4.12")
     androidTestImplementation("androidx.test.ext:junit:1.1.1")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.2.0")
+    androidTestImplementation("com.android.support.test.espresso:espresso-contrib:2.0")
+    androidTestImplementation("androidx.navigation:navigation-testing:2.3.5")
+    debugImplementation("androidx.fragment:fragment-testing:1.3.2")
+    androidTestImplementation ("io.mockk:mockk-android:1.9.3")
+
 }

.idea/jarRepositories.xml

@@ -0,0 +1,48 @@
+package dev.marcosfarias.pokedex
+
+import android.content.res.Resources
+import androidx.fragment.app.testing.launchFragmentInContainer
+import androidx.navigation.Navigation
+import androidx.navigation.testing.TestNavHostController
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.platform.app.InstrumentationRegistry
+import dev.marcosfarias.pokedex.model.Pokemon
+import dev.marcosfarias.pokedex.robots.BaseRobot
+import dev.marcosfarias.pokedex.ui.dashboard.DashboardFragment
+import io.mockk.mockk
+import org.junit.Before
+import org.junit.Test
+
+class DashboardTests : BaseRobot() {
+    val pokemon = Pokemon()
+    lateinit var navHost: TestNavHostController
+
+    private val resources: Resources by lazy {
+        InstrumentationRegistry.getInstrumentation().targetContext.resources
+    }
+
+    @Before
+    fun setup() {
+        pokemon.apply {
+            id = "001"
+            name = "Bulbasaur"
+        }
+
+        // Create a TestNavHostController
+        navHost = TestNavHostController(ApplicationProvider.getApplicationContext())
+        launchFragmentInContainer(themeResId = R.style.AppTheme) {
+            DashboardFragment().also { fragment ->
+                // In addition to returning a new instance of our Fragment, // get a callback whenever the fragment’s view is created // or destroyed so that we can set the NavController
+                fragment.viewLifecycleOwnerLiveData.observeForever { viewLifecycleOwner ->
+                    if (viewLifecycleOwner != null) {
+                        // The fragment’s view has just been created
+                        navHost.setGraph(R.navigation.mobile_navigation)
+                        navHost.setCurrentDestination(R.id.navigation_dashboard)
+                        Navigation.setViewNavController(fragment.requireView(), navHost)
+                    }
+                }
+            }
+        }
+    }
+    
+}

.idea/misc.xml

@@ -0,0 +1,45 @@
+package dev.marcosfarias.pokedex
+
+import android.content.res.Resources
+import androidx.fragment.app.testing.launchFragmentInContainer
+import androidx.navigation.Navigation
+import androidx.navigation.testing.TestNavHostController
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.platform.app.InstrumentationRegistry
+import dev.marcosfarias.pokedex.robots.BaseRobot
+import dev.marcosfarias.pokedex.ui.newsdetail.NewsDetailFragment
+import org.junit.Before
+import org.junit.Test
+
+class FragmentNewsDetailsTest: BaseRobot() {
+
+    lateinit var navHost: TestNavHostController
+
+    private val resources: Resources by lazy {
+        InstrumentationRegistry.getInstrumentation().targetContext.resources
+    }
+
+    @Before
+    fun setup() {
+        // Create a TestNavHostController
+        navHost = TestNavHostController(ApplicationProvider.getApplicationContext())
+        launchFragmentInContainer(themeResId = R.style.AppTheme) {
+            NewsDetailFragment().also { fragment ->
+                // In addition to returning a new instance of our Fragment, // get a callback whenever the fragment’s view is created // or destroyed so that we can set the NavController
+                fragment.viewLifecycleOwnerLiveData.observeForever { viewLifecycleOwner ->
+                    if (viewLifecycleOwner != null) {
+                        // The fragment’s view has just been created
+                        navHost.setGraph(R.navigation.mobile_navigation)
+                        Navigation.setViewNavController(fragment.requireView(), navHost)
+                    }
+                }
+            }
+        }
+    }
+
+    @Test
+    fun verifyIfTitleTextIsDisplayed() {
+        isViewDisplayed(R.id.txtNewsTitle)
+    }
+
+}

README.md

@@ -0,0 +1,83 @@
+package dev.marcosfarias.pokedex
+
+import android.content.res.Resources
+import androidx.fragment.app.testing.launchFragmentInContainer
+import androidx.navigation.Navigation
+import androidx.navigation.testing.TestNavHostController
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import dev.marcosfarias.pokedex.robots.BaseRobot
+import dev.marcosfarias.pokedex.ui.home.HomeFragment
+import junit.framework.Assert.assertEquals
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class HomeTest : BaseRobot() {
+    lateinit var navHost: TestNavHostController
+
+    private val resources: Resources by lazy {
+        InstrumentationRegistry.getInstrumentation().targetContext.resources
+    }
+
+    @Before
+    fun setup() {
+        // Create a TestNavHostController
+        navHost = TestNavHostController(ApplicationProvider.getApplicationContext())
+        launchFragmentInContainer(themeResId = R.style.AppTheme) {
+            HomeFragment().also { fragment ->
+                // In addition to returning a new instance of our Fragment, // get a callback whenever the fragment’s view is created // or destroyed so that we can set the NavController
+                fragment.viewLifecycleOwnerLiveData.observeForever { viewLifecycleOwner ->
+                    if (viewLifecycleOwner != null) {
+                        // The fragment’s view has just been created
+                        navHost.setGraph(R.navigation.mobile_navigation)
+                        Navigation.setViewNavController(fragment.requireView(), navHost)
+                    }
+                }
+            }
+        }
+    }
+
+
+    @Test
+    fun testingNavigation() {
+        assertEquals(navHost.graph.id, R.id.mobile_navigation)
+    }
+
+    @Test
+    fun verifyIfRecyclerViewMenuIsDisplayed() {
+        isViewDisplayed(R.id.recyclerViewMenu)
+    }
+
+    @Test
+    fun verifyIfRecyclerViewTextIsDisplayed() {
+        isRecyclerViewItemDisplayed(
+            R.id.recyclerViewMenu,
+            resources.getString(R.string.menu_item_1))
+    }
+
+    @Test
+    fun verifyIfRecyclerViewNewsIsDisplayed() {
+        isViewDisplayed(R.id.recyclerViewNews)
+    }
+
+    @Test
+    fun verifyIfRecyclerViewItemIsDisplayed() {
+        onClickItem(R.id.recyclerViewNews)
+    }
+
+    @Test
+    fun testingTitleAndSearchBarText() {
+        testViewText(
+            R.id.search_title,
+            resources.getString(R.string.main_title)
+        )
+
+        testViewText(
+            R.id.search_text,
+            resources.getString(R.string.main_search)
+        )
+    }
+}