diff --git a/android/app/src/main/res/layout-land/activity_home.xml b/android/app/src/main/res/layout-land/activity_home.xml index aa7603b6..d669f3e7 100644 --- a/android/app/src/main/res/layout-land/activity_home.xml +++ b/android/app/src/main/res/layout-land/activity_home.xml @@ -15,30 +15,29 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + + + app:layout_constraintTop_toBottomOf="@id/toolbar_home"> - - + android:textAppearance="@style/TextAppearance.Poke.TitleBold" + android:textSize="@dimen/home_tv_size" /> @@ -99,7 +99,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:layout_row="0" - android:layout_column="1" + android:layout_column="0" android:layout_columnWeight="1" android:layout_gravity="fill" android:layout_margin="6dp" @@ -116,8 +116,8 @@ + android:textAppearance="@style/TextAppearance.Poke.TitleBold" + android:textSize="@dimen/home_tv_size" /> @@ -136,7 +137,7 @@ android:layout_width="0dp" android:layout_height="0dp" android:layout_row="0" - android:layout_column="2" + android:layout_column="4" android:layout_columnWeight="1" android:layout_gravity="fill" android:layout_margin="6dp" @@ -153,8 +154,8 @@ + android:textAppearance="@style/TextAppearance.Poke.TitleBold" + android:textSize="@dimen/home_tv_size" /> + + + + + + + + + + + android:id="@+id/iv_home_land_battle" + android:layout_width="@dimen/home_iv_width" + android:layout_height="@dimen/home_iv_height" + android:src="@drawable/icon_home_battle" /> + android:textAppearance="@style/TextAppearance.Poke.TitleBold" + android:textSize="@dimen/home_tv_size" /> @@ -221,6 +262,6 @@ app:layout_constraintGuide_end="25dp" /> - + diff --git a/android/app/src/main/res/layout/activity_home.xml b/android/app/src/main/res/layout/activity_home.xml index c63188f3..19be742f 100644 --- a/android/app/src/main/res/layout/activity_home.xml +++ b/android/app/src/main/res/layout/activity_home.xml @@ -58,8 +58,8 @@ @@ -102,8 +103,8 @@ @@ -145,8 +147,8 @@ @@ -190,8 +193,8 @@ @@ -232,8 +236,8 @@ @@ -273,94 +278,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + 250dp + 250dp + 100dp + 100dp + 42dp + 42dp + 24sp + 100dp + + + diff --git a/android/app/src/main/res/values/dimens.xml b/android/app/src/main/res/values/dimens.xml new file mode 100644 index 00000000..0d4a5c35 --- /dev/null +++ b/android/app/src/main/res/values/dimens.xml @@ -0,0 +1,14 @@ + + + + 150dp + 150dp + 60dp + 60dp + 24dp + 25dp + 15sp + 20dp + + +