TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-03 04:52:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into version

Browse Source
This commit is contained in:
Niels Andriesse
2020-03-05 14:15:05 +11:00
parent efef42a6f6 218d6488af
commit 44fd72dfac
47 changed files with 300 additions and 1336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
res/layout/conversation_item_footer.xml
View File

@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<merge
xmlns:android="http://schemas.android.com/apk/res/android"
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
@@ -39,23 +37,6 @@
</LinearLayout>
<TextView
android:id="@+id/footer_sim_info"
android:autoLink="none"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:maxWidth="140dp"
android:maxLines="1"
android:ellipsize="end"
android:linksClickable="false"
style="@style/Signal.Text.Caption.MessageSent"
android:layout_gravity="end|bottom"
android:fontFamily="sans-serif-light"
android:visibility="gone"
tools:visibility="visible"
tools:text="to SIM1" />
<ImageView
android:id="@+id/footer_insecure_indicator"
android:layout_width="12dp"

2
res/layout/signal_map_view.xml
View File

@@ -5,11 +5,13 @@
<FrameLayout android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1">
<!--
<com.google.android.gms.maps.MapView
android:id="@+id/map_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone"/>
-->
<ImageView android:id="@+id/image_view"
android:layout_width="match_parent"