mirror of
https://github.com/oxen-io/session-android.git
synced 2025-11-10 04:15:01 +00:00
New design for Conversation Activity.
1) Move to Fragments for the list view. 2) Switch to CursorLoader from my jankey self-managed cursor. 3) Add session security logic to the ActionBar. 4) Fix colors to be less ugly.
This commit is contained in:
Moxie Marlinspike
210
res/layout/conversation_activity.xml
Normal file
210
res/layout/conversation_activity.xml
Normal file
@@ -0,0 +1,210 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
/*
|
||||
* Copyright (C) 2008 Esmertec AG.
|
||||
* Copyright (C) 2008 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
-->
|
||||
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<org.thoughtcrime.securesms.components.RecipientsPanel
|
||||
android:id="@+id/recipients"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:visibility="gone"
|
||||
/>
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/layout_container"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:orientation="vertical"
|
||||
android:background="@drawable/white_background"
|
||||
android:gravity="bottom">
|
||||
|
||||
<fragment
|
||||
android:id="@+id/fragment_content"
|
||||
android:name="org.thoughtcrime.securesms.ConversationFragment"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_above="@+id/bottom_container" />
|
||||
|
||||
<!-- <ListView -->
|
||||
<!-- android:id="@+id/conversation" -->
|
||||
<!-- android:layout_width="fill_parent" -->
|
||||
<!-- android:layout_height="fill_parent" -->
|
||||
<!-- android:layout_weight="1.0" -->
|
||||
<!-- android:listSelector="@drawable/chat_history_selector" -->
|
||||
<!-- android:drawSelectorOnTop="true" -->
|
||||
<!-- android:transcriptMode="alwaysScroll" -->
|
||||
<!-- android:scrollbarAlwaysDrawVerticalTrack="true" -->
|
||||
<!-- android:scrollbarStyle="insideInset" -->
|
||||
<!-- android:stackFromBottom="true" -->
|
||||
<!-- android:visibility="gone" -->
|
||||
<!-- android:fadingEdge="none" -->
|
||||
<!-- android:layout_marginBottom="1dip" -->
|
||||
<!-- android:cacheColorHint="@android:color/white" -->
|
||||
<!-- android:dividerHeight="0px" android:divider="#ffffffff"/> -->
|
||||
|
||||
<ScrollView android:id="@id/bottom_container"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentBottom="true">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:orientation="vertical"
|
||||
android:paddingBottom="5dip"
|
||||
android:background="#fff">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/attachment_editor"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:visibility="gone">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/attachment_thumbnail"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="150dip"
|
||||
android:layout_weight="1" />
|
||||
|
||||
<LinearLayout
|
||||
android:orientation="vertical"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="fill_parent"
|
||||
android:gravity="center_vertical">
|
||||
|
||||
<!-- <Button-->
|
||||
<!-- android:id="@+id/view_image_button"-->
|
||||
<!-- style="?android:attr/buttonStyleSmall"-->
|
||||
<!-- android:layout_width="100dip"-->
|
||||
<!-- android:layout_height="50dip"-->
|
||||
<!-- android:text="View" />-->
|
||||
<!-- -->
|
||||
<!-- <Button-->
|
||||
<!-- android:id="@+id/replace_image_button"-->
|
||||
<!-- style="?android:attr/buttonStyleSmall"-->
|
||||
<!-- android:layout_width="100dip"-->
|
||||
<!-- android:layout_height="50dip"-->
|
||||
<!-- android:text="Replace" />-->
|
||||
|
||||
<Button
|
||||
android:id="@+id/remove_image_button"
|
||||
style="?android:attr/buttonStyleSmall"
|
||||
android:layout_width="100dip"
|
||||
android:layout_height="50dip"
|
||||
android:text="Remove" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<View android:background="#eeeeee"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp" />
|
||||
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/bottom_panel"
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingTop="5dip"
|
||||
android:paddingLeft="5dip"
|
||||
android:paddingRight="5dip"
|
||||
>
|
||||
|
||||
<EditText
|
||||
android:id="@+id/embedded_text_editor"
|
||||
android:textColor="@android:color/black"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1.0"
|
||||
android:autoText="true"
|
||||
android:capitalize="sentences"
|
||||
android:nextFocusRight="@+id/send_button"
|
||||
android:hint="Type message"
|
||||
android:maxLines="4"
|
||||
android:inputType="textShortMessage|textAutoCorrect|textCapSentences|textMultiLine"
|
||||
android:imeOptions="actionSend|flagNoEnterAction"
|
||||
android:maxLength="1000"
|
||||
/>
|
||||
|
||||
<!-- <RelativeLayout -->
|
||||
<!-- android:id="@+id/editor_with_counter" -->
|
||||
<!-- android:layout_width="0dip" -->
|
||||
<!-- android:layout_height="wrap_content" -->
|
||||
<!-- android:layout_weight="1.0" -->
|
||||
<!-- android:addStatesFromChildren="true" -->
|
||||
<!-- android:background="@android:drawable/edit_text"> -->
|
||||
|
||||
<!-- <EditText -->
|
||||
<!-- android:id="@+id/embedded_text_editor" -->
|
||||
<!-- android:layout_width="fill_parent" -->
|
||||
<!-- android:layout_height="wrap_content" -->
|
||||
<!-- android:autoText="true" -->
|
||||
<!-- android:capitalize="sentences" -->
|
||||
<!-- android:nextFocusRight="@+id/send_button" -->
|
||||
<!-- android:hint="Type to compose" -->
|
||||
<!-- android:maxLines="4" -->
|
||||
<!-- android:inputType="textShortMessage|textAutoCorrect|textCapSentences|textMultiLine" -->
|
||||
<!-- android:imeOptions="actionSend|flagNoEnterAction" -->
|
||||
<!-- android:background="@null" -->
|
||||
<!-- android:maxLength="1000" -->
|
||||
<!-- /> -->
|
||||
|
||||
<!-- <TextView -->
|
||||
<!-- android:id="@+id/text_counter" -->
|
||||
<!-- android:layout_width="wrap_content" -->
|
||||
<!-- android:layout_height="wrap_content" -->
|
||||
<!-- android:background="#88000000" -->
|
||||
<!-- android:textColor="#ffffffff" -->
|
||||
<!-- android:textSize="11sp" -->
|
||||
<!-- android:textStyle="bold" -->
|
||||
<!-- android:paddingLeft="3dip" -->
|
||||
<!-- android:paddingRight="3dip" -->
|
||||
<!-- android:layout_alignParentRight="true" -->
|
||||
<!-- android:layout_alignParentTop="true" -->
|
||||
<!-- android:visibility="gone" -->
|
||||
<!-- /> -->
|
||||
<!-- </RelativeLayout> -->
|
||||
|
||||
<Button android:id="@+id/send_button"
|
||||
android:layout_marginLeft="5dip"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="fill_parent"
|
||||
style="?android:attr/buttonStyle"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:nextFocusLeft="@+id/embedded_text_editor"
|
||||
android:text="Send"
|
||||
/>
|
||||
</LinearLayout>
|
||||
<TextView android:id="@+id/space_left"
|
||||
android:paddingLeft="5dip"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="160/160 (1)"
|
||||
/>
|
||||
</LinearLayout>
|
||||
</ScrollView>
|
||||
</RelativeLayout>
|
||||
</LinearLayout>
|
||||
Reference in New Issue
Block a user