generate adaptive icons for launcher shortcuts and share targets on A…

…ndroid O
irccloud · Aug 2, 2017 · 0a90ef4 · 0a90ef4
1 parent 759bc5c
commit 0a90ef4
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -59,7 +59,7 @@ android {
     useLibrary 'org.apache.http.legacy'
 
     defaultConfig {
-        versionCode 135
+        versionCode 136
         versionName "3.27"
         minSdkVersion 14
         targetSdkVersion 26

diff --git a/irccloud-android.iml b/irccloud-android.iml
@@ -81,6 +81,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard-files" />

diff --git a/src/com/irccloud/android/ConversationChooserTargetService.java b/src/com/irccloud/android/ConversationChooserTargetService.java
@@ -24,6 +24,7 @@
 import android.os.Bundle;
 import android.service.chooser.ChooserTarget;
 import android.service.chooser.ChooserTargetService;
+import android.util.TypedValue;
 
 import com.irccloud.android.activity.MainActivity;
 import com.irccloud.android.data.collection.AvatarsList;
@@ -38,7 +39,9 @@
 
 @TargetApi(Build.VERSION_CODES.M)
 public class ConversationChooserTargetService extends ChooserTargetService {
-    private static final Icon channelIcon = Icon.createWithBitmap(Avatar.generateBitmap("#", 0xFFFFFFFF, 0xFFAAAAAA, false, 320, false));
+    private static final Icon channelIcon = Build.VERSION.SDK_INT < Build.VERSION_CODES.O ?
+            Icon.createWithBitmap(Avatar.generateBitmap("#", 0xFFFFFFFF, 0xFFAAAAAA, false, (int)TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 72, IRCCloudApplication.getInstance().getApplicationContext().getResources().getDisplayMetrics()), false)) :
+            Icon.createWithAdaptiveBitmap(Avatar.generateBitmap("#", 0xFFFFFFFF, 0xFFAAAAAA, false, (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 108, IRCCloudApplication.getInstance().getApplicationContext().getResources().getDisplayMetrics()), false));
 
     @Override
     public List<ChooserTarget> onGetChooserTargets(ComponentName componentName, IntentFilter intentFilter) {
@@ -53,7 +56,12 @@ public List<ChooserTarget> onGetChooserTargets(ComponentName componentName, Inte
             }
             Bundle extras = new Bundle();
             extras.putInt("bid", c.bid);
-            targets.add(new ChooserTarget(c.name, c.type.equals("channel")?channelIcon:Icon.createWithBitmap(AvatarsList.getInstance().getAvatar(c.cid, c.name).getBitmap(false, 320)), 0.5f, cn, extras));
+            targets.add(new ChooserTarget(c.name, c.type.equals("channel")?
+                    channelIcon:
+                    (Build.VERSION.SDK_INT < Build.VERSION_CODES.O ?
+                            Icon.createWithBitmap(AvatarsList.getInstance().getAvatar(c.cid, c.name).getBitmap(false, (int)TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 72, IRCCloudApplication.getInstance().getApplicationContext().getResources().getDisplayMetrics()))) :
+                            Icon.createWithAdaptiveBitmap(AvatarsList.getInstance().getAvatar(c.cid, c.name).getBitmap(false, (int)TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 108, IRCCloudApplication.getInstance().getApplicationContext().getResources().getDisplayMetrics()), false, false))
+                    ), 0.5f, cn, extras));
         }
 
         return targets;

diff --git a/src/com/irccloud/android/activity/MainActivity.java b/src/com/irccloud/android/activity/MainActivity.java
@@ -3884,16 +3884,15 @@ public void onClick(DialogInterface dialog, int which) {
                         intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, Intent.ShortcutIconResource.fromContext(this, R.mipmap.ic_launcher));
                         intent.setAction("com.android.launcher.action.INSTALL_SHORTCUT");
                         sendBroadcast(intent);
-                        moveTaskToBack(true);
                     } else {
                         ShortcutManager mShortcutManager = getSystemService(ShortcutManager.class);
 
                         if (mShortcutManager.isRequestPinShortcutSupported()) {
                             Icon icon = null;
                             if(buffer.isChannel()) {
-                                icon = Icon.createWithBitmap(Avatar.generateBitmap("#", 0xFFFFFFFF, 0xFFAAAAAA, false, 320, false));
+                                icon = Icon.createWithAdaptiveBitmap(Avatar.generateBitmap("#", 0xFFFFFFFF, 0xFFAAAAAA, false, (int)TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 108, getResources().getDisplayMetrics()), false));
                             } else if(buffer.isConversation()) {
-                                icon = Icon.createWithBitmap(AvatarsList.getInstance().getAvatar(buffer.getCid(), buffer.getName()).getBitmap(ColorScheme.getInstance().isDarkTheme, 320));
+                                icon = Icon.createWithAdaptiveBitmap(AvatarsList.getInstance().getAvatar(buffer.getCid(), buffer.getName()).getBitmap(false, (int)TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 108, getResources().getDisplayMetrics()), false, false));
                             }
                             ShortcutInfo pinShortcutInfo = new ShortcutInfo.Builder(this, String.valueOf(buffer.getBid()))
                                     .setIntent(shortcutIntent)
@@ -3905,6 +3904,7 @@ public void onClick(DialogInterface dialog, int which) {
                             mShortcutManager.requestPinShortcut(pinShortcutInfo, null);
                         }
                     }
+                    moveTaskToBack(true);
                 } catch (Exception e) {
                     NetworkConnection.printStackTraceToCrashlytics(e);
                 }