mirror of
https://github.com/oxen-io/session-android.git
synced 2025-08-26 11:08:02 +00:00
Update look of contact selection activities.
// FREEBIE
This commit is contained in:
Moxie Marlinspike
BIN
res/drawable-hdpi/ic_dialpad_white_24dp.png
Normal file
BIN
res/drawable-hdpi/ic_dialpad_white_24dp.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 359 B |
Binary file not shown.
|
Before Width: | Height: | Size: 429 B After Width: | Height: | Size: 281 B |
BIN
res/drawable-mdpi/ic_dialpad_white_24dp.png
Normal file
BIN
res/drawable-mdpi/ic_dialpad_white_24dp.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 252 B |
Binary file not shown.
|
Before Width: | Height: | Size: 340 B After Width: | Height: | Size: 210 B |
BIN
res/drawable-xhdpi/ic_dialpad_white_24dp.png
Normal file
BIN
res/drawable-xhdpi/ic_dialpad_white_24dp.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 375 B |
Binary file not shown.
|
Before Width: | Height: | Size: 440 B After Width: | Height: | Size: 333 B |
BIN
res/drawable-xxhdpi/ic_dialpad_white_24dp.png
Normal file
BIN
res/drawable-xxhdpi/ic_dialpad_white_24dp.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 463 B |
BIN
res/drawable-xxxhdpi/ic_dialpad_white_24dp.png
Normal file
BIN
res/drawable-xxxhdpi/ic_dialpad_white_24dp.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 493 B |
BIN
res/drawable-xxxhdpi/ic_keyboard_white_24dp.png
Normal file
BIN
res/drawable-xxxhdpi/ic_keyboard_white_24dp.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 502 B |
92
res/layout/contact_selection_activity.xml
Normal file
92
res/layout/contact_selection_activity.xml
Normal file
@@ -0,0 +1,92 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout android:layout_gravity="center"
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_width="fill_parent"
|
||||
android:orientation="vertical"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<android.support.v7.widget.Toolbar
|
||||
android:id="@+id/toolbar"
|
||||
android:layout_height="?attr/actionBarSize"
|
||||
android:layout_width="match_parent"
|
||||
android:minHeight="?attr/actionBarSize"
|
||||
android:background="?attr/colorPrimary"
|
||||
android:theme="@style/TextSecure.LightActionBar">
|
||||
|
||||
<LinearLayout android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView android:id="@+id/action_icon"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:gravity="center_vertical"
|
||||
android:clickable="true"
|
||||
android:background="@drawable/circle_touch_highlight_background"
|
||||
android:src="@drawable/ic_search_white_24dp" />
|
||||
|
||||
<EditText android:id="@+id/search_view"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="0px"
|
||||
android:layout_weight="1"
|
||||
android:layout_marginLeft="5dp"
|
||||
android:hint="Enter name or number"
|
||||
android:inputType="textPersonName"
|
||||
android:theme="@style/TextSecure.TitleTextStyle"
|
||||
android:background="@android:color/transparent"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:gravity="center_vertical"/>
|
||||
|
||||
<org.thoughtcrime.securesms.components.AnimatingToggle
|
||||
android:id="@+id/button_toggle"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:gravity="center">
|
||||
|
||||
<ImageView android:id="@+id/search_dialpad"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:gravity="center_vertical"
|
||||
android:clickable="true"
|
||||
android:background="@drawable/circle_touch_highlight_background"
|
||||
android:src="@drawable/ic_dialpad_white_24dp" />
|
||||
|
||||
<ImageView android:id="@+id/search_keyboard"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:gravity="center_vertical"
|
||||
android:clickable="true"
|
||||
android:visibility="gone"
|
||||
android:background="@drawable/circle_touch_highlight_background"
|
||||
android:src="@drawable/ic_keyboard_white_24dp" />
|
||||
|
||||
|
||||
<ImageView android:id="@+id/search_clear"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:gravity="center_vertical"
|
||||
android:clickable="true"
|
||||
android:visibility="gone"
|
||||
android:background="@drawable/circle_touch_highlight_background"
|
||||
android:src="@drawable/ic_clear_white_24dp" />
|
||||
|
||||
</org.thoughtcrime.securesms.components.AnimatingToggle>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</android.support.v7.widget.Toolbar>
|
||||
|
||||
<fragment
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:id="@+id/contact_selection_list_fragment"
|
||||
android:name="org.thoughtcrime.securesms.ContactSelectionListFragment">
|
||||
</fragment>
|
||||
|
||||
</LinearLayout>
|
||||
26
res/layout/contact_selection_list_fragment.xml
Normal file
26
res/layout/contact_selection_list_fragment.xml
Normal file
@@ -0,0 +1,26 @@
|
||||
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<android.support.v4.widget.SwipeRefreshLayout
|
||||
android:id="@+id/swipe_refresh"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<se.emilsjolander.stickylistheaders.StickyListHeadersListView
|
||||
android:id="@android:id/list"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" />
|
||||
|
||||
<TextView android:id="@android:id/empty"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:gravity="center|center_vertical"
|
||||
android:layout_marginTop="15dp"
|
||||
android:text="@string/contact_selection_group_activity__finding_contacts"
|
||||
android:textSize="20sp" />
|
||||
|
||||
</android.support.v4.widget.SwipeRefreshLayout>
|
||||
</LinearLayout>
|
||||
@@ -14,12 +14,7 @@
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:textSize="15sp"
|
||||
android:textColor="?conversation_selection_header_text"
|
||||
android:textColor="?contact_selection_header_text"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<View android:layout_width="match_parent"
|
||||
android:layout_height="3dp"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_marginTop="2dp"
|
||||
android:background="?conversation_selection_header_text" />
|
||||
</RelativeLayout>
|
||||
@@ -1,16 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout android:layout_gravity="center"
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_width="fill_parent"
|
||||
android:orientation="vertical"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<fragment
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:id="@+id/contact_selection_list_fragment"
|
||||
android:name="org.thoughtcrime.securesms.PushContactSelectionListFragment">
|
||||
</fragment>
|
||||
|
||||
</LinearLayout>
|
||||
@@ -1,16 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout android:layout_gravity="center"
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_width="fill_parent"
|
||||
android:orientation="vertical"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<fragment
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:id="@+id/contact_selection_list_fragment"
|
||||
android:name="org.thoughtcrime.securesms.PushContactSelectionListFragment">
|
||||
</fragment>
|
||||
|
||||
</LinearLayout>
|
||||
@@ -1,27 +0,0 @@
|
||||
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<EditText android:id="@+id/filter"
|
||||
android:inputType="textPersonName"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="45sp"
|
||||
android:hint="@string/recipients_panel__to"
|
||||
android:textColor="?conversation_editor_text_color" />
|
||||
|
||||
<se.emilsjolander.stickylistheaders.StickyListHeadersListView
|
||||
android:id="@android:id/list"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" />
|
||||
|
||||
<TextView android:id="@android:id/empty"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:gravity="center|center_vertical"
|
||||
android:layout_marginTop="15dp"
|
||||
android:text="@string/contact_selection_group_activity__finding_contacts"
|
||||
android:textSize="20sp" />
|
||||
|
||||
</LinearLayout>
|
||||
9
res/menu/new_conversation_activity_number_pad.xml
Normal file
9
res/menu/new_conversation_activity_number_pad.xml
Normal file
@@ -0,0 +1,9 @@
|
||||
<?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:title="Number pad"
|
||||
android:id="@+id/menu_number_pad"
|
||||
android:icon="@drawable/ic_dialpad_white_24dp"
|
||||
app:showAsAction="always"/>
|
||||
</menu>
|
||||
11
res/menu/new_conversation_activity_search.xml
Normal file
11
res/menu/new_conversation_activity_search.xml
Normal file
@@ -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:title="Search contacts"
|
||||
android:id="@+id/menu_search"
|
||||
android:icon="?attr/menu_search_icon"
|
||||
app:actionViewClass="android.support.v7.widget.SearchView"
|
||||
app:showAsAction="always|collapseActionView" />
|
||||
|
||||
</menu>
|
||||
10
res/menu/new_conversation_activity_text_pad.xml
Normal file
10
res/menu/new_conversation_activity_text_pad.xml
Normal file
@@ -0,0 +1,10 @@
|
||||
<?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:title="Text input"
|
||||
android:id="@+id/menu_text_pad"
|
||||
android:icon="@drawable/ic_keyboard_white_24dp"
|
||||
app:showAsAction="always"/>
|
||||
|
||||
</menu>
|
||||
@@ -4,6 +4,6 @@
|
||||
<item android:title="@string/push_directory__menu_refresh"
|
||||
android:id="@+id/menu_refresh_directory"
|
||||
android:icon="?menu_refresh_directory"
|
||||
app:showAsAction="ifRoom"
|
||||
app:showAsAction="always"
|
||||
/>
|
||||
</menu>
|
||||
@@ -72,7 +72,7 @@
|
||||
<attr name="contact_selection_push_user" format="reference|color" />
|
||||
<attr name="contact_selection_lay_user" format="reference|color" />
|
||||
<attr name="contact_selection_label_text" format="reference|color" />
|
||||
<attr name="conversation_selection_header_text" format="reference|color" />
|
||||
<attr name="contact_selection_header_text" format="reference|color" />
|
||||
|
||||
<attr name="import_export_item_background_color" format="reference|color" />
|
||||
<attr name="import_export_item_background_shadow_color" format="reference|color" />
|
||||
|
||||
@@ -58,6 +58,7 @@
|
||||
|
||||
<style name="TextSecure.TitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
|
||||
<item name="android:textColor">@color/white</item>
|
||||
<item name="android:textColorHint">#BFffffff</item>
|
||||
</style>
|
||||
|
||||
<style name="TextSecure.SubtitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Subtitle">
|
||||
|
||||
@@ -9,7 +9,12 @@
|
||||
<item name="colorPrimary">@color/textsecure_primary</item>
|
||||
<item name="colorPrimaryDark">@color/textsecure_primary_dark</item>
|
||||
<item name="colorAccent">@color/textsecure_primary_dark</item>
|
||||
|
||||
<item name="recipient_preference_blocked">#8e0000</item>
|
||||
<item name="contact_selection_label_text">#66000000</item>
|
||||
<item name="contact_selection_push_user">#ff000000</item>
|
||||
<item name="contact_selection_lay_user">#a0000000</item>
|
||||
<item name="contact_selection_header_text">@color/textsecure_primary_dark</item>
|
||||
</style>
|
||||
|
||||
<style name="TextSecure.DarkNoActionBar" parent="@style/Theme.AppCompat.NoActionBar">
|
||||
@@ -17,7 +22,12 @@
|
||||
<item name="actionBarStyle">@style/TextSecure.DarkActionBar</item>
|
||||
<item name="actionBarTabBarStyle">@style/TextSecure.DarkActionBar.TabBar</item>
|
||||
<item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
|
||||
|
||||
<item name="recipient_preference_blocked">#d00000</item>
|
||||
<item name="contact_selection_label_text">#66eeeeee</item>
|
||||
<item name="contact_selection_push_user">#ffeeeeee</item>
|
||||
<item name="contact_selection_lay_user">#afeeeeee</item>
|
||||
<item name="contact_selection_header_text">#66eeeeee</item>
|
||||
</style>
|
||||
|
||||
<style name="TextSecure.LightIntroTheme" parent="@style/Theme.AppCompat.Light">
|
||||
@@ -82,11 +92,6 @@
|
||||
|
||||
<item name="conversation_group_member_name">#99000000</item>
|
||||
|
||||
<item name="contact_selection_push_user">#ff000000</item>
|
||||
<item name="contact_selection_lay_user">#a0000000</item>
|
||||
<item name="contact_selection_label_text">#66000000</item>
|
||||
<item name="conversation_selection_header_text">#44000000</item>
|
||||
|
||||
<item name="conversation_background">#eeeeee</item>
|
||||
<item name="conversation_editor_background">#22000000</item>
|
||||
<item name="conversation_editor_text_color">#ff111111</item>
|
||||
@@ -196,11 +201,6 @@
|
||||
|
||||
<item name="conversation_group_member_name">#99ffffff</item>
|
||||
|
||||
<item name="contact_selection_push_user">#ffeeeeee</item>
|
||||
<item name="contact_selection_lay_user">#afeeeeee</item>
|
||||
<item name="contact_selection_label_text">#66eeeeee</item>
|
||||
<item name="conversation_selection_header_text">#66eeeeee</item>
|
||||
|
||||
<item name="conversation_item_background">@drawable/conversation_item_background_dark</item>
|
||||
<item name="conversation_item_bubble_background">#ff333333</item>
|
||||
<item name="conversation_item_sent_text_primary_color">#ffffffff</item>
|
||||
|
||||
Reference in New Issue
Block a user