Merge dev

3 files changed, 21 insertions, 11 deletions

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt
index f4c1244f..56125303 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt
@@ -30,6 +30,7 @@ import ca.allanwang.kau.adapters.ThemableIItemDelegate
 import ca.allanwang.kau.logging.KL
 import ca.allanwang.kau.utils.bindView
 import ca.allanwang.kau.utils.dimenPixelSize
+import ca.allanwang.kau.utils.drawable
 import ca.allanwang.kau.utils.resolveDrawable
 import ca.allanwang.kau.utils.startLink
 import ca.allanwang.kau.utils.string
@@ -156,17 +157,26 @@ class AboutActivity : AboutActivityBase(null, {
             init {
                 val c = itemView.context
                 val size = c.dimenPixelSize(R.dimen.kau_avatar_bounds)
-                images = arrayOf<Pair<IIcon, () -> Unit>>(
+
+                val icons: Array<Pair<Int, () -> Unit>> =
+                    arrayOf(R.drawable.ic_fdroid_24 to { c.startLink(R.string.fdroid_url) })
+                val iicons: Array<Pair<IIcon, () -> Unit>> = arrayOf(
                     GoogleMaterial.Icon.gmd_file_download to { c.startLink(R.string.github_downloads_url) },
                     CommunityMaterial.Icon2.cmd_reddit to { c.startLink(R.string.reddit_url) },
                     CommunityMaterial.Icon.cmd_github_circle to { c.startLink(R.string.github_url) },
                     CommunityMaterial.Icon2.cmd_slack to { c.startLink(R.string.slack_url) },
-                    CommunityMaterial.Icon2.cmd_xda to { c.startLink(R.string.xda_url) }
-                ).mapIndexed { i, (icon, onClick) ->
+                    CommunityMaterial.Icon2.cmd_xda to { c.startLink(R.string.xda_url) })
+
+                images = (icons.map { (icon, onClick) -> c.drawable(icon) to onClick } + iicons.map { (icon, onClick) ->
+                    icon.toDrawable(
+                        c,
+                        32
+                    ) to onClick
+                }).mapIndexed { i, (icon, onClick) ->
                     ImageView(c).apply {
                         layoutParams = ViewGroup.LayoutParams(size, size)
                         id = 109389 + i
-                        setImageDrawable(icon.toDrawable(context, 32))
+                        setImageDrawable(icon)
                         scaleType = ImageView.ScaleType.CENTER
                         background = context.resolveDrawable(android.R.attr.selectableItemBackgroundBorderless)
                         setOnClickListener { onClick() }
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt
index 610b2796..b80f06f7 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/LoginActivity.kt
@@ -146,7 +146,7 @@ class LoginActivity : BaseActivity() {
     private suspend fun loadProfile(id: Long): Boolean = withMainContext {
         suspendCancellableCoroutine<Boolean> { cont ->
             profileLoader.load(profilePictureUrl(id))
-                .transform(FrostGlide.roundCorner).listener(object : RequestListener<Drawable> {
+                .transform(FrostGlide.circleCrop).listener(object : RequestListener<Drawable> {
                     override fun onResourceReady(
                         resource: Drawable?,
                         model: Any?,
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt
index 1ea655d1..accf9d98 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/WebOverlayActivity.kt
@@ -58,7 +58,7 @@ import com.pitchedapps.frost.enums.OverlayContext
 import com.pitchedapps.frost.facebook.FB_URL_BASE
 import com.pitchedapps.frost.facebook.FbCookie
 import com.pitchedapps.frost.facebook.FbItem
-import com.pitchedapps.frost.facebook.USER_AGENT_BASIC
+import com.pitchedapps.frost.facebook.USER_AGENT_DESKTOP
 import com.pitchedapps.frost.facebook.formattedFbUrl
 import com.pitchedapps.frost.kotlin.subscribeDuringJob
 import com.pitchedapps.frost.services.FrostRunnable
@@ -141,10 +141,10 @@ class FrostWebActivity : WebOverlayActivityBase(false) {
 }
 
 /**
- * Variant that forces a basic user agent. This is largely internal,
+ * Variant that forces a desktop user agent. This is largely internal,
  * and is only necessary when we are launching from an existing [WebOverlayActivityBase]
  */
-class WebOverlayBasicActivity : WebOverlayActivityBase(true)
+class WebOverlayDesktopActivity : WebOverlayActivityBase(true)
 
 /**
  * Internal overlay for the app; this is tied with the main task and is singleTop as opposed to singleInstance
@@ -153,7 +153,7 @@ class WebOverlayActivity : WebOverlayActivityBase(false)
 
 @SuppressLint("Registered")
 @UseExperimental(ExperimentalCoroutinesApi::class)
-open class WebOverlayActivityBase(private val forceBasicAgent: Boolean) : BaseActivity(),
+open class WebOverlayActivityBase(private val forceDesktopAgent: Boolean) : BaseActivity(),
     ActivityContract, FrostContentContainer,
     VideoViewHolder, FileChooserContract by FileChooserDelegate() {
 
@@ -210,8 +210,8 @@ open class WebOverlayActivityBase(private val forceBasicAgent: Boolean) : BaseAc
         }
 
         with(web) {
-            if (forceBasicAgent) //todo check; the webview already adds it dynamically
-                userAgentString = USER_AGENT_BASIC
+            if (forceDesktopAgent) //todo check; the webview already adds it dynamically
+                userAgentString = USER_AGENT_DESKTOP
             Prefs.prevId = Prefs.userId
             launch {
                 if (userId != Prefs.userId)