gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-20 03:59:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #198 from nextcloud/callNotification

Browse Source 
Fix call notification layout for landscape
This commit is contained in:
Mario Đanić 2018-06-18 14:10:27 +02:00 committed by GitHub
commit d626424fa1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 39 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java
View File

@ -266,7 +266,7 @@ public class CallNotificationController extends BaseController {
private void loadAvatar() { private void loadAvatar() {
int avatarSize = Math.round(NextcloudTalkApplication int avatarSize = Math.round(NextcloudTalkApplication
.getSharedApplication().getResources().getDimension(R.dimen.avatar_size_very_big)); .getSharedApplication().getResources().getDimension(R.dimen.avatar_fetching_size_very_big));
switch (currentRoom.getType()) { switch (currentRoom.getType()) {
case ROOM_TYPE_ONE_TO_ONE_CALL: case ROOM_TYPE_ONE_TO_ONE_CALL:

36
app/src/main/res/layout/controller_call_notification.xml
View File

@ -29,7 +29,7 @@
android:id="@+id/incomingCallTextView" android:id="@+id/incomingCallTextView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="32dp" android:layout_marginTop="16dp"
android:text="@string/nc_incoming_call" android:text="@string/nc_incoming_call"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/white30" android:textColor="@color/white30"
@ -57,51 +57,45 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.498" app:layout_constraintVertical_bias="0.45"
tools:src="@color/white" /> tools:src="@color/white" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<com.nextcloud.talk.utils.MagicFlipView <com.nextcloud.talk.utils.MagicFlipView
android:id="@+id/callAnswerVoiceOnlyView" android:id="@+id/callAnswerVoiceOnlyView"
android:layout_width="60dp" android:layout_width="60dp"
android:layout_height="60dp" android:layout_height="60dp"
android:layout_marginBottom="48dp" android:layout_margin="24dp"
app:checked="false" app:checked="false"
app:enableInitialAnimation="false" app:enableInitialAnimation="false"
app:frontBackgroundColor="@color/colorPrimary" app:frontBackgroundColor="@color/colorPrimary"
app:frontImage="@drawable/ic_mic_white_24px" app:frontImage="@drawable/ic_mic_white_24px" />
app:layout_anchorGravity="top|center"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.129"
app:layout_constraintStart_toStartOf="parent" />
<com.nextcloud.talk.utils.MagicFlipView <com.nextcloud.talk.utils.MagicFlipView
android:id="@+id/callAnswerCameraView" android:id="@+id/callAnswerCameraView"
android:layout_width="60dp" android:layout_width="60dp"
android:layout_height="60dp" android:layout_height="60dp"
android:layout_marginBottom="48dp" android:layout_margin="24dp"
app:checked="false" app:checked="false"
app:enableInitialAnimation="false" app:enableInitialAnimation="false"
app:frontBackgroundColor="@color/colorPrimary" app:frontBackgroundColor="@color/colorPrimary"
app:frontImage="@drawable/ic_videocam_white_24px" app:frontImage="@drawable/ic_videocam_white_24px" />
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toStartOf="parent" />
<com.nextcloud.talk.utils.MagicFlipView <com.nextcloud.talk.utils.MagicFlipView
android:id="@+id/callControlHangupView" android:id="@+id/callControlHangupView"
android:layout_width="60dp" android:layout_width="60dp"
android:layout_height="60dp" android:layout_height="60dp"
android:layout_marginBottom="48dp" android:layout_margin="24dp"
app:checked="false" app:checked="false"
app:enableInitialAnimation="false" app:enableInitialAnimation="false"
app:frontBackgroundColor="@color/nc_darkRed" app:frontBackgroundColor="@color/nc_darkRed"
app:frontImage="@drawable/ic_call_end_white_24px" app:frontImage="@drawable/ic_call_end_white_24px" />
app:layout_constraintBottom_toBottomOf="parent" </LinearLayout>
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.87"
app:layout_constraintStart_toStartOf="parent" />
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>

2
app/src/main/res/values-land/dimens.xml
View File

@ -5,4 +5,6 @@
<dimen name="display_target_image_size">120dp</dimen> <dimen name="display_target_image_size">120dp</dimen>
<dimen name="display_target_image_margin">16dp</dimen> <dimen name="display_target_image_margin">16dp</dimen>
<dimen name="avatar_size_very_big">120dp</dimen>
</resources> </resources>

3
app/src/main/res/values/dimens.xml
View File

@ -16,7 +16,8 @@
<dimen name="margin_between_elements">8dp</dimen> <dimen name="margin_between_elements">8dp</dimen>
<dimen name="avatar_size">40dp</dimen> <dimen name="avatar_size">40dp</dimen>
<dimen name="avatar_size_big">80dp</dimen> <dimen name="avatar_size_big">80dp</dimen>
<dimen name="avatar_size_very_big">180dp</dimen> <dimen name="avatar_size_very_big">@dimen/avatar_fetching_size_very_big</dimen>
<dimen name="avatar_fetching_size_very_big">140dp</dimen>
<dimen name="avatar_corner_radius">20dp</dimen> <dimen name="avatar_corner_radius">20dp</dimen>
<dimen name="chat_text_size">14sp</dimen> <dimen name="chat_text_size">14sp</dimen>