mirror of
https://github.com/oxen-io/session-android.git
synced 2025-08-26 12:47:35 +00:00

committed by
Moxie Marlinspike

parent
ec8b06e96c
commit
d6d7ca19c1
@@ -12,13 +12,11 @@
|
||||
android:id="@+id/quick_attachment_drawer"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:background="@color/black">
|
||||
android:orientation="vertical">
|
||||
|
||||
<LinearLayout android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:background="?conversation_background"
|
||||
android:paddingTop="?attr/actionBarSize"
|
||||
android:gravity="bottom">
|
||||
|
||||
@@ -28,16 +26,18 @@
|
||||
android:layout_weight="1" />
|
||||
|
||||
<FrameLayout android:id="@+id/attachment_editor"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:gravity="center_horizontal"
|
||||
android:paddingTop="10dp"
|
||||
android:background="?android:windowBackground"
|
||||
android:visibility="gone">
|
||||
|
||||
<org.thoughtcrime.securesms.components.ThumbnailView
|
||||
android:id="@+id/attachment_thumbnail"
|
||||
android:layout_width="230dp"
|
||||
android:layout_height="150dp"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:contentDescription="@string/conversation_activity__attachment_thumbnail"
|
||||
app:backgroundColorHint="?conversation_background" />
|
||||
|
||||
@@ -45,7 +45,8 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/conversation_attachment_close_circle"
|
||||
android:layout_gravity="top|left"/>
|
||||
android:layout_marginRight="115dp"
|
||||
android:layout_gravity="top|center_horizontal"/>
|
||||
|
||||
</FrameLayout>
|
||||
|
||||
@@ -55,6 +56,7 @@
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal"
|
||||
android:clickable="true"
|
||||
android:background="?android:windowBackground"
|
||||
android:padding="5dp">
|
||||
|
||||
<LinearLayout android:id="@+id/compose_bubble"
|
||||
@@ -135,6 +137,7 @@
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:visibility="gone"
|
||||
android:background="?android:windowBackground"
|
||||
android:text="160/160 (1)" />
|
||||
|
||||
|
||||
|
@@ -17,7 +17,6 @@
|
||||
android:fadingEdge="none"
|
||||
android:divider="@android:color/transparent"
|
||||
android:dividerHeight="0dp"
|
||||
android:layout_marginBottom="1dip"
|
||||
android:cacheColorHint="?conversation_background" />
|
||||
|
||||
</LinearLayout>
|
@@ -40,7 +40,6 @@
|
||||
android:id="@+id/emoji_pager"
|
||||
android:visibility="visible"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="?emoji_background" />
|
||||
android:layout_height="match_parent" />
|
||||
|
||||
</merge>
|
@@ -76,7 +76,7 @@
|
||||
<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="android:windowBackground">@color/white</item>
|
||||
<item name="android:windowBackground">@color/gray5</item>
|
||||
<!--<item name="android:windowContentOverlay">@drawable/compat_actionbar_shadow_background</item>-->
|
||||
<item name="conversation_list_item_background_selected">@drawable/list_selected_holo_light</item>
|
||||
<item name="conversation_list_item_count_color">#66333333</item>
|
||||
@@ -111,7 +111,6 @@
|
||||
<item name="emoji_tab_indicator">#66555555</item>
|
||||
<item name="emoji_tab_underline">#44555555</item>
|
||||
<item name="emoji_tab_seperator">@color/gray20</item>
|
||||
<item name="emoji_background">@color/gray5</item>
|
||||
<item name="emoji_text_color">@color/black</item>
|
||||
|
||||
<item name="emoji_category_recent">@drawable/emoji_category_recent_light</item>
|
||||
|
Reference in New Issue
Block a user