narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

added missing strings back. + formating

Browse source
This commit is contained in:
iNPUTmice 2014-09-11 16:22:33 +02:00
parent dee46f3453
commit 12b62adeca
59 changed files with 565 additions and 489 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
res/drawable/actionbar_tab_indicator.xml
View file

@ -1,19 +1,21 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Non focused states --> <!-- Non focused states -->
<item android:state_focused="false" android:state_selected="false" android:state_pressed="false" android:drawable="@android:color/transparent" /> <item android:drawable="@android:color/transparent" android:state_focused="false" android:state_pressed="false" android:state_selected="false"/>
<item android:state_focused="false" android:state_selected="true" android:state_pressed="false" android:drawable="@drawable/tab_selected_conversations" /> <item android:drawable="@drawable/tab_selected_conversations" android:state_focused="false" android:state_pressed="false" android:state_selected="true"/>
<!-- Focused states --> <!-- Focused states -->
<item android:state_focused="true" android:state_selected="false" android:state_pressed="false" android:drawable="@drawable/tab_unselected_focused_conversations" /> <item android:drawable="@drawable/tab_unselected_focused_conversations" android:state_focused="true" android:state_pressed="false" android:state_selected="false"/>
<item android:state_focused="true" android:state_selected="true" android:state_pressed="false" android:drawable="@drawable/tab_selected_focused_conversations" /> <item android:drawable="@drawable/tab_selected_focused_conversations" android:state_focused="true" android:state_pressed="false" android:state_selected="true"/>
<!-- Pressed --> <!-- Pressed -->
<!-- Non focused states --> <!-- Non focused states -->
<item android:state_focused="false" android:state_selected="false" android:state_pressed="true" android:drawable="@drawable/tab_unselected_pressed_conversations" /> <item android:drawable="@drawable/tab_unselected_pressed_conversations" android:state_focused="false" android:state_pressed="true" android:state_selected="false"/>
<item android:state_focused="false" android:state_selected="true" android:state_pressed="true" android:drawable="@drawable/tab_selected_pressed_conversations" /> <item android:drawable="@drawable/tab_selected_pressed_conversations" android:state_focused="false" android:state_pressed="true" android:state_selected="true"/>
<!-- Focused states --> <!-- Focused states -->
<item android:state_focused="true" android:state_selected="false" android:state_pressed="true" android:drawable="@drawable/tab_unselected_pressed_conversations" /> <item android:drawable="@drawable/tab_unselected_pressed_conversations" android:state_focused="true" android:state_pressed="true" android:state_selected="false"/>
<item android:state_focused="true" android:state_selected="true" android:state_pressed="true" android:drawable="@drawable/tab_selected_pressed_conversations" /> <item android:drawable="@drawable/tab_selected_pressed_conversations" android:state_focused="true" android:state_pressed="true" android:state_selected="true"/>
</selector>
</selector>

13
res/drawable/es_slidingpane_shadow.xml
View file

@ -1,7 +1,12 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" > <shape xmlns:android="http://schemas.android.com/apk/res/android" >
<gradient
android:endColor="@color/divider" <gradient
android:startColor="@android:color/transparent" /> android:endColor="@color/divider"
<size android:width="3.0dp" android:height="0.5dp" /> android:startColor="@android:color/transparent" />
<size
android:height="0.5dp"
android:width="3.0dp" />
</shape> </shape>

6
res/drawable/grey.xml
View file

@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle" >
<solid android:color="#ffdddddd" /> <solid android:color="#ffdddddd" />
</shape> </shape>

10
res/drawable/greybackground.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" > <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_pressed="true" <item android:drawable="@drawable/grey" android:state_pressed="true"/>
android:drawable="@drawable/grey" />
</selector> </selector>

17
res/drawable/message_border.xml
View file

@ -1,6 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> <shape xmlns:android="http://schemas.android.com/apk/res/android"
<corners android:radius="2dp"/> android:shape="rectangle" >
<padding android:left="1.5dp" android:right="1.5dp" android:top="1.5dp" android:bottom="1.5dp"/>
<solid android:color="@color/divider"/> <corners android:radius="2dp" />
<padding
android:bottom="1.5dp"
android:left="1.5dp"
android:right="1.5dp"
android:top="1.5dp" />
<solid android:color="@color/divider" />
</shape> </shape>

1
res/drawable/section_header.xml
View file

@ -7,4 +7,5 @@
android:width="2000dp" /> android:width="2000dp" />
<solid android:color="@color/divider" /> <solid android:color="@color/divider" />
</shape> </shape>

16
res/drawable/snackbar.xml
View file

@ -1,6 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android" >
<solid android:color="@color/darkbackground"/>
<corners android:radius="8dip"/> <solid android:color="@color/darkbackground" />
<padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" />
<corners android:radius="8dip" />
<padding
android:bottom="0dip"
android:left="0dip"
android:right="0dip"
android:top="0dip" />
</shape> </shape>

52
res/layout-sw360dp/fragment_conversations_overview.xml
View file

@ -1,30 +1,30 @@
<android.support.v4.widget.SlidingPaneLayout <android.support.v4.widget.SlidingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/slidingpanelayout"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="324dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/slidingpanelayout">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="324dp"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/primarybackground"
>
<ListView
android:id="@+id/list"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:divider="@color/divider"
android:dividerHeight="1dp"
android:background="@color/primarybackground" android:background="@color/primarybackground"
/> android:orientation="vertical" >
</LinearLayout> <ListView
<LinearLayout android:id="@+id/list"
android:id="@+id/selected_conversation" android:layout_width="fill_parent"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_height="match_parent" android:background="@color/primarybackground"
android:layout_weight="1" android:divider="@color/divider"
android:orientation="vertical"> android:dividerHeight="1dp" />
</LinearLayout> </LinearLayout>
<LinearLayout
android:id="@+id/selected_conversation"
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical" >
</LinearLayout>
</android.support.v4.widget.SlidingPaneLayout> </android.support.v4.widget.SlidingPaneLayout>

52
res/layout-sw384dp/fragment_conversations_overview.xml
View file

@ -1,30 +1,30 @@
<android.support.v4.widget.SlidingPaneLayout <android.support.v4.widget.SlidingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/slidingpanelayout"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="345dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/slidingpanelayout">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="345dp"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/primarybackground"
>
<ListView
android:id="@+id/list"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:divider="@color/divider"
android:dividerHeight="1dp"
android:background="@color/primarybackground" android:background="@color/primarybackground"
/> android:orientation="vertical" >
</LinearLayout> <ListView
<LinearLayout android:id="@+id/list"
android:id="@+id/selected_conversation" android:layout_width="fill_parent"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_height="match_parent" android:background="@color/primarybackground"
android:layout_weight="1" android:divider="@color/divider"
android:orientation="vertical"> android:dividerHeight="1dp" />
</LinearLayout> </LinearLayout>
<LinearLayout
android:id="@+id/selected_conversation"
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical" >
</LinearLayout>
</android.support.v4.widget.SlidingPaneLayout> </android.support.v4.widget.SlidingPaneLayout>

