mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-29 22:03:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify welcome layouts (#2741)

Browse source 
* Simplify welcome layouts

* Add landscape layouts

* Reformat welcome layouts

* Rename string resources
This commit is contained in:
Adam Jones 2019-04-16 10:35:42 +01:00 • committed by neslihanturan
parent fb0d025f33
commit 5d299b1511
24 changed files with 331 additions and 925 deletions
Download patch file Download diff file Expand all files Collapse all files

124
app/src/main/res/layout-land/welcome_dont_upload.xml
View file

@ -1,62 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="?attr/tutorialBackground">
android:background="?attr/tutorialBackground"
android:gravity="center"
android:paddingLeft="@dimen/huge_gap"
android:paddingRight="@dimen/huge_gap">
<androidx.constraintlayout.widget.Guideline
android:id="@+id/center_guideline"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.50" />
<LinearLayout
android:layout_width="240dp"
<ImageView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="center_vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/center_guideline"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginEnd="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap">
<ImageView
android:id="@+id/selfie_x"
android:layout_width="110dp"
android:layout_height="wrap_content"
android:contentDescription="@string/welcome_image_no_selfies"
android:src="@drawable/selfie_x" />
<ImageView
android:id="@+id/proprietary_x"
android:layout_width="110dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/standard_gap"
android:layout_marginStart="@dimen/standard_gap"
android:contentDescription="@string/welcome_image_proprietary"
android:src="@drawable/proprietary_x" />
</LinearLayout>
android:layout_marginRight="@dimen/large_gap"
android:layout_weight="0.5"
android:adjustViewBounds="true"
android:contentDescription="@string/welcome_dont_upload_content_description"
android:src="@drawable/welcome_dont_upload" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/center_guideline"
app:layout_constraintTop_toTopOf="parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.5"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center_horizontal"
android:maxWidth="240dp"
android:layout_marginTop="@dimen/standard_gap"
android:layout_marginBottom="@dimen/standard_gap"
android:text="@string/tutorial_3_text"
android:textAlignment="center"
android:textColor="@android:color/white"
@ -64,86 +34,48 @@
android:textStyle="bold" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="4dp"
android:paddingTop="@dimen/standard_gap"
android:text="@string/bullet"
android:textColor="@android:color/white"
android:textSize="16sp" />
<include layout="@layout/welcome_bullet" />
<TextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="start"
android:maxWidth="240dp"
android:paddingTop="@dimen/standard_gap"
android:text="@string/tutorial_3_subtext_1"
android:textAlignment="textStart"
android:textColor="@android:color/white" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:maxWidth="240dp"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="4dp"
android:text="@string/bullet"
android:textColor="@android:color/white"
android:textSize="16sp" />
<include layout="@layout/welcome_bullet" />
<TextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="start"
android:maxWidth="240dp"
android:text="@string/tutorial_3_subtext_2"
android:textAlignment="textStart"
android:textColor="@android:color/white" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingRight="4dp"
android:text="@string/bullet"
android:textColor="@android:color/white"
android:textSize="16sp" />
<include layout="@layout/welcome_bullet" />
<TextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="start"
android:maxWidth="240dp"
android:text="@string/tutorial_3_subtext_3"
android:textAlignment="textStart"
android:textColor="@android:color/white" />
</LinearLayout>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>