arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2024-12-27 17:08:11 +00:00
Code Issues Releases Wiki Activity

Clean up launcher icon

Browse Source 
* clean up launcher icon
* update dependencies
This commit is contained in:
Ricki Hirner 2016-08-01 21:15:55 +02:00
parent 7fbdf96546
commit 2617063835
6 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/build.gradle
View File

@ -9,13 +9,13 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
android { android {
compileSdkVersion 23 compileSdkVersion 24
buildToolsVersion "23.0.3" buildToolsVersion "24.0.1"
defaultConfig { defaultConfig {
applicationId "at.bitfire.davdroid" applicationId "at.bitfire.davdroid"
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 23 targetSdkVersion 24
versionCode 110 versionCode 110
@ -65,10 +65,10 @@ dependencies {
compile project(':ical4android') compile project(':ical4android')
compile project(':vcard4android') compile project(':vcard4android')
compile 'com.android.support:appcompat-v7:23.+' compile 'com.android.support:appcompat-v7:24.+'
compile 'com.android.support:cardview-v7:23.+' compile 'com.android.support:cardview-v7:24.+'
compile 'com.android.support:design:23.+' compile 'com.android.support:design:24.+'
compile 'com.android.support:preference-v14:23.+' compile 'com.android.support:preference-v14:24.+'
compile 'com.github.yukuku:ambilwarna:2.0.1' compile 'com.github.yukuku:ambilwarna:2.0.1'
compile project(':MemorizingTrustManager') compile project(':MemorizingTrustManager')
@ -76,7 +76,7 @@ dependencies {
compile 'dnsjava:dnsjava:2.1.7' compile 'dnsjava:dnsjava:2.1.7'
compile 'org.apache.commons:commons-lang3:3.4' compile 'org.apache.commons:commons-lang3:3.4'
compile 'org.apache.commons:commons-collections4:4.1' compile 'org.apache.commons:commons-collections4:4.1'
provided 'org.projectlombok:lombok:1.16.8' provided 'org.projectlombok:lombok:1.16.10'
// for tests // for tests
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'

2
app/src/main/java/at/bitfire/davdroid/AccountSettings.java
View File

@ -126,7 +126,7 @@ public class AccountSettings {
Notification notify = new NotificationCompat.Builder(context) Notification notify = new NotificationCompat.Builder(context)
.setSmallIcon(R.drawable.ic_new_releases_light) .setSmallIcon(R.drawable.ic_new_releases_light)
.setLargeIcon(bitmapLogo) .setLargeIcon(App.getLauncherBitmap(context))
.setContentTitle(context.getString(R.string.settings_version_update)) .setContentTitle(context.getString(R.string.settings_version_update))
.setContentText(context.getString(R.string.settings_version_update_settings_updated)) .setContentText(context.getString(R.string.settings_version_update_settings_updated))
.setSubText(context.getString(R.string.settings_version_update_install_hint)) .setSubText(context.getString(R.string.settings_version_update_install_hint))

20
app/src/main/java/at/bitfire/davdroid/App.java
View File

@ -8,12 +8,18 @@
package at.bitfire.davdroid; package at.bitfire.davdroid;
import android.annotation.TargetApi;
import android.app.Application; import android.app.Application;
import android.app.NotificationManager; import android.app.NotificationManager;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.v7.app.NotificationCompat; import android.support.v7.app.NotificationCompat;
import android.util.Log; import android.util.Log;
@ -94,7 +100,7 @@ public class App extends Application {
if (logToFile) { if (logToFile) {
NotificationCompat.Builder builder = new NotificationCompat.Builder(this); NotificationCompat.Builder builder = new NotificationCompat.Builder(this);
builder .setSmallIcon(R.drawable.ic_sd_storage_light) builder .setSmallIcon(R.drawable.ic_sd_storage_light)
.setLargeIcon(((BitmapDrawable)getResources().getDrawable(R.drawable.ic_launcher)).getBitmap()) .setLargeIcon(getLauncherBitmap(this))
.setContentTitle(getString(R.string.logging_davdroid_file_logging)) .setContentTitle(getString(R.string.logging_davdroid_file_logging))
.setLocalOnly(true); .setLocalOnly(true);
@ -130,6 +136,18 @@ public class App extends Application {
nm.cancel(Constants.NOTIFICATION_EXTERNAL_FILE_LOGGING); nm.cancel(Constants.NOTIFICATION_EXTERNAL_FILE_LOGGING);
} }
@Nullable
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
public static Bitmap getLauncherBitmap(@NonNull Context context) {
Bitmap bitmapLogo = null;
Drawable drawableLogo = android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP ?
context.getDrawable(R.drawable.ic_launcher) :
context.getResources().getDrawable(R.drawable.ic_launcher);
if (drawableLogo instanceof BitmapDrawable)
bitmapLogo = ((BitmapDrawable)drawableLogo).getBitmap();
return bitmapLogo;
}
public static class ReinitLoggingReceiver extends BroadcastReceiver { public static class ReinitLoggingReceiver extends BroadcastReceiver {

2
app/src/main/java/at/bitfire/davdroid/DavService.java
View File

@ -312,7 +312,7 @@ public class DavService extends Service {
NotificationManager nm = (NotificationManager)getSystemService(NOTIFICATION_SERVICE); NotificationManager nm = (NotificationManager)getSystemService(NOTIFICATION_SERVICE);
Notification notify = new NotificationCompat.Builder(DavService.this) Notification notify = new NotificationCompat.Builder(DavService.this)
.setSmallIcon(R.drawable.ic_error_light) .setSmallIcon(R.drawable.ic_error_light)
.setLargeIcon(((BitmapDrawable)getResources().getDrawable(R.drawable.ic_launcher)).getBitmap()) .setLargeIcon(App.getLauncherBitmap(DavService.this))
.setContentTitle(getString(R.string.dav_service_refresh_failed)) .setContentTitle(getString(R.string.dav_service_refresh_failed))
.setContentText(getString(R.string.dav_service_refresh_couldnt_refresh)) .setContentText(getString(R.string.dav_service_refresh_couldnt_refresh))
.setContentIntent(PendingIntent.getActivity(DavService.this, 0, debugIntent, PendingIntent.FLAG_UPDATE_CURRENT)) .setContentIntent(PendingIntent.getActivity(DavService.this, 0, debugIntent, PendingIntent.FLAG_UPDATE_CURRENT))

2
app/src/main/java/at/bitfire/davdroid/syncadapter/SyncAdapterService.java
View File

@ -72,7 +72,7 @@ public abstract class SyncAdapterService extends Service {
Notification notify = new NotificationCompat.Builder(getContext()) Notification notify = new NotificationCompat.Builder(getContext())
.setSmallIcon(R.drawable.ic_error_light) .setSmallIcon(R.drawable.ic_error_light)
.setLargeIcon(((BitmapDrawable)getContext().getResources().getDrawable(R.drawable.ic_launcher)).getBitmap()) .setLargeIcon(App.getLauncherBitmap(getContext()))
.setContentTitle(getContext().getString(R.string.sync_error_permissions)) .setContentTitle(getContext().getString(R.string.sync_error_permissions))
.setContentText(getContext().getString(R.string.sync_error_permissions_text)) .setContentText(getContext().getString(R.string.sync_error_permissions_text))
.setContentIntent(PendingIntent.getActivity(getContext(), 0, intent, PendingIntent.FLAG_CANCEL_CURRENT)) .setContentIntent(PendingIntent.getActivity(getContext(), 0, intent, PendingIntent.FLAG_CANCEL_CURRENT))

2
app/src/main/java/at/bitfire/davdroid/syncadapter/SyncManager.java
View File

@ -230,7 +230,7 @@ abstract public class SyncManager {
NotificationCompat.Builder builder = new NotificationCompat.Builder(context); NotificationCompat.Builder builder = new NotificationCompat.Builder(context);
builder .setSmallIcon(R.drawable.ic_error_light) builder .setSmallIcon(R.drawable.ic_error_light)
.setLargeIcon(((BitmapDrawable)context.getResources().getDrawable(R.drawable.ic_launcher)).getBitmap()) .setLargeIcon(App.getLauncherBitmap(context))
.setContentTitle(getSyncErrorTitle()) .setContentTitle(getSyncErrorTitle())
.setContentIntent(PendingIntent.getActivity(context, 0, detailsIntent, PendingIntent.FLAG_CANCEL_CURRENT)) .setContentIntent(PendingIntent.getActivity(context, 0, detailsIntent, PendingIntent.FLAG_CANCEL_CURRENT))
.setCategory(NotificationCompat.CATEGORY_ERROR) .setCategory(NotificationCompat.CATEGORY_ERROR)