Merge branch 'dev' of https://github.com/rebelonion/Dantotsu into dev

app/src/main/java/ani/dantotsu/profile/activity/ActivityActivity.kt

@@ -0,0 +1,60 @@
+package ani.dantotsu.profile.activity
+
+import android.annotation.SuppressLint
+import android.os.Bundle
+import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.updateLayoutParams
+import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.LinearLayoutManager
+import ani.dantotsu.connections.anilist.Anilist
+import ani.dantotsu.connections.anilist.api.Activity
+import ani.dantotsu.databinding.ActivityFollowBinding
+import ani.dantotsu.initActivity
+import ani.dantotsu.statusBarHeight
+import ani.dantotsu.themes.ThemeManager
+import com.xwray.groupie.GroupieAdapter
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+class ActivityActivity : AppCompatActivity() {
+    private lateinit var binding: ActivityFollowBinding
+    private var adapter: GroupieAdapter = GroupieAdapter()
+    private var activityList: List<Activity> = emptyList()
+
+    @SuppressLint("SetTextI18n")
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        ThemeManager(this).applyTheme()
+        initActivity(this)
+        binding = ActivityFollowBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        binding.listTitle.text = "Activity"
+        binding.listToolbar.updateLayoutParams<ViewGroup.MarginLayoutParams> { topMargin = statusBarHeight }
+        binding.listRecyclerView.adapter = adapter
+        binding.listRecyclerView.layoutManager = LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)
+        binding.followerGrid.visibility = ViewGroup.GONE
+        binding.followerList.visibility = ViewGroup.GONE
+        binding.listBack.setOnClickListener {
+            onBackPressed()
+        }
+        binding.listProgressBar.visibility = ViewGroup.VISIBLE
+        var userId: Int? = intent.getIntExtra("userId", -1)
+        if (userId == -1) userId = null
+        val global = intent.getBooleanExtra("global", false)
+
+        lifecycleScope.launch(Dispatchers.IO) {
+            val res = Anilist.query.getFeed(userId, global)
+
+            withContext(Dispatchers.Main){
+                res?.data?.page?.activities?.let { activities ->
+                    activityList = activities
+                    adapter.update(activityList.map { ActivityItem(it){} })
+                }
+                binding.listProgressBar.visibility = ViewGroup.GONE
+            }
+        }
+    }
+}

app/src/main/java/ani/dantotsu/profile/activity/ActivityItem.kt

@@ -1,5 +1,6 @@
 package ani.dantotsu.profile.activity
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.view.View
 import androidx.core.content.ContextCompat
@@ -20,6 +21,7 @@ class ActivityItem(
     val clickCallback: (Int) -> Unit
 ): BindableItem<ItemActivityBinding>() {
     private lateinit var binding: ItemActivityBinding
+    @SuppressLint("SetTextI18n")
     override fun bind(viewBinding: ItemActivityBinding, position: Int) {
         binding = viewBinding
 
@@ -45,12 +47,13 @@ class ActivityItem(
                 binding.activityCover.loadImage(activity.media.coverImage?.medium)
                 val banner = activity.media.bannerImage
                 if (banner != null) {
-                if (!(context as android.app.Activity).isDestroyed)
-                    Glide.with(context as Context)
-                        .load(GlideUrl(banner))
-                        .diskCacheStrategy(DiskCacheStrategy.ALL).override(400)
-                        .apply(RequestOptions.bitmapTransform(BlurTransformation(2, 2)))
-                        .into(binding.activityBannerImage)
+                    if (!(context as android.app.Activity).isDestroyed) {
+                        Glide.with(context as Context)
+                            .load(GlideUrl(banner))
+                            .diskCacheStrategy(DiskCacheStrategy.ALL).override(400)
+                            .apply(RequestOptions.bitmapTransform(BlurTransformation(2, 2)))
+                            .into(binding.activityBannerImage)
+                    }
                 } else {
                     binding.activityBannerImage.setImageResource(R.drawable.linear_gradient_bg)
                 }

app/src/main/java/ani/dantotsu/profile/activity/NotificationActivity.kt

@@ -18,7 +18,9 @@ import ani.dantotsu.profile.ProfileActivity
 import ani.dantotsu.statusBarHeight
 import ani.dantotsu.themes.ThemeManager
 import com.xwray.groupie.GroupieAdapter
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 
 class NotificationActivity : AppCompatActivity() {
     private lateinit var binding: ActivityFollowBinding
@@ -41,13 +43,16 @@ class NotificationActivity : AppCompatActivity() {
         binding.listBack.setOnClickListener {
             onBackPressed()
         }
-
+        binding.listProgressBar.visibility = ViewGroup.VISIBLE
         lifecycleScope.launch {
             val res = Anilist.query.getNotifications(Anilist.userid?:0)
             res?.data?.page?.notifications?.let { notifications ->
                 notificationList = notifications
                 adapter.update(notificationList.map { NotificationItem(it, ::onNotificationClick) })
             }
+            withContext(Dispatchers.Main){
+                binding.listProgressBar.visibility = ViewGroup.GONE
+            }
         }
     }
 

app/src/main/java/ani/dantotsu/profile/activity/NotificationItem.kt

@@ -38,7 +38,7 @@ class NotificationItem(
 
     private fun image(user: Boolean = false) {
         val context = binding.notificationBannerImage.context
-        val cover = if (user) notification.user?.bannerImage else notification.media?.bannerImage
+        val cover = if (user) notification.user?.bannerImage ?: notification.user?.avatar?.medium else notification.media?.bannerImage ?: notification.media?.coverImage?.large
         if (cover != null) {
             if (!(context as Activity).isDestroyed)
                 Glide.with(context as Context)
@@ -50,7 +50,7 @@ class NotificationItem(
             binding.notificationBannerImage.setImageResource(R.drawable.linear_gradient_bg)
         }
         val defaultHeight = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 170f, context.resources.displayMetrics).toInt()
-        val userHeight = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 80f, context.resources.displayMetrics).toInt()
+        val userHeight = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 90f, context.resources.displayMetrics).toInt()
 
         if (user) {
             binding.notificationCover.visibility = View.GONE
@@ -58,14 +58,12 @@ class NotificationItem(
             binding.notificationCoverUserContainer.visibility = View.VISIBLE
             binding.notificationCoverUser.loadImage(notification.user?.avatar?.large)
             binding.notificationBannerImage.layoutParams.height = userHeight
-            binding.notificationBannerGradient.layoutParams.height = userHeight
         } else{
             binding.notificationCover.visibility = View.VISIBLE
             binding.notificationCoverUser.visibility = View.VISIBLE
             binding.notificationCoverUserContainer.visibility = View.GONE
             binding.notificationCover.loadImage(notification.media?.coverImage?.large)
             binding.notificationBannerImage.layoutParams.height = defaultHeight
-            binding.notificationBannerGradient.layoutParams.height = defaultHeight
         }
     }