Minor bug fixes and improvements, added caching to inventory

This commit is contained in:
2016-01-19 07:43:48 +01:00
parent 6ec25cfae7
commit 6f6a2e4e6c
9 changed files with 186 additions and 101 deletions

View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path android:fillColor="#000" android:pathData="M18,8A2,2 0 0,1 20,10V20A2,2 0 0,1 18,22H6C4.89,22 4,21.1 4,20V10A2,2 0 0,1 6,8H15V6A3,3 0 0,0 12,3A3,3 0 0,0 9,6H7A5,5 0 0,1 12,1A5,5 0 0,1 17,6V8H18M12,17A2,2 0 0,0 14,15A2,2 0 0,0 12,13A2,2 0 0,0 10,15A2,2 0 0,0 12,17Z" />
</vector>

View File

@ -16,65 +16,90 @@
-->
<RelativeLayout 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">
<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/colorAccent"
android:layout_margin="16dp"/>
android:id="@+id/avatar"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_margin="16dp"
android:src="@color/colorAccent"
tools:ignore="ContentDescription"/>
<EditText
android:id="@+id/name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="Name"
android:layout_alignTop="@+id/avatar"
android:layout_toRightOf="@+id/avatar"
android:layout_toEndOf="@+id/avatar"
android:layout_marginRight="16dp"
android:layout_marginEnd="16dp"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"/>
android:id="@+id/name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignTop="@+id/avatar"
android:layout_marginEnd="16dp"
android:layout_toEndOf="@+id/avatar"
android:text=""
android:inputType="textPersonName"
tools:ignore="LabelFor"/>
<TextView
android:id="@+id/address"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Address"
android:lines="1"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_below="@+id/avatar"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:textStyle="bold"
/>
android:id="@+id/address"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/avatar"
android:lines="1"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:text="BM-XyYxXyYxXyYxXyYxXyYx"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textStyle="bold"
tools:ignore="HardcodedText"/>
<TextView
android:id="@+id/stream_number"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Stream #"
android:lines="1"
android:ellipsize="end"
android:textAppearance="?android:attr/textAppearanceSmall"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:layout_below="@+id/address"/>
android:id="@+id/stream_number"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/address"
android:ellipsize="end"
android:lines="1"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:text="Stream #"
android:textAppearance="?android:attr/textAppearanceSmall"
tools:ignore="HardcodedText"/>
<Switch
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/subscribed"
android:id="@+id/active"
android:paddingTop="16dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:layout_below="@+id/stream_number"/>
android:id="@+id/active"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/stream_number"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingTop="16dp"
android:text="@string/subscribed"/>
<ImageView
android:id="@+id/pubkey_available"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_below="@+id/active"
android:paddingStart="16dp"
android:paddingEnd="4dp"
android:paddingTop="16dp"
android:src="@drawable/public_key"
tools:ignore="ContentDescription"/>
<TextView
android:id="@+id/pubkey_available_desc"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:paddingStart="0dp"
android:paddingEnd="16dp"
android:layout_alignBottom="@id/pubkey_available"
android:layout_toEndOf="@id/pubkey_available"
android:layout_alignParentEnd="true"
android:text="@string/pubkey_available"
android:textAppearance="?android:attr/textAppearanceSmall"/>
</RelativeLayout>

View File

@ -56,4 +56,6 @@
<string name="alias_default_identity">Ich</string>
<string name="title_activity_status">Debugging</string>
<string name="status_summary">Technische Infos</string>
<string name="pubkey_available">Öffentlicher Schlüssel verfügbar</string>
<string name="pubkey_not_available">Öffentlicher Schlüssel noch nicht verfügbar</string>
</resources>

View File

@ -59,4 +59,6 @@
<string name="status">Debugging</string>
<string name="status_summary">Technical information</string>
<string name="alias_default_identity">Me</string>
<string name="pubkey_available">Public key available</string>
<string name="pubkey_not_available">Public key not yet available</string>
</resources>