52
res/layout-sw600dp/fragment_conversations_overview.xml
View file

@ -1,30 +1,30 @@
<android.support.v4.widget.SlidingPaneLayout <android.support.v4.widget.SlidingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/slidingpanelayout"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="240dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/slidingpanelayout">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="240dp"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/primarybackground"
>
<ListView
android:id="@+id/list"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:divider="@color/divider"
android:dividerHeight="1dp"
android:background="@color/primarybackground" android:background="@color/primarybackground"
/> android:orientation="vertical" >
</LinearLayout> <ListView
<LinearLayout android:id="@+id/list"
android:id="@+id/selected_conversation" android:layout_width="fill_parent"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_height="match_parent" android:background="@color/primarybackground"
android:layout_weight="1" android:divider="@color/divider"
android:orientation="vertical"> android:dividerHeight="1dp" />
</LinearLayout> </LinearLayout>
<LinearLayout
android:id="@+id/selected_conversation"
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical" >
</LinearLayout>
</android.support.v4.widget.SlidingPaneLayout> </android.support.v4.widget.SlidingPaneLayout>

52
res/layout-sw720dp/fragment_conversations_overview.xml
View file

@ -1,30 +1,30 @@
<android.support.v4.widget.SlidingPaneLayout <android.support.v4.widget.SlidingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/slidingpanelayout"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="288dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/slidingpanelayout">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="288dp"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/primarybackground"
>
<ListView
android:id="@+id/list"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:divider="@color/divider"
android:dividerHeight="1dp"
android:background="@color/primarybackground" android:background="@color/primarybackground"
/> android:orientation="vertical" >
</LinearLayout> <ListView
<LinearLayout android:id="@+id/list"
android:id="@+id/selected_conversation" android:layout_width="fill_parent"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_height="match_parent" android:background="@color/primarybackground"
android:layout_weight="1" android:divider="@color/divider"
android:orientation="vertical"> android:dividerHeight="1dp" />
</LinearLayout> </LinearLayout>
<LinearLayout
android:id="@+id/selected_conversation"
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical" >
</LinearLayout>
</android.support.v4.widget.SlidingPaneLayout> </android.support.v4.widget.SlidingPaneLayout>

6
res/layout/account_row.xml
View file

@ -16,8 +16,8 @@
<LinearLayout <LinearLayout
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_toRightOf="@+id/account_image"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_toRightOf="@+id/account_image"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="8dp" > android:paddingLeft="8dp" >
@ -35,9 +35,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/account_status_unknown" android:text="@string/account_status_unknown"
android:textSize="?attr/TextSizeBody"
android:textColor="@color/secondarytext" android:textColor="@color/secondarytext"
android:textStyle="bold"/> android:textSize="?attr/TextSizeBody"
android:textStyle="bold" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>

2
res/layout/actionview_search.xml
View file

@ -14,6 +14,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:focusable="true" android:focusable="true"
android:inputType="textEmailAddress|textNoSuggestions" android:inputType="textEmailAddress|textNoSuggestions"
android:textColor="@color/ondarktext"/> android:textColor="@color/ondarktext" />
</LinearLayout> </LinearLayout>

215
res/layout/activity_contact_details.xml
View file

@ -2,124 +2,127 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/primarybackground"> android:background="@color/primarybackground" >
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
style="@style/sectionHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="8dp" android:orientation="vertical" >
android:text="@string/action_contact_details"
android:textColor="@color/primarytext"/>
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minHeight="88dp"
android:padding="8dp">
<QuickContactBadge <TextView
android:id="@+id/details_contact_badge" style="@style/sectionHeader"
android:layout_width="72dp"
android:layout_height="72dp"
android:layout_centerVertical="true"
android:scaleType="centerCrop"/>
<LinearLayout
android:id="@+id/details_jidbox"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:padding="8dp"
android:layout_toRightOf="@+id/details_contact_badge" android:text="@string/action_contact_details"
android:orientation="vertical" android:textColor="@color/primarytext" />
android:paddingLeft="8dp" >
<TextView <RelativeLayout
android:id="@+id/details_contactjid" android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minHeight="88dp"
android:padding="8dp" >
<QuickContactBadge
android:id="@+id/details_contact_badge"
android:layout_width="72dp"
android:layout_height="72dp"
android:layout_centerVertical="true"
android:scaleType="centerCrop" />
<LinearLayout
android:id="@+id/details_jidbox"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="8dp" android:layout_centerVertical="true"
android:singleLine="true" android:layout_toRightOf="@+id/details_contact_badge"
android:textSize="?attr/TextSizeBody" android:orientation="vertical"
android:textColor="@color/primarytext"/> android:paddingLeft="8dp" >
<TextView <TextView
android:id="@+id/details_contactstatus" android:id="@+id/details_contactjid"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="16dp" android:paddingLeft="8dp"
android:textSize="?attr/TextSizeHeadline" android:singleLine="true"
android:textColor="@color/primarytext" android:textColor="@color/primarytext"
android:textStyle="bold" /> android:textSize="?attr/TextSizeBody" />
<TextView
android:id="@+id/details_lastseen"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="8dp"
android:singleLine="true"
android:textSize="?attr/TextSizeBody"
android:textColor="@color/primarytext"/>
</LinearLayout>
</RelativeLayout>
<TextView
<TextView android:id="@+id/details_contactstatus"
style="@style/sectionHeader" android:layout_width="wrap_content"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:paddingLeft="16dp"
android:padding="8dp" android:textColor="@color/primarytext"
android:text="@string/your_account" android:textSize="?attr/TextSizeHeadline"
android:textColor="@color/primarytext"/> android:textStyle="bold" />
<TextView
android:id="@+id/details_account"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="8dp"
android:textSize="?attr/TextSizeBody"
android:textColor="@color/primarytext" />
<TextView
style="@style/sectionHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp"
android:text="@string/subscriptions"
android:textColor="@color/primarytext"/>
<CheckBox <TextView
android:id="@+id/details_send_presence" android:id="@+id/details_lastseen"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/send_presence_updates" android:paddingLeft="8dp"
android:textSize="?attr/TextSizeBody" android:singleLine="true"
android:textColor="@color/primarytext" /> android:textColor="@color/primarytext"
android:textSize="?attr/TextSizeBody" />
</LinearLayout>
</RelativeLayout>
<TextView
style="@style/sectionHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp"
android:text="@string/your_account"
android:textColor="@color/primarytext" />
<TextView
android:id="@+id/details_account"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="8dp"
android:textColor="@color/primarytext"
android:textSize="?attr/TextSizeBody" />
<TextView
style="@style/sectionHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp"
android:text="@string/subscriptions"
android:textColor="@color/primarytext" />
<CheckBox <CheckBox
android:id="@+id/details_receive_presence" android:id="@+id/details_send_presence"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/receive_presence_updates" android:text="@string/send_presence_updates"
android:textSize="?attr/TextSizeBody" android:textColor="@color/primarytext"
android:textColor="@color/primarytext" /> android:textSize="?attr/TextSizeBody" />
<TextView
style="@style/sectionHeader" <CheckBox
android:layout_width="wrap_content" android:id="@+id/details_receive_presence"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:padding="8dp" android:layout_height="wrap_content"
android:text="@string/keys" /> android:text="@string/receive_presence_updates"
android:textColor="@color/primarytext"
android:textSize="?attr/TextSizeBody" />
<TextView
style="@style/sectionHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp"
android:text="@string/keys" />
<LinearLayout
android:id="@+id/details_contact_keys"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:divider="?android:dividerHorizontal"
android:orientation="vertical"
android:showDividers="middle" >
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/details_contact_keys"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:divider="?android:dividerHorizontal"
android:showDividers="middle">
</LinearLayout>
</LinearLayout>
</ScrollView> </ScrollView>

