diff options
Diffstat (limited to 'OpenKeychain/src/main')
5 files changed, 8 insertions, 81 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UnderlineTextView.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UnderlineTextView.java deleted file mode 100644 index 937a48e48..000000000 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UnderlineTextView.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (C) 2013 Eric Frohnhoefer - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.sufficientlysecure.keychain.ui.widget; - -import android.content.Context; -import android.content.res.Resources; -import android.graphics.Canvas; -import android.graphics.Paint; -import android.util.AttributeSet; -import android.util.TypedValue; -import android.widget.TextView; - -/** - * Copied from StickyListHeaders lib example - * - * @author Eric Frohnhoefer - */ -public class UnderlineTextView extends TextView { - private final Paint mPaint = new Paint(); - private int mUnderlineHeight = 0; - - public UnderlineTextView(Context context) { - this(context, null); - } - - public UnderlineTextView(Context context, AttributeSet attrs) { - this(context, attrs, 0); - } - - public UnderlineTextView(Context context, AttributeSet attrs, int defStyle) { - super(context, attrs, defStyle); - - init(context, attrs); - } - - private void init(Context context, AttributeSet attrs) { - Resources r = getResources(); - mUnderlineHeight = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 2, - r.getDisplayMetrics()); - } - - @Override - public void setPadding(int left, int top, int right, int bottom) { - super.setPadding(left, top, right, bottom + mUnderlineHeight); - } - - @Override - protected void onDraw(Canvas canvas) { - super.onDraw(canvas); - - // Draw the underline the same color as the text - mPaint.setColor(getTextColors().getDefaultColor()); - canvas.drawRect(0, getHeight() - mUnderlineHeight, getWidth(), getHeight(), mPaint); - } -} diff --git a/OpenKeychain/src/main/res/layout/key_list_header.xml b/OpenKeychain/src/main/res/layout/key_list_header.xml index de7bdbd5c..8cb0d4262 100644 --- a/OpenKeychain/src/main/res/layout/key_list_header.xml +++ b/OpenKeychain/src/main/res/layout/key_list_header.xml @@ -3,15 +3,12 @@ android:layout_width="match_parent" android:layout_height="wrap_content" > - <org.sufficientlysecure.keychain.ui.widget.UnderlineTextView + <TextView + style="@style/SectionHeader" android:id="@+id/stickylist_header_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="start|left" - android:padding="8dp" - android:textColor="@color/emphasis" - android:textSize="17sp" - android:textStyle="bold" android:text="header text" /> <TextView diff --git a/OpenKeychain/src/main/res/layout/view_key_certs_header.xml b/OpenKeychain/src/main/res/layout/view_key_certs_header.xml index 037203dbd..f99c012c9 100644 --- a/OpenKeychain/src/main/res/layout/view_key_certs_header.xml +++ b/OpenKeychain/src/main/res/layout/view_key_certs_header.xml @@ -3,15 +3,12 @@ android:layout_width="match_parent" android:layout_height="wrap_content" > - <org.sufficientlysecure.keychain.ui.widget.UnderlineTextView + <TextView + style="@style/SectionHeader" android:id="@+id/stickylist_header_text" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="start|left" - android:padding="8dp" - android:textColor="@color/emphasis" - android:textSize="14sp" - android:textStyle="bold" android:text="header text" /> <TextView diff --git a/OpenKeychain/src/main/res/values-v11/styles_keychaintheme.xml b/OpenKeychain/src/main/res/values-v11/styles_keychaintheme.xml index ebb911718..0b6c4c4f5 100644 --- a/OpenKeychain/src/main/res/values-v11/styles_keychaintheme.xml +++ b/OpenKeychain/src/main/res/values-v11/styles_keychaintheme.xml @@ -25,8 +25,9 @@ <item name="android:drawableBottom">@drawable/section_header</item> <item name="android:drawablePadding">4dp</item> <item name="android:layout_marginTop">8dp</item> - <item name="android:paddingLeft">4dp</item> + <item name="android:paddingLeft">8dp</item> <item name="android:textAllCaps">true</item> + <item name="android:textStyle">bold</item> <item name="android:textColor">@color/emphasis</item> <item name="android:textSize">14sp</item> </style> diff --git a/OpenKeychain/src/main/res/values/styles.xml b/OpenKeychain/src/main/res/values/styles.xml index 4a3fa0f8f..27cd1546a 100644 --- a/OpenKeychain/src/main/res/values/styles.xml +++ b/OpenKeychain/src/main/res/values/styles.xml @@ -24,7 +24,8 @@ <item name="android:drawableBottom">@drawable/section_header</item> <item name="android:drawablePadding">4dp</item> <item name="android:layout_marginTop">8dp</item> - <item name="android:paddingLeft">4dp</item> + <item name="android:paddingLeft">8dp</item> + <item name="android:textStyle">bold</item> <item name="android:textColor">@color/emphasis</item> <item name="android:textSize">14sp</item> </style> |