rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rollback password UI and add logotype

Browse Source
This commit is contained in:
J-Jamet
2020-10-23 23:10:50 +02:00
parent 4c0aab15fa
commit 18a2aae66a
1 changed files with 59 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
app/src/main/res/layout/activity_password.xml
View File

@@ -27,50 +27,65 @@
android:backgroundTint="?android:attr/textColor" android:backgroundTint="?android:attr/textColor"
tools:targetApi="o"> tools:targetApi="o">
<com.kunzisoft.keepass.view.SpecialModeView
android:id="@+id/special_mode_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="?attr/specialToolbarAppearance"
app:titleTextAppearance="@style/KeepassDXStyle.TextAppearance.Toolbar.Special.Title"
app:subtitleTextAppearance="@style/KeepassDXStyle.TextAppearance.Toolbar.Special.SubTitle"
app:layout_constraintTop_toTopOf="parent" />
<androidx.coordinatorlayout.widget.CoordinatorLayout <androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/activity_password_coordinator_layout" android:id="@+id/activity_password_coordinator_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toBottomOf="@+id/special_mode_view"
app:layout_constraintBottom_toTopOf="@+id/activity_password_info_container"> app:layout_constraintBottom_toTopOf="@+id/activity_password_info_container">
<FrameLayout <com.google.android.material.appbar.AppBarLayout
android:id="@+id/biometric_info_container" android:id="@+id/app_bar"
android:background="?attr/colorPrimary"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom"> android:fitsSystemWindows="true">
<com.kunzisoft.keepass.view.AdvancedUnlockInfoView
android:id="@+id/biometric_info" <com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/toolbar_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:visibility="gone"/> app:titleEnabled="false"
</FrameLayout> app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
<androidx.core.widget.NestedScrollView <FrameLayout
android:id="@+id/scroll_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scrollbarStyle="insideOverlay">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.kunzisoft.keepass.view.SpecialModeView
android:id="@+id/special_mode_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:theme="?attr/specialToolbarAppearance" android:minHeight="148dp"
app:titleTextAppearance="@style/KeepassDXStyle.TextAppearance.Toolbar.Special.Title" android:layout_marginTop="?attr/actionBarSize">
app:subtitleTextAppearance="@style/KeepassDXStyle.TextAppearance.Toolbar.Special.SubTitle" <ImageView
app:layout_constraintTop_toTopOf="parent" /> android:layout_width="78dp"
android:layout_height="78dp"
android:layout_gravity="center"
android:contentDescription="@string/about"
android:src="@mipmap/ic_launcher"
android:background="@drawable/background_image_button"
android:backgroundTint="?attr/colorPrimaryDark"/>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.kunzisoft.keepass.view.AdvancedUnlockInfoView
android:id="@+id/biometric_info"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="?attr/colorPrimary"
android:visibility="gone"/>
</FrameLayout>
</FrameLayout>
<androidx.appcompat.widget.Toolbar <androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
app:layout_constraintTop_toBottomOf="@+id/special_mode_view"
android:background="?attr/colorPrimary" android:background="?attr/colorPrimary"
android:theme="?attr/toolbarAppearance" android:theme="?attr/toolbarAppearance"
android:popupTheme="?attr/toolbarPopupAppearance" android:popupTheme="?attr/toolbarPopupAppearance"
@@ -89,16 +104,28 @@
android:singleLine="true"/> android:singleLine="true"/>
</androidx.appcompat.widget.Toolbar> </androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout>
<androidx.core.widget.NestedScrollView
android:id="@+id/scroll_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbarStyle="insideOverlay"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout <LinearLayout
android:id="@+id/unlock_container" android:id="@+id/unlock_container"
android:orientation="vertical" android:orientation="vertical"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:elevation="4dp"
android:padding="@dimen/default_margin" android:padding="@dimen/default_margin"
android:background="?android:attr/windowBackground" android:background="?android:attr/windowBackground"
app:layout_constraintWidth_percent="@dimen/content_percent" app:layout_constraintWidth_percent="@dimen/content_percent"
app:layout_constraintTop_toBottomOf="@+id/toolbar" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"> app:layout_constraintEnd_toEndOf="parent">
@@ -178,8 +205,8 @@
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="1dp"
app:layout_constraintTop_toBottomOf="@+id/unlock_container" android:background="?attr/colorBackgroundFloating"
android:background="?attr/colorBackgroundFloating" /> app:layout_constraintTop_toBottomOf="@+id/unlock_container"/>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView> </androidx.core.widget.NestedScrollView>