diff options
author | Fup Duck <fupduck@sacknagel.com> | 2017-12-12 15:39:12 +0100 |
---|---|---|
committer | Fup Duck <fupduck@sacknagel.com> | 2017-12-12 15:39:12 +0100 |
commit | 41d8aeef77d93db93dd508045f1d05228480067a (patch) | |
tree | d5bf0881dd86ed1c2e42022a552b5e3b3ef8e323 /app/src/main | |
parent | b99938b1dc32f70800363f0faba88e7fd771abb4 (diff) |
Use VectorDrawable instead of Images
Diffstat (limited to 'app/src/main')
-rw-r--r-- | app/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java | 39 | ||||
-rw-r--r-- | app/src/main/res/drawable-hdpi/splash_background.png | bin | 66619 -> 0 bytes | |||
-rw-r--r-- | app/src/main/res/drawable-land-hdpi/splash_background.png | bin | 68637 -> 0 bytes | |||
-rw-r--r-- | app/src/main/res/drawable-land-ldpi/splash_background.png | bin | 43127 -> 0 bytes | |||
-rw-r--r-- | app/src/main/res/drawable-land-mdpi/splash_background.png | bin | 33924 -> 0 bytes | |||
-rw-r--r-- | app/src/main/res/drawable-land-xxxhdpi/splash_background.png | bin | 182692 -> 0 bytes | |||
-rw-r--r-- | app/src/main/res/drawable-ldpi/splash_background.png | bin | 41839 -> 0 bytes | |||
-rw-r--r-- | app/src/main/res/drawable-mdpi/splash_background.png | bin | 32718 -> 0 bytes | |||
-rw-r--r-- | app/src/main/res/drawable-xxxhdpi/splash_background.png | bin | 187062 -> 0 bytes | |||
-rw-r--r-- | app/src/main/res/drawable/ic_colorsquare.xml | 52 | ||||
-rw-r--r-- | app/src/main/res/drawable/splash_page.xml | 3 |
11 files changed, 54 insertions, 40 deletions
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 Binary files differdeleted file mode 100644 index 11dfd005..00000000 --- a/app/src/main/res/drawable-hdpi/splash_background.png +++ /dev/null diff --git a/app/src/main/res/drawable-land-hdpi/splash_background.png b/app/src/main/res/drawable-land-hdpi/splash_background.png Binary files differdeleted file mode 100644 index c2e123ce..00000000 --- a/app/src/main/res/drawable-land-hdpi/splash_background.png +++ /dev/null diff --git a/app/src/main/res/drawable-land-ldpi/splash_background.png b/app/src/main/res/drawable-land-ldpi/splash_background.png Binary files differdeleted file mode 100644 index 29f9e7cb..00000000 --- a/app/src/main/res/drawable-land-ldpi/splash_background.png +++ /dev/null diff --git a/app/src/main/res/drawable-land-mdpi/splash_background.png b/app/src/main/res/drawable-land-mdpi/splash_background.png Binary files differdeleted file mode 100644 index bf43f632..00000000 --- a/app/src/main/res/drawable-land-mdpi/splash_background.png +++ /dev/null diff --git a/app/src/main/res/drawable-land-xxxhdpi/splash_background.png b/app/src/main/res/drawable-land-xxxhdpi/splash_background.png Binary files differdeleted file mode 100644 index 12a9e8a8..00000000 --- a/app/src/main/res/drawable-land-xxxhdpi/splash_background.png +++ /dev/null diff --git a/app/src/main/res/drawable-ldpi/splash_background.png b/app/src/main/res/drawable-ldpi/splash_background.png Binary files differdeleted file mode 100644 index eaae5efb..00000000 --- a/app/src/main/res/drawable-ldpi/splash_background.png +++ /dev/null diff --git a/app/src/main/res/drawable-mdpi/splash_background.png b/app/src/main/res/drawable-mdpi/splash_background.png Binary files differdeleted file mode 100644 index 4df57929..00000000 --- a/app/src/main/res/drawable-mdpi/splash_background.png +++ /dev/null diff --git a/app/src/main/res/drawable-xxxhdpi/splash_background.png b/app/src/main/res/drawable-xxxhdpi/splash_background.png Binary files differdeleted file mode 100644 index 4ad0e2c3..00000000 --- a/app/src/main/res/drawable-xxxhdpi/splash_background.png +++ /dev/null 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 @@ +<vector android:height="24dp" android:viewportHeight="100.0" + android:viewportWidth="100.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:pathData="M50,50m-82000,0a82000,82000 0,1 1,164000 0a82000,82000 0,1 1,-164000 0"/> + <path android:fillAlpha="1" android:fillColor="#e6ee9c" + android:pathData="M50,50 L30664.67,-73860.37A80000,80000 0,0 0,50 -79950Z" + android:strokeColor="#e6ee9c" android:strokeWidth="0"/> + <path android:fillAlpha="1" android:fillColor="#fff59d" + android:pathData="m50,50 l56568.54,-56568.54a80000,80000 0,0 0,-25953.87 -17341.82z" + android:strokeColor="#fff59d" android:strokeWidth="0"/> + <path android:fillAlpha="1" android:fillColor="#ffe082" + android:pathData="m50,50 l73910.37,-30614.67a80000,80000 0,0 0,-17341.82 -25953.87z" + android:strokeColor="#ffe082" android:strokeWidth="0"/> + <path android:fillAlpha="1" android:fillColor="#ffcc80" + android:pathData="M50,50L80050,50A80000,80000 0,0 0,73960.37 -30564.67Z" + android:strokeColor="#ffcc80" android:strokeWidth="0"/> + <path android:fillAlpha="1" android:fillColor="#ffab91" + android:pathData="M50,50 L73960.37,30664.67A80000,80000 0,0 0,80050 50Z" + android:strokeColor="#ffab91" android:strokeWidth="0"/> + <path android:fillAlpha="1" android:fillColor="#ef9a9a" + android:pathData="m50,50 l56568.54,56568.54a80000,80000 0,0 0,17341.82 -25953.87z" + android:strokeColor="#ef9a9a" android:strokeWidth="0"/> + <path android:fillAlpha="1" android:fillColor="#f48fb1" + android:pathData="m50,50 l30614.67,73910.37a80000,80000 0,0 0,25953.87 -17341.82z" + android:strokeColor="#f48fb1" android:strokeWidth="0"/> + <path android:fillAlpha="1" android:fillColor="#ce93d8" + android:pathData="M50,50L50,80050A80000,80000 0,0 0,30664.67 73960.37Z" + android:strokeColor="#ce93d8" android:strokeWidth="0"/> + <path android:fillAlpha="1" android:fillColor="#b39ddb" + android:pathData="M50,50 L-30564.67,73960.37A80000,80000 0,0 0,50 80050Z" + android:strokeColor="#b39ddb" android:strokeWidth="0"/> + <path android:fillAlpha="1" android:fillColor="#9fa8da" + android:pathData="m50,50 l-56568.54,56568.54a80000,80000 0,0 0,25953.87 17341.82z" + android:strokeColor="#9fa8da" android:strokeWidth="0"/> + <path android:fillAlpha="1" android:fillColor="#90caf9" + android:pathData="m50,50 l-73910.37,30614.67a80000,80000 0,0 0,17341.82 25953.87z" + android:strokeColor="#90caf9" android:strokeWidth="0"/> + <path android:fillAlpha="1" android:fillColor="#81d4fa" + android:pathData="m50,50l-80000,0a80000,80000 0,0 0,6089.64 30614.67z" + android:strokeColor="#81d4fa" android:strokeWidth="0"/> + <path android:fillAlpha="1" android:fillColor="#80deea" + android:pathData="M50,50 L-73860.37,-30564.67A80000,80000 0,0 0,-79950 50Z" + android:strokeColor="#80deea" android:strokeWidth="0"/> + <path android:fillAlpha="1" android:fillColor="#80cbc4" + android:pathData="m50,50 l-56568.54,-56568.54a80000,80000 0,0 0,-17341.82 25953.87z" + android:strokeColor="#80cbc4" android:strokeWidth="0"/> + <path android:fillAlpha="1" android:fillColor="#a5d6a7" + android:pathData="m50,50 l-30614.67,-73910.37a80000,80000 0,0 0,-25953.87 17341.82z" + android:strokeColor="#a5d6a7" android:strokeWidth="0"/> + <path android:fillAlpha="1" android:fillColor="#c5e1a5" + android:pathData="m50,50l0,-80000a80000,80000 0,0 0,-30614.67 6089.64z" + android:strokeColor="#c5e1a5" android:strokeWidth="0"/> +</vector> 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 @@ <?xml version="1.0" encoding="utf-8"?> <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@drawable/splash_background" /> + <item android:drawable="@drawable/ic_colorsquare" + android:gravity="fill_horizontal|fill_vertical"/> <item android:drawable="@drawable/mask" android:gravity="center" > |