diff --git a/app/build.gradle b/app/build.gradle index a7c4f4a..893c544 100644 --- a/app/build.gradle +++ b/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 - versionName "1.0-beta7" + versionCode 8 + 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.google.zxing:core:3.2.0' - compile 'io.github.yavski:fab-speed-dial:1.0.2' + compile 'com.journeyapps:zxing-android-embedded:3.3.0@aar' + compile 'com.google.zxing:core:3.3.0' + 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 diff --git a/app/src/main/java/ch/dissem/apps/abit/AddressDetailFragment.java b/app/src/main/java/ch/dissem/apps/abit/AddressDetailFragment.java index 08760d6..d4b8b39 100644 --- a/app/src/main/java/ch/dissem/apps/abit/AddressDetailFragment.java +++ b/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(); } diff --git a/app/src/main/java/ch/dissem/apps/abit/MainActivity.java b/app/src/main/java/ch/dissem/apps/abit/MainActivity.java index 1cc4bea..0c347fd 100644 --- a/app/src/main/java/ch/dissem/apps/abit/MainActivity.java +++ b/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) { diff --git a/app/src/main/res/drawable/bg_item_activated.xml b/app/src/main/res/drawable/bg_item_activated.xml new file mode 100644 index 0000000..7b7e224 --- /dev/null +++ b/app/src/main/res/drawable/bg_item_activated.xml @@ -0,0 +1,21 @@ + + + + + + + diff --git a/app/src/main/res/layout-w720dp/activity_message_list.xml b/app/src/main/res/layout-w720dp/activity_message_list.xml index a4b6855..4e2005b 100644 --- a/app/src/main/res/layout-w720dp/activity_message_list.xml +++ b/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"/> + android:background="@color/bg_item_selected_state"> + + + diff --git a/app/src/main/res/layout/contact_row.xml b/app/src/main/res/layout/contact_row.xml index c6afc0f..af37c4a 100644 --- a/app/src/main/res/layout/contact_row.xml +++ b/app/src/main/res/layout/contact_row.xml @@ -21,42 +21,42 @@ android:layout_height="wrap_content"> + 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"/> + android:id="@+id/name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignTop="@+id/avatar" + android:layout_toEndOf="@+id/avatar" + android:ellipsize="end" + android:lines="1" + android:paddingBottom="0dp" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:paddingTop="0dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textStyle="bold" + tools:text="Name"/> + android:id="@+id/address" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignBottom="@+id/avatar" + android:layout_toEndOf="@+id/avatar" + android:ellipsize="marquee" + android:lines="1" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:textAppearance="?android:attr/textAppearanceSmall" + tools:text="BM-2cW0000000000000000000000000000000"/> - \ No newline at end of file + diff --git a/app/src/main/res/layout/fragment_address_detail.xml b/app/src/main/res/layout/fragment_address_detail.xml index 679aa5c..f1f1eed 100644 --- a/app/src/main/res/layout/fragment_address_detail.xml +++ b/app/src/main/res/layout/fragment_address_detail.xml @@ -116,4 +116,4 @@ android:elevation="2dp" tools:ignore="UnusedAttribute" tools:src="@drawable/public_key"/> - \ No newline at end of file + diff --git a/app/src/main/res/layout/fragment_address_list.xml b/app/src/main/res/layout/fragment_address_list.xml index c4a8950..018bf6f 100644 --- a/app/src/main/res/layout/fragment_address_list.xml +++ b/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" @@ -29,4 +30,4 @@ app:elevation="8dp" app:fabGravity="bottom_end" app:fabMenu="@menu/fab_address"/> - \ No newline at end of file + diff --git a/app/src/main/res/layout/scrolling_toolbar_layout.xml b/app/src/main/res/layout/scrolling_toolbar_layout.xml index 9abd179..0b995b4 100644 --- a/app/src/main/res/layout/scrolling_toolbar_layout.xml +++ b/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"/> diff --git a/app/src/main/res/layout/subscription_row.xml b/app/src/main/res/layout/subscription_row.xml index 70ee7a6..c7d137d 100644 --- a/app/src/main/res/layout/subscription_row.xml +++ b/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"> + 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"/> + android:id="@+id/name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignTop="@+id/avatar" + android:layout_toEndOf="@+id/avatar" + android:ellipsize="end" + android:lines="1" + android:paddingBottom="0dp" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:paddingTop="0dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textStyle="bold" + tools:text="Name" + /> + android:id="@+id/stream_number" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignBottom="@+id/avatar" + android:layout_toEndOf="@+id/avatar" + android:ellipsize="end" + android:lines="1" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:textAppearance="?android:attr/textAppearanceSmall" + tools:text="Stream #"/> + android:id="@+id/subscribed" + android:layout_width="16dp" + android:layout_height="16dp" + android:layout_alignParentEnd="true" + android:layout_centerVertical="true" + android:layout_marginEnd="16dp" + app:iiv_color="@android:color/black" + app:iiv_icon="cmd-rss"/> - \ No newline at end of file + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 408e914..f2c1565 100644 --- a/app/src/main/res/values/strings.xml +++ b/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 Select a File Please select the identities you want to import: You can just paste the contents of an export or a ‘keys.dat’ file + Name diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 02ec048..ba7dc9e 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -2,7 +2,7 @@