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

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

146
app/src/main/res/layout-land/welcome_do_upload.xml
View file

@ -1,85 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
<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:gravity="center"
android:orientation="horizontal">
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.55" />
<GridLayout
android:layout_width="300dp"
<ImageView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginBottom="8dp"
android:layout_marginTop="8dp"
android:columnCount="2"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toStartOf="@id/center_guideline">
<ImageView
android:id="@+id/mount_zao"
android:layout_width="150dp"
android:layout_height="118dp"
android:contentDescription="@string/welcome_image_mount_zao"
android:scaleType="fitXY"
android:src="@drawable/mount_zao" />
<ImageView
android:id="@+id/llamas"
android:layout_width="150dp"
android:layout_height="118dp"
android:contentDescription="@string/welcome_image_llamas"
android:scaleType="fitXY"
android:src="@drawable/llamas" />
<ImageView
android:id="@+id/rainbow_bridge"
android:layout_width="150dp"
android:layout_height="118dp"
android:contentDescription="@string/welcome_image_rainbow_bridge"
android:scaleType="fitXY"
android:src="@drawable/rainbow_bridge" />
<ImageView
android:id="@+id/tulip"
android:layout_width="150dp"
android:layout_height="118dp"
android:contentDescription="@string/welcome_image_tulip"
android:scaleType="fitXY"
android:src="@drawable/tulip" />
</GridLayout>
android:layout_marginRight="@dimen/large_gap"
android:layout_weight="0.5"
android:adjustViewBounds="true"
android:contentDescription="@string/welcome_do_upload_content_description"
android:src="@drawable/welcome_do_upload" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="vertical"
android:layout_marginStart="@dimen/standard_gap"
android:layout_marginLeft="@dimen/standard_gap"
app:layout_constraintStart_toEndOf="@id/center_guideline"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent">
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_2_text"
android:textAlignment="center"
android:textColor="@android:color/white"
@ -87,88 +34,47 @@
android:textStyle="bold" />
<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: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_2_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_2_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: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_2_subtext_3"
android:textAlignment="textStart"
android:textColor="@android:color/white" />
</LinearLayout>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>

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>

85
app/src/main/res/layout-land/welcome_final.xml
View file

@ -1,85 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/tutorialBackground"
>
<TextView
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_marginBottom="@dimen/large_gap"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/welcomeInfo"
android:layout_gravity="end|top"
android:layout_marginTop="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap"
android:layout_marginEnd="@dimen/standard_gap"
android:textSize="@dimen/normal_text"
android:textColor="@android:color/white"
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:gravity="center">
<!-- Sorry about the hardcoded sizes here. They're image-related. -->
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="180dp"
android:gravity="center_horizontal">
<ImageView
android:layout_width="150dp"
android:layout_height="180dp"
android:src="@drawable/welcome_wikipedia"
android:contentDescription="@string/welcome_image_welcome_wikipedia"
/>
<ImageView
android:layout_width="160dp"
android:layout_height="120dp"
android:layout_gravity="center"
android:src="@drawable/welcome_copyright"
android:contentDescription="@string/welcome_image_proprietary"
/>
</LinearLayout>
<LinearLayout android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxWidth="240dp"
android:text="@string/welcome_final_text"
android:layout_gravity="center"
android:textStyle="bold"
android:textSize="@dimen/normal_text"
android:textAlignment="center"
android:gravity="center_horizontal"
android:textColor="@android:color/white"/>
<Button
android:layout_width="120dp"
android:layout_height="@dimen/overflow_button_dimen"
android:layout_marginTop="@dimen/standard_gap"
android:text="@string/welcome_final_button_text"
android:id="@+id/finishTutorialButton"
android:layout_gravity="center"
android:background="@android:color/white"
android:textColor="#0c609c"
android:textStyle="bold"
/>
</LinearLayout>
</LinearLayout>
</RelativeLayout>

138
app/src/main/res/layout-land/welcome_image_details.xml
View file

