Merge remote-tracking branch 'origin/master'

tj

2 天以前 93775e1f3d79a1e11b839abbf24201dafcd9e646

 app/src/main/res/layout/activity_reminder_settings.xml

@@ -109,56 +109,56 @@

            </LinearLayout>

            <LinearLayout
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:layout_weight="1"
                android:orientation="horizontal">
<!--            <LinearLayout-->
<!--                android:layout_width="0dp"-->
<!--                android:layout_height="wrap_content"-->
<!--                android:layout_weight="1"-->
<!--                android:orientation="horizontal">-->

                <CheckBox
                    android:id="@+id/checkBoxFlight"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content" />
<!--                <CheckBox-->
<!--                    android:id="@+id/checkBoxFlight"-->
<!--                    android:layout_width="wrap_content"-->
<!--                    android:layout_height="wrap_content" />-->

                <TextView
                    android:layout_width="0dp"
                    android:layout_height="wrap_content"
                    android:layout_weight="1"
                    android:text="航班"
                    android:textColor="#000000"
                    android:textSize="14sp" />
<!--                <TextView-->
<!--                    android:layout_width="0dp"-->
<!--                    android:layout_height="wrap_content"-->
<!--                    android:layout_weight="1"-->
<!--                    android:text="航班"-->
<!--                    android:textColor="#000000"-->
<!--                    android:textSize="14sp" />-->


            </LinearLayout>
<!--            </LinearLayout>-->
        </LinearLayout>

        <!-- 第二行1个 -->
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginTop="8dp"
            android:orientation="horizontal">
<!--        <LinearLayout-->
<!--            android:layout_width="match_parent"-->
<!--            android:layout_height="wrap_content"-->
<!--            android:layout_marginTop="8dp"-->
<!--            android:orientation="horizontal">-->

            <LinearLayout
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:orientation="horizontal">
<!--            <LinearLayout-->
<!--                android:layout_width="wrap_content"-->
<!--                android:layout_height="wrap_content"-->
<!--                android:orientation="horizontal">-->

                <CheckBox
                    android:id="@+id/checkBoxTrain"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content" />
<!--                <CheckBox-->
<!--                    android:id="@+id/checkBoxTrain"-->
<!--                    android:layout_width="wrap_content"-->
<!--                    android:layout_height="wrap_content" />-->

                <TextView
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:text="火车票"
                    android:textColor="#000000"
                    android:textSize="14sp" />
<!--                <TextView-->
<!--                    android:layout_width="wrap_content"-->
<!--                    android:layout_height="wrap_content"-->
<!--                    android:text="火车票"-->
<!--                    android:textColor="#000000"-->
<!--                    android:textSize="14sp" />-->


            </LinearLayout>
        </LinearLayout>
<!--            </LinearLayout>-->
<!--        </LinearLayout>-->

        <!-- 选择提醒方式部分 -->
        <LinearLayout
@@ -228,7 +228,68 @@
                    android:background="#F8F8F8"
                    android:contentDescription="通知示例"
                    android:padding="8dp"
                    android:src="@drawable/up" />
                    android:src="@drawable/reminder_png" />
            </LinearLayout>
        </androidx.cardview.widget.CardView>

        <!-- 选择提醒方式部分 -->
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginTop="16dp"
            android:gravity="center_vertical"
            android:orientation="horizontal">

            <TextView
                android:layout_width="0dp"
                android:layout_height="wrap_content"
                android:layout_weight="1"
                android:text="如果没有获取授权短信通知，需要手动打开"
                android:textColor="#000000"
                android:textSize="16sp" />

        </LinearLayout>

        <!-- 通知卡片 -->
        <androidx.cardview.widget.CardView
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginTop="8dp"
            app:cardCornerRadius="8dp"
            app:cardElevation="2dp">

            <LinearLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:orientation="vertical"
                android:padding="8dp">

                <LinearLayout
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:gravity="center_vertical"
                    android:orientation="horizontal">

                    <TextView
                        android:layout_width="0dp"
                        android:layout_height="wrap_content"
                        android:layout_weight="1"
                        android:text="点击允许通知"
                        android:textSize="14sp"
                        android:gravity="end"/>

                </LinearLayout>

                <!-- 简化的通知图片 -->
                <ImageView
                    android:layout_width="match_parent"
                    android:layout_height="120dp"
                    android:layout_marginTop="8dp"
                    android:adjustViewBounds="true"
                    android:background="#F8F8F8"
                    android:contentDescription="通知示例"
                    android:padding="8dp"
                    android:src="@drawable/message_notification" />
            </LinearLayout>
        </androidx.cardview.widget.CardView>
    </LinearLayout>
@@ -258,4 +319,4 @@
            android:textSize="18sp" />
    </LinearLayout>

</LinearLayout> 
</LinearLayout>