kumi/andOTP
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make all card styles more consistent

Browse source
This commit is contained in:
Jakob Nixdorf 2018-04-04 13:08:33 +02:00
parent 2b319149da
commit 5259a492f8
No known key found for this signature in database
GPG key ID: BE99BF86574A7DBC
5 changed files with 42 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/res/layout/component_card.xml
View file

@ -5,6 +5,8 @@
android:id="@+id/card_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/activity_margin_xsmall"
android:layout_marginBottom="@dimen/activity_margin_xsmall"
app:contentPadding="0dp"
style="?attr/cardStyle">

3
app/src/main/res/layout/content_main.xml
View file

@ -19,6 +19,9 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentStart="true"
android:paddingStart="@dimen/activity_margin_small"
android:paddingEnd="@dimen/activity_margin_small"
android:paddingTop="@dimen/activity_margin_xsmall"
android:paddingBottom="@dimen/fab_recyclerview_padding"
android:clipToPadding="false" />

31
app/src/main/res/layout/fragment_about.xml
View file

@ -1,22 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.NestedScrollView
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/scroll_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:overScrollMode="never"
app:layout_behavior="@string/appbar_scrolling_view_behavior" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="@dimen/activity_margin"
android:clipToPadding="false"
android:orientation="vertical" >
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/activity_margin"
android:layout_marginTop="@dimen/activity_margin_small"
android:layout_marginBottom="@dimen/activity_margin_small"
style="?attr/cardStyle" >
<LinearLayout
@ -60,7 +62,8 @@
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/activity_margin"
android:layout_marginTop="@dimen/activity_margin_small"
android:layout_marginBottom="@dimen/activity_margin_small"
style="?attr/cardStyle" >
<LinearLayout
@ -211,7 +214,8 @@
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/activity_margin"
android:layout_marginTop="@dimen/activity_margin_small"
android:layout_marginBottom="@dimen/activity_margin_small"
style="?attr/cardStyle" >
<LinearLayout
@ -278,8 +282,8 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/divider"
android:layout_height="1px"
android:background="?attr/about_libraries_dividerLight_openSource"
android:layout_margin="@dimen/activity_margin" />
<!-- Original author -->
@ -336,8 +340,8 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/divider"
android:layout_height="1px"
android:background="?attr/about_libraries_dividerLight_openSource"
android:layout_margin="@dimen/activity_margin" />
<!-- Original author -->
@ -394,8 +398,8 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/divider"
android:layout_height="1px"
android:background="?attr/about_libraries_dividerLight_openSource"
android:layout_margin="@dimen/activity_margin" />
<!-- contributors -->
@ -460,7 +464,8 @@
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/activity_margin"
android:layout_marginTop="@dimen/activity_margin_small"
android:layout_marginBottom="@dimen/activity_margin_small"
style="?attr/cardStyle" >
<LinearLayout
@ -560,4 +565,4 @@
</android.support.v7.widget.CardView>
</LinearLayout>
</android.support.v4.widget.NestedScrollView>
</ScrollView>

2
app/src/main/res/values/dimens.xml
View file

@ -1,5 +1,6 @@
<resources>
<!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="activity_margin_xsmall">4dp</dimen>
<dimen name="activity_margin_small">8dp</dimen>
<dimen name="activity_margin">16dp</dimen>
<dimen name="activity_margin_medium">24dp</dimen>
@ -8,7 +9,6 @@
<dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="card_corner_radius">2dp</dimen>
<dimen name="card_padding_without_corners">14dp</dimen>
<dimen name="card_thumbnail_size">46dp</dimen>

20
app/src/main/res/values/styles.xml
View file

@ -27,6 +27,12 @@
<item name="thumbnailBackground">@android:color/transparent</item>
<item name="cardStyle">@style/CardViewStyle</item>
<item name="about_libraries_card">@color/cardview_light_background</item>
<item name="about_libraries_title_openSource">@color/about_libraries_text_openSource</item>
<item name="about_libraries_text_openSource">@color/about_libraries_text_openSource</item>
<item name="about_libraries_dividerDark_openSource">@color/about_libraries_dividerDark_openSource</item>
<item name="about_libraries_dividerLight_openSource">@color/about_libraries_dividerLight_openSource</item>
</style>
<style name="AppTheme.NoActionBar">
@ -35,8 +41,6 @@
</style>
<style name="CardViewStyle" parent="CardView">
<item name="cardCornerRadius">@dimen/card_corner_radius</item>
<item name="cardUseCompatPadding">true</item>
<item name="contentPadding">@dimen/activity_margin</item>
</style>
@ -53,6 +57,12 @@
<item name="colorPaypal">@color/paypal_light</item>
<item name="cardStyle">@style/CardViewStyle</item>
<item name="about_libraries_card">@color/cardview_dark_background</item>
<item name="about_libraries_title_openSource">@color/about_libraries_text_openSource_dark</item>
<item name="about_libraries_text_openSource">@color/about_libraries_text_openSource_dark</item>
<item name="about_libraries_dividerDark_openSource">@color/about_libraries_dividerDark_openSource_dark</item>
<item name="about_libraries_dividerLight_openSource">@color/about_libraries_dividerLight_openSource_dark</item>
</style>
<style name="AppTheme.Dark.NoActionBar">
@ -73,6 +83,12 @@
<item name="colorPaypal">@color/paypal_light</item>
<item name="cardStyle">@style/CardViewStyle.Black</item>
<item name="about_libraries_card">@android:color/black</item>
<item name="about_libraries_title_openSource">@color/about_libraries_text_openSource_dark</item>
<item name="about_libraries_text_openSource">@color/about_libraries_text_openSource_dark</item>
<item name="about_libraries_dividerDark_openSource">@color/about_libraries_dividerDark_openSource_dark</item>
<item name="about_libraries_dividerLight_openSource">@color/about_libraries_dividerLight_openSource_dark</item>
</style>
<style name="CardViewStyle.Black">