Added proper message list, and almost nice notifications

This commit is contained in:
2015-08-28 13:49:53 +02:00
parent 5e2d19df58
commit e5b00c7453
24 changed files with 390 additions and 94 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 356 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 273 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 455 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 660 B

View File

@ -1,25 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:gravity="center"
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
android:elevation="4dp" />
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_below="@id/toolbar"
android:id="@+id/message_detail_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MessageDetailActivity"
tools:layout="@android:layout/list_content"/>
</RelativeLayout>

View File

@ -6,24 +6,24 @@
android:padding="16dp">
<TextView
android:id="@+id/address"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="BM-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
android:textAppearance="?android:attr/textAppearanceSmall"
android:id="@+id/address"/>
android:textAppearance="?android:attr/textAppearanceSmall"/>
<android.support.design.widget.TextInputLayout
android:id="@+id/label_wrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/label_wrapper"
android:layout_below="@+id/address">
<EditText
android:id="@+id/label"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textPersonName"
android:hint="@string/label"
android:id="@+id/label"/>
android:hint="@string/label"/>
</android.support.design.widget.TextInputLayout>
@ -37,30 +37,47 @@
android:layout_marginTop="8dp"/>
<Switch
android:id="@+id/subscribe"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/subscribe"
android:id="@+id/subscribe"
android:layout_below="@+id/import_contact"
android:layout_centerHorizontal="true"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"/>
<Button
android:id="@+id/compose_message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Message"
style="?android:attr/borderlessButtonStyle"
android:layout_below="@+id/subscribe"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_marginTop="12dp"
android:layout_marginBottom="12dp"/>
<Button
android:id="@+id/do_import"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/do_import"
android:id="@+id/do_import"
android:layout_alignParentBottom="true"
style="?android:attr/borderlessButtonStyle"
android:layout_below="@+id/subscribe"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"/>
android:layout_alignParentEnd="true"
android:layout_marginTop="12dp"
android:layout_marginBottom="12dp"/>
<Button
android:id="@+id/cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/cancel"
android:id="@+id/cancel"
android:layout_alignParentBottom="true"
android:layout_toLeftOf="@id/do_import"/>
style="?android:attr/borderlessButtonStyle"
android:layout_alignTop="@+id/do_import"
android:layout_toLeftOf="@+id/do_import"
android:layout_toStartOf="@+id/do_import"/>
</RelativeLayout>

View File

@ -1,9 +1,82 @@
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/message_detail"
style="?android:attr/textAppearanceLarge"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="16dp"
android:textIsSelectable="true"
tools:context=".MessageDetailFragment"/>
<?xml version="1.0" encoding="utf-8"?>
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="match_parent"
android:layout_width="match_parent">
<RelativeLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fitsSystemWindows="true">
<TextView
android:id="@+id/subject"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:gravity="center_vertical"
android:text="Subject"
android:padding="16dp"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:elegantTextHeight="false"
android:enabled="false"/>
<View
android:id="@+id/divider"
android:layout_width="fill_parent"
android:layout_height="2dip"
android:layout_below="@id/subject"
android:background="@color/divider"/>
<ImageView
android:id="@+id/avatar"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_below="@+id/divider"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:src="@color/accent"
android:layout_margin="16dp"/>
<TextView
android:id="@+id/sender"
android:layout_width="wrap_content"
android:layout_height="20dp"
android:text="Sender"
android:layout_alignTop="@+id/avatar"
android:layout_toRightOf="@+id/avatar"
android:layout_toEndOf="@+id/avatar"
android:gravity="center_vertical"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:textStyle="bold"/>
<TextView
android:id="@+id/recipient"
android:layout_width="wrap_content"
android:layout_height="20dp"
android:text="Recipient"
android:gravity="center_vertical"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:layout_alignBottom="@+id/avatar"
android:layout_toRightOf="@+id/avatar"
android:layout_toEndOf="@+id/avatar"/>
<TextView
android:id="@+id/text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="New Text"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="32dp"
android:paddingBottom="64dp"
android:layout_below="@+id/avatar"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"/>
</RelativeLayout>
</ScrollView>

View File

@ -0,0 +1,80 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright 2015 Christian Basler
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/avatar"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:src="@color/accent"
android:layout_margin="16dp"/>
<TextView
android:id="@+id/sender"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Sender"
android:lines="1"
android:ellipsize="end"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_alignTop="@+id/avatar"
android:layout_toRightOf="@+id/avatar"
android:layout_toEndOf="@+id/avatar"
android:layout_marginTop="-5dp"
android:paddingTop="0dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingBottom="0dp"
android:textStyle="bold"
/>
<TextView
android:id="@+id/subject"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Subject"
android:lines="1"
android:ellipsize="end"
android:textAppearance="?android:attr/textAppearanceSmall"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:layout_below="@+id/sender"
android:layout_toRightOf="@+id/avatar"
android:layout_toEndOf="@+id/avatar"/>
<TextView
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Text"
android:lines="1"
android:ellipsize="end"
android:textAppearance="?android:attr/textAppearanceSmall"
android:gravity="center_vertical"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingBottom="8dp"
android:layout_below="@+id/subject"
android:layout_toRightOf="@+id/avatar"
android:layout_toEndOf="@+id/avatar"/>
</RelativeLayout>