7
res/layout/activity_muc_details.xml
View file

@ -24,7 +24,7 @@
android:singleLine="true" android:singleLine="true"
android:text="@string/account_settings_example_jabber_id" android:text="@string/account_settings_example_jabber_id"
android:textColor="@color/primarytext" android:textColor="@color/primarytext"
android:textSize="?attr/TextSizeBody"/> android:textSize="?attr/TextSizeBody" />
<TextView <TextView
style="@style/sectionHeader" style="@style/sectionHeader"
@ -82,9 +82,8 @@
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:background="?android:selectableItemBackground" android:background="?android:selectableItemBackground"
android:src="@drawable/ic_action_edit_dark" android:padding="8dp"
android:padding="8dp"/> android:src="@drawable/ic_action_edit_dark" />
</RelativeLayout> </RelativeLayout>
<LinearLayout <LinearLayout

16
res/layout/activity_publish_profile_picture.xml
View file

@ -28,7 +28,7 @@
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:text="@string/touch_to_choose_picture" android:text="@string/touch_to_choose_picture"
android:textColor="@color/secondarytext" /> android:textColor="@color/secondarytext" />
<TextView <TextView
android:id="@+id/secondary_hint" android:id="@+id/secondary_hint"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -77,30 +77,30 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_above="@+id/button_bar" android:layout_above="@+id/button_bar"
android:layout_below="@+id/secondary_hint"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_below="@+id/secondary_hint"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="8dp" android:paddingLeft="8dp"
android:paddingRight="8dp" > android:paddingRight="8dp" >
<TextView <TextView
android:id="@+id/account" android:id="@+id/account"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/primarytext" android:textColor="@color/primarytext"
android:textSize="?attr/TextSizeHeadline"/> android:textSize="?attr/TextSizeHeadline" />
<TextView <TextView
android:id="@+id/hint_or_warning" android:id="@+id/hint_or_warning"
android:layout_marginTop="8dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:minLines="3"
android:text="@string/publish_avatar_explanation" android:text="@string/publish_avatar_explanation"
android:textColor="@color/primarytext" android:textColor="@color/primarytext"
android:textSize="?attr/TextSizeBody" android:textSize="?attr/TextSizeBody" />
android:minLines="3" />
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>

2
res/layout/activity_start_conversation.xml
View file

@ -3,6 +3,6 @@
android:id="@+id/start_conversation_view_pager" android:id="@+id/start_conversation_view_pager"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/primarybackground"> android:background="@color/primarybackground" >
</android.support.v4.view.ViewPager> </android.support.v4.view.ViewPager>

4
res/layout/contact.xml
View file

@ -27,8 +27,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:textSize="?attr/TextSizeHeadline" android:textColor="@color/primarytext"
android:textColor="@color/primarytext" /> android:textSize="?attr/TextSizeHeadline" />
<TextView <TextView
android:id="@+id/contact_jid" android:id="@+id/contact_jid"

4
res/layout/contact_key.xml
View file

@ -32,9 +32,9 @@
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:padding="8dp"
android:background="?android:selectableItemBackground" android:background="?android:selectableItemBackground"
android:padding="8dp"
android:src="@drawable/ic_action_remove" android:src="@drawable/ic_action_remove"
android:visibility="invisible"/> android:visibility="invisible" />
</RelativeLayout> </RelativeLayout>

120
res/layout/conversation_list_row.xml
View file

@ -2,71 +2,67 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:padding="8dp"> android:padding="8dp" >
<ImageView <ImageView
android:id="@+id/conversation_image" android:id="@+id/conversation_image"
android:layout_width="56dp" android:layout_width="56dp"
android:layout_height="56dp" android:layout_height="56dp"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:scaleType="centerCrop"/> android:scaleType="centerCrop" />
<RelativeLayout <RelativeLayout
android:layout_toRightOf="@+id/conversation_image" android:layout_width="fill_parent"
android:layout_centerVertical="true" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_centerVertical="true"
android:layout_width="fill_parent" android:layout_toRightOf="@+id/conversation_image"
android:paddingLeft="8dp"> android:paddingLeft="8dp" >
<TextView <TextView
android:id="@+id/conversation_name" android:id="@+id/conversation_name"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignLeft="@+id/conversation_lastwrapper" android:layout_alignLeft="@+id/conversation_lastwrapper"
android:layout_toLeftOf="@+id/conversation_lastupdate" android:layout_toLeftOf="@+id/conversation_lastupdate"
android:singleLine="true" android:singleLine="true"
android:textSize="?attr/TextSizeHeadline" android:textColor="@color/primarytext"
android:textColor="@color/primarytext" android:textSize="?attr/TextSizeHeadline"
android:typeface="sans" /> android:typeface="sans" />
<LinearLayout
android:orientation="vertical"
android:id="@+id/conversation_lastwrapper"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@id/conversation_name"
android:paddingTop="3dp"
>
<TextView
android:id="@+id/conversation_lastmsg"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textSize="?attr/TextSizeBody"
android:textColor="@color/primarytext"
android:singleLine="true"
android:scrollHorizontally="false"
/>
<ImageView
android:id="@+id/conversation_lastimage"
android:layout_width="fill_parent"
android:layout_height="36dp"
android:background="@color/primarytext"
android:scaleType="centerCrop" />
</LinearLayout> <LinearLayout
<TextView android:id="@+id/conversation_lastwrapper"
android:id="@+id/conversation_lastupdate" android:layout_width="fill_parent"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_below="@id/conversation_name"
android:layout_alignBaseline="@+id/conversation_name" android:orientation="vertical"
android:layout_alignParentRight="true" android:paddingTop="3dp" >
android:gravity="right"
android:textSize="?attr/TextSizeInfo" <TextView
android:textColor="@color/secondarytext"/> android:id="@+id/conversation_lastmsg"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:scrollHorizontally="false"
android:singleLine="true"
android:textColor="@color/primarytext"
android:textSize="?attr/TextSizeBody" />
<ImageView
android:id="@+id/conversation_lastimage"
android:layout_width="fill_parent"
android:layout_height="36dp"
android:background="@color/primarytext"
android:scaleType="centerCrop" />
</LinearLayout>
<TextView
android:id="@+id/conversation_lastupdate"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBaseline="@+id/conversation_name"
android:layout_alignParentRight="true"
android:gravity="right"
android:textColor="@color/secondarytext"
android:textSize="?attr/TextSizeInfo" />
</RelativeLayout>
</RelativeLayout>
</RelativeLayout> </RelativeLayout>

