TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-26 21:47:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implemented full-text search.

Browse Source 
You can now use the search bar on the conversation list to find
conversations, messages, and contacts.
This commit is contained in:
Greyson Parrelli
2018-04-06 18:15:24 -07:00
parent c0b75c2ef5
commit 0449647cf9
28 changed files with 1505 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
res/drawable/header_search_background.xml Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape android:shape="rectangle" >
<solid android:color="@color/grey_200"/>
</shape>
</item>
<item android:top="1dp">
<shape android:shape="rectangle" >
<solid android:color="@color/white" />
</shape>
</item>
</layer-list>

20
res/layout/fragment_search.xml Normal file
View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:id="@+id/search_no_results"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:background="@color/white"
android:visibility="gone" />
<android.support.v7.widget.RecyclerView
android:id="@+id/search_list"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
</FrameLayout>

13
res/layout/header_search_result.xml Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<TextView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
style="@style/Base.TextAppearance.AppCompat.Body2"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="8dp"
android:background="@drawable/header_search_background"
tools:text="Conversations">
</TextView>

43
res/layout/load_more_header.xml
View File

@@ -1,9 +1,48 @@
<?xml version="1.0" encoding="utf-8"?>
<Button xmlns:android="http://schemas.android.com/apk/res/android"
<ViewSwitcher
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:wheel="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?conversation_item_bubble_background"
android:padding="16dp"
android:elevation="2dp">
<TextView
style="@style/Base.TextAppearance.AppCompat.Button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="?conversation_item_bubble_background"
android:gravity="center"
android:textColor="?conversation_item_sent_text_primary_color"
android:text="@string/load_more_header__see_full_conversation" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_gravity="center">
<TextView
style="@style/Base.TextAppearance.AppCompat.Button"
android:id="@+id/load_more_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:textColor="?conversation_item_sent_text_primary_color"
android:text="@string/load_more_header__loading" />
<com.pnikosis.materialishprogress.ProgressWheel
android:id="@+id/load_more_progress"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_gravity="center_vertical"
android:layout_marginStart="11dp"
android:layout_marginLeft="11dp"
wheel:matProg_progressIndeterminate="true"
tools:ignore="RtlSymmetry" />
</LinearLayout>
</ViewSwitcher>

8
res/values/strings.xml
View File

@@ -584,6 +584,13 @@
<string name="RingtonePreference_add_ringtone_text">Add ringtone</string>
<string name="RingtonePreference_unable_to_add_ringtone">Unable to add custom ringtone</string>
<!-- Search -->
<string name="SearchFragment_begin_searching">Begin typing to search for conversations, messages, and contacts.</string>
<string name="SearchFragment_no_results">No results found for \'%s\'</string>
<string name="SearchFragment_header_conversations">Conversations</string>
<string name="SearchFragment_header_contacts">Contacts</string>
<string name="SearchFragment_header_messages">Messages</string>
<!-- SharedContactDetailsActivity -->
<string name="SharedContactDetailsActivity_add_to_contacts">Add to Contacts</string>
<string name="SharedContactDetailsActivity_invite_to_signal">Invite to Signal</string>
@@ -980,6 +987,7 @@
<!-- load_more_header -->
<string name="load_more_header__see_full_conversation">See full conversation</string>
<string name="load_more_header__loading">Loading</string>
<!-- media_overview_activity -->
<string name="media_overview_activity__no_media">No media</string>