@ -1,138 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/tutorialBackground"
android:gravity="center"
android:orientation="horizontal">
<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.60" />
<ImageView
android:layout_width="370dp"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:contentDescription="@string/welcome_image_sydney_opera_house"
android:paddingBottom="@dimen/large_gap"
android:paddingLeft="@dimen/tiny_gap"
android:paddingStart="@dimen/tiny_gap"
android:paddingRight="@dimen/standard_gap"
android:paddingEnd="@dimen/standard_gap"
android:paddingTop="@dimen/large_gap"
android:src="@drawable/sydney_opera_house"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/center_guideline"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_marginEnd="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap"
app:layout_constraintStart_toEndOf="@id/center_guideline"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center_horizontal"
android:maxWidth="240dp"
android:text="@string/tutorial_4_text"
android:textAlignment="center"
android:textColor="@android:color/white"
android:textSize="@dimen/normal_text"
android:textStyle="bold" />
<LinearLayout
android:layout_width="wrap_content"
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" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="start"
android:maxWidth="240dp"
android:paddingTop="@dimen/standard_gap"
android:text="@string/tutorial_4_subtext_1"
android:textAlignment="textStart"
android:textColor="@android:color/white" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
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" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="start"
android:maxWidth="240dp"
android:text="@string/tutorial_4_subtext_2"
android:textAlignment="textStart"
android:textColor="@android:color/white" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
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" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="start"
android:maxWidth="240dp"
android:text="@string/tutorial_4_subtext_3"
android:textAlignment="textStart"
android:textColor="@android:color/white" />
</LinearLayout>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

80
app/src/main/res/layout-land/welcome_image_example.xml Normal file
View file

@ -0,0 +1,80 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/tutorialBackground"
android:gravity="center"
android:paddingLeft="@dimen/huge_gap"
android:paddingRight="@dimen/huge_gap">
<ImageView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/large_gap"
android:layout_weight="0.5"
android:adjustViewBounds="true"
android:contentDescription="@string/welcome_image_sydney_opera_house"
android:src="@drawable/welcome_image_example" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="0.5"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/standard_gap"
android:layout_marginBottom="@dimen/standard_gap"
android:text="@string/tutorial_4_text"
android:textAlignment="center"
android:textColor="@android:color/white"
android:textSize="@dimen/normal_text"
android:textStyle="bold" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<include layout="@layout/welcome_bullet" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/tutorial_4_subtext_1"
android:textColor="@android:color/white" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<include layout="@layout/welcome_bullet" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/tutorial_4_subtext_2"
android:textColor="@android:color/white" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<include layout="@layout/welcome_bullet" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/tutorial_4_subtext_3"
android:textColor="@android:color/white" />
</LinearLayout>
</LinearLayout>
</LinearLayout>

52
app/src/main/res/layout-land/welcome_wikipedia.xml
View file

@ -1,47 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/tutorialBackground">
<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" />
android:background="?attr/tutorialBackground"
android:gravity="center"
android:paddingLeft="@dimen/huge_gap"
android:paddingRight="@dimen/huge_gap">
<ImageView
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap"
android:layout_marginRight="@dimen/large_gap"
android:layout_weight="0.5"
android:adjustViewBounds="true"
android:contentDescription="@string/welcome_image_welcome_wikipedia"
android:src="@drawable/welcome_wikipedia"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/center_guideline"
app:layout_constraintTop_toTopOf="parent" />
android:src="@drawable/welcome_wikipedia" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/standard_gap"
android:layout_marginStart="@dimen/standard_gap"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/center_guideline"
app:layout_constraintTop_toTopOf="parent">
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:gravity="center_horizontal"
android:maxWidth="240dp"
android:layout_marginTop="@dimen/standard_gap"
android:layout_marginBottom="@dimen/standard_gap"
android:text="@string/tutorial_1_text"
android:textAlignment="center"
android:textColor="@android:color/white"
@ -51,11 +36,10 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:maxWidth="240dp"
android:paddingTop="@dimen/standard_gap"
android:text="@string/tutorial_1_subtext"
android:textAlignment="center"
android:textColor="@android:color/white" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>