diff options
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/layout/activity_channel_discovery.xml | 40 | ||||
| -rw-r--r-- | src/main/res/layout/activity_magic_create.xml | 9 | ||||
| -rw-r--r-- | src/main/res/layout/search_result_item.xml | 52 | ||||
| -rw-r--r-- | src/main/res/menu/channel_discovery_activity.xml | 11 | ||||
| -rw-r--r-- | src/main/res/menu/manageaccounts.xml | 2 | ||||
| -rw-r--r-- | src/main/res/menu/start_conversation_fab_submenu.xml | 4 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 8 |
7 files changed, 123 insertions, 3 deletions
diff --git a/src/main/res/layout/activity_channel_discovery.xml b/src/main/res/layout/activity_channel_discovery.xml new file mode 100644 index 000000000..ee253f3dd --- /dev/null +++ b/src/main/res/layout/activity_channel_discovery.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> +<layout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:background="?attr/color_background_secondary" + android:orientation="vertical"> + + <include + android:id="@+id/toolbar" + layout="@layout/toolbar" /> + + <ProgressBar + android:id="@+id/progressBar" + style="?android:attr/progressBarStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + app:layout_anchor="@+id/list" /> + + <android.support.design.widget.CoordinatorLayout + android:id="@+id/coordinator" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="?attr/color_background_secondary"> + + <android.support.v7.widget.RecyclerView + android:id="@+id/list" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="?attr/color_background_secondary" + android:orientation="vertical" + android:visibility="gone" + app:layoutManager="android.support.v7.widget.LinearLayoutManager" /> + </android.support.design.widget.CoordinatorLayout> + + </LinearLayout> +</layout>
\ No newline at end of file diff --git a/src/main/res/layout/activity_magic_create.xml b/src/main/res/layout/activity_magic_create.xml index 523d210c0..1ecf8a346 100644 --- a/src/main/res/layout/activity_magic_create.xml +++ b/src/main/res/layout/activity_magic_create.xml @@ -6,7 +6,7 @@ <include layout="@layout/toolbar" /> - <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + <ScrollView android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true"> @@ -74,6 +74,12 @@ android:prompt="@string/server_hint" android:spinnerMode="dialog" /> + <CheckBox + android:id="@+id/use_own" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/use_own_provider" /> + <TextView android:id="@+id/full_jid" android:layout_width="wrap_content" @@ -99,6 +105,7 @@ android:layout_gravity="end" android:text="@string/next" android:textColor="?attr/colorAccent" /> + </LinearLayout> <RelativeLayout diff --git a/src/main/res/layout/search_result_item.xml b/src/main/res/layout/search_result_item.xml new file mode 100644 index 000000000..856aa7ab6 --- /dev/null +++ b/src/main/res/layout/search_result_item.xml @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="utf-8"?> +<layout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="?selectableItemBackground" + android:padding="@dimen/list_padding"> + + <com.makeramen.roundedimageview.RoundedImageView + android:id="@+id/avatar" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_alignParentStart="true" + android:layout_alignParentLeft="true" + android:scaleType="centerCrop" + app:riv_corner_radius="2dp" /> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/avatar_item_distance" + android:layout_marginLeft="@dimen/avatar_item_distance" + android:layout_toEndOf="@+id/avatar" + android:layout_toRightOf="@+id/avatar" + android:orientation="vertical"> + + <TextView + android:id="@+id/name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:singleLine="true" + android:textAppearance="@style/TextAppearance.Conversations.Subhead" /> + + <TextView + android:id="@+id/description" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:maxLines="2" + android:textAppearance="@style/TextAppearance.Conversations.Body1" /> + + <TextView + android:id="@+id/room" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:maxLines="2" + android:textAppearance="@style/TextAppearance.Conversations.Body1.Secondary" /> + </LinearLayout> + + </RelativeLayout> +</layout>
\ No newline at end of file diff --git a/src/main/res/menu/channel_discovery_activity.xml b/src/main/res/menu/channel_discovery_activity.xml new file mode 100644 index 000000000..93e044f27 --- /dev/null +++ b/src/main/res/menu/channel_discovery_activity.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + + <item + android:id="@+id/action_search" + android:icon="?attr/icon_search" + android:title="@string/search" + app:actionLayout="@layout/actionview_search" + app:showAsAction="collapseActionView|always" /> +</menu>
\ No newline at end of file diff --git a/src/main/res/menu/manageaccounts.xml b/src/main/res/menu/manageaccounts.xml index 3199fc2be..cf2c80510 100644 --- a/src/main/res/menu/manageaccounts.xml +++ b/src/main/res/menu/manageaccounts.xml @@ -5,7 +5,7 @@ <item android:id="@+id/action_add_account" android:icon="?attr/icon_add_person" - android:title="@string/action_add_account" + android:title="@string/action_add_new_account" app:showAsAction="always" /> <item android:id="@+id/action_import_backup" diff --git a/src/main/res/menu/start_conversation_fab_submenu.xml b/src/main/res/menu/start_conversation_fab_submenu.xml index 212a94a7e..2cf545d68 100644 --- a/src/main/res/menu/start_conversation_fab_submenu.xml +++ b/src/main/res/menu/start_conversation_fab_submenu.xml @@ -1,6 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item + android:id="@+id/discover_public_channels" + android:icon="@drawable/ic_search_white_24dp" + android:title="@string/discover_channels" /> + <item android:id="@+id/join_public_channel" android:icon="@drawable/ic_input_white_24dp" android:title="@string/join_public_channel" /> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 90bcb50b7..7b27130ea 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -6,7 +6,7 @@ <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_add_new_account">Add new 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> @@ -904,4 +904,10 @@ <string name="delete_locally">Delete locally</string> <string name="delete_from_server">Delete from server</string> <string name="go_online_to_delete">You have to activate and/or go online with the account you want to delete from server.</string> + <string name="discover_channels">Discover channels</string> + <string name="search_channels">Search channels</string> + <string name="channel_discovery_opt_in_title">Privacy notice</string> + <string name="channel_discover_opt_in_message"><![CDATA[Channel discovery uses a third party service called <a href="https://search.jabbercat.org">search.jabbercat.org</a>.<br><br>Using this feature will transmit your IP address and search terms to that service. See their <a href="https://search.jabbercat.org/privacy">Privacy Policy</a> for more information.]]></string> + <string name="action_add_existing_account">Add existing account</string> + <string name="use_own_provider">Use own provider</string> </resources> |