diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index bbc5f7a05aa5fe91717bac4fb7144f684b903a0b..24164c67d08a56b34c526cd1ee2bfb31d8d68cc4 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -2177,6 +2177,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke @Override public void success(Message message) { + //TODO the following two call can be made before the callback message.setEncryption(Message.ENCRYPTION_DECRYPTED); activity.xmppConnectionService.sendMessage(message); getActivity().runOnUiThread(() -> messageSent()); diff --git a/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java index 86b1b4c710099e1f45c7ec2cdcbc72cf15190021..72d9b5a3e48718477fa249574f8d1070126d3413 100644 --- a/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java @@ -74,7 +74,7 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda super.onCreate(savedInstanceState); - setContentView(R.layout.manage_accounts); + setContentView(R.layout.activity_manage_accounts); if (savedInstanceState != null) { String jid = savedInstanceState.getString(STATE_SELECTED_ACCOUNT); diff --git a/src/main/java/eu/siacs/conversations/ui/ShareViaAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/ShareViaAccountActivity.java index a05775f05ecb1676c40dd4a5c09c7ca671b13c11..cbe85505f7cce38e3a98514f834e325c18a9f9e0 100644 --- a/src/main/java/eu/siacs/conversations/ui/ShareViaAccountActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ShareViaAccountActivity.java @@ -43,7 +43,7 @@ public class ShareViaAccountActivity extends XmppActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.manage_accounts); + setContentView(R.layout.activity_manage_accounts); accountListView = (ListView) findViewById(R.id.account_list); this.mAccountAdapter = new AccountAdapter(this, accountList, false); diff --git a/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java b/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java index a7d7cfc09f5ed707f5c4b7219ff08432ac69e1ba..6f4e866aa974ce0bcc4c57636f5e989759245855 100644 --- a/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java @@ -174,7 +174,7 @@ public class ShareWithActivity extends XmppActivity implements XmppConnectionSer getSupportActionBar().setHomeButtonEnabled(false); } - setContentView(R.layout.share_with); + setContentView(R.layout.activity_share_with); setTitle(getString(R.string.title_activity_sharewith)); mListView = findViewById(R.id.choose_conversation_list); diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java index 27242bec5efd33eebdd03e2fcb52fa7d72e95e4c..86838617fed431c9ce7121f5ddcc50eccaa6d3f2 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java @@ -7,11 +7,11 @@ import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.os.AsyncTask; import android.support.v7.widget.SwitchCompat; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ArrayAdapter; -import android.widget.CompoundButton; import android.widget.ImageView; import android.widget.TextView; @@ -24,6 +24,7 @@ import eu.siacs.conversations.R; import eu.siacs.conversations.entities.Account; import eu.siacs.conversations.ui.ManageAccountActivity; import eu.siacs.conversations.ui.XmppActivity; +import eu.siacs.conversations.ui.util.Color; import eu.siacs.conversations.utils.UIHelper; public class AccountAdapter extends ArrayAdapter { @@ -67,7 +68,7 @@ public class AccountAdapter extends ArrayAdapter { break; case DISABLED: case CONNECTING: - statusView.setTextColor(activity.getSecondaryTextColor()); + statusView.setTextColor(Color.get(activity,android.R.attr.textColorSecondary)); break; default: statusView.setTextColor(activity.getWarningTextColor()); diff --git a/src/main/java/eu/siacs/conversations/ui/util/Color.java b/src/main/java/eu/siacs/conversations/ui/util/Color.java index 795193be2665ad95903cc46fd28ca39db5eb88b0..ac3dcaf6d6aef32465af68cbdec88cc47ce2b713 100644 --- a/src/main/java/eu/siacs/conversations/ui/util/Color.java +++ b/src/main/java/eu/siacs/conversations/ui/util/Color.java @@ -31,18 +31,17 @@ package eu.siacs.conversations.ui.util; import android.content.Context; -import android.content.res.Resources; +import android.content.res.TypedArray; import android.support.annotation.AttrRes; import android.support.annotation.ColorInt; -import android.util.TypedValue; public class Color { public static @ColorInt int get(Context context, @AttrRes int attr) { - TypedValue typedValue = new TypedValue(); - Resources.Theme theme = context.getTheme(); - theme.resolveAttribute(attr, typedValue, true); - return typedValue.data; + TypedArray typedArray = context.obtainStyledAttributes(new int[]{attr}); + int color = typedArray.getColor(0,0); + typedArray.recycle(); + return color; } } diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml index 3e6048a073a7136537f462484ba711848951ea41..5de047403e78bb9248eecb82d2555d3133616fc9 100644 --- a/src/main/res/layout/account_row.xml +++ b/src/main/res/layout/account_row.xml @@ -22,7 +22,7 @@ android:layout_centerVertical="true" android:layout_toRightOf="@+id/account_image" android:orientation="vertical" - android:paddingLeft="8dp" + android:paddingLeft="@dimen/avatar_item_distance" android:layout_toLeftOf="@+id/tgl_account_status" android:layout_toStartOf="@+id/tgl_account_status"> @@ -32,17 +32,15 @@ android:layout_height="wrap_content" android:scrollHorizontally="false" android:singleLine="true" - android:textColor="?attr/color_text_primary" - android:textSize="?attr/TextSizeHeadline" /> + android:textAppearance="@style/TextAppearance.AppCompat.Subhead"/> + android:textAppearance="@style/TextAppearance.AppCompat.Body2" + /> + android:layout_height="match_parent" + android:background="?attr/color_background_primary"> + tools:listitem="@layout/contact" + android:divider="@android:color/transparent" + android:dividerHeight="0dp"/> \ No newline at end of file diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml index 6f5f366d988e2001586b320344b70c300580ad54..048466d4212f0421e082c648688cf75b9e281918 100644 --- a/src/main/res/layout/activity_contact_details.xml +++ b/src/main/res/layout/activity_contact_details.xml @@ -1,7 +1,5 @@ - + + android:background="?attr/color_background_primary" > + android:divider="@android:color/transparent" + android:dividerHeight="0dp" > \ No newline at end of file diff --git a/src/main/res/layout/share_with.xml b/src/main/res/layout/activity_share_with.xml similarity index 71% rename from src/main/res/layout/share_with.xml rename to src/main/res/layout/activity_share_with.xml index 41b6033da28dd6f7a600c7f723822c103b9993c2..126d9bb6c7760dba620b81a416831c9a71917506 100644 --- a/src/main/res/layout/share_with.xml +++ b/src/main/res/layout/activity_share_with.xml @@ -8,6 +8,8 @@ android:id="@+id/choose_conversation_list" android:layout_width="match_parent" android:layout_height="match_parent" - tools:listitem="@layout/conversation_list_row" /> + tools:listitem="@layout/conversation_list_row" + android:divider="@android:color/transparent" + android:dividerHeight="0dp"/> \ No newline at end of file diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml index 019e878a5430514c1ad3fa9893828db6adab6f1e..31fc82c1efdf53f410a35bfe5f8837cb4887abc2 100644 --- a/src/main/res/layout/conversation_list_row.xml +++ b/src/main/res/layout/conversation_list_row.xml @@ -46,8 +46,7 @@ android:paddingRight="4dp" android:maxLines="1" android:ellipsize="end" - android:textAppearance="@style/TextAppearance.AppCompat.Subhead" - android:typeface="sans"/> + android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />