Skip to content

Pre-set profile to active profile when creating a new link #390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yogeshpaliyal merged 4 commits into from
Mar 7, 2026
+6 −6
Merged

Pre-set profile to active profile when creating a new link #390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ae2955d
Initial plan
Copilot Feb 21, 2026
1b99e61
Pre-set profile when creating a link based on currently active profile
Copilot Feb 21, 2026
3f22658
Merge branch 'master' into copilot/fix-profile-linking-issue
yogeshpaliyal Feb 21, 2026
73dab1b
fix: add missing newline at end of ThemeSelectionDialog.kt
yogeshpaliyal Feb 21, 2026
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
2 changes: 1 addition & 1 deletion app/src/main/java/com/yogeshpaliyal/deepr/ui/components/ThemeSelectionDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,4 @@ fun ThemeSelectionDialog(
}
},
)
}
}
3 changes: 1 addition & 2 deletions app/src/main/java/com/yogeshpaliyal/deepr/ui/screens/addlink/AddLinkScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,8 @@ fun AddLinkScreen(

// Profile selection
val allProfiles by viewModel.allProfiles.collectAsStateWithLifecycle()
val currentProfile by viewModel.currentProfile.collectAsStateWithLifecycle()
var selectedProfileId by remember(selectedLink) {
mutableStateOf(selectedLink.profileId.takeIf { !isCreate } ?: currentProfile?.id ?: 1L)
mutableStateOf(selectedLink.profileId)
}
var showCreateProfileDialog by remember { mutableStateOf(false) }
var pendingProfileNameToSelect by remember { mutableStateOf<String?>(null) }
Expand Down
7 changes: 4 additions & 3 deletions app/src/main/java/com/yogeshpaliyal/deepr/ui/screens/home/Home.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ fun HomeScreen(
) {
val viewModel: AccountViewModel = koinActivityViewModel()
val currentViewType by viewModel.viewType.collectAsStateWithLifecycle()
val currentProfile by viewModel.currentProfile.collectAsStateWithLifecycle()
val localNavigator = LocalNavigator.current
val hapticFeedback = LocalHapticFeedback.current
val tags = viewModel.allTagsWithCount.collectAsStateWithLifecycle()
Expand Down Expand Up @@ -265,7 +266,7 @@ fun HomeScreen(
val normalizedLink = normalizeLink(sharedText.url)
if (isValidDeeplink(normalizedLink)) {
selectedLink =
createDeeprObject(link = normalizedLink, name = sharedText.title ?: "")
createDeeprObject(link = normalizedLink, name = sharedText.title ?: "", profileId = currentProfile?.id ?: 1L)
} else {
Toast
.makeText(context, "Invalid deeplink from shared content", Toast.LENGTH_SHORT)
Expand Down Expand Up @@ -455,7 +456,7 @@ fun HomeScreen(
clipboardLink = clipboardLink,
onAddClick = { url ->
resetClipboardLink?.invoke()
localNavigator.add(AddLinkScreen(createDeeprObject(link = url)))
localNavigator.add(AddLinkScreen(createDeeprObject(link = url, profileId = currentProfile?.id ?: 1L)))
},
onDismiss = {
resetClipboardLink?.invoke()
Expand Down Expand Up @@ -510,7 +511,7 @@ fun HomeScreen(
},
expanded = isExpanded,
onClick = {
localNavigator.add(AddLinkScreen(createDeeprObject()))
localNavigator.add(AddLinkScreen(createDeeprObject(profileId = currentProfile?.id ?: 1L)))
},
)
},
Expand Down
⚡