aljaz/Android-nRF-Toolbox
1
0
Fork 0
mirror of https://github.com/aljazceru/Android-nRF-Toolbox.git synced 2025-12-22 17:04:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixing deprecations

Browse Source
This commit is contained in:
Aleksander Nowakowski
2017-02-23 16:41:04 +01:00
parent bc64870f73
commit 8406ab6afd
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/no/nordicsemi/android/nrftoolbox/uart/UARTActivity.java
View File

@@ -51,6 +51,7 @@ import android.support.annotation.NonNull;
import android.support.design.widget.Snackbar; import android.support.design.widget.Snackbar;
import android.support.v4.app.ActivityCompat; import android.support.v4.app.ActivityCompat;
import android.support.v4.app.DialogFragment; import android.support.v4.app.DialogFragment;
import android.support.v4.content.ContextCompat;
import android.support.v4.widget.SlidingPaneLayout; import android.support.v4.widget.SlidingPaneLayout;
import android.support.v7.app.AlertDialog; import android.support.v7.app.AlertDialog;
import android.support.v7.app.NotificationCompat; import android.support.v7.app.NotificationCompat;
@@ -651,11 +652,11 @@ public class UARTActivity extends BleProfileServiceReadyActivity<UARTService.UAR
final ColorDrawable color = new ColorDrawable(); final ColorDrawable color = new ColorDrawable();
int darkColor = 0; int darkColor = 0;
if (editMode) { if (editMode) {
color.setColor(getResources().getColor(R.color.orange)); color.setColor(ContextCompat.getColor(this, R.color.orange));
darkColor = getResources().getColor(R.color.dark_orange); darkColor = ContextCompat.getColor(this, R.color.dark_orange);
} else { } else {
color.setColor(getResources().getColor(R.color.actionBarColor)); color.setColor(ContextCompat.getColor(this, R.color.actionBarColor));
darkColor = getResources().getColor(R.color.actionBarColorDark); darkColor = ContextCompat.getColor(this, R.color.actionBarColorDark);
} }
getSupportActionBar().setBackgroundDrawable(color); getSupportActionBar().setBackgroundDrawable(color);
@@ -671,8 +672,8 @@ public class UARTActivity extends BleProfileServiceReadyActivity<UARTService.UAR
// Since Lollipop the status bar color may also be changed // Since Lollipop the status bar color may also be changed
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
final int colorFrom = getResources().getColor(editMode ? R.color.actionBarColorDark : R.color.dark_orange); final int colorFrom = ContextCompat.getColor(this, editMode ? R.color.actionBarColorDark : R.color.dark_orange);
final int colorTo = getResources().getColor(!editMode ? R.color.actionBarColorDark : R.color.dark_orange); final int colorTo = ContextCompat.getColor(this, !editMode ? R.color.actionBarColorDark : R.color.dark_orange);
final ValueAnimator anim = ValueAnimator.ofObject(new ArgbEvaluator(), colorFrom, colorTo); final ValueAnimator anim = ValueAnimator.ofObject(new ArgbEvaluator(), colorFrom, colorTo);
anim.setDuration(200); anim.setDuration(200);