Merge remote-tracking branch 'origin/main'
This commit is contained in:
commit
89ac22effd
|
@ -62,10 +62,10 @@
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/btnSupportActivityImpressumCollapse"
|
android:id="@+id/btnSupportActivityImpressumCollapse"
|
||||||
android:layout_width="48dp"
|
android:layout_width="30dp"
|
||||||
android:layout_height="48dp"
|
android:layout_height="30dp"
|
||||||
android:layout_gravity="right|top"
|
android:layout_gravity="right|top"
|
||||||
android:layout_marginTop="10px"
|
android:layout_marginTop="0px"
|
||||||
android:src="@drawable/ic_arrow_drop_up_circle"
|
android:src="@drawable/ic_arrow_drop_up_circle"
|
||||||
android:layout_marginEnd="10dp"></ImageView>
|
android:layout_marginEnd="10dp"></ImageView>
|
||||||
|
|
||||||
|
@ -82,8 +82,8 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:textSize="18dp"
|
android:textSize="18dp"
|
||||||
android:paddingStart="10dp"
|
android:paddingStart="10dp"
|
||||||
android:paddingTop="10dp"
|
android:paddingTop="0dp"
|
||||||
android:paddingBottom="10dp"
|
android:paddingBottom="0dp"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
android:textColor="@color/black"
|
android:textColor="@color/black"
|
||||||
android:textAlignment="center"
|
android:textAlignment="center"
|
||||||
|
@ -92,7 +92,7 @@
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/SupportActivity_LaborLogo"
|
android:id="@+id/SupportActivity_LaborLogo"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="100dp"
|
android:layout_height="80dp"
|
||||||
android:scaleX="0.7"
|
android:scaleX="0.7"
|
||||||
android:scaleY="0.7">
|
android:scaleY="0.7">
|
||||||
</ImageView>
|
</ImageView>
|
||||||
|
@ -144,7 +144,7 @@
|
||||||
<!-- BEGIN EMAIL -->
|
<!-- BEGIN EMAIL -->
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="72dp"
|
android:layout_height="52dp"
|
||||||
android:background="@drawable/bottom_border"
|
android:background="@drawable/bottom_border"
|
||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
|
@ -165,7 +165,7 @@
|
||||||
<!-- BEGIN TOPICS -->
|
<!-- BEGIN TOPICS -->
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="72dp"
|
android:layout_height="52dp"
|
||||||
android:background="@drawable/bottom_border"
|
android:background="@drawable/bottom_border"
|
||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
|
@ -180,9 +180,11 @@
|
||||||
<!-- END TOPICS -->
|
<!-- END TOPICS -->
|
||||||
|
|
||||||
<!-- BEGIN TEXT -->
|
<!-- BEGIN TEXT -->
|
||||||
|
<!-- END TEXT -->
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="200dp"
|
android:layout_height="100dp"
|
||||||
android:background="@drawable/bottom_border"
|
android:background="@drawable/bottom_border"
|
||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
|
@ -191,14 +193,13 @@
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:background="@android:color/transparent"
|
android:background="@android:color/transparent"
|
||||||
|
android:gravity="start|top"
|
||||||
android:hint="LBL_TEXT"
|
android:hint="LBL_TEXT"
|
||||||
android:inputType="text|textMultiLine"
|
android:inputType="text|textMultiLine"
|
||||||
android:textAlignment="gravity"
|
android:textAlignment="gravity"
|
||||||
android:gravity="start|top"
|
|
||||||
android:textAllCaps="false"></EditText>
|
android:textAllCaps="false"></EditText>
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
<!-- END TEXT -->
|
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
|
Loading…
Reference in New Issue