TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-25 23:57:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

basic messaging when non-push users are added

Browse Source
This commit is contained in:
Jake McGinty
2014-02-12 17:17:33 -08:00
parent b4a4e629f1
commit 01a438de09
5 changed files with 142 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
res/layout/group_create_activity.xml
View File

@@ -3,30 +3,61 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="20dp">
android:layout_height="match_parent">
<LinearLayout
<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical"
android:layout_marginBottom="20dp" >
android:layout_marginBottom="20dp">
<ImageView
android:id="@+id/avatar"
android:layout_width="70dp"
android:layout_height="70dp"
android:src="@drawable/icon"/>
<EditText
android:id="@+id/group_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="10dp"
android:hint="Group name"
android:layout_gravity="center_vertical" />
</LinearLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="106dp"
android:orientation="horizontal"
android:gravity="center_vertical"
android:paddingLeft="18dp"
android:paddingRight="18dp"
android:paddingTop="18dp">
<ImageView
android:id="@+id/avatar"
android:layout_width="70dp"
android:layout_height="70dp"
android:layout_marginRight="10dp"
android:src="@drawable/icon"/>
<EditText
android:id="@+id/group_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="10dp"
android:hint="Group name"
android:layout_gravity="center_vertical" />
</LinearLayout>
<RelativeLayout
android:id="@+id/push_disabled"
android:layout_width="fill_parent"
android:layout_height="106dp"
android:background="#dd555555"
android:gravity="center_vertical|center_horizontal"
android:padding="15dp"
android:visibility="gone">
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:background="#ff444444"
android:textColor="#ffeeeeee"
android:fontFamily="sans-serif-light"
android:padding="8dp"
android:textSize="16dp"
android:text="You have selected a contact that doesn't support TextSecure groups, so this group will be MMS." />
</RelativeLayout>
</RelativeLayout>
<org.thoughtcrime.securesms.components.PushRecipientsPanel
android:id="@+id/recipients"

1
res/values/strings.xml
View File

@@ -118,6 +118,7 @@
<!-- GroupCreateActivity -->
<string name="GroupCreateActivity_actionbar_title">New Group</string>
<string name="GroupCreateActivity_actionbar_mms_title">New MMS Group</string>
<!-- ImportFragment -->
<string name="ImportFragment_import_system_sms_database">Import System SMS Database?</string>