Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 05:09:53 +01:00
Code Issues Projects Releases Wiki Activity

Show beta expiry warning in main activity

Browse Source
This commit is contained in:
Torsten Grote
2017-07-04 14:05:28 -03:00
parent a8a9b9032d
commit 6f99a53fd9
12 changed files with 173 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/src/main/res/layout/activity_expired.xml
View File

@@ -5,5 +5,5 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:gravity="center"
android:text="@string/expiry_warning"
android:text="@string/expiry_date_reached"
android:textSize="@dimen/text_size_large"/>

32
briar-android/src/main/res/layout/activity_nav_drawer.xml
View File

@@ -15,6 +15,38 @@
<include layout="@layout/toolbar"/>
<RelativeLayout
android:id="@+id/expiryWarning"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/briar_warning_background"
android:orientation="horizontal"
android:padding="@dimen/margin_medium"
android:visibility="gone"
tools:visibility="visible">
<TextView
android:id="@+id/expiryWarningText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toLeftOf="@+id/expiryWarningClose"
android:text="@string/expiry_warning"
android:textColor="@color/briar_text_primary_inverse"
android:textSize="@dimen/text_size_small"/>
<ImageView
android:id="@+id/expiryWarningClose"
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_alignParentRight="true"
android:layout_centerInParent="true"
android:contentDescription="@string/close"
android:scaleType="center"
android:src="@drawable/ic_close"
android:tint="@color/briar_text_tertiary_inverse"/>
</RelativeLayout>
<FrameLayout
android:id="@+id/fragmentContainer"
android:layout_width="match_parent"