Move default SMS and system import to "reminders"

// FREEBIE
Closes #1730
This commit is contained in:
Jake McGinty
2014-07-22 17:27:05 -10:00
committed by Moxie Marlinspike
parent acc7c4c1c6
commit 7d688846f9
17 changed files with 227 additions and 33 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

View File

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

View File

@@ -0,0 +1,82 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<LinearLayout android:id="@+id/container"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:background="?reminder_header_background">
<ImageView android:id="@+id/icon"
android:layout_width="50dp"
android:layout_height="50dp"
android:src="@drawable/sms_selection_icon"
android:padding="5dp"/>
<LinearLayout android:id="@+id/reminder"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_margin="10dp"
android:orientation="vertical">
<TextView android:id="@+id/reminder_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
android:textColor="@color/white"
android:textSize="18sp"/>
<TextView android:id="@+id/reminder_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="sans-serif-light"
android:textColor="@color/white"
android:textSize="16sp"/>
</LinearLayout>
<LinearLayout android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="right"
android:layout_marginLeft="15dp"
android:orientation="vertical">
<LinearLayout android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="top">
<ImageButton android:id="@+id/cancel"
android:layout_width="40dp"
android:layout_height="40dp"
android:padding="10dp"
android:background="@drawable/touch_highlight_background"
android:src="@drawable/ic_menu_remove_holo_light"/>
</LinearLayout>
<LinearLayout android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="bottom">
<Button android:id="@+id/ok"
android:layout_width="60sp"
android:layout_height="40sp"
android:gravity="center_vertical|center_horizontal"
android:background="@drawable/light_touch_highlight_background"
android:fontFamily="sans-serif-light"
android:textColor="@color/white"
android:text="@string/yes"
android:padding="2dp"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>

View File

@@ -57,6 +57,8 @@
<attr name="navigation_drawer_icons" format="reference"/>
<attr name="navigation_drawer_shadow" format="reference"/>
<attr name="reminder_header_background" format="color"/>
<attr name="menu_new_conversation_icon" format="reference" />
<attr name="menu_new_group_icon" format="reference" />
<attr name="menu_search_icon" format="reference" />

View File

@@ -15,7 +15,8 @@
<color name="textsecure_holo_blue_light">#ff33b5e5</color>
<color name="touch_highlight">#400099cc</color>
<color name="light_button">#33ffffff</color>
<color name="light_button_highlight">#66ffffff</color>
<color name="conversation_item_sent_background_dark">#ff284e0a</color>
<color name="conversation_item_sent_background_light">#ff64a926</color>
<color name="conversation_item_sent_shadow_light">#ffd5d5d5</color>

View File

@@ -856,6 +856,11 @@
<!-- verify_keys -->
<string name="verify_keys__menu_verified">Verified</string>
<!-- reminder_header -->
<string name="reminder_header_sms_default_title">Use as default SMS app?</string>
<string name="reminder_header_sms_default_text">TextSecure is not currently your default SMS app.</string>
<string name="reminder_header_sms_import_title">Import system SMS?</string>
<string name="reminder_header_sms_import_text">TextSecure can copy your phone\'s SMS messages into its encrypted database.</string>
<!-- EOF -->
</resources>

View File

@@ -79,6 +79,8 @@
<item name="menu_info_icon">@drawable/ic_dialog_info_holo_light</item>
<item name="menu_forward_icon">@drawable/ic_action_forward_holo_light</item>
<item name="menu_save_icon">@drawable/ic_action_save_holo_light</item>
<item name="reminder_header_background">#ff5a8800</item>
</style>
<style name="TextSecure.LightTheme.NavigationDrawer"
@@ -160,6 +162,8 @@
<item name="menu_info_icon">@drawable/ic_dialog_info_holo_dark</item>
<item name="menu_forward_icon">@drawable/ic_action_forward_holo_dark</item>
<item name="menu_save_icon">@drawable/ic_action_save_holo_dark</item>
<item name="reminder_header_background">#ff385400</item>
</style>
<style name="TextSecure.DarkTheme.NavigationDrawer"