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

in-conversation invite reminder

Browse Source 
Closes #4250
// FREEBIE
This commit is contained in:
Jake McGinty
2015-10-13 21:44:01 -07:00
committed by Moxie Marlinspike
parent 38d0b5caa8
commit 4ffb1ea95e
20 changed files with 366 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/layout/conversation_activity.xml
View File

@@ -20,6 +20,11 @@
android:paddingTop="?attr/actionBarSize"
android:gravity="bottom">
<org.thoughtcrime.securesms.components.reminder.ReminderView
android:id="@+id/reminder"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<FrameLayout android:id="@+id/fragment_content"
android:layout_width="match_parent"
android:layout_height="0dp"

2
res/layout/conversation_list_fragment.xml
View File

@@ -11,7 +11,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<org.thoughtcrime.securesms.components.ReminderView
<org.thoughtcrime.securesms.components.reminder.ReminderView
android:id="@+id/reminder"
android:layout_width="match_parent"
android:layout_height="wrap_content" />

105
res/layout/reminder_header.xml
View File

@@ -1,59 +1,62 @@
<?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"
<LinearLayout android:id="@+id/container"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:visibility="gone"
android:background="?reminder_header_background">
<LinearLayout android:id="@+id/reminder"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:background="?reminder_header_background">
android:layout_weight="1"
android:layout_margin="10dp"
android:orientation="vertical">
<ImageView android:id="@+id/icon"
android:layout_width="50dp"
android:layout_height="50dp"
android:src="@drawable/sms_selection_icon"
android:padding="5dp"/>
<TextView android:id="@+id/reminder_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:textSize="16sp"
tools:text="@string/reminder_header_push_title" />
<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|top"
android:layout_marginLeft="15dp"
android:orientation="vertical">
<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_cancel_white_24dp"/>
</LinearLayout>
<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="14sp"
tools:text="@string/reminder_header_push_text" />
</LinearLayout>
<TextView android:id="@+id/cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="16sp"
android:fontFamily="sans-serif-medium"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:textColor="#99ffffff"
android:clickable="true"
android:text="@string/reminder_header_close_button" />
<TextView android:id="@+id/accept"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="16sp"
android:fontFamily="sans-serif-medium"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:textColor="@color/white"
tools:text="ENABLE" />
</LinearLayout>

12
res/values/strings.xml
View File

@@ -1037,12 +1037,20 @@
<!-- reminder_header -->
<string name="reminder_header_expired_build">Your build of Signal has expired!</string>
<string name="reminder_header_expired_build_details">Messages will no longer send successfully, please update to the most recent version.</string>
<string name="reminder_header_expired_build_button">UPGRADE</string>
<string name="reminder_header_sms_default_title">Use as default SMS app?</string>
<string name="reminder_header_sms_default_text">Tap to make Signal your default SMS app.</string>
<string name="reminder_header_sms_default_button">SET</string>
<string name="reminder_header_sms_import_title">Import system SMS?</string>
<string name="reminder_header_sms_import_text">Tap to copy your phone\'s SMS messages into its encrypted database.</string>
<string name="reminder_header_push_title">Enable Signal messages?</string>
<string name="reminder_header_push_text">Tap for instant delivery, stronger privacy, and no SMS fees.</string>
<string name="reminder_header_sms_import_button">IMPORT</string>
<string name="reminder_header_push_title">Enable Signal?</string>
<string name="reminder_header_push_text">Upgrade your messaging experience.</string>
<string name="reminder_header_push_button">ENABLE</string>
<string name="reminder_header_invite_title">Invite to Signal?</string>
<string name="reminder_header_invite_text">Take your conversation with %1$s to the next level.</string>
<string name="reminder_header_invite_button">INVITE</string>
<string name="reminder_header_close_button">CLOSE</string>
<!-- MediaPreviewActivity -->
<string name="MediaPreviewActivity_you">You</string>