sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

more formating

This commit is contained in:
iNPUTmice 2014-09-11 16:32:49 +02:00
parent 12b62adeca
commit c9a342fc6e
4 changed files with 64 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
res/layout/fragment_conversation.xml
View File

@ -5,8 +5,6 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/secondarybackground" > android:background="@color/secondarybackground" >
<ListView <ListView
android:id="@+id/messages_view" android:id="@+id/messages_view"
android:layout_width="fill_parent" android:layout_width="fill_parent"
@ -23,13 +21,13 @@
tools:listitem="@layout/message_sent" > tools:listitem="@layout/message_sent" >
</ListView> </ListView>
<RelativeLayout <RelativeLayout
android:id="@+id/textsend" android:id="@+id/textsend"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:background="@color/primarybackground" > android:background="@color/primarybackground" >
<eu.siacs.conversations.ui.EditMessage <eu.siacs.conversations.ui.EditMessage
android:id="@+id/textinput" android:id="@+id/textinput"
@ -39,6 +37,7 @@
android:layout_toLeftOf="@+id/textSendButton" android:layout_toLeftOf="@+id/textSendButton"
android:background="@color/primarybackground" android:background="@color/primarybackground"
android:ems="10" android:ems="10"
android:imeOptions="flagNoExtractUi"
android:inputType="textShortMessage|textMultiLine|textCapSentences" android:inputType="textShortMessage|textMultiLine|textCapSentences"
android:minHeight="48dp" android:minHeight="48dp"
android:minLines="1" android:minLines="1"
@ -46,8 +45,8 @@
android:paddingLeft="8dp" android:paddingLeft="8dp"
android:paddingRight="8dp" android:paddingRight="8dp"
android:paddingTop="12dp" android:paddingTop="12dp"
android:textColor="@color/primarytext" android:textColor="@color/primarytext" >
android:imeOptions="flagNoExtractUi">
<requestFocus /> <requestFocus />
</eu.siacs.conversations.ui.EditMessage> </eu.siacs.conversations.ui.EditMessage>
@ -61,43 +60,43 @@
android:src="@drawable/ic_action_send_now_offline" /> android:src="@drawable/ic_action_send_now_offline" />
</RelativeLayout> </RelativeLayout>
<RelativeLayout <RelativeLayout
android:id="@+id/snackbar" android:id="@+id/snackbar"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_above="@+id/textsend" android:layout_above="@+id/textsend"
android:background="@drawable/snackbar" android:layout_marginBottom="4dp"
android:minHeight="48dp" android:layout_marginLeft="8dp"
android:layout_marginLeft="8dp" android:layout_marginRight="8dp"
android:layout_marginRight="8dp" android:background="@drawable/snackbar"
android:layout_marginBottom="4dp" android:minHeight="48dp"
android:visibility="gone" > android:visibility="gone" >
<TextView <TextView
android:id="@+id/snackbar_message" android:id="@+id/snackbar_message"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:paddingLeft="24dp" android:layout_toLeftOf="@+id/snackbar_action"
android:textColor="@color/ondarktext" android:paddingLeft="24dp"
android:textSize="?attr/TextSizeBody" android:textColor="@color/ondarktext"
android:layout_toLeftOf="@+id/snackbar_action"/> android:textSize="?attr/TextSizeBody" />
<TextView <TextView
android:id="@+id/snackbar_action" android:id="@+id/snackbar_action"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:paddingBottom="16dp" android:paddingBottom="16dp"
android:paddingLeft="24dp" android:paddingLeft="24dp"
android:paddingRight="24dp" android:paddingRight="24dp"
android:paddingTop="16dp" android:paddingTop="16dp"
android:textAllCaps="true" android:textAllCaps="true"
android:textColor="@color/ondarktext" android:textColor="@color/ondarktext"
android:textSize="?attr/TextSizeBody" android:textSize="?attr/TextSizeBody"
android:textStyle="bold" /> android:textStyle="bold" />
</RelativeLayout> </RelativeLayout>
</RelativeLayout> </RelativeLayout>

2
res/values/colors.xml
View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="primary" type="color">#ff259b24</color> <color name="primary" type="color">#ff259b24</color>
<color name="primarydark" type="color">#ff0a7e07</color> <color name="primarydark" type="color">#ff0a7e07</color>
<color name="primarytext" type="color">#de000000</color> <color name="primarytext" type="color">#de000000</color>
@ -12,4 +13,5 @@
<color name="red">#ffe51c23</color> <color name="red">#ffe51c23</color>
<color name="orange">#ffff9800</color> <color name="orange">#ffff9800</color>
<color name="green">#ff259b24</color> <color name="green">#ff259b24</color>
</resources> </resources>

13
res/values/strings.xml
View File

@ -250,10 +250,11 @@
<string name="pref_force_encryption_summary">Always send messages encrypted (execpt for conferences)</string> <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">Don’t save encrypted messages</string>
<string name="pref_dont_save_encrypted_summary">Warning: This could lead to message loss</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">Expert options</string>
<string name="pref_expert_options_summary">Please be very careful with those</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">Increase font size</string>
<string name="pref_use_larger_font_summary">Use larger font sizes across the entire app</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">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_use_send_button_to_indicate_status_summary">Colorize send button to indicate a contacs status</string>
</resources> </resources>

19
res/xml/preferences.xml
View File

@ -62,18 +62,17 @@
android:summary="@string/pref_notification_grace_period_summary" android:summary="@string/pref_notification_grace_period_summary"
android:title="@string/pref_notification_grace_period" /> android:title="@string/pref_notification_grace_period" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory <PreferenceCategory android:title="@string/pref_ui_options" >
android:title="@string/pref_ui_options"> <CheckBoxPreference
<CheckBoxPreference
android:defaultValue="false" android:defaultValue="false"
android:key="use_larger_font" android:key="use_larger_font"
android:title="@string/pref_use_larger_font" android:summary="@string/pref_use_larger_font_summary"
android:summary="@string/pref_use_larger_font_summary"/> android:title="@string/pref_use_larger_font" />
<CheckBoxPreference <CheckBoxPreference
android:key="send_button_status" android:defaultValue="false"
android:defaultValue="false" android:key="send_button_status"
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_send_button_to_indicate_status_summary"/> android:title="@string/pref_use_send_button_to_indicate_status" />
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory android:title="@string/pref_advanced_options" > <PreferenceCategory android:title="@string/pref_advanced_options" >
<PreferenceScreen <PreferenceScreen