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

Fixed some layouts and updated dependencies

Browse Source
This commit is contained in:
Christian Basler 2016-10-06 22:01:33 +02:00
parent da6cd43a46
commit 91451b0ce7
12 changed files with 140 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/build.gradle
View File

@ -11,14 +11,14 @@ if (project.hasProperty("project.configs")
android { android {
compileSdkVersion 24 compileSdkVersion 24
buildToolsVersion "24.0.2" buildToolsVersion "24.0.3"
defaultConfig { defaultConfig {
applicationId "ch.dissem.apps." + appName.toLowerCase() applicationId "ch.dissem.apps." + appName.toLowerCase()
minSdkVersion 19 minSdkVersion 19
targetSdkVersion 24 targetSdkVersion 24
versionCode 7 versionCode 8
versionName "1.0-beta7" versionName "1.0-beta8"
} }
buildTypes { buildTypes {
release { release {
@ -29,7 +29,7 @@ android {
} }
} }
ext.jabitVersion = 'development-SNAPSHOT' ext.jabitVersion = '2.0.0'
dependencies { dependencies {
compile fileTree(dir: 'libs', include: ['*.jar']) compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:24.2.1' 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:iconics:1.6.2@aar'
compile 'com.mikepenz:community-material-typeface:1.5.54.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.github.amlcurran.showcaseview:library:5.4.3'
compile ('com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.9.3@aar'){ compile ('com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.9.3@aar'){
transitive=true transitive=true

4
app/src/main/java/ch/dissem/apps/abit/AddressDetailFragment.java
View File

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

13
app/src/main/java/ch/dissem/apps/abit/MainActivity.java
View File

@ -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) { public void removeIdentityEntry(BitmessageAddress identity) {
for (IProfile profile : accountHeader.getProfiles()) { for (IProfile profile : accountHeader.getProfiles()) {
if (profile instanceof ProfileDrawerItem) { if (profile instanceof ProfileDrawerItem) {

21
app/src/main/res/drawable/bg_item_activated.xml Normal file
View File

@ -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>

17
app/src/main/res/layout-w720dp/activity_message_list.xml
View File

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

66
app/src/main/res/layout/contact_row.xml
View File

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

1
app/src/main/res/layout/fragment_address_list.xml
View File

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

1
app/src/main/res/layout/scrolling_toolbar_layout.xml
View File

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

87
app/src/main/res/layout/subscription_row.xml
View File

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

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

@ -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_file_title">Select a File</string>
<string name="select_identities_to_import">Please select the identities you want to import:</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="import_input_description">You can just paste the contents of an export or a ‘keys.dat’ file</string>
<string name="name">Name</string>
</resources> </resources>

2
app/src/main/res/values/styles.xml
View File

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