auth feed working

championswimmer · championswimmer · commit fcf859dec7c6 · 2020-12-18T01:04:14.000+05:30
Signed-off-by: Arnav Gupta &lt;arnav@codingblocks.com&gt;
diff --git a/api/src/main/java/io/realworld/api/ConduitClient.kt b/api/src/main/java/io/realworld/api/ConduitClient.kt
@@ -36,7 +36,7 @@ object ConduitClient {
         .create(ConduitAPI::class.java)
 
     val authApi = retrofitBuilder
-        .client(okHttpBuilder.build())
+        .client(okHttpBuilder.addInterceptor(authInterceptor).build())
         .build()
         .create(ConduitAuthAPI::class.java)
 
diff --git a/app/src/main/java/io/realworld/android/AuthViewModel.kt b/app/src/main/java/io/realworld/android/AuthViewModel.kt
@@ -14,7 +14,13 @@ class AuthViewModel : ViewModel() {
 
     fun login(email: String, password: String) = viewModelScope.launch {
         UserRepo.login(email, password)?.let {
-            _user.postValue(it.user)
+            _user.postValue(it)
+        }
+    }
+
+    fun signup(username: String, email: String, password: String) = viewModelScope.launch {
+        UserRepo.signup(username, email, password)?.let {
+            _user.postValue(it)
         }
     }
 }
diff --git a/app/src/main/java/io/realworld/android/MainActivity.kt b/app/src/main/java/io/realworld/android/MainActivity.kt
@@ -39,6 +39,7 @@ class MainActivity : AppCompatActivity() {
         appBarConfiguration = AppBarConfiguration(
             setOf(
                 R.id.nav_feed,
+                R.id.nav_my_feed,
                 R.id.nav_auth
             ), drawerLayout
         )
diff --git a/app/src/main/java/io/realworld/android/data/ArticlesRepo.kt b/app/src/main/java/io/realworld/android/data/ArticlesRepo.kt
@@ -4,6 +4,8 @@ import io.realworld.api.ConduitClient
 
 object ArticlesRepo {
     val api = ConduitClient.publicApi
+    val authApi = ConduitClient.authApi
 
-    suspend fun getGlobalFeed() = api.getArticles()
+    suspend fun getGlobalFeed() = api.getArticles().body()?.articles
+    suspend fun getMyFeed() = authApi.getFeedArticles().body()?.articles
 }
diff --git a/app/src/main/java/io/realworld/android/data/UserRepo.kt b/app/src/main/java/io/realworld/android/data/UserRepo.kt
@@ -2,19 +2,35 @@ package io.realworld.android.data
 
 import io.realworld.api.ConduitClient
 import io.realworld.api.models.entities.LoginData
+import io.realworld.api.models.entities.SignupData
+import io.realworld.api.models.entities.User
 import io.realworld.api.models.requests.LoginRequest
+import io.realworld.api.models.requests.SignupRequest
 import io.realworld.api.models.responses.UserResponse
 
 object UserRepo {
     val api = ConduitClient.publicApi
     val authAPI = ConduitClient.authApi
 
-    suspend fun login(email: String, password: String): UserResponse? {
+    suspend fun login(email: String, password: String): User? {
         val response = api.loginUser(LoginRequest(LoginData(email, password)))
 
+        // TODO: Save it in SharedPreferences
         ConduitClient.authToken = response.body()?.user?.token
 
-        return response.body()
+        return response.body()?.user
+    }
+
+    suspend fun signup(username: String, email: String, password: String): User? {
+        val response = api.signupUser(SignupRequest(SignupData(
+            email, password, username
+        )))
+
+        // TODO: Save it in SharedPreferences
+        ConduitClient.authToken = response.body()?.user?.token
+
+        return response.body()?.user
+
     }
 
     suspend fun getUserProfile() = authAPI.getCurrentUser().body()?.user
diff --git a/app/src/main/java/io/realworld/android/ui/auth/AuthFragment.kt b/app/src/main/java/io/realworld/android/ui/auth/AuthFragment.kt
@@ -31,7 +31,7 @@ class AuthFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        navController = _binding?.let { Navigation.findNavController(it.root) }
+        navController = _binding?.let { Navigation.findNavController(it.root.findViewById(R.id.authFragmentNavHost)) }
         _binding?.authTabLayout?.addOnTabSelectedListener(object: TabLayout.OnTabSelectedListener {
             override fun onTabSelected(tab: TabLayout.Tab?) {
                 when(tab?.position) {
diff --git a/app/src/main/java/io/realworld/android/ui/auth/LoginFragment.kt b/app/src/main/java/io/realworld/android/ui/auth/LoginFragment.kt
@@ -4,22 +4,24 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import io.realworld.android.AuthViewModel
-import io.realworld.android.databinding.FragmentLoginBinding
+import io.realworld.android.databinding.FragmentLoginSignupBinding
 
 class LoginFragment : Fragment() {
 
-    private var _binding: FragmentLoginBinding? = null
+    private var _binding: FragmentLoginSignupBinding? = null
     val authViewModel: AuthViewModel by activityViewModels()
 
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
-        _binding = FragmentLoginBinding.inflate(inflater, container, false)
+        _binding = FragmentLoginSignupBinding.inflate(inflater, container, false)
+        _binding?.usernameEditText?.isVisible = false
 
         return _binding?.root
     }
@@ -28,7 +30,7 @@ class LoginFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
 
         _binding?.apply {
-            loginButton.setOnClickListener {
+            submitButton.setOnClickListener {
                 authViewModel.login(
                     emailEditText.text.toString(),
                     passwordEditText.text.toString()
diff --git a/app/src/main/java/io/realworld/android/ui/auth/SignupFragment.kt b/app/src/main/java/io/realworld/android/ui/auth/SignupFragment.kt
@@ -1,7 +1,47 @@
 package io.realworld.android.ui.auth
 
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
+import io.realworld.android.AuthViewModel
+import io.realworld.android.databinding.FragmentLoginSignupBinding
 
 class SignupFragment : Fragment() {
 
+    private var _binding: FragmentLoginSignupBinding? = null
+    val authViewModel: AuthViewModel by activityViewModels()
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        _binding = FragmentLoginSignupBinding.inflate(inflater, container, false)
+        _binding?.usernameEditText?.isVisible = true
+
+        return _binding?.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        _binding?.apply {
+            submitButton.setOnClickListener {
+                authViewModel.signup(
+                    usernameEditText.text.toString(),
+                    emailEditText.text.toString(),
+                    passwordEditText.text.toString()
+                )
+            }
+        }
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
 }
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
@@ -16,11 +16,16 @@ class FeedViewModel : ViewModel() {
     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}")
+        ArticlesRepo.getGlobalFeed()?.let {
+            _feed.postValue(it)
         }
 
     }
 
+    fun fetchMyFeed() = viewModelScope.launch {
+        ArticlesRepo.getMyFeed()?.let {
+            _feed.postValue(it)
+        }
+    }
+
 }
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
@@ -10,7 +10,6 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import io.realworld.android.databinding.FragmentFeedBinding
 
 class GlobalFeedFragment : Fragment() {
-
     private var _binding: FragmentFeedBinding? = null
     private lateinit var viewModel: FeedViewModel
     private lateinit var feedAdapter: ArticleFeedAdapter
@@ -26,12 +25,17 @@ class GlobalFeedFragment : Fragment() {
         _binding = FragmentFeedBinding.inflate(inflater, container, false)
         _binding?.feedRecyclerView?.layoutManager = LinearLayoutManager(context)
         _binding?.feedRecyclerView?.adapter = feedAdapter
+        return _binding?.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
         viewModel.fetchGlobalFeed()
         viewModel.feed.observe({ lifecycle }) {
             feedAdapter.submitList(it)
         }
 
-        return _binding?.root
+
     }
 
     override fun onDestroyView() {
diff --git a/app/src/main/java/io/realworld/android/ui/feed/MyFeedFragment.kt b/app/src/main/java/io/realworld/android/ui/feed/MyFeedFragment.kt
@@ -0,0 +1,46 @@
+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 androidx.recyclerview.widget.LinearLayoutManager
+import io.realworld.android.databinding.FragmentFeedBinding
+
+class MyFeedFragment : Fragment() {
+
+    private var _binding: FragmentFeedBinding? = null
+    private lateinit var viewModel: FeedViewModel
+    private lateinit var feedAdapter: ArticleFeedAdapter
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        viewModel = ViewModelProvider(this).get(FeedViewModel::class.java)
+        feedAdapter = ArticleFeedAdapter()
+
+        _binding = FragmentFeedBinding.inflate(inflater, container, false)
+        _binding?.feedRecyclerView?.layoutManager = LinearLayoutManager(context)
+        _binding?.feedRecyclerView?.adapter = feedAdapter
+        return _binding?.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        viewModel.fetchMyFeed()
+        viewModel.feed.observe({ lifecycle }) {
+            feedAdapter.submitList(it)
+        }
+
+
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+}
diff --git a/app/src/main/res/drawable/ic_my_feed.xml b/app/src/main/res/drawable/ic_my_feed.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp">
+        
+    <path android:fillColor="@android:color/white" android:pathData="M14,10L2,10v2h12v-2zM14,6L2,6v2h12L14,6zM2,16h8v-2L2,14v2zM21.5,11.5L23,13l-6.99,7 -4.51,-4.5L13,14l3.01,3 5.49,-5.5z"/>
+    
+</vector>
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
@@ -16,5 +16,5 @@
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:navGraph="@navigation/navigation_main_guest" />
+            app:navGraph="@navigation/navigation_main" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_login_signup.xml b/app/src/main/res/layout/fragment_login_signup.xml
@@ -5,6 +5,14 @@
         android:orientation="vertical"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content">
+    <EditText
+            android:inputType="text"
+            android:textAlignment="center"
+            android:hint="username"
+            android:id="@+id/usernameEditText"
+            android:ems="10"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
     <EditText
             android:inputType="textEmailAddress"
             android:textAlignment="center"
@@ -23,7 +31,7 @@
             android:layout_height="wrap_content"/>
     <com.google.android.material.button.MaterialButton
             android:text="Login"
-            android:id="@+id/loginButton"
+            android:id="@+id/submitButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
 
diff --git a/app/src/main/res/menu/menu_main_user.xml b/app/src/main/res/menu/menu_main_user.xml
@@ -8,5 +8,9 @@
                 android:id="@+id/nav_feed"
                 android:icon="@drawable/ic_menu_feed"
                 android:title="@string/menu_feed" />
+        <item
+                android:id="@+id/nav_my_feed"
+                android:icon="@drawable/ic_my_feed"
+                android:title="@string/menu_my_feed" />
     </group>
 </menu>
diff --git a/app/src/main/res/navigation/navigation_main.xml b/app/src/main/res/navigation/navigation_main.xml
@@ -11,6 +11,12 @@
             android:label="@string/menu_feed"
             tools:layout="@layout/fragment_feed" />
 
+    <fragment
+            android:id="@+id/nav_my_feed"
+            android:name="io.realworld.android.ui.feed.MyFeedFragment"
+            android:label="@string/menu_my_feed"
+            tools:layout="@layout/fragment_feed" />
+
     <fragment
             android:id="@+id/nav_auth"
             android:name="io.realworld.android.ui.auth.AuthFragment"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -8,5 +8,6 @@
     <string name="action_settings">Settings</string>
 
     <string name="menu_feed">Feed</string>
+    <string name="menu_my_feed">My Feed</string>
     <string name="menu_auth">Login / Signup</string>
 </resources>

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,13 @@ class AuthViewModel : ViewModel() {`
`14`	`14`
`15`	`15`	`fun login(email: String, password: String) = viewModelScope.launch {`
`16`	`16`	`UserRepo.login(email, password)?.let {`
`17`		`- _user.postValue(it.user)`
	`17`	`+ _user.postValue(it)`
	`18`	`+ }`
	`19`	`+ }`
	`20`	`+`
	`21`	`+ fun signup(username: String, email: String, password: String) = viewModelScope.launch {`
	`22`	`+ UserRepo.signup(username, email, password)?.let {`
	`23`	`+ _user.postValue(it)`
`18`	`24`	`}`
`19`	`25`	`}`
`20`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ class MainActivity : AppCompatActivity() {`
`39`	`39`	`appBarConfiguration = AppBarConfiguration(`
`40`	`40`	`setOf(`
`41`	`41`	`R.id.nav_feed,`
	`42`	`+ R.id.nav_my_feed,`
`42`	`43`	`R.id.nav_auth`
`43`	`44`	`), drawerLayout`
`44`	`45`	`)`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@ import io.realworld.api.ConduitClient`
`4`	`4`
`5`	`5`	`object ArticlesRepo {`
`6`	`6`	`val api = ConduitClient.publicApi`
	`7`	`+ val authApi = ConduitClient.authApi`
`7`	`8`
`8`		`- suspend fun getGlobalFeed() = api.getArticles()`
	`9`	`+ suspend fun getGlobalFeed() = api.getArticles().body()?.articles`
	`10`	`+ suspend fun getMyFeed() = authApi.getFeedArticles().body()?.articles`
`9`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,11 +16,16 @@ class FeedViewModel : ViewModel() {`
`16`	`16`	`val feed: LiveData<List<Article>> = _feed`
`17`	`17`
`18`	`18`	`fun fetchGlobalFeed() = viewModelScope.launch {`
`19`		`- ArticlesRepo.getGlobalFeed().body()?.let {`
`20`		`- _feed.postValue(it.articles)`
`21`		`- Log.d("FEED", "feed fetched ${it.articlesCount}")`
	`19`	`+ ArticlesRepo.getGlobalFeed()?.let {`
	`20`	`+ _feed.postValue(it)`
`22`	`21`	`}`
`23`	`22`
`24`	`23`	`}`
`25`	`24`
	`25`	`+ fun fetchMyFeed() = viewModelScope.launch {`
	`26`	`+ ArticlesRepo.getMyFeed()?.let {`
	`27`	`+ _feed.postValue(it)`
	`28`	`+ }`
	`29`	`+ }`
	`30`	`+`
`26`	`31`	`}`