summaryrefslogtreecommitdiff
path: root/app/src/main
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/src/main
parent25f822e35f6f1f34a430f836d0883c19998b9452 (diff)
custom theme for riseup vpn
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/res/drawable-ldpi/logo.pngbin8743 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-mdpi/logo.pngbin6324 -> 0 bytes
-rw-r--r--app/src/main/res/drawable-xxxhdpi/logo.pngbin43251 -> 0 bytes
-rw-r--r--app/src/main/res/drawable/background_drawer.xml52
-rw-r--r--app/src/main/res/drawable/background_eip.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
8 files changed, 9 insertions, 172 deletions
diff --git a/app/src/main/res/drawable-ldpi/logo.png b/app/src/main/res/drawable-ldpi/logo.png
deleted file mode 100644
index 4e22d99f..00000000
--- a/app/src/main/res/drawable-ldpi/logo.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/logo.png b/app/src/main/res/drawable-mdpi/logo.png
deleted file mode 100644
index e53cb15c..00000000
--- a/app/src/main/res/drawable-mdpi/logo.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/logo.png b/app/src/main/res/drawable-xxxhdpi/logo.png
deleted file mode 100644
index 4297d90c..00000000
--- a/app/src/main/res/drawable-xxxhdpi/logo.png
+++ /dev/null
Binary files differ
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_eip.xml b/app/src/main/res/drawable/background_eip.xml
deleted file mode 100644
index 4b60e9dc..00000000
--- a/app/src/main/res/drawable/background_eip.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"