From 7fbff71ed6899880abb8f4dcfe8bc206da7187aa Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Thu, 14 Jun 2018 21:26:54 +0200 Subject: [PATCH 01/10] revamp call notification screen with dark theme and constraint layout --- app/build.gradle | 2 + .../layout/controller_call_notification.xml | 90 ++++++++++--------- app/src/main/res/values/colors.xml | 1 + app/src/main/res/values/dimens.xml | 1 + app/src/main/res/values/strings.xml | 2 +- 5 files changed, 53 insertions(+), 43 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0342379a8..4a3640387 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -79,6 +79,8 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "com.android.support:appcompat-v7:${supportLibraryVersion}" implementation "com.android.support:design:${supportLibraryVersion}" + implementation 'com.android.support.constraint:constraint-layout:1.1.1' + implementation 'com.android.support:multidex:1.0.3' diff --git a/app/src/main/res/layout/controller_call_notification.xml b/app/src/main/res/layout/controller_call_notification.xml index e8171245f..cbc797b60 100644 --- a/app/src/main/res/layout/controller_call_notification.xml +++ b/app/src/main/res/layout/controller_call_notification.xml @@ -18,84 +18,90 @@ ~ You should have received a copy of the GNU General Public License ~ along with this program. If not, see . --> - - - + - - + android:textColor="@color/white30" + android:textSize="16sp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + android:textColor="@color/white" + android:textSize="28sp" + app:layout_constraintTop_toBottomOf="@+id/incomingCallTextView" + tools:text="Victor Gregorius Magnus" /> + + 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" /> + 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" /> + app:frontImage="@drawable/ic_call_end_white_24px" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.87" + app:layout_constraintStart_toStartOf="parent" /> - - \ No newline at end of file + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index c7412376a..a9d3cb3e2 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -17,5 +17,6 @@ #E8E8E8 #757575 #D5D5D5 + #e9ffffff diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 75461c897..f1d21de80 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -16,6 +16,7 @@ 8dp 40dp 80dp + 180dp 20dp 14sp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2264ae148..66f9cbe45 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -113,7 +113,7 @@ Open settings - Incoming call + Incoming call from Guest New public conversation Public conversations let you invite people from outside through a From 3fd9f842f59903f222a3ffa61574509fa74a572f Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Thu, 14 Jun 2018 21:34:50 +0200 Subject: [PATCH 02/10] fix lint error for Drone... --- app/src/main/res/values-ko/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 942d29a2c..30de7c415 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -28,7 +28,7 @@ 검색 인증서 확인 - %1$s에서 %2$s에게 발급한 %3$s부터 %4%s까지 유효한 알 수 없는 인증서를 신뢰하시겠습니까? + %1$s에서 %2$s에게 발급한 %3$s부터 %4$s까지 유효한 알 수 없는 인증서를 신뢰하시겠습니까? 예 아니요 자세히 From 40f58d26f95cc61814cee02be85626c82ffa11ef Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Thu, 14 Jun 2018 21:43:42 +0200 Subject: [PATCH 03/10] light black --- app/src/main/res/layout/controller_call_notification.xml | 2 +- app/src/main/res/values/colors.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/layout/controller_call_notification.xml b/app/src/main/res/layout/controller_call_notification.xml index cbc797b60..340457cdf 100644 --- a/app/src/main/res/layout/controller_call_notification.xml +++ b/app/src/main/res/layout/controller_call_notification.xml @@ -23,7 +23,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/black"> + android:background="@color/grey950"> #757575 #D5D5D5 #e9ffffff + #0f0f0f From 32811ba3e42ee47cb8531b2291a747d1dd17c083 Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Thu, 14 Jun 2018 21:44:42 +0200 Subject: [PATCH 04/10] load avatar in right size --- .../nextcloud/talk/controllers/CallNotificationController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c47b880cb..85d0c0477 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java @@ -262,7 +262,7 @@ public class CallNotificationController extends BaseController { private void loadAvatar() { int avatarSize = Math.round(NextcloudTalkApplication - .getSharedApplication().getResources().getDimension(R.dimen.avatar_size_big)); + .getSharedApplication().getResources().getDimension(R.dimen.avatar_size_very_big)); switch (currentRoom.getType()) { case ROOM_TYPE_ONE_TO_ONE_CALL: From d24bb90d54ab120f45712387f0dfd4f404440aea Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Thu, 14 Jun 2018 21:46:00 +0200 Subject: [PATCH 05/10] upper case color codes --- app/src/main/res/values/colors.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index a8ed0dc9d..962729108 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -17,7 +17,7 @@ #E8E8E8 #757575 #D5D5D5 - #e9ffffff - #0f0f0f + #e9FFFFFF + #0F0F0F From 85f4023059d78cfb74b75425f4ac4dd9942dd8b2 Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Thu, 14 Jun 2018 21:49:53 +0200 Subject: [PATCH 06/10] true upper case colors --- app/src/main/res/values/colors.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 962729108..5f1a7373e 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -17,7 +17,7 @@ #E8E8E8 #757575 #D5D5D5 - #e9FFFFFF + #E9FFFFFF #0F0F0F From 566fc25542ac9a583b91fdc185e7b211051c131d Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Thu, 14 Jun 2018 21:51:53 +0200 Subject: [PATCH 07/10] lighter grey --- app/src/main/res/values/colors.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 5f1a7373e..03007a602 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -18,6 +18,6 @@ #757575 #D5D5D5 #E9FFFFFF - #0F0F0F + #111111 From 3ea3fadff23dab399fe0d644f1c405f316257937 Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Thu, 14 Jun 2018 21:58:07 +0200 Subject: [PATCH 08/10] always request the right avatar size --- .../com/nextcloud/talk/activities/CallActivity.java | 2 +- .../talk/adapters/items/AdvancedUserItem.java | 2 +- .../com/nextcloud/talk/adapters/items/CallItem.java | 2 +- .../talk/adapters/items/MentionAutocompleteItem.java | 2 +- .../com/nextcloud/talk/adapters/items/UserItem.java | 2 +- .../talk/controllers/CallNotificationController.java | 2 +- .../talk/controllers/SettingsController.java | 2 +- .../nextcloud/talk/models/json/chat/ChatMessage.java | 3 ++- .../main/java/com/nextcloud/talk/utils/ApiUtils.java | 12 +++--------- 9 files changed, 12 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java index eda2dd992..b28eeb597 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java +++ b/app/src/main/java/com/nextcloud/talk/activities/CallActivity.java @@ -1348,7 +1348,7 @@ public class CallActivity extends AppCompatActivity { GlideApp.with(this) .asBitmap() .diskCacheStrategy(DiskCacheStrategy.NONE) - .load(ApiUtils.getUrlForAvatarWithName(baseUrl, participantMap.get(session).getUserId(), true)) + .load(ApiUtils.getUrlForAvatarWithName(baseUrl, participantMap.get(session).getUserId(), R.dimen.avatar_size_big)) .centerInside() .override(size, size) .apply(RequestOptions.bitmapTransform(new CircleCrop())) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java index 15d7d5fbd..7ae6dcb20 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/items/AdvancedUserItem.java @@ -123,7 +123,7 @@ public class AdvancedUserItem extends AbstractFlexibleItem if (!TextUtils.isEmpty(room.getName())) { GlideUrl glideUrl = new GlideUrl(ApiUtils.getUrlForAvatarWithName(userEntity.getBaseUrl(), - room.getName(), false), new LazyHeaders.Builder() + room.getName(), R.dimen.avatar_size), new LazyHeaders.Builder() .setHeader("Accept", "image/*") .setHeader("User-Agent", ApiUtils.getUserAgent()) .build()); diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.java index eab6f6f96..58e55306e 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.java @@ -99,7 +99,7 @@ public class MentionAutocompleteItem extends AbstractFlexibleItem } GlideUrl glideUrl = new GlideUrl(ApiUtils.getUrlForAvatarWithName(userEntity.getBaseUrl(), - participant.getUserId(), false), new LazyHeaders.Builder() + participant.getUserId(), R.dimen.avatar_size), new LazyHeaders.Builder() .setHeader("Accept", "image/*") .setHeader("User-Agent", ApiUtils.getUserAgent()) .build()); 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 85d0c0477..316e16545 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java @@ -269,7 +269,7 @@ public class CallNotificationController extends BaseController { avatarImageView.setVisibility(View.VISIBLE); GlideUrl glideUrl = new GlideUrl(ApiUtils.getUrlForAvatarWithName(userBeingCalled.getBaseUrl(), - currentRoom.getName(), true), new LazyHeaders.Builder() + currentRoom.getName(), R.dimen.avatar_size_very_big), new LazyHeaders.Builder() .setHeader("Accept", "image/*") .setHeader("User-Agent", ApiUtils.getUserAgent()) .build()); diff --git a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java index f23a30e1e..67329b015 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java @@ -499,7 +499,7 @@ public class SettingsController extends BaseController { } GlideUrl glideUrl = new GlideUrl(ApiUtils.getUrlForAvatarWithName(userEntity.getBaseUrl(), - avatarId, true), new LazyHeaders.Builder() + avatarId, R.dimen.avatar_size_big), new LazyHeaders.Builder() .setHeader("Accept", "image/*") .setHeader("User-Agent", ApiUtils.getUserAgent()) .build()); diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java index c2101b9a8..ad5f0677d 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java +++ b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java @@ -21,6 +21,7 @@ package com.nextcloud.talk.models.json.chat; import com.bluelinelabs.logansquare.annotation.JsonField; import com.bluelinelabs.logansquare.annotation.JsonObject; +import com.nextcloud.talk.R; import com.nextcloud.talk.utils.ApiUtils; import com.stfalcon.chatkit.commons.models.IMessage; import com.stfalcon.chatkit.commons.models.IUser; @@ -90,7 +91,7 @@ public class ChatMessage implements IMessage { @Override public String getAvatar() { - return ApiUtils.getUrlForAvatarWithName(getBaseUrl(), actorId, false); + return ApiUtils.getUrlForAvatarWithName(getBaseUrl(), actorId, R.dimen.avatar_size); } }; } diff --git a/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java b/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java index e20d13222..017609bb6 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java +++ b/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java @@ -20,6 +20,7 @@ package com.nextcloud.talk.utils; import android.net.Uri; +import android.support.annotation.DimenRes; import android.support.annotation.Nullable; import com.nextcloud.talk.BuildConfig; @@ -163,16 +164,9 @@ public class ApiUtils { return "/status.php"; } - public static String getUrlForAvatarWithName(String baseUrl, String name, boolean isLargeAvatar) { - int avatarSize; - - if (isLargeAvatar) { - avatarSize = Math.round(NextcloudTalkApplication - .getSharedApplication().getResources().getDimension(R.dimen.avatar_size_big)); - } else { - avatarSize = Math.round(NextcloudTalkApplication + public static String getUrlForAvatarWithName(String baseUrl, String name, @DimenRes int avatarSize) { + avatarSize = Math.round(NextcloudTalkApplication .getSharedApplication().getResources().getDimension(R.dimen.avatar_size)); - } return baseUrl + "/index.php/avatar/" + Uri.encode(name) + "/" + avatarSize; } From 654af51f3ffdda99a05cda76cedf1918c7315e3d Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Thu, 14 Jun 2018 22:01:26 +0200 Subject: [PATCH 09/10] use the parameter, mate... just do it --- app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java b/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java index 017609bb6..d97417c5f 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java +++ b/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java @@ -165,9 +165,6 @@ public class ApiUtils { } public static String getUrlForAvatarWithName(String baseUrl, String name, @DimenRes int avatarSize) { - avatarSize = Math.round(NextcloudTalkApplication - .getSharedApplication().getResources().getDimension(R.dimen.avatar_size)); - return baseUrl + "/index.php/avatar/" + Uri.encode(name) + "/" + avatarSize; } From c816c8d10221e364f314cdd7564fdf09f0b074df Mon Sep 17 00:00:00 2001 From: AndyScherzinger Date: Thu, 14 Jun 2018 22:03:07 +0200 Subject: [PATCH 10/10] again fix size calculation --- app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java b/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java index d97417c5f..728a0a6f2 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java +++ b/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.java @@ -165,6 +165,9 @@ public class ApiUtils { } public static String getUrlForAvatarWithName(String baseUrl, String name, @DimenRes int avatarSize) { + avatarSize = Math.round(NextcloudTalkApplication + .getSharedApplication().getResources().getDimension(avatarSize)); + return baseUrl + "/index.php/avatar/" + Uri.encode(name) + "/" + avatarSize; }