From 7941ce1ec51c7631dd06f09a9f7a5119884d2587 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Sun, 29 Jul 2018 14:38:51 +0200 Subject: [PATCH] Fix rotation issues with MagicCallControlelr Signed-off-by: Mario Danic --- .../talk/activities/MagicCallActivity.java | 16 ++++++++++ .../talk/controllers/CallController.java | 16 ++++++---- .../CallNotificationController.java | 32 +++++++++++++++++++ .../talk/events/ConfigurationChangeEvent.java | 27 ++++++++++++++++ 4 files changed, 85 insertions(+), 6 deletions(-) create mode 100644 app/src/main/java/com/nextcloud/talk/events/ConfigurationChangeEvent.java diff --git a/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.java index b71ad8f96..44cab626c 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.java +++ b/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.java @@ -20,6 +20,7 @@ package com.nextcloud.talk.activities; +import android.content.res.Configuration; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; import android.view.View; @@ -35,8 +36,13 @@ import com.nextcloud.talk.R; import com.nextcloud.talk.application.NextcloudTalkApplication; import com.nextcloud.talk.controllers.CallController; import com.nextcloud.talk.controllers.CallNotificationController; +import com.nextcloud.talk.events.ConfigurationChangeEvent; import com.nextcloud.talk.utils.bundle.BundleKeys; +import org.greenrobot.eventbus.EventBus; + +import javax.inject.Inject; + import autodagger.AutoInjector; import butterknife.BindView; import butterknife.ButterKnife; @@ -45,6 +51,9 @@ import butterknife.ButterKnife; public class MagicCallActivity extends AppCompatActivity { private static final String TAG = "MagicCallActivity"; + @Inject + EventBus eventBus; + @BindView(R.id.controller_container) ViewGroup container; @@ -86,4 +95,11 @@ public class MagicCallActivity extends AppCompatActivity { } } } + + @Override + public void onConfigurationChanged(Configuration newConfig) { + super.onConfigurationChanged(newConfig); + + eventBus.post(new ConfigurationChangeEvent()); + } } diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java index 331b8e3f6..0ae8faac1 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/CallController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/CallController.java @@ -51,6 +51,7 @@ import com.nextcloud.talk.R; import com.nextcloud.talk.api.NcApi; import com.nextcloud.talk.application.NextcloudTalkApplication; import com.nextcloud.talk.controllers.base.BaseController; +import com.nextcloud.talk.events.ConfigurationChangeEvent; import com.nextcloud.talk.events.MediaStreamEvent; import com.nextcloud.talk.events.PeerConnectionEvent; import com.nextcloud.talk.events.SessionDescriptionSendEvent; @@ -1480,6 +1481,15 @@ public class CallController extends BaseController { } } + @Subscribe(threadMode = ThreadMode.MAIN) + public void onMessageEvent(ConfigurationChangeEvent configurationChangeEvent) { + if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) { + remoteRenderersLayout.setOrientation(LinearLayout.HORIZONTAL); + } else if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) { + remoteRenderersLayout.setOrientation(LinearLayout.VERTICAL); + } + } + @Subscribe(threadMode = ThreadMode.MAIN) public void onMessageEvent(PeerConnectionEvent peerConnectionEvent) { if (peerConnectionEvent.getPeerConnectionEventType().equals(PeerConnectionEvent.PeerConnectionEventType @@ -1735,12 +1745,6 @@ public class CallController extends BaseController { protected void onAttach(@NonNull View view) { super.onAttach(view); eventBus.register(this); - - if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) { - remoteRenderersLayout.setOrientation(LinearLayout.HORIZONTAL); - } else if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) { - remoteRenderersLayout.setOrientation(LinearLayout.VERTICAL); - } } @Override diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java index 920cfb5d8..36abae059 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java @@ -55,6 +55,7 @@ import com.nextcloud.talk.R; import com.nextcloud.talk.api.NcApi; import com.nextcloud.talk.application.NextcloudTalkApplication; import com.nextcloud.talk.controllers.base.BaseController; +import com.nextcloud.talk.events.ConfigurationChangeEvent; import com.nextcloud.talk.models.RingtoneSettings; import com.nextcloud.talk.models.database.UserEntity; import com.nextcloud.talk.models.json.participants.Participant; @@ -67,6 +68,9 @@ import com.nextcloud.talk.utils.bundle.BundleKeys; import com.nextcloud.talk.utils.glide.GlideApp; import com.nextcloud.talk.utils.preferences.AppPreferences; +import org.greenrobot.eventbus.EventBus; +import org.greenrobot.eventbus.Subscribe; +import org.greenrobot.eventbus.ThreadMode; import org.parceler.Parcels; import java.io.IOException; @@ -95,6 +99,9 @@ public class CallNotificationController extends BaseController { @Inject AppPreferences appPreferences; + @Inject + EventBus eventBus; + @BindView(R.id.conversationNameTextView) TextView conversationNameTextView; @@ -314,6 +321,31 @@ public class CallNotificationController extends BaseController { } } + + @Subscribe(threadMode = ThreadMode.MAIN) + public void onMessageEvent(ConfigurationChangeEvent configurationChangeEvent) { + ConstraintLayout.LayoutParams layoutParams = (ConstraintLayout.LayoutParams) avatarImageView.getLayoutParams(); + int dimen = (int) getResources().getDimension(R.dimen.avatar_size_very_big); + + layoutParams.width = dimen; + layoutParams.height = dimen; + + avatarImageView.setLayoutParams(layoutParams); + } + + @Override + protected void onDetach(@NonNull View view) { + super.onDetach(view); + eventBus.unregister(this); + } + + @Override + protected void onAttach(@NonNull View view) { + super.onAttach(view); + eventBus.register(this); + + } + private void loadAvatar() { int avatarSize = Math.round(NextcloudTalkApplication .getSharedApplication().getResources().getDimension(R.dimen.avatar_fetching_size_very_big)); diff --git a/app/src/main/java/com/nextcloud/talk/events/ConfigurationChangeEvent.java b/app/src/main/java/com/nextcloud/talk/events/ConfigurationChangeEvent.java new file mode 100644 index 000000000..b8c86a201 --- /dev/null +++ b/app/src/main/java/com/nextcloud/talk/events/ConfigurationChangeEvent.java @@ -0,0 +1,27 @@ +/* + * Nextcloud Talk application + * + * @author Mario Danic + * Copyright (C) 2017-2018 Mario Danic + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.nextcloud.talk.events; + +import lombok.Data; + +@Data +public class ConfigurationChangeEvent { +}