more formating
This commit is contained in:
iNPUTmice
parent
12b62adeca
commit
c9a342fc6e
|
|
@ -5,8 +5,6 @@
|
|||
android:layout_height="match_parent"
|
||||
android:background="@color/secondarybackground" >
|
||||
|
||||
|
||||
|
||||
<ListView
|
||||
android:id="@+id/messages_view"
|
||||
android:layout_width="fill_parent"
|
||||
|
|
@ -23,13 +21,13 @@
|
|||
tools:listitem="@layout/message_sent" >
|
||||
</ListView>
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/textsend"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:background="@color/primarybackground" >
|
||||
<RelativeLayout
|
||||
android:id="@+id/textsend"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:background="@color/primarybackground" >
|
||||
|
||||
<eu.siacs.conversations.ui.EditMessage
|
||||
android:id="@+id/textinput"
|
||||
|
|
@ -39,6 +37,7 @@
|
|||
android:layout_toLeftOf="@+id/textSendButton"
|
||||
android:background="@color/primarybackground"
|
||||
android:ems="10"
|
||||
android:imeOptions="flagNoExtractUi"
|
||||
android:inputType="textShortMessage|textMultiLine|textCapSentences"
|
||||
android:minHeight="48dp"
|
||||
android:minLines="1"
|
||||
|
|
@ -46,8 +45,8 @@
|
|||
android:paddingLeft="8dp"
|
||||
android:paddingRight="8dp"
|
||||
android:paddingTop="12dp"
|
||||
android:textColor="@color/primarytext"
|
||||
android:imeOptions="flagNoExtractUi">
|
||||
android:textColor="@color/primarytext" >
|
||||
|
||||
<requestFocus />
|
||||
</eu.siacs.conversations.ui.EditMessage>
|
||||
|
||||
|
|
@ -61,43 +60,43 @@
|
|||
android:src="@drawable/ic_action_send_now_offline" />
|
||||
</RelativeLayout>
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/snackbar"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_above="@+id/textsend"
|
||||
android:background="@drawable/snackbar"
|
||||
android:minHeight="48dp"
|
||||
android:layout_marginLeft="8dp"
|
||||
android:layout_marginRight="8dp"
|
||||
android:layout_marginBottom="4dp"
|
||||
android:visibility="gone" >
|
||||
<RelativeLayout
|
||||
android:id="@+id/snackbar"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_above="@+id/textsend"
|
||||
android:layout_marginBottom="4dp"
|
||||
android:layout_marginLeft="8dp"
|
||||
android:layout_marginRight="8dp"
|
||||
android:background="@drawable/snackbar"
|
||||
android:minHeight="48dp"
|
||||
android:visibility="gone" >
|
||||
|
||||
<TextView
|
||||
android:id="@+id/snackbar_message"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:paddingLeft="24dp"
|
||||
android:textColor="@color/ondarktext"
|
||||
android:textSize="?attr/TextSizeBody"
|
||||
android:layout_toLeftOf="@+id/snackbar_action"/>
|
||||
<TextView
|
||||
android:id="@+id/snackbar_message"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_toLeftOf="@+id/snackbar_action"
|
||||
android:paddingLeft="24dp"
|
||||
android:textColor="@color/ondarktext"
|
||||
android:textSize="?attr/TextSizeBody" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/snackbar_action"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:paddingBottom="16dp"
|
||||
android:paddingLeft="24dp"
|
||||
android:paddingRight="24dp"
|
||||
android:paddingTop="16dp"
|
||||
android:textAllCaps="true"
|
||||
android:textColor="@color/ondarktext"
|
||||
android:textSize="?attr/TextSizeBody"
|
||||
android:textStyle="bold" />
|
||||
</RelativeLayout>
|
||||
<TextView
|
||||
android:id="@+id/snackbar_action"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:paddingBottom="16dp"
|
||||
android:paddingLeft="24dp"
|
||||
android:paddingRight="24dp"
|
||||
android:paddingTop="16dp"
|
||||
android:textAllCaps="true"
|
||||
android:textColor="@color/ondarktext"
|
||||
android:textSize="?attr/TextSizeBody"
|
||||
android:textStyle="bold" />
|
||||
</RelativeLayout>
|
||||
|
||||
</RelativeLayout>
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
|
||||
<color name="primary" type="color">#ff259b24</color>
|
||||
<color name="primarydark" type="color">#ff0a7e07</color>
|
||||
<color name="primarytext" type="color">#de000000</color>
|
||||
|
|
@ -12,4 +13,5 @@
|
|||
<color name="red">#ffe51c23</color>
|
||||
<color name="orange">#ffff9800</color>
|
||||
<color name="green">#ff259b24</color>
|
||||
|
||||
</resources>
|
||||
|
|
@ -250,10 +250,11 @@
|
|||
<string name="pref_force_encryption_summary">Always send messages encrypted (execpt for conferences)</string>
|
||||
<string name="pref_dont_save_encrypted">Don’t save encrypted messages</string>
|
||||
<string name="pref_dont_save_encrypted_summary">Warning: This could lead to message loss</string>
|
||||
<string name="pref_expert_options">Expert options</string>
|
||||
<string name="pref_expert_options_summary">Please be very careful with those</string>
|
||||
<string name="pref_use_larger_font">Increase font size</string>
|
||||
<string name="pref_use_larger_font_summary">Use larger font sizes across the entire app</string>
|
||||
<string name="pref_use_send_button_to_indicate_status">Send button indicates status</string>
|
||||
<string name="pref_use_send_button_to_indicate_status_summary">Colorize send button to indicate a contacs status</string>
|
||||
<string name="pref_expert_options">Expert options</string>
|
||||
<string name="pref_expert_options_summary">Please be very careful with those</string>
|
||||
<string name="pref_use_larger_font">Increase font size</string>
|
||||
<string name="pref_use_larger_font_summary">Use larger font sizes across the entire app</string>
|
||||
<string name="pref_use_send_button_to_indicate_status">Send button indicates status</string>
|
||||
<string name="pref_use_send_button_to_indicate_status_summary">Colorize send button to indicate a contacs status</string>
|
||||
|
||||
</resources>
|
||||
|
|
@ -62,18 +62,17 @@
|
|||
android:summary="@string/pref_notification_grace_period_summary"
|
||||
android:title="@string/pref_notification_grace_period" />
|
||||
</PreferenceCategory>
|
||||
<PreferenceCategory
|
||||
android:title="@string/pref_ui_options">
|
||||
<CheckBoxPreference
|
||||
<PreferenceCategory android:title="@string/pref_ui_options" >
|
||||
<CheckBoxPreference
|
||||
android:defaultValue="false"
|
||||
android:key="use_larger_font"
|
||||
android:title="@string/pref_use_larger_font"
|
||||
android:summary="@string/pref_use_larger_font_summary"/>
|
||||
<CheckBoxPreference
|
||||
android:key="send_button_status"
|
||||
android:defaultValue="false"
|
||||
android:title="@string/pref_use_send_button_to_indicate_status"
|
||||
android:summary="@string/pref_use_send_button_to_indicate_status_summary"/>
|
||||
android:summary="@string/pref_use_larger_font_summary"
|
||||
android:title="@string/pref_use_larger_font" />
|
||||
<CheckBoxPreference
|
||||
android:defaultValue="false"
|
||||
android:key="send_button_status"
|
||||
android:summary="@string/pref_use_send_button_to_indicate_status_summary"
|
||||
android:title="@string/pref_use_send_button_to_indicate_status" />
|
||||
</PreferenceCategory>
|
||||
<PreferenceCategory android:title="@string/pref_advanced_options" >
|
||||
<PreferenceScreen
|
||||
|
|
|
|||
Loading…
Reference in a new issue