diff options
21 files changed, 136 insertions, 115 deletions
diff --git a/build.gradle b/build.gradle index 14e0b9704..3fc14c234 100644 --- a/build.gradle +++ b/build.gradle @@ -34,7 +34,7 @@ configurations { } ext { - supportLibVersion = '27.0.2' + supportLibVersion = '27.1.0' } dependencies { @@ -54,12 +54,13 @@ dependencies { compile 'com.makeramen:roundedimageview:2.3.0' compile 'jetty:javax.servlet:5.1.12' compile 'com.google.code.gson:gson:2.8.0' - compile 'com.android.support:multidex:1.0.2' + compile 'com.android.support:multidex:1.0.3' compile "com.android.support:support-v13:$supportLibVersion" compile "com.android.support:appcompat-v7:$supportLibVersion" compile "com.android.support:support-v4:$supportLibVersion" compile "com.android.support:support-emoji:$supportLibVersion" compile "com.android.support:support-emoji-bundled:$supportLibVersion" + compile "com.android.support:exifinterface:$supportLibVersion" compile 'com.github.bumptech.glide:glide:3.8.0' compile 'com.github.chrisbanes:PhotoView:2.0.0' compile 'com.github.rtoshiro.fullscreenvideoview:fullscreenvideoview:1.1.3' @@ -82,8 +83,8 @@ android { minSdkVersion 16 targetSdkVersion 25 - versionCode 218 - versionName "1.21.3" + versionCode 219 + versionName "2.0.0" archivesBaseName += "-$versionName" applicationId "de.pixart.messenger" diff --git a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java index 192979083..aabb8c1fe 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java @@ -1,7 +1,7 @@ package de.pixart.messenger.ui; import android.annotation.SuppressLint; -import android.app.ActionBar; +import android.support.v7.app.ActionBar; import android.app.AlertDialog; import android.app.FragmentTransaction; import android.app.PendingIntent; @@ -18,7 +18,7 @@ import android.content.pm.PackageManager; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.graphics.Typeface; -import android.media.ExifInterface; +import android.support.media.ExifInterface; import android.net.Uri; import android.os.Build; import android.os.Bundle; @@ -250,7 +250,7 @@ public class ConversationActivity extends XmppActivity this.listAdapter = new ConversationAdapter(this, conversationList); listView.setAdapter(this.listAdapter); - final ActionBar actionBar = getActionBar(); + final ActionBar actionBar = getSupportActionBar(); if (actionBar != null) { actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_TITLE); } @@ -364,7 +364,7 @@ public class ConversationActivity extends XmppActivity } private void updateActionBarTitle(boolean titleShouldBeName) { - final ActionBar ab = getActionBar(); + final ActionBar ab = getSupportActionBar(); final Conversation conversation = getSelectedConversation(); if (ab != null) { if (titleShouldBeName && conversation != null) { diff --git a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java index c1cd8a015..7a11a0e08 100644 --- a/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java +++ b/src/main/java/de/pixart/messenger/ui/StartConversationActivity.java @@ -2,15 +2,8 @@ package de.pixart.messenger.ui; import android.Manifest; import android.annotation.SuppressLint; -import android.app.ActionBar; -import android.app.ActionBar.Tab; -import android.app.ActionBar.TabListener; import android.app.AlertDialog; import android.app.Dialog; -import android.app.Fragment; -import android.app.FragmentManager; -import android.app.FragmentTransaction; -import android.app.ListFragment; import android.app.PendingIntent; import android.content.ActivityNotFoundException; import android.content.Context; @@ -21,8 +14,14 @@ import android.content.pm.PackageManager; import android.net.Uri; import android.os.Build; import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentManager; +import android.support.v4.app.FragmentTransaction; +import android.support.v4.app.ListFragment; +import android.support.v4.view.MenuItemCompat; import android.support.v4.view.PagerAdapter; import android.support.v4.view.ViewPager; +import android.support.v7.app.ActionBar; import android.text.Editable; import android.text.SpannableString; import android.text.Spanned; @@ -82,8 +81,8 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU private final int REQUEST_CREATE_CONFERENCE = 0x3b39da; public int conference_context_id; public int contact_context_id; - private Tab mContactsTab; - private Tab mConferencesTab; + private ActionBar.Tab mContactsTab; + private ActionBar.Tab mConferencesTab; private ViewPager mViewPager; private ListPagerAdapter mListPagerAdapter; private List<ListItem> contacts = new ArrayList<>(); @@ -119,29 +118,30 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU return true; } }; - private TabListener mTabListener = new TabListener() { + private ActionBar.TabListener mTabListener = new ActionBar.TabListener() { @Override - public void onTabUnselected(Tab tab, FragmentTransaction ft) { + public void onTabUnselected(ActionBar.Tab tab, FragmentTransaction ft) { return; } @Override - public void onTabSelected(Tab tab, FragmentTransaction ft) { + public void onTabSelected(ActionBar.Tab tab, FragmentTransaction ft) { mViewPager.setCurrentItem(tab.getPosition()); onTabChanged(); } @Override - public void onTabReselected(Tab tab, FragmentTransaction ft) { + public void onTabReselected(ActionBar.Tab tab, FragmentTransaction ft) { return; } }; private ViewPager.SimpleOnPageChangeListener mOnPageChangeListener = new ViewPager.SimpleOnPageChangeListener() { @Override public void onPageSelected(int position) { - if (getActionBar() != null) { - getActionBar().setSelectedNavigationItem(position); + ActionBar actionBar = getSupportActionBar(); + if (actionBar != null) { + actionBar.setSelectedNavigationItem(position); } onTabChanged(); } @@ -166,7 +166,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU private TextView.OnEditorActionListener mSearchDone = new TextView.OnEditorActionListener() { @Override public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { - int pos = getActionBar().getSelectedNavigationIndex(); + int pos = getSupportActionBar().getSelectedNavigationIndex(); if (pos == 0) { if (contacts.size() == 1) { openConversationForContact((Contact) contacts.get(0)); @@ -257,18 +257,16 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU new EmojiService(this).init(useBundledEmoji()); setContentView(R.layout.activity_start_conversation); mViewPager = findViewById(R.id.start_conversation_view_pager); - ActionBar actionBar = getActionBar(); + ActionBar actionBar = getSupportActionBar(); actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS); - mContactsTab = actionBar.newTab().setText(R.string.contacts) - .setTabListener(mTabListener); - mConferencesTab = actionBar.newTab().setText(R.string.conferences) - .setTabListener(mTabListener); + mContactsTab = actionBar.newTab().setText(R.string.contacts).setTabListener(mTabListener); + mConferencesTab = actionBar.newTab().setText(R.string.conferences).setTabListener(mTabListener); actionBar.addTab(mContactsTab); actionBar.addTab(mConferencesTab); mViewPager.setOnPageChangeListener(mOnPageChangeListener); - mListPagerAdapter = new ListPagerAdapter(getFragmentManager()); + mListPagerAdapter = new ListPagerAdapter(getSupportFragmentManager()); mViewPager.setAdapter(mListPagerAdapter); mConferenceAdapter = new ListItemAdapter(this, conferences); @@ -607,18 +605,17 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU menuHideOffline.setChecked(this.mHideOfflineContacts); mMenuSearchView = menu.findItem(R.id.action_search); mMenuSearchView.setOnActionExpandListener(mOnActionExpandListener); - View mSearchView = mMenuSearchView.getActionView(); - mSearchEditText = mSearchView - .findViewById(R.id.search_field); + View mSearchView = MenuItemCompat.getActionView(mMenuSearchView); + mSearchEditText = (EditText) mSearchView.findViewById(R.id.search_field); mSearchEditText.addTextChangedListener(mSearchTextWatcher); mSearchEditText.setOnEditorActionListener(mSearchDone); - if (getActionBar().getSelectedNavigationIndex() == 0) { + if (getSupportActionBar().getSelectedNavigationIndex() == 0) { menuCreateConference.setVisible(false); } else { menuCreateContact.setVisible(false); } if (mInitialJid != null) { - mMenuSearchView.expandActionView(); + MenuItemCompat.expandActionView(mMenuSearchView); mSearchEditText.append(mInitialJid); filter(mInitialJid); } @@ -778,7 +775,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU } } final Intent intent = getIntent(); - final ActionBar ab = getActionBar(); + final ActionBar ab = getSupportActionBar(); boolean init = intent != null && intent.getBooleanExtra("init", false); boolean noConversations = xmppConnectionService.getConversations().size() == 0; if ((init || noConversations) && ab != null) { diff --git a/src/main/java/de/pixart/messenger/ui/XmppActivity.java b/src/main/java/de/pixart/messenger/ui/XmppActivity.java index 79f528f93..3881b3569 100644 --- a/src/main/java/de/pixart/messenger/ui/XmppActivity.java +++ b/src/main/java/de/pixart/messenger/ui/XmppActivity.java @@ -4,7 +4,6 @@ import android.Manifest; import android.annotation.SuppressLint; import android.annotation.TargetApi; import android.app.ActionBar; -import android.app.Activity; import android.app.AlertDialog; import android.app.AlertDialog.Builder; import android.app.PendingIntent; @@ -39,6 +38,7 @@ import android.os.SystemClock; import android.preference.PreferenceManager; import android.provider.Settings; import android.support.v4.content.ContextCompat; +import android.support.v7.app.AppCompatActivity; import android.text.InputType; import android.util.DisplayMetrics; import android.util.Log; @@ -83,7 +83,7 @@ import de.pixart.messenger.xmpp.OnUpdateBlocklist; import de.pixart.messenger.xmpp.jid.InvalidJidException; import de.pixart.messenger.xmpp.jid.Jid; -public abstract class XmppActivity extends Activity { +public abstract class XmppActivity extends AppCompatActivity { protected static final int REQUEST_ANNOUNCE_PGP = 0x0101; protected static final int REQUEST_INVITE_TO_CONVERSATION = 0x0102; diff --git a/src/main/res/menu/change_presence.xml b/src/main/res/menu/change_presence.xml index 34af0a679..5417076b6 100644 --- a/src/main/res/menu/change_presence.xml +++ b/src/main/res/menu/change_presence.xml @@ -1,12 +1,13 @@ -<menu xmlns:android="http://schemas.android.com/apk/res/android"> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/action_account_details" android:title="@string/account_details" - android:showAsAction="always" + app:showAsAction="always" android:icon="@drawable/ic_account_box_white_24dp" /> <item android:id="@+id/action_settings" android:orderInCategory="100" - android:showAsAction="never" + app:showAsAction="never" android:title="@string/action_settings" /> </menu>
\ No newline at end of file diff --git a/src/main/res/menu/choose_contact.xml b/src/main/res/menu/choose_contact.xml index 382e96017..fb52a3a1a 100644 --- a/src/main/res/menu/choose_contact.xml +++ b/src/main/res/menu/choose_contact.xml @@ -1,24 +1,25 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android"> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/action_search" android:actionLayout="@layout/actionview_search" android:icon="?attr/icon_search" - android:showAsAction="collapseActionView|always" + app:showAsAction="collapseActionView|always" android:title="@string/search" /> <item android:id="@+id/action_create_contact" android:icon="?attr/icon_add_person" - android:showAsAction="always" + app:showAsAction="always" android:title="@string/create_contact" android:visible="false" /> <item android:id="@+id/action_block_jid" android:icon="?attr/icon_add_person" - android:showAsAction="always" + app:showAsAction="always" android:title="@string/block_jabber_id" android:visible="false" /> </menu> diff --git a/src/main/res/menu/contact_details.xml b/src/main/res/menu/contact_details.xml index 29ef166e5..50243150b 100644 --- a/src/main/res/menu/contact_details.xml +++ b/src/main/res/menu/contact_details.xml @@ -1,18 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android"> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/action_edit_contact" android:icon="?attr/icon_edit" android:orderInCategory="10" - android:showAsAction="always" + app:showAsAction="always" android:title="@string/action_edit_contact" /> <item android:id="@+id/action_share" android:icon="?attr/icon_share" android:orderInCategory="15" - android:showAsAction="always" + app:showAsAction="always" android:title="@string/share_uri_with"> <menu> <item @@ -30,14 +31,14 @@ <item android:id="@+id/action_block" android:orderInCategory="72" - android:showAsAction="always" + app:showAsAction="always" android:icon="@drawable/ic_speaker_notes_off_white_24dp" android:title="@string/action_block_contact" /> <item android:id="@+id/action_unblock" android:orderInCategory="73" - android:showAsAction="always" + app:showAsAction="always" android:icon="@drawable/ic_speaker_notes_white_24dp" android:title="@string/action_unblock_contact" /> diff --git a/src/main/res/menu/conversations.xml b/src/main/res/menu/conversations.xml index 992371fc7..b748a065e 100644 --- a/src/main/res/menu/conversations.xml +++ b/src/main/res/menu/conversations.xml @@ -1,71 +1,72 @@ -<menu xmlns:android="http://schemas.android.com/apk/res/android"> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/action_add" android:icon="?attr/icon_new" android:orderInCategory="10" - android:showAsAction="always" + app:showAsAction="always" android:title="@string/action_add" /> <item android:id="@+id/action_security" android:icon="?attr/icon_not_secure" android:orderInCategory="20" - android:showAsAction="always" + app:showAsAction="always" android:title="@string/action_secure" /> <item android:id="@+id/action_attach_file" android:icon="?attr/icon_new_attachment" android:orderInCategory="30" - android:showAsAction="always" + app:showAsAction="always" android:title="@string/attach_file" /> <item android:id="@+id/action_invite" android:orderInCategory="45" - android:showAsAction="never" + app:showAsAction="never" android:title="@string/invite_contact" /> <item android:id="@+id/action_clear_history" android:orderInCategory="50" - android:showAsAction="never" + app:showAsAction="never" android:title="@string/action_clear_history" /> <item android:id="@+id/action_archive_chat" android:orderInCategory="60" - android:showAsAction="never" + app:showAsAction="never" android:title="@string/action_end_conversation" /> <item android:id="@+id/action_archive_muc" android:orderInCategory="60" - android:showAsAction="never" + app:showAsAction="never" android:title="@string/action_end_conversation_muc" /> <item android:id="@+id/action_accounts" android:orderInCategory="90" - android:showAsAction="never" + app:showAsAction="never" android:title="@string/mgmt_account_edit" /> <item android:id="@+id/action_settings" android:orderInCategory="100" - android:showAsAction="never" + app:showAsAction="never" android:title="@string/action_settings" /> <item android:id="@+id/action_invite_user" android:orderInCategory="100" - android:showAsAction="never" + app:showAsAction="never" android:title="@string/invite_user" /> <item android:id="@+id/action_create_issue" android:orderInCategory="100" - android:showAsAction="never" + app:showAsAction="never" android:title="@string/create_issue" /> <item android:id="@+id/action_check_updates" android:orderInCategory="100" - android:showAsAction="never" + app:showAsAction="never" android:title="@string/action_check_update" /> <item android:id="@+id/action_search_history" android:icon="?attr/icon_search" - android:showAsAction="ifRoom" + app:showAsAction="ifRoom" android:title="@string/search" /> </menu>
\ No newline at end of file diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml index 698c648ee..13e8db4a6 100644 --- a/src/main/res/menu/editaccount.xml +++ b/src/main/res/menu/editaccount.xml @@ -1,9 +1,10 @@ -<menu xmlns:android="http://schemas.android.com/apk/res/android"> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/action_share" android:title="@string/share_uri_with" android:icon="?attr/icon_share" - android:showAsAction="always"> + app:showAsAction="always"> <menu> <item android:id="@+id/action_share_uri" @@ -22,19 +23,19 @@ <item android:id="@+id/action_change_presence" - android:showAsAction="always" + app:showAsAction="always" android:title="@string/change_presence" android:icon="@drawable/ic_new_releases_white_24dp" /> <item android:id="@+id/action_show_block_list" - android:showAsAction="always" + app:showAsAction="always" android:icon="@drawable/ic_speaker_notes_off_white_24dp" android:title="@string/show_block_list" /> <item android:id="@+id/action_renew_certificate" - android:showAsAction="never" + app:showAsAction="never" android:title="@string/action_renew_certificate" android:visible="false" /> @@ -42,28 +43,28 @@ android:id="@+id/action_server_info_show_more" android:checkable="true" android:checked="false" - android:showAsAction="never" + app:showAsAction="never" android:title="@string/server_info_show_more" /> <item android:id="@+id/action_mam_prefs" android:icon="@drawable/ic_cloud_white_24dp" - android:showAsAction="always" + app:showAsAction="always" android:title="@string/mam_prefs" /> <item android:id="@+id/action_show_password" - android:showAsAction="never" + app:showAsAction="never" android:title="@string/show_password" /> <item android:id="@+id/action_change_password_on_server" - android:showAsAction="always" + app:showAsAction="always" android:icon="@drawable/ic_vpn_key_white_24dp" android:title="@string/change_password" /> <item android:id="@+id/mgmt_account_reconnect" - android:showAsAction="never" + app:showAsAction="never" android:title="@string/mgmt_account_reconnect" /> <item android:id="@+id/mgmt_account_announce_pgp" @@ -71,6 +72,6 @@ <item android:id="@+id/action_settings" android:orderInCategory="100" - android:showAsAction="never" + app:showAsAction="never" android:title="@string/action_settings" /> </menu>
\ No newline at end of file diff --git a/src/main/res/menu/manageaccounts.xml b/src/main/res/menu/manageaccounts.xml index 38b82010b..044c715c5 100644 --- a/src/main/res/menu/manageaccounts.xml +++ b/src/main/res/menu/manageaccounts.xml @@ -1,21 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android"> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/action_add_account" android:icon="?attr/icon_add_person" - android:showAsAction="always" + app:showAsAction="always" android:title="@string/action_add_account" /> <item android:id="@+id/action_add_account_with_cert" - android:showAsAction="never" + app:showAsAction="never" android:icon="?attr/icon_add_person" android:title="@string/action_add_account_with_certificate" android:visible="true" /> <item android:id="@+id/action_settings" android:orderInCategory="100" - android:showAsAction="never" + app:showAsAction="never" android:title="@string/action_settings" /> </menu>
\ No newline at end of file diff --git a/src/main/res/menu/manageaccounts_context.xml b/src/main/res/menu/manageaccounts_context.xml index beca7b8ec..a49b770df 100644 --- a/src/main/res/menu/manageaccounts_context.xml +++ b/src/main/res/menu/manageaccounts_context.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android"> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/mgmt_account_change_presence" @@ -12,7 +13,7 @@ android:title="@string/mgmt_account_publish_pgp" /> <item android:id="@+id/mgmt_account_reconnect" - android:showAsAction="always" + app:showAsAction="always" android:title="@string/mgmt_account_reconnect" /> <item android:id="@+id/mgmt_account_delete" diff --git a/src/main/res/menu/muc_details.xml b/src/main/res/menu/muc_details.xml index 585bd1def..910c986ec 100644 --- a/src/main/res/menu/muc_details.xml +++ b/src/main/res/menu/muc_details.xml @@ -1,16 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android"> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/action_edit_subject" android:icon="?attr/icon_edit" android:orderInCategory="10" - android:showAsAction="always" + app:showAsAction="always" android:title="@string/action_edit_subject" /> <item android:id="@+id/action_share" android:icon="?attr/icon_share" - android:showAsAction="always" + app:showAsAction="always" android:orderInCategory="15" android:title="@string/share_uri_with" > <menu> @@ -29,19 +30,19 @@ <item android:id="@+id/action_save_as_bookmark" android:orderInCategory="80" - android:showAsAction="never" + app:showAsAction="never" android:title="@string/save_as_bookmark" /> <item android:id="@+id/action_delete_bookmark" android:orderInCategory="80" - android:showAsAction="never" + app:showAsAction="never" android:title="@string/delete_bookmark" /> <item android:id="@+id/action_advanced_mode" android:checkable="true" android:checked="false" android:orderInCategory="85" - android:showAsAction="never" + app:showAsAction="never" android:title="@string/advanced_mode" /> </menu>
\ No newline at end of file diff --git a/src/main/res/menu/publish_avatar.xml b/src/main/res/menu/publish_avatar.xml index 39478c0a4..72ceb2d17 100644 --- a/src/main/res/menu/publish_avatar.xml +++ b/src/main/res/menu/publish_avatar.xml @@ -1,8 +1,9 @@ -<menu xmlns:android="http://schemas.android.com/apk/res/android"> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/action_crop_image" - android:showAsAction="always" + app:showAsAction="always" android:icon="@drawable/ic_crop_white_24dp" android:title="@string/select_image_and_crop" /> </menu>
\ No newline at end of file diff --git a/src/main/res/menu/select_multiple.xml b/src/main/res/menu/select_multiple.xml index efd6e4d0a..51f05e21a 100644 --- a/src/main/res/menu/select_multiple.xml +++ b/src/main/res/menu/select_multiple.xml @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android"> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/selection_submit" android:title="@string/invite_contact" - android:showAsAction="always" /> + app:showAsAction="always" /> </menu> diff --git a/src/main/res/menu/share_with.xml b/src/main/res/menu/share_with.xml index ff87edc1a..5c57eedd8 100644 --- a/src/main/res/menu/share_with.xml +++ b/src/main/res/menu/share_with.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android"> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/action_add" android:icon="?attr/icon_new" android:orderInCategory="10" - android:showAsAction="always" + app:showAsAction="always" android:title="@string/action_add" /> </menu>
\ No newline at end of file diff --git a/src/main/res/menu/showlocation.xml b/src/main/res/menu/showlocation.xml index 3eb0647c9..c7049a5b0 100644 --- a/src/main/res/menu/showlocation.xml +++ b/src/main/res/menu/showlocation.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android"> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/action_navigate" - android:showAsAction="always" + app:showAsAction="always" android:title="@string/navigate" android:icon="@drawable/ic_navigation_white_24dp" /> </menu>
\ No newline at end of file diff --git a/src/main/res/menu/start_conversation.xml b/src/main/res/menu/start_conversation.xml index ea7572b41..79cce252c 100644 --- a/src/main/res/menu/start_conversation.xml +++ b/src/main/res/menu/start_conversation.xml @@ -1,21 +1,22 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android"> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/action_search" android:actionLayout="@layout/actionview_search" android:icon="?attr/icon_search" - android:showAsAction="collapseActionView|always" + app:showAsAction="collapseActionView|always" android:title="@string/search" /> <item android:id="@+id/action_create_contact" android:icon="?attr/icon_add_person" - android:showAsAction="always" + app:showAsAction="always" android:title="@string/create_contact" /> <item android:id="@+id/action_conference" android:icon="?attr/icon_add_group" - android:showAsAction="always" + app:showAsAction="always" android:title="@string/join_or_create_conference"> <menu> <item @@ -29,7 +30,7 @@ </item> <item android:id="@+id/action_scan_qr_code" - android:showAsAction="never" + app:showAsAction="never" android:title="@string/scan_qr_code" /> <item @@ -37,17 +38,17 @@ android:checkable="true" android:checked="false" android:orderInCategory="85" - android:showAsAction="never" + app:showAsAction="never" android:title="@string/hide_offline" /> <item android:id="@+id/action_accounts" android:orderInCategory="90" - android:showAsAction="never" + app:showAsAction="never" android:title="@string/mgmt_account_edit" /> <item android:id="@+id/action_settings" android:orderInCategory="100" - android:showAsAction="never" + app:showAsAction="never" android:title="@string/action_settings" /> </menu>
\ No newline at end of file diff --git a/src/main/res/menu/trust_keys.xml b/src/main/res/menu/trust_keys.xml index 7c63bd7fe..e40295eea 100644 --- a/src/main/res/menu/trust_keys.xml +++ b/src/main/res/menu/trust_keys.xml @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android"> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/action_scan_qr_code" android:title="@string/scan_qr_code" - android:showAsAction="always" + app:showAsAction="always" android:icon="?attr/icon_scan_qr_code"/> </menu>
\ No newline at end of file diff --git a/src/main/res/menu/verify_otr.xml b/src/main/res/menu/verify_otr.xml index 7dadffce8..b6dd79610 100644 --- a/src/main/res/menu/verify_otr.xml +++ b/src/main/res/menu/verify_otr.xml @@ -1,14 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android"> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/action_show_qr_code" android:title="@string/show_qr_code" - android:showAsAction="never" /> + app:showAsAction="never" /> <item android:id="@+id/action_settings" android:orderInCategory="100" - android:showAsAction="never" + app:showAsAction="never" android:title="@string/action_settings" /> </menu>
\ No newline at end of file diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml index 0c0b3cefb..8d0de873f 100644 --- a/src/main/res/values-v21/themes.xml +++ b/src/main/res/values-v21/themes.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <style name="ConversationsTheme" parent="@android:style/Theme.Material.Light.DarkActionBar"> - <item name="android:colorPrimary">@color/primary</item> - <item name="android:colorPrimaryDark">@color/primary_dark</item> - <item name="android:colorAccent">@color/accent</item> - <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back_white_24dp</item> + <style name="ConversationsTheme" parent="Theme.AppCompat.Light.DarkActionBar"> + <item name="colorPrimary">@color/primary</item> + <item name="colorPrimaryDark">@color/primary_dark</item> + <item name="colorAccent">@color/accent</item> + <item name="homeAsUpIndicator">@drawable/ic_arrow_back_white_24dp</item> <item name="android:windowActionModeOverlay">true</item> <item name="android:actionModeBackground">@color/accent</item> @@ -16,9 +16,18 @@ <item name="TextSizeHeadline">18sp</item> <item name="TextSeparation">5sp</item> + <!--<item type="reference" name="infocard_border">@drawable/infocard_border</item>--> + <item name="divider">@color/black12</item> + <item name="color_text_primary">@color/black87</item> <item name="color_text_secondary">@color/black54</item> + <!--<item name="color_background_primary">@color/grey50</item>--> + <!--<item name="color_background_secondary">@color/grey200</item>--> + + <!--<item name="unread_count">@color/unreadcountlight</item>--> + <!--<item name="conversations_overview_background">@color/primary700</item>--> + <item name="dialog_horizontal_padding">24dp</item> <item name="dialog_vertical_padding">16dp</item> @@ -53,5 +62,4 @@ <item name="ic_attach_record">@drawable/ic_attach_record</item> </style> - </resources>
\ No newline at end of file diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index 83598c041..17c1c5607 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -53,5 +53,5 @@ <attr name="ic_file_pdf" format="reference" /> <attr name="ic_file_vcard" format="reference" /> <attr name="ic_file_calendar" format="reference" /> - + </resources>
\ No newline at end of file |