Fixed some layouts and updated dependencies

app/build.gradle

@@ -11,14 +11,14 @@ if (project.hasProperty("project.configs")
 
 android {
     compileSdkVersion 24
-    buildToolsVersion "24.0.2"
+    buildToolsVersion "24.0.3"
 
     defaultConfig {
         applicationId "ch.dissem.apps." + appName.toLowerCase()
         minSdkVersion 19
         targetSdkVersion 24
-        versionCode 7
+        versionCode 8
-        versionName "1.0-beta7"
+        versionName "1.0-beta8"
     }
     buildTypes {
         release {
@@ -29,7 +29,7 @@ android {
     }
 }
 
-ext.jabitVersion = 'development-SNAPSHOT'
+ext.jabitVersion = '2.0.0'
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:appcompat-v7:24.2.1'
@@ -54,9 +54,9 @@ dependencies {
     compile 'com.mikepenz:iconics:1.6.2@aar'
     compile 'com.mikepenz:community-material-typeface:1.5.54.2@aar'
 
-    compile 'com.journeyapps:zxing-android-embedded:3.1.0@aar'
+    compile 'com.journeyapps:zxing-android-embedded:3.3.0@aar'
-    compile 'com.google.zxing:core:3.2.0'
+    compile 'com.google.zxing:core:3.3.0'
-    compile 'io.github.yavski:fab-speed-dial:1.0.2'
+    compile 'io.github.yavski:fab-speed-dial:1.0.4'
     compile 'com.github.amlcurran.showcaseview:library:5.4.3'
     compile ('com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.9.3@aar'){
         transitive=true

app/src/main/java/ch/dissem/apps/abit/AddressDetailFragment.java

@@ -278,6 +278,10 @@ public class AddressDetailFragment extends Fragment {
     public void onPause() {
         if (item != null) {
             Singleton.getAddressRepository(getContext()).save(item);
+            MainActivity mainActivity = MainActivity.getInstance();
+            if (mainActivity != null && item.getPrivateKey() != null) {
+                mainActivity.updateIdentityEntry(item);
+            }
         }
         super.onPause();
     }

app/src/main/java/ch/dissem/apps/abit/MainActivity.java

@@ -438,6 +438,19 @@ public class MainActivity extends AppCompatActivity
         }
     }
 
+    public void updateIdentityEntry(BitmessageAddress identity) {
+        for (IProfile profile : accountHeader.getProfiles()) {
+            if (profile instanceof ProfileDrawerItem) {
+                if (identity.equals(((ProfileDrawerItem) profile).getTag())) {
+                    ((ProfileDrawerItem) profile)
+                        .withName(identity.toString())
+                        .withTag(identity);
+                    return;
+                }
+            }
+        }
+    }
+
     public void removeIdentityEntry(BitmessageAddress identity) {
         for (IProfile profile : accountHeader.getProfiles()) {
             if (profile instanceof ProfileDrawerItem) {

app/src/main/res/drawable/bg_item_activated.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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.
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_activated="true" android:drawable="@color/bg_item_selected_state" />
+    <item android:state_activated="false" android:drawable="@color/contentBackground" />
+</selector>

app/src/main/res/layout-w720dp/activity_message_list.xml

@@ -20,7 +20,6 @@
                   android:layout_width="match_parent"
                   android:layout_height="match_parent"
                   android:layout_below="@id/toolbar"
-                  android:background="@color/bg_item_selected_state"
                   android:baselineAligned="false"
                   android:orientation="horizontal"
                   android:showDividers="middle"
@@ -40,14 +39,20 @@
             tools:layout="@layout/fragment_message_list"/>
 
         <FrameLayout
-            android:id="@+id/message_detail_container"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_margin="16dp"
             android:layout_weight="2"
+            android:background="@color/bg_item_selected_state">
+
+            <FrameLayout
+                android:id="@+id/message_detail_container"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_margin="16dp"
                 android:background="@color/contentBackground"
                 android:elevation="2dp"
                 tools:layout="@layout/fragment_message_detail"/>
+        </FrameLayout>
 
     </LinearLayout>
 </RelativeLayout>

app/src/main/res/layout/contact_row.xml

@@ -24,39 +24,39 @@
         android:id="@+id/avatar"
         android:layout_width="40dp"
         android:layout_height="40dp"
-            android:layout_alignParentTop="true"
         android:layout_alignParentStart="true"
-            android:src="@color/colorAccent"
+        android:layout_alignParentTop="true"
         android:layout_margin="16dp"
+        android:src="@color/colorAccent"
         tools:ignore="ContentDescription"/>
 
     <TextView
         android:id="@+id/name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-            tools:text="Name"
-            android:lines="1"
-            android:ellipsize="end"
-            android:textAppearance="?android:attr/textAppearanceMedium"
         android:layout_alignTop="@+id/avatar"
         android:layout_toEndOf="@+id/avatar"
-            android:paddingTop="0dp"
+        android:ellipsize="end"
+        android:lines="1"
+        android:paddingBottom="0dp"
         android:paddingLeft="8dp"
         android:paddingRight="8dp"
-            android:paddingBottom="0dp"
+        android:paddingTop="0dp"
-            android:textStyle="bold"/>
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textStyle="bold"
+        tools:text="Name"/>
 
     <TextView
         android:id="@+id/address"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-            tools:text="BM-2cW0000000000000000000000000000000"
+        android:layout_alignBottom="@+id/avatar"
-            android:lines="1"
+        android:layout_toEndOf="@+id/avatar"
         android:ellipsize="marquee"
-            android:textAppearance="?android:attr/textAppearanceSmall"
+        android:lines="1"
         android:paddingLeft="8dp"
         android:paddingRight="8dp"
-            android:layout_alignBottom="@+id/avatar"
+        android:textAppearance="?android:attr/textAppearanceSmall"
-            android:layout_toEndOf="@+id/avatar"/>
+        tools:text="BM-2cW0000000000000000000000000000000"/>
 
 </RelativeLayout>

app/src/main/res/layout/fragment_address_list.xml

@@ -8,6 +8,7 @@
         android:id="@id/android:list"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:choiceMode="singleChoice"
 
         android:layout_alignParentBottom="true"
         android:layout_alignParentStart="true"

app/src/main/res/layout/scrolling_toolbar_layout.xml

@@ -27,7 +27,6 @@
             android:background="?attr/colorPrimary"
             android:elevation="4dp"
             android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-            app:layout_scrollFlags="scroll|enterAlways"
             app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
             tools:ignore="UnusedAttribute"/>
 

app/src/main/res/layout/subscription_row.xml

@@ -19,56 +19,57 @@
                 xmlns:app="http://schemas.android.com/apk/res-auto"
                 xmlns:tools="http://schemas.android.com/tools"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:background="?android:attr/activatedBackgroundIndicator">
 
     <ImageView
         android:id="@+id/avatar"
         android:layout_width="40dp"
         android:layout_height="40dp"
-            android:layout_alignParentTop="true"
         android:layout_alignParentStart="true"
-            android:src="@color/colorAccent"
+        android:layout_alignParentTop="true"
         android:layout_margin="16dp"
+        android:src="@color/colorAccent"
         tools:ignore="ContentDescription"/>
 
     <TextView
         android:id="@+id/name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-            tools:text="Name"
-            android:lines="1"
-            android:ellipsize="end"
-            android:textAppearance="?android:attr/textAppearanceMedium"
         android:layout_alignTop="@+id/avatar"
         android:layout_toEndOf="@+id/avatar"
-            android:paddingTop="0dp"
+        android:ellipsize="end"
+        android:lines="1"
+        android:paddingBottom="0dp"
         android:paddingLeft="8dp"
         android:paddingRight="8dp"
-            android:paddingBottom="0dp"
+        android:paddingTop="0dp"
+        android:textAppearance="?android:attr/textAppearanceMedium"
         android:textStyle="bold"
+        tools:text="Name"
         />
 
     <TextView
         android:id="@+id/stream_number"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-            tools:text="Stream #"
+        android:layout_alignBottom="@+id/avatar"
-            android:lines="1"
+        android:layout_toEndOf="@+id/avatar"
         android:ellipsize="end"
-            android:textAppearance="?android:attr/textAppearanceSmall"
+        android:lines="1"
         android:paddingLeft="8dp"
         android:paddingRight="8dp"
-            android:layout_alignBottom="@+id/avatar"
+        android:textAppearance="?android:attr/textAppearanceSmall"
-            android:layout_toEndOf="@+id/avatar"/>
+        tools:text="Stream #"/>
 
     <com.mikepenz.iconics.view.IconicsImageView
         android:id="@+id/subscribed"
         android:layout_width="16dp"
         android:layout_height="16dp"
-            app:iiv_color="@android:color/black"
-            app:iiv_icon="cmd-rss"
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
-            android:layout_marginEnd="16dp"/>
+        android:layout_marginEnd="16dp"
+        app:iiv_color="@android:color/black"
+        app:iiv_icon="cmd-rss"/>
 
 </RelativeLayout>

app/src/main/res/values/strings.xml

@@ -102,4 +102,5 @@ As an alternative you could configure a trusted node in the settings, but as of
     <string name="select_file_title">Select a File</string>
     <string name="select_identities_to_import">Please select the identities you want to import:</string>
     <string name="import_input_description">You can just paste the contents of an export or a ‘keys.dat’ file</string>
+    <string name="name">Name</string>
 </resources>

app/src/main/res/values/styles.xml

@@ -2,7 +2,7 @@
 
     <!-- Base application theme. -->
     <style name="AppTheme" parent="MaterialDrawerTheme.Light.DarkToolbar.TranslucentStatus">
-        <item name="android:activatedBackgroundIndicator">@color/colorPrimaryLight</item>
+        <item name="android:activatedBackgroundIndicator">@drawable/bg_item_activated</item>
         <item name="android:textColor">@color/colorPrimaryText</item>
         <item name="android:textColorSecondary">@color/colorSecondaryText</item>
     </style>