diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-08-28 14:22:52 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-08-28 14:22:52 +0200 |
| commit | 6fa5f0b129eb30cfdb24da69530a2f107e8ae591 (patch) | |
| tree | f6ebbb5ac6a033af8813dad2a0a4b9af6e324304 /OpenKeychain/src/main/res | |
| parent | bff9aa1401b3844bab1f4fb8e7e6509f7fde2859 (diff) | |
| download | open-keychain-6fa5f0b129eb30cfdb24da69530a2f107e8ae591.tar.gz open-keychain-6fa5f0b129eb30cfdb24da69530a2f107e8ae591.tar.bz2 open-keychain-6fa5f0b129eb30cfdb24da69530a2f107e8ae591.zip | |
introduce text protection and fix color change after confirm
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_activity.xml | 33 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/colors.xml | 4 |
2 files changed, 28 insertions, 9 deletions
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml index b3b0c1bba..1c29ad759 100644 --- a/OpenKeychain/src/main/res/layout/view_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml @@ -34,21 +34,36 @@ android:fitsSystemWindows="true" app:layout_collapseMode="parallax"> - <ImageView - android:id="@+id/view_key_photo" + <FrameLayout + android:id="@+id/view_key_photo_layout" android:layout_width="match_parent" android:layout_height="match_parent" android:layout_alignParentLeft="true" android:layout_alignParentStart="true" android:layout_alignParentTop="false" - android:adjustViewBounds="false" - android:baselineAlignBottom="false" - android:cropToPadding="false" android:fitsSystemWindows="true" - android:focusable="false" - android:scaleType="centerCrop" - android:src="@drawable/ic_launcher" - android:visibility="gone" /> + android:visibility="gone"> + + <ImageView + android:id="@+id/view_key_photo" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:adjustViewBounds="false" + android:baselineAlignBottom="false" + android:cropToPadding="false" + android:fitsSystemWindows="true" + android:focusable="false" + android:scaleType="centerCrop" + android:src="@drawable/ic_launcher" /> + + <!-- text protection scrim --> + <View + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="bottom" + android:background="@drawable/scrim_bottom" /> + + </FrameLayout> <TextView android:id="@+id/view_key_status" diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml index 5db66b945..06fe2a9cd 100644 --- a/OpenKeychain/src/main/res/values/colors.xml +++ b/OpenKeychain/src/main/res/values/colors.xml @@ -29,4 +29,8 @@ <color name="android_green_light">#7bad45</color> <color name="android_green_dark">#6c983d</color> + <!-- text protection scrim colors --> + <color name="translucent_scrim_bottom">#2A000000</color> + <color name="translucent_scrim_bottom_center">#2A000000</color> + </resources> |