27
res/layout/create_contact_dialog.xml
View file

@ -3,36 +3,37 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:padding="8dp"> android:padding="8dp" >
<TextView <TextView
android:id="@+id/your_account" android:id="@+id/your_account"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="?attr/TextSizeBody" android:text="@string/your_account"
android:textColor="@color/primarytext" android:textColor="@color/primarytext"
android:text="@string/your_account" /> android:textSize="?attr/TextSizeBody" />
<Spinner <Spinner
android:id="@+id/account" android:id="@+id/account"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<TextView <TextView
android:id="@+id/jabber_id" android:id="@+id/jabber_id"
android:layout_marginTop="8dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="?attr/TextSizeBody" android:layout_marginTop="8dp"
android:text="@string/account_settings_jabber_id"
android:textColor="@color/primarytext" android:textColor="@color/primarytext"
android:text="@string/account_settings_jabber_id" /> android:textSize="?attr/TextSizeBody" />
<AutoCompleteTextView <AutoCompleteTextView
android:id="@+id/jid" android:id="@+id/jid"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:inputType="textEmailAddress"
android:hint="@string/account_settings_example_jabber_id" android:hint="@string/account_settings_example_jabber_id"
android:textColorHint="@color/secondarytext" android:inputType="textEmailAddress"
android:textColor="@color/primarytext" android:textColor="@color/primarytext"
/> android:textColorHint="@color/secondarytext" />
</LinearLayout>
</LinearLayout>

13
res/layout/dialog_clear_history.xml
View file

@ -3,16 +3,19 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:padding="8dp"> android:padding="8dp" >
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="8dp"
android:text="@string/clear_histor_msg" android:text="@string/clear_histor_msg"
android:textSize="?attr/TextSizeBody" android:textSize="?attr/TextSizeBody" />
android:paddingBottom="8dp"/>
<CheckBox <CheckBox
android:id="@+id/end_conversation_checkbox" android:id="@+id/end_conversation_checkbox"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/also_end_conversation"/> android:text="@string/also_end_conversation" />
</LinearLayout>
</LinearLayout>

37
res/layout/dialog_verify_otr.xml
View file

@ -3,55 +3,58 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="8dp"
android:paddingBottom="16dp" android:paddingBottom="16dp"
android:paddingRight="8dp"> android:paddingLeft="8dp"
android:paddingRight="8dp" >
<TextView
<TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="8dp" android:paddingTop="8dp"
android:text="Jabber ID" android:text="Jabber ID"
android:textColor="@color/primarytext" android:textColor="@color/primarytext"
android:textSize="?attr/TextSizeHeadline"/> android:textSize="?attr/TextSizeHeadline" />
<TextView <TextView
android:id="@+id/verify_otr_jid" android:id="@+id/verify_otr_jid"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="8dp" android:paddingLeft="8dp"
android:textSize="?attr/TextSizeBody" android:textColor="@color/secondarytext"
android:textColor="@color/secondarytext"/> android:textSize="?attr/TextSizeBody" />
<TextView
<TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="8dp" android:paddingTop="8dp"
android:text="@string/otr_fingerprint" android:text="@string/otr_fingerprint"
android:textColor="@color/primarytext" android:textColor="@color/primarytext"
android:textSize="?attr/TextSizeHeadline"/> android:textSize="?attr/TextSizeHeadline" />
<TextView <TextView
android:id="@+id/verify_otr_fingerprint" android:id="@+id/verify_otr_fingerprint"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="8dp" android:paddingLeft="8dp"
android:textColor="@color/secondarytext"
android:textSize="?attr/TextSizeBody" android:textSize="?attr/TextSizeBody"
android:typeface="monospace" android:typeface="monospace" />
android:textColor="@color/secondarytext"/>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingTop="8dp" android:paddingTop="8dp"
android:text="@string/your_fingerprint" android:text="@string/your_fingerprint"
android:textSize="?attr/TextSizeHeadline" android:textColor="@color/primarytext"
android:textColor="@color/primarytext"/> android:textSize="?attr/TextSizeHeadline" />
<TextView <TextView
android:id="@+id/verify_otr_yourprint" android:id="@+id/verify_otr_yourprint"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="8dp" android:paddingLeft="8dp"
android:textColor="@color/secondarytext"
android:textSize="?attr/TextSizeBody" android:textSize="?attr/TextSizeBody"
android:typeface="monospace" android:typeface="monospace" />
android:textColor="@color/secondarytext"/>
</LinearLayout> </LinearLayout>

52
res/layout/fragment_conversations_overview.xml
View file

@ -1,30 +1,30 @@
<android.support.v4.widget.SlidingPaneLayout <android.support.v4.widget.SlidingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/slidingpanelayout"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="288dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/slidingpanelayout">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="288dp"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/primarybackground"
>
<ListView
android:id="@+id/list"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:divider="@color/divider"
android:dividerHeight="1dp"
android:background="@color/primarybackground" android:background="@color/primarybackground"
/> android:orientation="vertical" >
</LinearLayout> <ListView
<LinearLayout android:id="@+id/list"
android:id="@+id/selected_conversation" android:layout_width="fill_parent"
android:layout_width="fill_parent" android:layout_height="wrap_content"
android:layout_height="match_parent" android:background="@color/primarybackground"
android:layout_weight="1" android:divider="@color/divider"
android:orientation="vertical"> android:dividerHeight="1dp" />
</LinearLayout> </LinearLayout>
<LinearLayout
android:id="@+id/selected_conversation"
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical" >
</LinearLayout>
</android.support.v4.widget.SlidingPaneLayout> </android.support.v4.widget.SlidingPaneLayout>

32
res/layout/join_conference_dialog.xml
View file

