diff --git a/app/src/main/res/layout/activity_donate.xml b/app/src/main/res/layout/activity_donate.xml index 5b055a8..82b0123 100644 --- a/app/src/main/res/layout/activity_donate.xml +++ b/app/src/main/res/layout/activity_donate.xml @@ -1,7 +1,6 @@ @@ -13,7 +12,7 @@ app:liftOnScroll="true"> @@ -24,20 +23,49 @@ android:layout_height="?attr/actionBarSize" app:layout_collapseMode="pin" app:navigationIcon="@drawable/ic_arrow_back" - app:title="@string/help_donate" /> + app:title="@string/help_donate" + app:titleCentered="@bool/titleCentered" /> - + app:layout_behavior="@string/appbar_scrolling_view_behavior"> + + + + + + + + + + + @@ -13,7 +12,7 @@ app:liftOnScroll="true"> @@ -24,7 +23,8 @@ android:layout_height="?attr/actionBarSize" app:layout_collapseMode="pin" app:navigationIcon="@drawable/ic_arrow_back" - app:title="@string/help_test" /> + app:title="@string/help_test" + app:titleCentered="@bool/titleCentered" /> @@ -37,32 +37,42 @@ android:clipToPadding="false" app:layout_behavior="@string/appbar_scrolling_view_behavior"> - + android:layout_height="wrap_content"> - + android:clipToPadding="false" + android:orientation="vertical" + android:paddingTop="16dp" + android:paddingBottom="16dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintWidth_max="@dimen/sheetMaxWidth"> - + + + - + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 52e68da..ceca900 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -13,7 +13,7 @@ app:liftOnScroll="true"> @@ -23,7 +23,8 @@ android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" app:layout_collapseMode="pin" - app:title="@string/app_name" /> + app:title="@string/app_name" + app:titleCentered="@bool/titleCentered" /> @@ -42,16 +43,16 @@ + app:layout_constraintWidth_max="@dimen/sheetMaxWidth"> Разработка и поддержка приложения может быть остановлена навсегда. Мой дом сейчас под обстрелом российской армией. Выходите на улицы, что бы остановить войну! Что происходит? - https://www.youtube.com/watch?v=9F5ZmLhIy8E diff --git a/app/src/main/res/values-w580dp/dimens.xml b/app/src/main/res/values-w580dp/dimens.xml deleted file mode 100644 index f966f23..0000000 --- a/app/src/main/res/values-w580dp/dimens.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - 16dp - diff --git a/app/src/main/res/values-w640dp/styles.xml b/app/src/main/res/values-w640dp/styles.xml new file mode 100644 index 0000000..a88d84a --- /dev/null +++ b/app/src/main/res/values-w640dp/styles.xml @@ -0,0 +1,11 @@ + + + + + + true + + diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 03efaab..a2cda25 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -2,6 +2,7 @@ 56dp 0dp + 640dp 16dp 24dp diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 227c464..53156b6 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -23,4 +23,11 @@ + + + false +