Open button expanded and add small text

This commit is contained in:
J-Jamet
2018-04-17 14:09:44 +02:00
parent 2c16fe3335
commit 7c9153ea04
4 changed files with 16 additions and 14 deletions

View File

@@ -6,12 +6,12 @@
<item> <item>
<shape> <shape>
<corners <corners
android:radius="2dp" /> android:radius="0dp" />
<padding <padding
android:left="0dp" android:left="0dp"
android:right="0dp" android:right="0dp"
android:top="8dp" android:top="12dp"
android:bottom="8dp"/> android:bottom="12dp"/>
<solid android:color="?attr/colorAccentCompat"/> <solid android:color="?attr/colorAccentCompat"/>
</shape> </shape>
</item> </item>

View File

@@ -3,12 +3,12 @@
<item> <item>
<shape> <shape>
<corners <corners
android:radius="2dp" /> android:radius="0dp" />
<padding <padding
android:left="0dp" android:left="0dp"
android:right="0dp" android:right="0dp"
android:top="8dp" android:top="12dp"
android:bottom="8dp"/> android:bottom="12dp"/>
<solid android:color="@color/orange"/> <solid android:color="@color/orange"/>
</shape> </shape>
</item> </item>

View File

@@ -130,6 +130,7 @@
<!-- File Input --> <!-- File Input -->
<RelativeLayout <RelativeLayout
android:id="@+id/container_key_file"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
@@ -173,9 +174,9 @@
<android.support.v7.widget.SwitchCompat <android.support.v7.widget.SwitchCompat
android:id="@+id/default_database" android:id="@+id/default_database"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/KeepassDXStyle.TextAppearance.Default" style="@style/KeepassDXStyle.TextAppearance.Small"
android:layout_margin="16dp" android:layout_margin="16dp"
android:text="@string/default_checkbox" /> android:text="@string/default_checkbox" />
@@ -187,15 +188,13 @@
<android.support.v7.widget.AppCompatButton <android.support.v7.widget.AppCompatButton
android:id="@+id/pass_ok" android:id="@+id/pass_ok"
android:layout_marginRight="@dimen/default_margin" android:layout_width="wrap_content"
android:layout_marginEnd="@dimen/default_margin"
android:layout_marginTop="@dimen/default_margin"
android:layout_marginBottom="@dimen/default_margin"
android:layout_width="100sp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentRight="true" android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:text="@string/menu_open" /> android:text="@string/menu_open" />
</RelativeLayout> </RelativeLayout>

View File

@@ -185,6 +185,9 @@
<style name="KeepassDXStyle.TextAppearance.Default" parent="KeepassDXStyle.TextAppearance"> <style name="KeepassDXStyle.TextAppearance.Default" parent="KeepassDXStyle.TextAppearance">
<item name="android:textSize">16sp</item> <item name="android:textSize">16sp</item>
</style> </style>
<style name="KeepassDXStyle.TextAppearance.Small" parent="KeepassDXStyle.TextAppearance">
<item name="android:textSize">14sp</item>
</style>
<style name="KeepassDXStyle.TextAppearance.Large" parent="KeepassDXStyle.TextAppearance"> <style name="KeepassDXStyle.TextAppearance.Large" parent="KeepassDXStyle.TextAppearance">
<item name="android:textSize">18sp</item> <item name="android:textSize">18sp</item>
</style> </style>