@ -3,45 +3,45 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:padding="8dp"> android:padding="8dp" >
<TextView <TextView
android:id="@+id/your_account" android:id="@+id/your_account"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="?attr/TextSizeBody" android:text="@string/your_account"
android:textColor="@color/primarytext" android:textColor="@color/primarytext"
android:text="@string/your_account" /> android:textSize="?attr/TextSizeBody" />
<Spinner <Spinner
android:id="@+id/account" android:id="@+id/account"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<TextView <TextView
android:id="@+id/jabber_id" android:id="@+id/jabber_id"
android:layout_marginTop="8dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="?attr/TextSizeBody" android:layout_marginTop="8dp"
android:text="@string/conference_address"
android:textColor="@color/primarytext" android:textColor="@color/primarytext"
android:text="@string/conference_address" /> android:textSize="?attr/TextSizeBody" />
<AutoCompleteTextView <AutoCompleteTextView
android:id="@+id/jid" android:id="@+id/jid"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:inputType="textEmailAddress"
android:hint="@string/conference_address_example" android:hint="@string/conference_address_example"
android:textColorHint="@color/secondarytext" android:inputType="textEmailAddress"
android:textColor="@color/primarytext" android:textColor="@color/primarytext"
/> android:textColorHint="@color/secondarytext" />
<CheckBox <CheckBox
android:id="@+id/bookmark" android:id="@+id/bookmark"
android:layout_marginTop="8dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/save_as_bookmark" android:layout_marginTop="8dp"
android:checked="true" /> android:checked="true"
android:text="@string/save_as_bookmark" />
</LinearLayout> </LinearLayout>

4
res/layout/manage_accounts.xml
View file

@ -3,14 +3,14 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:background="@color/primarybackground"> android:background="@color/primarybackground" >
<ListView <ListView
android:id="@+id/account_list" android:id="@+id/account_list"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:divider="@color/divider" android:divider="@color/divider"
android:dividerHeight="1dp"> android:dividerHeight="1dp" >
</ListView> </ListView>
</LinearLayout> </LinearLayout>

3
res/layout/message_null.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content" >
</RelativeLayout> </RelativeLayout>

8
res/layout/message_status.xml
View file

@ -3,11 +3,11 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingTop="6dp"
android:paddingBottom="6dp" android:paddingBottom="6dp"
android:paddingLeft="8dp"
android:paddingRight="6dp" android:paddingRight="6dp"
android:paddingLeft="8dp"> android:paddingTop="6dp" >
<ImageView <ImageView
android:id="@+id/message_photo" android:id="@+id/message_photo"
android:layout_width="32dp" android:layout_width="32dp"
@ -17,6 +17,6 @@
android:layout_marginRight="-1.5dp" android:layout_marginRight="-1.5dp"
android:padding="0dp" android:padding="0dp"
android:scaleType="fitXY" android:scaleType="fitXY"
android:src="@drawable/ic_profile"/> android:src="@drawable/ic_profile" />
</RelativeLayout> </RelativeLayout>

9
res/layout/quickedit.xml
View file

@ -3,16 +3,17 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:padding="16dp"> android:padding="16dp" >
<EditText <EditText
android:id="@+id/editor" android:id="@+id/editor"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ems="10" android:ems="10"
android:inputType="textPersonName" android:inputType="textPersonName"
android:textColor="@color/primarytext"> android:textColor="@color/primarytext" >
<requestFocus /> <requestFocus />
</EditText> </EditText>
</LinearLayout> </LinearLayout>

9
res/menu/attachment_choices.xml
View file

@ -7,8 +7,9 @@
<item <item
android:id="@+id/attach_take_picture" android:id="@+id/attach_take_picture"
android:title="@string/attach_take_picture"/> android:title="@string/attach_take_picture"/>
<item <item
android:id="@+id/attach_record_voice" android:id="@+id/attach_record_voice"
android:title="@string/attach_record_voice" android:title="@string/attach_record_voice"
android:visible="false"/> android:visible="false"/>
</menu> </menu>

1
res/menu/choose_contact.xml
View file

@ -7,4 +7,5 @@
android:icon="@drawable/ic_action_search" android:icon="@drawable/ic_action_search"
android:showAsAction="collapseActionView|always" android:showAsAction="collapseActionView|always"
android:title="@string/search"/> android:title="@string/search"/>
</menu> </menu>

16
res/menu/contact_details.xml
View file

@ -1,27 +1,27 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" > <menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item <item
android:id="@+id/action_edit_contact" android:id="@+id/action_edit_contact"
android:icon="@drawable/ic_action_edit"
android:orderInCategory="10" android:orderInCategory="10"
android:showAsAction="always" android:showAsAction="always"
android:icon="@drawable/ic_action_edit" android:title="@string/action_edit_contact"/>
android:title="@string/action_edit_contact" />
<item <item
android:id="@+id/action_delete_contact" android:id="@+id/action_delete_contact"
android:icon="@drawable/ic_action_discard"
android:orderInCategory="10" android:orderInCategory="10"
android:showAsAction="always" android:showAsAction="always"
android:icon="@drawable/ic_action_discard" android:title="@string/action_delete_contact"/>
android:title="@string/action_delete_contact" />
<item <item
android:id="@+id/action_accounts" android:id="@+id/action_accounts"
android:orderInCategory="90" android:orderInCategory="90"
android:showAsAction="never" android:showAsAction="never"
android:title="@string/action_accounts" android:title="@string/action_accounts"/>
/>
<item <item
android:id="@+id/action_settings" android:id="@+id/action_settings"
android:orderInCategory="100" android:orderInCategory="100"
android:showAsAction="never" android:showAsAction="never"
android:title="@string/action_settings"/> android:title="@string/action_settings"/>
</menu>
</menu>

29
res/menu/encryption_choices.xml
View file

@ -1,17 +1,16 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" > <menu xmlns:android="http://schemas.android.com/apk/res/android" >
<group android:checkableBehavior="single">
<group android:checkableBehavior="single" >
<item <item
android:id="@+id/encryption_choice_none" android:id="@+id/encryption_choice_none"
android:title="@string/encryption_choice_none" android:title="@string/encryption_choice_none"/>
/> <item
<item android:id="@+id/encryption_choice_otr"
android:id="@+id/encryption_choice_otr" android:title="@string/encryption_choice_otr"/>
android:title="@string/encryption_choice_otr" <item
/> android:id="@+id/encryption_choice_pgp"
<item android:title="@string/encryption_choice_pgp"/>
android:id="@+id/encryption_choice_pgp" </group>
android:title="@string/encryption_choice_pgp"/>
</group> </menu>
</menu>

13
res/menu/manageaccounts.xml
View file

