diff options
| author | Zeapo <mohamed@zenadi.com> | 2014-08-02 23:10:09 +0100 |
|---|---|---|
| committer | Zeapo <mohamed@zenadi.com> | 2014-08-02 23:10:09 +0100 |
| commit | cb8216b5878183005890a6deefde0797462de966 (patch) | |
| tree | 4b5344e6449b31e69d18ec99b7e2aff9d75fa21b /app/src/main/res/layout/activity_pgp_handler.xml | |
| parent | e2ce35c85e2c54b4c801ef24edfc468a546c335c (diff) | |
| download | HardenedPass-cb8216b5878183005890a6deefde0797462de966.tar.gz HardenedPass-cb8216b5878183005890a6deefde0797462de966.zip | |
improved ui for decrypt/encrypt
Diffstat (limited to 'app/src/main/res/layout/activity_pgp_handler.xml')
| -rw-r--r-- | app/src/main/res/layout/activity_pgp_handler.xml | 71 |
1 files changed, 14 insertions, 57 deletions
diff --git a/app/src/main/res/layout/activity_pgp_handler.xml b/app/src/main/res/layout/activity_pgp_handler.xml index ced0ec33..b5dfba53 100644 --- a/app/src/main/res/layout/activity_pgp_handler.xml +++ b/app/src/main/res/layout/activity_pgp_handler.xml @@ -24,73 +24,30 @@ android:id="@+id/crypto_password_file" android:layout_gravity="center_vertical" android:layout_marginLeft="8dp" - android:layout_column="0"/> + android:layout_column="0" + android:layout_row="0"/> <ImageButton + android:id="@+id/crypto_show_button" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_column="2" android:src="@android:drawable/ic_input_get" android:background="@android:drawable/screen_background_light_transparent" android:layout_gravity="center_vertical" - android:onClick="decrypt"/> - - </GridLayout> - - <LinearLayout - android:id="@+id/crypto_password_show_layout" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:visibility="invisible" - android:orientation="vertical" - android:background="@drawable/rectangle"> - - <GridLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textStyle="bold" - android:text="Password: "/> - <TextView - android:id="@+id/crypto_password_show" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:typeface="monospace" - android:layout_column="2"/> - </GridLayout> - - <ProgressBar - android:id="@+id/pbLoading" android:visibility="invisible" - android:layout_width="match_parent" - android:layout_height="2dp" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp" - style="?android:attr/progressBarStyleHorizontal"/> - </LinearLayout> - - <LinearLayout - android:id="@+id/crypto_extra_show_layout" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@drawable/rectangle" - android:orientation="vertical" - android:visibility="invisible"> + android:onClick="decrypt" + android:layout_column="2" + android:layout_row="0"/> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textStyle="bold" - android:text="Extra content: "/> - <TextView - android:id="@+id/crypto_extra_show" - android:layout_width="match_parent" + <LinearLayout + android:id="@+id/crypto_container" + android:orientation="vertical" + android:layout_width="fill_parent" android:layout_height="wrap_content" - android:typeface="monospace"/> + android:layout_column="0" + android:layout_row="2" + android:layout_columnSpan="3" /> - </LinearLayout> + </GridLayout> </LinearLayout> |