Merge remote-tracking branch 'origin/master'

tj

3 天以前 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