@ -1,12 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" > <menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:id="@+id/action_add_account"
<item
android:id="@+id/action_add_account"
android:icon="@drawable/ic_action_add_person"
android:showAsAction="always" android:showAsAction="always"
android:title="@string/action_add_account" android:title="@string/action_add_account"/>
android:icon="@drawable/ic_action_add_person"/> <item
<item
android:id="@+id/action_settings" android:id="@+id/action_settings"
android:orderInCategory="100" android:orderInCategory="100"
android:showAsAction="never" android:showAsAction="never"
android:title="@string/action_settings"/> android:title="@string/action_settings"/>
</menu>
</menu>

12
res/menu/muc_details.xml
View file

@ -1,21 +1,21 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" > <menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item <item
android:id="@+id/action_edit_subject" android:id="@+id/action_edit_subject"
android:icon="@drawable/ic_action_edit"
android:orderInCategory="10" android:orderInCategory="10"
android:showAsAction="always" android:showAsAction="always"
android:icon="@drawable/ic_action_edit" android:title="@string/action_edit_subject"/>
android:title="@string/action_edit_subject" />
<item <item
android:id="@+id/action_accounts" android:id="@+id/action_accounts"
android:orderInCategory="90" android:orderInCategory="90"
android:showAsAction="never" android:showAsAction="never"
android:title="@string/action_accounts" android:title="@string/action_accounts"/>
/>
<item <item
android:id="@+id/action_settings" android:id="@+id/action_settings"
android:orderInCategory="100" android:orderInCategory="100"
android:showAsAction="never" android:showAsAction="never"
android:title="@string/action_settings"/> android:title="@string/action_settings"/>
</menu>
</menu>

2
res/menu/start_conversation.xml
View file

@ -7,7 +7,6 @@
android:icon="@drawable/ic_action_search" android:icon="@drawable/ic_action_search"
android:showAsAction="collapseActionView|always" android:showAsAction="collapseActionView|always"
android:title="@string/search"/> android:title="@string/search"/>
<item <item
android:id="@+id/action_create_contact" android:id="@+id/action_create_contact"
android:icon="@drawable/ic_action_add_person" android:icon="@drawable/ic_action_add_person"
@ -18,7 +17,6 @@
android:icon="@drawable/ic_action_add_group" android:icon="@drawable/ic_action_add_group"
android:showAsAction="always" android:showAsAction="always"
android:title="@string/join_conference"/> android:title="@string/join_conference"/>
<item <item
android:id="@+id/action_accounts" android:id="@+id/action_accounts"
android:orderInCategory="90" android:orderInCategory="90"

4
res/values-ca/arrays.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string-array name="resources"> <string-array name="resources">
<item>Mòbil</item> <item>Mòbil</item>
<item>Telèfon</item> <item>Telèfon</item>
@ -19,4 +20,5 @@
<item>524288</item> <item>524288</item>
<item>1048576</item> <item>1048576</item>
</string-array> </string-array>
</resources>
</resources>

15
res/values-ca/strings.xml
View file

@ -60,11 +60,11 @@
<string name="encrypted_message_received"><i>Missatge xifrat rebut. Prem per desxifrar i veure-ho.</i></string> <string name="encrypted_message_received"><i>Missatge xifrat rebut. Prem per desxifrar i veure-ho.</i></string>
<string name="encrypted_image_received"><i>Imatge xifrada rebuda. Prem per desxifrar i veure-la.</i></string> <string name="encrypted_image_received"><i>Imatge xifrada rebuda. Prem per desxifrar i veure-la.</i></string>
<string name="image_file"><i>Imatge rebuda. Prem per veure</i></string> <string name="image_file"><i>Imatge rebuda. Prem per veure</i></string>
<string name="pref_xmpp_resource">Recursos XMPP</string> <string name="pref_xmpp_resource">Recursos XMPP</string>
<string name="pref_xmpp_resource_summary">El nom que identifica aquest client amb</string> <string name="pref_xmpp_resource_summary">El nom que identifica aquest client amb</string>
<string name="pref_accept_files">Acceptar fitxers</string> <string name="pref_accept_files">Acceptar fitxers</string>
<string name="pref_accept_files_summary">Accepta fitxers automàticament amb una mida menor a&#8230;</string> <string name="pref_accept_files_summary">Accepta fitxers automàticament amb una mida menor a&#8230;</string>
<string name="pref_notification_settings">Ajustos de notificacions</string> <string name="pref_notification_settings">Ajustos de notificacions</string>
<string name="pref_notifications">Notificacions</string> <string name="pref_notifications">Notificacions</string>
<string name="pref_notifications_summary">Notifica quan arriba un nou missatge</string> <string name="pref_notifications_summary">Notifica quan arriba un nou missatge</string>
<string name="pref_vibrate">Vibra</string> <string name="pref_vibrate">Vibra</string>
@ -77,6 +77,7 @@
<string name="pref_notification_grace_period_summary">Desactiva les notificacions durant un breu termini després de rebre una còpia de missatges carbon</string> <string name="pref_notification_grace_period_summary">Desactiva les notificacions durant un breu termini després de rebre una còpia de missatges carbon</string>
<string name="pref_advanced_options">Opcions avançades</string> <string name="pref_advanced_options">Opcions avançades</string>
<string name="pref_never_send_crash">Mai enviïs informes d\'errors</string> <string name="pref_never_send_crash">Mai enviïs informes d\'errors</string>
<string name="pref_never_send_crash_summary">Enviant traces d\'execució ajudes al futur desenvolupament del Conversations.</string> <string name="pref_never_send_crash_summary">Enviant traces d\'execució ajudes al futur desenvolupament del Conversations.</string>
<string name="pref_ui_options">Opcions de UI</string>
</resources>
</resources>

4
res/values-de/arrays.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string-array name="resources"> <string-array name="resources">
<item>Mobile</item> <item>Mobile</item>
<item>Phone</item> <item>Phone</item>
@ -19,4 +20,5 @@
<item>524288</item> <item>524288</item>
<item>1048576</item> <item>1048576</item>
</string-array> </string-array>
</resources>
</resources>

5
res/values-de/strings.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="app_name">Conversations</string> <string name="app_name">Conversations</string>
<string name="action_settings">Einstellungen</string> <string name="action_settings">Einstellungen</string>
<string name="action_add">Neue Unterhaltung</string> <string name="action_add">Neue Unterhaltung</string>
@ -230,4 +231,6 @@
<string name="server_info_session_established">Aktuelle Sitzung wiederhergestellt</string> <string name="server_info_session_established">Aktuelle Sitzung wiederhergestellt</string>
<string name="additional_information">Zusätzliche Informationen</string> <string name="additional_information">Zusätzliche Informationen</string>
<string name="skip">Überspringen</string> <string name="skip">Überspringen</string>
</resources> <string name="pref_ui_options">Benutzeroberfläche</string>
</resources>

