aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r--OpenKeychain/src/main/res/drawable-mdpi/minus.pngbin0 -> 263 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-mdpi/plus.pngbin0 -> 231 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xhdpi/minus.pngbin0 -> 323 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xhdpi/plus.pngbin0 -> 281 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/minus.pngbin0 -> 447 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/plus.pngbin0 -> 493 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable/button_edgy.xml6
-rw-r--r--OpenKeychain/src/main/res/drawable/button_rounded_green.xml37
-rw-r--r--OpenKeychain/src/main/res/drawable/button_rounded_red.xml37
-rw-r--r--OpenKeychain/src/main/res/layout/edit_key_activity.xml6
-rw-r--r--OpenKeychain/src/main/res/layout/edit_key_key_item.xml8
-rw-r--r--OpenKeychain/src/main/res/layout/edit_key_section.xml9
-rw-r--r--OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml11
13 files changed, 90 insertions, 24 deletions
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/minus.png b/OpenKeychain/src/main/res/drawable-mdpi/minus.png
new file mode 100644
index 000000000..d59e4a3e1
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/minus.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/plus.png b/OpenKeychain/src/main/res/drawable-mdpi/plus.png
new file mode 100644
index 000000000..88ee823af
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-mdpi/plus.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/minus.png b/OpenKeychain/src/main/res/drawable-xhdpi/minus.png
new file mode 100644
index 000000000..8a98ea967
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/minus.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/plus.png b/OpenKeychain/src/main/res/drawable-xhdpi/plus.png
new file mode 100644
index 000000000..def608491
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/plus.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/minus.png b/OpenKeychain/src/main/res/drawable-xxhdpi/minus.png
new file mode 100644
index 000000000..c46bf00de
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/minus.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/plus.png b/OpenKeychain/src/main/res/drawable-xxhdpi/plus.png
new file mode 100644
index 000000000..e1f6e841f
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/plus.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable/button_edgy.xml b/OpenKeychain/src/main/res/drawable/button_edgy.xml
index d296642b8..fdb94d40e 100644
--- a/OpenKeychain/src/main/res/drawable/button_edgy.xml
+++ b/OpenKeychain/src/main/res/drawable/button_edgy.xml
@@ -8,8 +8,8 @@
android:left="6dip"
android:right="6dip"
android:top="6dip" />
+ <solid android:color="#ebebeb" />
<stroke android:color="#cccccc" android:width="1.5dip" />
- <stroke android:color="#ebebeb" />
</shape>
</item>
<item android:state_focused="true">
@@ -19,8 +19,8 @@
android:left="6dip"
android:right="6dip"
android:top="6dip" />
- <stroke android:color="#cccccc" android:width="1.5dip" />
<solid android:color="#ebebeb"/>
+ <stroke android:color="#cccccc" android:width="1.5dip" />
</shape>
</item>
<item >
@@ -30,8 +30,8 @@
android:left="6dip"
android:right="6dip"
android:top="6dip" />
- <stroke android:color="#cccccc" android:width="1.5dip" />
<solid android:color="#ffffff" />
+ <stroke android:color="#cccccc" android:width="1.5dip" />
</shape>
</item>
</selector> \ No newline at end of file
diff --git a/OpenKeychain/src/main/res/drawable/button_rounded_green.xml b/OpenKeychain/src/main/res/drawable/button_rounded_green.xml
new file mode 100644
index 000000000..fc12fdf05
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable/button_rounded_green.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_pressed="true" >
+ <shape android:shape="rectangle" >
+ <padding
+ android:bottom="6dip"
+ android:left="6dip"
+ android:right="6dip"
+ android:top="6dip" />
+ <corners android:radius="6dip" />
+ <solid android:color="#47a447" />
+ </shape>
+ </item>
+ <item android:state_focused="true">
+ <shape android:shape="rectangle" >
+ <padding
+ android:bottom="6dip"
+ android:left="6dip"
+ android:right="6dip"
+ android:top="6dip" />
+ <corners android:radius="6dip" />
+ <solid android:color="#47a447"/>
+ </shape>
+ </item>
+ <item >
+ <shape android:shape="rectangle" >
+ <padding
+ android:bottom="6dip"
+ android:left="6dip"
+ android:right="6dip"
+ android:top="6dip" />
+ <corners android:radius="6dip" />
+ <solid android:color="#5cb85c" />
+ </shape>
+ </item>
+</selector> \ No newline at end of file
diff --git a/OpenKeychain/src/main/res/drawable/button_rounded_red.xml b/OpenKeychain/src/main/res/drawable/button_rounded_red.xml
new file mode 100644
index 000000000..330e83939
--- /dev/null
+++ b/OpenKeychain/src/main/res/drawable/button_rounded_red.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_pressed="true" >
+ <shape android:shape="rectangle" >
+ <padding
+ android:bottom="6dip"
+ android:left="6dip"
+ android:right="6dip"
+ android:top="6dip" />
+ <corners android:radius="6dip" />
+ <solid android:color="#d2322d" />
+ </shape>
+ </item>
+ <item android:state_focused="true">
+ <shape android:shape="rectangle" >
+ <padding
+ android:bottom="6dip"
+ android:left="6dip"
+ android:right="6dip"
+ android:top="6dip" />
+ <corners android:radius="6dip" />
+ <solid android:color="#d2322d"/>
+ </shape>
+ </item>
+ <item >
+ <shape android:shape="rectangle" >
+ <padding
+ android:bottom="6dip"
+ android:left="6dip"
+ android:right="6dip"
+ android:top="6dip" />
+ <corners android:radius="6dip" />
+ <solid android:color="#d9534f" />
+ </shape>
+ </item>
+</selector> \ No newline at end of file
diff --git a/OpenKeychain/src/main/res/layout/edit_key_activity.xml b/OpenKeychain/src/main/res/layout/edit_key_activity.xml
index 1ce5c096f..b6c5a1c9a 100644
--- a/OpenKeychain/src/main/res/layout/edit_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/edit_key_activity.xml
@@ -26,14 +26,14 @@
android:layout_height="wrap_content"
android:text="@string/label_no_passphrase" />
- <com.beardedhen.androidbootstrap.BootstrapButton
+ <Button
android:id="@+id/edit_key_btn_change_passphrase"
android:layout_width="match_parent"
android:layout_height="60dp"
android:padding="4dp"
android:text="@string/btn_set_passphrase"
- bootstrapbutton:bb_icon_left="fa-pencil"
- bootstrapbutton:bb_type="default" />
+ android:drawableLeft="@drawable/ic_action_edit"
+ android:background="@drawable/button_edgy" />
<LinearLayout
android:id="@+id/edit_key_container"
diff --git a/OpenKeychain/src/main/res/layout/edit_key_key_item.xml b/OpenKeychain/src/main/res/layout/edit_key_key_item.xml
index 090115d62..2d2fe51ab 100644
--- a/OpenKeychain/src/main/res/layout/edit_key_key_item.xml
+++ b/OpenKeychain/src/main/res/layout/edit_key_key_item.xml
@@ -155,15 +155,13 @@
</TableRow>
</TableLayout>
- <com.beardedhen.androidbootstrap.BootstrapButton
+ <ImageButton
android:id="@+id/delete"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="10dp"
- bootstrapbutton:bb_icon_left="fa-minus"
- bootstrapbutton:bb_roundedCorners="true"
- bootstrapbutton:bb_size="small"
- bootstrapbutton:bb_type="danger" />
+ android:src="@drawable/minus"
+ android:background="@drawable/button_rounded_red"/>
</LinearLayout>
<View
diff --git a/OpenKeychain/src/main/res/layout/edit_key_section.xml b/OpenKeychain/src/main/res/layout/edit_key_section.xml
index 9f10ff8c1..6cfe18bd6 100644
--- a/OpenKeychain/src/main/res/layout/edit_key_section.xml
+++ b/OpenKeychain/src/main/res/layout/edit_key_section.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<org.sufficientlysecure.keychain.ui.widget.SectionView xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
@@ -23,15 +22,13 @@
android:singleLine="true"
android:text="Section Name" />
- <com.beardedhen.androidbootstrap.BootstrapButton
+ <ImageButton
android:id="@+id/plusbutton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="10dp"
- bootstrapbutton:bb_icon_left="fa-plus"
- bootstrapbutton:bb_roundedCorners="true"
- bootstrapbutton:bb_size="small"
- bootstrapbutton:bb_type="success" />
+ android:src="@drawable/plus"
+ android:background="@drawable/button_rounded_green"/>
</LinearLayout>
<LinearLayout
diff --git a/OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml b/OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml
index a8d1dc674..3454d3668 100644
--- a/OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml
+++ b/OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<org.sufficientlysecure.keychain.ui.widget.UserIdEditor xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
@@ -76,18 +75,16 @@
</TableRow>
</TableLayout>
- <com.beardedhen.androidbootstrap.BootstrapButton
+ <ImageButton
android:id="@+id/delete"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:layout_margin="10dp"
+ android:layout_margin="10dip"
android:layout_marginLeft="4dip"
android:layout_marginRight="6dip"
- bootstrapbutton:bb_icon_left="fa-minus"
- bootstrapbutton:bb_roundedCorners="true"
- bootstrapbutton:bb_size="small"
- bootstrapbutton:bb_type="danger" />
+ android:src="@drawable/minus"
+ android:background="@drawable/button_rounded_red" />
</LinearLayout>
<View
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 17:38:10 +0000