Merge branch 'my-profile-drawer' into bookmark
This commit is contained in:
commit
24a7906978
@ -53,6 +53,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
|
|||||||
launchActivity(LoginActivity())
|
launchActivity(LoginActivity())
|
||||||
} else {
|
} else {
|
||||||
setupDrawer()
|
setupDrawer()
|
||||||
|
setupTabs()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -61,19 +62,14 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
|
|||||||
val navigationView: NavigationView = findViewById(R.id.nav_view)
|
val navigationView: NavigationView = findViewById(R.id.nav_view)
|
||||||
navigationView.setNavigationItemSelectedListener(this)
|
navigationView.setNavigationItemSelectedListener(this)
|
||||||
|
|
||||||
val tabs = arrayOf(
|
|
||||||
PostsFeedFragment(),
|
|
||||||
searchDiscoverFragment,
|
|
||||||
NewPostFragment(),
|
|
||||||
NotificationsFragment(),
|
|
||||||
Fragment()
|
|
||||||
)
|
|
||||||
setupTabs(tabs)
|
|
||||||
|
|
||||||
// Setup views
|
// Setup views
|
||||||
val accessToken = preferences.getString("accessToken", "")
|
val accessToken = preferences.getString("accessToken", "")
|
||||||
val pixelfedAPI = PixelfedAPI.create("${preferences.getString("domain", "")}")
|
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")
|
pixelfedAPI.verifyCredentials("Bearer $accessToken")
|
||||||
.enqueue(object : Callback<Account> {
|
.enqueue(object : Callback<Account> {
|
||||||
override fun onResponse(call: Call<Account>, response: Response<Account>) {
|
override fun onResponse(call: Call<Account>, response: Response<Account>) {
|
||||||
@ -81,13 +77,11 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
|
|||||||
val account = response.body()!!
|
val account = response.body()!!
|
||||||
|
|
||||||
// Set profile picture
|
// Set profile picture
|
||||||
val avatar = findViewById<ImageView>(R.id.drawer_avatar)
|
|
||||||
ImageConverter.setRoundImageFromURL(
|
ImageConverter.setRoundImageFromURL(
|
||||||
View(applicationContext), account.avatar_static, avatar)
|
View(applicationContext), account.avatar_static, avatar)
|
||||||
avatar.setOnClickListener{ launchActivity(ProfileActivity()) }
|
avatar.setOnClickListener{ launchActivity(ProfileActivity()) }
|
||||||
|
|
||||||
// Set account name
|
// Set account name
|
||||||
val accountName = findViewById<TextView>(R.id.drawer_account_name)
|
|
||||||
accountName.text = account.display_name
|
accountName.text = account.display_name
|
||||||
accountName.setOnClickListener{ launchActivity(ProfileActivity()) }
|
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 = findViewById(R.id.view_pager)
|
||||||
viewPager.adapter = object : FragmentStateAdapter(this) {
|
viewPager.adapter = object : FragmentStateAdapter(this) {
|
||||||
override fun createFragment(position: Int): Fragment {
|
override fun createFragment(position: Int): Fragment {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user