mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-26 12:23:58 +01:00
f79456ec8e
* Update WelcomeActivity.java Now it starts welcome screen after not finishing the pager. Moved "Skip Tutorial" button here so it does not animate by swipe. * Update activity_welcome.xml Putting "Skip Tutorial" button here so that it does not animate by swipes. * Update LoginActivity.java Removing the set of "first run " flag from here. we set it after the buttons press or on WelcomeActivity's finish() * Update welcome_do_upload.xml removing "skip tut" button from here. * Update welcome_dont_upload.xml Removing "Skip Tutorial" button from here so that it does not animate by swipes. * Update welcome_image_details.xml Removing "Skip Tutorial" button from here so that it does not animate by swipes. * Update welcome_wikipedia.xml Removing "Skip Tutorial" button from here so that it does not animate by swipes. * Update WelcomePagerAdapter.java the "welcomyesButton" is removed from the child views in pager, so it is optional now. * Add JavaDoc to WelcomeActivity.onBackPressed() * Fix #2103: Remove welcomeYesButton from landscape layout * Refactor WelcomePagerAdapter
85 lines
No EOL
3.2 KiB
XML
85 lines
No EOL
3.2 KiB
XML
<?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="#0c609c"
|
|
|
|
>
|
|
<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> |