toggle expand title & description

README.md

@@ -5,15 +5,19 @@ An unofficial Android client for [LinkDing](https://github.com/sissbruecker/link
 
 ## Features
 - Save bookmarks through the Android share menu.
+- Easily add tags to bookmarks.
 - View recent bookmarks.
-## Install
+## Installation
 
 1. Use [Obtainium](https://github.com/ImranR98/Obtainium) to install and update from GitHub, or
 2. Download the latest apk from the [releases page](https://github.com/danielyrovas/linklater/releases/latest).
 
 ## TODO:
-- Provide typical CRUD operations on bookmarks
-- Simplify selecting/searching for tags when saving bookmarks
+- Provide management operations on bookmarks: edit/delete.
+- Make tag predictions smarter.
+- Tests.
+- Use Fastlane to release on the Play store.
+- F-Droid release.
 
 ## Free Software
 

app/src/main/java/org/yrovas/linklater/AppComponent.kt

@@ -35,7 +35,7 @@ import org.yrovas.linklater.domain.BookmarkAPI
 import org.yrovas.linklater.domain.BookmarkDataSource
 import org.yrovas.linklater.domain.TagDataSource
 import org.yrovas.linklater.ui.activity.AppActivity
-import org.yrovas.linklater.ui.common.DestinationHost
+import org.yrovas.linklater.ui.component.DestinationHost
 
 const val TAG = "DEBUG/create"
 val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = "preferences")

app/src/main/java/org/yrovas/linklater/data/Bookmark.kt

@@ -24,6 +24,26 @@ data class Bookmark(
     @SerialName("tag_names") val tags: List<String> = emptyList(),
 )
 
+fun Bookmark.showTitleOrElse(value: String): String {
+    return if (!title.isNullOrBlank()) {
+        title
+    } else if (!website_title.isNullOrBlank()) {
+        website_title
+    } else {
+        value
+    }
+}
+
+fun Bookmark.showDescriptionOrElse(value: String): String {
+    return if (!description.isNullOrBlank()) {
+        description
+    } else if (!website_description.isNullOrBlank()) {
+        website_description
+    } else {
+        value
+    }
+}
+
 fun GetBookmarksWithTags.toBookmark() = Bookmark(
     id = id,
     url = url,

app/src/main/java/org/yrovas/linklater/ui/common/Icon.kt

@@ -7,35 +7,55 @@ import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.graphics.vector.ImageVector
 
 @Composable
-fun Icon(painter: Painter, tint: Color, modifier: Modifier = Modifier) {
+fun Icon(
+    painter: Painter,
+    tint: Color,
+    modifier: Modifier = Modifier,
+    contentDescription: String? = null,
+) {
     androidx.compose.material3.Icon(
         modifier = modifier,
         painter = painter,
-        tint = tint,
-        contentDescription = null
+        tint = tint, contentDescription = contentDescription
     )
 }
 
 @Composable
-fun Icon(painter: Painter, modifier: Modifier = Modifier) {
+fun Icon(
+    painter: Painter,
+    modifier: Modifier = Modifier,
+    contentDescription: String? = null,
+) {
     androidx.compose.material3.Icon(
-        modifier = modifier, painter = painter, contentDescription = null
+        modifier = modifier,
+        painter = painter,
+        contentDescription = contentDescription
     )
 }
 
 @Composable
-fun Icon(imageVector: ImageVector, modifier: Modifier = Modifier) {
+fun Icon(
+    imageVector: ImageVector,
+    modifier: Modifier = Modifier,
+    contentDescription: String? = null,
+) {
     androidx.compose.material3.Icon(
-        modifier = modifier, imageVector = imageVector, contentDescription = null
+        modifier = modifier,
+        imageVector = imageVector,
+        contentDescription = contentDescription
     )
 }
 
 @Composable
-fun Icon(imageVector: ImageVector, tint: Color, modifier: Modifier = Modifier) {
+fun Icon(
+    imageVector: ImageVector,
+    tint: Color,
+    modifier: Modifier = Modifier,
+    contentDescription: String? = null,
+) {
     androidx.compose.material3.Icon(
         modifier = modifier,
         imageVector = imageVector,
-        tint = tint,
-        contentDescription = null
+        tint = tint, contentDescription = contentDescription
     )
 }

app/src/main/java/org/yrovas/linklater/ui/common/KeyboardRow.kt

@@ -26,10 +26,10 @@ import androidx.compose.ui.zIndex
 fun KeyboardRow(content: @Composable () -> Unit) {
     val isImeVisible = WindowInsets.isImeVisible
     val density = LocalDensity.current
-    val offsetY =
-        WindowInsets.ime.getBottom(density) - WindowInsets.systemBars.getBottom(
-            density
-        )
+
+    val offsetY = WindowInsets.ime.getBottom(density) -
+            // take into account padding from system bars (navigation pill/buttons)
+            WindowInsets.systemBars.getBottom(density)
 
     var previousOffset by remember { mutableStateOf(0) }
 
@@ -54,11 +54,7 @@ fun KeyboardRow(content: @Composable () -> Unit) {
             contentAlignment = Alignment.BottomStart
         ) {
             Box(modifier = Modifier
-                .offset {
-                    IntOffset(0, -offsetY)
-                }
-//                    .height(100.dp)
-//                    .border(5.dp, colorScheme.tertiaryContainer)
+                .offset { IntOffset(0, -offsetY) }
                 .fillMaxWidth()) {
                 content()
             }

app/src/main/java/org/yrovas/linklater/ui/common/RefreshIcon.kt

@@ -10,6 +10,7 @@ import androidx.compose.animation.core.tween
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Refresh
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
@@ -21,13 +22,17 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.launch
+import org.yrovas.linklater.ThemePreview
+import org.yrovas.linklater.ui.theme.AppTheme
+import kotlin.random.Random
 
 @Composable
 fun RefreshIcon(
     modifier: Modifier = Modifier,
-    refreshing: StateFlow<Boolean>,
+    isRefreshing: StateFlow<Boolean>,
     icon: ImageVector = Icons.Default.Refresh,
     tint: Color = MaterialTheme.colorScheme.primary,
 ) {
@@ -36,35 +41,35 @@ fun RefreshIcon(
     val linearInFastOutEasing: Easing =
         remember { CubicBezierEasing(0.4f, 0.0f, 0.25f, 1.0f) }
 
-    val isRefreshing by refreshing.collectAsState()
+    val refreshing by isRefreshing.collectAsState()
     var didRefresh by remember { mutableStateOf(false) }
     val rotation = remember { Animatable(0f) }
 
-    LaunchedEffect(isRefreshing) {
-        launch {
-            val duration = 750
-            val target = 360f
-            if (isRefreshing) {
-                didRefresh = true
-                rotation.animateTo(
-                    targetValue = 360f, animationSpec = infiniteRepeatable(
-                        animation = tween(
-                            durationMillis = duration, easing = slowInFastOutEasing
-                        ), repeatMode = RepeatMode.Restart
-                    )
+    LaunchedEffect(refreshing) {
+        val duration = 750
+        val target = 360f
+        if (refreshing) {
+            didRefresh = true
+            rotation.animateTo(
+                targetValue = 360f, animationSpec = infiniteRepeatable(
+                    animation = tween(
+                        durationMillis = duration, easing = slowInFastOutEasing
+                    ), repeatMode = RepeatMode.Restart
                 )
-            } else if (didRefresh) {
-                val remainingMillis: Int = ((target - rotation.value) / target * duration).toInt()
-                val easing = if (remainingMillis > (duration/2)) linearInFastOutEasing else LinearEasing
-                rotation.animateTo(
-                    targetValue = 360f,
-                    initialVelocity = rotation.velocity,
-                    animationSpec = tween(
-                        durationMillis = remainingMillis, easing = easing
-                    )
+            )
+        } else if (didRefresh) {
+            val remainingMillis: Int =
+                ((target - rotation.value) / target * duration).toInt()
+            val easing =
+                if (remainingMillis > (duration / 2)) linearInFastOutEasing else LinearEasing
+            rotation.animateTo(
+                targetValue = 360f,
+                initialVelocity = rotation.velocity,
+                animationSpec = tween(
+                    durationMillis = remainingMillis, easing = easing
                 )
-                rotation.snapTo(0f)
-            }
+            )
+            rotation.snapTo(0f)
         }
     }
 
@@ -74,3 +79,20 @@ fun RefreshIcon(
         modifier = modifier.rotate(rotation.value)
     )
 }
+
+@ThemePreview
+@Composable
+fun PreviewRefreshIcon() {
+    val refreshing = remember { MutableStateFlow(false) }
+    LaunchedEffect(Unit) {
+        while (true) {
+            delay(Random.nextLong(1000, 4000))
+            refreshing.emit(!refreshing.value)
+        }
+    }
+    AppTheme {
+        Surface {
+            RefreshIcon(isRefreshing = refreshing)
+        }
+    }
+}

app/src/main/java/org/yrovas/linklater/ui/common/TextPreference.kt

@@ -5,15 +5,36 @@ import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.Crossfade
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.*
+import androidx.compose.material.icons.filled.Build
+import androidx.compose.material.icons.filled.ContentPasteGo
+import androidx.compose.material.icons.filled.Info
 import androidx.compose.material.icons.outlined.Info
-import androidx.compose.material3.*
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme.colorScheme
 import androidx.compose.material3.MaterialTheme.typography
-import androidx.compose.runtime.*
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.State
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
@@ -93,7 +114,7 @@ private fun TextPreference(
             .fillMaxWidth()
             .padding(padding.standard)
             .clip(RoundedCornerShape(8.dp))
-            .clickable {  showDialog = true  }
+            .clickable { showDialog = true }
         ,
     ) {
         Column {
@@ -181,7 +202,8 @@ private fun TextEditDialog(
                     Row(
                         verticalAlignment = Alignment.CenterVertically,
                         horizontalArrangement = Arrangement.Start,
-                        modifier = Modifier.fillMaxWidth()
+                        modifier = Modifier
+                            .fillMaxWidth()
                             .clickable { showInfo = !showInfo }
                             .padding(padding.standard)
                     ) {