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

go back to old reminder view look

Browse Source 
Closes #4283
// FREEBIE
This commit is contained in:
Jake McGinty
2015-10-23 12:47:21 -07:00
committed by Moxie Marlinspike
parent 23a2a5e5f3
commit 2f568c6400
9 changed files with 87 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/drawable/light_touch_highlight_background.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:drawable="@color/light_button_highlight" />
<item android:drawable="@color/light_button" />
</selector>

122
res/layout/reminder_header.xml
View File

@@ -1,62 +1,78 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout android:id="@+id/container"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:visibility="gone"
android:background="?reminder_header_background">
<LinearLayout android:id="@+id/reminder"
android:layout_width="0dp"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<LinearLayout android:id="@+id/container"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_margin="10dp"
android:orientation="vertical">
android:gravity="center_vertical"
android:background="?reminder_header_background">
<TextView android:id="@+id/reminder_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/white"
android:textSize="16sp"
tools:text="@string/reminder_header_push_title" />
<LinearLayout android:id="@+id/reminder"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_margin="10dp"
android:orientation="vertical">
<TextView android:id="@+id/reminder_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="sans-serif-light"
android:textColor="@color/white"
android:textSize="14sp"
tools:text="@string/reminder_header_push_text" />
<TextView android:id="@+id/reminder_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
android:textColor="@color/white"
android:textSize="18sp"/>
<TextView android:id="@+id/reminder_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="sans-serif-light"
android:textColor="@color/white"
android:textSize="16sp"/>
</LinearLayout>
<LinearLayout android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="right"
android:layout_marginLeft="15dp"
android:orientation="vertical">
<LinearLayout android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="top">
<ImageButton android:id="@+id/cancel"
android:layout_width="40dp"
android:layout_height="40dp"
android:padding="10dp"
android:background="@drawable/touch_highlight_background"
android:src="@drawable/ic_menu_remove_holo_light"/>
</LinearLayout>
<LinearLayout android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="bottom">
<Button android:id="@+id/ok"
android:layout_width="60sp"
android:layout_height="40sp"
android:gravity="center_vertical|center_horizontal"
android:background="@drawable/light_touch_highlight_background"
android:fontFamily="sans-serif-light"
android:textColor="@color/white"
android:clickable="false"
android:text="@string/yes"
android:padding="2dp"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
<TextView android:id="@+id/cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="16sp"
android:fontFamily="sans-serif-medium"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:textColor="#99ffffff"
android:clickable="true"
android:text="@string/reminder_header_close_button" />
<TextView android:id="@+id/accept"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="16sp"
android:fontFamily="sans-serif-medium"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:textColor="@color/white"
tools:text="ENABLE" />
</LinearLayout>