use brighter start button in initial setup flow

5 files changed, 5 insertions, 11 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/base/views/MainButton.java b/app/src/main/java/se/leap/bitmaskclient/base/views/MainButton.java
index 2fcc036e..e322e6c6 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/views/MainButton.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/views/MainButton.java
@@ -61,13 +61,11 @@ public class MainButton extends RelativeLayout {
     }
 
     public void setCustomDrawable(@DrawableRes int drawableResource) {
-       // Drawable drawable = ContextCompat.getDrawable(getContext(), drawableResource);
-        Drawable drawable = getContext().getDrawable(drawableResource);
+        Drawable drawable = ContextCompat.getDrawable(getContext(), drawableResource);
         if (drawable == null) {
             return;
         }
 
-        drawable.setColorFilter(ContextCompat.getColor(getContext(), R.color.colorPrimaryLight), PorterDuff.Mode.MULTIPLY);
         button.setImageDrawable(drawable);
         button.setTag("button_setup_circle_custom");
     }
diff --git a/app/src/main/res/drawable/button_setup_circle_progress_pressed.xml b/app/src/main/res/drawable/button_setup_circle_progress_pressed.xml
index 9f0021ef..d83a43cb 100644
--- a/app/src/main/res/drawable/button_setup_circle_progress_pressed.xml
+++ b/app/src/main/res/drawable/button_setup_circle_progress_pressed.xml
@@ -26,7 +26,7 @@
         android:bottom="12dp"
         >
         <shape android:shape="oval">
-            <solid android:color="@color/black"/>
+            <solid android:color="@color/colorPrimary"/>
             <size android:width="250dp" android:height="250dp" />
         </shape>
     </item>
@@ -51,7 +51,6 @@
         </shape>
     </item>
     <item
-        android:id="@+id/tintDrawable"
         android:top="78dp"
         android:bottom="72dp"
         android:left="60dp"
diff --git a/app/src/main/res/drawable/button_setup_circle_progress_released.xml b/app/src/main/res/drawable/button_setup_circle_progress_released.xml
index 244ecf10..9c4ac6d6 100644
--- a/app/src/main/res/drawable/button_setup_circle_progress_released.xml
+++ b/app/src/main/res/drawable/button_setup_circle_progress_released.xml
@@ -27,7 +27,7 @@
         android:top="15dp"
         >
         <shape android:shape="oval">
-            <solid android:color="@color/black800_dark"/>
+            <solid android:color="@color/colorPrimaryLight"/>
             <size android:width="250dp" android:height="250dp" />
         </shape>
     </item>
@@ -52,7 +52,6 @@
         </shape>
     </item>
     <item
-        android:id="@+id/tintDrawable"
         android:top="75dp"
         android:bottom="75dp"
         android:left="60dp"
diff --git a/app/src/main/res/drawable/button_setup_circle_start_pressed.xml b/app/src/main/res/drawable/button_setup_circle_start_pressed.xml
index a9ca0312..dd0caf4c 100644
--- a/app/src/main/res/drawable/button_setup_circle_start_pressed.xml
+++ b/app/src/main/res/drawable/button_setup_circle_start_pressed.xml
@@ -13,7 +13,7 @@
         android:bottom="12dp"
         >
         <shape android:shape="oval">
-            <solid android:color="@color/black"/>
+            <solid android:color="@color/colorPrimary"/>
             <size android:width="250dp" android:height="250dp" />
         </shape>
     </item>
@@ -38,7 +38,6 @@
         </shape>
     </item>
     <item
-        android:id="@+id/tintDrawable"
         android:top="78dp"
         android:bottom="72dp"
         android:left="60dp"
diff --git a/app/src/main/res/drawable/button_setup_circle_start_released.xml b/app/src/main/res/drawable/button_setup_circle_start_released.xml
index 70c82ec6..da1cb120 100644
--- a/app/src/main/res/drawable/button_setup_circle_start_released.xml
+++ b/app/src/main/res/drawable/button_setup_circle_start_released.xml
@@ -11,7 +11,7 @@
        android:top="15dp"
         >
         <shape android:shape="oval">
-           <solid android:color="@color/black800_dark"/>
+           <solid android:color="@color/colorPrimaryLight"/>
             <size android:width="250dp" android:height="250dp" />
         </shape>
     </item>
@@ -36,7 +36,6 @@
         </shape>
     </item>
     <item
-        android:id="@+id/tintDrawable"
         android:top="75dp"
         android:bottom="75dp"
         android:left="60dp"