bitmessage/Abit
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor UI improvements

Browse Source 
- added outbox label
- notification is now always removed when on main activity
- send status is now shown in message list and detail view
This commit is contained in:
Christian Basler
2016-10-27 17:37:34 +02:00
parent 7332886786
commit e249c86b79
18 changed files with 246 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/res/drawable/draft.xml Normal file
View File

@ -0,0 +1,25 @@
<!--
~ Copyright 2016 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.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
</vector>

25
app/src/main/res/drawable/sent.xml Normal file
View File

@ -0,0 +1,25 @@
<!--
~ Copyright 2016 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.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
</vector>

25
app/src/main/res/drawable/sent_acknowledged.xml Normal file
View File

@ -0,0 +1,25 @@
<!--
~ Copyright 2016 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.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M18,7l-1.41,-1.41 -6.34,6.34 1.41,1.41L18,7zM22.24,5.59L11.66,16.17 7.48,12l-1.41,1.41L11.66,19l12,-12 -1.42,-1.41zM0.41,13.41L6,19l1.41,-1.41L1.83,12 0.41,13.41z"/>
</vector>

33
app/src/main/res/layout/fragment_message_detail.xml
View File

@ -2,34 +2,47 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fitsSystemWindows="true"
android:focusableInTouchMode="true"
android:orientation="vertical">
<TextView
android:id="@+id/subject"
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_toStartOf="@+id/status"
android:elegantTextHeight="false"
android:enabled="false"
android:gravity="center_vertical"
android:padding="16dp"
tools:text="Subject"
android:textAppearance="?android:attr/textAppearanceLarge"
tools:ignore="UnusedAttribute"/>
tools:ignore="UnusedAttribute"
tools:text="Subject"/>
<ImageView
android:id="@+id/status"
android:layout_width="wrap_content"
android:layout_height="60dp"
android:layout_alignParentEnd="true"
android:layout_alignParentTop="true"
android:tint="@color/colorAccent"
tools:src="@drawable/ic_notification_proof_of_work"
android:padding="16dp"
tools:ignore="ContentDescription"/>
<View
android:id="@+id/divider"
android:layout_width="fill_parent"
android:layout_height="2dip"
android:layout_below="@id/subject"
android:background="@color/divider" />
android:background="@color/divider"/>
<ImageView
android:id="@+id/avatar"
@ -50,8 +63,8 @@
android:gravity="center_vertical"
android:paddingLeft="8dp"
android:paddingRight="8dp"
tools:text="Sender"
android:textStyle="bold" />
android:textStyle="bold"
tools:text="Sender"/>
<TextView
android:id="@+id/recipient"
@ -62,7 +75,7 @@
android:gravity="center_vertical"
android:paddingLeft="8dp"
android:paddingRight="8dp"
tools:text="Recipient" />
tools:text="Recipient"/>
<TextView
android:id="@+id/text"
@ -75,6 +88,6 @@
android:layout_marginTop="32dp"
android:paddingBottom="64dp"
android:text="New Text"
android:textIsSelectable="true" />
android:textIsSelectable="true"/>
</RelativeLayout>
</ScrollView>
</ScrollView>

14
app/src/main/res/layout/message_row.xml
View File

@ -44,7 +44,7 @@
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_margin="16dp"
android:src="@color/colorAccent"
android:src="@color/colorPrimaryDark"
tools:ignore="ContentDescription"/>
<TextView
@ -96,6 +96,18 @@
android:textAppearance="?android:attr/textAppearanceSmall"
tools:text="Text"/>
<ImageView
android:id="@+id/status"
android:layout_width="24dp"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/avatar"
android:layout_alignEnd="@+id/avatar"
android:layout_marginBottom="-8dp"
android:layout_marginEnd="-8dp"
android:tint="@color/colorAccent"
tools:ignore="ContentDescription"
tools:src="@drawable/ic_notification_proof_of_work"/>
</RelativeLayout>
</FrameLayout>

9
app/src/main/res/values-de/strings.xml
View File

@ -101,4 +101,13 @@ Als Alternative kann in den Einstellungen ein vertrauenswürdiger Knoten konfigu
<string name="startup_node">Knoten starten</string>
<string name="personal_message">Nachricht</string>
<string name="no_identity_warning">Bitte versuchs nochmals wenn eine Identität verfügbar ist.</string>
<string name="title_chan_detail">Chan</string>
<string name="title_contact_detail">Kontakt</string>
<string name="title_identity_detail">Identität</string>
<string name="outbox">Postausgang</string>
<string name="status_draft">Entwurf</string>
<string name="status_public_key">öffentlicher Schlüssel angefordert</string>
<string name="status_received">empfangen</string>
<string name="status_sent">gesendet</string>
<string name="status_sent_acknowledged">Empfang bestätigt</string>
</resources>

13
app/src/main/res/values/strings.xml
View File

@ -1,8 +1,11 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<string name="app_name">Abit</string>
<string name="about_app">A Bitmessage client for Android</string>
<string name="title_message_detail">Message Detail</string>
<string name="title_subscription_detail">Subscription Detail</string>
<string name="title_message_detail">Message</string>
<string name="title_subscription_detail">Subscription</string>
<string name="title_chan_detail">Chan</string>
<string name="title_identity_detail">Identity</string>
<string name="title_contact_detail">Contact</string>
<string name="bitmessage_full_node">Bitmessage Node</string>
<string name="settings">Settings</string>
<string name="wifi_only">Wi-Fi only</string>
@ -100,4 +103,10 @@ As an alternative you could configure a trusted node in the settings, but as of
<string name="startup_node">Startup node</string>
<string name="personal_message">Message</string>
<string name="no_identity_warning">Please try again once an identity is available.</string>
<string name="status_public_key">public key requested</string>
<string name="status_sent_acknowledged">acknowledged</string>
<string name="status_draft">draft</string>
<string name="status_sent">sent</string>
<string name="status_received">received</string>
<string name="outbox">Outbox</string>
</resources>