Merge branch 'SimpleMobileTools:master' into add_new_strings
This commit is contained in:
commit
a5fbad4ba8
|
@ -187,9 +187,10 @@
|
||||||
<com.simplemobiletools.commons.views.MyTextView
|
<com.simplemobiletools.commons.views.MyTextView
|
||||||
android:id="@+id/settings_font_size"
|
android:id="@+id/settings_font_size"
|
||||||
style="@style/SettingsTextValueStyle"
|
style="@style/SettingsTextValueStyle"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_below="@+id/settings_font_size_label" />
|
android:layout_below="@+id/settings_font_size_label"
|
||||||
|
tools:text="@string/medium" />
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
|
@ -51,7 +51,10 @@
|
||||||
android:layout_toEndOf="@+id/conversation_image"
|
android:layout_toEndOf="@+id/conversation_image"
|
||||||
android:ellipsize="end"
|
android:ellipsize="end"
|
||||||
android:maxLines="1"
|
android:maxLines="1"
|
||||||
|
android:paddingStart="0dp"
|
||||||
android:paddingEnd="@dimen/activity_margin"
|
android:paddingEnd="@dimen/activity_margin"
|
||||||
|
android:textAlignment="viewStart"
|
||||||
|
android:textDirection="locale"
|
||||||
android:textSize="@dimen/big_text_size"
|
android:textSize="@dimen/big_text_size"
|
||||||
tools:text="John" />
|
tools:text="John" />
|
||||||
|
|
||||||
|
@ -61,13 +64,16 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_below="@+id/conversation_address"
|
android:layout_below="@+id/conversation_address"
|
||||||
android:layout_toEndOf="@+id/conversation_image"
|
android:layout_toEndOf="@+id/conversation_image"
|
||||||
android:textColor="@color/color_primary"
|
|
||||||
android:textStyle="italic"
|
|
||||||
android:ellipsize="end"
|
android:ellipsize="end"
|
||||||
android:maxLines="1"
|
android:maxLines="1"
|
||||||
|
android:paddingStart="0dp"
|
||||||
android:paddingEnd="@dimen/small_margin"
|
android:paddingEnd="@dimen/small_margin"
|
||||||
|
android:text="@string/draft"
|
||||||
|
android:textAlignment="viewStart"
|
||||||
|
android:textColor="@color/color_primary"
|
||||||
|
android:textDirection="locale"
|
||||||
android:textSize="@dimen/normal_text_size"
|
android:textSize="@dimen/normal_text_size"
|
||||||
android:text="@string/draft" />
|
android:textStyle="italic" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/conversation_body_short"
|
android:id="@+id/conversation_body_short"
|
||||||
|
@ -77,7 +83,10 @@
|
||||||
android:layout_toEndOf="@+id/draft_indicator"
|
android:layout_toEndOf="@+id/draft_indicator"
|
||||||
android:ellipsize="end"
|
android:ellipsize="end"
|
||||||
android:maxLines="1"
|
android:maxLines="1"
|
||||||
|
android:paddingStart="0dp"
|
||||||
android:paddingEnd="@dimen/activity_margin"
|
android:paddingEnd="@dimen/activity_margin"
|
||||||
|
android:textAlignment="viewStart"
|
||||||
|
android:textDirection="locale"
|
||||||
android:textSize="@dimen/normal_text_size"
|
android:textSize="@dimen/normal_text_size"
|
||||||
tools:text="Hey buddy!" />
|
tools:text="Hey buddy!" />
|
||||||
|
|
||||||
|
@ -89,6 +98,8 @@
|
||||||
android:layout_marginTop="@dimen/tiny_margin"
|
android:layout_marginTop="@dimen/tiny_margin"
|
||||||
android:layout_toEndOf="@+id/conversation_image"
|
android:layout_toEndOf="@+id/conversation_image"
|
||||||
android:alpha="0.4"
|
android:alpha="0.4"
|
||||||
|
android:textAlignment="viewStart"
|
||||||
|
android:textDirection="locale"
|
||||||
android:textSize="@dimen/smaller_text_size"
|
android:textSize="@dimen/smaller_text_size"
|
||||||
tools:text="13:30" />
|
tools:text="13:30" />
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue