From 67fddd1654192441d4e9a79aa319f51214dceefd Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sat, 12 Jan 2019 21:08:13 +0100 Subject: [PATCH] fix manual location correcting / fab not showing up on 4.4 fixes #3097 --- .../ui/ConferenceDetailsActivity.java | 1 + .../ui/ConversationsActivity.java | 1 - .../conversations/ui/ShareWithActivity.java | 2 - .../ui/StartConversationActivity.java | 1 - .../siacs/conversations/ui/XmppActivity.java | 2 + .../res/layout/activity_share_location.xml | 116 +++++++++--------- .../res/layout/activity_show_location.xml | 15 +-- 7 files changed, 70 insertions(+), 68 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java index 882b8f3646d4dddad0dbfa42ead8ef3eaf61bcff..dfa5f74717fc3f342380b81ac82d6914eecdf0ab 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java @@ -53,6 +53,7 @@ import eu.siacs.conversations.services.XmppConnectionService.OnConversationUpdat import eu.siacs.conversations.services.XmppConnectionService.OnMucRosterUpdate; import eu.siacs.conversations.ui.adapter.MediaAdapter; import eu.siacs.conversations.ui.interfaces.OnMediaLoaded; +import eu.siacs.conversations.ui.service.EmojiService; import eu.siacs.conversations.ui.util.Attachment; import eu.siacs.conversations.ui.util.GridManager; import eu.siacs.conversations.ui.util.MenuDoubleTabUtil; diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java index 937406d249e77a78dcb93dd36751c87508590bb9..bcd586d3f99e0f90da9fd5f8eb7d379cadf16301 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java @@ -358,7 +358,6 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio super.onCreate(savedInstanceState); ConversationMenuConfigurator.reloadFeatures(this); OmemoSetting.load(this); - new EmojiService(this).init(); this.binding = DataBindingUtil.setContentView(this, R.layout.activity_conversations); setSupportActionBar((Toolbar) binding.toolbar); configureActionBar(getSupportActionBar()); diff --git a/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java b/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java index 5daf9933ca81fff1a8961ae92c7193cb8ed6c5c2..40ac1599cc28222eb015166b38e1d106ee4acc15 100644 --- a/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java @@ -81,8 +81,6 @@ public class ShareWithActivity extends XmppActivity implements XmppConnectionSer @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - new EmojiService(this).init(); - setContentView(R.layout.activity_share_with); setSupportActionBar(findViewById(R.id.toolbar)); diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java index de526fc9cb28b772155b8384e5fc447105a1a04b..66af744a87e0fae755469a120c902f0378ef0ec0 100644 --- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java @@ -268,7 +268,6 @@ public class StartConversationActivity extends XmppActivity implements XmppConne @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - new EmojiService(this).init(); this.binding = DataBindingUtil.setContentView(this, R.layout.activity_start_conversation); Toolbar toolbar = (Toolbar) binding.toolbar; setSupportActionBar(toolbar); diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java index 03c60d9599f44a97ef732c5c8ec442eaeb55de71..60f5d5a712c5eb8c24a82f5c72c9f0a1dfae87e9 100644 --- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java @@ -69,6 +69,7 @@ import eu.siacs.conversations.services.AvatarService; import eu.siacs.conversations.services.BarcodeProvider; import eu.siacs.conversations.services.XmppConnectionService; import eu.siacs.conversations.services.XmppConnectionService.XmppConnectionBinder; +import eu.siacs.conversations.ui.service.EmojiService; import eu.siacs.conversations.ui.util.MenuDoubleTabUtil; import eu.siacs.conversations.ui.util.PresenceSelector; import eu.siacs.conversations.ui.util.SoftKeyboardUtils; @@ -395,6 +396,7 @@ public abstract class XmppActivity extends ActionBarActivity { setVolumeControlStream(AudioManager.STREAM_NOTIFICATION); metrics = getResources().getDisplayMetrics(); ExceptionHelper.init(getApplicationContext()); + new EmojiService(this).init(); this.isCameraFeatureAvailable = getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA); mColorRed = ContextCompat.getColor(this, R.color.red800); diff --git a/src/main/res/layout/activity_share_location.xml b/src/main/res/layout/activity_share_location.xml index d5f993bf68a614b4eda3772d0a74d3773515456c..01249da55ddc6621d249c22bf3935a565b6d75ad 100644 --- a/src/main/res/layout/activity_share_location.xml +++ b/src/main/res/layout/activity_share_location.xml @@ -1,78 +1,80 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools"> - - - + - - android:id="@+id/snackbar_coordinator" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_above="@+id/button_bar" > + + android:id="@+id/snackbar_coordinator" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_above="@+id/button_bar" + android:layout_below="@id/toolbar"> + android:layout_height="match_parent" /> - - - + android:layout_gravity="end|bottom" + android:layout_margin="16dp" + app:elevation="4dp" + android:contentDescription="@string/action_unfix_from_location" + android:src="?attr/icon_gps_fixed" + app:backgroundTint="?colorPrimary" /> + + + -