Skip to content

Commit 2170bbd

Browse files
Merge branch 'master' into fix-issue-255
2 parents e36b367 + f44d5d5 commit 2170bbd

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

app/src/main/java/com/yogeshpaliyal/deepr/ui/components/ThemeSelectionDialog.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,4 @@ fun ThemeSelectionDialog(
6868
}
6969
},
7070
)
71-
}
71+
}

app/src/main/java/com/yogeshpaliyal/deepr/ui/screens/addlink/AddLinkScreen.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,8 @@ fun AddLinkScreen(
134134

135135
// Profile selection
136136
val allProfiles by viewModel.allProfiles.collectAsStateWithLifecycle()
137-
val currentProfile by viewModel.currentProfile.collectAsStateWithLifecycle()
138137
var selectedProfileId by remember(selectedLink) {
139-
mutableStateOf(selectedLink.profileId.takeIf { !isCreate } ?: currentProfile?.id ?: 1L)
138+
mutableStateOf(selectedLink.profileId)
140139
}
141140
var showCreateProfileDialog by remember { mutableStateOf(false) }
142141
var pendingProfileNameToSelect by remember { mutableStateOf<String?>(null) }

app/src/main/java/com/yogeshpaliyal/deepr/ui/screens/home/Home.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ fun HomeScreen(
212212
) {
213213
val viewModel: AccountViewModel = koinActivityViewModel()
214214
val currentViewType by viewModel.viewType.collectAsStateWithLifecycle()
215+
val currentProfile by viewModel.currentProfile.collectAsStateWithLifecycle()
215216
val localNavigator = LocalNavigator.current
216217
val hapticFeedback = LocalHapticFeedback.current
217218
val tags = viewModel.allTagsWithCount.collectAsStateWithLifecycle()
@@ -265,7 +266,7 @@ fun HomeScreen(
265266
val normalizedLink = normalizeLink(sharedText.url)
266267
if (isValidDeeplink(normalizedLink)) {
267268
selectedLink =
268-
createDeeprObject(link = normalizedLink, name = sharedText.title ?: "")
269+
createDeeprObject(link = normalizedLink, name = sharedText.title ?: "", profileId = currentProfile?.id ?: 1L)
269270
} else {
270271
Toast
271272
.makeText(context, "Invalid deeplink from shared content", Toast.LENGTH_SHORT)
@@ -455,7 +456,7 @@ fun HomeScreen(
455456
clipboardLink = clipboardLink,
456457
onAddClick = { url ->
457458
resetClipboardLink?.invoke()
458-
localNavigator.add(AddLinkScreen(createDeeprObject(link = url)))
459+
localNavigator.add(AddLinkScreen(createDeeprObject(link = url, profileId = currentProfile?.id ?: 1L)))
459460
},
460461
onDismiss = {
461462
resetClipboardLink?.invoke()
@@ -510,7 +511,7 @@ fun HomeScreen(
510511
},
511512
expanded = isExpanded,
512513
onClick = {
513-
localNavigator.add(AddLinkScreen(createDeeprObject()))
514+
localNavigator.add(AddLinkScreen(createDeeprObject(profileId = currentProfile?.id ?: 1L)))
514515
},
515516
)
516517
},

0 commit comments

Comments
 (0)