view binding and viewmodels are done

championswimmer · championswimmer · commit 3b24addf1eac · 2020-12-12T20:35:05.000+05:30
Signed-off-by: Arnav Gupta &lt;arnav@codingblocks.com&gt;
diff --git a/api/build.gradle b/api/build.gradle
@@ -12,7 +12,7 @@ java {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2"
-    implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
+    api "com.squareup.retrofit2:retrofit:$retrofit_version"
     implementation "com.squareup.retrofit2:converter-moshi:$retrofit_version"
     implementation  "com.squareup.moshi:moshi:$moshi_version"
     kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshi_version"
diff --git a/api/src/main/java/io/realworld/api/models/entities/ArticleData.kt b/api/src/main/java/io/realworld/api/models/entities/ArticleData.kt
@@ -0,0 +1,17 @@
+package io.realworld.api.models.entities
+
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class ArticleData(
+    @Json(name = "body")
+    val body: String,
+    @Json(name = "description")
+    val description: String,
+    @Json(name = "tagList")
+    val tagList: List<String>,
+    @Json(name = "title")
+    val title: String
+)
diff --git a/api/src/main/java/io/realworld/api/models/entities/LoginData.kt b/api/src/main/java/io/realworld/api/models/entities/LoginData.kt
@@ -0,0 +1,13 @@
+package io.realworld.api.models.entities
+
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class LoginData(
+    @Json(name = "email")
+    val email: String,
+    @Json(name = "password")
+    val password: String,
+)
diff --git a/api/src/main/java/io/realworld/api/models/entities/SignupData.kt b/api/src/main/java/io/realworld/api/models/entities/SignupData.kt
@@ -5,7 +5,7 @@ import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 @JsonClass(generateAdapter = true)
-data class UserCreds(
+data class SignupData(
     @Json(name = "email")
     val email: String,
     @Json(name = "password")
diff --git a/api/src/main/java/io/realworld/api/models/entities/UserUpdateData.kt b/api/src/main/java/io/realworld/api/models/entities/UserUpdateData.kt
@@ -0,0 +1,19 @@
+package io.realworld.api.models.entities
+
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class UserUpdateData(
+    @Json(name = "bio")
+    val bio: String?,
+    @Json(name = "email")
+    val email: String?,
+    @Json(name = "image")
+    val image: String?,
+    @Json(name = "username")
+    val username: String?,
+    @Json(name = "password")
+    val password: String?
+)
diff --git a/api/src/main/java/io/realworld/api/models/requests/CreateArticleRequest.kt b/api/src/main/java/io/realworld/api/models/requests/CreateArticleRequest.kt
@@ -0,0 +1,12 @@
+package io.realworld.api.models.requests
+
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+import io.realworld.api.models.entities.ArticleData
+
+@JsonClass(generateAdapter = true)
+data class CreateArticleRequest(
+    @Json(name = "article")
+    val article: ArticleData
+)
diff --git a/api/src/main/java/io/realworld/api/models/requests/LoginRequest.kt b/api/src/main/java/io/realworld/api/models/requests/LoginRequest.kt
@@ -0,0 +1,13 @@
+package io.realworld.api.models.requests
+
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+import io.realworld.api.models.entities.LoginData
+import io.realworld.api.models.entities.SignupData
+
+@JsonClass(generateAdapter = true)
+data class LoginRequest(
+    @Json(name = "user")
+    val user: LoginData
+)
diff --git a/api/src/main/java/io/realworld/api/models/requests/SignupRequest.kt b/api/src/main/java/io/realworld/api/models/requests/SignupRequest.kt
@@ -3,10 +3,10 @@ package io.realworld.api.models.requests
 
 import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
-import io.realworld.api.models.entities.UserCreds
+import io.realworld.api.models.entities.SignupData
 
 @JsonClass(generateAdapter = true)
 data class SignupRequest(
     @Json(name = "user")
-    val user: UserCreds
+    val user: SignupData
 )
diff --git a/api/src/main/java/io/realworld/api/models/requests/UserUpdateRequest.kt b/api/src/main/java/io/realworld/api/models/requests/UserUpdateRequest.kt
@@ -0,0 +1,11 @@
+package io.realworld.api.models.requests
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+import io.realworld.api.models.entities.SignupData
+
+@JsonClass(generateAdapter = true)
+data class UserUpdateRequest(
+    @Json(name = "user")
+    val user: SignupData
+)
diff --git a/api/src/main/java/io/realworld/api/services/ConduitAPI.kt b/api/src/main/java/io/realworld/api/services/ConduitAPI.kt
@@ -1,14 +1,13 @@
 package io.realworld.api.services
 
-import io.realworld.api.models.entities.UserCreds
+import io.realworld.api.models.requests.LoginRequest
 import io.realworld.api.models.requests.SignupRequest
+import io.realworld.api.models.responses.ArticleResponse
 import io.realworld.api.models.responses.ArticlesResponse
+import io.realworld.api.models.responses.TagsResponse
 import io.realworld.api.models.responses.UserResponse
 import retrofit2.Response
-import retrofit2.http.Body
-import retrofit2.http.GET
-import retrofit2.http.POST
-import retrofit2.http.Query
+import retrofit2.http.*
 
 interface ConduitAPI {
 
@@ -17,11 +16,24 @@ interface ConduitAPI {
         @Body userCreds: SignupRequest
     ): Response<UserResponse>
 
+    @POST("users")
+    suspend fun loginUser(
+        @Body userCreds: LoginRequest
+    ): Response<UserResponse>
+
     @GET("articles")
     suspend fun getArticles(
         @Query("author") author: String? = null,
         @Query("favourited") favourited: String? = null,
         @Query("tag") tag: String? = null
     ): Response<ArticlesResponse>
 
+    @GET("articles/{slug}")
+    suspend fun getArticleBySlug(
+        @Path("slug") slug: String
+    ): Response<ArticleResponse>
+
+    @GET("tags")
+    suspend fun getTags(): Response<TagsResponse>
+
 }
diff --git a/api/src/main/java/io/realworld/api/services/ConduitAuthAPI.kt b/api/src/main/java/io/realworld/api/services/ConduitAuthAPI.kt
@@ -0,0 +1,48 @@
+package io.realworld.api.services
+
+import io.realworld.api.models.requests.UserUpdateRequest
+import io.realworld.api.models.responses.ArticleResponse
+import io.realworld.api.models.responses.ArticlesResponse
+import io.realworld.api.models.responses.ProfileResponse
+import io.realworld.api.models.responses.UserResponse
+import retrofit2.Response
+import retrofit2.http.*
+
+interface ConduitAuthAPI {
+
+    @GET("user")
+    suspend fun getCurrentUser(): Response<UserResponse>
+
+    @PUT("user")
+    suspend fun updateCurrentUser(
+        @Body userUpdateRequest: UserUpdateRequest
+    ): Response<UserResponse>
+
+    @GET("profiles/{username}")
+    suspend fun getProfile(
+        @Path("username") username: String
+    ): Response<ProfileResponse>
+
+    @POST("profiles/{username}/follow")
+    suspend fun followProfile(
+        @Path("username") username: String
+    ): Response<ProfileResponse>
+
+    @DELETE("profiles/{username}/follow")
+    suspend fun unfollowProfile(
+        @Path("username") username: String
+    ): Response<ProfileResponse>
+
+    @GET("articles/feed")
+    suspend fun getFeedArticles(): Response<ArticlesResponse>
+
+    @POST("articles/{slug}/favorite")
+    suspend fun favoriteArticle(
+        @Path("slug") slug: String
+    ): Response<ArticleResponse>
+
+    @DELETE("articles/{slug}/favorite")
+    suspend fun unfavoriteArticle(
+        @Path("slug") slug: String
+    ): Response<ArticleResponse>
+}
diff --git a/api/src/test/java/io/realworld/api/ConduitClientTests.kt b/api/src/test/java/io/realworld/api/ConduitClientTests.kt
@@ -1,6 +1,6 @@
 package io.realworld.api
 
-import io.realworld.api.models.entities.UserCreds
+import io.realworld.api.models.entities.SignupData
 import io.realworld.api.models.requests.SignupRequest
 import kotlinx.coroutines.runBlocking
 import org.junit.Assert.assertEquals
@@ -38,7 +38,7 @@ class ConduitClientTests {
 
     @Test
     fun `POST users - create user`() {
-        val userCreds = UserCreds(
+        val userCreds = SignupData(
             email = "testemail${Random.nextInt(999, 9999)}@test.com",
             password = "pass${Random.nextInt(9999, 999999)}",
             username = "rand_user_${Random.nextInt(99, 999)}"
diff --git a/app/build.gradle b/app/build.gradle
@@ -34,6 +34,8 @@ android {
     }
 }
 
+
+
 dependencies {
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
@@ -46,7 +48,14 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
     implementation 'androidx.navigation:navigation-fragment-ktx:2.3.1'
     implementation 'androidx.navigation:navigation-ui-ktx:2.3.1'
+
+    implementation project(":api")
+
+
+    // unit testing
     testImplementation 'junit:junit:4.+'
+
+    // instrumentation testing
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="io.realworld.android">
 
+    <uses-permission android:name="android.permission.INTERNET"/>
+
     <application
             android:allowBackup="true"
             android:icon="@mipmap/ic_launcher"
diff --git a/app/src/main/java/io/realworld/android/MainActivity.kt b/app/src/main/java/io/realworld/android/MainActivity.kt
@@ -2,15 +2,15 @@ package io.realworld.android
 
 import android.os.Bundle
 import android.view.Menu
-import com.google.android.material.snackbar.Snackbar
-import com.google.android.material.navigation.NavigationView
+import androidx.appcompat.app.AppCompatActivity
+import androidx.drawerlayout.widget.DrawerLayout
 import androidx.navigation.findNavController
 import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.navigateUp
 import androidx.navigation.ui.setupActionBarWithNavController
 import androidx.navigation.ui.setupWithNavController
-import androidx.drawerlayout.widget.DrawerLayout
-import androidx.appcompat.app.AppCompatActivity
+import com.google.android.material.navigation.NavigationView
+import com.google.android.material.snackbar.Snackbar
 import io.realworld.android.databinding.ActivityMainBinding
 
 class MainActivity : AppCompatActivity() {
@@ -28,15 +28,21 @@ class MainActivity : AppCompatActivity() {
 
         binding.appBarMain.fab.setOnClickListener { view ->
             Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
-                    .setAction("Action", null).show()
+                .setAction("Action", null).show()
         }
         val drawerLayout: DrawerLayout = binding.drawerLayout
         val navView: NavigationView = binding.navView
         val navController = findNavController(R.id.nav_host_fragment_content_main)
         // Passing each menu ID as a set of Ids because each
         // menu should be considered as top level destinations.
-        appBarConfiguration = AppBarConfiguration(setOf(
-                R.id.nav_home, R.id.nav_gallery, R.id.nav_slideshow), drawerLayout)
+        appBarConfiguration = AppBarConfiguration(
+            setOf(
+                R.id.nav_feed,
+                R.id.nav_home,
+                R.id.nav_gallery,
+                R.id.nav_slideshow
+            ), drawerLayout
+        )
         setupActionBarWithNavController(navController, appBarConfiguration)
         navView.setupWithNavController(navController)
     }
diff --git a/app/src/main/java/io/realworld/android/data/ArticlesRepo.kt b/app/src/main/java/io/realworld/android/data/ArticlesRepo.kt
@@ -0,0 +1,9 @@
+package io.realworld.android.data
+
+import io.realworld.api.ConduitClient
+
+object ArticlesRepo {
+    val api = ConduitClient().api
+
+    suspend fun getGlobalFeed() = api.getArticles()
+}
diff --git a/app/src/main/java/io/realworld/android/ui/feed/FeedViewModel.kt b/app/src/main/java/io/realworld/android/ui/feed/FeedViewModel.kt
@@ -0,0 +1,27 @@
+package io.realworld.android.ui.feed
+
+import android.util.Log
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import io.realworld.android.data.ArticlesRepo
+import io.realworld.api.models.entities.Article
+import kotlinx.coroutines.launch
+
+class FeedViewModel : ViewModel() {
+
+
+    private val _feed = MutableLiveData<List<Article>>()
+
+    val feed: LiveData<List<Article>> = _feed
+
+    fun fetchGlobalFeed() = viewModelScope.launch {
+        ArticlesRepo.getGlobalFeed().body()?.let {
+            _feed.postValue(it.articles)
+            Log.d("FEED", "feed fetched ${it.articlesCount}")
+        }
+
+    }
+
+}
diff --git a/app/src/main/java/io/realworld/android/ui/feed/GlobalFeedFragment.kt b/app/src/main/java/io/realworld/android/ui/feed/GlobalFeedFragment.kt
@@ -0,0 +1,36 @@
+package io.realworld.android.ui.feed
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.ViewModelProvider
+import io.realworld.android.databinding.FragmentFeedBinding
+
+class GlobalFeedFragment : Fragment() {
+
+    private var _binding: FragmentFeedBinding? = null
+    private lateinit var viewModel: FeedViewModel
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        viewModel = ViewModelProvider(this).get(FeedViewModel::class.java)
+
+        _binding = FragmentFeedBinding.inflate(inflater, container, false)
+
+        _binding?.fetchFeedButton?.setOnClickListener {
+            viewModel.fetchGlobalFeed()
+        }
+
+        return _binding?.root
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+}
diff --git a/app/src/main/res/layout/fragment_feed.xml b/app/src/main/res/layout/fragment_feed.xml
diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
