Browse Source

Writes some sizes in dimen.

pull/15/head
Mushegh Sahakyan 4 years ago
parent
commit
b470d70ee4
4 changed files with 24 additions and 13 deletions
  1. +2
    -2
      ui/src/main/res/layout/activity_login.xml
  2. +7
    -7
      ui/src/main/res/layout/activity_main.xml
  3. +4
    -4
      ui/src/main/res/layout/error_layout.xml
  4. +11
    -0
      ui/src/main/res/values/dimens.xml

+ 2
- 2
ui/src/main/res/layout/activity_login.xml View File

@@ -36,7 +36,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_start_and_end"
android:layout_marginTop="24dp"
android:layout_marginTop="@dimen/top_bubble_image_marginTop"
android:layout_marginEnd="@dimen/margin_start_and_end"
android:src="@drawable/bubble_top"
app:layout_constraintBottom_toBottomOf="parent"
@@ -53,7 +53,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_start_and_end"
android:layout_marginTop="32dp"
android:layout_marginTop="@dimen/signIn_title_marginTop"
android:layout_marginEnd="@dimen/margin_start_and_end"
android:fontFamily="@font/josefin_sans_bold"
android:text="@string/sign_in"


+ 7
- 7
ui/src/main/res/layout/activity_main.xml View File

@@ -11,9 +11,9 @@

<ImageView
android:id="@+id/union"
android:layout_width="450dp"
android:layout_height="770dp"
android:layout_marginBottom="8dp"
android:layout_width="@dimen/union_width"
android:layout_height="@dimen/union_height"
android:layout_marginBottom="@dimen/union_marginBottom"
android:scaleType="fitXY"
android:src="@drawable/union"
app:layout_constraintBottom_toBottomOf="parent"
@@ -25,7 +25,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_start_and_end"
android:layout_marginTop="32dp"
android:layout_marginTop="@dimen/bubble_connection_marginTop"
android:layout_marginEnd="@dimen/margin_start_and_end"
android:fontFamily="@font/josefin_sans"
android:letterSpacing="-0.02"
@@ -55,9 +55,9 @@
android:id="@+id/logout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginStart="@dimen/margin_start_and_end"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:layout_marginEnd="@dimen/margin_start_and_end"
android:text="@string/log_out"
android:textColor="@color/logout"
android:textSize="@dimen/text_title"
@@ -86,7 +86,7 @@
android:letterSpacing="-0.05"
android:text="@string/bubble_status"
android:textColor="@android:color/black"
android:textSize="16sp"
android:textSize="@dimen/myBubble_text_size"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/constraints"
app:layout_constraintEnd_toEndOf="@+id/imageMyBubble"


+ 4
- 4
ui/src/main/res/layout/error_layout.xml View File

@@ -12,7 +12,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/margin_start_and_end"
android:layout_marginTop="30dp"
android:layout_marginTop="@dimen/error_title_marginTop"
android:layout_marginEnd="@dimen/margin_start_and_end"
android:fontFamily="@font/josefin_sans"
android:text="@string/error_title"
@@ -25,10 +25,10 @@
app:layout_constraintTop_toTopOf="parent" />

<ImageView
android:layout_width="420dp"
android:layout_height="400dp"
android:layout_width="@dimen/error_image_width"
android:layout_height="@dimen/error_image_height"
android:layout_marginStart="@dimen/margin_start_and_end"
android:layout_marginTop="230dp"
android:layout_marginTop="@dimen/error_image_marginTop"
android:layout_marginEnd="@dimen/margin_start_and_end"
android:scaleType="fitXY"
android:src="@drawable/error_face"


+ 11
- 0
ui/src/main/res/values/dimens.xml View File

@@ -17,4 +17,15 @@
<dimen name="bubble_connection_title_text_size">30sp</dimen>
<dimen name="icons_size">90dp</dimen>
<dimen name="toast_text_size">14sp</dimen>
<dimen name="error_title_marginTop">30dp</dimen>
<dimen name="error_image_width">420dp</dimen>
<dimen name="error_image_height">400dp</dimen>
<dimen name="error_image_marginTop">230dp</dimen>
<dimen name="top_bubble_image_marginTop">24dp</dimen>
<dimen name="signIn_title_marginTop">32dp</dimen>
<dimen name="bubble_connection_marginTop">32dp</dimen>
<dimen name="union_width">450dp</dimen>
<dimen name="union_height">770dp</dimen>
<dimen name="union_marginBottom">8dp</dimen>
<dimen name="myBubble_text_size">16sp</dimen>
</resources>

Loading…
Cancel
Save