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

Fix background color generation

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-12-12 16:54:10 +01:00
parent 92cb537d2f
commit 7ff6fcd366
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -109,7 +109,7 @@ dependencies {
implementation 'com.google.android.material:material:1.0.0' implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2' implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2'
implementation 'androidx.emoji:emoji-bundled:1.0.0' implementation 'androidx.emoji:emoji-bundled:1.0.0'
implementation 'androidx.palette:palette:1.0.0' implementation 'org.michaelevans.colorart:library:0.0.3'
implementation "android.arch.work:work-runtime:${workVersion}" implementation "android.arch.work:work-runtime:${workVersion}"
implementation "android.arch.work:work-firebase:${workVersion}" implementation "android.arch.work:work-firebase:${workVersion}"
androidTestImplementation "android.arch.work:work-testing:${workVersion}" androidTestImplementation "android.arch.work:work-testing:${workVersion}"

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

@ -25,6 +25,7 @@ import android.content.Context;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.ColorDrawable;
import android.media.AudioAttributes; import android.media.AudioAttributes;
import android.media.MediaPlayer; import android.media.MediaPlayer;
import android.net.Uri; import android.net.Uri;
@ -79,6 +80,7 @@ import com.nextcloud.talk.utils.singletons.AvatarStatusCodeHolder;
import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode; import org.greenrobot.eventbus.ThreadMode;
import org.michaelevans.colorart.library.ColorArt;
import org.parceler.Parcels; import org.parceler.Parcels;
import java.io.IOException; import java.io.IOException;
@ -89,7 +91,6 @@ import javax.inject.Inject;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.constraintlayout.widget.ConstraintLayout; import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.palette.graphics.Palette;
import autodagger.AutoInjector; import autodagger.AutoInjector;
import butterknife.BindView; import butterknife.BindView;
import butterknife.OnClick; import butterknife.OnClick;
@ -436,6 +437,11 @@ public class CallNotificationController extends BaseController {
(getActivity()).getBitmapPool(), resource, avatarSize, avatarSize)); (getActivity()).getBitmapPool(), resource, avatarSize, avatarSize));
} }
if (getResources() != null) {
incomingTextRelativeLayout.setBackground(getResources().getDrawable(R.drawable
.incoming_gradient));
}
if (AvatarStatusCodeHolder.getInstance().getStatusCode() == 200 && if (AvatarStatusCodeHolder.getInstance().getStatusCode() == 200 &&
userBeingCalled.hasSpreedCapabilityWithName("no-ping")) { userBeingCalled.hasSpreedCapabilityWithName("no-ping")) {
final Allocation input = Allocation.createFromBitmap(renderScript, resource); final Allocation input = Allocation.createFromBitmap(renderScript, resource);
@ -447,25 +453,17 @@ public class CallNotificationController extends BaseController {
script.forEach(output); script.forEach(output);
output.copyTo(resource); output.copyTo(resource);
if (getResources() != null) { backgroundImageView.setImageDrawable(new BitmapDrawable(resource));
incomingTextRelativeLayout.setBackground(getResources().getDrawable(R.drawable
.incoming_gradient));
backgroundImageView.setImageDrawable(new BitmapDrawable(resource));
}
} else if (AvatarStatusCodeHolder.getInstance().getStatusCode() == 201) { } else if (AvatarStatusCodeHolder.getInstance().getStatusCode() == 201) {
Palette palette = Palette.from(resource).generate(); ColorArt colorArt = new ColorArt(resource);
if (getResources() != null) { int color = colorArt.getBackgroundColor();
int color = palette.getDominantColor(getResources().getColor(R.color.grey950));
if (color != getResources().getColor(R.color.grey950)) { float[] hsv = new float[3];
float[] hsv = new float[3]; Color.colorToHSV(color, hsv);
Color.colorToHSV(color, hsv); hsv[2] *= 0.75f;
hsv[2] *= 0.75f; color = Color.HSVToColor(hsv);
color = Color.HSVToColor(hsv);
}
backgroundImageView.setBackgroundColor(color); backgroundImageView.setImageDrawable(new ColorDrawable(color));
}
} }
} }
}); });