Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -110,5 +110,9 @@ interface LinkRepository {

suspend fun toggleFavourite(id: Long)

suspend fun updateFavourite(id: Long, isFavourite: Long)

suspend fun updateLinkProfile(id: Long, profileId: Long)

suspend fun insertDeeprOpenLog(id: Long)
}
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,20 @@ class LinkRepositoryImpl(
scheduleAutoBackup()
}

override suspend fun updateFavourite(id: Long, isFavourite: Long) {
withContext(Dispatchers.IO) {
deeprQueries.setFavourite(isFavourite, id)
}
scheduleAutoBackup()
}

override suspend fun updateLinkProfile(id: Long, profileId: Long) {
withContext(Dispatchers.IO) {
deeprQueries.updateLinkProfile(profileId, id)
}
scheduleAutoBackup()
}

override suspend fun insertDeeprOpenLog(id: Long) {
withContext(Dispatchers.IO) {
deeprQueries.insertDeeprOpenLog(id)
Expand Down
112 changes: 70 additions & 42 deletions app/src/main/java/com/yogeshpaliyal/deepr/ui/screens/home/DeeprItem.kt
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import androidx.compose.material.icons.rounded.Star
import androidx.compose.material.icons.rounded.StarBorder
import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.Checkbox
import androidx.compose.material3.FilterChip
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
Expand Down Expand Up @@ -106,6 +107,10 @@ sealed class MenuItem(
class ViewNote(
item: GetLinksAndTags,
) : MenuItem(item)

class ToggleSelection(
item: GetLinksAndTags,
) : MenuItem(item)
}

@OptIn(ExperimentalFoundationApi::class)
Expand All @@ -118,6 +123,8 @@ fun DeeprItem(
isThumbnailEnable: Boolean,
modifier: Modifier = Modifier,
showOpenCounter: Boolean = true,
isSelectionMode: Boolean = false,
isSelected: Boolean = false,
analyticsManager: com.yogeshpaliyal.deepr.analytics.AnalyticsManager = org.koin.compose.koinInject(),
) {
var tagsExpanded by remember { mutableStateOf(false) }
Expand All @@ -127,28 +134,40 @@ fun DeeprItem(

val linkCopied = stringResource(R.string.link_copied)

DeeprItemSwipable(account, onItemClick, modifier) {
DeeprItemSwipable(account, onItemClick, modifier, isSelectionMode) {
Card(
colors =
CardDefaults.cardColors(
containerColor = getDeeprItemBackgroundColor(account.isFavourite),
containerColor = if (isSelected) {
MaterialTheme.colorScheme.primaryContainer
} else {
getDeeprItemBackgroundColor(account.isFavourite)
},
),
modifier =
Modifier
.testTag("DeeprItem")
.fillMaxWidth()
.combinedClickable(
onClick = { onItemClick(MenuItem.Click(account)) },
onClick = {
if (isSelectionMode) {
onItemClick(MenuItem.ToggleSelection(account))
} else {
onItemClick(MenuItem.Click(account))
}
},
onLongClick = {
analyticsManager.logEvent(
com.yogeshpaliyal.deepr.analytics.AnalyticsEvents.COPY_LINK,
mapOf(com.yogeshpaliyal.deepr.analytics.AnalyticsParams.LINK_ID to account.id),
)
val clipboard =
context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
val clip = ClipData.newPlainText(linkCopied, account.link)
clipboard.setPrimaryClip(clip)
Toast.makeText(context, linkCopied, Toast.LENGTH_SHORT).show()
if (!isSelectionMode) {
analyticsManager.logEvent(
com.yogeshpaliyal.deepr.analytics.AnalyticsEvents.COPY_LINK,
mapOf(com.yogeshpaliyal.deepr.analytics.AnalyticsParams.LINK_ID to account.id),
)
val clipboard =
context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
val clip = ClipData.newPlainText(linkCopied, account.link)
clipboard.setPrimaryClip(clip)
Toast.makeText(context, linkCopied, Toast.LENGTH_SHORT).show()
}
},
),
) {
Expand Down Expand Up @@ -205,38 +224,47 @@ fun DeeprItem(
}
Column(horizontalAlignment = Alignment.End) {
Row {
IconButton(onClick = {
onItemClick(MenuItem.FavouriteClick(account))
}) {
Icon(
imageVector =
if (account.isFavourite == 1L) {
Icons.Rounded.Star
} else {
Icons.Rounded.StarBorder
},
contentDescription =
if (account.isFavourite == 1L) {
stringResource(R.string.remove_from_favourites)
} else {
stringResource(R.string.add_to_favourites)
},
tint = getDeeprItemTextColor(account.isFavourite),
modifier = Modifier.size(28.dp),
if (isSelectionMode) {
Checkbox(
checked = isSelected,
onCheckedChange = {
onItemClick(MenuItem.ToggleSelection(account))
},
)
}
} else {
IconButton(onClick = {
onItemClick(MenuItem.FavouriteClick(account))
}) {
Icon(
imageVector =
if (account.isFavourite == 1L) {
Icons.Rounded.Star
} else {
Icons.Rounded.StarBorder
},
contentDescription =
if (account.isFavourite == 1L) {
stringResource(R.string.remove_from_favourites)
} else {
stringResource(R.string.add_to_favourites)
},
tint = getDeeprItemTextColor(account.isFavourite),
modifier = Modifier.size(28.dp),
)
}

IconButton(onClick = {
onItemClick(
MenuItem.MoreOptionsBottomSheet(
account,
),
)
}) {
Icon(
TablerIcons.DotsVertical,
contentDescription = stringResource(R.string.more_options),
)
IconButton(onClick = {
onItemClick(
MenuItem.MoreOptionsBottomSheet(
account,
),
)
}) {
Icon(
TablerIcons.DotsVertical,
contentDescription = stringResource(R.string.more_options),
)
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.width
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.Checkbox
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
Expand Down Expand Up @@ -42,20 +43,34 @@ fun DeeprItemCompact(
isThumbnailEnable: Boolean,
modifier: Modifier = Modifier,
showOpenCounter: Boolean = true,
isSelectionMode: Boolean = false,
isSelected: Boolean = false,
) {
DeeprItemSwipable(account, onItemClick, modifier) {
DeeprItemSwipable(account, onItemClick, modifier, isSelectionMode) {
Card(
colors =
CardDefaults.cardColors(
containerColor = getDeeprItemBackgroundColor(account.isFavourite),
containerColor = if (isSelected) {
MaterialTheme.colorScheme.primaryContainer
} else {
getDeeprItemBackgroundColor(account.isFavourite)
},
),
modifier =
Modifier
.fillMaxWidth()
.combinedClickable(
onClick = { onItemClick(MenuItem.Click(account)) },
onClick = {
if (isSelectionMode) {
onItemClick(MenuItem.ToggleSelection(account))
} else {
onItemClick(MenuItem.Click(account))
}
},
onLongClick = {
onItemClick(MenuItem.Copy(account))
if (!isSelectionMode) {
onItemClick(MenuItem.Copy(account))
}
},
),
) {
Expand Down Expand Up @@ -112,14 +127,23 @@ fun DeeprItemCompact(
Row(
verticalAlignment = Alignment.CenterVertically,
) {
IconButton(onClick = {
onItemClick(MenuItem.MoreOptionsBottomSheet(account))
}) {
Icon(
imageVector = TablerIcons.DotsVertical,
contentDescription = stringResource(R.string.more_options),
tint = MaterialTheme.colorScheme.onSurfaceVariant,
if (isSelectionMode) {
Checkbox(
checked = isSelected,
onCheckedChange = {
onItemClick(MenuItem.ToggleSelection(account))
},
)
} else {
IconButton(onClick = {
onItemClick(MenuItem.MoreOptionsBottomSheet(account))
}) {
Icon(
imageVector = TablerIcons.DotsVertical,
contentDescription = stringResource(R.string.more_options),
tint = MaterialTheme.colorScheme.onSurfaceVariant,
)
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.Card
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.Checkbox
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
Expand Down Expand Up @@ -41,20 +42,34 @@ fun DeeprItemGrid(
modifier: Modifier = Modifier,
isThumbnailEnable: Boolean = true,
showOpenCounter: Boolean = true,
isSelectionMode: Boolean = false,
isSelected: Boolean = false,
) {
DeeprItemSwipable(account, onItemClick, modifier) {
DeeprItemSwipable(account, onItemClick, modifier, isSelectionMode) {
Card(
colors =
CardDefaults.cardColors(
containerColor = getDeeprItemBackgroundColor(account.isFavourite),
containerColor = if (isSelected) {
MaterialTheme.colorScheme.primaryContainer
} else {
getDeeprItemBackgroundColor(account.isFavourite)
},
),
modifier =
Modifier
.fillMaxWidth()
.combinedClickable(
onClick = { onItemClick(MenuItem.Click(account)) },
onClick = {
if (isSelectionMode) {
onItemClick(MenuItem.ToggleSelection(account))
} else {
onItemClick(MenuItem.Click(account))
}
},
onLongClick = {
onItemClick(MenuItem.Copy(account))
if (!isSelectionMode) {
onItemClick(MenuItem.Copy(account))
}
},
),
) {
Expand Down Expand Up @@ -111,14 +126,23 @@ fun DeeprItemGrid(
verticalAlignment = Alignment.CenterVertically,
) {
OpenCountAndTags(account, Modifier.weight(1f), showOpenCounter)
IconButton(onClick = {
onItemClick(MenuItem.MoreOptionsBottomSheet(account))
}) {
Icon(
imageVector = TablerIcons.DotsVertical,
contentDescription = stringResource(R.string.more_options),
tint = MaterialTheme.colorScheme.onSurfaceVariant,
if (isSelectionMode) {
Checkbox(
checked = isSelected,
onCheckedChange = {
onItemClick(MenuItem.ToggleSelection(account))
},
)
} else {
IconButton(onClick = {
onItemClick(MenuItem.MoreOptionsBottomSheet(account))
}) {
Icon(
imageVector = TablerIcons.DotsVertical,
contentDescription = stringResource(R.string.more_options),
tint = MaterialTheme.colorScheme.onSurfaceVariant,
)
}
}
}
}
Expand Down
Loading
Loading