From 8ac638e17c41b3575dbea238281ec4a79f78dfd6 Mon Sep 17 00:00:00 2001
From: mjaillot <marie.jaillot@epfl.ch>
Date: Thu, 30 Apr 2020 22:10:45 +0200
Subject: [PATCH] Fixed avatar drawer

---
 .../java/com/h/pixeldroid/MainActivity.kt     | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/h/pixeldroid/MainActivity.kt b/app/src/main/java/com/h/pixeldroid/MainActivity.kt
index 2163ef06..f48cfd22 100644
--- a/app/src/main/java/com/h/pixeldroid/MainActivity.kt
+++ b/app/src/main/java/com/h/pixeldroid/MainActivity.kt
@@ -53,6 +53,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
             launchActivity(LoginActivity())
         } else {
             setupDrawer()
+            setupTabs()
         }
     }
 
@@ -61,19 +62,14 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
         val navigationView: NavigationView = findViewById(R.id.nav_view)
         navigationView.setNavigationItemSelectedListener(this)
 
-        val tabs = arrayOf(
-            PostsFeedFragment(),
-            searchDiscoverFragment,
-            NewPostFragment(),
-            NotificationsFragment(),
-            Fragment()
-        )
-        setupTabs(tabs)
-
         // Setup views
         val accessToken = preferences.getString("accessToken", "")
         val pixelfedAPI = PixelfedAPI.create("${preferences.getString("domain", "")}")
 
+        val drawerHeader = navigationView.getHeaderView(0)
+        val accountName = drawerHeader.findViewById<TextView>(R.id.drawer_account_name)
+        val avatar = drawerHeader.findViewById<ImageView>(R.id.drawer_avatar)
+
         pixelfedAPI.verifyCredentials("Bearer $accessToken")
             .enqueue(object : Callback<Account> {
                 override fun onResponse(call: Call<Account>, response: Response<Account>) {
@@ -81,13 +77,11 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
                         val account = response.body()!!
 
                         // Set profile picture
-                        val avatar = findViewById<ImageView>(R.id.drawer_avatar)
                         ImageConverter.setRoundImageFromURL(
                             View(applicationContext), account.avatar_static, avatar)
                         avatar.setOnClickListener{ launchActivity(ProfileActivity()) }
 
                         // Set account name
-                        val accountName = findViewById<TextView>(R.id.drawer_account_name)
                         accountName.text = account.display_name
                         accountName.setOnClickListener{ launchActivity(ProfileActivity()) }
                     }
@@ -99,7 +93,15 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
             })
     }
 
-    private fun setupTabs(tabs: Array<Fragment>){
+    private fun setupTabs(){
+        val tabs = arrayOf(
+            PostsFeedFragment(),
+            searchDiscoverFragment,
+            NewPostFragment(),
+            NotificationsFragment(),
+            Fragment()
+        )
+
         viewPager = findViewById(R.id.view_pager)
         viewPager.adapter = object : FragmentStateAdapter(this) {
             override fun createFragment(position: Int): Fragment {