5
res/values-es/arrays.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string-array name="resources"> <string-array name="resources">
<item>Móvil</item> <item>Móvil</item>
<item>Teléfono</item> <item>Teléfono</item>
@ -26,6 +27,7 @@
<item>8 horas</item> <item>8 horas</item>
<item>Hasta nuevo aviso</item> <item>Hasta nuevo aviso</item>
</string-array> </string-array>
<integer-array name="mute_options_durations"> <integer-array name="mute_options_durations">
<item>1800</item> <item>1800</item>
<item>3600</item> <item>3600</item>
@ -33,4 +35,5 @@
<item>28800</item> <item>28800</item>
<item>-1</item> <item>-1</item>
</integer-array> </integer-array>
</resources>
</resources>

3
res/values-es/strings.xml
View file

@ -254,4 +254,5 @@
<string name="pref_expert_options_summary">Por favor, cuidado con estas opciones</string> <string name="pref_expert_options_summary">Por favor, cuidado con estas opciones</string>
<string name="pref_use_larger_font">Incrementar tamaño de fuente</string> <string name="pref_use_larger_font">Incrementar tamaño de fuente</string>
<string name="pref_use_larger_font_summary">Usar fuentes grandes en toda la aplicación</string> <string name="pref_use_larger_font_summary">Usar fuentes grandes en toda la aplicación</string>
</resources>
</resources>

4
res/values-eu/arrays.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string-array name="resources"> <string-array name="resources">
<item>Mugikorra</item> <item>Mugikorra</item>
<item>Telefonoa</item> <item>Telefonoa</item>
@ -19,4 +20,5 @@
<item>524288</item> <item>524288</item>
<item>1048576</item> <item>1048576</item>
</string-array> </string-array>
</resources>
</resources>

3
res/values-eu/strings.xml
View file

@ -230,5 +230,6 @@
<string name="server_info_session_established">Uneko saioa ezarri da</string> <string name="server_info_session_established">Uneko saioa ezarri da</string>
<string name="additional_information">Informazio gehiago</string> <string name="additional_information">Informazio gehiago</string>
<string name="skip">Orain ez</string> <string name="skip">Orain ez</string>
<string name="pref_ui_options">Erabiltzaile-interfazearen aukerak</string>
</resources> </resources>

4
res/values-fr/arrays.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string-array name="resources"> <string-array name="resources">
<item>Mobile</item> <item>Mobile</item>
<item>Téléphone</item> <item>Téléphone</item>
@ -19,4 +20,5 @@
<item>524288</item> <item>524288</item>
<item>1048576</item> <item>1048576</item>
</string-array> </string-array>
</resources>
</resources>

3
res/values-fr/strings.xml
View file

@ -207,5 +207,6 @@
<string name="contact_added_you">Votre correspondant vous a ajouté dans sa liste de contacts</string> <string name="contact_added_you">Votre correspondant vous a ajouté dans sa liste de contacts</string>
<string name="add_back">Ajouter également</string> <string name="add_back">Ajouter également</string>
<string name="contact_has_read_up_to_this_point">%s a lu les messages précédents.</string> <string name="contact_has_read_up_to_this_point">%s a lu les messages précédents.</string>
<string name="pref_ui_options">Options d\'affichage</string>
</resources> </resources>

4
res/values-gl/arrays.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string-array name="resources"> <string-array name="resources">
<item>Móvil</item> <item>Móvil</item>
<item>Teléfono</item> <item>Teléfono</item>
@ -19,4 +20,5 @@
<item>524288</item> <item>524288</item>
<item>1048576</item> <item>1048576</item>
</string-array> </string-array>
</resources>
</resources>

8
res/values-gl/strings.xml
View file

@ -66,9 +66,9 @@
<string name="image_file"><i>Imaxe recibida. Pulsa para ver</i></string> <string name="image_file"><i>Imaxe recibida. Pulsa para ver</i></string>
<string name="pref_xmpp_resource">Recurso</string> <string name="pref_xmpp_resource">Recurso</string>
<string name="pref_xmpp_resource_summary">O nome que identifica o cliente que estás a empregar</string> <string name="pref_xmpp_resource_summary">O nome que identifica o cliente que estás a empregar</string>
<string name="pref_accept_files">Aceptar arquivos</string> <string name="pref_accept_files">Aceptar arquivos</string>
<string name="pref_accept_files_summary">De forma automática aceptar arquivos menores de&#8230;</string> <string name="pref_accept_files_summary">De forma automática aceptar arquivos menores de&#8230;</string>
<string name="pref_notification_settings">Axustes de notificación</string> <string name="pref_notification_settings">Axustes de notificación</string>
<string name="pref_notifications">Notificacións</string> <string name="pref_notifications">Notificacións</string>
<string name="pref_notifications_summary">Notifica cuando chega unha nova mensaxe</string> <string name="pref_notifications_summary">Notifica cuando chega unha nova mensaxe</string>
<string name="pref_vibrate">Tremer</string> <string name="pref_vibrate">Tremer</string>
@ -125,4 +125,6 @@
<string name="save">Gardar</string> <string name="save">Gardar</string>
<string name="passwords_do_not_match">As contrasinais non coinciden</string> <string name="passwords_do_not_match">As contrasinais non coinciden</string>
<string name="invalid_jid">O identificador non é un identificador de Jabber válido</string> <string name="invalid_jid">O identificador non é un identificador de Jabber válido</string>
</resources> <string name="pref_ui_options">Opcións de interfaz</string>
</resources>

4
res/values-he/arrays.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string-array name="resources"> <string-array name="resources">
<item>נייד</item> <item>נייד</item>
<item>טלפון</item> <item>טלפון</item>
@ -19,4 +20,5 @@
<item>524288</item> <item>524288</item>
<item>1048576</item> <item>1048576</item>
</string-array> </string-array>
</resources>
</resources>

4
res/values-he/strings.xml
View file

@ -219,4 +219,6 @@
<string name="private_message">בפרטי</string> <string name="private_message">בפרטי</string>
<string name="private_message_to">בפרטי אל %s</string> <string name="private_message_to">בפרטי אל %s</string>
<string name="send_private_message_to">שלח הודעה פרטית אל %s</string> <string name="send_private_message_to">שלח הודעה פרטית אל %s</string>
</resources> <string name="pref_ui_options">אפשרויות ממשק משתמש</string>
</resources>

4
res/values-nl/arrays.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string-array name="resources"> <string-array name="resources">
<item>Mobiel</item> <item>Mobiel</item>
<item>Telefoon</item> <item>Telefoon</item>
@ -19,4 +20,5 @@
<item>524288</item> <item>524288</item>
<item>1048576</item> <item>1048576</item>
</string-array> </string-array>
</resources>
</resources>

7
res/values-nl/strings.xml
View file

