yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_1.1.2' into dev_1.1.2

Browse Source
This commit is contained in:
董宏宇
2020-08-11 14:58:09 +08:00
parent 40905b916c cdb48ea0d8
commit 7d3e57858a
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_extensions.xml
View File

@@ -10,10 +10,10 @@
android:layout_height="@dimen/module_ext_height"
android:background="@drawable/module_ext_drawable_weather_bkg"
android:gravity="center"
android:paddingLeft="@dimen/module_ext_weather_container_paddingLeft"
android:paddingRight="@dimen/module_ext_weather_container_paddingRight"
android:paddingStart="@dimen/module_ext_weather_container_paddingLeft"
android:paddingEnd="@dimen/module_ext_weather_container_paddingRight"
android:visibility="invisible"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@+id/module_ext_id_msg"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible">
@@ -35,13 +35,13 @@
android:id="@+id/module_ext_id_msg"
android:layout_width="@dimen/module_ext_height"
android:layout_height="@dimen/module_ext_height"
android:layout_marginRight="@dimen/module_ext_msg_marginRight"
android:layout_marginEnd="@dimen/module_ext_msg_marginRight"
android:background="@drawable/module_ext_drawable_msg_container_bkg"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@+id/ivUserHeadImg"
app:layout_constraintRight_toLeftOf="@+id/ivUserHeadImg"
app:layout_constraintTop_toTopOf="@+id/ivUserHeadImg"
tools:visibility="visible">
tools:visibility="gone">
<ImageView
android:layout_width="wrap_content"
@@ -71,5 +71,6 @@
android:src="@drawable/model_ext_default_user_head"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@+id/module_ext_id_weather_container"
app:layout_constraintBottom_toBottomOf="@+id/module_ext_id_weather_container"/>
app:layout_constraintBottom_toBottomOf="@+id/module_ext_id_weather_container"
tools:visibility="gone"/>
</merge>