diff options
3 files changed, 66 insertions, 45 deletions
diff --git a/app/src/main/java/es/wolfi/app/passman/fragments/VaultLockScreenFragment.java b/app/src/main/java/es/wolfi/app/passman/fragments/VaultLockScreenFragment.java index 271c880..a8b06a4 100644 --- a/app/src/main/java/es/wolfi/app/passman/fragments/VaultLockScreenFragment.java +++ b/app/src/main/java/es/wolfi/app/passman/fragments/VaultLockScreenFragment.java @@ -36,6 +36,8 @@ import android.widget.Toast; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; +import com.google.android.material.floatingactionbutton.FloatingActionButton; + import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; @@ -62,7 +64,7 @@ public class VaultLockScreenFragment extends Fragment { @BindView(R.id.fragment_vault_password) EditText vault_password; @BindView(R.id.fragment_vault_unlock) - Button btn_unlock; + FloatingActionButton btn_unlock; @BindView(R.id.vault_lock_screen_chk_save_pw) CheckBox chk_save; diff --git a/app/src/main/res/drawable/ic_baseline_vpn_key_24.xml b/app/src/main/res/drawable/ic_baseline_vpn_key_24.xml new file mode 100644 index 0000000..1bdb032 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_vpn_key_24.xml @@ -0,0 +1,5 @@ +<vector android:height="24dp" android:tint="#FFFFFF" + android:viewportHeight="24" android:viewportWidth="24" + android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="@android:color/white" android:pathData="M12.65,10C11.83,7.67 9.61,6 7,6c-3.31,0 -6,2.69 -6,6s2.69,6 6,6c2.61,0 4.83,-1.67 5.65,-4H17v4h4v-4h2v-4H12.65zM7,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"/> +</vector> diff --git a/app/src/main/res/layout/fragment_vault_lock_screen.xml b/app/src/main/res/layout/fragment_vault_lock_screen.xml index 748e628..1daee42 100644 --- a/app/src/main/res/layout/fragment_vault_lock_screen.xml +++ b/app/src/main/res/layout/fragment_vault_lock_screen.xml @@ -20,60 +20,74 @@ * --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent" - android:paddingLeft="@dimen/activity_horizontal_margin" - android:paddingRight="@dimen/activity_horizontal_margin" - android:paddingTop="@dimen/activity_vertical_margin" - android:paddingBottom="@dimen/activity_vertical_margin" - tools:context="es.wolfi.app.passman.fragments.VaultLockScreenFragment"> + android:layout_height="match_parent"> - <!-- TODO: Update blank fragment layout --> - <TextView + <ScrollView android:layout_width="match_parent" - android:layout_height="wrap_content" - android:id="@+id/fragment_vault_name" - tools:text="Vault name" - android:textAppearance="@style/TextAppearance.AppCompat.Large" /> + android:layout_height="wrap_content"> - <com.google.android.material.textfield.TextInputLayout - android:id="@+id/input_layout_password" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_below="@+id/fragment_vault_name" - android:paddingTop="@dimen/activity_horizontal_margin"> - - <EditText - android:id="@+id/fragment_vault_password" + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignParentStart="true" - android:ems="10" - android:hint="@string/vault_password" - android:inputType="textPassword"> + android:orientation="vertical" + android:paddingLeft="@dimen/activity_horizontal_margin" + android:paddingTop="@dimen/activity_vertical_margin" + android:paddingRight="@dimen/activity_horizontal_margin" + android:paddingBottom="@dimen/floating_button_parent_padding" + tools:context="es.wolfi.app.passman.fragments.VaultLockScreenFragment"> + + <!-- TODO: Update blank fragment layout --> + <TextView + android:id="@+id/fragment_vault_name" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textAppearance="@style/TextAppearance.AppCompat.Large" + tools:text="Vault name" /> + + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/input_layout_password" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="@dimen/activity_horizontal_margin"> - <requestFocus/> - </EditText> + <EditText + android:id="@+id/fragment_vault_password" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentStart="true" + android:ems="10" + android:hint="@string/vault_password" + android:inputType="textPassword"> - </com.google.android.material.textfield.TextInputLayout> + <requestFocus /> + </EditText> - <Button - android:id="@+id/fragment_vault_unlock" - style="@style/Button.Primary" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_alignParentEnd="true" - android:text="@string/unlock" - android:theme="@style/Button.Primary"/> + </com.google.android.material.textfield.TextInputLayout> - <CheckBox - android:text="@string/vault_password_save" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:id="@+id/vault_lock_screen_chk_save_pw" - android:layout_below="@+id/input_layout_password" - android:layout_alignParentStart="true" /> + <CheckBox + android:id="@+id/vault_lock_screen_chk_save_pw" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/vault_password_save" /> + </LinearLayout> + </ScrollView> + + <androidx.coordinatorlayout.widget.CoordinatorLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:gravity="bottom|end"> + + <com.google.android.material.floatingactionbutton.FloatingActionButton + android:id="@+id/fragment_vault_unlock" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="bottom|end" + android:layout_margin="@dimen/fab_margin" + app:backgroundTint="?attr/colorPrimary" + app:srcCompat="@drawable/ic_baseline_vpn_key_24" /> + </androidx.coordinatorlayout.widget.CoordinatorLayout> </RelativeLayout> |