From 41d8aeef77d93db93dd508045f1d05228480067a Mon Sep 17 00:00:00 2001 From: Fup Duck Date: Tue, 12 Dec 2017 15:39:12 +0100 Subject: Use VectorDrawable instead of Images --- app/build.gradle | 1 + .../de/blinkt/openvpn/fragments/LogFragment.java | 39 ---------------- .../main/res/drawable-hdpi/splash_background.png | Bin 66619 -> 0 bytes .../res/drawable-land-hdpi/splash_background.png | Bin 68637 -> 0 bytes .../res/drawable-land-ldpi/splash_background.png | Bin 43127 -> 0 bytes .../res/drawable-land-mdpi/splash_background.png | Bin 33924 -> 0 bytes .../drawable-land-xxxhdpi/splash_background.png | Bin 182692 -> 0 bytes .../main/res/drawable-ldpi/splash_background.png | Bin 41839 -> 0 bytes .../main/res/drawable-mdpi/splash_background.png | Bin 32718 -> 0 bytes .../res/drawable-xxxhdpi/splash_background.png | Bin 187062 -> 0 bytes app/src/main/res/drawable/ic_colorsquare.xml | 52 +++++++++++++++++++++ app/src/main/res/drawable/splash_page.xml | 3 +- 12 files changed, 55 insertions(+), 40 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi/splash_background.png delete mode 100644 app/src/main/res/drawable-land-hdpi/splash_background.png delete mode 100644 app/src/main/res/drawable-land-ldpi/splash_background.png delete mode 100644 app/src/main/res/drawable-land-mdpi/splash_background.png delete mode 100644 app/src/main/res/drawable-land-xxxhdpi/splash_background.png delete mode 100644 app/src/main/res/drawable-ldpi/splash_background.png delete mode 100644 app/src/main/res/drawable-mdpi/splash_background.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/splash_background.png create mode 100644 app/src/main/res/drawable/ic_colorsquare.xml diff --git a/app/build.gradle b/app/build.gradle index b9db8cd6..35665852 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,6 +10,7 @@ android { defaultConfig { applicationId "se.leap.bitmaskclient" resValue "string", "app_name", "Bitmask" + vectorDrawables.useSupportLibrary = true } signingConfigs { diff --git a/app/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java b/app/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java index a1fc7cdc..d5931c83 100644 --- a/app/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java +++ b/app/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java @@ -423,45 +423,6 @@ public class LogFragment extends ListFragment implements StateListener, SeekBar. private TextView mSpeedView; - @Override - public boolean onOptionsItemSelected(MenuItem item) { - if (item.getItemId() == R.id.clearlog) { - ladapter.clearLog(); - return true; - } else if (item.getItemId() == R.id.cancel) { - Intent intent = new Intent(getActivity(), DisconnectVPN.class); - startActivity(intent); - return true; - } else if (item.getItemId() == R.id.send) { - ladapter.shareLog(); - } else if (item.getItemId() == R.id.edit_vpn) { - VpnProfile lastConnectedprofile = ProfileManager.get(getActivity(), VpnStatus.getLastConnectedVPNProfile()); - - if (lastConnectedprofile != null) { - Intent vprefintent = new Intent(getActivity(), Dashboard.class) - .putExtra(VpnProfile.EXTRA_PROFILEUUID, lastConnectedprofile.getUUIDString()); - startActivityForResult(vprefintent, START_VPN_CONFIG); - } else { - Toast.makeText(getActivity(), R.string.log_no_last_vpn, Toast.LENGTH_LONG).show(); - } - } else if (item.getItemId() == R.id.toggle_time) { - showHideOptionsPanel(); - } else if (item.getItemId() == android.R.id.home) { - // This is called when the Home (Up) button is pressed - // in the Action Bar. - Intent parentActivityIntent = new Intent(getActivity(), Dashboard.class); - parentActivityIntent.addFlags( - Intent.FLAG_ACTIVITY_CLEAR_TOP | - Intent.FLAG_ACTIVITY_NEW_TASK); - startActivity(parentActivityIntent); - getActivity().finish(); - return true; - - } - return super.onOptionsItemSelected(item); - - } - private void showHideOptionsPanel() { boolean optionsVisible = (mOptionsLayout.getVisibility() != View.GONE); diff --git a/app/src/main/res/drawable-hdpi/splash_background.png b/app/src/main/res/drawable-hdpi/splash_background.png deleted file mode 100644 index 11dfd005..00000000 Binary files a/app/src/main/res/drawable-hdpi/splash_background.png and /dev/null differ diff --git a/app/src/main/res/drawable-land-hdpi/splash_background.png b/app/src/main/res/drawable-land-hdpi/splash_background.png deleted file mode 100644 index c2e123ce..00000000 Binary files a/app/src/main/res/drawable-land-hdpi/splash_background.png and /dev/null differ diff --git a/app/src/main/res/drawable-land-ldpi/splash_background.png b/app/src/main/res/drawable-land-ldpi/splash_background.png deleted file mode 100644 index 29f9e7cb..00000000 Binary files a/app/src/main/res/drawable-land-ldpi/splash_background.png and /dev/null differ diff --git a/app/src/main/res/drawable-land-mdpi/splash_background.png b/app/src/main/res/drawable-land-mdpi/splash_background.png deleted file mode 100644 index bf43f632..00000000 Binary files a/app/src/main/res/drawable-land-mdpi/splash_background.png and /dev/null differ diff --git a/app/src/main/res/drawable-land-xxxhdpi/splash_background.png b/app/src/main/res/drawable-land-xxxhdpi/splash_background.png deleted file mode 100644 index 12a9e8a8..00000000 Binary files a/app/src/main/res/drawable-land-xxxhdpi/splash_background.png and /dev/null differ diff --git a/app/src/main/res/drawable-ldpi/splash_background.png b/app/src/main/res/drawable-ldpi/splash_background.png deleted file mode 100644 index eaae5efb..00000000 Binary files a/app/src/main/res/drawable-ldpi/splash_background.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/splash_background.png b/app/src/main/res/drawable-mdpi/splash_background.png deleted file mode 100644 index 4df57929..00000000 Binary files a/app/src/main/res/drawable-mdpi/splash_background.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/splash_background.png b/app/src/main/res/drawable-xxxhdpi/splash_background.png deleted file mode 100644 index 4ad0e2c3..00000000 Binary files a/app/src/main/res/drawable-xxxhdpi/splash_background.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_colorsquare.xml b/app/src/main/res/drawable/ic_colorsquare.xml new file mode 100644 index 00000000..4b60e9dc --- /dev/null +++ b/app/src/main/res/drawable/ic_colorsquare.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/splash_page.xml b/app/src/main/res/drawable/splash_page.xml index 1d8a6bf6..0a083c7e 100644 --- a/app/src/main/res/drawable/splash_page.xml +++ b/app/src/main/res/drawable/splash_page.xml @@ -1,7 +1,8 @@ - + -- cgit v1.2.3