summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorcyBerta <cyberta@riseup.net>2018-09-08 20:19:02 +0200
committercyBerta <cyberta@riseup.net>2018-09-08 20:19:02 +0200
commit80b04ba633303d33207ca9438ee6933915036e84 (patch)
treefee85ab76b8b9b86d213378f697e78bd1f59b19a /app
parent25f822e35f6f1f34a430f836d0883c19998b9452 (diff)
custom theme for riseup vpn
Diffstat (limited to 'app')
-rw-r--r--app/build.gradle4
-rw-r--r--app/src/custom/res/drawable-land/background_main.pngbin0 -> 38813 bytes
-rw-r--r--app/src/custom/res/drawable-land/ic_splash_background.pngbin0 -> 60125 bytes
-rw-r--r--app/src/custom/res/drawable-sw600dp-port/background_main.pngbin0 -> 45747 bytes
-rw-r--r--app/src/custom/res/drawable-sw600dp-port/ic_splash_background.pngbin0 -> 74566 bytes
-rw-r--r--app/src/custom/res/drawable-sw600dp/background_main.pngbin0 -> 64577 bytes
-rw-r--r--app/src/custom/res/drawable-sw600dp/ic_splash_background.pngbin0 -> 86371 bytes
-rw-r--r--app/src/custom/res/drawable/background_drawer.pngbin0 -> 41536 bytes
-rw-r--r--app/src/custom/res/drawable/background_eip.xml63
-rw-r--r--app/src/custom/res/drawable/background_main.pngbin0 -> 45747 bytes
-rw-r--r--app/src/custom/res/drawable/donation_img.xml12
-rw-r--r--app/src/custom/res/drawable/drawer_logo.xml12
-rw-r--r--app/src/custom/res/drawable/ic_splash_background.pngbin0 -> 74566 bytes
-rw-r--r--app/src/custom/res/drawable/logo_square.pngbin0 -> 6141 bytes
-rw-r--r--app/src/custom/res/drawable/splash_page.xml8
-rw-r--r--app/src/main/res/drawable/background_drawer.xml52
-rw-r--r--app/src/main/res/drawable/background_main.xml52
-rw-r--r--app/src/main/res/layout/donation_reminder_dialog.xml16
-rw-r--r--app/src/main/res/layout/f_drawer_main.xml9
-rw-r--r--app/src/normal/res/drawable-ldpi/logo.png (renamed from app/src/main/res/drawable-ldpi/logo.png)bin8743 -> 8743 bytes
-rw-r--r--app/src/normal/res/drawable-mdpi/logo.png (renamed from app/src/main/res/drawable-mdpi/logo.png)bin6324 -> 6324 bytes
-rw-r--r--app/src/normal/res/drawable-xxxhdpi/logo.png (renamed from app/src/main/res/drawable-xxxhdpi/logo.png)bin43251 -> 43251 bytes
-rw-r--r--app/src/normal/res/drawable/background_drawer.xml (renamed from app/src/custom/res/drawable/background_drawer.xml)0
-rw-r--r--app/src/normal/res/drawable/background_eip.xml (renamed from app/src/main/res/drawable/background_eip.xml)0
-rw-r--r--app/src/normal/res/drawable/background_main.xml (renamed from app/src/custom/res/drawable/background_main.xml)0
-rw-r--r--app/src/normal/res/drawable/donation_img.xml18
-rw-r--r--app/src/normal/res/drawable/drawer_logo.xml11
27 files changed, 74 insertions, 183 deletions
diff --git a/app/build.gradle b/app/build.gradle
index b7522e07..16d517b4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -72,7 +72,7 @@ android {
//**************************************************************************
//Configurations for custom branded app.
- //Change the package name as needed
+ //Change the package name as needed, e.g. "org.example.myapp"
applicationId "net.riseup.black"
//Set app name here
appName = "Riseup VPN"
@@ -91,7 +91,7 @@ android {
//Build Config Fields for default donation details
//This is the donation URL and should be set to the relevant donation page.
- buildConfigField 'String', 'donation_url', '"https://leap.se/en/about-us/donate"'
+ buildConfigField 'String', 'donation_url', '"https://riseup.net/vpn/donate"'
//The field to enable donations in the app.
buildConfigField 'boolean', 'enable_donation', 'true'
//The field to enable donation reminder popup in the app if enable_donation is set to 'false' this will be disabled.
diff --git a/app/src/custom/res/drawable-land/background_main.png b/app/src/custom/res/drawable-land/background_main.png
new file mode 100644
index 00000000..ce11f5b4
--- /dev/null
+++ b/app/src/custom/res/drawable-land/background_main.png
Binary files differ
diff --git a/app/src/custom/res/drawable-land/ic_splash_background.png b/app/src/custom/res/drawable-land/ic_splash_background.png
new file mode 100644
index 00000000..09103e4b
--- /dev/null
+++ b/app/src/custom/res/drawable-land/ic_splash_background.png
Binary files differ
diff --git a/app/src/custom/res/drawable-sw600dp-port/background_main.png b/app/src/custom/res/drawable-sw600dp-port/background_main.png
new file mode 100644
index 00000000..23c7ffa6
--- /dev/null
+++ b/app/src/custom/res/drawable-sw600dp-port/background_main.png
Binary files differ
diff --git a/app/src/custom/res/drawable-sw600dp-port/ic_splash_background.png b/app/src/custom/res/drawable-sw600dp-port/ic_splash_background.png
new file mode 100644
index 00000000..c5abd96a
--- /dev/null
+++ b/app/src/custom/res/drawable-sw600dp-port/ic_splash_background.png
Binary files differ
diff --git a/app/src/custom/res/drawable-sw600dp/background_main.png b/app/src/custom/res/drawable-sw600dp/background_main.png
new file mode 100644
index 00000000..d11acde1
--- /dev/null
+++ b/app/src/custom/res/drawable-sw600dp/background_main.png
Binary files differ
diff --git a/app/src/custom/res/drawable-sw600dp/ic_splash_background.png b/app/src/custom/res/drawable-sw600dp/ic_splash_background.png
new file mode 100644
index 00000000..b3fb1f9c
--- /dev/null
+++ b/app/src/custom/res/drawable-sw600dp/ic_splash_background.png
Binary files differ
diff --git a/app/src/custom/res/drawable/background_drawer.png b/app/src/custom/res/drawable/background_drawer.png
new file mode 100644
index 00000000..ed138c42
--- /dev/null
+++ b/app/src/custom/res/drawable/background_drawer.png
Binary files differ
diff --git a/app/src/custom/res/drawable/background_eip.xml b/app/src/custom/res/drawable/background_eip.xml
index 4b60e9dc..a2364794 100644
--- a/app/src/custom/res/drawable/background_eip.xml
+++ b/app/src/custom/res/drawable/background_eip.xml
@@ -1,52 +1,11 @@
-<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>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ *****************************************************
+ Background image for the main vpn screem
+ example: <item android:drawable="@drawable/mybackground" />
+ *****************************************************
+-->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/background_main" />
+</layer-list> \ No newline at end of file
diff --git a/app/src/custom/res/drawable/background_main.png b/app/src/custom/res/drawable/background_main.png
new file mode 100644
index 00000000..23c7ffa6
--- /dev/null
+++ b/app/src/custom/res/drawable/background_main.png
Binary files differ
diff --git a/app/src/custom/res/drawable/donation_img.xml b/app/src/custom/res/drawable/donation_img.xml
index de93a9ce..91801baf 100644
--- a/app/src/custom/res/drawable/donation_img.xml
+++ b/app/src/custom/res/drawable/donation_img.xml
@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--Used to create the image to be shown in the donation popup-->
+<!--
+ *****************************************************
+ Used to create the image to be shown in the donation popup
+ example: <item android:drawable="@drawable/mybackground" />
+ *****************************************************
+-->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:drawable="@drawable/background_main"
+ <item android:drawable="@drawable/logo_square"
android:gravity="fill_horizontal|fill_vertical"/>
- <item android:drawable="@drawable/logo"
- android:gravity="center"
- />
</layer-list>
diff --git a/app/src/custom/res/drawable/drawer_logo.xml b/app/src/custom/res/drawable/drawer_logo.xml
new file mode 100644
index 00000000..3771c681
--- /dev/null
+++ b/app/src/custom/res/drawable/drawer_logo.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ *****************************************************
+ Foreground logo for the drawer header
+ example: <item android:drawable="@drawable/mylogo" />
+ *****************************************************
+-->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+ <!-- <item android:drawable="@drawable/logo" /> -->
+</layer-list> \ No newline at end of file
diff --git a/app/src/custom/res/drawable/ic_splash_background.png b/app/src/custom/res/drawable/ic_splash_background.png
new file mode 100644
index 00000000..c5abd96a
--- /dev/null
+++ b/app/src/custom/res/drawable/ic_splash_background.png
Binary files differ
diff --git a/app/src/custom/res/drawable/logo_square.png b/app/src/custom/res/drawable/logo_square.png
new file mode 100644
index 00000000..d20cedd5
--- /dev/null
+++ b/app/src/custom/res/drawable/logo_square.png
Binary files differ
diff --git a/app/src/custom/res/drawable/splash_page.xml b/app/src/custom/res/drawable/splash_page.xml
index 5b07671f..4c72dfe2 100644
--- a/app/src/custom/res/drawable/splash_page.xml
+++ b/app/src/custom/res/drawable/splash_page.xml
@@ -9,13 +9,13 @@
android:gravity="fill_horizontal|fill_vertical" />
<!--If a foreground image is not need remove this <item> tag-->
- <item>
+ <!--<item> -->
<!--Replace custom/res/drawable/logo with foreground image-->
<!--Replace custom/res/drawable-ldpi/logo with foreground image-->
<!--Replace custom/res/drawable-xxxhdpi/logo with foreground image-->
- <bitmap
+ <!--<bitmap
android:src="@drawable/logo"
- android:gravity="center" />
- </item>
+ android:gravity="center" /> -->
+<!--</item>-->
</layer-list> \ No newline at end of file
diff --git a/app/src/main/res/drawable/background_drawer.xml b/app/src/main/res/drawable/background_drawer.xml
deleted file mode 100644
index 4b60e9dc..00000000
--- a/app/src/main/res/drawable/background_drawer.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<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/background_main.xml b/app/src/main/res/drawable/background_main.xml
deleted file mode 100644
index 4b60e9dc..00000000
--- a/app/src/main/res/drawable/background_main.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<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/layout/donation_reminder_dialog.xml b/app/src/main/res/layout/donation_reminder_dialog.xml
index 3241071f..e8fb34d4 100644
--- a/app/src/main/res/layout/donation_reminder_dialog.xml
+++ b/app/src/main/res/layout/donation_reminder_dialog.xml
@@ -38,20 +38,12 @@
android:innerRadius="0dp"
android:shape="ring"
app:cardCornerRadius="60dp">
- <FrameLayout
+ <ImageView
+ android:id="@+id/donation_logo"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@drawable/background_main"
- >
- <ImageView
- android:id="@+id/ivImg"
- android:layout_width="120dp"
- android:layout_height="wrap_content"
- android:scaleType="centerInside"
- android:layout_marginBottom="@dimen/add_button_margin"
- android:layout_marginTop="@dimen/add_button_margin"
- android:src="@drawable/logo" />
- </FrameLayout>
+ android:scaleType="centerCrop"
+ android:src="@drawable/donation_img" />
</android.support.v7.widget.CardView>
diff --git a/app/src/main/res/layout/f_drawer_main.xml b/app/src/main/res/layout/f_drawer_main.xml
index 549b4b6a..b04d7b87 100644
--- a/app/src/main/res/layout/f_drawer_main.xml
+++ b/app/src/main/res/layout/f_drawer_main.xml
@@ -11,7 +11,7 @@
<FrameLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="150dp">
<android.support.v7.widget.AppCompatImageView
android:id="@+id/background"
@@ -23,10 +23,11 @@
app:srcCompat="@drawable/background_drawer" />
<android.support.v7.widget.AppCompatImageView
- android:id="@+id/mask"
+ android:id="@+id/foreground"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- app:srcCompat="@drawable/logo" />
+ android:layout_height="match_parent"
+ android:scaleType="centerInside"
+ app:srcCompat="@drawable/drawer_logo" />
</FrameLayout>
<RelativeLayout
android:layout_width="match_parent"
diff --git a/app/src/main/res/drawable-ldpi/logo.png b/app/src/normal/res/drawable-ldpi/logo.png
index 4e22d99f..4e22d99f 100644
--- a/app/src/main/res/drawable-ldpi/logo.png
+++ b/app/src/normal/res/drawable-ldpi/logo.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/logo.png b/app/src/normal/res/drawable-mdpi/logo.png
index e53cb15c..e53cb15c 100644
--- a/app/src/main/res/drawable-mdpi/logo.png
+++ b/app/src/normal/res/drawable-mdpi/logo.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/logo.png b/app/src/normal/res/drawable-xxxhdpi/logo.png
index 4297d90c..4297d90c 100644
--- a/app/src/main/res/drawable-xxxhdpi/logo.png
+++ b/app/src/normal/res/drawable-xxxhdpi/logo.png
Binary files differ
diff --git a/app/src/custom/res/drawable/background_drawer.xml b/app/src/normal/res/drawable/background_drawer.xml
index 4b60e9dc..4b60e9dc 100644
--- a/app/src/custom/res/drawable/background_drawer.xml
+++ b/app/src/normal/res/drawable/background_drawer.xml
diff --git a/app/src/main/res/drawable/background_eip.xml b/app/src/normal/res/drawable/background_eip.xml
index 4b60e9dc..4b60e9dc 100644
--- a/app/src/main/res/drawable/background_eip.xml
+++ b/app/src/normal/res/drawable/background_eip.xml
diff --git a/app/src/custom/res/drawable/background_main.xml b/app/src/normal/res/drawable/background_main.xml
index 4b60e9dc..4b60e9dc 100644
--- a/app/src/custom/res/drawable/background_main.xml
+++ b/app/src/normal/res/drawable/background_main.xml
diff --git a/app/src/normal/res/drawable/donation_img.xml b/app/src/normal/res/drawable/donation_img.xml
new file mode 100644
index 00000000..4a330b8f
--- /dev/null
+++ b/app/src/normal/res/drawable/donation_img.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:drawable="@drawable/background_main"
+ android:gravity="fill_horizontal|fill_vertical"/>
+
+ <item
+ android:top="50dp"
+ android:bottom="50dp"
+ android:left="50dp"
+ android:right="50dp"
+ >
+ <bitmap
+ android:src="@drawable/logo"
+ android:gravity="center" />
+ </item>
+
+</layer-list> \ No newline at end of file
diff --git a/app/src/normal/res/drawable/drawer_logo.xml b/app/src/normal/res/drawable/drawer_logo.xml
new file mode 100644
index 00000000..b42ea2b4
--- /dev/null
+++ b/app/src/normal/res/drawable/drawer_logo.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ *****************************************************
+ Foreground logo for the drawer header
+ example: <item android:drawable="@drawable/mylogo" />
+ *****************************************************
+-->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:drawable="@drawable/logo" />
+</layer-list> \ No newline at end of file