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

Change file_selection

Browse Source
This commit is contained in:
J-Jamet
2018-01-12 18:56:25 +01:00
parent a1237215cc
commit b7a76ed2e7
2 changed files with 75 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

141
app/src/main/res/layout/file_selection.xml
View File

@@ -17,88 +17,93 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with KeePass DX. If not, see <http://www.gnu.org/licenses/>. along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
--> -->
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<android.support.design.widget.AppBarLayout <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/app_bar" xmlns:app="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="match_parent">
android:elevation="4dp"
android:fitsSystemWindows="true">
<android.support.design.widget.CollapsingToolbarLayout <android.support.design.widget.AppBarLayout
android:id="@+id/toolbar_layout" android:id="@+id/app_bar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
app:expandedTitleTextAppearance="?attr/expandedTitleTextAppearance" android:elevation="4dp"
app:collapsedTitleTextAppearance="?attr/collapsedTitleTextAppearance" android:fitsSystemWindows="true">
app:contentScrim="?attr/colorPrimary"
app:layout_scrollFlags="scroll|exitUntilCollapsed">
<com.keepassdroid.view.FileNameView android:id="@+id/file_select" <android.support.design.widget.CollapsingToolbarLayout
android:id="@+id/toolbar_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginTop="?attr/actionBarSize"/> app:titleEnabled="false"
<android.support.v7.widget.Toolbar app:contentScrim="?attr/colorPrimary"
android:id="@+id/toolbar" app:layout_scrollFlags="scroll|exitUntilCollapsed">
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:theme="?attr/toolbarAppearance"
app:popupTheme="?attr/toolbarPopupAppearance"
app:layout_collapseMode="pin"/>
</android.support.design.widget.CollapsingToolbarLayout> <com.keepassdroid.view.FileNameView android:id="@+id/file_select"
</android.support.design.widget.AppBarLayout> android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="?attr/actionBarSize"/>
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
app:theme="?attr/toolbarAppearance"
app:popupTheme="?attr/toolbarPopupAppearance"
app:layout_collapseMode="pin"/>
<android.support.design.widget.FloatingActionButton </android.support.design.widget.CollapsingToolbarLayout>
android:id="@+id/open_database" </android.support.design.widget.AppBarLayout>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/filename_container"
android:layout_marginStart="24dp"
android:layout_marginLeft="24dp"
android:layout_marginEnd="24dp"
android:layout_marginRight="24dp"
app:fabSize="mini"
app:layout_anchor="@id/filename_container"
app:layout_anchorGravity="bottom|start"
android:src="@drawable/ic_open_folder_white_24dp" />
<RelativeLayout
app:layout_behavior="@string/appbar_scrolling_view_behavior"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView android:id="@+id/file_listtop"
android:layout_marginLeft="@dimen/default_margin"
android:layout_marginStart="@dimen/default_margin"
android:layout_marginRight="@dimen/default_margin"
android:layout_marginEnd="@dimen/default_margin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/KeepassDXStyle.TextAppearance.Title"
android:text="@string/open_recent" />
<ListView
android:id="@+id/file_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/file_listtop" />
<android.support.design.widget.FloatingActionButton <android.support.design.widget.FloatingActionButton
android:id="@+id/create_database" android:id="@+id/open_database"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_marginStart="24dp"
android:layout_alignParentRight="true" android:layout_marginLeft="24dp"
android:layout_alignParentBottom="true" android:layout_marginEnd="24dp"
android:src="@drawable/ic_database_plus_white_24dp" android:layout_marginRight="24dp"
style="@style/KeepassDXStyle.Fab"/> android:paddingTop="-20dp"
app:fabSize="mini"
app:layout_anchor="@id/filename_container"
app:layout_anchorGravity="bottom|end"
android:src="@drawable/ic_open_folder_white_24dp" />
</RelativeLayout> <LinearLayout
</android.support.design.widget.CoordinatorLayout> app:layout_behavior="@string/appbar_scrolling_view_behavior"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView android:id="@+id/file_listtop"
android:layout_marginTop="@dimen/default_margin"
android:layout_marginLeft="@dimen/default_margin"
android:layout_marginStart="@dimen/default_margin"
android:layout_marginRight="@dimen/default_margin"
android:layout_marginEnd="@dimen/default_margin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/KeepassDXStyle.TextAppearance.Title"
android:text="@string/open_recent" />
<ListView
android:id="@+id/file_list"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
</android.support.design.widget.CoordinatorLayout>
<android.support.design.widget.FloatingActionButton
android:id="@+id/create_database"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:src="@drawable/ic_database_plus_white_24dp"
style="@style/KeepassDXStyle.Fab"/>
</RelativeLayout>

4
app/src/main/res/layout/file_selection_filename.xml
View File

@@ -36,7 +36,7 @@
android:layout_marginStart="@dimen/default_margin" android:layout_marginStart="@dimen/default_margin"
android:layout_marginRight="@dimen/default_margin" android:layout_marginRight="@dimen/default_margin"
android:layout_marginEnd="@dimen/default_margin" android:layout_marginEnd="@dimen/default_margin"
android:layout_marginBottom="12dp"> android:layout_marginBottom="22dp">
<TextView android:id="@+id/label_warning" <TextView android:id="@+id/label_warning"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -47,7 +47,7 @@
<TextView android:id="@+id/label_open_by_filename" <TextView android:id="@+id/label_open_by_filename"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/KeepassDXStyle.TextAppearance.Title" style="@style/KeepassDXStyle.TextAppearance.Inverse"
android:text="@string/enter_filename"/> android:text="@string/enter_filename"/>
<android.support.v7.widget.AppCompatImageView <android.support.v7.widget.AppCompatImageView