Skip to content

U
uni-api

DCloud / uni-api

通知 669
Star 23
Fork 12
U
uni-api
提交 976e070a 编写于 作者: 杜庆泉's avatar 杜庆泉
浏览文件
操作

手动解决合并冲突

上级 ffb6edbb
隐藏空白更改
内联 并排
Showing with 0 addition and 20 deletion
uni_modules/uni-prompt/utssdk/app-android/res/layout/uni_prompt_ac_recyclerview_layout_top.xml
浏览文件 @ 976e070a
...@@ -9,28 +9,17 @@ ...@@ -9,28 +9,17 @@
android:id="@+id/line_bottom" android:id="@+id/line_bottom"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
<<<<<<<< HEAD:uni_modules/uni-prompt/utssdk/app-android/res/layout/uni_prompt_ac_recyclerview_layout_top_night.xml
android:background="@color/uni_prompt_night_bg_hair_line_night"
========
android:background="@color/uni_prompt_night_bg_hair_line" android:background="@color/uni_prompt_night_bg_hair_line"
>>>>>>>> alpha:uni_modules/uni-prompt/utssdk/app-android/res/layout/uni_prompt_ac_recyclerview_layout_top.xml
android:orientation="vertical" /> android:orientation="vertical" />
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tvName" android:id="@+id/tvName"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
<<<<<<<< HEAD:uni_modules/uni-prompt/utssdk/app-android/res/layout/uni_prompt_ac_recyclerview_layout_top_night.xml
android:background="@drawable/uni_prompt_actionsheet_button_select_total_night_top"
android:gravity="center"
android:padding="17dp"
android:textColor="@color/uni_prompt_dialog_title_text_night"
========
android:gravity="center" android:gravity="center"
android:padding="17dp" android:padding="17dp"
android:textColor="@color/uni_prompt_dialog_title_text" android:textColor="@color/uni_prompt_dialog_title_text"
android:background="@drawable/uni_prompt_actionsheet_button_select_total_top" android:background="@drawable/uni_prompt_actionsheet_button_select_total_top"
>>>>>>>> alpha:uni_modules/uni-prompt/utssdk/app-android/res/layout/uni_prompt_ac_recyclerview_layout_top.xml
android:textSize="16dp" /> android:textSize="16dp" />
......
uni_modules/uni-prompt/utssdk/app-android/res/layout/uni_prompt_ac_recyclerview_layout_top_night.xml
浏览文件 @ 976e070a
...@@ -9,11 +9,7 @@ ...@@ -9,11 +9,7 @@
android:id="@+id/line_bottom" android:id="@+id/line_bottom"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
<<<<<<<< HEAD:uni_modules/uni-prompt/utssdk/app-android/res/layout/uni_prompt_ac_recyclerview_layout_top.xml
android:background="@color/uni_prompt_night_bg_hair_line"
========
android:background="@color/uni_prompt_night_bg_hair_line_night" android:background="@color/uni_prompt_night_bg_hair_line_night"
>>>>>>>> alpha:uni_modules/uni-prompt/utssdk/app-android/res/layout/uni_prompt_ac_recyclerview_layout_top_night.xml
android:orientation="vertical" /> android:orientation="vertical" />
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
...@@ -23,12 +19,7 @@ ...@@ -23,12 +19,7 @@
android:background="@drawable/uni_prompt_actionsheet_button_select_total_night_top" android:background="@drawable/uni_prompt_actionsheet_button_select_total_night_top"
android:gravity="center" android:gravity="center"
android:padding="17dp" android:padding="17dp"
<<<<<<<< HEAD:uni_modules/uni-prompt/utssdk/app-android/res/layout/uni_prompt_ac_recyclerview_layout_top.xml
android:textColor="@color/uni_prompt_dialog_title_text"
android:background="@drawable/uni_prompt_actionsheet_button_select_total_top"
========
android:textColor="@color/uni_prompt_dialog_title_text_night" android:textColor="@color/uni_prompt_dialog_title_text_night"
>>>>>>>> alpha:uni_modules/uni-prompt/utssdk/app-android/res/layout/uni_prompt_ac_recyclerview_layout_top_night.xml
android:textSize="16dp" /> android:textSize="16dp" />
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或