From 6d7ffe5134255fec8398a41fea4b5a54b98fe93a Mon Sep 17 00:00:00 2001
From: Mariotaku Lee <mariotaku.lee@gmail.com>
Date: Tue, 22 Dec 2015 14:43:55 +0800
Subject: [PATCH] updated code

---
 twidere.extension.emoji.noto/build.gradle     | 29 +++++++------------
 .../scripts/add_missing_png.sh                | 16 ++++++++++
 .../src/main/.gitignore                       |  3 +-
 3 files changed, 28 insertions(+), 20 deletions(-)
 create mode 100755 twidere.extension.emoji.noto/scripts/add_missing_png.sh

diff --git a/twidere.extension.emoji.noto/build.gradle b/twidere.extension.emoji.noto/build.gradle
index ee2f79343..b0ca1fac4 100644
--- a/twidere.extension.emoji.noto/build.gradle
+++ b/twidere.extension.emoji.noto/build.gradle
@@ -20,7 +20,16 @@ import fr.avianey.androidsvgdrawable.gradle.SvgDrawableTask
  */
 
 apply plugin: 'com.android.application'
-apply plugin: 'androidsvgdrawable'
+apply plugin: 'com.github.forsety.adr'
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.github.forsety:adr:0.1'
+    }
+}
 
 android {
     compileSdkVersion 23
@@ -49,21 +58,3 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
 }
-
-
-task emojiSvgToMipmap(type: SvgDrawableTask) {
-    // specify where to pick SVG from
-    from = files('src/main/svg/drawable')
-    // specify the android res folder
-    to = file('src/main/res-svg2png')
-    // override files only if necessary
-    overwriteMode = 'ifModified'
-    // let generate PNG for the following densities only
-    targetedDensities = ['hdpi', 'mdpi', 'xhdpi', 'xxhdpi', 'xxxhdpi']
-    // relative path of the file specifying nine patch specs
-    ninePatchConfig = file('src/main/svg/drawable/9patch.json')
-    // output format of the generated resources
-    outputFormat = 'PNG'
-
-    outputType = 'mipmap'
-}
\ No newline at end of file
diff --git a/twidere.extension.emoji.noto/scripts/add_missing_png.sh b/twidere.extension.emoji.noto/scripts/add_missing_png.sh
new file mode 100755
index 000000000..a4e635c93
--- /dev/null
+++ b/twidere.extension.emoji.noto/scripts/add_missing_png.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+if [ -z $1 ] || [ -z $2 ] || [ -z $3 ] || [ -z $4 ]; then
+    echo "Usage: $0 in_dir out_dir type suffix"
+    exit
+fi
+
+for f in $1/*.png; do
+    png_name=`basename ${f}`
+    svg_name=${png_name%.png}$4.svg
+    svg_file=$2/${svg_name}
+    if [ ! -e ${svg_file} ]; then
+        echo "Convert ${png_name} to ${svg_name}"
+        convert ${f} ${svg_file}
+    fi
+done
\ No newline at end of file
diff --git a/twidere.extension.emoji.noto/src/main/.gitignore b/twidere.extension.emoji.noto/src/main/.gitignore
index 42afabfd2..2292473dc 100644
--- a/twidere.extension.emoji.noto/src/main/.gitignore
+++ b/twidere.extension.emoji.noto/src/main/.gitignore
@@ -1 +1,2 @@
-/build
\ No newline at end of file
+# Those files generated on compile, so there's no need to include them in VCSw
+res-svg2png/
\ No newline at end of file