logout, images, date format done

Signed-off-by: Arnav Gupta <[email protected]>

Author: championswimmer

app/build.gradle

@@ -48,6 +48,7 @@ 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 "com.github.bumptech.glide:glide:4.11.0"
 
     implementation project(":api")
 

app/src/main/java/io/realworld/android/AuthViewModel.kt

@@ -12,6 +12,12 @@ class AuthViewModel : ViewModel() {
     private val _user = MutableLiveData<User?>()
     val user: LiveData<User?> = _user
 
+    fun getCurrentUser(token: String) = viewModelScope.launch {
+        UserRepo.getCurrentUser(token)?.let {
+            _user.postValue(it)
+        }
+    }
+
     fun login(email: String, password: String) = viewModelScope.launch {
         UserRepo.login(email, password)?.let {
             _user.postValue(it)
@@ -24,6 +30,10 @@ class AuthViewModel : ViewModel() {
         }
     }
 
+    fun logout() {
+        _user.postValue(null)
+    }
+
     fun update(
         bio: String?,
         username: String?,

app/src/main/java/io/realworld/android/MainActivity.kt

@@ -1,9 +1,12 @@
 package io.realworld.android
 
+import android.content.Context
+import android.content.SharedPreferences
 import android.os.Bundle
 import android.view.Menu
-import android.widget.Toast
+import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.edit
 import androidx.drawerlayout.widget.DrawerLayout
 import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.findNavController
@@ -17,16 +20,23 @@ import io.realworld.api.models.entities.User
 
 class MainActivity : AppCompatActivity() {
 
+    companion object {
+        const val PREFS_FILE_AUTH = "prefs_auth"
+        const val PREFS_KEY_TOKEN = "token"
+    }
+
     private lateinit var appBarConfiguration: AppBarConfiguration
     private lateinit var binding: ActivityMainBinding
     private lateinit var authViewModel: AuthViewModel
+    private lateinit var sharedPreferences: SharedPreferences
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        sharedPreferences = getSharedPreferences(PREFS_FILE_AUTH, Context.MODE_PRIVATE)
         authViewModel = ViewModelProvider(this).get(AuthViewModel::class.java)
-
         binding = ActivityMainBinding.inflate(layoutInflater)
+
         setContentView(binding.root)
 
         setSupportActionBar(binding.appBarMain.toolbar)
@@ -46,10 +56,25 @@ class MainActivity : AppCompatActivity() {
         setupActionBarWithNavController(navController, appBarConfiguration)
         navView.setupWithNavController(navController)
 
+        sharedPreferences.getString(PREFS_KEY_TOKEN, null)?.let { t ->
+            authViewModel.getCurrentUser(t)
+        }
+
         authViewModel.user.observe({ lifecycle }) {
             updateMenu(it)
+            it?.token?.let { t ->
+                sharedPreferences.edit {
+                    putString(PREFS_KEY_TOKEN, t)
+                }
+            } ?: run {
+                sharedPreferences.edit {
+                    remove(PREFS_KEY_TOKEN)
+                }
+            }
             navController.navigateUp()
         }
+
+
     }
 
     private fun updateMenu(user: User?) {
@@ -59,12 +84,23 @@ class MainActivity : AppCompatActivity() {
                 binding.navView.inflateMenu(R.menu.menu_main_user)
             }
             else -> {
-
+                binding.navView.menu.clear()
+                binding.navView.inflateMenu(R.menu.menu_main_guest)
             }
         }
 
     }
 
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            R.id.action_logout -> {
+                authViewModel.logout()
+                return true
+            }
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         // Inflate the menu; this adds items to the action bar if it is present.
         menuInflater.inflate(R.menu.main, menu)

app/src/main/java/io/realworld/android/data/UserRepo.kt

@@ -35,6 +35,11 @@ object UserRepo {
 
     }
 
+    suspend fun getCurrentUser(token: String): User? {
+        ConduitClient.authToken = token
+        return authAPI.getCurrentUser().body()?.user
+    }
+
     suspend fun updateUser(
         bio: String?,
         username: String?,

app/src/main/java/io/realworld/android/extensions/ImageView.kt

@@ -0,0 +1,12 @@
+package io.realworld.android.extensions
+
+import android.widget.ImageView
+import com.bumptech.glide.Glide
+
+fun ImageView.loadImage(uri: String, circleCrop: Boolean = false) {
+    if (circleCrop) {
+        Glide.with(this).load(uri).circleCrop().into(this)
+    } else {
+        Glide.with(this).load(uri).into(this)
+    }
+}

app/src/main/java/io/realworld/android/extensions/TextView.kt

@@ -0,0 +1,22 @@
+package io.realworld.android.extensions
+
+import android.annotation.SuppressLint
+import android.icu.text.SimpleDateFormat
+import android.widget.TextView
+import java.util.*
+
+@SuppressLint("ConstantLocale")
+val isoDateFormat = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.getDefault())
+
+@SuppressLint("ConstantLocale")
+val appDateFormat = SimpleDateFormat("MMMM dd, yyyy", Locale.getDefault())
+
+var TextView.timeStamp: String
+    set(value) {
+        val date = isoDateFormat.parse(value)
+        text = appDateFormat.format(date)
+    }
+    get() {
+        val date = appDateFormat.parse(text.toString())
+        return isoDateFormat.format(date)
+    }

app/src/main/java/io/realworld/android/ui/article/ArticleFragment.kt

@@ -8,6 +8,8 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProvider
 import io.realworld.android.R
 import io.realworld.android.databinding.FragmentArticleBinding
+import io.realworld.android.extensions.loadImage
+import io.realworld.android.extensions.timeStamp
 
 class ArticleFragment : Fragment() {
 
@@ -40,7 +42,8 @@ class ArticleFragment : Fragment() {
                 titleTextView.text = it.title
                 bodyTextView.text = it.body
                 authorTextView.text = it.author.username
-                dateTextView.text = it.createdAt // TODO: format
+                dateTextView.timeStamp = it.createdAt
+                avatarImageView.loadImage(it.author.image, true)
             }
         }
 

app/src/main/java/io/realworld/android/ui/feed/ArticleFeedAdapter.kt

@@ -1,7 +1,5 @@
 package io.realworld.android.ui.feed
 
-import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -10,19 +8,22 @@ import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import io.realworld.android.R
 import io.realworld.android.databinding.ListItemArticleBinding
+import io.realworld.android.extensions.loadImage
+import io.realworld.android.extensions.timeStamp
 import io.realworld.api.models.entities.Article
 
-class ArticleFeedAdapter(val onArticleClicked: (slug: String) -> Unit) : ListAdapter<Article, ArticleFeedAdapter.ArticleViewHolder>(
-    object : DiffUtil.ItemCallback<Article>() {
-        override fun areItemsTheSame(oldItem: Article, newItem: Article): Boolean {
-            return oldItem == newItem
-        }
+class ArticleFeedAdapter(val onArticleClicked: (slug: String) -> Unit) :
+    ListAdapter<Article, ArticleFeedAdapter.ArticleViewHolder>(
+        object : DiffUtil.ItemCallback<Article>() {
+            override fun areItemsTheSame(oldItem: Article, newItem: Article): Boolean {
+                return oldItem == newItem
+            }
 
-        override fun areContentsTheSame(oldItem: Article, newItem: Article): Boolean {
-            return oldItem.toString() == newItem.toString()
+            override fun areContentsTheSame(oldItem: Article, newItem: Article): Boolean {
+                return oldItem.toString() == newItem.toString()
+            }
         }
-    }
-) {
+    ) {
     inner class ArticleViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView)
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ArticleViewHolder {
@@ -42,8 +43,8 @@ class ArticleFeedAdapter(val onArticleClicked: (slug: String) -> Unit) : ListAda
             authorTextView.text = article.author.username
             titleTextView.text = article.title
             bodySnippetTextView.text = article.body
-            dateTextView.text = "December 15, 2020" //TODO: format actual date
-            avatarImageView.background = ColorDrawable(Color.GRAY) //TODO: show real image
+            dateTextView.timeStamp = article.createdAt
+            avatarImageView.loadImage(article.author.image, true)
 
             root.setOnClickListener { onArticleClicked(article.slug) }
 

app/src/main/res/layout/fragment_article.xml

@@ -25,7 +25,7 @@
                 android:id="@+id/avatarImageView"
                 android:layout_width="32dp"
                 android:layout_height="32dp"
-                android:background="@color/conduit_grey" />
+                tools:background="@color/conduit_grey" />
 
         <LinearLayout
                 android:layout_width="wrap_content"

app/src/main/res/menu/main.xml

@@ -2,8 +2,8 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
-            android:id="@+id/action_settings"
+            android:id="@+id/action_logout"
             android:orderInCategory="100"
-            android:title="@string/action_settings"
+            android:title="@string/action_logout"
             app:showAsAction="never" />
 </menu>