diff --git a/app/build.gradle b/app/build.gradle index 20a7417..d9669a8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,7 +24,6 @@ dependencies { implementation 'com.android.support:appcompat-v7:26.1.0' implementation 'com.android.support.constraint:constraint-layout:1.1.2' implementation 'com.android.support:support-v4:26.1.0' - testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' implementation 'com.android.support:design:26.1.0' diff --git a/app/src/main/java/space/neothefox/laytray/IconService.java b/app/src/main/java/space/neothefox/laytray/IconService.java index 5dea33b..0411d43 100644 --- a/app/src/main/java/space/neothefox/laytray/IconService.java +++ b/app/src/main/java/space/neothefox/laytray/IconService.java @@ -13,6 +13,7 @@ import android.graphics.Color; import android.graphics.Paint; import android.graphics.PorterDuff; import android.graphics.PorterDuffXfermode; +import android.graphics.Rect; import android.graphics.RectF; import android.graphics.drawable.Icon; import android.os.Build; @@ -48,7 +49,7 @@ implements SharedPreferences.OnSharedPreferenceChangeListener{ layouts = getSharedPreferences("layouts", 0); options = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); lastToast = "EMPT"; - //options.registerOnSharedPreferenceChangeListener(this); + options.registerOnSharedPreferenceChangeListener(this); iconManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { @@ -120,7 +121,7 @@ implements SharedPreferences.OnSharedPreferenceChangeListener{ paint.setColor(Color.TRANSPARENT); paint.setTextSize(textSize); paint.setTextAlign(Paint.Align.CENTER); - canvas.drawText(text, width / 2f, height / 2f + textSize / 2f, paint); + canvas.drawText(text, width/2f, ((height/2f) - (paint.descent()+paint.ascent())/2f), paint); return image; } @@ -134,7 +135,7 @@ implements SharedPreferences.OnSharedPreferenceChangeListener{ paint.setColor(Color.TRANSPARENT); paint.setTextSize(textSize); paint.setTextAlign(Paint.Align.CENTER); - canvas.drawText(text, width / 2f, height / 2f + textSize / 2f, paint); + canvas.drawText(text, width / 2f, ((height/2f) - (paint.descent()+paint.ascent())/2f), paint); return image; } @@ -150,7 +151,7 @@ implements SharedPreferences.OnSharedPreferenceChangeListener{ paint.setColor(textColor); paint.setTextSize(textSize); paint.setTextAlign(Paint.Align.CENTER); - canvas.drawText(text, width / 2f, height / 2f + textSize / 2f, paint); + canvas.drawText(text, width / 2f, ((height/2f) - (paint.descent()+paint.ascent())/2f), paint); return image; }