Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

UI updates: About, Password Generator view, added string, rounded… #418

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

UI updates: About, Password Generator view, added string, rounded… #418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .idea/.name
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .idea/modules.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 0 additions & 19 deletions KeePassDroid.iml
View file
Open in desktop

This file was deleted.

10 changes: 5 additions & 5 deletions app/app.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="keepassdroid" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
<option name="GRADLE_PROJECT_PATH" value=":app" />
<option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.6.3" />
<option name="LAST_KNOWN_AGP_VERSION" value="3.6.3" />
<option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="4.0.1" />
<option name="LAST_KNOWN_AGP_VERSION" value="4.0.1" />
</configuration>
</facet>
<facet type="android" name="Android">
Expand All @@ -19,8 +19,8 @@
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/androidTest/res" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/src/general/res;file://$MODULE_DIR$/src/debug/res;file://$MODULE_DIR$/src/generalDebug/res;file://$MODULE_DIR$/build/generated/res/rs/general/debug" />
<option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/androidTest/res;file://$MODULE_DIR$/src/test/res;file://$MODULE_DIR$/src/androidTestGeneral/res;file://$MODULE_DIR$/src/testGeneral/res;file://$MODULE_DIR$/src/androidTestDebug/res;file://$MODULE_DIR$/src/testDebug/res;file://$MODULE_DIR$/build/generated/res/rs/androidTest/general/debug" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
</configuration>
</facet>
Expand Down
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/rounded_buttons.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item >
<shape android:shape="rectangle" >
<corners android:radius="3dip" />
<stroke android:width="1dip" android:color="#EE7974" />
</shape>
</item>
</selector>
24 changes: 24 additions & 0 deletions app/src/main/res/drawable/rounded_buttons_green.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" >
<shape android:shape="rectangle" >
<corners android:radius="3dip" />
<stroke android:width="1dip" android:color="#5e7974" />
<gradient android:angle="-90" android:startColor="#345953" android:endColor="#689a92" />
</shape>
</item>
<item android:state_focused="true">
<shape android:shape="rectangle" >
<corners android:radius="3dip" />
<stroke android:width="1dip" android:color="#5e7974" />
<solid android:color="#58857e"/>
</shape>
</item>
<item >
<shape android:shape="rectangle" >
<corners android:radius="3dip" />
<stroke android:width="1dip" android:color="#5e7974" />
<gradient android:angle="-90" android:startColor="#8dbab3" android:endColor="#58857e" />
</shape>
</item>
</selector>
40 changes: 32 additions & 8 deletions app/src/main/res/layout/about.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,22 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
android:layout_height="fill_parent"
android:padding="@dimen/margin_medium">
<TextView android:id="@+id/about_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/AboutText"/>
<ImageView android:id="@+id/divider1"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_height="2dp"
android:layout_below="@id/about_title"
android:layout_marginStart="@dimen/margin_small"
android:layout_marginLeft="@dimen/margin_small"
android:layout_marginEnd="@dimen/margin_small"
android:layout_marginRight="@dimen/margin_small"
android:layout_marginTop="@dimen/margin_small"
android:layout_marginBottom="@dimen/margin_small"
android:scaleType="fitXY"
tools:ignore="ContentDescription"
android:src="@android:drawable/divider_horizontal_dark"/>
Expand All @@ -41,11 +48,18 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/divider1"
android:layout_alignParentRight="true"/>
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true" />
<ImageView android:id="@+id/divider2"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_height="2dp"
android:layout_below="@id/version_title"
android:layout_marginStart="@dimen/margin_small"
android:layout_marginLeft="@dimen/margin_small"
android:layout_marginEnd="@dimen/margin_small"
android:layout_marginRight="@dimen/margin_small"
android:layout_marginTop="@dimen/margin_small"
android:layout_marginBottom="@dimen/margin_small"
android:scaleType="fitXY"
tools:ignore="ContentDescription"
android:src="@android:drawable/divider_horizontal_dark"/>
Expand All @@ -59,7 +73,8 @@
android:text="@string/homepage_short"
android:layout_below="@id/divider2"
android:layout_alignParentRight="true"
android:autoLink="web"/>
android:autoLink="web"
android:layout_alignParentEnd="true" />
<TextView android:id="@+id/feedback"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand All @@ -70,7 +85,8 @@
android:text="@string/issues"
android:layout_below="@id/homepage"
android:layout_alignParentRight="true"
android:autoLink="web"/>
android:autoLink="web"
android:layout_alignParentEnd="true" />
<TextView android:id="@+id/Twitter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand All @@ -81,12 +97,19 @@
android:text="@string/twitter"
android:layout_below="@id/feedback"
android:layout_alignParentRight="true"
android:autoLink="web"/>
android:autoLink="web"
android:layout_alignParentEnd="true" />
<ImageView android:id="@+id/divider3"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_height="2dp"
android:layout_below="@id/Twitter"
android:scaleType="fitXY"
android:layout_marginStart="@dimen/margin_small"
android:layout_marginLeft="@dimen/margin_small"
android:layout_marginEnd="@dimen/margin_small"
android:layout_marginRight="@dimen/margin_small"
android:layout_marginTop="@dimen/margin_small"
android:layout_marginBottom="@dimen/margin_small"
tools:ignore="ContentDescription"
android:src="@android:drawable/divider_horizontal_dark"/>
<TextView android:id="@+id/disclaimer"
Expand All @@ -98,6 +121,7 @@
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_below="@id/disclaimer"
android:layout_marginTop="@dimen/margin_medium"
android:layout_centerHorizontal="true"
android:text="@android:string/ok"
android:width="100sp"/>
Expand Down
7 changes: 7 additions & 0 deletions app/src/main/res/layout/entry_edit.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:padding="@dimen/margin_medium"
xmlns:app="http://schemas.android.com/apk/res-auto">

<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
Expand All @@ -29,21 +31,25 @@
android:elevation="4dp"
android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
app:popupTheme="@style/ThemeOverlay.AppCompat" />

<Button android:id="@+id/entry_save"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:text="@string/entry_save"/>

<Button android:id="@+id/entry_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_toRightOf="@id/entry_save"
android:text="@string/entry_cancel"/>

<View android:id="@+id/entry_divider"
android:layout_above="@id/entry_save"
android:scaleType="fitXY"
style="@style/DividerEntry"/>

<com.keepassdroid.view.NoFocusScrollView android:id="@+id/entry_scroll"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
Expand Down Expand Up @@ -189,4 +195,5 @@
/>
</RelativeLayout>
</com.keepassdroid.view.NoFocusScrollView>

</RelativeLayout>
Loading