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

Clean up UI

Browse Source
This commit is contained in:
Niels Andriesse
2020-01-28 11:13:07 +11:00
parent 2ea009b05b
commit 2823c0ce5d
6 changed files with 81 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/layout/conversation_activity.xml
View File

@@ -104,6 +104,11 @@
android:indeterminate="false"
android:progress="80" />
<org.thoughtcrime.securesms.loki.SessionRestoreBannerView
android:id="@+id/sessionRestoreBannerView"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<ViewStub
android:id="@+id/group_share_profile_view_stub"
android:layout_width="match_parent"
@@ -118,11 +123,6 @@
android:inflatedId="@+id/unverified_banner"
android:layout="@layout/conversation_activity_unverified_banner_stub" />
<org.thoughtcrime.securesms.loki.SessionRestoreBannerView
android:id="@+id/sessionRestoreBannerView"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<ViewStub
android:id="@+id/reminder_stub"
android:layout_width="match_parent"

86
res/layout/session_restore_banner.xml
View File

@@ -1,53 +1,73 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/sessionRestoreBanner"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/core_grey_60"
android:background="@color/dialog_background"
android:orientation="vertical"
android:paddingLeft="8dp"
android:paddingTop="8dp"
android:paddingRight="8dp"
android:visibility="visible"
tools:visibility="visible">
android:elevation="10dp">
<TextView
android:id="@+id/restoreText"
<View
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:fontFamily="sans-serif-light"
android:textColor="@color/white"
android:textSize="16sp"
tools:text="@string/session_restore_banner_message" />
android:layout_height="1px"
android:background="@color/separator" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="right"
android:orientation="horizontal">
android:orientation="vertical"
android:padding="@dimen/medium_spacing"
android:gravity="center_horizontal">
<Button
android:id="@+id/dismissButton"
style="@style/Widget.AppCompat.Button.Borderless"
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/session_restore_banner_dismiss_button_title" />
android:text="Session Out of Sync"
android:textColor="@color/text"
android:textStyle="bold"
android:textSize="@dimen/medium_font_size" />
<android.support.v4.widget.Space
android:layout_width="8dp"
android:layout_height="wrap_content" />
<Button
android:id="@+id/restoreButton"
style="@style/Button.Borderless"
<TextView
android:id="@+id/messageTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/session_restore_banner_restore_button_title" />
android:layout_marginTop="@dimen/small_spacing"
android:text="@string/session_restore_banner_message"
android:textColor="@color/text"
android:textSize="@dimen/small_font_size"
android:textAlignment="center" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/small_spacing"
android:orientation="horizontal">
<Button
style="@style/UnimportantDialogButton"
android:id="@+id/dismissButton"
android:layout_width="0dp"
android:layout_height="@dimen/small_button_height"
android:layout_weight="1"
android:text="@string/session_restore_banner_dismiss_button_title" />
<Button
style="@style/ProminentDialogButton"
android:id="@+id/restoreButton"
android:layout_width="0dp"
android:layout_height="@dimen/small_button_height"
android:layout_weight="1"
android:layout_marginLeft="@dimen/medium_spacing"
android:text="@string/session_restore_banner_restore_button_title" />
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/separator" />
</LinearLayout>