tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

About activity cards now have 8dp padding instead of 16dp.

Browse source
This commit is contained in:
Karim Abou Zeid 2015-09-24 17:52:25 +02:00
commit 5d4ed7af50
3 changed files with 20 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

28
app/src/main/res/layout-w640dp/activity_about_content.xml
View file

@ -3,10 +3,12 @@
xmlns:grid="http://schemas.android.com/apk/res-auto" xmlns:grid="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="wrap_content"
android:padding="16dp" android:padding="8dp"
grid:alignmentMode="alignBounds"> grid:alignmentMode="alignBounds">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_marginEnd="4dp"
android:layout_marginRight="4dp"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
@ -17,24 +19,19 @@
<include <include
layout="@layout/card_about_app" layout="@layout/card_about_app"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" />
<include
layout="@layout/card_support_development"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" /> android:layout_marginBottom="8dp" />
<include layout="@layout/card_support_development" />
</LinearLayout> </LinearLayout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_marginStart="4dp"
android:layout_marginLeft="4dp"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingEnd="0dp"
android:paddingLeft="16dp"
android:paddingRight="0dp"
android:paddingStart="16dp"
grid:layout_column="1" grid:layout_column="1"
grid:layout_columnWeight="1" grid:layout_columnWeight="1"
grid:layout_row="0"> grid:layout_row="0">
@ -42,13 +39,10 @@
<include <include
layout="@layout/card_author" layout="@layout/card_author"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" />
<include
layout="@layout/card_special_thanks"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" /> android:layout_marginBottom="8dp" />
<include layout="@layout/card_special_thanks" />
</LinearLayout> </LinearLayout>

18
app/src/main/res/layout/activity_about_content.xml
View file

@ -3,26 +3,26 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:padding="16dp"> android:padding="8dp">
<include layout="@layout/card_about_app" /> <include
layout="@layout/card_about_app"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp" />
<include <include
layout="@layout/card_author" layout="@layout/card_author"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" /> android:layout_marginBottom="8dp" />
<include <include
layout="@layout/card_support_development" layout="@layout/card_support_development"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="16dp" /> android:layout_marginBottom="8dp" />
<include <include layout="@layout/card_special_thanks" />
layout="@layout/card_special_thanks"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp" />
</LinearLayout> </LinearLayout>

1
app/src/main/res/layout/card_special_thanks.xml
View file

@ -4,7 +4,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginTop="16dp"
app:cardBackgroundColor="?cardBackgroundColor" app:cardBackgroundColor="?cardBackgroundColor"
app:cardUseCompatPadding="true"> app:cardUseCompatPadding="true">