summaryrefslogtreecommitdiff
path: root/app/src
diff options
context:
space:
mode:
Diffstat (limited to 'app/src')
-rw-r--r--app/src/custom/res/drawable/splash_page.xml2
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/LoginActivity.java2
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/SignupActivity.java2
-rw-r--r--app/src/main/res/drawable-ldpi/logo.png (renamed from app/src/main/res/drawable-ldpi/mask.png)bin8743 -> 8743 bytes
-rw-r--r--app/src/main/res/drawable-mdpi/logo.png (renamed from app/src/main/res/drawable-mdpi/mask.png)bin6324 -> 6324 bytes
-rw-r--r--app/src/main/res/drawable-xxxhdpi/logo.png (renamed from app/src/main/res/drawable-xxxhdpi/mask.png)bin43251 -> 43251 bytes
-rw-r--r--app/src/main/res/drawable/splash_page.xml2
-rw-r--r--app/src/main/res/layout-xlarge/v_provider_header.xml2
-rw-r--r--app/src/main/res/layout/f_drawer_main.xml2
-rw-r--r--app/src/main/res/layout/v_provider_header.xml2
10 files changed, 7 insertions, 7 deletions
diff --git a/app/src/custom/res/drawable/splash_page.xml b/app/src/custom/res/drawable/splash_page.xml
index 8fe99847..57caa834 100644
--- a/app/src/custom/res/drawable/splash_page.xml
+++ b/app/src/custom/res/drawable/splash_page.xml
@@ -10,7 +10,7 @@
<item>
<!--Rename mask to foreground image name-->
<bitmap
- android:src="@drawable/mask"
+ android:src="@drawable/logo"
android:gravity="center" />
</item>
diff --git a/app/src/main/java/se/leap/bitmaskclient/LoginActivity.java b/app/src/main/java/se/leap/bitmaskclient/LoginActivity.java
index a407b0a9..00ede1a6 100644
--- a/app/src/main/java/se/leap/bitmaskclient/LoginActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/LoginActivity.java
@@ -17,7 +17,7 @@ public class LoginActivity extends ProviderCredentialsBaseActivity {
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setProgressbarText(R.string.logging_in);
- setProviderHeaderLogo(R.drawable.mask);
+ setProviderHeaderLogo(R.drawable.logo);
setProviderHeaderText(R.string.login_to_profile);
}
diff --git a/app/src/main/java/se/leap/bitmaskclient/SignupActivity.java b/app/src/main/java/se/leap/bitmaskclient/SignupActivity.java
index 0ff792bb..3eac711f 100644
--- a/app/src/main/java/se/leap/bitmaskclient/SignupActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/SignupActivity.java
@@ -18,7 +18,7 @@ public class SignupActivity extends ProviderCredentialsBaseActivity {
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- setProviderHeaderLogo(R.drawable.mask);
+ setProviderHeaderLogo(R.drawable.logo);
setProviderHeaderText(R.string.create_profile);
setProgressbarText(R.string.signing_up);
diff --git a/app/src/main/res/drawable-ldpi/mask.png b/app/src/main/res/drawable-ldpi/logo.png
index 4e22d99f..4e22d99f 100644
--- a/app/src/main/res/drawable-ldpi/mask.png
+++ b/app/src/main/res/drawable-ldpi/logo.png
Binary files differ
diff --git a/app/src/main/res/drawable-mdpi/mask.png b/app/src/main/res/drawable-mdpi/logo.png
index e53cb15c..e53cb15c 100644
--- a/app/src/main/res/drawable-mdpi/mask.png
+++ b/app/src/main/res/drawable-mdpi/logo.png
Binary files differ
diff --git a/app/src/main/res/drawable-xxxhdpi/mask.png b/app/src/main/res/drawable-xxxhdpi/logo.png
index 4297d90c..4297d90c 100644
--- a/app/src/main/res/drawable-xxxhdpi/mask.png
+++ b/app/src/main/res/drawable-xxxhdpi/logo.png
Binary files differ
diff --git a/app/src/main/res/drawable/splash_page.xml b/app/src/main/res/drawable/splash_page.xml
index 44112f06..1740da58 100644
--- a/app/src/main/res/drawable/splash_page.xml
+++ b/app/src/main/res/drawable/splash_page.xml
@@ -6,7 +6,7 @@
<item>
<bitmap
- android:src="@drawable/mask"
+ android:src="@drawable/logo"
android:gravity="center" />
</item>
diff --git a/app/src/main/res/layout-xlarge/v_provider_header.xml b/app/src/main/res/layout-xlarge/v_provider_header.xml
index 45f8302b..1d5ece94 100644
--- a/app/src/main/res/layout-xlarge/v_provider_header.xml
+++ b/app/src/main/res/layout-xlarge/v_provider_header.xml
@@ -7,7 +7,7 @@
android:layout_width="@dimen/bitmask_logo_tablet"
android:layout_height="@dimen/bitmask_logo_tablet"
android:adjustViewBounds="true"
- app:srcCompat="@drawable/mask" />
+ app:srcCompat="@drawable/logo" />
<android.support.v7.widget.AppCompatTextView
android:id="@+id/provider_header_text"
diff --git a/app/src/main/res/layout/f_drawer_main.xml b/app/src/main/res/layout/f_drawer_main.xml
index 7e89a769..549b4b6a 100644
--- a/app/src/main/res/layout/f_drawer_main.xml
+++ b/app/src/main/res/layout/f_drawer_main.xml
@@ -26,7 +26,7 @@
android:id="@+id/mask"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:srcCompat="@drawable/mask" />
+ app:srcCompat="@drawable/logo" />
</FrameLayout>
<RelativeLayout
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/v_provider_header.xml b/app/src/main/res/layout/v_provider_header.xml
index 6b08976c..d13f0186 100644
--- a/app/src/main/res/layout/v_provider_header.xml
+++ b/app/src/main/res/layout/v_provider_header.xml
@@ -7,7 +7,7 @@
android:layout_width="@dimen/bitmask_logo"
android:layout_height="@dimen/bitmask_logo"
android:adjustViewBounds="true"
- app:srcCompat="@drawable/mask" />
+ app:srcCompat="@drawable/logo" />
<android.support.v7.widget.AppCompatTextView
android:id="@+id/provider_header_text"