diff options
Diffstat (limited to '')
87 files changed, 1697 insertions, 1642 deletions
diff --git a/src/main/res/drawable/actionbar_tab_indicator.xml b/src/main/res/drawable/actionbar_tab_indicator.xml index 5598ee424..ffd36f6fe 100644 --- a/src/main/res/drawable/actionbar_tab_indicator.xml +++ b/src/main/res/drawable/actionbar_tab_indicator.xml @@ -2,20 +2,20 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <!-- Non focused states --> - <item android:drawable="@android:color/transparent" android:state_focused="false" android:state_pressed="false" android:state_selected="false"/> - <item android:drawable="@drawable/tab_selected_conversations" android:state_focused="false" android:state_pressed="false" android:state_selected="true"/> + <item android:drawable="@android:color/transparent" android:state_focused="false" android:state_pressed="false" android:state_selected="false" /> + <item android:drawable="@drawable/tab_selected_conversations" android:state_focused="false" android:state_pressed="false" android:state_selected="true" /> <!-- Focused states --> - <item android:drawable="@drawable/tab_unselected_focused_conversations" android:state_focused="true" android:state_pressed="false" android:state_selected="false"/> - <item android:drawable="@drawable/tab_selected_focused_conversations" android:state_focused="true" android:state_pressed="false" android:state_selected="true"/> + <item android:drawable="@drawable/tab_unselected_focused_conversations" android:state_focused="true" android:state_pressed="false" android:state_selected="false" /> + <item android:drawable="@drawable/tab_selected_focused_conversations" android:state_focused="true" android:state_pressed="false" android:state_selected="true" /> <!-- Pressed --> <!-- Non focused states --> - <item android:drawable="@drawable/tab_unselected_pressed_conversations" android:state_focused="false" android:state_pressed="true" android:state_selected="false"/> - <item android:drawable="@drawable/tab_selected_pressed_conversations" android:state_focused="false" android:state_pressed="true" android:state_selected="true"/> + <item android:drawable="@drawable/tab_unselected_pressed_conversations" android:state_focused="false" android:state_pressed="true" android:state_selected="false" /> + <item android:drawable="@drawable/tab_selected_pressed_conversations" android:state_focused="false" android:state_pressed="true" android:state_selected="true" /> <!-- Focused states --> - <item android:drawable="@drawable/tab_unselected_pressed_conversations" android:state_focused="true" android:state_pressed="true" android:state_selected="false"/> - <item android:drawable="@drawable/tab_selected_pressed_conversations" android:state_focused="true" android:state_pressed="true" android:state_selected="true"/> + <item android:drawable="@drawable/tab_unselected_pressed_conversations" android:state_focused="true" android:state_pressed="true" android:state_selected="false" /> + <item android:drawable="@drawable/tab_selected_pressed_conversations" android:state_focused="true" android:state_pressed="true" android:state_selected="true" /> </selector>
\ No newline at end of file diff --git a/src/main/res/drawable/es_slidingpane_shadow.xml b/src/main/res/drawable/es_slidingpane_shadow.xml index de96e08f4..b9aaf908b 100644 --- a/src/main/res/drawable/es_slidingpane_shadow.xml +++ b/src/main/res/drawable/es_slidingpane_shadow.xml @@ -1,5 +1,5 @@ <?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/black12" diff --git a/src/main/res/drawable/grey.xml b/src/main/res/drawable/grey.xml index 26986dbe2..9354f095d 100644 --- a/src/main/res/drawable/grey.xml +++ b/src/main/res/drawable/grey.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle" > + android:shape="rectangle"> <solid android:color="@color/black12" /> diff --git a/src/main/res/drawable/greybackground.xml b/src/main/res/drawable/greybackground.xml index bedc4b17a..f820cf318 100644 --- a/src/main/res/drawable/greybackground.xml +++ b/src/main/res/drawable/greybackground.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@drawable/grey" android:state_pressed="true"/> + <item android:drawable="@drawable/grey" android:state_pressed="true" /> </selector>
\ No newline at end of file diff --git a/src/main/res/drawable/infocard_border.xml b/src/main/res/drawable/infocard_border.xml index baf60602f..ff3ec366a 100644 --- a/src/main/res/drawable/infocard_border.xml +++ b/src/main/res/drawable/infocard_border.xml @@ -1,5 +1,5 @@ <?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/grey50" /> @@ -7,9 +7,8 @@ <stroke android:width="0.5dp" - android:color="@color/black12" > - </stroke> - + android:color="@color/black12"></stroke> + <padding android:bottom="0dp" android:left="0dp" diff --git a/src/main/res/drawable/message_border.xml b/src/main/res/drawable/message_border.xml index e80f50cd5..73c7a6716 100644 --- a/src/main/res/drawable/message_border.xml +++ b/src/main/res/drawable/message_border.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle" > + android:shape="rectangle"> <corners android:radius="5dp" /> diff --git a/src/main/res/drawable/snackbar.xml b/src/main/res/drawable/snackbar.xml index 2645b1362..a250a1bd6 100644 --- a/src/main/res/drawable/snackbar.xml +++ b/src/main/res/drawable/snackbar.xml @@ -1,5 +1,5 @@ <?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/grey800" /> diff --git a/src/main/res/drawable/switch_back_off.xml b/src/main/res/drawable/switch_back_off.xml index 20d2fb146..9082347b2 100644 --- a/src/main/res/drawable/switch_back_off.xml +++ b/src/main/res/drawable/switch_back_off.xml @@ -1,15 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_enabled="false"><shape android:shape="rectangle"> + <item android:state_enabled="false"> + <shape android:shape="rectangle"> <solid android:color="#D5D5D5" /> <corners android:radius="99dp" /> - </shape></item> - <item android:state_enabled="true"><shape android:shape="rectangle"> + </shape> + </item> + <item android:state_enabled="true"> + <shape android:shape="rectangle"> <solid android:color="#939393" /> <corners android:radius="99dp" /> - </shape></item> + </shape> + </item> </selector>
\ No newline at end of file diff --git a/src/main/res/drawable/switch_back_on.xml b/src/main/res/drawable/switch_back_on.xml index 45117a98e..ae78edecc 100644 --- a/src/main/res/drawable/switch_back_on.xml +++ b/src/main/res/drawable/switch_back_on.xml @@ -2,15 +2,15 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_enabled="false"> <shape android:shape="rectangle"> - <solid android:color="#D5D5D5"/> - <corners android:radius="99dp"/> + <solid android:color="#D5D5D5" /> + <corners android:radius="99dp" /> </shape> </item> <item android:state_enabled="true"> <shape android:shape="rectangle"> <!-- 30% accent on white --> - <solid android:color="#b3ddf7"/> - <corners android:radius="99dp"/> + <solid android:color="#b3ddf7" /> + <corners android:radius="99dp" /> </shape> </item> </selector>
\ No newline at end of file diff --git a/src/main/res/drawable/switch_thumb.xml b/src/main/res/drawable/switch_thumb.xml index ba3d1c456..da33e46c3 100644 --- a/src/main/res/drawable/switch_thumb.xml +++ b/src/main/res/drawable/switch_thumb.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@drawable/switch_thumb_disable" android:state_enabled="false"/> - <item android:drawable="@drawable/switch_thumb_on_pressed" android:state_checked="true" android:state_pressed="true"/> - <item android:drawable="@drawable/switch_thumb_on_pressed" android:state_checked="true" android:state_focused="true"/> - <item android:drawable="@drawable/switch_thumb_on_normal" android:state_checked="true"/> - <item android:drawable="@drawable/switch_thumb_off_pressed" android:state_checked="false" android:state_pressed="true"/> - <item android:drawable="@drawable/switch_thumb_off_pressed" android:state_checked="false" android:state_focused="true"/> - <item android:drawable="@drawable/switch_thumb_off_normal" android:state_checked="false"/> + <item android:drawable="@drawable/switch_thumb_disable" android:state_enabled="false" /> + <item android:drawable="@drawable/switch_thumb_on_pressed" android:state_checked="true" android:state_pressed="true" /> + <item android:drawable="@drawable/switch_thumb_on_pressed" android:state_checked="true" android:state_focused="true" /> + <item android:drawable="@drawable/switch_thumb_on_normal" android:state_checked="true" /> + <item android:drawable="@drawable/switch_thumb_off_pressed" android:state_checked="false" android:state_pressed="true" /> + <item android:drawable="@drawable/switch_thumb_off_pressed" android:state_checked="false" android:state_focused="true" /> + <item android:drawable="@drawable/switch_thumb_off_normal" android:state_checked="false" /> </selector>
\ No newline at end of file diff --git a/src/main/res/layout-w945dp/fragment_conversations_overview.xml b/src/main/res/layout-w945dp/fragment_conversations_overview.xml index 7ae1788d7..c6cc7d7c2 100644 --- a/src/main/res/layout-w945dp/fragment_conversations_overview.xml +++ b/src/main/res/layout-w945dp/fragment_conversations_overview.xml @@ -10,7 +10,7 @@ android:layout_height="match_parent" android:layout_weight="1" android:background="@color/grey50" - android:orientation="vertical" > + android:orientation="vertical"> <de.timroes.android.listview.EnhancedListView android:id="@+id/list" @@ -26,7 +26,6 @@ android:layout_width="0dp" android:layout_weight="2" android:layout_height="match_parent" - android:orientation="vertical" > - </LinearLayout> + android:orientation="vertical"></LinearLayout> </LinearLayout>
\ No newline at end of file diff --git a/src/main/res/layout/ab_title.xml b/src/main/res/layout/ab_title.xml index 1143ad798..2886a4716 100644 --- a/src/main/res/layout/ab_title.xml +++ b/src/main/res/layout/ab_title.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" android:layout_width="match_parent" + android:orientation="vertical" + android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="start|center_vertical"> @@ -17,6 +18,7 @@ android:clickable="true" android:onClick="onClick" android:paddingTop="1dp" /> + <github.ankushsachdeva.emojicon.EmojiconTextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/text2" style="@style/Base.TextAppearance.AppCompat.Widget.ActionBar.Subtitle" diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml index fbb05a274..b953b6d31 100644 --- a/src/main/res/layout/account_row.xml +++ b/src/main/res/layout/account_row.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="?android:attr/activatedBackgroundIndicator" - android:paddingLeft="8dp" - android:paddingBottom="8dp" - android:paddingTop="8dp"> + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="?android:attr/activatedBackgroundIndicator" + android:paddingLeft="8dp" + android:paddingBottom="8dp" + android:paddingTop="8dp"> <com.makeramen.roundedimageview.RoundedImageView android:id="@+id/account_image" diff --git a/src/main/res/layout/actionview_search.xml b/src/main/res/layout/actionview_search.xml index 50becfc68..64588959c 100644 --- a/src/main/res/layout/actionview_search.xml +++ b/src/main/res/layout/actionview_search.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:addStatesFromChildren="true" android:focusable="true" android:gravity="center" android:paddingLeft="5dp" - android:paddingRight="5dp" > + android:paddingRight="5dp"> <EditText android:id="@+id/search_field" @@ -17,6 +17,6 @@ android:imeOptions="actionSearch" android:textColor="@color/white" android:textColorHint="@color/white70" - android:hint="@string/search_for_contacts_or_groups"/> + android:hint="@string/search_for_contacts_or_groups" /> </RelativeLayout>
\ No newline at end of file diff --git a/src/main/res/layout/activity_about.xml b/src/main/res/layout/activity_about.xml index 47204b430..2d9f9a691 100644 --- a/src/main/res/layout/activity_about.xml +++ b/src/main/res/layout/activity_about.xml @@ -18,5 +18,5 @@ android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" android:typeface="monospace" - android:fontFamily="monospace"/> + android:fontFamily="monospace" /> </ScrollView> diff --git a/src/main/res/layout/activity_change_password.xml b/src/main/res/layout/activity_change_password.xml index 6fb1d0131..8808227e3 100644 --- a/src/main/res/layout/activity_change_password.xml +++ b/src/main/res/layout/activity_change_password.xml @@ -1,110 +1,111 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@color/grey200"> + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/grey200"> - <ScrollView - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_above="@+id/button_bar"> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/activity_horizontal_margin" - android:layout_marginRight="@dimen/activity_horizontal_margin" - android:layout_marginTop="@dimen/activity_vertical_margin" - android:layout_marginBottom="@dimen/activity_vertical_margin" - android:background="@drawable/infocard_border" - android:padding="@dimen/infocard_padding" - android:orientation="vertical"> + <ScrollView + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_above="@+id/button_bar"> - <TextView - android:id="@+id/current_password_label" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/current_password" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody"/> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" + android:background="@drawable/infocard_border" + android:padding="@dimen/infocard_padding" + android:orientation="vertical"> - <EditText - android:id="@+id/current_password" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="8dp" - android:hint="@string/password" - android:inputType="textPassword" - android:textColor="@color/black87" - android:textColorHint="@color/black54" - android:textSize="?attr/TextSizeBody"/> + <TextView + android:id="@+id/current_password_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/current_password" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/new_password" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody"/> + <EditText + android:id="@+id/current_password" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="8dp" + android:hint="@string/password" + android:inputType="textPassword" + android:textColor="@color/black87" + android:textColorHint="@color/black54" + android:textSize="?attr/TextSizeBody" /> - <EditText - android:id="@+id/new_password" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="8dp" - android:hint="@string/password" - android:inputType="textPassword" - android:textColor="@color/black87" - android:textColorHint="@color/black54" - android:textSize="?attr/TextSizeBody"/> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/new_password" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/account_settings_confirm_password" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody"/> + <EditText + android:id="@+id/new_password" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="8dp" + android:hint="@string/password" + android:inputType="textPassword" + android:textColor="@color/black87" + android:textColorHint="@color/black54" + android:textSize="?attr/TextSizeBody" /> - <EditText - android:id="@+id/new_password_confirm" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:hint="@string/password" - android:inputType="textPassword" - android:textColor="@color/black87" - android:textColorHint="@color/black54" - android:textSize="?attr/TextSizeBody"/> - </LinearLayout> - </ScrollView> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/account_settings_confirm_password" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" /> + + <EditText + android:id="@+id/new_password_confirm" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/password" + android:inputType="textPassword" + android:textColor="@color/black87" + android:textColorHint="@color/black54" + android:textSize="?attr/TextSizeBody" /> + </LinearLayout> + </ScrollView> - <LinearLayout - android:id="@+id/button_bar" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_alignParentLeft="true" - android:layout_alignParentRight="true"> + <LinearLayout + android:id="@+id/button_bar" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:layout_alignParentLeft="true" + android:layout_alignParentRight="true"> - <Button - android:id="@+id/left_button" - style="?android:attr/borderlessButtonStyle" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="@string/cancel"/> + <Button + android:id="@+id/left_button" + style="?android:attr/borderlessButtonStyle" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/cancel" /> - <View - android:layout_width="1dp" - android:layout_height="fill_parent" - android:layout_marginBottom="7dp" - android:layout_marginTop="7dp" - android:background="@color/black12"/> + <View + android:layout_width="1dp" + android:layout_height="fill_parent" + android:layout_marginBottom="7dp" + android:layout_marginTop="7dp" + android:background="@color/black12" /> - <Button - android:id="@+id/right_button" - style="?android:attr/borderlessButtonStyle" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="@string/change_password"/> - </LinearLayout> + <Button + android:id="@+id/right_button" + style="?android:attr/borderlessButtonStyle" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/change_password" /> + </LinearLayout> </RelativeLayout>
\ No newline at end of file diff --git a/src/main/res/layout/activity_choose_contact.xml b/src/main/res/layout/activity_choose_contact.xml index 248a7822c..66e416de5 100644 --- a/src/main/res/layout/activity_choose_contact.xml +++ b/src/main/res/layout/activity_choose_contact.xml @@ -2,7 +2,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent" > + android:layout_height="match_parent"> <ListView android:id="@+id/choose_contact_list" diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml index eb479b96b..ca641886e 100644 --- a/src/main/res/layout/activity_contact_details.xml +++ b/src/main/res/layout/activity_contact_details.xml @@ -2,13 +2,13 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:background="@color/grey200" > + android:background="@color/grey200"> <LinearLayout android:id="@+id/details_main_layout" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:orientation="vertical" > + android:orientation="vertical"> <RelativeLayout android:layout_width="fill_parent" @@ -18,7 +18,7 @@ android:layout_marginTop="@dimen/activity_vertical_margin" android:layout_marginBottom="@dimen/activity_vertical_margin" android:background="@drawable/infocard_border" - android:padding="@dimen/infocard_padding" > + android:padding="@dimen/infocard_padding"> <QuickContactBadge android:id="@+id/details_contact_badge" @@ -64,8 +64,7 @@ android:layout_marginLeft="-2dp" android:layout_marginBottom="4dp" android:orientation="horizontal" - android:layout_gravity="center_horizontal"> - </com.wefika.flowlayout.FlowLayout> + android:layout_gravity="center_horizontal"></com.wefika.flowlayout.FlowLayout> <TextView android:id="@+id/details_lastseen" @@ -109,7 +108,7 @@ android:layout_marginTop="@dimen/activity_vertical_margin" android:layout_marginBottom="@dimen/activity_vertical_margin" android:background="@drawable/infocard_border" - android:padding="@dimen/infocard_padding" > + android:padding="@dimen/infocard_padding"> <Button android:id="@+id/add_contact_button" @@ -156,8 +155,7 @@ android:divider="?android:dividerHorizontal" android:orientation="vertical" android:padding="@dimen/infocard_padding" - android:showDividers="middle" > - </LinearLayout> + android:showDividers="middle"></LinearLayout> </LinearLayout> </ScrollView> diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml index 808834d22..7747055ec 100644 --- a/src/main/res/layout/activity_edit_account.xml +++ b/src/main/res/layout/activity_edit_account.xml @@ -189,6 +189,7 @@ android:orientation="vertical" android:padding="@dimen/infocard_padding" android:visibility="gone"> + <TextView android:id="@+id/os_optimization_headline" android:layout_width="wrap_content" @@ -196,7 +197,8 @@ android:text="@string/battery_optimizations_enabled" android:textColor="@color/black87" android:textSize="?attr/TextSizeHeadline" - android:textStyle="bold"/> + android:textStyle="bold" /> + <TextView android:id="@+id/os_optimization_body" android:layout_width="wrap_content" @@ -206,7 +208,8 @@ android:layout_marginTop="8dp" android:text="@string/battery_optimizations_enabled_explained" android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> + <Button android:id="@+id/os_optimization_disable" style="?android:attr/borderlessButtonStyle" @@ -215,9 +218,10 @@ android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" android:layout_below="@+id/os_optimization_body" + android:layout_alignParentRight="true" + android:layout_below="@+id/os_optimization_body" android:text="@string/disable" - android:textColor="@color/accent"/> + android:textColor="@color/accent" /> </RelativeLayout> <LinearLayout @@ -251,7 +255,7 @@ android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" android:singleLine="true" - android:ellipsize="end"/> + android:ellipsize="end" /> <TextView android:id="@+id/session_est" @@ -285,7 +289,7 @@ android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" android:singleLine="true" - android:ellipsize="end"/> + android:ellipsize="end" /> <TextView android:id="@+id/server_info_pep" @@ -309,7 +313,7 @@ android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" android:singleLine="true" - android:ellipsize="end"/> + android:ellipsize="end" /> <TextView android:id="@+id/server_info_blocking" @@ -333,7 +337,7 @@ android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" android:singleLine="true" - android:ellipsize="end"/> + android:ellipsize="end" /> <TextView android:id="@+id/server_info_sm" @@ -357,7 +361,7 @@ android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" android:singleLine="true" - android:ellipsize="end"/> + android:ellipsize="end" /> <TextView android:id="@+id/server_info_roster_version" @@ -381,7 +385,7 @@ android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" android:singleLine="true" - android:ellipsize="end"/> + android:ellipsize="end" /> <TextView android:id="@+id/server_info_carbons" @@ -405,7 +409,7 @@ android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" android:singleLine="true" - android:ellipsize="end"/> + android:ellipsize="end" /> <TextView android:id="@+id/server_info_mam" @@ -429,7 +433,7 @@ android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" android:singleLine="true" - android:ellipsize="end"/> + android:ellipsize="end" /> <TextView android:id="@+id/server_info_csi" @@ -454,7 +458,7 @@ android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" android:singleLine="true" - android:ellipsize="end"/> + android:ellipsize="end" /> <TextView android:id="@+id/server_info_push" @@ -463,8 +467,9 @@ android:layout_gravity="right" android:textColor="@color/black87" android:paddingLeft="4dp" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> </TableRow> + <TableRow android:layout_width="fill_parent" android:layout_height="wrap_content"> @@ -476,7 +481,7 @@ android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" android:singleLine="true" - android:ellipsize="end"/> + android:ellipsize="end" /> <TextView android:id="@+id/server_info_http_upload" @@ -485,7 +490,7 @@ android:layout_gravity="right" android:textColor="@color/black87" android:paddingLeft="4dp" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> </TableRow> </TableLayout> @@ -624,8 +629,7 @@ android:layout_height="wrap_content" android:divider="?android:dividerHorizontal" android:orientation="vertical" - android:showDividers="middle"> - </LinearLayout> + android:showDividers="middle"></LinearLayout> </LinearLayout> </LinearLayout> </ScrollView> @@ -647,14 +651,14 @@ android:layout_height="wrap_content" android:layout_weight="1" android:text="@string/cancel" - android:textColor="@color/black87"/> + android:textColor="@color/black87" /> <View android:layout_width="1dp" android:layout_height="fill_parent" android:layout_marginBottom="7dp" android:layout_marginTop="7dp" - android:background="@color/black12"/> + android:background="@color/black12" /> <Button android:id="@+id/save_button" @@ -664,7 +668,7 @@ android:layout_weight="1" android:enabled="false" android:text="@string/save" - android:textColor="@color/black54"/> + android:textColor="@color/black54" /> </LinearLayout> </RelativeLayout>
\ No newline at end of file diff --git a/src/main/res/layout/activity_fullscreen_message.xml b/src/main/res/layout/activity_fullscreen_message.xml index 69e6f3d6a..a4d30f902 100644 --- a/src/main/res/layout/activity_fullscreen_message.xml +++ b/src/main/res/layout/activity_fullscreen_message.xml @@ -7,8 +7,7 @@ <include android:id="@+id/toolbar" - layout="@layout/tool_bar"> - </include> + layout="@layout/tool_bar"></include> <uk.co.senab.photoview.PhotoView android:id="@id/message_image_view" diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml index df7737ea0..1fce6b608 100644 --- a/src/main/res/layout/activity_muc_details.xml +++ b/src/main/res/layout/activity_muc_details.xml @@ -51,30 +51,31 @@ </RelativeLayout> <RelativeLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content"> - <TextView - android:id="@+id/notification_status_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/notify_on_all_messages" - android:layout_centerVertical="true" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" - android:layout_alignParentLeft="true" - android:layout_toLeftOf="@+id/notification_status_button" - /> - <ImageButton - android:id="@+id/notification_status_button" - style="?android:attr/buttonStyleSmall" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:layout_alignParentRight="true" - android:layout_centerVertical="true" - android:background="?android:selectableItemBackground" - android:padding="@dimen/image_button_padding" - android:src="@drawable/ic_notifications_grey600_24dp"/> + android:layout_width="fill_parent" + android:layout_height="wrap_content"> + + <TextView + android:id="@+id/notification_status_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/notify_on_all_messages" + android:layout_centerVertical="true" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" + android:layout_alignParentLeft="true" + android:layout_toLeftOf="@+id/notification_status_button" /> + + <ImageButton + android:id="@+id/notification_status_button" + style="?android:attr/buttonStyleSmall" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + android:background="?android:selectableItemBackground" + android:padding="@dimen/image_button_padding" + android:src="@drawable/ic_notifications_grey600_24dp" /> </RelativeLayout> <TextView @@ -129,7 +130,7 @@ android:padding="1dp" android:src="@drawable/ic_profile" app:riv_corner_radius="5dp" - android:layout_alignParentRight="false"/> + android:layout_alignParentRight="false" /> <LinearLayout android:layout_width="fill_parent" @@ -174,8 +175,7 @@ android:layout_weight="1" android:divider="?android:dividerHorizontal" android:orientation="vertical" - android:showDividers="middle"> - </LinearLayout> + android:showDividers="middle"></LinearLayout> <Button android:id="@+id/invite" @@ -188,52 +188,52 @@ </LinearLayout> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/activity_vertical_margin" - android:layout_marginLeft="@dimen/activity_horizontal_margin" - android:layout_marginRight="@dimen/activity_horizontal_margin" - android:layout_marginTop="@dimen/activity_vertical_margin" - android:background="@drawable/infocard_border" - android:orientation="vertical" - android:padding="@dimen/infocard_padding" - android:id="@+id/muc_info_more" - android:shrinkColumns="0" - android:stretchColumns="1" - android:visibility="gone"> - - - <TableLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:stretchColumns="1"> - - <TableRow - android:layout_width="fill_parent" - android:layout_height="match_parent"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/server_info_mam" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" - android:singleLine="true" - android:ellipsize="end" /> - - <TextView - android:id="@+id/muc_info_mam" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="right" - android:paddingLeft="4dp" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" /> - </TableRow> - - </TableLayout> - </LinearLayout> + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="@dimen/activity_vertical_margin" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:background="@drawable/infocard_border" + android:orientation="vertical" + android:padding="@dimen/infocard_padding" + android:id="@+id/muc_info_more" + android:shrinkColumns="0" + android:stretchColumns="1" + android:visibility="gone"> + + + <TableLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:stretchColumns="1"> + + <TableRow + android:layout_width="fill_parent" + android:layout_height="match_parent"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/server_info_mam" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" + android:singleLine="true" + android:ellipsize="end" /> + + <TextView + android:id="@+id/muc_info_mam" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:paddingLeft="4dp" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" /> + </TableRow> + + </TableLayout> + </LinearLayout> </LinearLayout> </ScrollView>
\ No newline at end of file diff --git a/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml index 8690509e9..7051233b5 100644 --- a/src/main/res/layout/activity_publish_profile_picture.xml +++ b/src/main/res/layout/activity_publish_profile_picture.xml @@ -4,116 +4,119 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/grey200"> + <ScrollView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_above="@+id/button_bar" - android:layout_alignParentTop="true" > - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:gravity="center_horizontal"> + android:layout_alignParentTop="true"> <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_above="@+id/button_bar" - android:layout_alignParentLeft="true" - android:layout_alignParentRight="true" - android:layout_below="@+id/secondary_hint" - android:gravity="center_vertical" - android:orientation="vertical" - android:layout_marginRight="@dimen/activity_horizontal_margin" - android:layout_marginLeft="@dimen/activity_horizontal_margin" - android:layout_marginTop="@dimen/activity_vertical_margin" - android:layout_marginBottom="@dimen/activity_vertical_margin" - android:background="@drawable/infocard_border" - android:padding="@dimen/infocard_padding"> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:gravity="center_horizontal"> <LinearLayout - android:id="@+id/account_image_wrapper" - android:layout_width="wrap_content" + android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_centerHorizontal="true" - android:layout_gravity="center_horizontal"> + android:layout_above="@+id/button_bar" + android:layout_alignParentLeft="true" + android:layout_alignParentRight="true" + android:layout_below="@+id/secondary_hint" + android:gravity="center_vertical" + android:orientation="vertical" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" + android:background="@drawable/infocard_border" + android:padding="@dimen/infocard_padding"> - <com.makeramen.roundedimageview.RoundedImageView - android:id="@+id/account_image" + <LinearLayout + android:id="@+id/account_image_wrapper" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentTop="true" android:layout_centerHorizontal="true" - android:layout_marginBottom="16dp" - android:adjustViewBounds="true" - android:background="@drawable/message_border" - android:contentDescription="@string/account_image_description" - android:maxHeight="384dp" - android:maxWidth="384dp" - android:padding="1dp" - app:riv_corner_radius="5dp" /> - </LinearLayout> + android:layout_gravity="center_horizontal"> - <TextView - android:id="@+id/hint" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/account_image_wrapper" - android:layout_centerHorizontal="true" - android:text="@string/touch_to_choose_picture" - android:textColor="@color/black54" - android:layout_marginLeft="@dimen/activity_horizontal_margin" - android:layout_marginRight="@dimen/activity_horizontal_margin" - android:layout_marginTop="@dimen/activity_vertical_margin" - android:layout_marginBottom="@dimen/activity_vertical_margin" - android:layout_gravity="center_horizontal" - android:textAlignment="center" /> + <com.makeramen.roundedimageview.RoundedImageView + android:id="@+id/account_image" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:layout_centerHorizontal="true" + android:layout_marginBottom="16dp" + android:adjustViewBounds="true" + android:background="@drawable/message_border" + android:contentDescription="@string/account_image_description" + android:maxHeight="384dp" + android:maxWidth="384dp" + android:padding="1dp" + app:riv_corner_radius="5dp" /> + </LinearLayout> - <TextView - android:id="@+id/secondary_hint" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@id/hint" - android:layout_centerHorizontal="true" - android:text="@string/or_long_press_for_default" - android:textColor="@color/black54" - android:layout_marginBottom="@dimen/activity_vertical_margin" - android:layout_marginTop="@dimen/activity_vertical_margin" - android:layout_marginLeft="@dimen/activity_horizontal_margin" - android:layout_marginRight="@dimen/activity_horizontal_margin" - android:layout_gravity="center_horizontal" - android:textAlignment="center" /> + <TextView + android:id="@+id/hint" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/account_image_wrapper" + android:layout_centerHorizontal="true" + android:text="@string/touch_to_choose_picture" + android:textColor="@color/black54" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" + android:layout_gravity="center_horizontal" + android:textAlignment="center" /> - <TextView - android:id="@+id/account" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeHeadline" - android:visibility="gone" /> + <TextView + android:id="@+id/secondary_hint" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/hint" + android:layout_centerHorizontal="true" + android:text="@string/or_long_press_for_default" + android:textColor="@color/black54" + android:layout_marginBottom="@dimen/activity_vertical_margin" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_gravity="center_horizontal" + android:textAlignment="center" /> - <TextView - android:id="@+id/hint_or_warning" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:minLines="3" - android:text="@string/publish_avatar_explanation" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" - android:textAlignment="center" - android:layout_gravity="center_horizontal" /> - </LinearLayout> -</LinearLayout> + <TextView + android:id="@+id/account" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeHeadline" + android:visibility="gone" /> + + <TextView + android:id="@+id/hint_or_warning" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:minLines="3" + android:text="@string/publish_avatar_explanation" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" + android:textAlignment="center" + android:layout_gravity="center_horizontal" /> + </LinearLayout> + </LinearLayout> </ScrollView> + <LinearLayout android:id="@+id/button_bar" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:layout_alignParentLeft="true" - android:layout_alignParentRight="true" > + android:layout_alignParentRight="true"> <Button android:id="@+id/cancel_button" diff --git a/src/main/res/layout/activity_recording.xml b/src/main/res/layout/activity_recording.xml index 2e5ea7307..b1bcb2a65 100644 --- a/src/main/res/layout/activity_recording.xml +++ b/src/main/res/layout/activity_recording.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@color/grey50"> + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@color/grey50"> <LinearLayout android:id="@+id/button_bar" @@ -48,5 +48,5 @@ android:textStyle="bold" android:id="@+id/timer" android:layout_alignParentTop="true" - android:layout_centerHorizontal="true"/> + android:layout_centerHorizontal="true" /> </RelativeLayout>
\ No newline at end of file diff --git a/src/main/res/layout/activity_set_presence.xml b/src/main/res/layout/activity_set_presence.xml index d7ada8539..517654093 100644 --- a/src/main/res/layout/activity_set_presence.xml +++ b/src/main/res/layout/activity_set_presence.xml @@ -20,6 +20,7 @@ android:background="@drawable/infocard_border" android:padding="@dimen/infocard_padding" android:orientation="vertical"> + <github.ankushsachdeva.emojicon.EmojiconEditText android:layout_width="match_parent" android:layout_height="wrap_content" @@ -28,12 +29,14 @@ android:id="@+id/presence_status_message" android:textColor="@color/black87" android:layout_marginBottom="8dp" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> + <Spinner android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/presence_show" - android:layout_gravity="center_horizontal"/> + android:layout_gravity="center_horizontal" /> + <CheckBox android:layout_marginTop="16dp" android:layout_marginBottom="16dp" @@ -43,7 +46,8 @@ android:id="@+id/all_accounts" android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" - android:visibility="gone"/> + android:visibility="gone" /> + <Button android:id="@+id/change_presence" style="?android:attr/borderlessButtonStyle" @@ -51,8 +55,9 @@ android:layout_height="wrap_content" android:layout_gravity="right" android:text="@string/change_presence" - android:textColor="@color/accent"/> + android:textColor="@color/accent" /> </LinearLayout> + <LinearLayout android:id="@+id/templates" android:layout_width="match_parent" @@ -65,7 +70,6 @@ android:padding="@dimen/infocard_padding" android:orientation="vertical" android:divider="?android:dividerHorizontal" - android:showDividers="middle"> - </LinearLayout> + android:showDividers="middle"></LinearLayout> </LinearLayout> </ScrollView>
\ No newline at end of file diff --git a/src/main/res/layout/activity_share_locaction.xml b/src/main/res/layout/activity_share_locaction.xml index df3e08a95..7505e9b99 100644 --- a/src/main/res/layout/activity_share_locaction.xml +++ b/src/main/res/layout/activity_share_locaction.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:map="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@color/ripple_material_dark"> + xmlns:map="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/ripple_material_dark"> + <fragment android:name="com.google.android.gms.maps.MapFragment" android:id="@+id/map_fragment" @@ -18,7 +19,7 @@ map:uiTiltGestures="false" map:uiZoomControls="false" map:uiZoomGestures="true" - tools:ignore="MissingPrefix"/> + tools:ignore="MissingPrefix" /> <RelativeLayout android:id="@+id/snackbar" @@ -31,7 +32,7 @@ android:layout_above="@+id/button_bar" android:background="@drawable/snackbar" android:minHeight="48dp" - android:visibility="visible" > + android:visibility="visible"> <TextView android:layout_width="wrap_content" @@ -42,7 +43,7 @@ android:paddingLeft="24dp" android:textColor="@color/grey50" android:textSize="?attr/TextSizeBody" - android:text="@string/location_sharing_disabled"/> + android:text="@string/location_sharing_disabled" /> <TextView android:id="@+id/snackbar_action" @@ -59,7 +60,7 @@ android:text="@string/enable" android:layout_alignParentTop="true" android:layout_alignParentRight="true" - android:layout_alignParentEnd="true"/> + android:layout_alignParentEnd="true" /> </RelativeLayout> <RelativeLayout @@ -73,7 +74,7 @@ android:layout_above="@+id/button_bar" android:background="@drawable/snackbar" android:minHeight="24dp" - android:visibility="gone" > + android:visibility="gone"> <TextView android:id="@id/snackbar_location_message" @@ -93,7 +94,7 @@ android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:layout_alignParentLeft="true" - android:layout_alignParentRight="true" > + android:layout_alignParentRight="true"> <Button android:id="@+id/cancel_button" diff --git a/src/main/res/layout/activity_show_locaction.xml b/src/main/res/layout/activity_show_locaction.xml index 95c22e09d..32e177b33 100644 --- a/src/main/res/layout/activity_show_locaction.xml +++ b/src/main/res/layout/activity_show_locaction.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:map="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="match_parent"> + xmlns:map="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent"> <fragment @@ -18,6 +18,6 @@ map:uiTiltGestures="false" map:uiZoomControls="false" map:uiZoomGestures="true" - tools:ignore="MissingPrefix"/> + tools:ignore="MissingPrefix" /> </RelativeLayout>
\ No newline at end of file diff --git a/src/main/res/layout/activity_start_conversation.xml b/src/main/res/layout/activity_start_conversation.xml index d55ec196f..28e954b99 100644 --- a/src/main/res/layout/activity_start_conversation.xml +++ b/src/main/res/layout/activity_start_conversation.xml @@ -3,6 +3,6 @@ android:id="@+id/start_conversation_view_pager" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/grey50" > + android:background="@color/grey50"> </android.support.v4.view.ViewPager>
\ No newline at end of file diff --git a/src/main/res/layout/activity_trust_keys.xml b/src/main/res/layout/activity_trust_keys.xml index 1e95099f9..2ebffb5be 100644 --- a/src/main/res/layout/activity_trust_keys.xml +++ b/src/main/res/layout/activity_trust_keys.xml @@ -3,11 +3,12 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/grey200"> + <ScrollView android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_above="@+id/button_bar" - android:layout_alignParentTop="true" > + android:layout_alignParentTop="true"> <LinearLayout android:layout_width="match_parent" @@ -34,7 +35,7 @@ android:textColor="@color/black87" android:textSize="?attr/TextSizeHeadline" android:textStyle="bold" - android:text="@string/error_trustkeys_title"/> + android:text="@string/error_trustkeys_title" /> <TextView android:id="@+id/key_error_message" @@ -42,7 +43,7 @@ android:layout_height="wrap_content" android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" - android:padding="8dp"/> + android:padding="8dp" /> </LinearLayout> @@ -65,7 +66,7 @@ android:layout_height="wrap_content" android:textColor="@color/black87" android:textSize="?attr/TextSizeHeadline" - android:textStyle="bold"/> + android:textStyle="bold" /> <LinearLayout android:id="@+id/own_keys_details" @@ -73,8 +74,7 @@ android:layout_height="wrap_content" android:divider="?android:dividerHorizontal" android:showDividers="middle" - android:orientation="vertical"> - </LinearLayout> + android:orientation="vertical"></LinearLayout> </LinearLayout> @@ -89,6 +89,7 @@ </LinearLayout> </ScrollView> + <LinearLayout android:id="@+id/button_bar" android:layout_width="wrap_content" @@ -97,7 +98,7 @@ android:layout_alignParentStart="true" android:layout_alignParentEnd="true" android:layout_alignParentLeft="true" - android:layout_alignParentRight="true" > + android:layout_alignParentRight="true"> <Button android:id="@+id/cancel_button" @@ -123,6 +124,6 @@ android:layout_weight="1" android:enabled="true" android:textColor="@color/black54" - android:text="@string/done"/> + android:text="@string/done" /> </LinearLayout> </RelativeLayout> diff --git a/src/main/res/layout/activity_updater.xml b/src/main/res/layout/activity_updater.xml index ccc147361..8613b978a 100644 --- a/src/main/res/layout/activity_updater.xml +++ b/src/main/res/layout/activity_updater.xml @@ -1,13 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" android:layout_height="match_parent" tools:context="de.pixart.messenger.ui.UpdaterActivity"> - <TextView android:id="@+id/updater" android:layout_width="wrap_content" - android:layout_height="wrap_content" android:layout_alignParentLeft="true" - android:layout_alignParentTop="true" android:layout_marginTop="6dp" - android:text="Current" android:textAppearance="?android:attr/textAppearanceMedium" + <TextView + android:id="@+id/updater" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_alignParentTop="true" + android:layout_marginTop="6dp" + android:text="Current" + android:textAppearance="?android:attr/textAppearanceMedium" android:textStyle="normal" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" /> diff --git a/src/main/res/layout/activity_verify_otr.xml b/src/main/res/layout/activity_verify_otr.xml index c15f19d5e..1617b8e26 100644 --- a/src/main/res/layout/activity_verify_otr.xml +++ b/src/main/res/layout/activity_verify_otr.xml @@ -1,152 +1,152 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@color/grey50"> - - <ScrollView - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_above="@+id/button_bar"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:layout_marginLeft="@dimen/activity_horizontal_margin" - android:layout_marginRight="@dimen/activity_horizontal_margin" - android:layout_marginTop="@dimen/activity_vertical_margin" - android:layout_marginBottom="@dimen/activity_vertical_margin"> - - <TextView - android:id="@+id/verification_explanation" - android:layout_width="wrap_content" - android:layout_height="wrap_content"/> - - <LinearLayout - android:id="@+id/manual_verification_area" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginTop="16dp" - android:orientation="vertical"> - - <TextView - android:id="@+id/your_fingerprint" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" - android:typeface="monospace" - android:fontFamily="monospace"/> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/your_fingerprint" - android:textColor="@color/black54" - android:textSize="?attr/TextSizeInfo"/> - - <TextView - android:id="@+id/remote_fingerprint" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="20dp" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" - android:typeface="monospace" - android:fontFamily="monospace"/> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="20dp" - android:text="@string/remote_fingerprint" - android:textColor="@color/black54" - android:textSize="?attr/TextSizeInfo"/> - - </LinearLayout> - - <LinearLayout - android:id="@+id/smp_verification_area" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_marginTop="16dp" - android:orientation="vertical"> - - <TextView - android:id="@+id/status_message" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:text="@string/verified" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeHeadline" - android:textStyle="bold" - android:visibility="gone"/> - - <TextView - android:id="@+id/shared_secret_hint" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="8dp" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" - android:textStyle="bold" - android:visibility="gone"/> - - <EditText - android:id="@+id/shared_secret_hint_editable" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="8dp" - android:hint="@string/shared_secret_hint" - android:inputType="textAutoComplete" - android:textColor="@color/black87" - android:textColorHint="@color/black54" - android:textSize="?attr/TextSizeBody"/> - - <EditText - android:id="@+id/shared_secret_secret" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:hint="@string/shared_secret_secret" - android:inputType="textPassword" - android:textColor="@color/black87" - android:textColorHint="@color/black54" - android:textSize="?attr/TextSizeBody"/> - </LinearLayout> - </LinearLayout> - </ScrollView> - - <LinearLayout - android:id="@+id/button_bar" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_alignParentLeft="true" - android:layout_alignParentRight="true"> - - <Button - android:id="@+id/left_button" - style="?android:attr/borderlessButtonStyle" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1"/> - - <View - android:layout_width="1dp" - android:layout_height="fill_parent" - android:layout_marginBottom="7dp" - android:layout_marginTop="7dp" - android:background="@color/black12"/> - - <Button - android:id="@+id/right_button" - style="?android:attr/borderlessButtonStyle" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1"/> - </LinearLayout> + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/grey50"> + + <ScrollView + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_above="@+id/button_bar"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin"> + + <TextView + android:id="@+id/verification_explanation" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + + <LinearLayout + android:id="@+id/manual_verification_area" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:orientation="vertical"> + + <TextView + android:id="@+id/your_fingerprint" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" + android:typeface="monospace" + android:fontFamily="monospace" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/your_fingerprint" + android:textColor="@color/black54" + android:textSize="?attr/TextSizeInfo" /> + + <TextView + android:id="@+id/remote_fingerprint" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="20dp" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" + android:typeface="monospace" + android:fontFamily="monospace" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="20dp" + android:text="@string/remote_fingerprint" + android:textColor="@color/black54" + android:textSize="?attr/TextSizeInfo" /> + + </LinearLayout> + + <LinearLayout + android:id="@+id/smp_verification_area" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_marginTop="16dp" + android:orientation="vertical"> + + <TextView + android:id="@+id/status_message" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:text="@string/verified" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeHeadline" + android:textStyle="bold" + android:visibility="gone" /> + + <TextView + android:id="@+id/shared_secret_hint" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="8dp" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" + android:textStyle="bold" + android:visibility="gone" /> + + <EditText + android:id="@+id/shared_secret_hint_editable" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="8dp" + android:hint="@string/shared_secret_hint" + android:inputType="textAutoComplete" + android:textColor="@color/black87" + android:textColorHint="@color/black54" + android:textSize="?attr/TextSizeBody" /> + + <EditText + android:id="@+id/shared_secret_secret" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:hint="@string/shared_secret_secret" + android:inputType="textPassword" + android:textColor="@color/black87" + android:textColorHint="@color/black54" + android:textSize="?attr/TextSizeBody" /> + </LinearLayout> + </LinearLayout> + </ScrollView> + + <LinearLayout + android:id="@+id/button_bar" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:layout_alignParentLeft="true" + android:layout_alignParentRight="true"> + + <Button + android:id="@+id/left_button" + style="?android:attr/borderlessButtonStyle" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" /> + + <View + android:layout_width="1dp" + android:layout_height="fill_parent" + android:layout_marginBottom="7dp" + android:layout_marginTop="7dp" + android:background="@color/black12" /> + + <Button + android:id="@+id/right_button" + style="?android:attr/borderlessButtonStyle" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" /> + </LinearLayout> </RelativeLayout>
\ No newline at end of file diff --git a/src/main/res/layout/captcha.xml b/src/main/res/layout/captcha.xml index ea77b8354..08e685db4 100644 --- a/src/main/res/layout/captcha.xml +++ b/src/main/res/layout/captcha.xml @@ -3,13 +3,14 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:padding="16dp" > + android:padding="16dp"> <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/captcha" - android:layout_gravity="center_horizontal"/> + android:layout_gravity="center_horizontal" /> + <EditText android:id="@+id/input" android:layout_marginTop="8dp" diff --git a/src/main/res/layout/certificate_information.xml b/src/main/res/layout/certificate_information.xml index 4c085459b..18925c82b 100644 --- a/src/main/res/layout/certificate_information.xml +++ b/src/main/res/layout/certificate_information.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent" android:padding="16dp"> <TextView @@ -10,73 +10,84 @@ android:layout_height="wrap_content" android:text="@string/certificate_subject" android:textColor="@color/black87" - android:textSize="?attr/TextSizeHeadline"/> + android:textSize="?attr/TextSizeHeadline" /> + <TextView android:layout_marginTop="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/certificate_cn" android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> + <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/subject_cn" android:textColor="@color/black54" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> + <TextView android:layout_marginTop="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/certificate_o" android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> + <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/subject_o" android:textColor="@color/black54" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> + <TextView android:layout_marginTop="16dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/certificate_issuer" android:textColor="@color/black87" - android:textSize="?attr/TextSizeHeadline"/> + android:textSize="?attr/TextSizeHeadline" /> + <TextView android:layout_marginTop="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/certificate_cn" android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> + <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/issuer_cn" android:textColor="@color/black54" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> + <TextView android:layout_marginTop="8dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/certificate_o" android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> + <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/issuer_o" android:textColor="@color/black54" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> + <TextView android:layout_marginTop="16dp" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/certificate_sha1" android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> + <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -84,5 +95,5 @@ android:textColor="@color/black54" android:textSize="?attr/TextSizeBody" android:typeface="monospace" - android:fontFamily="monospace"/> + android:fontFamily="monospace" /> </LinearLayout>
\ No newline at end of file diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml index 445f16567..92e6020c9 100644 --- a/src/main/res/layout/contact.xml +++ b/src/main/res/layout/contact.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="?android:attr/activatedBackgroundIndicator" - android:padding="8dp"> + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="?android:attr/activatedBackgroundIndicator" + android:padding="8dp"> <com.makeramen.roundedimageview.RoundedImageView android:id="@+id/contact_photo" @@ -22,7 +22,7 @@ android:layout_centerVertical="true" android:layout_toRightOf="@+id/contact_photo" android:orientation="vertical" - android:paddingLeft="8dp" > + android:paddingLeft="8dp"> <github.ankushsachdeva.emojicon.EmojiconTextView android:id="@+id/contact_display_name" @@ -39,13 +39,14 @@ android:singleLine="true" android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" /> + <com.wefika.flowlayout.FlowLayout android:id="@+id/tags" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="-2dp" - android:orientation="horizontal"> - </com.wefika.flowlayout.FlowLayout> + android:orientation="horizontal"></com.wefika.flowlayout.FlowLayout> + <TextView android:id="@+id/key" android:layout_width="wrap_content" diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml index ec8ca1996..63a4e8518 100644 --- a/src/main/res/layout/contact_key.xml +++ b/src/main/res/layout/contact_key.xml @@ -23,7 +23,7 @@ android:textSize="?attr/TextSizeBody" android:typeface="monospace" android:fontFamily="monospace" - android:longClickable="true"/> + android:longClickable="true" /> <TextView android:id="@+id/key_type" @@ -34,7 +34,7 @@ android:layout_below="@+id/key" android:maxLines="1" android:textSize="?attr/TextSizeInfo" - android:longClickable="true"/> + android:longClickable="true" /> <TextView android:id="@+id/key_trust" @@ -45,7 +45,7 @@ android:visibility="gone" android:textColor="@color/black54" android:textSize="?attr/TextSizeInfo" - android:longClickable="true"/> + android:longClickable="true" /> <LinearLayout android:id="@+id/action_container" @@ -55,6 +55,7 @@ android:orientation="vertical" android:layout_alignParentRight="true" android:layout_centerVertical="true"> + <ImageButton android:layout_gravity="center_horizontal" android:id="@+id/button_remove" @@ -82,7 +83,7 @@ android:layout_height="wrap_content" android:layout_alignParentRight="true" android:layout_centerVertical="true" - style="@style/MD"/> + style="@style/MD" /> </LinearLayout> </RelativeLayout> </RelativeLayout>
\ No newline at end of file diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml index 42a55d09f..5a8f0736f 100644 --- a/src/main/res/layout/conversation_list_row.xml +++ b/src/main/res/layout/conversation_list_row.xml @@ -1,13 +1,13 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:descendantFocusability="blocksDescendants"> + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:descendantFocusability="blocksDescendants"> <View android:layout_width="fill_parent" android:layout_height="match_parent" - android:background="@color/primary"/> + android:background="@color/primary" /> <FrameLayout android:id="@+id/swipeable_item" @@ -32,7 +32,7 @@ android:padding="1dp" app:riv_border_color="@color/black12" app:riv_border_width="1dp" - app:riv_corner_radius="5dp"/> + app:riv_corner_radius="5dp" /> <RelativeLayout android:layout_width="fill_parent" @@ -52,7 +52,7 @@ android:text="Awesome groupchat" android:textColor="@color/black87" android:textSize="?attr/TextSizeHeadline" - android:typeface="sans"/> + android:typeface="sans" /> <RelativeLayout android:id="@+id/conversation_lastwrapper" @@ -61,12 +61,14 @@ android:layout_below="@id/conversation_name" android:layout_marginTop="4dp"> - <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_centerVertical="true" - android:layout_toLeftOf="@+id/notification_status" - android:orientation="vertical"> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" + android:layout_toLeftOf="@+id/notification_status" + android:orientation="vertical"> + <github.ankushsachdeva.emojicon.EmojiconTextView android:id="@+id/conversation_lastmsg" android:layout_width="match_parent" @@ -75,7 +77,7 @@ android:singleLine="true" android:text="This is a placeholder text to show the last messages" android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> <com.makeramen.roundedimageview.RoundedImageView android:id="@+id/conversation_lastimage" @@ -88,6 +90,7 @@ app:riv_corner_radius="5dp" android:maxWidth="400dp" /> </LinearLayout> + <ImageView android:id="@+id/notification_status" android:layout_width="16sp" @@ -95,8 +98,7 @@ android:layout_alignParentRight="true" android:layout_centerVertical="true" android:layout_marginLeft="4dp" - android:src="@drawable/ic_notifications_grey600_24dp" - /> + android:src="@drawable/ic_notifications_grey600_24dp" /> </RelativeLayout> <TextView @@ -108,7 +110,7 @@ android:gravity="right" android:text="23:42" android:textColor="@color/black54" - android:textSize="?attr/TextSizeInfo"/> + android:textSize="?attr/TextSizeInfo" /> </RelativeLayout> </RelativeLayout> </FrameLayout> diff --git a/src/main/res/layout/dialog_block_contact.xml b/src/main/res/layout/dialog_block_contact.xml index fd15a4665..2e43f6af8 100644 --- a/src/main/res/layout/dialog_block_contact.xml +++ b/src/main/res/layout/dialog_block_contact.xml @@ -13,7 +13,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="?attr/TextSizeBody" - android:textColor="@color/black87"/> + android:textColor="@color/black87" /> + <CheckBox android:layout_marginTop="8dp" android:id="@+id/report_spam" diff --git a/src/main/res/layout/dialog_show_password.xml b/src/main/res/layout/dialog_show_password.xml index 167659637..299b65dca 100644 --- a/src/main/res/layout/dialog_show_password.xml +++ b/src/main/res/layout/dialog_show_password.xml @@ -16,7 +16,6 @@ android:textSize="?attr/TextSizeHeadline" android:fontFamily="monospace" android:layout_gravity="center_horizontal" - android:textColor="@color/black87" > - </TextView> + android:textColor="@color/black87"></TextView> </LinearLayout>
\ No newline at end of file diff --git a/src/main/res/layout/form_boolean.xml b/src/main/res/layout/form_boolean.xml index fd553acb2..6a1a3920a 100644 --- a/src/main/res/layout/form_boolean.xml +++ b/src/main/res/layout/form_boolean.xml @@ -1,13 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:paddingTop="8dp" - android:orientation="vertical"> + android:layout_width="match_parent" + android:layout_height="match_parent" + android:paddingTop="8dp" + android:orientation="vertical"> + <CheckBox android:id="@+id/field" android:layout_width="match_parent" android:layout_height="wrap_content" android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> </LinearLayout>
\ No newline at end of file diff --git a/src/main/res/layout/form_text.xml b/src/main/res/layout/form_text.xml index 31b521e89..398fa9bff 100644 --- a/src/main/res/layout/form_text.xml +++ b/src/main/res/layout/form_text.xml @@ -1,15 +1,16 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:paddingTop="8dp" - android:orientation="vertical"> + android:layout_width="match_parent" + android:layout_height="match_parent" + android:paddingTop="8dp" + android:orientation="vertical"> + <TextView android:id="@+id/label" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> <EditText android:id="@+id/field" @@ -17,5 +18,5 @@ android:layout_height="wrap_content" android:textColor="@color/black87" android:textColorHint="@color/black54" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> </LinearLayout>
\ No newline at end of file diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml index 70ee276b7..eff7afa8f 100644 --- a/src/main/res/layout/fragment_conversation.xml +++ b/src/main/res/layout/fragment_conversation.xml @@ -19,8 +19,7 @@ android:listSelector="@android:color/transparent" android:stackFromBottom="true" android:transcriptMode="normal" - tools:listitem="@layout/message_sent"> - </ListView> + tools:listitem="@layout/message_sent"></ListView> <RelativeLayout android:id="@+id/textsend" @@ -53,6 +52,7 @@ android:paddingTop="12dp" android:textColor="@color/black87" android:singleLine="false"> + <requestFocus /> </de.pixart.messenger.ui.EditMessage> @@ -76,7 +76,7 @@ android:layout_marginRight="8dp" android:background="@drawable/snackbar" android:minHeight="48dp" - android:visibility="gone" > + android:visibility="gone"> <TextView android:id="@+id/snackbar_message" diff --git a/src/main/res/layout/fragment_conversations_overview.xml b/src/main/res/layout/fragment_conversations_overview.xml index 9494fa067..90327136b 100644 --- a/src/main/res/layout/fragment_conversations_overview.xml +++ b/src/main/res/layout/fragment_conversations_overview.xml @@ -1,15 +1,14 @@ <android.support.v4.widget.SlidingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/content_view_spl" android:layout_width="match_parent" - android:layout_height="match_parent" > + android:layout_height="match_parent"> - <LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_weight="1" android:layout_height="match_parent" android:background="@color/grey50" - android:orientation="vertical" > + android:orientation="vertical"> <de.timroes.android.listview.EnhancedListView android:id="@+id/list" @@ -25,7 +24,6 @@ android:layout_width="fill_parent" android:layout_height="match_parent" android:layout_weight="1" - android:orientation="vertical" > - </LinearLayout> + android:orientation="vertical"></LinearLayout> </android.support.v4.widget.SlidingPaneLayout>
\ No newline at end of file diff --git a/src/main/res/layout/join_conference_dialog.xml b/src/main/res/layout/join_conference_dialog.xml index 9ef2dc047..a615346fc 100644 --- a/src/main/res/layout/join_conference_dialog.xml +++ b/src/main/res/layout/join_conference_dialog.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:paddingBottom="8dp" - android:paddingLeft="24dp" - android:paddingRight="24dp" - android:paddingTop="16dp"> + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:paddingBottom="8dp" + android:paddingLeft="24dp" + android:paddingRight="24dp" + android:paddingTop="16dp"> <TextView android:id="@+id/your_account" @@ -40,7 +40,7 @@ android:inputType="textEmailAddress" android:textColor="@color/black87" android:textColorHint="@color/black54" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> <CheckBox android:id="@+id/bookmark" @@ -50,6 +50,6 @@ android:checked="true" android:text="@string/save_as_bookmark" android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> </LinearLayout>
\ No newline at end of file diff --git a/src/main/res/layout/keys_card.xml b/src/main/res/layout/keys_card.xml index d3271d1bc..89c47c904 100644 --- a/src/main/res/layout/keys_card.xml +++ b/src/main/res/layout/keys_card.xml @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout android:id="@+id/foreign_keys_card" - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/activity_vertical_margin" - android:layout_marginLeft="@dimen/activity_horizontal_margin" - android:layout_marginRight="@dimen/activity_horizontal_margin" - android:layout_marginTop="@dimen/activity_vertical_margin" - android:background="@drawable/infocard_border" - android:orientation="vertical" - android:padding="@dimen/infocard_padding"> + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="@dimen/activity_vertical_margin" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:background="@drawable/infocard_border" + android:orientation="vertical" + android:padding="@dimen/infocard_padding"> <TextView android:id="@+id/foreign_keys_title" @@ -17,7 +17,7 @@ android:layout_height="wrap_content" android:textColor="@color/black87" android:textSize="?attr/TextSizeHeadline" - android:textStyle="bold"/> + android:textStyle="bold" /> <LinearLayout android:id="@+id/foreign_keys_details" @@ -25,8 +25,7 @@ android:layout_height="wrap_content" android:divider="?android:dividerHorizontal" android:orientation="vertical" - android:showDividers="middle"> - </LinearLayout> + android:showDividers="middle"></LinearLayout> <TextView android:layout_marginTop="8dp" @@ -35,5 +34,5 @@ android:layout_height="wrap_content" android:textColor="@color/black87" android:text="@string/no_keys_just_confirm" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> </LinearLayout>
\ No newline at end of file diff --git a/src/main/res/layout/list_item_tag.xml b/src/main/res/layout/list_item_tag.xml index 5042d8d16..fcb7dd984 100644 --- a/src/main/res/layout/list_item_tag.xml +++ b/src/main/res/layout/list_item_tag.xml @@ -10,5 +10,4 @@ android:textColor="@color/white" android:textAllCaps="true" android:maxLines="1" - android:layout_margin="2dp" -/>
\ No newline at end of file + android:layout_margin="2dp" />
\ No newline at end of file diff --git a/src/main/res/layout/magic_create.xml b/src/main/res/layout/magic_create.xml index c4adc0297..3330a7cbb 100644 --- a/src/main/res/layout/magic_create.xml +++ b/src/main/res/layout/magic_create.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:fillViewport="true"> + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fillViewport="true"> + <RelativeLayout android:layout_width="match_parent" android:layout_height="match_parent" @@ -20,24 +21,28 @@ android:paddingBottom="8dp" android:paddingLeft="16dp" android:paddingRight="16dp"> + <Space android:layout_width="match_parent" android:layout_height="0dp" - android:layout_weight="1"/> + android:layout_weight="1" /> + <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/pick_your_username" android:textColor="@color/black87" android:textSize="?attr/TextSizeHeadline" - android:textStyle="bold"/> + android:textStyle="bold" /> + <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" android:text="@string/magic_create_text" android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> + <EditText android:id="@+id/username" android:layout_width="match_parent" @@ -45,7 +50,8 @@ android:layout_gravity="center_horizontal" android:hint="@string/username_hint" android:inputType="textNoSuggestions" - android:textSize="?attr/TextSizeBody"/> + android:textSize="?attr/TextSizeBody" /> + <TextView android:id="@+id/full_jid" android:layout_width="wrap_content" @@ -54,7 +60,8 @@ android:text="@string/your_full_jid_will_be" android:textColor="@color/black54" android:textSize="?attr/TextSizeInfo" - android:visibility="invisible"/> + android:visibility="invisible" /> + <Button android:id="@+id/create_account" style="?android:attr/borderlessButtonStyle" @@ -62,8 +69,9 @@ android:layout_height="wrap_content" android:layout_gravity="right" android:text="@string/next" - android:textColor="@color/accent"/> + android:textColor="@color/accent" /> </LinearLayout> + <RelativeLayout android:layout_width="match_parent" android:layout_height="match_parent" @@ -71,13 +79,14 @@ android:layout_alignParentLeft="true" android:layout_alignParentStart="true" android:layout_alignParentTop="true"> + <ImageView android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerHorizontal="true" android:layout_centerVertical="true" android:padding="8dp" - android:src="@drawable/main_logo"/> + android:src="@drawable/main_logo" /> </RelativeLayout> </RelativeLayout> </ScrollView>
\ No newline at end of file diff --git a/src/main/res/layout/manage_accounts.xml b/src/main/res/layout/manage_accounts.xml index e55d8d40a..8d7167ea6 100644 --- a/src/main/res/layout/manage_accounts.xml +++ b/src/main/res/layout/manage_accounts.xml @@ -9,7 +9,6 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:divider="@color/black12" - android:dividerHeight="1dp" > - </ListView> + android:dividerHeight="1dp"></ListView> </LinearLayout>
\ No newline at end of file diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml index 5d5fb7c43..9717081a8 100644 --- a/src/main/res/layout/message_received.xml +++ b/src/main/res/layout/message_received.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:emojicon="http://schemas.android.com/apk/res-auto" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingBottom="3dp" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:paddingTop="3dp"> + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:emojicon="http://schemas.android.com/apk/res-auto" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingBottom="3dp" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:paddingTop="3dp"> <com.makeramen.roundedimageview.RoundedImageView android:id="@+id/message_photo" diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml index 5c414ed2c..c44a216bd 100644 --- a/src/main/res/layout/message_sent.xml +++ b/src/main/res/layout/message_sent.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:emojicon="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:paddingBottom="3dp" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:paddingTop="3dp"> + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:emojicon="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:paddingBottom="3dp" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:paddingTop="3dp"> <com.makeramen.roundedimageview.RoundedImageView android:id="@+id/message_photo" @@ -125,6 +125,7 @@ android:layout_marginLeft="4sp" android:gravity="center_vertical" android:src="@drawable/ic_received_indicator" /> + <ImageView android:id="@+id/indicator_read" android:layout_width="?attr/TextSizeInfo" diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml index 0a5804a2e..117f31264 100644 --- a/src/main/res/layout/message_status.xml +++ b/src/main/res/layout/message_status.xml @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingBottom="5dp" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:paddingTop="5dp"> + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingBottom="5dp" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:paddingTop="5dp"> <Button android:id="@+id/load_more_messages" @@ -15,8 +15,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/load_more_messages" - android:textColor="@color/accent" android:layout_centerVertical="true" - android:layout_centerHorizontal="true"/> + android:textColor="@color/accent" + android:layout_centerVertical="true" + android:layout_centerHorizontal="true" /> <com.makeramen.roundedimageview.RoundedImageView android:id="@+id/message_photo" @@ -29,7 +30,7 @@ android:scaleType="fitXY" android:src="@drawable/ic_profile" android:background="@drawable/message_border" - app:riv_corner_radius="5dp"/> + app:riv_corner_radius="5dp" /> <TextView android:id="@+id/status_message" @@ -42,6 +43,6 @@ android:text="@string/contact_has_read_up_to_this_point" android:textColor="@color/black54" android:textSize="?attr/TextSizeInfo" - android:textStyle="italic"/> + android:textStyle="italic" /> </RelativeLayout>
\ No newline at end of file diff --git a/src/main/res/layout/password.xml b/src/main/res/layout/password.xml index 5de9baa23..db8d82505 100644 --- a/src/main/res/layout/password.xml +++ b/src/main/res/layout/password.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" android:layout_width="match_parent" + android:orientation="vertical" + android:layout_width="match_parent" android:layout_height="match_parent"> <EditText diff --git a/src/main/res/layout/presence_template.xml b/src/main/res/layout/presence_template.xml index ea1d05bd8..ef6f01643 100644 --- a/src/main/res/layout/presence_template.xml +++ b/src/main/res/layout/presence_template.xml @@ -1,12 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="?android:attr/activatedBackgroundIndicator" - android:paddingTop="8dp" - android:paddingLeft="8dp" - android:paddingBottom="8dp" - android:id="@+id/presence_template"> + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="?android:attr/activatedBackgroundIndicator" + android:paddingTop="8dp" + android:paddingLeft="8dp" + android:paddingBottom="8dp" + android:id="@+id/presence_template"> + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" @@ -17,25 +18,28 @@ android:layout_toLeftOf="@+id/delete_button" android:layout_toStartOf="@+id/delete_button" android:layout_marginRight="8dp"> - <github.ankushsachdeva.emojicon.EmojiconTextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:id="@+id/presence_status_message" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody"/> - <github.ankushsachdeva.emojicon.EmojiconTextView - android:id="@+id/status" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingBottom="1dp" - android:paddingLeft="4dp" - android:paddingRight="4dp" - android:paddingTop="1dp" - android:textAllCaps="true" - android:textColor="@color/white" - android:textSize="?attr/TextSizeInfo" - android:layout_marginTop="4dp"/> + + <github.ankushsachdeva.emojicon.EmojiconTextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:id="@+id/presence_status_message" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" /> + + <github.ankushsachdeva.emojicon.EmojiconTextView + android:id="@+id/status" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingBottom="1dp" + android:paddingLeft="4dp" + android:paddingRight="4dp" + android:paddingTop="1dp" + android:textAllCaps="true" + android:textColor="@color/white" + android:textSize="?attr/TextSizeInfo" + android:layout_marginTop="4dp" /> </LinearLayout> + <ImageButton android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -45,5 +49,5 @@ android:layout_alignParentEnd="true" android:background="?android:selectableItemBackground" android:padding="@dimen/image_button_padding" - android:src="?attr/icon_remove"/> + android:src="?attr/icon_remove" /> </RelativeLayout>
\ No newline at end of file diff --git a/src/main/res/layout/quickedit.xml b/src/main/res/layout/quickedit.xml index fb0b7d58f..5bbf7dad9 100644 --- a/src/main/res/layout/quickedit.xml +++ b/src/main/res/layout/quickedit.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:padding="16dp" > + android:padding="16dp"> <github.ankushsachdeva.emojicon.EmojiconEditText android:id="@+id/editor" @@ -11,7 +11,7 @@ android:layout_height="wrap_content" android:ems="10" android:inputType="textPersonName" - android:textColor="@color/black87" > + android:textColor="@color/black87"> <requestFocus /> </github.ankushsachdeva.emojicon.EmojiconEditText> diff --git a/src/main/res/layout/share_with.xml b/src/main/res/layout/share_with.xml index 41b6033da..162d02efe 100644 --- a/src/main/res/layout/share_with.xml +++ b/src/main/res/layout/share_with.xml @@ -2,7 +2,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent" > + android:layout_height="match_parent"> <ListView android:id="@+id/choose_conversation_list" diff --git a/src/main/res/layout/show_location_infowindow.xml b/src/main/res/layout/show_location_infowindow.xml index 0793ba7d5..a4bdf108f 100644 --- a/src/main/res/layout/show_location_infowindow.xml +++ b/src/main/res/layout/show_location_infowindow.xml @@ -14,12 +14,13 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="?attr/TextSizeBody" - android:textStyle="bold"/> + android:textStyle="bold" /> + <TextView android:id="@+id/snippet" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="?attr/TextSizeInfo"/> + android:textSize="?attr/TextSizeInfo" /> </LinearLayout> </LinearLayout>
\ No newline at end of file diff --git a/src/main/res/layout/simple_list_item.xml b/src/main/res/layout/simple_list_item.xml index 8cbc1f923..c54fd7833 100644 --- a/src/main/res/layout/simple_list_item.xml +++ b/src/main/res/layout/simple_list_item.xml @@ -1,5 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2006 The Android Open Source Project +<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2006 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -15,12 +14,12 @@ --> <TextView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@android:id/text1" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" - android:gravity="center_vertical" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:minHeight="?android:attr/listPreferredItemHeightSmall" /> + android:id="@android:id/text1" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" + android:gravity="center_vertical" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:minHeight="?android:attr/listPreferredItemHeightSmall" /> diff --git a/src/main/res/menu/attachment_choices.xml b/src/main/res/menu/attachment_choices.xml index e2b0798ee..e56a9fa07 100644 --- a/src/main/res/menu/attachment_choices.xml +++ b/src/main/res/menu/attachment_choices.xml @@ -1,28 +1,28 @@ <?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/attach_location" - android:title="@string/send_location"/> + android:title="@string/send_location" /> <item android:id="@+id/attach_record_voice" - android:title="@string/attach_record_voice"/> + android:title="@string/attach_record_voice" /> <item android:id="@+id/attach_take_picture" - android:title="@string/attach_take_picture"/> + android:title="@string/attach_take_picture" /> <item android:id="@+id/attach_choose_picture" - android:title="@string/attach_choose_picture"/> + android:title="@string/attach_choose_picture" /> <item android:id="@+id/attach_choose_video" - android:title="@string/attach_choose_video"/> + android:title="@string/attach_choose_video" /> <item android:id="@+id/attach_choose_file" - android:title="@string/choose_file"/> + android:title="@string/choose_file" /> </menu>
\ No newline at end of file diff --git a/src/main/res/menu/change_presence.xml b/src/main/res/menu/change_presence.xml index f3dfadfd0..1a320d59e 100644 --- a/src/main/res/menu/change_presence.xml +++ b/src/main/res/menu/change_presence.xml @@ -3,15 +3,15 @@ android:id="@+id/action_account_details" android:title="@string/account_details" android:showAsAction="always" - android:icon="@drawable/ic_account_box_white_24dp"/> + android:icon="@drawable/ic_account_box_white_24dp" /> <item android:id="@+id/action_accounts" android:orderInCategory="90" android:showAsAction="never" - android:title="@string/action_accounts"/> + android:title="@string/action_accounts" /> <item android:id="@+id/action_settings" android:orderInCategory="100" android:showAsAction="never" - android:title="@string/action_settings"/> + android:title="@string/action_settings" /> </menu>
\ No newline at end of file diff --git a/src/main/res/menu/choose_contact.xml b/src/main/res/menu/choose_contact.xml index 94b6479be..6c4d82153 100644 --- a/src/main/res/menu/choose_contact.xml +++ b/src/main/res/menu/choose_contact.xml @@ -6,12 +6,12 @@ android:actionLayout="@layout/actionview_search" android:icon="?attr/icon_search" android:showAsAction="collapseActionView|always" - android:title="@string/search"/> + android:title="@string/search" /> <item android:id="@+id/action_create_contact" android:icon="?attr/icon_add_person" android:showAsAction="always" android:title="@string/create_contact" - android:visible="false"/> + android:visible="false" /> </menu> diff --git a/src/main/res/menu/conference_context.xml b/src/main/res/menu/conference_context.xml index fd898580a..6a6eb92d2 100644 --- a/src/main/res/menu/conference_context.xml +++ b/src/main/res/menu/conference_context.xml @@ -1,11 +1,11 @@ <?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/context_join_conference" - android:title="@string/join_conference"/> + android:title="@string/join_conference" /> <item android:id="@+id/context_delete_conference" - android:title="@string/delete_bookmark"/> + android:title="@string/delete_bookmark" /> </menu>
\ No newline at end of file diff --git a/src/main/res/menu/contact_context.xml b/src/main/res/menu/contact_context.xml index 223c7ece0..1940d176e 100644 --- a/src/main/res/menu/contact_context.xml +++ b/src/main/res/menu/contact_context.xml @@ -1,17 +1,17 @@ <?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/context_start_conversation" - android:title="@string/start_conversation"/> + android:title="@string/start_conversation" /> <item android:id="@+id/context_contact_details" - android:title="@string/view_contact_details"/> + android:title="@string/view_contact_details" /> <item android:id="@+id/context_contact_block_unblock" - android:title="@string/block_contact"/> + android:title="@string/block_contact" /> <item android:id="@+id/context_delete_contact" - android:title="@string/delete_contact"/> + android:title="@string/delete_contact" /> </menu>
\ No newline at end of file diff --git a/src/main/res/menu/contact_details.xml b/src/main/res/menu/contact_details.xml index 7fba3a4bd..328b46098 100644 --- a/src/main/res/menu/contact_details.xml +++ b/src/main/res/menu/contact_details.xml @@ -1,38 +1,38 @@ <?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_edit_contact" android:icon="?attr/icon_edit" android:orderInCategory="10" android:showAsAction="always" - android:title="@string/action_edit_contact"/> + android:title="@string/action_edit_contact" /> <item android:id="@+id/action_share" android:icon="?attr/icon_share" android:showAsAction="always" android:orderInCategory="15" - android:title="@string/share_uri_with"/> + android:title="@string/share_uri_with" /> <item android:id="@+id/action_delete_contact" android:orderInCategory="10" android:showAsAction="never" - android:title="@string/action_delete_contact"/> + android:title="@string/action_delete_contact" /> <item android:id="@+id/action_block" android:orderInCategory="72" android:showAsAction="always" android:icon="@drawable/ic_speaker_notes_off_white_24dp" - android:title="@string/action_block_contact"/> + android:title="@string/action_block_contact" /> <item android:id="@+id/action_unblock" android:orderInCategory="73" android:showAsAction="always" android:icon="@drawable/ic_speaker_notes_white_24dp" - android:title="@string/action_unblock_contact"/> + android:title="@string/action_unblock_contact" /> </menu>
\ No newline at end of file diff --git a/src/main/res/menu/conversations.xml b/src/main/res/menu/conversations.xml index 4f0b98a34..22d8a513a 100644 --- a/src/main/res/menu/conversations.xml +++ b/src/main/res/menu/conversations.xml @@ -1,78 +1,78 @@ -<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" android:icon="?attr/icon_new" android:orderInCategory="10" android:showAsAction="always" - android:title="@string/action_add"/> + android:title="@string/action_add" /> <item android:id="@+id/action_security" android:icon="?attr/icon_not_secure" android:orderInCategory="20" android:showAsAction="always" - android:title="@string/action_secure"/> + android:title="@string/action_secure" /> <item android:id="@+id/action_attach_file" android:icon="?attr/icon_new_attachment" android:orderInCategory="30" android:showAsAction="always" - android:title="@string/attach_file"/> -<!-- <item - android:id="@+id/action_contact_details" - android:icon="?attr/icon_group" - android:orderInCategory="40" - android:showAsAction="never" - android:title="@string/action_contact_details"/> - <item - android:id="@+id/action_muc_details" - android:icon="?attr/icon_group" - android:orderInCategory="40" - android:showAsAction="never" - android:title="@string/action_muc_details"/> ---> + android:title="@string/attach_file" /> + <!-- <item + android:id="@+id/action_contact_details" + android:icon="?attr/icon_group" + android:orderInCategory="40" + android:showAsAction="never" + android:title="@string/action_contact_details"/> + <item + android:id="@+id/action_muc_details" + android:icon="?attr/icon_group" + android:orderInCategory="40" + android:showAsAction="never" + android:title="@string/action_muc_details"/> + --> <item android:id="@+id/action_invite" android:orderInCategory="45" android:showAsAction="never" - android:title="@string/invite_contact"/> + android:title="@string/invite_contact" /> <item android:id="@+id/action_clear_history" android:orderInCategory="50" android:showAsAction="never" - android:title="@string/action_clear_history"/> + android:title="@string/action_clear_history" /> <item android:id="@+id/action_archive_chat" android:orderInCategory="60" android:showAsAction="never" - android:title="@string/action_end_conversation"/> + android:title="@string/action_end_conversation" /> <item android:id="@+id/action_archive_muc" android:orderInCategory="60" android:showAsAction="never" - android:title="@string/action_end_conversation_muc"/> + android:title="@string/action_end_conversation_muc" /> <item android:id="@+id/action_mute" android:orderInCategory="70" android:showAsAction="never" - android:title="@string/disable_notifications"/> + android:title="@string/disable_notifications" /> <item android:id="@+id/action_unmute" android:orderInCategory="71" android:showAsAction="never" - android:title="@string/enable_notifications"/> + android:title="@string/enable_notifications" /> <item android:id="@+id/action_accounts" android:orderInCategory="90" android:showAsAction="never" - android:title="@string/mgmt_account_edit"/> + android:title="@string/mgmt_account_edit" /> <item android:id="@+id/action_settings" android:orderInCategory="100" android:showAsAction="never" - android:title="@string/action_settings"/> + android:title="@string/action_settings" /> <item android:id="@+id/action_invite_user" android:orderInCategory="100" @@ -87,6 +87,6 @@ android:id="@+id/action_check_updates" android:orderInCategory="100" android:showAsAction="never" - android:title="@string/action_check_update"/> + android:title="@string/action_check_update" /> </menu>
\ No newline at end of file diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml index 5aa2fc04e..fa53c08de 100644 --- a/src/main/res/menu/editaccount.xml +++ b/src/main/res/menu/editaccount.xml @@ -4,59 +4,59 @@ android:id="@+id/action_change_presence" android:showAsAction="always" android:title="@string/change_presence" - android:icon="@drawable/ic_new_releases_white_24dp"/> + android:icon="@drawable/ic_new_releases_white_24dp" /> <item android:id="@+id/action_show_qr_code" android:showAsAction="never" - android:title="@string/show_qr_code"/> + android:title="@string/show_qr_code" /> <item android:id="@+id/action_show_block_list" android:showAsAction="always" android:icon="@drawable/ic_speaker_notes_off_white_24dp" - android:title="@string/show_block_list"/> + android:title="@string/show_block_list" /> <item android:id="@+id/action_renew_certificate" android:showAsAction="never" android:title="@string/action_renew_certificate" - android:visible="false"/> + android:visible="false" /> <item android:id="@+id/action_server_info_show_more" android:checkable="true" android:checked="false" android:showAsAction="never" - android:title="@string/server_info_show_more"/> + android:title="@string/server_info_show_more" /> <item android:id="@+id/action_mam_prefs" android:icon="@drawable/ic_cloud_white_24dp" android:showAsAction="always" - android:title="@string/mam_prefs"/> + android:title="@string/mam_prefs" /> <item android:id="@+id/action_show_password" android:showAsAction="never" - android:title="@string/show_password"/> + android:title="@string/show_password" /> <item android:id="@+id/action_change_password_on_server" android:showAsAction="always" android:icon="@drawable/ic_vpn_key_white_24dp" - android:title="@string/change_password"/> + android:title="@string/change_password" /> <item android:id="@+id/mgmt_account_reconnect" android:showAsAction="never" - android:title="@string/mgmt_account_reconnect"/> + android:title="@string/mgmt_account_reconnect" /> <item android:id="@+id/action_clear_devices" android:showAsAction="never" - android:title="@string/clear_other_devices"/> + android:title="@string/clear_other_devices" /> <item android:id="@+id/action_settings" android:orderInCategory="100" android:showAsAction="never" - android:title="@string/action_settings"/> + android:title="@string/action_settings" /> </menu>
\ No newline at end of file diff --git a/src/main/res/menu/encryption_choices.xml b/src/main/res/menu/encryption_choices.xml index ab42a206b..89b6761ce 100644 --- a/src/main/res/menu/encryption_choices.xml +++ b/src/main/res/menu/encryption_choices.xml @@ -1,19 +1,19 @@ <?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 android:id="@+id/encryption_choice_none" - android:title="@string/encryption_choice_unencrypted"/> + android:title="@string/encryption_choice_unencrypted" /> <item android:id="@+id/encryption_choice_axolotl" - android:title="@string/encryption_choice_omemo"/> + android:title="@string/encryption_choice_omemo" /> <item 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" - android:title="@string/encryption_choice_pgp"/> + android:title="@string/encryption_choice_pgp" /> </group> </menu>
\ No newline at end of file diff --git a/src/main/res/menu/manageaccounts.xml b/src/main/res/menu/manageaccounts.xml index 2ce422a7b..38b82010b 100644 --- a/src/main/res/menu/manageaccounts.xml +++ b/src/main/res/menu/manageaccounts.xml @@ -1,21 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> <menu xmlns:android="http://schemas.android.com/apk/res/android"> - <item - android:id="@+id/action_add_account" - android:icon="?attr/icon_add_person" - android:showAsAction="always" - android:title="@string/action_add_account"/> - <item - android:id="@+id/action_add_account_with_cert" - android:showAsAction="never" - android:icon="?attr/icon_add_person" - android:title="@string/action_add_account_with_certificate" - android:visible="true"/> - <item - android:id="@+id/action_settings" - android:orderInCategory="100" - android:showAsAction="never" - android:title="@string/action_settings"/> + <item + android:id="@+id/action_add_account" + android:icon="?attr/icon_add_person" + android:showAsAction="always" + android:title="@string/action_add_account" /> + <item + android:id="@+id/action_add_account_with_cert" + android:showAsAction="never" + android:icon="?attr/icon_add_person" + android:title="@string/action_add_account_with_certificate" + android:visible="true" /> + <item + android:id="@+id/action_settings" + android:orderInCategory="100" + android:showAsAction="never" + android:title="@string/action_settings" /> </menu>
\ No newline at end of file diff --git a/src/main/res/menu/manageaccounts_context.xml b/src/main/res/menu/manageaccounts_context.xml index 1205b3291..beca7b8ec 100644 --- a/src/main/res/menu/manageaccounts_context.xml +++ b/src/main/res/menu/manageaccounts_context.xml @@ -1,21 +1,21 @@ <?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/mgmt_account_change_presence" - android:title="@string/change_presence"/> + android:title="@string/change_presence" /> <item android:id="@+id/mgmt_account_publish_avatar" - android:title="@string/mgmt_account_publish_avatar"/> + android:title="@string/mgmt_account_publish_avatar" /> <item android:id="@+id/mgmt_account_announce_pgp" - android:title="@string/mgmt_account_publish_pgp"/> + android:title="@string/mgmt_account_publish_pgp" /> <item android:id="@+id/mgmt_account_reconnect" android:showAsAction="always" - android:title="@string/mgmt_account_reconnect"/> + android:title="@string/mgmt_account_reconnect" /> <item android:id="@+id/mgmt_account_delete" - android:title="@string/mgmt_account_delete"/> + android:title="@string/mgmt_account_delete" /> </menu>
\ No newline at end of file diff --git a/src/main/res/menu/message_context.xml b/src/main/res/menu/message_context.xml index 7f95d712a..0c3220683 100644 --- a/src/main/res/menu/message_context.xml +++ b/src/main/res/menu/message_context.xml @@ -1,48 +1,48 @@ <?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/copy_text" android:title="@string/copy_text" - android:visible="false"/> + android:visible="false" /> <item android:id="@+id/select_text" android:title="@string/select_text" - android:visible="false"/> + android:visible="false" /> <item android:id="@+id/retry_decryption" android:title="Retry decryption" - android:visible="false"/> + android:visible="false" /> <item android:id="@+id/correct_message" android:title="@string/correct_message" - android:visible="false"/> + android:visible="false" /> <item android:id="@+id/share_with" android:title="@string/share_with" - android:visible="false"/> + android:visible="false" /> <item android:id="@+id/copy_url" android:title="@string/copy_original_url" - android:visible="false"/> + android:visible="false" /> <item android:id="@+id/show_error_message" android:title="@string/show_error_message" - android:visible="false"/> + android:visible="false" /> <item android:id="@+id/send_again" android:title="@string/send_again" - android:visible="false"/> + android:visible="false" /> <item android:id="@+id/download_file" android:title="@string/download_x_file" - android:visible="false"/> + android:visible="false" /> <item android:id="@+id/cancel_transmission" android:title="@string/cancel_transmission" - android:visible="false"/> + android:visible="false" /> <item android:id="@+id/delete_file" android:title="@string/delete_x_file" - android:visible="false"/> + android:visible="false" /> </menu>
\ No newline at end of file diff --git a/src/main/res/menu/muc_details.xml b/src/main/res/menu/muc_details.xml index 5ee463de5..cf0d6c3b8 100644 --- a/src/main/res/menu/muc_details.xml +++ b/src/main/res/menu/muc_details.xml @@ -6,30 +6,30 @@ android:icon="?attr/icon_edit" android:orderInCategory="10" android:showAsAction="always" - android:title="@string/action_edit_subject"/> + android:title="@string/action_edit_subject" /> <item android:id="@+id/action_share" android:icon="?attr/icon_share" android:showAsAction="always" android:orderInCategory="15" - android:title="@string/share_uri_with"/> + android:title="@string/share_uri_with" /> <item android:id="@+id/action_save_as_bookmark" android:orderInCategory="80" android:showAsAction="never" - android:title="@string/save_as_bookmark"/> + android:title="@string/save_as_bookmark" /> <item android:id="@+id/action_delete_bookmark" android:orderInCategory="80" android:showAsAction="never" - android:title="@string/delete_bookmark"/> + android:title="@string/delete_bookmark" /> <item android:id="@+id/action_advanced_mode" android:checkable="true" android:checked="false" android:orderInCategory="85" android:showAsAction="never" - android:title="@string/advanced_mode"/> + android:title="@string/advanced_mode" /> </menu>
\ No newline at end of file diff --git a/src/main/res/menu/muc_details_context.xml b/src/main/res/menu/muc_details_context.xml index edbb2264a..4760cec44 100644 --- a/src/main/res/menu/muc_details_context.xml +++ b/src/main/res/menu/muc_details_context.xml @@ -1,44 +1,44 @@ <?xml version="1.0" encoding="utf-8"?> <menu xmlns:android="http://schemas.android.com/apk/res/android"> - <item + <item android:id="@+id/start_conversation" android:title="@string/start_conversation" - android:visible="false"/> + android:visible="false" /> <item android:id="@+id/action_contact_details" android:title="@string/action_contact_details" - android:visible="false"/> + android:visible="false" /> <item android:id="@+id/invite" android:title="@string/invite_again" - android:visible="false"/> + android:visible="false" /> <item android:id="@+id/send_private_message" android:title="@string/send_private_message" - android:visible="false"/> + android:visible="false" /> <item android:id="@+id/give_membership" android:title="@string/grant_membership" - android:visible="false"/> + android:visible="false" /> <item android:id="@+id/give_admin_privileges" android:title="@string/grant_admin_privileges" - android:visible="false"/> + android:visible="false" /> <item android:id="@+id/remove_admin_privileges" android:title="@string/remove_admin_privileges" - android:visible="false"/> + android:visible="false" /> <item android:id="@+id/remove_membership" android:title="@string/remove_membership" - android:visible="false"/> + android:visible="false" /> <item android:id="@+id/ban_from_conference" android:title="@string/ban_from_conference" - android:visible="false"/> + android:visible="false" /> <item android:id="@+id/remove_from_room" android:title="@string/remove_from_room" - android:visible="false"/> + android:visible="false" /> </menu> diff --git a/src/main/res/menu/omemo_key_context.xml b/src/main/res/menu/omemo_key_context.xml index 2e2fc5dac..f63a3439b 100644 --- a/src/main/res/menu/omemo_key_context.xml +++ b/src/main/res/menu/omemo_key_context.xml @@ -2,8 +2,8 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item android:id="@+id/purge_omemo_key" - android:title="@string/purge_key"/> + android:title="@string/purge_key" /> <item android:id="@+id/copy_omemo_key" - android:title="@string/copy_fingerprint"/> + android:title="@string/copy_fingerprint" /> </menu>
\ No newline at end of file diff --git a/src/main/res/menu/publish_avatar.xml b/src/main/res/menu/publish_avatar.xml index 1bffb2961..39478c0a4 100644 --- a/src/main/res/menu/publish_avatar.xml +++ b/src/main/res/menu/publish_avatar.xml @@ -4,5 +4,5 @@ android:id="@+id/action_crop_image" android:showAsAction="always" android:icon="@drawable/ic_crop_white_24dp" - android:title="@string/select_image_and_crop"/> + android:title="@string/select_image_and_crop" /> </menu>
\ No newline at end of file diff --git a/src/main/res/menu/select_multiple.xml b/src/main/res/menu/select_multiple.xml index 4240849fd..efd6e4d0a 100644 --- a/src/main/res/menu/select_multiple.xml +++ b/src/main/res/menu/select_multiple.xml @@ -1,5 +1,5 @@ <?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/selection_submit" diff --git a/src/main/res/menu/share_with.xml b/src/main/res/menu/share_with.xml index bc51f4625..ff87edc1a 100644 --- a/src/main/res/menu/share_with.xml +++ b/src/main/res/menu/share_with.xml @@ -1,11 +1,11 @@ <?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" android:icon="?attr/icon_new" android:orderInCategory="10" android:showAsAction="always" - android:title="@string/action_add"/> + android:title="@string/action_add" /> </menu>
\ No newline at end of file diff --git a/src/main/res/menu/showlocation.xml b/src/main/res/menu/showlocation.xml index 227b9970f..3eb0647c9 100644 --- a/src/main/res/menu/showlocation.xml +++ b/src/main/res/menu/showlocation.xml @@ -4,5 +4,5 @@ android:id="@+id/action_navigate" android:showAsAction="always" android:title="@string/navigate" - android:icon="@drawable/ic_navigation_white_24dp"/> + android:icon="@drawable/ic_navigation_white_24dp" /> </menu>
\ No newline at end of file diff --git a/src/main/res/menu/start_conversation.xml b/src/main/res/menu/start_conversation.xml index 305ffd223..27e9fc29b 100644 --- a/src/main/res/menu/start_conversation.xml +++ b/src/main/res/menu/start_conversation.xml @@ -20,10 +20,10 @@ <menu> <item android:id="@+id/action_join_conference" - android:title="@string/join_conference"/> + android:title="@string/join_conference" /> <item android:id="@+id/action_create_conference" - android:title="@string/create_conference"/> + android:title="@string/create_conference" /> </menu> </item> @@ -38,6 +38,6 @@ android:checked="false" android:orderInCategory="85" android:showAsAction="never" - android:title="@string/hide_offline"/> + android:title="@string/hide_offline" /> </menu>
\ No newline at end of file diff --git a/src/main/res/menu/verification_choices.xml b/src/main/res/menu/verification_choices.xml index e833ba79d..57d45dcde 100644 --- a/src/main/res/menu/verification_choices.xml +++ b/src/main/res/menu/verification_choices.xml @@ -3,10 +3,10 @@ <item android:id="@+id/scan_fingerprint" - android:title="@string/scan_qr_code"/> + android:title="@string/scan_qr_code" /> <item android:id="@+id/ask_question" - android:title="@string/ask_question"/> + android:title="@string/ask_question" /> <item android:id="@+id/manual_verification" diff --git a/src/main/res/menu/verify_otr.xml b/src/main/res/menu/verify_otr.xml index 42b66ad5b..17b6562c2 100644 --- a/src/main/res/menu/verify_otr.xml +++ b/src/main/res/menu/verify_otr.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <menu xmlns:android="http://schemas.android.com/apk/res/android"> - <item - android:id="@+id/action_show_qr_code" - android:title="@string/show_qr_code" - android:showAsAction="never" /> + <item + android:id="@+id/action_show_qr_code" + android:title="@string/show_qr_code" + android:showAsAction="never" /> <item android:id="@+id/action_accounts" diff --git a/src/main/res/values-v21/dimens.xml b/src/main/res/values-v21/dimens.xml index b689d1008..4a3d93d1b 100644 --- a/src/main/res/values-v21/dimens.xml +++ b/src/main/res/values-v21/dimens.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <dimen name="elv_undo_bottom_offset">63dp</dimen> <!-- 48dp + 15dp --> - <dimen name="image_button_padding">12dp</dimen> + <dimen name="elv_undo_bottom_offset">63dp</dimen> <!-- 48dp + 15dp --> + <dimen name="image_button_padding">12dp</dimen> </resources>
\ No newline at end of file diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml index b6bd918c5..4c126478e 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -1,99 +1,99 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string-array name="resources"> - <item>Mobile</item> - <item>Phone</item> - <item>Tablet</item> - <item>@string/app_name</item> - <item>Android</item> - </string-array> - <string-array name="filesizes"> - <item>@string/never</item> - <item>256 KiB</item> - <item>512 KiB</item> - <item>1 MiB</item> - <item>5 MiB</item> - <item>10 MiB</item> - </string-array> - <string-array name="filesizes_values"> - <item>1</item> - <item>262144</item> - <item>524288</item> - <item>1048576</item> - <item>5242880</item> - <item>10485760</item> - </string-array> - <string-array name="mute_options_descriptions"> - <item>@string/thirty_minutes</item> - <item>@string/one_hour</item> - <item>@string/two_hours</item> - <item>@string/eight_hours</item> - <item>@string/until_further_notice</item> - </string-array> + <string-array name="resources"> + <item>Mobile</item> + <item>Phone</item> + <item>Tablet</item> + <item>@string/app_name</item> + <item>Android</item> + </string-array> + <string-array name="filesizes"> + <item>@string/never</item> + <item>256 KiB</item> + <item>512 KiB</item> + <item>1 MiB</item> + <item>5 MiB</item> + <item>10 MiB</item> + </string-array> + <string-array name="filesizes_values"> + <item>1</item> + <item>262144</item> + <item>524288</item> + <item>1048576</item> + <item>5242880</item> + <item>10485760</item> + </string-array> + <string-array name="mute_options_descriptions"> + <item>@string/thirty_minutes</item> + <item>@string/one_hour</item> + <item>@string/two_hours</item> + <item>@string/eight_hours</item> + <item>@string/until_further_notice</item> + </string-array> - <integer-array name="mute_options_durations"> - <item>1800</item> - <item>3600</item> - <item>7200</item> - <item>28800</item> - <item>-1</item> - </integer-array> + <integer-array name="mute_options_durations"> + <item>1800</item> + <item>3600</item> + <item>7200</item> + <item>28800</item> + <item>-1</item> + </integer-array> - <string-array name="quick_actions"> - <item>@string/none</item> - <item>@string/recently_used</item> - <item>@string/attach_take_picture</item> - <item>@string/attach_choose_picture</item> - <item>@string/attach_record_voice</item> - <item>@string/send_location</item> - </string-array> + <string-array name="quick_actions"> + <item>@string/none</item> + <item>@string/recently_used</item> + <item>@string/attach_take_picture</item> + <item>@string/attach_choose_picture</item> + <item>@string/attach_record_voice</item> + <item>@string/send_location</item> + </string-array> - <string-array name="quick_action_values"> - <item>none</item> - <item>recent</item> - <item>photo</item> - <item>picture</item> - <item>voice</item> - <item>location</item> - </string-array> + <string-array name="quick_action_values"> + <item>none</item> + <item>recent</item> + <item>photo</item> + <item>picture</item> + <item>voice</item> + <item>location</item> + </string-array> - <string-array name="picture_compression_values"> - <item>never</item> - <item>auto</item> - <item>always</item> - </string-array> + <string-array name="picture_compression_values"> + <item>never</item> + <item>auto</item> + <item>always</item> + </string-array> - <string-array name="picture_compression_entries"> - <item>@string/never</item> - <item>@string/automatically</item> - <item>@string/always</item> - </string-array> + <string-array name="picture_compression_entries"> + <item>@string/never</item> + <item>@string/automatically</item> + <item>@string/always</item> + </string-array> - <string-array name="video_compression_values"> - <item>never</item> - <item>auto</item> - <item>always</item> - </string-array> + <string-array name="video_compression_values"> + <item>never</item> + <item>auto</item> + <item>always</item> + </string-array> - <string-array name="video_compression_entries"> - <item>@string/never</item> - <item>@string/automatically</item> - <item>@string/always</item> - </string-array> + <string-array name="video_compression_entries"> + <item>@string/never</item> + <item>@string/automatically</item> + <item>@string/always</item> + </string-array> - <string-array name="mam_prefs"> - <item>@string/never</item> - <item>@string/contacts</item> - <item>@string/always</item> - </string-array> + <string-array name="mam_prefs"> + <item>@string/never</item> + <item>@string/contacts</item> + <item>@string/always</item> + </string-array> - <string-array name="presence_show_options"> - <item>@string/presence_chat</item> - <item>@string/presence_online</item> - <item>@string/presence_away</item> - <item>@string/presence_xa</item> - <item>@string/presence_dnd</item> - </string-array> + <string-array name="presence_show_options"> + <item>@string/presence_chat</item> + <item>@string/presence_online</item> + <item>@string/presence_away</item> + <item>@string/presence_xa</item> + <item>@string/presence_dnd</item> + </string-array> </resources> diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index 526ab66be..309c1fb30 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -5,34 +5,34 @@ <attr name="TextSizeBody" format="dimension" /> <attr name="TextSizeHeadline" format="dimension" /> - <attr name="icon_add_group" format="reference"/> - <attr name="icon_add_person" format="reference"/> - <attr name="icon_cancel" format="reference"/> - <attr name="icon_chat" format="reference"/> - <attr name="icon_copy" format="reference"/> - <attr name="icon_discard" format="reference"/> - <attr name="icon_download" format="reference"/> - <attr name="icon_edit" format="reference"/> - <attr name="icon_edit_dark" format="reference"/> - <attr name="icon_done" format="reference"/> - <attr name="icon_group" format="reference"/> - <attr name="icon_new" format="reference"/> - <attr name="icon_new_attachment" format="reference"/> - <attr name="icon_not_secure" format="reference"/> - <attr name="icon_refresh" format="reference"/> - <attr name="icon_remove" format="reference"/> - <attr name="icon_search" format="reference"/> - <attr name="icon_secure" format="reference"/> - <attr name="icon_settings" format="reference"/> - <attr name="icon_share" format="reference"/> - <attr name="icon_import_export" format="reference"/> + <attr name="icon_add_group" format="reference" /> + <attr name="icon_add_person" format="reference" /> + <attr name="icon_cancel" format="reference" /> + <attr name="icon_chat" format="reference" /> + <attr name="icon_copy" format="reference" /> + <attr name="icon_discard" format="reference" /> + <attr name="icon_download" format="reference" /> + <attr name="icon_edit" format="reference" /> + <attr name="icon_edit_dark" format="reference" /> + <attr name="icon_done" format="reference" /> + <attr name="icon_group" format="reference" /> + <attr name="icon_new" format="reference" /> + <attr name="icon_new_attachment" format="reference" /> + <attr name="icon_not_secure" format="reference" /> + <attr name="icon_refresh" format="reference" /> + <attr name="icon_remove" format="reference" /> + <attr name="icon_search" format="reference" /> + <attr name="icon_secure" format="reference" /> + <attr name="icon_settings" format="reference" /> + <attr name="icon_share" format="reference" /> + <attr name="icon_import_export" format="reference" /> - <attr name="icon_notifications" format="reference"/> - <attr name="icon_notifications_off" format="reference"/> - <attr name="icon_notifications_paused" format="reference"/> - <attr name="icon_notifications_none" format="reference"/> + <attr name="icon_notifications" format="reference" /> + <attr name="icon_notifications_off" format="reference" /> + <attr name="icon_notifications_paused" format="reference" /> + <attr name="icon_notifications_none" format="reference" /> - <attr name="dialog_horizontal_padding" format="dimension"/> - <attr name="dialog_vertical_padding" format="dimension"/> + <attr name="dialog_horizontal_padding" format="dimension" /> + <attr name="dialog_vertical_padding" format="dimension" /> </resources>
\ No newline at end of file diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index 4a7f235d9..a613cefb9 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <color name="realgreen">#ff259b24</color> - <color name="primary">#ff2e4272</color> - <color name="primary_dark">#ff08183e</color> - <color name="dark">#ff000309</color> - <color name="accent">#ff2e4272</color> - <color name="black87">#de000309</color> - <color name="black54">#8a000309</color> + <color name="realgreen">#ff259b24</color> + <color name="primary">#ff2e4272</color> + <color name="primary_dark">#ff08183e</color> + <color name="dark">#ff000309</color> + <color name="accent">#ff2e4272</color> + <color name="black87">#de000309</color> + <color name="black54">#8a000309</color> <color name="black12">#1f000000</color> - <color name="white">#ffe2e7f1</color> - <color name="white70">#b2e2e7f1</color> - <color name="grey50">#fafafa</color> - <color name="grey200">#ffeeeeee</color> - <color name="grey500">#ff9e9e9e</color> - <color name="grey800">#ff424242</color> + <color name="white">#ffe2e7f1</color> + <color name="white70">#b2e2e7f1</color> + <color name="grey50">#fafafa</color> + <color name="grey200">#ffeeeeee</color> + <color name="grey500">#ff9e9e9e</color> + <color name="grey800">#ff424242</color> <color name="red800">#ffc62828</color> - <color name="orange500">#ffff9800</color> + <color name="orange500">#ffff9800</color> </resources> diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml index da216ef21..9ef329aa8 100644 --- a/src/main/res/values/dimens.xml +++ b/src/main/res/values/dimens.xml @@ -1,8 +1,8 @@ <resources> - <!-- Default screen margins, per the Android Design guidelines. --> - <dimen name="activity_horizontal_margin">8dp</dimen> - <dimen name="activity_vertical_margin">8dp</dimen> - <dimen name="infocard_padding">16dp</dimen> + <!-- Default screen margins, per the Android Design guidelines. --> + <dimen name="activity_horizontal_margin">8dp</dimen> + <dimen name="activity_vertical_margin">8dp</dimen> + <dimen name="infocard_padding">16dp</dimen> <dimen name="image_button_padding">8dp</dimen> - <dimen name="elv_touch_slop">64dp</dimen> + <dimen name="elv_touch_slop">64dp</dimen> </resources> diff --git a/src/main/res/values/ids.xml b/src/main/res/values/ids.xml index 84f9ac69e..78ccb5596 100644 --- a/src/main/res/values/ids.xml +++ b/src/main/res/values/ids.xml @@ -4,6 +4,6 @@ <item name="message_image_view" type="id" /> <item name="message_video_view" type="id" /> <item name="import_text" type="id" /> - <item type="id" name="TAG_ACCOUNT"/> - <item type="id" name="TAG_FINGERPRINT"/> + <item type="id" name="TAG_ACCOUNT" /> + <item type="id" name="TAG_FINGERPRINT" /> </resources>
\ No newline at end of file diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 3bd18cfbf..21a09479c 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -1,280 +1,280 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name" translatable="false">Pix-Art Messenger</string> - <string name="action_settings">Settings</string> - <string name="action_add">New conversation</string> - <string name="action_accounts">Manage accounts</string> - <string name="action_end_conversation">End this conversation</string> - <string name="action_contact_details">Contact details</string> - <string name="action_secure">Secure conversation</string> - <string name="action_add_account">Add account</string> - <string name="action_edit_contact">Edit name</string> - <string name="action_add_phone_book">Add to address book</string> - <string name="action_delete_contact">Delete from roster</string> - <string name="action_block_contact">Block contact</string> - <string name="action_unblock_contact">Unblock contact</string> - <string name="action_block_domain">Block domain</string> - <string name="action_unblock_domain">Unblock domain</string> - <string name="title_activity_manage_accounts">Manage Accounts</string> - <string name="title_activity_settings">Settings</string> - <string name="title_activity_conference_details">Conference Details</string> - <string name="title_activity_contact_details">Contact Details</string> - <string name="title_activity_sharewith">Share with Conversation</string> - <string name="title_activity_start_conversation">Start Conversation</string> - <string name="title_activity_choose_contact">Choose contact</string> - <string name="title_activity_block_list">Block list</string> - <string name="just_now">just now</string> - <string name="minute_ago">1 min ago</string> - <string name="minutes_ago">%d mins ago</string> - <string name="unread_conversations">unread Conversations</string> - <string name="sending">sending…</string> - <string name="message_decrypting">Decrypting message. Please wait…</string> - <string name="pgp_message">OpenPGP encrypted message</string> - <string name="nick_in_use">Nickname is already in use</string> - <string name="admin">Admin</string> - <string name="owner">Owner</string> - <string name="moderator">Moderator</string> - <string name="participant">Participant</string> - <string name="visitor">Visitor</string> - <string name="remove_contact_text">Would you like to remove %s from your roster? The conversation associated with this contact will not be removed.</string> - <string name="block_contact_text">Would you like to block %s from sending you messages?</string> - <string name="unblock_contact_text">Would you like to unblock %s and allow them to send you messages?</string> - <string name="block_domain_text">Block all contacts from %s?</string> - <string name="unblock_domain_text">Unblock all contacts from %s?</string> - <string name="contact_blocked">Contact blocked</string> - <string name="remove_bookmark_text">Would you like to remove %s as a bookmark? The conversation associated with this bookmark will not be removed.</string> - <string name="register_account">Register new account on server</string> - <string name="change_password_on_server">Change password on server</string> - <string name="share_with">Share with…</string> - <string name="start_conversation">Start Conversation</string> - <string name="invite_contact">Invite Contact</string> - <string name="contacts">Contacts</string> - <string name="cancel">Cancel</string> - <string name="set">Set</string> - <string name="add">Add</string> - <string name="edit">Edit</string> - <string name="delete">Delete</string> - <string name="block">Block</string> - <string name="unblock">Unblock</string> - <string name="save">Save</string> - <string name="ok">OK</string> - <string name="crash_report_title">Pix-Art Messenger has crashed</string> - <string name="crash_report_message">By sending in stack traces you are helping the ongoing development of Pix-Art Messenger\n<b>Warning:</b> This will use your XMPP account to send the stack trace to the developer.</string> - <string name="send_now">Send now</string> - <string name="send_never">Never ask again</string> - <string name="problem_connecting_to_account">Unable to connect to account</string> - <string name="problem_connecting_to_accounts">Unable to connect to multiple accounts</string> - <string name="touch_to_fix">Touch here to manage your accounts</string> - <string name="attach_file">Attach file</string> - <string name="not_in_roster">The contact is not in your roster. Would you like to add it?</string> - <string name="add_contact">Add contact</string> - <string name="send_failed">delivery failed</string> - <string name="preparing_image">Preparing image for transmission</string> - <string name="preparing_images">Preparing images for transmission</string> - <string name="sharing_files_please_wait">Sharing files. Please wait…</string> - <string name="action_clear_history">Clear history</string> - <string name="clear_conversation_history">Clear Conversation History</string> - <string name="clear_histor_msg">Do you want to delete all messages within this Conversation?\n\n<b>Warning:</b> This will not influence messages stored on other devices or servers.</string> - <string name="delete_messages">Delete messages</string> - <string name="also_end_conversation">End this conversation afterwards</string> - <string name="choose_presence">Choose device</string> - <string name="send_unencrypted_message">Send unencrypted message</string> - <string name="send_message_to_x">Send message to %s</string> - <string name="send_otr_message">Send OTR encrypted message</string> - <string name="send_omemo_message">Send OMEMO encrypted message</string> - <string name="send_omemo_x509_message">Send v\\OMEMO encrypted message</string> - <string name="send_pgp_message">Send OpenPGP encrypted message</string> - <string name="your_nick_has_been_changed">Your nickname has been changed</string> - <string name="send_unencrypted">Send unencrypted</string> - <string name="decryption_failed">Decryption failed. Maybe you don’t have the proper private key.</string> - <string name="openkeychain_required">OpenKeychain</string> - <string name="openkeychain_required_long">Pix-Art Messenger utilizes a third party app called <b>OpenKeychain</b> to encrypt and decrypt messages and to manage your public keys.\n\nOpenKeychain is licensed under GPLv3 and available on F-Droid and Google Play.\n\n<small>(Please restart Pix-Art Messenger afterwards.)</small></string> - <string name="restart">Restart</string> - <string name="install">Install</string> - <string name="openkeychain_not_installed">Please install OpenKeychain</string> - <string name="offering">offering…</string> - <string name="waiting">waiting…</string> - <string name="no_pgp_key">No OpenPGP Key found</string> - <string name="contact_has_no_pgp_key">Pix-Art Messenger is unable to encrypt your messages because your contact is not announcing his or hers public key.\n\n<small>Please ask your contact to setup OpenPGP.</small></string> - <string name="no_pgp_keys">No OpenPGP Keys found</string> - <string name="pref_general">General</string> - <string name="pref_xmpp_resource">XMPP resource</string> - <string name="pref_xmpp_resource_summary">The name this client identifies itself with</string> - <string name="pref_accept_files_wifi">Accept files in WiFi connections</string> - <string name="pref_accept_files_summary_wifi">When connected to wifi automatically accept files smaller than…</string> - <string name="pref_accept_files_mobile">Accept files in mobile connections</string> - <string name="pref_accept_files_summary_mobile">When connected with mobile data automatically accept files smaller than…</string> - <string name="pref_accept_files_mobileroaming">Accept files in mobile roaming connections</string> - <string name="pref_accept_files_summary_mobileroaming">When connected with mobile data in roaming automatically accept files smaller than…</string> - <string name="pref_attachments">Attachments</string> - <string name="pref_notification_settings">Notification</string> - <string name="pref_notifications">Notifications</string> - <string name="pref_notifications_summary">Notify when a new message arrives</string> - <string name="pref_vibrate">Vibrate</string> - <string name="pref_vibrate_summary">Vibrate when a new message arrives</string> - <string name="pref_led">LED Notification</string> - <string name="pref_led_summary">Blink notification light when a new message arrives</string> - <string name="pref_sound">Ringtone</string> - <string name="pref_sound_summary">Play sound when a new message arrives</string> - <string name="pref_send_crash">Send crash reports</string> - <string name="pref_send_crash_summary">By sending in stack traces you are helping the ongoing development of Pix-Art Messenger</string> - <string name="pref_confirm_messages">Confirm Messages</string> - <string name="pref_confirm_messages_summary">Let your contact know when you have received and read a message</string> - <string name="pref_ui_options">UI</string> - <string name="openpgp_error">OpenKeychain reported an error</string> - <string name="accept">Accept</string> - <string name="error">An error has occurred</string> - <string name="pref_grant_presence_updates">Grant presence updates</string> - <string name="pref_grant_presence_updates_summary">Preemptively grant and ask for presence subscription for contacts you created</string> - <string name="your_account">Your account</string> - <string name="send_presence_updates">Send presence updates</string> - <string name="receive_presence_updates">Receive presence updates</string> - <string name="ask_for_presence_updates">Ask for presence updates</string> - <string name="attach_choose_picture">Choose picture</string> - <string name="attach_take_picture">Take picture</string> - <string name="preemptively_grant">Preemptively grant subscription request</string> - <string name="error_not_an_image_file">The file you selected is not an image</string> - <string name="error_compressing_image">Error while converting the image file</string> - <string name="error_file_not_found">File not found</string> - <string name="error_io_exception">General I/O error. Maybe you ran out of storage space?</string> - <string name="error_security_exception_during_image_copy">The app you used to select this image did not provide us with enough permissions to read the file.\n\n<small>Use a different file manager to choose an image</small></string> - <string name="account_status_unknown">Unknown</string> - <string name="account_status_disabled">Temporarily disabled</string> - <string name="account_status_online">Online</string> - <string name="account_status_connecting">Connecting\u2026</string> - <string name="account_status_offline">Offline</string> - <string name="account_status_unauthorized">Unauthorized</string> - <string name="account_status_not_found">Server not found</string> - <string name="account_status_no_internet">No connectivity</string> - <string name="account_status_regis_fail">Registration failed</string> - <string name="account_status_regis_conflict">Username already in use</string> - <string name="account_status_regis_success">Registration completed</string> - <string name="account_status_regis_not_sup">Server does not support registration</string> - <string name="account_status_security_error">Security error</string> - <string name="account_status_policy_violation">Policy violation</string> - <string name="account_status_incompatible_server">Incompatible server</string> - <string name="account_status_stream_error">Stream error</string> - <string name="encryption_choice_unencrypted">Unencrypted</string> - <string name="encryption_choice_otr">OTR</string> - <string name="encryption_choice_pgp">OpenPGP</string> - <string name="encryption_choice_omemo">OMEMO</string> - <string name="mgmt_account_edit">Edit account</string> - <string name="mgmt_account_delete">Delete account</string> - <string name="mgmt_account_publish_avatar">Publish avatar</string> - <string name="mgmt_account_publish_pgp">Publish OpenPGP public key</string> - <string name="openpgp_has_been_published">OpenPGP public key has been published.</string> - <string name="republish_pgp_keys">Remember to republish your OpenPGP public keys!</string> - <string name="mgmt_account_are_you_sure">Are you sure?</string> - <string name="mgmt_account_delete_confirm_text">If you delete your account your entire conversation history will be lost</string> - <string name="attach_record_voice">Record voice</string> - <string name="account_settings_jabber_id">Jabber ID</string> - <string name="account_settings_password">Password</string> - <string name="account_settings_example_jabber_id">username@pix-art.de</string> - <string name="account_settings_confirm_password">Confirm password</string> - <string name="password">Password</string> - <string name="confirm_password">Confirm password</string> - <string name="passwords_do_not_match">Passwords do not match</string> - <string name="invalid_jid">This is not a valid Jabber ID</string> - <string name="error_out_of_memory">Out of memory. Image is too large</string> - <string name="add_phone_book_text">Do you want to add %s to your address book?</string> - <string name="server_info_show_more">Server info</string> - <string name="server_info_mam">XEP-0313: MAM</string> - <string name="server_info_carbon_messages">XEP-0280: Message Carbons</string> - <string name="server_info_csi">XEP-0352: Client State Indication</string> - <string name="server_info_blocking">XEP-0191: Blocking Command</string> - <string name="server_info_roster_version">XEP-0237: Roster Versioning</string> - <string name="server_info_stream_management">XEP-0198: Stream Management</string> - <string name="server_info_pep">XEP-0163: PEP (Avatars / OMEMO)</string> - <string name="server_info_http_upload">XEP-0363: HTTP File Upload</string> - <string name="server_info_push">XEP-0357: Push</string> - <string name="server_info_available">available</string> - <string name="server_info_unavailable">unavailable</string> - <string name="missing_public_keys">Missing public key announcements</string> - <string name="last_seen_now">online</string> - <string name="last_seen_min">1 minute ago</string> - <string name="last_seen_mins">%d minutes ago</string> - <string name="last_seen_hour">1 hour ago</string> - <string name="last_seen_hours">%d hours ago</string> - <string name="last_seen_day">1 day ago</string> - <string name="last_seen_days">%d days ago</string> - <string name="install_openkeychain">Encrypted message. Please install OpenKeychain to decrypt.</string> - <string name="unknown_otr_fingerprint">Unknown OTR fingerprint</string> - <string name="openpgp_messages_found">OpenPGP encrypted messages found</string> - <string name="your_fingerprint">Your fingerprint</string> - <string name="otr_fingerprint">OTR fingerprint</string> - <string name="otr_fingerprint_selected_message">OTR fingerprint of message</string> - <string name="openpgp_key_id">OpenPGP Key ID</string> - <string name="omemo_fingerprint">OMEMO fingerprint</string> - <string name="omemo_fingerprint_x509">v\\OMEMO fingerprint</string> - <string name="omemo_fingerprint_selected_message">OMEMO fingerprint of message</string> - <string name="omemo_fingerprint_x509_selected_message">v\\OMEMO fingerprint of message</string> - <string name="this_device_omemo_fingerprint">Own OMEMO fingerprint</string> - <string name="other_devices">Other devices</string> - <string name="trust_omemo_fingerprints">Trust OMEMO Fingerprints</string> - <string name="fetching_keys">Fetching keys…</string> - <string name="done">Done</string> - <string name="verify">Verify</string> - <string name="decrypt">Decrypt</string> - <string name="conferences">Conferences</string> - <string name="search">Search</string> - <string name="create_contact">Create Contact</string> - <string name="enter_contact">Enter Contact</string> - <string name="join_conference">Join Conference</string> - <string name="delete_contact">Delete Contact</string> - <string name="view_contact_details">View contact details</string> - <string name="block_contact">Block contact</string> - <string name="unblock_contact">Unblock contact</string> - <string name="create">Create</string> - <string name="select">Select</string> - <string name="contact_already_exists">The contact already exists</string> - <string name="join">Join</string> - <string name="conference_address">Conference address</string> - <string name="conference_address_example">conference@room.pix-art.de</string> - <string name="save_as_bookmark">Save as bookmark</string> - <string name="delete_bookmark">Delete bookmark</string> - <string name="bookmark_already_exists">This bookmark already exists</string> - <string name="action_edit_subject">Edit conference subject</string> - <string name="edit_subject_hint">The subject of this conference</string> - <string name="joining_conference">Joining conference…</string> - <string name="leave">Leave</string> - <string name="contact_added_you">Contact added you to contact list</string> - <string name="add_back">Add back</string> - <string name="contact_has_read_up_to_this_point">%s has read up to this point</string> - <string name="publish">Publish</string> - <string name="touch_to_choose_picture">Touch avatar to select picture from gallery</string> - <string name="publish_avatar_explanation">Please note: Everyone subscribed to your presence updates will be allowed to see this picture.</string> - <string name="publishing">Publishing…</string> - <string name="error_publish_avatar_server_reject">The server rejected your publication</string> - <string name="error_publish_avatar_converting">Something went wrong while converting your picture</string> - <string name="error_saving_avatar">Could not save avatar to disk</string> - <string name="or_long_press_for_default">(Or long press to bring back default)</string> - <string name="error_publish_avatar_no_server_support">Your server does not support the publication of avatars</string> - <string name="private_message">whispered</string> - <string name="private_message_to">to %s</string> - <string name="send_private_message_to">Send private message to %s</string> - <string name="connect">Connect</string> - <string name="account_already_exists">This account already exists</string> - <string name="next">Next</string> - <string name="server_info_session_established">Current session established</string> - <string name="skip">Skip</string> - <string name="disable_notifications">Disable notifications</string> - <string name="enable">Enable</string> - <string name="conference_requires_password">Conference requires password</string> - <string name="enter_password">Enter password</string> - <string name="request_presence_updates">Please request presence updates from your contact first.\n\n<small>This will be used to determine what client(s) your contact is using.</small></string> - <string name="request_now">Request now</string> - <string name="delete_fingerprint">Delete Fingerprint</string> - <string name="sure_delete_fingerprint">Are you sure you would like to delete this fingerprint?</string> - <string name="ignore">Ignore</string> - <string name="without_mutual_presence_updates"><b>Warning:</b> Sending this without mutual presence updates could cause unexpected problems.\n\n<small>Go to contact details to verify your presence subscriptions.</small></string> - <string name="pref_security_settings">Security and data protection</string> - <string name="pref_allow_message_correction">Allow message correction</string> - <string name="pref_allow_message_correction_summary">Allow your contacts to retroactively edit their 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_expert_options">Expert settings</string> - <string name="title_activity_about">About Pix-Art Messenger</string> - <string name="pref_about_conversations_summary">Build and licensing information</string> + <string name="app_name" translatable="false">Pix-Art Messenger</string> + <string name="action_settings">Settings</string> + <string name="action_add">New conversation</string> + <string name="action_accounts">Manage accounts</string> + <string name="action_end_conversation">End this conversation</string> + <string name="action_contact_details">Contact details</string> + <string name="action_secure">Secure conversation</string> + <string name="action_add_account">Add account</string> + <string name="action_edit_contact">Edit name</string> + <string name="action_add_phone_book">Add to address book</string> + <string name="action_delete_contact">Delete from roster</string> + <string name="action_block_contact">Block contact</string> + <string name="action_unblock_contact">Unblock contact</string> + <string name="action_block_domain">Block domain</string> + <string name="action_unblock_domain">Unblock domain</string> + <string name="title_activity_manage_accounts">Manage Accounts</string> + <string name="title_activity_settings">Settings</string> + <string name="title_activity_conference_details">Conference Details</string> + <string name="title_activity_contact_details">Contact Details</string> + <string name="title_activity_sharewith">Share with Conversation</string> + <string name="title_activity_start_conversation">Start Conversation</string> + <string name="title_activity_choose_contact">Choose contact</string> + <string name="title_activity_block_list">Block list</string> + <string name="just_now">just now</string> + <string name="minute_ago">1 min ago</string> + <string name="minutes_ago">%d mins ago</string> + <string name="unread_conversations">unread Conversations</string> + <string name="sending">sending…</string> + <string name="message_decrypting">Decrypting message. Please wait…</string> + <string name="pgp_message">OpenPGP encrypted message</string> + <string name="nick_in_use">Nickname is already in use</string> + <string name="admin">Admin</string> + <string name="owner">Owner</string> + <string name="moderator">Moderator</string> + <string name="participant">Participant</string> + <string name="visitor">Visitor</string> + <string name="remove_contact_text">Would you like to remove %s from your roster? The conversation associated with this contact will not be removed.</string> + <string name="block_contact_text">Would you like to block %s from sending you messages?</string> + <string name="unblock_contact_text">Would you like to unblock %s and allow them to send you messages?</string> + <string name="block_domain_text">Block all contacts from %s?</string> + <string name="unblock_domain_text">Unblock all contacts from %s?</string> + <string name="contact_blocked">Contact blocked</string> + <string name="remove_bookmark_text">Would you like to remove %s as a bookmark? The conversation associated with this bookmark will not be removed.</string> + <string name="register_account">Register new account on server</string> + <string name="change_password_on_server">Change password on server</string> + <string name="share_with">Share with…</string> + <string name="start_conversation">Start Conversation</string> + <string name="invite_contact">Invite Contact</string> + <string name="contacts">Contacts</string> + <string name="cancel">Cancel</string> + <string name="set">Set</string> + <string name="add">Add</string> + <string name="edit">Edit</string> + <string name="delete">Delete</string> + <string name="block">Block</string> + <string name="unblock">Unblock</string> + <string name="save">Save</string> + <string name="ok">OK</string> + <string name="crash_report_title">Pix-Art Messenger has crashed</string> + <string name="crash_report_message">By sending in stack traces you are helping the ongoing development of Pix-Art Messenger\n<b>Warning:</b> This will use your XMPP account to send the stack trace to the developer.</string> + <string name="send_now">Send now</string> + <string name="send_never">Never ask again</string> + <string name="problem_connecting_to_account">Unable to connect to account</string> + <string name="problem_connecting_to_accounts">Unable to connect to multiple accounts</string> + <string name="touch_to_fix">Touch here to manage your accounts</string> + <string name="attach_file">Attach file</string> + <string name="not_in_roster">The contact is not in your roster. Would you like to add it?</string> + <string name="add_contact">Add contact</string> + <string name="send_failed">delivery failed</string> + <string name="preparing_image">Preparing image for transmission</string> + <string name="preparing_images">Preparing images for transmission</string> + <string name="sharing_files_please_wait">Sharing files. Please wait…</string> + <string name="action_clear_history">Clear history</string> + <string name="clear_conversation_history">Clear Conversation History</string> + <string name="clear_histor_msg">Do you want to delete all messages within this Conversation?\n\n<b>Warning:</b> This will not influence messages stored on other devices or servers.</string> + <string name="delete_messages">Delete messages</string> + <string name="also_end_conversation">End this conversation afterwards</string> + <string name="choose_presence">Choose device</string> + <string name="send_unencrypted_message">Send unencrypted message</string> + <string name="send_message_to_x">Send message to %s</string> + <string name="send_otr_message">Send OTR encrypted message</string> + <string name="send_omemo_message">Send OMEMO encrypted message</string> + <string name="send_omemo_x509_message">Send v\\OMEMO encrypted message</string> + <string name="send_pgp_message">Send OpenPGP encrypted message</string> + <string name="your_nick_has_been_changed">Your nickname has been changed</string> + <string name="send_unencrypted">Send unencrypted</string> + <string name="decryption_failed">Decryption failed. Maybe you don’t have the proper private key.</string> + <string name="openkeychain_required">OpenKeychain</string> + <string name="openkeychain_required_long">Pix-Art Messenger utilizes a third party app called <b>OpenKeychain</b> to encrypt and decrypt messages and to manage your public keys.\n\nOpenKeychain is licensed under GPLv3 and available on F-Droid and Google Play.\n\n<small>(Please restart Pix-Art Messenger afterwards.)</small></string> + <string name="restart">Restart</string> + <string name="install">Install</string> + <string name="openkeychain_not_installed">Please install OpenKeychain</string> + <string name="offering">offering…</string> + <string name="waiting">waiting…</string> + <string name="no_pgp_key">No OpenPGP Key found</string> + <string name="contact_has_no_pgp_key">Pix-Art Messenger is unable to encrypt your messages because your contact is not announcing his or hers public key.\n\n<small>Please ask your contact to setup OpenPGP.</small></string> + <string name="no_pgp_keys">No OpenPGP Keys found</string> + <string name="pref_general">General</string> + <string name="pref_xmpp_resource">XMPP resource</string> + <string name="pref_xmpp_resource_summary">The name this client identifies itself with</string> + <string name="pref_accept_files_wifi">Accept files in WiFi connections</string> + <string name="pref_accept_files_summary_wifi">When connected to wifi automatically accept files smaller than…</string> + <string name="pref_accept_files_mobile">Accept files in mobile connections</string> + <string name="pref_accept_files_summary_mobile">When connected with mobile data automatically accept files smaller than…</string> + <string name="pref_accept_files_mobileroaming">Accept files in mobile roaming connections</string> + <string name="pref_accept_files_summary_mobileroaming">When connected with mobile data in roaming automatically accept files smaller than…</string> + <string name="pref_attachments">Attachments</string> + <string name="pref_notification_settings">Notification</string> + <string name="pref_notifications">Notifications</string> + <string name="pref_notifications_summary">Notify when a new message arrives</string> + <string name="pref_vibrate">Vibrate</string> + <string name="pref_vibrate_summary">Vibrate when a new message arrives</string> + <string name="pref_led">LED Notification</string> + <string name="pref_led_summary">Blink notification light when a new message arrives</string> + <string name="pref_sound">Ringtone</string> + <string name="pref_sound_summary">Play sound when a new message arrives</string> + <string name="pref_send_crash">Send crash reports</string> + <string name="pref_send_crash_summary">By sending in stack traces you are helping the ongoing development of Pix-Art Messenger</string> + <string name="pref_confirm_messages">Confirm Messages</string> + <string name="pref_confirm_messages_summary">Let your contact know when you have received and read a message</string> + <string name="pref_ui_options">UI</string> + <string name="openpgp_error">OpenKeychain reported an error</string> + <string name="accept">Accept</string> + <string name="error">An error has occurred</string> + <string name="pref_grant_presence_updates">Grant presence updates</string> + <string name="pref_grant_presence_updates_summary">Preemptively grant and ask for presence subscription for contacts you created</string> + <string name="your_account">Your account</string> + <string name="send_presence_updates">Send presence updates</string> + <string name="receive_presence_updates">Receive presence updates</string> + <string name="ask_for_presence_updates">Ask for presence updates</string> + <string name="attach_choose_picture">Choose picture</string> + <string name="attach_take_picture">Take picture</string> + <string name="preemptively_grant">Preemptively grant subscription request</string> + <string name="error_not_an_image_file">The file you selected is not an image</string> + <string name="error_compressing_image">Error while converting the image file</string> + <string name="error_file_not_found">File not found</string> + <string name="error_io_exception">General I/O error. Maybe you ran out of storage space?</string> + <string name="error_security_exception_during_image_copy">The app you used to select this image did not provide us with enough permissions to read the file.\n\n<small>Use a different file manager to choose an image</small></string> + <string name="account_status_unknown">Unknown</string> + <string name="account_status_disabled">Temporarily disabled</string> + <string name="account_status_online">Online</string> + <string name="account_status_connecting">Connecting\u2026</string> + <string name="account_status_offline">Offline</string> + <string name="account_status_unauthorized">Unauthorized</string> + <string name="account_status_not_found">Server not found</string> + <string name="account_status_no_internet">No connectivity</string> + <string name="account_status_regis_fail">Registration failed</string> + <string name="account_status_regis_conflict">Username already in use</string> + <string name="account_status_regis_success">Registration completed</string> + <string name="account_status_regis_not_sup">Server does not support registration</string> + <string name="account_status_security_error">Security error</string> + <string name="account_status_policy_violation">Policy violation</string> + <string name="account_status_incompatible_server">Incompatible server</string> + <string name="account_status_stream_error">Stream error</string> + <string name="encryption_choice_unencrypted">Unencrypted</string> + <string name="encryption_choice_otr">OTR</string> + <string name="encryption_choice_pgp">OpenPGP</string> + <string name="encryption_choice_omemo">OMEMO</string> + <string name="mgmt_account_edit">Edit account</string> + <string name="mgmt_account_delete">Delete account</string> + <string name="mgmt_account_publish_avatar">Publish avatar</string> + <string name="mgmt_account_publish_pgp">Publish OpenPGP public key</string> + <string name="openpgp_has_been_published">OpenPGP public key has been published.</string> + <string name="republish_pgp_keys">Remember to republish your OpenPGP public keys!</string> + <string name="mgmt_account_are_you_sure">Are you sure?</string> + <string name="mgmt_account_delete_confirm_text">If you delete your account your entire conversation history will be lost</string> + <string name="attach_record_voice">Record voice</string> + <string name="account_settings_jabber_id">Jabber ID</string> + <string name="account_settings_password">Password</string> + <string name="account_settings_example_jabber_id">username@pix-art.de</string> + <string name="account_settings_confirm_password">Confirm password</string> + <string name="password">Password</string> + <string name="confirm_password">Confirm password</string> + <string name="passwords_do_not_match">Passwords do not match</string> + <string name="invalid_jid">This is not a valid Jabber ID</string> + <string name="error_out_of_memory">Out of memory. Image is too large</string> + <string name="add_phone_book_text">Do you want to add %s to your address book?</string> + <string name="server_info_show_more">Server info</string> + <string name="server_info_mam">XEP-0313: MAM</string> + <string name="server_info_carbon_messages">XEP-0280: Message Carbons</string> + <string name="server_info_csi">XEP-0352: Client State Indication</string> + <string name="server_info_blocking">XEP-0191: Blocking Command</string> + <string name="server_info_roster_version">XEP-0237: Roster Versioning</string> + <string name="server_info_stream_management">XEP-0198: Stream Management</string> + <string name="server_info_pep">XEP-0163: PEP (Avatars / OMEMO)</string> + <string name="server_info_http_upload">XEP-0363: HTTP File Upload</string> + <string name="server_info_push">XEP-0357: Push</string> + <string name="server_info_available">available</string> + <string name="server_info_unavailable">unavailable</string> + <string name="missing_public_keys">Missing public key announcements</string> + <string name="last_seen_now">online</string> + <string name="last_seen_min">1 minute ago</string> + <string name="last_seen_mins">%d minutes ago</string> + <string name="last_seen_hour">1 hour ago</string> + <string name="last_seen_hours">%d hours ago</string> + <string name="last_seen_day">1 day ago</string> + <string name="last_seen_days">%d days ago</string> + <string name="install_openkeychain">Encrypted message. Please install OpenKeychain to decrypt.</string> + <string name="unknown_otr_fingerprint">Unknown OTR fingerprint</string> + <string name="openpgp_messages_found">OpenPGP encrypted messages found</string> + <string name="your_fingerprint">Your fingerprint</string> + <string name="otr_fingerprint">OTR fingerprint</string> + <string name="otr_fingerprint_selected_message">OTR fingerprint of message</string> + <string name="openpgp_key_id">OpenPGP Key ID</string> + <string name="omemo_fingerprint">OMEMO fingerprint</string> + <string name="omemo_fingerprint_x509">v\\OMEMO fingerprint</string> + <string name="omemo_fingerprint_selected_message">OMEMO fingerprint of message</string> + <string name="omemo_fingerprint_x509_selected_message">v\\OMEMO fingerprint of message</string> + <string name="this_device_omemo_fingerprint">Own OMEMO fingerprint</string> + <string name="other_devices">Other devices</string> + <string name="trust_omemo_fingerprints">Trust OMEMO Fingerprints</string> + <string name="fetching_keys">Fetching keys…</string> + <string name="done">Done</string> + <string name="verify">Verify</string> + <string name="decrypt">Decrypt</string> + <string name="conferences">Conferences</string> + <string name="search">Search</string> + <string name="create_contact">Create Contact</string> + <string name="enter_contact">Enter Contact</string> + <string name="join_conference">Join Conference</string> + <string name="delete_contact">Delete Contact</string> + <string name="view_contact_details">View contact details</string> + <string name="block_contact">Block contact</string> + <string name="unblock_contact">Unblock contact</string> + <string name="create">Create</string> + <string name="select">Select</string> + <string name="contact_already_exists">The contact already exists</string> + <string name="join">Join</string> + <string name="conference_address">Conference address</string> + <string name="conference_address_example">conference@room.pix-art.de</string> + <string name="save_as_bookmark">Save as bookmark</string> + <string name="delete_bookmark">Delete bookmark</string> + <string name="bookmark_already_exists">This bookmark already exists</string> + <string name="action_edit_subject">Edit conference subject</string> + <string name="edit_subject_hint">The subject of this conference</string> + <string name="joining_conference">Joining conference…</string> + <string name="leave">Leave</string> + <string name="contact_added_you">Contact added you to contact list</string> + <string name="add_back">Add back</string> + <string name="contact_has_read_up_to_this_point">%s has read up to this point</string> + <string name="publish">Publish</string> + <string name="touch_to_choose_picture">Touch avatar to select picture from gallery</string> + <string name="publish_avatar_explanation">Please note: Everyone subscribed to your presence updates will be allowed to see this picture.</string> + <string name="publishing">Publishing…</string> + <string name="error_publish_avatar_server_reject">The server rejected your publication</string> + <string name="error_publish_avatar_converting">Something went wrong while converting your picture</string> + <string name="error_saving_avatar">Could not save avatar to disk</string> + <string name="or_long_press_for_default">(Or long press to bring back default)</string> + <string name="error_publish_avatar_no_server_support">Your server does not support the publication of avatars</string> + <string name="private_message">whispered</string> + <string name="private_message_to">to %s</string> + <string name="send_private_message_to">Send private message to %s</string> + <string name="connect">Connect</string> + <string name="account_already_exists">This account already exists</string> + <string name="next">Next</string> + <string name="server_info_session_established">Current session established</string> + <string name="skip">Skip</string> + <string name="disable_notifications">Disable notifications</string> + <string name="enable">Enable</string> + <string name="conference_requires_password">Conference requires password</string> + <string name="enter_password">Enter password</string> + <string name="request_presence_updates">Please request presence updates from your contact first.\n\n<small>This will be used to determine what client(s) your contact is using.</small></string> + <string name="request_now">Request now</string> + <string name="delete_fingerprint">Delete Fingerprint</string> + <string name="sure_delete_fingerprint">Are you sure you would like to delete this fingerprint?</string> + <string name="ignore">Ignore</string> + <string name="without_mutual_presence_updates"><b>Warning:</b> Sending this without mutual presence updates could cause unexpected problems.\n\n<small>Go to contact details to verify your presence subscriptions.</small></string> + <string name="pref_security_settings">Security and data protection</string> + <string name="pref_allow_message_correction">Allow message correction</string> + <string name="pref_allow_message_correction_summary">Allow your contacts to retroactively edit their 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_expert_options">Expert settings</string> + <string name="title_activity_about">About Pix-Art Messenger</string> + <string name="pref_about_conversations_summary">Build and licensing information</string> <string name="pref_about_message" translatable="false">Pix-Art Messenger \n\nCopyright © 2014-2016 Christian Schneppe \n\nhttp://jabber.pix-art.de @@ -318,397 +318,397 @@ \n\nhttps://github.com/blazsolar/FlowLayout\n(Apache License, Version 2.0) \n\nhttps://github.com/ankushsachdeva/emojicon\n(Apache License, Version 2.0) </string> - <string name="title_pref_quiet_hours">Quiet Hours</string> - <string name="title_pref_quiet_hours_start_time">Start time</string> - <string name="title_pref_quiet_hours_end_time">End time</string> - <string name="title_pref_enable_quiet_hours">Enable quiet hours</string> - <string name="pref_quiet_hours_summary">Notifications will be silenced during quiet hours</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_indicate_received">Request message receipts</string> - <string name="pref_use_indicate_received_summary">Received messages will be marked with a green tick if supported</string> - <string name="pref_use_send_button_to_indicate_status_summary">Colorize send button to indicate contact status</string> - <string name="pref_expert_options_other">Other</string> - <string name="pref_autojoin">Automatically join conferences</string> - <string name="pref_autojoin_summary">Respect the autojoin flag in conference bookmarks</string> - <string name="toast_message_otr_fingerprint">OTR fingerprint copied to clipboard!</string> - <string name="toast_message_omemo_fingerprint">OMEMO fingerprint copied to clipboard!</string> - <string name="conference_banned">You are banned from this conference</string> - <string name="conference_members_only">This conference is members only</string> - <string name="conference_kicked">You have been kicked from this conference</string> - <string name="conference_shutdown">The conference was shut down</string> - <string name="using_account">using account %s</string> - <string name="checking_x">Checking %s on HTTP host</string> - <string name="not_connected_try_again">You are not connected. Try again later</string> - <string name="check_x_filesize">Check %s size</string> - <string name="check_x_filesize_on_host">Check %1$s size on %2$s</string> - <string name="message_options">Message options</string> - <string name="copy_text">Copy text</string> - <string name="copy_original_url">Copy original URL</string> - <string name="send_again">Send again</string> - <string name="file_url">File URL</string> - <string name="message_text">Message text</string> - <string name="url_copied_to_clipboard">URL copied to clipboard</string> - <string name="message_copied_to_clipboard">Message copied to clipboard</string> - <string name="scan_qr_code">Scan QR code</string> - <string name="show_qr_code">Show QR code</string> - <string name="show_block_list">Show block list</string> - <string name="account_details">Account details</string> - <string name="verify_otr">Verify OTR</string> - <string name="remote_fingerprint">Remote Fingerprint</string> - <string name="shared_secret_hint">Hint or Question</string> - <string name="shared_secret_secret">Shared Secret</string> - <string name="confirm">Confirm</string> - <string name="in_progress">In progress</string> - <string name="respond">Respond</string> - <string name="failed">Failed</string> - <string name="secrets_do_not_match">Secrets do not match</string> - <string name="try_again">Try again</string> - <string name="finish">Finish</string> - <string name="verified">Verified!</string> - <string name="smp_requested">Contact requested SMP verification</string> - <string name="no_otr_session_found">No valid OTR session has been found!</string> - <string name="conversations_foreground_service">Pix-Art Messenger</string> - <string name="pref_export_logs">Export Logs</string> - <string name="pref_export_logs_summary">Write logs to SD card</string> - <string name="notification_export_logs_title">Writing backup to SD card</string> - <string name="choose_file">Choose file</string> - <string name="receiving_x_file">Receiving %1$s (%2$d%% completed)</string> - <string name="download_x_file">Download %s</string> - <string name="delete_x_file">Delete %s</string> - <string name="file">file</string> - <string name="open_x_file">Open %s</string> - <string name="sending_file">sending (%1$d%% completed)</string> - <string name="preparing_file">Preparing file for transmission</string> - <string name="x_file_offered_for_download">%s offered for download</string> - <string name="cancel_transmission">Cancel transmission</string> - <string name="file_transmission_failed">file transmission failed</string> - <string name="file_deleted">The file has been deleted</string> - <string name="no_application_found_to_open_file">No application found to open file</string> - <string name="could_not_verify_fingerprint">Could not verify fingerprint</string> - <string name="manually_verify">Manually verify</string> - <string name="are_you_sure_verify_fingerprint">Are you sure that you want to verify your contacts OTR fingerprint?</string> - <string name="pref_show_dynamic_tags">Show dynamic tags</string> - <string name="pref_show_dynamic_tags_summary">Display read-only tags underneath contacts</string> - <string name="enable_notifications">Enable notifications</string> - <string name="no_conference_server_found">No conference server found</string> - <string name="conference_creation_failed">Conference creation failed!</string>s - <string name="account_image_description">Account avatar</string> - <string name="copy_otr_clipboard_description">Copy OTR fingerprint to clipboard</string> - <string name="copy_omemo_clipboard_description">Copy OMEMO fingerprint to clipboard</string> - <string name="regenerate_omemo_key">Regenerate OMEMO key</string> - <string name="clear_other_devices">Clear devices</string> - <string name="clear_other_devices_desc">Are you sure you want to clear all other devices from the OMEMO announcement? The next time your devices connect, they will reannounce themselves, but they might not receive messages sent in the meantime.</string> - <string name="purge_key">Purge key</string> - <string name="purge_key_desc_part1">Are you sure you want to purge this key?</string> - <string name="purge_key_desc_part2">It will irreversibly be considered compromised, and you can never build a session with it again.</string> - <string name="error_no_keys_to_trust_server_error">There are no usable keys available for this contact.\nFetching new keys from the server has been unsuccessful. Maybe there is something wrong with your contacts server.</string> - <string name="error_no_keys_to_trust">There are no usable keys available for this contact. If you have purged any of their keys, they need to generate new ones.</string> - <string name="error_trustkeys_title">Error</string> - <string name="fetching_history_from_server">Fetching history from server</string> - <string name="no_more_history_on_server">No more history on server</string> - <string name="updating">Updating…</string> - <string name="password_changed">Password changed!</string> - <string name="could_not_change_password">Could not change password</string> - <string name="otr_session_not_started">Send a message to start an encrypted chat</string> - <string name="ask_question">Ask question</string> - <string name="smp_explain_question">If you and your contact have a secret in common that no one else knows (like an inside joke or simply what you had for lunch the last time you met) you can use that secret to verify each other’s fingerprints.\n\nYou provide a hint or a question for your contact who will respond with a case-sensitive answer.</string> - <string name="smp_explain_answer">Your contact would like to verify your fingerprint by challenging you with a shared secret. Your contact provided the following hint or question for that secret.</string> - <string name="shared_secret_hint_should_not_be_empty">Your hint should not be empty</string> - <string name="shared_secret_can_not_be_empty">Your shared secret can not be empty</string> - <string name="manual_verification_explanation">Carefully compare the fingerprint shown below with the fingerprint of your contact.\nYou can use any trusted form of communication like an encrypted e-mail or a telephone call to exchange those.</string> - <string name="change_password">Change password</string> - <string name="current_password">Current password</string> - <string name="new_password">New password</string> - <string name="password_should_not_be_empty">Password should not be empty</string> - <string name="perform_action_with">Perform action with</string> - <string name="no_affiliation">No affiliation</string> - <string name="no_role">Offline</string> - <string name="outcast">Outcast</string> - <string name="member">Member</string> - <string name="advanced_mode">Advanced mode</string> - <string name="grant_membership">Grant membership</string> - <string name="remove_membership">Revoke membership</string> - <string name="grant_admin_privileges">Grant admin privileges</string> - <string name="remove_admin_privileges">Revoke admin privileges</string> - <string name="remove_from_room">Remove from conference</string> - <string name="could_not_change_affiliation">Could not change affiliation of %s</string> - <string name="ban_from_conference">Ban from conference</string> - <string name="removing_from_public_conference">You are trying to remove %s from a public conference. The only way to do that is to ban that user for ever.</string> - <string name="ban_now">Ban now</string> - <string name="could_not_change_role">Could not change role of %s</string> - <string name="public_conference">Publicly accessible conference</string> - <string name="private_conference">Private, members only conference</string> - <string name="conference_options">Conference options</string> - <string name="members_only">Private, members only</string> - <string name="non_anonymous">Non-anonymous</string> - <string name="moderated">Moderated</string> - <string name="you_are_not_participating">You are not participating</string> - <string name="modified_conference_options">Modified conference options!</string> - <string name="could_not_modify_conference_options">Could not modify conference options</string> - <string name="never">Never</string> - <string name="thirty_minutes">30 minutes</string> - <string name="one_hour">1 hour</string> - <string name="two_hours">2 hours</string> - <string name="eight_hours">8 hours</string> - <string name="until_further_notice">Until further notice</string> - <string name="pref_input_options">Input</string> - <string name="pref_enter_is_send">Enter is send</string> - <string name="pref_enter_is_send_summary">Use enter key to send message</string> - <string name="pref_display_enter_key">Show enter key</string> - <string name="pref_display_enter_key_summary">Change the emoticons key to an enter key</string> - <string name="audio">audio</string> - <string name="video">video</string> - <string name="image">image</string> - <string name="pdf_document">PDF document</string> - <string name="apk">Android App</string> - <string name="vcard">Contact</string> - <string name="received_x_file">Received %s</string> - <string name="disable_foreground_service">Disable foreground service</string> - <string name="touch_to_open_conversations">Touch to open Pix-Art Messenger</string> - <string name="avatar_has_been_published">Avatar has been published!</string> - <string name="sending_x_file">Sending %s</string> - <string name="offering_x_file">Offering %s</string> - <string name="hide_offline">Hide offline</string> - <string name="is_typing">is typing…</string> - <string name="pref_chat_states">Typing notifications</string> - <string name="pref_chat_states_summary">Let your contact know when you are writing a new message</string> - <string name="send_location">Send location</string> - <string name="show_location">Show location</string> - <string name="no_application_found_to_display_location">No application found to display location</string> - <string name="location">Location</string> - <string name="received_location">Received location</string> - <string name="title_undo_swipe_out_conversation">Conversation closed</string> - <string name="title_undo_swipe_out_muc">Left conference</string> - <string name="pref_dont_trust_system_cas_title">Don’t trust system CAs</string> - <string name="pref_dont_trust_system_cas_summary">All certificates must be manually approved</string> - <string name="pref_remove_trusted_certificates_title">Remove certificates</string> - <string name="pref_remove_trusted_certificates_summary">Delete manually approved certificates</string> - <string name="toast_no_trusted_certs">No manually approved certificates</string> - <string name="dialog_manage_certs_title">Remove certificates</string> - <string name="dialog_manage_certs_positivebutton">Delete selection</string> - <string name="dialog_manage_certs_negativebutton">Cancel</string> - <plurals name="toast_delete_certificates"> - <item quantity="one">%d certificate deleted</item> - <item quantity="other">%d certificates deleted</item> - </plurals> - <plurals name="select_contact"> - <item quantity="one">Select %d contact</item> - <item quantity="other">Select %d contacts</item> - </plurals> - <string name="pref_quick_action_summary">Replace send button with quick action</string> - <string name="pref_quick_action">Quick Action</string> - <string name="none">None</string> - <string name="recently_used">Most recently used</string> - <string name="choose_quick_action">Choose quick action</string> - <string name="search_for_contacts_or_groups">Search for contacts or groups</string> - <string name="send_private_message">Send private message</string> - <string name="user_has_left_conference">%s has left the conference!</string> - <string name="username">Username</string> - <string name="username_hint">Username</string> - <string name="invalid_username">This is not a valid username</string> - <string name="download_failed_server_not_found">Download failed: Server not found</string> - <string name="download_failed_file_not_found">Download failed: File not found</string> - <string name="download_failed_could_not_connect">Download failed: Could not connect to host</string> - <string name="elv_undo">undo</string> - <string name="download_failed_could_not_write_file">Download failed: Could not write file</string> - <string name="pref_use_white_background">Use white background</string> - <string name="pref_use_white_background_summary">Show received messages as black text on a white background</string> - <string name="action_check_update">Check for Updates</string> - <string name="title_activity_updater">Update Service</string> - <string name="update_available">Version %1$s is available.\n\nFilesize: %2$s\n\nUpdate to version %1$s now?\n\n\n%4$s</string> - <string name="checking_for_updates">Checking for Pix-Art Messenger updates</string> - <string name="remind_later">later</string> - <string name="update">update</string> - <string name="no_update_available">No update available</string> - <string name="download_started">Download started</string> - <string name="account_status_tor_unavailable">Tor network unavailable</string> - <string name="account_status_bind_failure">Bind failure</string> - <string name="account_status_host_unknown">Server not responsible for domain</string> - <string name="server_info_broken">Broken</string> - <string name="pref_presence_settings">Presence</string> - <string name="pref_away_when_screen_off">Away when screen is off</string> - <string name="pref_away_when_screen_off_summary">Marks your resource as away when the screen is turned off</string> - <string name="pref_xa_on_silent_mode">Not available in silent mode</string> - <string name="update_info">Pix-Art Messenger is checking for an update. If an update is available you will be asked, if you want to update your version. The update process is downloading and installing the new version automatically.\n\nPlease wait…</string> - <string name="pref_xa_on_silent_mode_summary">Marks your resource as not available when device is in silent mode</string> - <string name="pref_treat_vibrate_as_silent">Treat vibrate as silent mode</string> - <string name="pref_treat_vibrate_as_silent_summary">Marks your resource as not available when device is on vibrate</string> - <string name="hostname_example">xmpp.pix-art.de</string> - <string name="action_add_account_with_certificate">Add account with certificate</string> - <string name="unable_to_parse_certificate">Unable to parse certificate</string> - <string name="authenticate_with_certificate">Leave empty to authenticate w/ certificate</string> - <string name="mam_prefs">Archiving preferences</string> - <string name="server_side_mam_prefs">Server-side archiving preferences</string> - <string name="fetching_mam_prefs">Fetching archiving preferences. Please wait…</string> - <string name="unable_to_fetch_mam_prefs">Unable to fetch archiving preferences</string> - <string name="captcha_required">Captcha required</string> - <string name="captcha_hint">Enter the text from the image above</string> - <string name="certificate_chain_is_not_trusted">Certificate chain is not trusted</string> - <string name="jid_does_not_match_certificate">Jabber ID does not match certificate</string> - <string name="action_renew_certificate">Renew certificate</string> - <string name="error_fetching_omemo_key">Error fetching OMEMO key!</string> - <string name="verified_omemo_key_with_certificate">Verified OMEMO key with certificate!</string> - <string name="device_does_not_support_certificates">Your device does not support the selection of client certificates!</string> - <string name="changelog">Changes</string> - <string name="account_settings_hostname">Hostname</string> - <string name="account_settings_port">Port</string> - <string name="hostname_or_onion">Server- or .onion-Address</string> - <string name="not_a_valid_port">This is not a valid port number</string> - <string name="not_valid_hostname">This is not a valid hostname</string> - <string name="connected_accounts">%1$d of %2$d accounts connected</string> - <plurals name="x_messages"> - <item quantity="one">%d message</item> - <item quantity="other">%d messages</item> - </plurals> - <string name="load_more_messages">Load more messages</string> - <string name="shared_file_with_x">Shared file with %s</string> - <string name="shared_image_with_x">Shared image with %s</string> - <string name="no_storage_permission">Pix-Art Messenger needs access to external storage</string> - <string name="shared_images_with_x">Shared images with %s</string> - <string name="shared_text_with_x">Shared text with %s</string> - <string name="sync_with_contacts">Synchronize with contacts</string> - <string name="sync_with_contacts_long">Pix-Art Messenger wants to match your XMPP roster with your contacts to show their full names and avatars.\n\nPix-Art Messenger will only read your contacts and match them locally without uploading them to your server.\n\nYou will now be asked to grant permission to access your contacts.</string> - <string name="certificate_information">Certificate Information</string> - <string name="certificate_subject">Subject</string> - <string name="certificate_issuer">Issuer</string> - <string name="certificate_cn">Common Name</string> - <string name="certificate_o">Organization</string> - <string name="certificate_sha1">SHA-1</string> - <string name="certicate_info_not_available">(Not available)</string> - <string name="certificate_not_found">No certificate found</string> - <string name="notify_on_all_messages">Notify on all messages</string> - <string name="notify_only_when_highlighted">Notify only when highlighted</string> - <string name="notify_never">Notifications disabled</string> - <string name="notify_paused">Notifications paused</string> - <string name="pref_picture_compression">Compress Pictures</string> - <string name="pref_picture_compression_summary">Resize and compress pictures</string> - <string name="pref_video_compression">Compress Videos</string> - <string name="pref_video_compression_summary">Resize and compress Videos</string> - <string name="always">Always</string> - <string name="automatically">Automatically</string> - <string name="battery_optimizations_enabled">Battery optimizations enabled</string> - <string name="battery_optimizations_enabled_explained">Your device is doing some heavy battery optimizations on Pix-Art Messenger that might lead to delayed notifications or even message loss.\nIt is recommended to disable those.</string> - <string name="battery_optimizations_enabled_dialog">Your device is doing some heavy battery optimizations on Pix-Art Messenger that might lead to delayed notifications or even message loss.\n\nYou will now be asked to disable those.</string> - <string name="disable">Disable</string> - <string name="selection_too_large">The selected area is too large</string> - <string name="cancel_update">Cancel update check?</string> - <string name="yes">Yes</string> - <string name="no">No</string> - <string name="no_accounts">(No activated accounts)</string> - <string name="this_field_is_required">This field is required</string> - <string name="no_participants">No participants</string> - <string name="correct_message">Correct message</string> - <string name="send_corrected_message">Send corrected message</string> - <string name="no_keys_just_confirm">You already trust this contact. By selecting \'done\' you are just confirming that %s is part of this conference.</string> - <string name="select_image_and_crop">Select image and crop</string> - <string name="contacts_have_no_pgp_keys">Pix-Art Messenger is unable to encrypt your messages because your contacts are not announcing their public keys.\n\n</string> - <string name="this_account_is_disabled">You have disabled this account</string> - <string name="security_error_invalid_file_access">Security error: Invalid file access</string> - <string name="no_application_to_share_uri">No application found to share URI</string> - <string name="share_uri_with">Share URI with…</string> - <string name="mgmt_account_reconnect">reconnect</string> - <string name="welcome_header" translatable="false">Pix-Art Messenger</string> - <string name="welcome_text">…is a free and secure XMPP/Jabber client for the use with pix-art.de</string> - <string name="magic_create_text">We will guide you through the process of creating an account on pix-art.de with a random password, which you can use or change to your own password on the next page. \nThan you will be able to communicate with users of this and other providers by giving them your full Jabber-ID.</string> - <string name="your_full_jid_will_be">Your Jabber-ID will be: %s</string> - <string name="create_account">Create new account</string> - <string name="use_existing_accout">Use an existing account</string> - <string name="pick_your_username">Choose your username</string> - <string name="pref_manually_change_presence">Manually change presence</string> - <string name="pref_manually_change_presence_summary">Change your presence inside your account</string> - <string name="change_presence">Change Presence</string> - <string name="status_message">Status message</string> - <string name="all_accounts_on_this_device">Set for all accounts on this device</string> - <string name="presence_chat">Free for Chat</string> - <string name="presence_online">Online</string> - <string name="presence_away">Away</string> - <string name="presence_xa">Not Available</string> - <string name="presence_dnd">Busy</string> - <string name="secure_password_generated">A secure password has been generated</string> - <string name="device_does_not_support_battery_op">Your device does not support opting out of battery optimization</string> - <string name="share">Share</string> - <string name="share_location">Share location</string> - <string name="location_sharing_disabled">Location sharing is disabled in settings</string> - <string name="locating">Locating…</string> - <string name="uninstall_plugins">We have integrated the VoiceRecorder and ShareLocation plugin directly into the messenger. You should uninstall the plugins.</string> - <string name="uninstall">Uninstall</string> - <string name="action_end_conversation_muc">Leave conference</string> - <string name="leave_conference_warning">Do you really want to leave this conference? You will no longer be notified of new messages until joining the conference again.</string> - <string name="show_password">Show password</string> - <string name="registration_please_wait">Registration failed: Try again later</string> - <string name="registration_password_too_weak">Registration failed: Password too weak</string> - <string name="create_conference">Create conference</string> - <string name="join_or_create_conference">Join or create conference</string> - <string name="conference_subject">Subject</string> - <string name="choose_participants">Choose participants</string> - <string name="creating_conference">Creating conference…</string> - <string name="import_text">There is a backup on your device which can be imported.\nPossibly you will be asked to uninstall the old version or Conversations and your Messenger will be restarted during backup process. Shall the backup be imported? </string> - <string name="import_database">Import backup</string> - <string name="invite_again">Invite again</string> - <string name="inviteUser_Subject">has invited you via</string> - <string name="InviteText">Hello,\n\nthe user %s has invited you to Pix-Art Messenger. If you are using Android, give it a try and click the following link to start over...</string> - <string name="pref_broadcast_last_activity">Broadcast Last User Interaction</string> - <string name="pref_broadcast_last_activity_summary">Let all your contacts know when use Pix-Art Messenger</string> - <string name="invite_user">Invite to Pix-Art Messenger</string> - <string name="request_permissions_message">Pix-Art Messenger will ask you to allow a few permissions. It is important that you allow all these permissions to use all features of this messenger. If you deny any of these permissions the app will close itself.</string> - <string name="request_permissions_message_again">You have denied some or all permissions needed for Pix-Art Messenger. Would you like to jump to the settings and allow these permissions? If you denie any of these permissions, the app will close itself.</string> - <string name="unable_to_connect_to_keychain">Unable to connect to OpenKeychain</string> - <string name="no_permission">Pix-Art Messenger has no permissions</string> - <string name="send_image">Send image?</string> - <string name="this_device_is_no_longer_in_use">This device is no longer in use</string> - <string name="type_pc">Computer</string> - <string name="type_phone">Mobile phone</string> - <string name="type_tablet">Tablet</string> - <string name="type_web">Web browser</string> - <string name="type_console">Console</string> - <string name="import_canceled">Import canceled</string> - <string name="Import_failed">Database import failed, an import is not possible</string> - <string name="Password_wrong">Wrong password, try again</string> - <string name="enter_account_password">Please enter your account password to import your backup.</string> - <string name="please_wait">Please wait…</string> - <string name="databaseimport_started">Backup will be imported, this may take awhile.</string> - <string name="pref_export_plain_text_logs_summary">Enable an export of chat logs as human readable text files</string> - <string name="pref_export_plain_text_logs">Export human readable chat logs</string> - <string name="payment_required">Payment required</string> - <string name="missing_internet_permission">Missing internet permission</string> - <string name="me">Me</string> - <string name="contact_asks_for_presence_subscription">Contact asks for presence subscription</string> - <string name="allow">Allow</string> - <string name="attach_choose_video">Choose video</string> - <string name="preparing_video">Prepare video for transmission. Please wait…</string> - <string name="compressing_video">Compressing video, please wait…</string> - <string name="shared_video_with_x">Shared video with %s</string> - <string name="no_permission_to_access_x">No permission to access %s</string> - <string name="remote_server_not_found">Remote server not found</string> - <string name="error_file_corrupt">This file seems to be corrupt.</string> - <string name="unable_to_update_account">Unable to update account</string> - <string name="missing_presence_subscription_with_x">Missing presence subscription with %s.</string> - <string name="missing_keys_from_x">Missing OMEMO keys from %s.</string> - <string name="wrong_conference_configuration">This is not a private, non-anonymous conference.</string> - <string name="this_conference_has_no_members">There are no members in this conference.</string> - <string name="report_jid_as_spammer">Report this JID as sending unwanted messages.</string> - <string name="create_issue">Report an issue</string> - <string name="pref_delete_omemo_identities">Delete OMEMO identities</string> - <string name="pref_delete_omemo_identities_summary">Regenerate your OMEMO keys. All your contacts will have to verify you again. Use this only as a last resort.</string> - <string name="delete_selected_keys">Delete selected keys</string> - <string name="missing_presence_subscription">Missing presence subscription</string> - <string name="missing_omemo_keys">Missing OMEMO keys</string> - <string name="error_publish_avatar_offline">You need to be connected to publish your avatar.</string> - <string name="select_text">Select text</string> - <string name="show_error_message">Show error message</string> - <string name="error_message">Error Message</string> - <string name="data_saver_enabled">Data saver enabled</string> - <string name="data_saver_enabled_explained">Your operating system is restricting Pix-Art Messenger from accessing the Internet when in background. To receive notifications of new messages you should allow Pix-Art Messenger unrestricted access when Data saver is on.\\nPix-Art Messenger will still make an effort to save data when possible.</string> - <string name="device_does_not_support_data_saver">Your device does not supporting disabling Data saver for Pix-Art Messenger.</string> - <string name="navigate">Navigate to location</string> - <string name="add_to_contact_list">Add to contact list</string> - <string name="received_contact">Received contact</string> - <string name="contact">Contact</string> - <string name="unable_to_start_recording">Unable to start recording</string> - <string name="error_unable_to_create_temporary_file">Unable to create temporary file</string> - <string name="this_device_has_been_verified">This device has been verified</string> - <string name="copy_fingerprint">Copy fingerprint</string> - <string name="all_omemo_keys_have_been_verified"><![CDATA[>All OMEMO keys have been verified]]></string> + <string name="title_pref_quiet_hours">Quiet Hours</string> + <string name="title_pref_quiet_hours_start_time">Start time</string> + <string name="title_pref_quiet_hours_end_time">End time</string> + <string name="title_pref_enable_quiet_hours">Enable quiet hours</string> + <string name="pref_quiet_hours_summary">Notifications will be silenced during quiet hours</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_indicate_received">Request message receipts</string> + <string name="pref_use_indicate_received_summary">Received messages will be marked with a green tick if supported</string> + <string name="pref_use_send_button_to_indicate_status_summary">Colorize send button to indicate contact status</string> + <string name="pref_expert_options_other">Other</string> + <string name="pref_autojoin">Automatically join conferences</string> + <string name="pref_autojoin_summary">Respect the autojoin flag in conference bookmarks</string> + <string name="toast_message_otr_fingerprint">OTR fingerprint copied to clipboard!</string> + <string name="toast_message_omemo_fingerprint">OMEMO fingerprint copied to clipboard!</string> + <string name="conference_banned">You are banned from this conference</string> + <string name="conference_members_only">This conference is members only</string> + <string name="conference_kicked">You have been kicked from this conference</string> + <string name="conference_shutdown">The conference was shut down</string> + <string name="using_account">using account %s</string> + <string name="checking_x">Checking %s on HTTP host</string> + <string name="not_connected_try_again">You are not connected. Try again later</string> + <string name="check_x_filesize">Check %s size</string> + <string name="check_x_filesize_on_host">Check %1$s size on %2$s</string> + <string name="message_options">Message options</string> + <string name="copy_text">Copy text</string> + <string name="copy_original_url">Copy original URL</string> + <string name="send_again">Send again</string> + <string name="file_url">File URL</string> + <string name="message_text">Message text</string> + <string name="url_copied_to_clipboard">URL copied to clipboard</string> + <string name="message_copied_to_clipboard">Message copied to clipboard</string> + <string name="scan_qr_code">Scan QR code</string> + <string name="show_qr_code">Show QR code</string> + <string name="show_block_list">Show block list</string> + <string name="account_details">Account details</string> + <string name="verify_otr">Verify OTR</string> + <string name="remote_fingerprint">Remote Fingerprint</string> + <string name="shared_secret_hint">Hint or Question</string> + <string name="shared_secret_secret">Shared Secret</string> + <string name="confirm">Confirm</string> + <string name="in_progress">In progress</string> + <string name="respond">Respond</string> + <string name="failed">Failed</string> + <string name="secrets_do_not_match">Secrets do not match</string> + <string name="try_again">Try again</string> + <string name="finish">Finish</string> + <string name="verified">Verified!</string> + <string name="smp_requested">Contact requested SMP verification</string> + <string name="no_otr_session_found">No valid OTR session has been found!</string> + <string name="conversations_foreground_service">Pix-Art Messenger</string> + <string name="pref_export_logs">Export Logs</string> + <string name="pref_export_logs_summary">Write logs to SD card</string> + <string name="notification_export_logs_title">Writing backup to SD card</string> + <string name="choose_file">Choose file</string> + <string name="receiving_x_file">Receiving %1$s (%2$d%% completed)</string> + <string name="download_x_file">Download %s</string> + <string name="delete_x_file">Delete %s</string> + <string name="file">file</string> + <string name="open_x_file">Open %s</string> + <string name="sending_file">sending (%1$d%% completed)</string> + <string name="preparing_file">Preparing file for transmission</string> + <string name="x_file_offered_for_download">%s offered for download</string> + <string name="cancel_transmission">Cancel transmission</string> + <string name="file_transmission_failed">file transmission failed</string> + <string name="file_deleted">The file has been deleted</string> + <string name="no_application_found_to_open_file">No application found to open file</string> + <string name="could_not_verify_fingerprint">Could not verify fingerprint</string> + <string name="manually_verify">Manually verify</string> + <string name="are_you_sure_verify_fingerprint">Are you sure that you want to verify your contacts OTR fingerprint?</string> + <string name="pref_show_dynamic_tags">Show dynamic tags</string> + <string name="pref_show_dynamic_tags_summary">Display read-only tags underneath contacts</string> + <string name="enable_notifications">Enable notifications</string> + <string name="no_conference_server_found">No conference server found</string> + <string name="conference_creation_failed">Conference creation failed!</string>s + <string name="account_image_description">Account avatar</string> + <string name="copy_otr_clipboard_description">Copy OTR fingerprint to clipboard</string> + <string name="copy_omemo_clipboard_description">Copy OMEMO fingerprint to clipboard</string> + <string name="regenerate_omemo_key">Regenerate OMEMO key</string> + <string name="clear_other_devices">Clear devices</string> + <string name="clear_other_devices_desc">Are you sure you want to clear all other devices from the OMEMO announcement? The next time your devices connect, they will reannounce themselves, but they might not receive messages sent in the meantime.</string> + <string name="purge_key">Purge key</string> + <string name="purge_key_desc_part1">Are you sure you want to purge this key?</string> + <string name="purge_key_desc_part2">It will irreversibly be considered compromised, and you can never build a session with it again.</string> + <string name="error_no_keys_to_trust_server_error">There are no usable keys available for this contact.\nFetching new keys from the server has been unsuccessful. Maybe there is something wrong with your contacts server.</string> + <string name="error_no_keys_to_trust">There are no usable keys available for this contact. If you have purged any of their keys, they need to generate new ones.</string> + <string name="error_trustkeys_title">Error</string> + <string name="fetching_history_from_server">Fetching history from server</string> + <string name="no_more_history_on_server">No more history on server</string> + <string name="updating">Updating…</string> + <string name="password_changed">Password changed!</string> + <string name="could_not_change_password">Could not change password</string> + <string name="otr_session_not_started">Send a message to start an encrypted chat</string> + <string name="ask_question">Ask question</string> + <string name="smp_explain_question">If you and your contact have a secret in common that no one else knows (like an inside joke or simply what you had for lunch the last time you met) you can use that secret to verify each other’s fingerprints.\n\nYou provide a hint or a question for your contact who will respond with a case-sensitive answer.</string> + <string name="smp_explain_answer">Your contact would like to verify your fingerprint by challenging you with a shared secret. Your contact provided the following hint or question for that secret.</string> + <string name="shared_secret_hint_should_not_be_empty">Your hint should not be empty</string> + <string name="shared_secret_can_not_be_empty">Your shared secret can not be empty</string> + <string name="manual_verification_explanation">Carefully compare the fingerprint shown below with the fingerprint of your contact.\nYou can use any trusted form of communication like an encrypted e-mail or a telephone call to exchange those.</string> + <string name="change_password">Change password</string> + <string name="current_password">Current password</string> + <string name="new_password">New password</string> + <string name="password_should_not_be_empty">Password should not be empty</string> + <string name="perform_action_with">Perform action with</string> + <string name="no_affiliation">No affiliation</string> + <string name="no_role">Offline</string> + <string name="outcast">Outcast</string> + <string name="member">Member</string> + <string name="advanced_mode">Advanced mode</string> + <string name="grant_membership">Grant membership</string> + <string name="remove_membership">Revoke membership</string> + <string name="grant_admin_privileges">Grant admin privileges</string> + <string name="remove_admin_privileges">Revoke admin privileges</string> + <string name="remove_from_room">Remove from conference</string> + <string name="could_not_change_affiliation">Could not change affiliation of %s</string> + <string name="ban_from_conference">Ban from conference</string> + <string name="removing_from_public_conference">You are trying to remove %s from a public conference. The only way to do that is to ban that user for ever.</string> + <string name="ban_now">Ban now</string> + <string name="could_not_change_role">Could not change role of %s</string> + <string name="public_conference">Publicly accessible conference</string> + <string name="private_conference">Private, members only conference</string> + <string name="conference_options">Conference options</string> + <string name="members_only">Private, members only</string> + <string name="non_anonymous">Non-anonymous</string> + <string name="moderated">Moderated</string> + <string name="you_are_not_participating">You are not participating</string> + <string name="modified_conference_options">Modified conference options!</string> + <string name="could_not_modify_conference_options">Could not modify conference options</string> + <string name="never">Never</string> + <string name="thirty_minutes">30 minutes</string> + <string name="one_hour">1 hour</string> + <string name="two_hours">2 hours</string> + <string name="eight_hours">8 hours</string> + <string name="until_further_notice">Until further notice</string> + <string name="pref_input_options">Input</string> + <string name="pref_enter_is_send">Enter is send</string> + <string name="pref_enter_is_send_summary">Use enter key to send message</string> + <string name="pref_display_enter_key">Show enter key</string> + <string name="pref_display_enter_key_summary">Change the emoticons key to an enter key</string> + <string name="audio">audio</string> + <string name="video">video</string> + <string name="image">image</string> + <string name="pdf_document">PDF document</string> + <string name="apk">Android App</string> + <string name="vcard">Contact</string> + <string name="received_x_file">Received %s</string> + <string name="disable_foreground_service">Disable foreground service</string> + <string name="touch_to_open_conversations">Touch to open Pix-Art Messenger</string> + <string name="avatar_has_been_published">Avatar has been published!</string> + <string name="sending_x_file">Sending %s</string> + <string name="offering_x_file">Offering %s</string> + <string name="hide_offline">Hide offline</string> + <string name="is_typing">is typing…</string> + <string name="pref_chat_states">Typing notifications</string> + <string name="pref_chat_states_summary">Let your contact know when you are writing a new message</string> + <string name="send_location">Send location</string> + <string name="show_location">Show location</string> + <string name="no_application_found_to_display_location">No application found to display location</string> + <string name="location">Location</string> + <string name="received_location">Received location</string> + <string name="title_undo_swipe_out_conversation">Conversation closed</string> + <string name="title_undo_swipe_out_muc">Left conference</string> + <string name="pref_dont_trust_system_cas_title">Don’t trust system CAs</string> + <string name="pref_dont_trust_system_cas_summary">All certificates must be manually approved</string> + <string name="pref_remove_trusted_certificates_title">Remove certificates</string> + <string name="pref_remove_trusted_certificates_summary">Delete manually approved certificates</string> + <string name="toast_no_trusted_certs">No manually approved certificates</string> + <string name="dialog_manage_certs_title">Remove certificates</string> + <string name="dialog_manage_certs_positivebutton">Delete selection</string> + <string name="dialog_manage_certs_negativebutton">Cancel</string> + <plurals name="toast_delete_certificates"> + <item quantity="one">%d certificate deleted</item> + <item quantity="other">%d certificates deleted</item> + </plurals> + <plurals name="select_contact"> + <item quantity="one">Select %d contact</item> + <item quantity="other">Select %d contacts</item> + </plurals> + <string name="pref_quick_action_summary">Replace send button with quick action</string> + <string name="pref_quick_action">Quick Action</string> + <string name="none">None</string> + <string name="recently_used">Most recently used</string> + <string name="choose_quick_action">Choose quick action</string> + <string name="search_for_contacts_or_groups">Search for contacts or groups</string> + <string name="send_private_message">Send private message</string> + <string name="user_has_left_conference">%s has left the conference!</string> + <string name="username">Username</string> + <string name="username_hint">Username</string> + <string name="invalid_username">This is not a valid username</string> + <string name="download_failed_server_not_found">Download failed: Server not found</string> + <string name="download_failed_file_not_found">Download failed: File not found</string> + <string name="download_failed_could_not_connect">Download failed: Could not connect to host</string> + <string name="elv_undo">undo</string> + <string name="download_failed_could_not_write_file">Download failed: Could not write file</string> + <string name="pref_use_white_background">Use white background</string> + <string name="pref_use_white_background_summary">Show received messages as black text on a white background</string> + <string name="action_check_update">Check for Updates</string> + <string name="title_activity_updater">Update Service</string> + <string name="update_available">Version %1$s is available.\n\nFilesize: %2$s\n\nUpdate to version %1$s now?\n\n\n%4$s</string> + <string name="checking_for_updates">Checking for Pix-Art Messenger updates</string> + <string name="remind_later">later</string> + <string name="update">update</string> + <string name="no_update_available">No update available</string> + <string name="download_started">Download started</string> + <string name="account_status_tor_unavailable">Tor network unavailable</string> + <string name="account_status_bind_failure">Bind failure</string> + <string name="account_status_host_unknown">Server not responsible for domain</string> + <string name="server_info_broken">Broken</string> + <string name="pref_presence_settings">Presence</string> + <string name="pref_away_when_screen_off">Away when screen is off</string> + <string name="pref_away_when_screen_off_summary">Marks your resource as away when the screen is turned off</string> + <string name="pref_xa_on_silent_mode">Not available in silent mode</string> + <string name="update_info">Pix-Art Messenger is checking for an update. If an update is available you will be asked, if you want to update your version. The update process is downloading and installing the new version automatically.\n\nPlease wait…</string> + <string name="pref_xa_on_silent_mode_summary">Marks your resource as not available when device is in silent mode</string> + <string name="pref_treat_vibrate_as_silent">Treat vibrate as silent mode</string> + <string name="pref_treat_vibrate_as_silent_summary">Marks your resource as not available when device is on vibrate</string> + <string name="hostname_example">xmpp.pix-art.de</string> + <string name="action_add_account_with_certificate">Add account with certificate</string> + <string name="unable_to_parse_certificate">Unable to parse certificate</string> + <string name="authenticate_with_certificate">Leave empty to authenticate w/ certificate</string> + <string name="mam_prefs">Archiving preferences</string> + <string name="server_side_mam_prefs">Server-side archiving preferences</string> + <string name="fetching_mam_prefs">Fetching archiving preferences. Please wait…</string> + <string name="unable_to_fetch_mam_prefs">Unable to fetch archiving preferences</string> + <string name="captcha_required">Captcha required</string> + <string name="captcha_hint">Enter the text from the image above</string> + <string name="certificate_chain_is_not_trusted">Certificate chain is not trusted</string> + <string name="jid_does_not_match_certificate">Jabber ID does not match certificate</string> + <string name="action_renew_certificate">Renew certificate</string> + <string name="error_fetching_omemo_key">Error fetching OMEMO key!</string> + <string name="verified_omemo_key_with_certificate">Verified OMEMO key with certificate!</string> + <string name="device_does_not_support_certificates">Your device does not support the selection of client certificates!</string> + <string name="changelog">Changes</string> + <string name="account_settings_hostname">Hostname</string> + <string name="account_settings_port">Port</string> + <string name="hostname_or_onion">Server- or .onion-Address</string> + <string name="not_a_valid_port">This is not a valid port number</string> + <string name="not_valid_hostname">This is not a valid hostname</string> + <string name="connected_accounts">%1$d of %2$d accounts connected</string> + <plurals name="x_messages"> + <item quantity="one">%d message</item> + <item quantity="other">%d messages</item> + </plurals> + <string name="load_more_messages">Load more messages</string> + <string name="shared_file_with_x">Shared file with %s</string> + <string name="shared_image_with_x">Shared image with %s</string> + <string name="no_storage_permission">Pix-Art Messenger needs access to external storage</string> + <string name="shared_images_with_x">Shared images with %s</string> + <string name="shared_text_with_x">Shared text with %s</string> + <string name="sync_with_contacts">Synchronize with contacts</string> + <string name="sync_with_contacts_long">Pix-Art Messenger wants to match your XMPP roster with your contacts to show their full names and avatars.\n\nPix-Art Messenger will only read your contacts and match them locally without uploading them to your server.\n\nYou will now be asked to grant permission to access your contacts.</string> + <string name="certificate_information">Certificate Information</string> + <string name="certificate_subject">Subject</string> + <string name="certificate_issuer">Issuer</string> + <string name="certificate_cn">Common Name</string> + <string name="certificate_o">Organization</string> + <string name="certificate_sha1">SHA-1</string> + <string name="certicate_info_not_available">(Not available)</string> + <string name="certificate_not_found">No certificate found</string> + <string name="notify_on_all_messages">Notify on all messages</string> + <string name="notify_only_when_highlighted">Notify only when highlighted</string> + <string name="notify_never">Notifications disabled</string> + <string name="notify_paused">Notifications paused</string> + <string name="pref_picture_compression">Compress Pictures</string> + <string name="pref_picture_compression_summary">Resize and compress pictures</string> + <string name="pref_video_compression">Compress Videos</string> + <string name="pref_video_compression_summary">Resize and compress Videos</string> + <string name="always">Always</string> + <string name="automatically">Automatically</string> + <string name="battery_optimizations_enabled">Battery optimizations enabled</string> + <string name="battery_optimizations_enabled_explained">Your device is doing some heavy battery optimizations on Pix-Art Messenger that might lead to delayed notifications or even message loss.\nIt is recommended to disable those.</string> + <string name="battery_optimizations_enabled_dialog">Your device is doing some heavy battery optimizations on Pix-Art Messenger that might lead to delayed notifications or even message loss.\n\nYou will now be asked to disable those.</string> + <string name="disable">Disable</string> + <string name="selection_too_large">The selected area is too large</string> + <string name="cancel_update">Cancel update check?</string> + <string name="yes">Yes</string> + <string name="no">No</string> + <string name="no_accounts">(No activated accounts)</string> + <string name="this_field_is_required">This field is required</string> + <string name="no_participants">No participants</string> + <string name="correct_message">Correct message</string> + <string name="send_corrected_message">Send corrected message</string> + <string name="no_keys_just_confirm">You already trust this contact. By selecting \'done\' you are just confirming that %s is part of this conference.</string> + <string name="select_image_and_crop">Select image and crop</string> + <string name="contacts_have_no_pgp_keys">Pix-Art Messenger is unable to encrypt your messages because your contacts are not announcing their public keys.\n\n</string> + <string name="this_account_is_disabled">You have disabled this account</string> + <string name="security_error_invalid_file_access">Security error: Invalid file access</string> + <string name="no_application_to_share_uri">No application found to share URI</string> + <string name="share_uri_with">Share URI with…</string> + <string name="mgmt_account_reconnect">reconnect</string> + <string name="welcome_header" translatable="false">Pix-Art Messenger</string> + <string name="welcome_text">…is a free and secure XMPP/Jabber client for the use with pix-art.de</string> + <string name="magic_create_text">We will guide you through the process of creating an account on pix-art.de with a random password, which you can use or change to your own password on the next page. \nThan you will be able to communicate with users of this and other providers by giving them your full Jabber-ID.</string> + <string name="your_full_jid_will_be">Your Jabber-ID will be: %s</string> + <string name="create_account">Create new account</string> + <string name="use_existing_accout">Use an existing account</string> + <string name="pick_your_username">Choose your username</string> + <string name="pref_manually_change_presence">Manually change presence</string> + <string name="pref_manually_change_presence_summary">Change your presence inside your account</string> + <string name="change_presence">Change Presence</string> + <string name="status_message">Status message</string> + <string name="all_accounts_on_this_device">Set for all accounts on this device</string> + <string name="presence_chat">Free for Chat</string> + <string name="presence_online">Online</string> + <string name="presence_away">Away</string> + <string name="presence_xa">Not Available</string> + <string name="presence_dnd">Busy</string> + <string name="secure_password_generated">A secure password has been generated</string> + <string name="device_does_not_support_battery_op">Your device does not support opting out of battery optimization</string> + <string name="share">Share</string> + <string name="share_location">Share location</string> + <string name="location_sharing_disabled">Location sharing is disabled in settings</string> + <string name="locating">Locating…</string> + <string name="uninstall_plugins">We have integrated the VoiceRecorder and ShareLocation plugin directly into the messenger. You should uninstall the plugins.</string> + <string name="uninstall">Uninstall</string> + <string name="action_end_conversation_muc">Leave conference</string> + <string name="leave_conference_warning">Do you really want to leave this conference? You will no longer be notified of new messages until joining the conference again.</string> + <string name="show_password">Show password</string> + <string name="registration_please_wait">Registration failed: Try again later</string> + <string name="registration_password_too_weak">Registration failed: Password too weak</string> + <string name="create_conference">Create conference</string> + <string name="join_or_create_conference">Join or create conference</string> + <string name="conference_subject">Subject</string> + <string name="choose_participants">Choose participants</string> + <string name="creating_conference">Creating conference…</string> + <string name="import_text">There is a backup on your device which can be imported.\nPossibly you will be asked to uninstall the old version or Conversations and your Messenger will be restarted during backup process. Shall the backup be imported? </string> + <string name="import_database">Import backup</string> + <string name="invite_again">Invite again</string> + <string name="inviteUser_Subject">has invited you via</string> + <string name="InviteText">Hello,\n\nthe user %s has invited you to Pix-Art Messenger. If you are using Android, give it a try and click the following link to start over...</string> + <string name="pref_broadcast_last_activity">Broadcast Last User Interaction</string> + <string name="pref_broadcast_last_activity_summary">Let all your contacts know when use Pix-Art Messenger</string> + <string name="invite_user">Invite to Pix-Art Messenger</string> + <string name="request_permissions_message">Pix-Art Messenger will ask you to allow a few permissions. It is important that you allow all these permissions to use all features of this messenger. If you deny any of these permissions the app will close itself.</string> + <string name="request_permissions_message_again">You have denied some or all permissions needed for Pix-Art Messenger. Would you like to jump to the settings and allow these permissions? If you denie any of these permissions, the app will close itself.</string> + <string name="unable_to_connect_to_keychain">Unable to connect to OpenKeychain</string> + <string name="no_permission">Pix-Art Messenger has no permissions</string> + <string name="send_image">Send image?</string> + <string name="this_device_is_no_longer_in_use">This device is no longer in use</string> + <string name="type_pc">Computer</string> + <string name="type_phone">Mobile phone</string> + <string name="type_tablet">Tablet</string> + <string name="type_web">Web browser</string> + <string name="type_console">Console</string> + <string name="import_canceled">Import canceled</string> + <string name="Import_failed">Database import failed, an import is not possible</string> + <string name="Password_wrong">Wrong password, try again</string> + <string name="enter_account_password">Please enter your account password to import your backup.</string> + <string name="please_wait">Please wait…</string> + <string name="databaseimport_started">Backup will be imported, this may take awhile.</string> + <string name="pref_export_plain_text_logs_summary">Enable an export of chat logs as human readable text files</string> + <string name="pref_export_plain_text_logs">Export human readable chat logs</string> + <string name="payment_required">Payment required</string> + <string name="missing_internet_permission">Missing internet permission</string> + <string name="me">Me</string> + <string name="contact_asks_for_presence_subscription">Contact asks for presence subscription</string> + <string name="allow">Allow</string> + <string name="attach_choose_video">Choose video</string> + <string name="preparing_video">Prepare video for transmission. Please wait…</string> + <string name="compressing_video">Compressing video, please wait…</string> + <string name="shared_video_with_x">Shared video with %s</string> + <string name="no_permission_to_access_x">No permission to access %s</string> + <string name="remote_server_not_found">Remote server not found</string> + <string name="error_file_corrupt">This file seems to be corrupt.</string> + <string name="unable_to_update_account">Unable to update account</string> + <string name="missing_presence_subscription_with_x">Missing presence subscription with %s.</string> + <string name="missing_keys_from_x">Missing OMEMO keys from %s.</string> + <string name="wrong_conference_configuration">This is not a private, non-anonymous conference.</string> + <string name="this_conference_has_no_members">There are no members in this conference.</string> + <string name="report_jid_as_spammer">Report this JID as sending unwanted messages.</string> + <string name="create_issue">Report an issue</string> + <string name="pref_delete_omemo_identities">Delete OMEMO identities</string> + <string name="pref_delete_omemo_identities_summary">Regenerate your OMEMO keys. All your contacts will have to verify you again. Use this only as a last resort.</string> + <string name="delete_selected_keys">Delete selected keys</string> + <string name="missing_presence_subscription">Missing presence subscription</string> + <string name="missing_omemo_keys">Missing OMEMO keys</string> + <string name="error_publish_avatar_offline">You need to be connected to publish your avatar.</string> + <string name="select_text">Select text</string> + <string name="show_error_message">Show error message</string> + <string name="error_message">Error Message</string> + <string name="data_saver_enabled">Data saver enabled</string> + <string name="data_saver_enabled_explained">Your operating system is restricting Pix-Art Messenger from accessing the Internet when in background. To receive notifications of new messages you should allow Pix-Art Messenger unrestricted access when Data saver is on.\\nPix-Art Messenger will still make an effort to save data when possible.</string> + <string name="device_does_not_support_data_saver">Your device does not supporting disabling Data saver for Pix-Art Messenger.</string> + <string name="navigate">Navigate to location</string> + <string name="add_to_contact_list">Add to contact list</string> + <string name="received_contact">Received contact</string> + <string name="contact">Contact</string> + <string name="unable_to_start_recording">Unable to start recording</string> + <string name="error_unable_to_create_temporary_file">Unable to create temporary file</string> + <string name="this_device_has_been_verified">This device has been verified</string> + <string name="copy_fingerprint">Copy fingerprint</string> + <string name="all_omemo_keys_have_been_verified"><![CDATA[>All OMEMO keys have been verified]]></string> </resources> diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index 9837b8588..071d26d3c 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -32,7 +32,7 @@ <item name="attr/icon_settings">@drawable/ic_settings_grey600_24dp</item> <item name="attr/icon_import_export">@drawable/ic_import_export_white_24dp</item> <item name="attr/icon_share">@drawable/ic_share_white_24dp</item> - + <item name="attr/dialog_horizontal_padding">16dp</item> <item name="attr/dialog_vertical_padding">16dp</item> </style> @@ -52,12 +52,15 @@ <style name="ConversationsActionBarWidget" parent="android:Theme.Holo.Light"> <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 name="ConversationsActionBarTabs" parent="@android:style/Widget.Holo.ActionBar.TabView"> <item name="android:background">@drawable/actionbar_tab_indicator</item> </style> + <style name="ConversationsDialog" parent="@android:style/Theme.Holo.Light.Dialog"> <item name="android:windowNoTitle">true</item> <item name="TextSizeInfo">10sp</item> diff --git a/src/main/res/xml/file_paths.xml b/src/main/res/xml/file_paths.xml index 2a8bc7667..6ba7c695b 100644 --- a/src/main/res/xml/file_paths.xml +++ b/src/main/res/xml/file_paths.xml @@ -1,4 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <paths> - <external-path name="external" path="/"/> + <external-path + name="external" + path="/" /> </paths>
\ No newline at end of file diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index d88df7d38..3159fd61e 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -187,7 +187,7 @@ android:defaultValue="true" android:key="last_activity" android:title="@string/pref_broadcast_last_activity" - android:summary="@string/pref_broadcast_last_activity_summary"/> + android:summary="@string/pref_broadcast_last_activity_summary" /> <CheckBoxPreference android:defaultValue="true" android:key="crashreport" @@ -235,7 +235,7 @@ <Preference android:key="delete_omemo_identities" android:title="@string/pref_delete_omemo_identities" - android:summary="@string/pref_delete_omemo_identities_summary"/> + android:summary="@string/pref_delete_omemo_identities_summary" /> <CheckBoxPreference android:defaultValue="false" android:key="dont_trust_system_cas" |