View File

@ -21,5 +21,5 @@
<string name="sent">Gesendet</string>
<string name="unread">Ungelesen</string>
<string name="trash">Papierkorb</string>
<string name="broadcast">Broadcasts</string>
<string name="broadcasts">Broadcasts</string>
</resources>

View File

@ -6,12 +6,22 @@
<string name="wifi_only_summary">Nicht mit Mobilfunknetz verbinden</string>
<string name="bitmessage_active">Bitmessage ist aktiv</string>
<string name="disable_sync">Synchronisieren ausschalten</string>
<string name="emoji_input">Eingabe von Emojis</string>
<string name="emoji_input_summary">Emoji-Taste anstelle von Eingabe anzeigen</string>
<string name="enable_sync">Synchronisieren einschalten</string>
<string name="subject">Betreff</string>
<string name="to">An</string>
<string name="title_message_detail">Nachricht</string>
<string name="subscriptions">Abonnements</string>
<string name="wifi_mode">Art der WLAN-Verbindung</string>
<string name="action_settings">Einstellungen</string>
<string name="add_identity">Identität hinzufügen</string>
<string name="add_identity_summary">Eine neue Identität erstellen</string>
<string name="broadcast">Broadcast</string>
<string name="cancel">Abbrechen</string>
<string name="do_import">Importieren</string>
<string name="import_address">Adresse importieren</string>
<string name="import_contact">Kontakt hinzufügen</string>
<string name="label">Label</string>
<string name="manage_identity">Identität verwalten</string>
<string name="subscribe">Abonnieren</string>
<string name="title_activity_open_bitmessage_link">Kontakt importieren</string>
</resources>

View File

@ -21,5 +21,5 @@
<string name="sent">Sent</string>
<string name="unread">Unread</string>
<string name="trash">Trash</string>
<string name="broadcast">Broadcasts</string>
<string name="broadcasts">Broadcasts</string>
</resources>

View File

@ -11,14 +11,11 @@
<string name="subscriptions">Subscriptions</string>
<string name="to">To</string>
<string name="subject">Subject</string>
<string name="emoji_input">Emoji Input</string>
<string name="emoji_input_summary">Show the emoji button instead of enter</string>
<string name="manage_identity">Manage Identity</string>
<string name="add_identity">Add Identity</string>
<string name="add_identity_summary">Create new identity</string>
<string name="title_activity_open_bitmessage_link">Import Contact</string>
<string name="hello_world">Hello world!</string>
<string name="action_settings">Settings</string>
<string name="import_address">Import Address</string>
<string name="import_contact">Add to contacts</string>
@ -26,4 +23,5 @@
<string name="subscribe">Subscribe</string>
<string name="do_import">Import</string>
<string name="cancel">Cancel</string>
<string name="broadcast">Broadcast</string>
</resources>

View File

@ -4,18 +4,20 @@
<style name="AppTheme.Base" parent="MaterialDrawerTheme.Light.DarkToolbar.TranslucentStatus">
<item name="android:activatedBackgroundIndicator">@color/primary_light</item>
<item name="android:textColor">@color/primary_text</item>
<item name="android:textColorSecondary">@color/secondary_text</item>
<!-- MaterialDrawer specific values -->
<item name="material_drawer_background">@color/primary_dark</item>
<item name="material_drawer_icons">@color/icons</item>
<item name="material_drawer_icons">@color/primary_text</item>
<item name="material_drawer_primary_icon">@color/icons</item>
<item name="material_drawer_primary_text">@color/icons</item>
<item name="material_drawer_secondary_text">@color/icons</item>
<item name="material_drawer_hint_text">@color/icons</item>
<item name="material_drawer_divider">@color/icons</item>
<item name="material_drawer_primary_text">@color/primary_text</item>
<item name="material_drawer_secondary_text">@color/secondary_text</item>
<item name="material_drawer_hint_text">@color/secondary_text</item>
<item name="material_drawer_divider">@color/divider</item>
<item name="material_drawer_selected">@color/primary</item>
<item name="material_drawer_selected_text">@color/icons</item>
<item name="material_drawer_header_selection_text">@color/icons</item>
<item name="material_drawer_selected_text">@color/primary_text</item>
<item name="material_drawer_header_selection_text">@color/primary_text</item>
</style>