v1.2.0

app/build.gradle.kts

@@ -16,8 +16,8 @@ android {
  applicationId = "com.yangdai.opennote"
  minSdk = 29
  targetSdk = 34
- versionCode = 118
- versionName = "1.1.8"
+ versionCode = 120
+ versionName = "1.2.0"
  resourceConfigurations += listOf("en", "zh")
 
  testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -62,10 +62,8 @@ android {
 }
 
 dependencies {
- // For Glance support
- implementation(libs.androidx.glance)
- implementation(libs.androidx.glance.appwidget)
 
+ implementation(libs.google.gson)
  implementation(libs.kotlinx.collections.immutable)
 
  // CommonMark, for markdown rendering and parsing
@@ -113,6 +111,9 @@ dependencies {
  implementation(libs.androidx.compose.material3)
  implementation(libs.androidx.compose.material3.window.size)
  implementation(libs.androidx.compose.material.icons)
+ implementation(libs.androidx.compose.material3.adaptive)
+ implementation(libs.androidx.compose.material3.adaptive.layout)
+ implementation(libs.androidx.compose.material3.adaptive.navigation)
  implementation(libs.androidx.compose.foundation)
  implementation(libs.androidx.navigation.compose)
  implementation(libs.androidx.lifecycle.runtime.compose)

app/src/main/AndroidManifest.xml

@@ -63,16 +63,6 @@
  android:name="firebase_analytics_collection_enabled"
  android:value="false" />
 
- <!-- <receiver android:name=".presentation.glance.MyReceiver"-->
- <!-- android:exported="true">-->
- <!-- <intent-filter>-->
- <!-- <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />-->
- <!-- </intent-filter>-->
- <!-- <meta-data-->
- <!-- android:name="android.appwidget.provider"-->
- <!-- android:resource="@xml/my_app_widget_info" />-->
- <!-- </receiver>-->
-
  </application>
 
 </manifest>

app/src/main/java/com/yangdai/opennote/MainActivity.kt

@@ -18,18 +18,16 @@ import androidx.compose.runtime.remember
 import androidx.core.animation.doOnEnd
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import com.yangdai.opennote.presentation.screen.BaseScreen
-import com.yangdai.opennote.presentation.util.BiometricPromptManager
 import com.yangdai.opennote.presentation.viewmodel.SharedViewModel
 import dagger.hilt.android.AndroidEntryPoint
 
 @OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
 @AndroidEntryPoint
 class MainActivity : AppCompatActivity() {
+ override fun onCreate(savedInstanceState: Bundle?) {
 
- private val promptManager by lazy { BiometricPromptManager(this) }
- private val sharedViewModel: SharedViewModel by viewModels()
+ val sharedViewModel: SharedViewModel by viewModels()
 
- override fun onCreate(savedInstanceState: Bundle?) {
  // Handle the splash screen transition.
  installSplashScreen().apply {
  setKeepOnScreenCondition {
@@ -62,13 +60,12 @@ class MainActivity : AppCompatActivity() {
  setContent {
  val windowSize = calculateWindowSizeClass(this)
  val isLargeScreen by remember {
- derivedStateOf { windowSize.widthSizeClass == WindowWidthSizeClass.Expanded && windowSize.heightSizeClass > WindowHeightSizeClass.Compact }
+ derivedStateOf {
+ windowSize.widthSizeClass == WindowWidthSizeClass.Expanded
+ && windowSize.heightSizeClass > WindowHeightSizeClass.Compact
+ }
  }
- BaseScreen(
- sharedViewModel = sharedViewModel,
- promptManager = promptManager,
- isLargeScreen = isLargeScreen
- )
+ BaseScreen(isLargeScreen = isLargeScreen)
  }
  }
 }

app/src/main/java/com/yangdai/opennote/presentation/component/CurlyCornerShape.kt

@@ -0,0 +1,82 @@
+package com.yangdai.opennote.presentation.component
+
+import androidx.compose.foundation.shape.CornerBasedShape
+import androidx.compose.foundation.shape.CornerSize
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.shape.ZeroCornerSize
+import androidx.compose.ui.geometry.Size
+import androidx.compose.ui.graphics.Outline
+import androidx.compose.ui.graphics.Path
+import androidx.compose.ui.unit.LayoutDirection
+import kotlin.math.cos
+import kotlin.math.sin
+
+class CurlyCornerShape(
+ private val amp: Double = 16.0,
+ private val count: Int = 12,
+) : CornerBasedShape(
+ topStart = ZeroCornerSize,
+ topEnd = ZeroCornerSize,
+ bottomEnd = ZeroCornerSize,
+ bottomStart = ZeroCornerSize
+) {
+
+ private fun sineCircleXYatAngle(
+ d1: Double,
+ d2: Double,
+ d3: Double,
+ d4: Double,
+ d5: Double,
+ i: Int,
+ ): List<Double> = (i.toDouble() * d5).run {
+ listOf(
+ (sin(this) * d4 + d3) * cos(d5) + d1,
+ (sin(this) * d4 + d3) * sin(d5) + d2
+ )
+ }
+
+ override fun createOutline(
+ size: Size,
+ topStart: Float,
+ topEnd: Float,
+ bottomEnd: Float,
+ bottomStart: Float,
+ layoutDirection: LayoutDirection,
+ ): Outline {
+ val d = 2.0
+ val r2: Double = size.width / d
+ var r13: Double = size.height / d
+ val r18 = size.width / 2.0 - amp
+ val path = Path()
+ path.moveTo((d * r2 - amp).toFloat(), r13.toFloat())
+ var i = 0
+ while (true) {
+ val i2 = i + 1
+ val d3 = r13
+ val r5: List<Double> = sineCircleXYatAngle(
+ r2, r13, r18, amp, Math.toRadians(
+ i.toDouble()
+ ), count
+ )
+ path.lineTo(r5[0].toFloat(), r5[1].toFloat())
+ if (i2 >= 360) {
+ path.close()
+ return Outline.Generic(path)
+ }
+ i = i2
+ r13 = d3
+ }
+ }
+
+ override fun copy(
+ topStart: CornerSize,
+ topEnd: CornerSize,
+ bottomEnd: CornerSize,
+ bottomStart: CornerSize,
+ ) = RoundedCornerShape(
+ topStart = topStart,
+ topEnd = topEnd,
+ bottomEnd = bottomEnd,
+ bottomStart = bottomStart
+ )
+}

app/src/main/java/com/yangdai/opennote/presentation/component/DrawerContent.kt

@@ -30,6 +30,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import com.yangdai.opennote.R
 import com.yangdai.opennote.data.local.entity.FolderEntity
@@ -47,9 +48,11 @@ fun DrawerContent(
  // Record whether the folder list is expanded
  var isFoldersExpended by rememberSaveable { mutableStateOf(false) }
 
- Column(modifier = Modifier
- .fillMaxWidth()
- .verticalScroll(rememberScrollState())) {
+ Column(
+ modifier = Modifier
+ .fillMaxWidth()
+ .verticalScroll(rememberScrollState())
+ ) {
 
  Row(
  modifier = Modifier.fillMaxWidth(),
@@ -109,17 +112,12 @@ fun DrawerContent(
  }
  }
 
- Row(
- modifier = Modifier.fillMaxWidth(),
- horizontalArrangement = Arrangement.Center
- ) {
- TextButton(
- modifier = Modifier
- .fillMaxWidth()
- .padding(NavigationDrawerItemDefaults.ItemPadding),
- onClick = { navigateTo(Route.FOLDERS) }) {
- Text(text = stringResource(R.string.manage_folders))
- }
+ TextButton(
+ modifier = Modifier
+ .fillMaxWidth()
+ .padding(NavigationDrawerItemDefaults.ItemPadding),
+ onClick = { navigateTo(Route.FOLDERS) }) {
+ Text(text = stringResource(R.string.manage_folders), textAlign = TextAlign.Center)
  }
  }
 }

app/src/main/java/com/yangdai/opennote/presentation/component/ExportDialog.kt

@@ -17,21 +17,17 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.Role
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.yangdai.opennote.R
-import com.yangdai.opennote.presentation.util.exportNote
 
 @Composable
 fun ExportDialog(
- html: String,
- title: String,
- content: String,
- onDismissRequest: () -> Unit
+ onDismissRequest: () -> Unit,
+ onConfirm: (String) -> Unit
 ) {
- val context = LocalContext.current
  val modeOptions = listOf(
  "TXT",
  "MARKDOWN",
@@ -81,22 +77,7 @@ fun ExportDialog(
  confirmButton = {
  TextButton(
  onClick = {
- if (selectedMode == "HTML") {
- exportNote(
- context.applicationContext,
- title,
- html,
- selectedMode
- )
- } else {
- exportNote(
- context.applicationContext,
- title,
- content,
- selectedMode
- )
- }
- onDismissRequest()
+ onConfirm(selectedMode)
  }
  ) {
  Text(text = stringResource(android.R.string.ok))
@@ -110,3 +91,12 @@ fun ExportDialog(
  }
  })
 }
+
+@Composable
+@Preview
+fun ExportDialogPreview() {
+ ExportDialog(
+ onDismissRequest = {},
+ onConfirm = {}
+ )
+}

app/src/main/java/com/yangdai/opennote/presentation/component/FolderItem.kt

@@ -4,6 +4,7 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.grid.LazyGridItemScope
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Delete
 import androidx.compose.material.icons.outlined.DriveFileRenameOutline
@@ -27,7 +28,7 @@ import com.yangdai.opennote.R
 import com.yangdai.opennote.data.local.entity.FolderEntity
 
 @Composable
-fun FolderItem(
+fun LazyGridItemScope.FolderItem(
  folder: FolderEntity,
  onModify: (FolderEntity) -> Unit,
  onDelete: () -> Unit
@@ -44,7 +45,8 @@ fun FolderItem(
  Row(
  Modifier
  .fillMaxWidth()
- .padding(vertical = 4.dp),
+ .padding(vertical = 4.dp)
+ .animateItem(),
  verticalAlignment = Alignment.CenterVertically,
  horizontalArrangement = Arrangement.SpaceBetween
  ) {

app/src/main/java/com/yangdai/opennote/presentation/component/FolderListDialog.kt

@@ -26,10 +26,12 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.yangdai.opennote.R
 import com.yangdai.opennote.data.local.entity.FolderEntity
 import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
 
 
 @Composable
@@ -130,3 +132,19 @@ fun FolderListDialog(
  }
  )
 }
+
+@Composable
+@Preview
+fun FolderListDialogPreview() {
+ FolderListDialog(
+ hint = "Select a folder",
+ oFolderId = 1,
+ folders = listOf(
+ FolderEntity(1, "Folder 1", null),
+ FolderEntity(2, "Folder 2", null),
+ FolderEntity(3, "Folder 3", null)
+ ).toImmutableList(),
+ onDismissRequest = {},
+ onSelect = {}
+ )
+}