PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

Added new button style and converted account_settings and the select_secret_key_layout to use it

Browse source
This commit is contained in:
Daniel Albert 2014-06-29 13:59:51 +02:00
parent 4beff43a83
commit 9091c22240
9 changed files with 51 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java
View file

@ -28,8 +28,7 @@ import android.widget.AdapterView;
import android.widget.AdapterView.OnItemSelectedListener;
import android.widget.Spinner;
import android.widget.TextView;
import com.beardedhen.androidbootstrap.BootstrapButton;
import android.widget.Button;
import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.R;
@ -57,7 +56,7 @@ public class AccountSettingsFragment extends Fragment implements
private Spinner mCompression;
private SelectSecretKeyLayoutFragment mSelectKeyFragment;
private BootstrapButton mCreateKeyButton;
private Button mCreateKeyButton;
KeyValueSpinnerAdapter mEncryptionAdapter;
KeyValueSpinnerAdapter mHashAdapter;
@ -107,7 +106,7 @@ public class AccountSettingsFragment extends Fragment implements
.findViewById(R.id.api_account_settings_encryption_algorithm);
mHashAlgorithm = (Spinner) view.findViewById(R.id.api_account_settings_hash_algorithm);
mCompression = (Spinner) view.findViewById(R.id.api_account_settings_compression);
mCreateKeyButton = (BootstrapButton) view.findViewById(R.id.api_account_settings_create_key);
mCreateKeyButton = (Button) view.findViewById(R.id.api_account_settings_create_key);
mCreateKeyButton.setOnClickListener(new View.OnClickListener() {
@Override

8
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java
View file

@ -30,10 +30,9 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.TextView;
import com.beardedhen.androidbootstrap.BootstrapButton;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.pgp.KeyRing;
import org.sufficientlysecure.keychain.pgp.PgpKeyHelper;
@ -45,7 +44,7 @@ public class SelectSecretKeyLayoutFragment extends Fragment implements LoaderMan
private TextView mKeyUserIdRest;
private TextView mKeyMasterKeyIdHex;
private TextView mNoKeySelected;
private BootstrapButton mSelectKeyButton;
private Button mSelectKeyButton;
private Boolean mFilterCertify, mFilterSign;
private Uri mReceivedUri = null;
@ -117,8 +116,7 @@ public class SelectSecretKeyLayoutFragment extends Fragment implements LoaderMan
mKeyUserId = (TextView) view.findViewById(R.id.select_secret_key_user_id);
mKeyUserIdRest = (TextView) view.findViewById(R.id.select_secret_key_user_id_rest);
mKeyMasterKeyIdHex = (TextView) view.findViewById(R.id.select_secret_key_master_key_hex);
mSelectKeyButton = (BootstrapButton) view
.findViewById(R.id.select_secret_key_select_key_button);
mSelectKeyButton = (Button) view.findViewById(R.id.select_secret_key_select_key_button);
mFilterCertify = false;
mFilterSign = false;
mSelectKeyButton.setOnClickListener(new OnClickListener() {

BIN
OpenKeychain/src/main/res/drawable-hdpi/ic_action_accounts.png Normal file
View file

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 641 B

BIN
OpenKeychain/src/main/res/drawable-mdpi/ic_action_accounts.png Normal file
View file

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 506 B

BIN
OpenKeychain/src/main/res/drawable-xhdpi/ic_action_accounts.png Normal file
View file

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 765 B

BIN
OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_accounts.png Normal file
View file

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

37
OpenKeychain/src/main/res/drawable/button_edgy.xml Normal file
View file

@ -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" />
<stroke android:color="#cccccc" android:width="1.5dip" />
<stroke android:color="#ebebeb" />
</shape>
</item>
<item android:state_focused="true">
<shape android:shape="rectangle" >
<padding
android:bottom="6dip"
android:left="6dip"
android:right="6dip"
android:top="6dip" />
<stroke android:color="#cccccc" android:width="1.5dip" />
<solid android:color="#ebebeb"/>
</shape>
</item>
<item >
<shape android:shape="rectangle" >
<padding
android:bottom="6dip"
android:left="6dip"
android:right="6dip"
android:top="6dip" />
<stroke android:color="#cccccc" android:width="1.5dip" />
<solid android:color="#ffffff" />
</shape>
</item>
</selector>

9
OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
xmlns:custom="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
@ -43,7 +42,7 @@
android:layout_height="wrap_content"
tools:layout="@layout/select_secret_key_layout_fragment" />
<com.beardedhen.androidbootstrap.BootstrapButton
<Button
android:id="@+id/api_account_settings_create_key"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -52,9 +51,9 @@
android:layout_marginRight="4dp"
android:layout_marginTop="4dp"
android:text="@string/api_settings_create_key"
bootstrapbutton:bb_icon_left="fa-key"
bootstrapbutton:bb_size="default"
bootstrapbutton:bb_type="default" />
android:background="@drawable/button_edgy"
android:drawableLeft="@drawable/ic_action_accounts"
android:textSize="14dip"/>
<org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout
android:layout_width="match_parent"

9
OpenKeychain/src/main/res/layout/select_secret_key_layout_fragment.xml
View file

@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<LinearLayout 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="horizontal">
<com.beardedhen.androidbootstrap.BootstrapButton
<Button
android:id="@+id/select_secret_key_select_key_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -14,9 +13,9 @@
android:layout_marginRight="4dp"
android:layout_marginTop="4dp"
android:text="@string/api_settings_select_key"
bootstrapbutton:bb_icon_left="fa-key"
bootstrapbutton:bb_size="default"
bootstrapbutton:bb_type="default" />
android:drawableLeft="@drawable/ic_action_accounts"
android:background="@drawable/button_edgy"
android:textSize="14dp"/>
<LinearLayout
android:layout_width="match_parent"