@ -153,7 +153,7 @@
<string name="confirm_password">Bevestig wachtwoord</string> <string name="confirm_password">Bevestig wachtwoord</string>
<string name="passwords_do_not_match">Wachtwoorden komen niet overeen</string> <string name="passwords_do_not_match">Wachtwoorden komen niet overeen</string>
<string name="invalid_jid">Dit is geen geldig Jabber ID</string> <string name="invalid_jid">Dit is geen geldig Jabber ID</string>
<string name="error_out_of_memory">Geen geheugen beschikbaar. Afbeelding is te groot</string> <string name="error_out_of_memory">Geen geheugen beschikbaar. Afbeelding is te groot</string>
<string name="add_phone_book_text">Wilt U %s toevoegen aan de contactenlijst op uw telefoon?</string> <string name="add_phone_book_text">Wilt U %s toevoegen aan de contactenlijst op uw telefoon?</string>
<string name="contact_status_online">online</string> <string name="contact_status_online">online</string>
<string name="contact_status_free_to_chat">beschikbaar</string> <string name="contact_status_free_to_chat">beschikbaar</string>
@ -178,7 +178,6 @@
<string name="unknown_otr_fingerprint">Onbekende OTR vingerafdruk</string> <string name="unknown_otr_fingerprint">Onbekende OTR vingerafdruk</string>
<string name="openpgp_messages_found">OpenPGP encrypted messages found</string> <string name="openpgp_messages_found">OpenPGP encrypted messages found</string>
<string name="reception_failed">Ontvangen mislukt</string> <string name="reception_failed">Ontvangen mislukt</string>
<string name="join_conference">Aan groepsconversatie deelnemen</string> <string name="join_conference">Aan groepsconversatie deelnemen</string>
<string name="invite_contact">Contact uitnodigen</string> <string name="invite_contact">Contact uitnodigen</string>
<string name="your_fingerprint">Uw vingerafdruk</string> <string name="your_fingerprint">Uw vingerafdruk</string>
@ -229,4 +228,6 @@
<string name="server_info_session_established">Huidige sessie opgezet</string> <string name="server_info_session_established">Huidige sessie opgezet</string>
<string name="or_long_press_for_default">(Of houdt lang ingedrukt om de oorspronkelijke terug te zetten)</string> <string name="or_long_press_for_default">(Of houdt lang ingedrukt om de oorspronkelijke terug te zetten)</string>
<string name="server_info_available">beschikbaar</string> <string name="server_info_available">beschikbaar</string>
</resources> <string name="pref_ui_options">UI Opties</string>
</resources>

4
res/values-ru/arrays.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string-array name="resources"> <string-array name="resources">
<item>Мобильный</item> <item>Мобильный</item>
<item>Телефон</item> <item>Телефон</item>
@ -19,4 +20,5 @@
<item>524288</item> <item>524288</item>
<item>1048576</item> <item>1048576</item>
</string-array> </string-array>
</resources>
</resources>

3
res/values-ru/strings.xml
View file

@ -229,5 +229,6 @@
<string name="save_as_bookmark">Сохранить закладку</string> <string name="save_as_bookmark">Сохранить закладку</string>
<string name="delete_bookmark">Удалить закладку</string> <string name="delete_bookmark">Удалить закладку</string>
<string name="bookmark_already_exists">Такая закладка уже существует</string> <string name="bookmark_already_exists">Такая закладка уже существует</string>
<string name="pref_ui_options">Параметры интерфейса</string>
</resources> </resources>

4
res/values-sv/arrays.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string-array name="resources"> <string-array name="resources">
<item>Mobile</item> <item>Mobile</item>
<item>Phone</item> <item>Phone</item>
@ -19,4 +20,5 @@
<item>524288</item> <item>524288</item>
<item>1048576</item> <item>1048576</item>
</string-array> </string-array>
</resources>
</resources>

3
res/values-sv/strings.xml
View file

@ -231,5 +231,6 @@
<string name="pref_general">Generellt</string> <string name="pref_general">Generellt</string>
<string name="publish">Publicera</string> <string name="publish">Publicera</string>
<string name="private_message">privat meddelande</string> <string name="private_message">privat meddelande</string>
<string name="pref_ui_options">UI inställningar</string>
</resources> </resources>

5
res/values/arrays.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string-array name="resources"> <string-array name="resources">
<item>Mobile</item> <item>Mobile</item>
<item>Phone</item> <item>Phone</item>
@ -26,6 +27,7 @@
<item>8 hours</item> <item>8 hours</item>
<item>until further notice</item> <item>until further notice</item>
</string-array> </string-array>
<integer-array name="mute_options_durations"> <integer-array name="mute_options_durations">
<item>1800</item> <item>1800</item>
<item>3600</item> <item>3600</item>
@ -33,4 +35,5 @@
<item>28800</item> <item>28800</item>
<item>-1</item> <item>-1</item>
</integer-array> </integer-array>
</resources>
</resources>

10
res/values/attrs.xml
View file

@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<attr name="TextSizeInfo" format="dimension"/>
<attr name="TextSizeBody" format="dimension"/> <attr name="TextSizeInfo" format="dimension" />
<attr name="TextSizeHeadline" format="dimension"/> <attr name="TextSizeBody" format="dimension" />
</resources> <attr name="TextSizeHeadline" format="dimension" />
</resources>

6
res/values/themes.xml
View file

@ -9,7 +9,7 @@
<item name="TextSizeBody">14sp</item> <item name="TextSizeBody">14sp</item>
<item name="TextSizeHeadline">20sp</item> <item name="TextSizeHeadline">20sp</item>
</style> </style>
<style name="ConversationsTheme.LargerText" parent="ConversationsTheme"> <style name="ConversationsTheme.LargerText" parent="ConversationsTheme">
<item name="TextSizeInfo">14sp</item> <item name="TextSizeInfo">14sp</item>
<item name="TextSizeBody">16sp</item> <item name="TextSizeBody">16sp</item>
@ -27,9 +27,9 @@
<item name="android:popupMenuStyle">@android:style/Widget.Holo.Light.PopupMenu</item> <item name="android:popupMenuStyle">@android:style/Widget.Holo.Light.PopupMenu</item>
<item name="android:dropDownListViewStyle">@android:style/Widget.Holo.Light.ListView.DropDown</item> <item name="android:dropDownListViewStyle">@android:style/Widget.Holo.Light.ListView.DropDown</item>
</style> </style>
<style name="ConversationsActionBarTabs" parent="@android:style/Widget.Holo.ActionBar.TabView"> <style name="ConversationsActionBarTabs" parent="@android:style/Widget.Holo.ActionBar.TabView">
<item name="android:background">@drawable/actionbar_tab_indicator</item> <item name="android:background">@drawable/actionbar_tab_indicator</item>
</style> </style>
</resources> </resources>