From 80dc0167cf9fb91cd9373bdd2a93793f71b901dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Thu, 15 May 2014 17:41:41 +0200 Subject: Copy some necessary icons from ics-openvpn. I'm hardcoding their values based on the compilation errors (i.e., the drawables referenced by de.blinkt.openvpn.core.OpenVpnService). If a new drawable were introduced, build.gradle should be updated accordingly. --- app/src/main/java/se/leap/bitmaskclient/EIP.java | 2 +- .../main/res/drawable-hdpi/ic_stat_vpn_empty_halo.png | Bin 0 -> 816 bytes app/src/main/res/drawable-hdpi/ic_stat_vpn_offline.png | Bin 0 -> 637 bytes app/src/main/res/drawable-hdpi/ic_stat_vpn_outline.png | Bin 0 -> 863 bytes .../main/res/drawable-mdpi/ic_stat_vpn_empty_halo.png | Bin 0 -> 545 bytes app/src/main/res/drawable-mdpi/ic_stat_vpn_offline.png | Bin 0 -> 451 bytes app/src/main/res/drawable-mdpi/ic_stat_vpn_outline.png | Bin 0 -> 609 bytes .../main/res/drawable-xhdpi/ic_stat_vpn_empty_halo.png | Bin 0 -> 1033 bytes app/src/main/res/drawable-xhdpi/ic_stat_vpn_offline.png | Bin 0 -> 834 bytes app/src/main/res/drawable-xhdpi/ic_stat_vpn_outline.png | Bin 0 -> 1151 bytes app/src/main/res/values/strings-icsopenvpn.xml | 2 -- build.gradle | 15 +++++++++++---- 12 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/ic_stat_vpn_empty_halo.png create mode 100644 app/src/main/res/drawable-hdpi/ic_stat_vpn_offline.png create mode 100644 app/src/main/res/drawable-hdpi/ic_stat_vpn_outline.png create mode 100644 app/src/main/res/drawable-mdpi/ic_stat_vpn_empty_halo.png create mode 100644 app/src/main/res/drawable-mdpi/ic_stat_vpn_offline.png create mode 100644 app/src/main/res/drawable-mdpi/ic_stat_vpn_outline.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_stat_vpn_empty_halo.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_stat_vpn_offline.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_stat_vpn_outline.png diff --git a/app/src/main/java/se/leap/bitmaskclient/EIP.java b/app/src/main/java/se/leap/bitmaskclient/EIP.java index 8b95a586..d5d3c55f 100644 --- a/app/src/main/java/se/leap/bitmaskclient/EIP.java +++ b/app/src/main/java/se/leap/bitmaskclient/EIP.java @@ -56,7 +56,7 @@ import android.util.Log; * Internet Proxy connection. Connections are started, stopped, and queried through * this IntentService. * Contains logic for parsing eip-service.json from the provider, configuring and selecting - * gateways, and controlling {@link .openvpn.OpenVpnService} connections. + * gateways, and controlling {@link de.blinkt.openvpn.core.OpenVpnService} connections. * * @author Sean Leonard */ diff --git a/app/src/main/res/drawable-hdpi/ic_stat_vpn_empty_halo.png b/app/src/main/res/drawable-hdpi/ic_stat_vpn_empty_halo.png new file mode 100644 index 00000000..7df5b670 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_stat_vpn_empty_halo.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_stat_vpn_offline.png b/app/src/main/res/drawable-hdpi/ic_stat_vpn_offline.png new file mode 100644 index 00000000..8aa48803 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_stat_vpn_offline.png differ diff --git a/app/src/main/res/drawable-hdpi/ic_stat_vpn_outline.png b/app/src/main/res/drawable-hdpi/ic_stat_vpn_outline.png new file mode 100644 index 00000000..b5583d99 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_stat_vpn_outline.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_stat_vpn_empty_halo.png b/app/src/main/res/drawable-mdpi/ic_stat_vpn_empty_halo.png new file mode 100644 index 00000000..fc039a82 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_stat_vpn_empty_halo.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_stat_vpn_offline.png b/app/src/main/res/drawable-mdpi/ic_stat_vpn_offline.png new file mode 100644 index 00000000..f31387a4 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_stat_vpn_offline.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_stat_vpn_outline.png b/app/src/main/res/drawable-mdpi/ic_stat_vpn_outline.png new file mode 100644 index 00000000..052aef9d Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_stat_vpn_outline.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_vpn_empty_halo.png b/app/src/main/res/drawable-xhdpi/ic_stat_vpn_empty_halo.png new file mode 100644 index 00000000..2f61e890 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_stat_vpn_empty_halo.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_vpn_offline.png b/app/src/main/res/drawable-xhdpi/ic_stat_vpn_offline.png new file mode 100644 index 00000000..e9411518 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_stat_vpn_offline.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_stat_vpn_outline.png b/app/src/main/res/drawable-xhdpi/ic_stat_vpn_outline.png new file mode 100644 index 00000000..5d27240d Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_stat_vpn_outline.png differ diff --git a/app/src/main/res/values/strings-icsopenvpn.xml b/app/src/main/res/values/strings-icsopenvpn.xml index 6cd45b66..a5424c39 100755 --- a/app/src/main/res/values/strings-icsopenvpn.xml +++ b/app/src/main/res/values/strings-icsopenvpn.xml @@ -1,8 +1,6 @@ - OpenVPN for Android - Server Address: Server Port: Location Unable to read directory diff --git a/build.gradle b/build.gradle index 76d60d0b..29ceb2f2 100644 --- a/build.gradle +++ b/build.gradle @@ -51,9 +51,16 @@ task copyIcsOpenVPNClasses( type: Copy ) { } filter { line -> line.replaceAll('de.blinkt.openvpn.BuildConfig', 'se.leap.bitmaskclient.BuildConfig') - } - } - into 'app' + } + } into 'app' + + from ('ics-openvpn/main') { + //TODO We should detect which drawables are needed by the classes + //we need (such as de.blinkt.openvpn.core.OpenVpnService) + include '**/ic_stat_vpn_offline.png' + include '**/ic_stat_vpn_outline.png' + include '**/ic_stat_vpn_empty_halo.png' + } into 'app' } def processFileInplace(file, Closure processText) { @@ -62,7 +69,7 @@ def processFileInplace(file, Closure processText) { } // thanks to http://pleac.sourceforge.net/pleac_groovy/fileaccess.html -task removeDuplicatedStrings() << { +task removeDuplicatedStrings( dependsOn: 'copyIcsOpenVPNClasses' ) { def resources_directory = new File('./app/src/main/res/') resources_directory.eachFileRecurse { if(it.name.equals('strings.xml')) { -- cgit v1.2.3