From 655bbd893916dca3e4c27da27f76a50aec9740de Mon Sep 17 00:00:00 2001
From: tj <1378534974@qq.com>
Date: 星期四, 27 二月 2025 17:11:01 +0800
Subject: [PATCH] 1
---
.idea/vcs.xml | 2
.idea/deploymentTargetSelector.xml | 4 +-
.idea/gradle.xml | 3 -
app/src/main/res/layout/fragment_reminder_settings_other_bak.xml | 61 ++++++++++++++++++++++++++++++
gradle/libs.versions.toml | 6 +++
.idea/misc.xml | 3 +
gradle.properties | 2
7 files changed, 74 insertions(+), 7 deletions(-)
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 3b8cd93..31c1a01 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
<selectionStates>
<SelectionState runConfigName="app">
<option name="selectionMode" value="DROPDOWN" />
- <DropdownSelection timestamp="2025-02-25T09:44:45.437232500Z">
+ <DropdownSelection timestamp="2025-02-25T05:56:30.000685300Z">
<Target type="DEFAULT_BOOT">
<handle>
- <DeviceId pluginId="PhysicalDevice" identifier="serial=88Y5T19C14010323" />
+ <DeviceId pluginId="PhysicalDevice" identifier="serial=HMQNW19A24001406" />
</handle>
</Target>
</DropdownSelection>
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index ad84da2..c29b364 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,9 +4,8 @@
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
- <option name="testRunner" value="CHOOSE_PER_TEST" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
- <option name="gradleJvm" value="17" />
+ <option name="gradleJvm" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index d7916a5..0ad17cb 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
- <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 94a25f7..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
- <mapping directory="$PROJECT_DIR$" vcs="Git" />
+ <mapping directory="" vcs="Git" />
</component>
</project>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_reminder_settings_other_bak.xml b/app/src/main/res/layout/fragment_reminder_settings_other_bak.xml
new file mode 100644
index 0000000..f15532e
--- /dev/null
+++ b/app/src/main/res/layout/fragment_reminder_settings_other_bak.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <!-- 主要内容区域 -->
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_above="@+id/bottom_navigation"
+ android:orientation="vertical">
+
+ <!-- 倒数日列表 -->
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/countdown_list"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:padding="16dp" />
+
+ </LinearLayout>
+
+ <!-- 底部导航栏 -->
+ <LinearLayout
+ android:id="@+id/bottom_navigation"
+ android:layout_width="match_parent"
+ android:layout_height="56dp"
+ android:layout_alignParentBottom="true"
+ android:background="#FFFFFF"
+ android:orientation="horizontal"
+ android:elevation="8dp">
+
+ <ImageButton
+ android:id="@+id/btn_add"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:background="?android:attr/selectableItemBackground"
+ android:src="@drawable/ic_add"
+ android:contentDescription="添加"/>
+
+ <ImageButton
+ android:id="@+id/btn_edit"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:background="?android:attr/selectableItemBackground"
+ android:src="@drawable/ic_edit"
+ android:contentDescription="编辑"/>
+
+ <ImageButton
+ android:id="@+id/btn_delete"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:background="?android:attr/selectableItemBackground"
+ android:src="@drawable/ic_delete"
+ android:contentDescription="删除"/>
+
+ </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 15a3aae..ec48926 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -35,5 +35,5 @@
android.precompileDependenciesResources=false
android.enableJetifier=true
#android.enableD8=true
-org.gradle.java.home=D\:\\tanjiyaun\\jdk\\jdk1.8\\jdk-17.0.12
+org.gradle.java.home=D\:\\devInstall\\java\\jdk-17.0.12
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8108deb..cf13be6 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -12,6 +12,9 @@
lifecycleViewmodelKtx = "2.6.1"
navigationFragmentKtx = "2.6.0"
navigationUiKtx = "2.6.0"
+legacySupportV4 = "1.0.0"
+fragmentKtx = "1.5.6"
+recyclerview = "1.3.0"
[libraries]
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -25,6 +28,9 @@
androidx-lifecycle-viewmodel-ktx = { group = "androidx.lifecycle", name = "lifecycle-viewmodel-ktx", version.ref = "lifecycleViewmodelKtx" }
androidx-navigation-fragment-ktx = { group = "androidx.navigation", name = "navigation-fragment-ktx", version.ref = "navigationFragmentKtx" }
androidx-navigation-ui-ktx = { group = "androidx.navigation", name = "navigation-ui-ktx", version.ref = "navigationUiKtx" }
+androidx-legacy-support-v4 = { group = "androidx.legacy", name = "legacy-support-v4", version.ref = "legacySupportV4" }
+androidx-fragment-ktx = { group = "androidx.fragment", name = "fragment-ktx", version.ref = "fragmentKtx" }
+androidx-recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "recyclerview" }
[plugins]
android-application = { id = "com.android.application", version.ref = "agp" }
--
Gitblit v1.9.3