version:2.0.0

fix:
update:修改样式,设置页面开关修改,联系人页面修改
This commit is contained in:
2025-01-07 09:15:04 +08:00
parent 2a232e34d0
commit 8eb83634d0
95 changed files with 1152 additions and 4268 deletions

View File

@@ -20,7 +20,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray">
android:background="@color/default_light_background">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_exit"
@@ -53,7 +53,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="编辑闹钟"
android:text="设置闹钟"
android:textColor="@color/black"
android:textSize="18sp"
android:textStyle="bold"
@@ -92,9 +92,10 @@
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:text="选择时间"
android:text="时间"
android:textColor="@color/black"
android:textSize="16sp"
android:textSize="20sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -113,7 +114,68 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="120dp"
android:layout_height="0dp"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:background="@drawable/add_alarm_background"
android:visibility="gone">
<TextView
android:id="@+id/textView25"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:text="闹钟类型"
android:textColor="@color/black"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<RadioGroup
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/textView25"
app:layout_constraintTop_toTopOf="parent">
<RadioButton
android:id="@+id/rb_all"
android:layout_width="36dp"
android:layout_height="36dp"
android:button="@null"
android:checked="true"
android:textColor="@color/radio_botton_gray"
android:textSize="9sp" />
<RadioButton
android:id="@+id/rb_look"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginStart="8dp"
android:button="@null"
android:textColor="@color/radio_botton_gray"
android:textSize="9sp" />
<RadioButton
android:id="@+id/rb_reserve"
android:layout_width="36dp"
android:layout_height="36dp"
android:layout_marginStart="8dp"
android:button="@null"
android:textColor="@color/radio_botton_gray"
android:textSize="9sp" />
</RadioGroup>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="80dp"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:background="@drawable/add_alarm_background">
@@ -129,7 +191,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_type"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_height="80dp"
android:layout_weight="1">
<TextView
@@ -137,63 +199,55 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:text="重复"
android:text="类型"
android:textColor="@color/black"
android:textSize="16sp"
android:textSize="20sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_height="match_parent"
android:onClick="@{click::setType}"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">
<RadioGroup
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:text="一次"
android:textColor="@color/black"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/imageView2"
app:layout_constraintTop_toTopOf="parent" />
<RadioButton
android:id="@+id/rb1"
android:layout_width="50dp"
android:layout_height="25dp"
android:background="@drawable/tv_times_bg_once_selector"
android:button="@null"
android:textColor="@color/radio_botton_gray"
android:textSize="12sp" />
<RadioButton
android:id="@+id/rb2"
android:layout_width="50dp"
android:layout_height="25dp"
android:layout_marginStart="8dp"
android:background="@drawable/tv_times_bg_loop_selector"
android:button="@null"
android:textColor="@color/radio_botton_gray"
android:textSize="12sp" />
</RadioGroup>
<ImageView
android:id="@+id/imageView2"
android:layout_width="28dp"
android:layout_height="28dp"
android:layout_marginEnd="8dp"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:src="@drawable/icon_more"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:background="@color/gray" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:visibility="gone"
android:layout_weight="1">
android:layout_weight="1"
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
@@ -236,15 +290,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:text="标题"
android:text="备注"
android:textColor="@color/black"
android:textSize="12sp"
android:visibility="gone"
android:textSize="20sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_activation"
android:layout_width="0dp"
@@ -254,7 +307,7 @@
android:background="@drawable/edit_background"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintStart_toEndOf="@+id/textView27"
app:layout_constraintTop_toTopOf="parent">
<EditText
@@ -263,11 +316,10 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:background="@null"
android:hint="输入标题"
android:text="@{alarmClockData.title}"
android:padding="4dp"
android:hint="输入"
android:maxLength="13"
android:maxLines="1"
android:padding="4dp"
android:singleLine="true"
android:textColorHint="@color/radio_botton_gray"
android:textSize="18sp"
@@ -282,7 +334,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="160dp"
android:layout_height="200dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
@@ -294,9 +346,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:text="选择图片或视频"
android:text="附件"
android:textColor="@color/black"
android:textSize="16sp"
android:textSize="20sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/cl_pic"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -309,7 +362,8 @@
android:onClick="@{click::openGallery}"
android:padding="8dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@+id/textView28"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -332,7 +386,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:textColor="@color/radio_botton_gray"
android:textColor="@color/black"
android:textSize="13sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/cl_pic"
@@ -355,9 +409,10 @@
android:layout_marginBottom="8dp"
android:background="@drawable/tv_add_alarm_background"
android:gravity="center"
android:textStyle="bold"
android:onClick="@{click::submit}"
android:text="保存"
android:textColor="@color/white"
android:text="添加闹钟"
android:textColor="@color/black"
android:textSize="18sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"