Skip to content
Closed
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 @@ -9,6 +9,7 @@ import io.github.wiiznokes.gitnote.ui.model.Cred
import io.github.wiiznokes.gitnote.ui.model.CredType
import io.github.wiiznokes.gitnote.ui.model.GitAuthor
import io.github.wiiznokes.gitnote.ui.model.NoteMinWidth
import io.github.wiiznokes.gitnote.ui.model.NoteViewType
import io.github.wiiznokes.gitnote.ui.model.SortOrder
import io.github.wiiznokes.gitnote.ui.model.StorageConfiguration
import io.github.wiiznokes.gitnote.ui.theme.Theme
Expand Down Expand Up @@ -140,6 +141,7 @@ class AppPreferences(

val noteMinWidth = enumPreference("noteMinWidth", NoteMinWidth.Default)
val showFullNoteHeight = booleanPreference("showFullNoteHeight", false)
val noteViewType = enumPreference("noteViewType", NoteViewType.Grid)

val rememberLastOpenedFolder = booleanPreference("rememberLastOpenedFolder", false)
val lastOpenedFolder = stringPreference("lastOpenedFolder", "")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalResources
import androidx.compose.ui.unit.DpOffset
import androidx.compose.ui.unit.dp
import androidx.core.util.TypedValueCompat.pxToDp
import androidx.compose.ui.platform.LocalDensity


private val TAG = "CustomDropDown"
Expand All @@ -41,10 +40,10 @@ fun CustomDropDown(
mutableStateOf(Offset.Zero)
}
) {
val m = LocalResources.current.displayMetrics
val x = pxToDp(clickPosition.value.x, m).dp
val y = pxToDp(clickPosition.value.y, m).dp
val offset = DpOffset(x, y)
val density = LocalDensity.current
val offset = with(density) {
DpOffset(clickPosition.value.x.toDp(), clickPosition.value.y.toDp())
}

MaterialTheme(
shapes = MaterialTheme.shapes.copy(extraSmall = shape)
Expand Down Expand Up @@ -75,4 +74,4 @@ fun CustomDropDown(
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,14 @@ enum class NoteMinWidth(val size: Int) {
override fun toString(): String = this.size.toString()
}

enum class NoteViewType {
Grid,
List,
}

data class GridNote(
@Embedded
val note: Note,
val isUnique: Boolean,
val selected: Boolean = false,
)
)
Loading