summaryrefslogtreecommitdiff
path: root/app/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java25
-rw-r--r--app/src/main/res/layout-port/f_eip.xml2
-rw-r--r--app/src/main/res/layout-xlarge-port/f_eip.xml2
-rw-r--r--app/src/main/res/layout-xlarge/f_eip.xml2
-rw-r--r--app/src/main/res/layout/f_eip.xml3
-rw-r--r--app/src/main/res/values/colors.xml1
6 files changed, 25 insertions, 10 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java b/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java
index ef16d085..d8be1cc5 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/fragments/EipFragment.java
@@ -54,6 +54,7 @@ import de.blinkt.openvpn.core.ConnectionStatus;
import de.blinkt.openvpn.core.IOpenVPNServiceInternal;
import de.blinkt.openvpn.core.OpenVPNService;
import de.blinkt.openvpn.core.VpnStatus;
+import se.leap.bitmaskclient.BuildConfig;
import se.leap.bitmaskclient.R;
import se.leap.bitmaskclient.base.FragmentManagerEnhanced;
import se.leap.bitmaskclient.base.MainActivity;
@@ -552,21 +553,27 @@ public class EipFragment extends Fragment implements Observer {
}
private void greyscaleBackground() {
- ColorMatrix matrix = new ColorMatrix();
- matrix.setSaturation(0);
- ColorMatrixColorFilter cf = new ColorMatrixColorFilter(matrix);
- background.setColorFilter(cf);
- background.setImageAlpha(255);
+ if (BuildConfig.use_color_filter) {
+ ColorMatrix matrix = new ColorMatrix();
+ matrix.setSaturation(0);
+ ColorMatrixColorFilter cf = new ColorMatrixColorFilter(matrix);
+ background.setColorFilter(cf);
+ background.setImageAlpha(255);
+ }
}
private void colorBackgroundALittle() {
- background.setColorFilter(null);
- background.setImageAlpha(144);
+ if (BuildConfig.use_color_filter) {
+ background.setColorFilter(null);
+ background.setImageAlpha(144);
+ }
}
private void colorBackground() {
- background.setColorFilter(null);
- background.setImageAlpha(210);
+ if (BuildConfig.use_color_filter) {
+ background.setColorFilter(null);
+ background.setImageAlpha(210);
+ }
}
private void updateInvalidVpnCertificate() {
diff --git a/app/src/main/res/layout-port/f_eip.xml b/app/src/main/res/layout-port/f_eip.xml
index 4dae126c..03401d16 100644
--- a/app/src/main/res/layout-port/f_eip.xml
+++ b/app/src/main/res/layout-port/f_eip.xml
@@ -65,6 +65,7 @@
android:padding="@dimen/activity_margin"
android:textAppearance="@android:style/TextAppearance.Large"
android:textStyle="bold"
+ android:textColor="@color/colorEipFragmentFont"
app:layout_constraintDimensionRatio="1:1"
tools:text="CONNETION"
android:gravity="center"
@@ -82,6 +83,7 @@
android:padding="@dimen/activity_margin"
android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
android:textStyle="bold"
+ android:textColor="@color/colorEipFragmentFont"
app:layout_constraintDimensionRatio="1:1"
tools:text="A LONG TEXT WITH SEVERAL THINGS BLABLkk \n kdjfkj \n kjdfkjdf"
android:gravity="center"
diff --git a/app/src/main/res/layout-xlarge-port/f_eip.xml b/app/src/main/res/layout-xlarge-port/f_eip.xml
index 5325d6a6..6a115a8b 100644
--- a/app/src/main/res/layout-xlarge-port/f_eip.xml
+++ b/app/src/main/res/layout-xlarge-port/f_eip.xml
@@ -76,6 +76,7 @@
android:padding="@dimen/activity_margin"
android:textAppearance="@android:style/TextAppearance.Large"
android:textStyle="bold"
+ android:textColor="@color/colorEipFragmentFont"
app:layout_constraintDimensionRatio="1:1"
tools:text="CONNETION"
android:gravity="center"
@@ -93,6 +94,7 @@
android:padding="@dimen/activity_margin"
android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
android:textStyle="bold"
+ android:textColor="@color/colorEipFragmentFont"
app:layout_constraintDimensionRatio="1:1"
tools:text="A LONG TEXT WITH SEVERAL THINGS BLABLkk"
android:gravity="center"
diff --git a/app/src/main/res/layout-xlarge/f_eip.xml b/app/src/main/res/layout-xlarge/f_eip.xml
index 8ed9a57c..1ea7ba4b 100644
--- a/app/src/main/res/layout-xlarge/f_eip.xml
+++ b/app/src/main/res/layout-xlarge/f_eip.xml
@@ -80,6 +80,7 @@
android:padding="@dimen/stdpadding"
android:textAppearance="@android:style/TextAppearance.DeviceDefault.Large"
android:textStyle="bold"
+ android:textColor="@color/colorEipFragmentFont"
app:layout_constraintDimensionRatio="1:1"
tools:text="CONNETION SECURE"
android:maxLines="1"
@@ -96,6 +97,7 @@
android:padding="@dimen/stdpadding"
android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
android:textStyle="bold"
+ android:textColor="@color/colorEipFragmentFont"
app:layout_constraintDimensionRatio="1:1"
android:maxLines="5"
android:ellipsize="end"
diff --git a/app/src/main/res/layout/f_eip.xml b/app/src/main/res/layout/f_eip.xml
index 0cefcd6c..e3e8fe0a 100644
--- a/app/src/main/res/layout/f_eip.xml
+++ b/app/src/main/res/layout/f_eip.xml
@@ -97,6 +97,7 @@
android:paddingEnd="@dimen/stdpadding"
android:textAppearance="@android:style/TextAppearance.DeviceDefault.Large"
android:textStyle="bold"
+ android:textColor="@color/colorEipFragmentFont"
app:layout_constraintDimensionRatio="1:1"
tools:text="CONNETION SECURE"
/>
@@ -111,12 +112,12 @@
app:layout_constraintBottom_toTopOf="@+id/gateway_location_button"
android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium"
android:textStyle="bold"
+ android:textColor="@color/colorEipFragmentFont"
android:paddingLeft="@dimen/stdpadding"
android:paddingStart="@dimen/stdpadding"
android:paddingRight="@dimen/stdpadding"
android:paddingEnd="@dimen/stdpadding"
android:paddingBottom="@dimen/stdpadding"
-
app:layout_constraintDimensionRatio="1:1"
tools:text="Your traffic is securly routed through \n another"
android:maxLines="2"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index a8cdb28e..e911a6d1 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -34,6 +34,7 @@
<color name="colorActionBarTitleFont">@color/white</color>
<color name="colorActionBarSubtitleFont">@color/black800</color>
+ <color name="colorEipFragmentFont">@color/black800</color>
<color name="colorWarning">#B33A3A</color>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 07:48:20 +0000