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

Converted AsymetricKeyFragment to new button style

Browse source
This commit is contained in:
Daniel Albert 2014-06-29 15:28:24 +02:00
parent 9091c22240
commit e8bb14ca26
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -27,8 +27,7 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.CheckBox; import android.widget.CheckBox;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Button;
import com.beardedhen.androidbootstrap.BootstrapButton;
import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.R;
@ -52,7 +51,7 @@ public class EncryptAsymmetricFragment extends Fragment {
OnAsymmetricKeySelection mKeySelectionListener; OnAsymmetricKeySelection mKeySelectionListener;
// view // view
private BootstrapButton mSelectKeysButton; private Button mSelectKeysButton;
private CheckBox mSign; private CheckBox mSign;
private TextView mMainUserId; private TextView mMainUserId;
private TextView mMainUserIdRest; private TextView mMainUserIdRest;
@ -99,7 +98,7 @@ public class EncryptAsymmetricFragment extends Fragment {
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.encrypt_asymmetric_fragment, container, false); View view = inflater.inflate(R.layout.encrypt_asymmetric_fragment, container, false);
mSelectKeysButton = (BootstrapButton) view.findViewById(R.id.btn_selectEncryptKeys); mSelectKeysButton = (Button) view.findViewById(R.id.btn_selectEncryptKeys);
mSign = (CheckBox) view.findViewById(R.id.sign); mSign = (CheckBox) view.findViewById(R.id.sign);
mMainUserId = (TextView) view.findViewById(R.id.mainUserId); mMainUserId = (TextView) view.findViewById(R.id.mainUserId);
mMainUserIdRest = (TextView) view.findViewById(R.id.mainUserIdRest); mMainUserIdRest = (TextView) view.findViewById(R.id.mainUserIdRest);

8
OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
View file

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
@ -65,15 +64,14 @@
android:text="@string/label_select_public_keys" android:text="@string/label_select_public_keys"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="?android:attr/textAppearanceMedium" />
<com.beardedhen.androidbootstrap.BootstrapButton <Button
android:id="@+id/btn_selectEncryptKeys" android:id="@+id/btn_selectEncryptKeys"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_margin="4dp" android:layout_margin="4dp"
android:text="@string/select_keys_button_default" android:text="@string/select_keys_button_default"
bootstrapbutton:bb_icon_left="fa-user" android:background="@drawable/button_edgy"
bootstrapbutton:bb_size="default" android:drawableLeft="@drawable/ic_action_person" />
bootstrapbutton:bb_type="default" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>