Commit 586e96c2 authored by Igor Oliveira's avatar Igor Oliveira Committed by Georg Koppen
Browse files

Bug 25696 - Implement alpha onboarding for Tor Browser for Android 

- FirstrunTorPagerConfig.java: Create file that sets up all the views
in the pager.

- FirstrunPager.java: Update code to use the FirstrunTorPagerConfig.

- FirstrunLastPanel.java: Create view that adds a close handler in the
latest pager view.
parent 4d65de4b

mobile/android/app/src/main/res/layout/firstrun_animation_container.xml

+5 −5
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
             xmlns:gecko="http://schemas.android.com/apk/res-auto"

             android:layout_height="match_parent"

             android:layout_width="match_parent"

             android:background="@color/dark_transparent_overlay">

             android:background="@android:color/white">



    <org.mozilla.gecko.firstrun.FirstrunPager

                    android:id="@+id/firstrun_pager"
@@ -18,12 +18,12 @@ 


        <org.mozilla.gecko.home.TabMenuStrip android:layout_width="match_parent"

                                             android:layout_height="@dimen/tabs_strip_height"

                                             android:background="@color/firstrun_pager_header"

                                             android:background="@android:color/white"

                                             android:visibility="visible"

                                             android:layout_gravity="top"

                                             gecko:strip="@drawable/home_tab_menu_strip"

                                             gecko:activeTextColor="@color/placeholder_grey"

                                             gecko:inactiveTextColor="@color/tab_text_color"

                                             gecko:strip="@drawable/home_tab_menu_strip_tor"

                                             gecko:activeTextColor="@color/tor_tab_active_text"

                                             gecko:inactiveTextColor="@color/tor_tab_inactive_text"

                                             gecko:tabsMarginLeft="@dimen/firstrun_tab_strip_content_start" />



    </org.mozilla.gecko.firstrun.FirstrunPager>

mobile/android/app/src/main/res/layout/firstrun_basepanel_checkable_fragment.xml

+20 −14
Original line number Diff line number Diff line
@@ -13,31 +13,37 @@ 
    <LinearLayout android:layout_width="match_parent"

                  android:layout_height="wrap_content"

                  android:minHeight="@dimen/firstrun_min_height"

                  android:background="@color/about_page_header_grey"

                  android:background="@android:color/white"

                  android:gravity="center_horizontal"

                  android:orientation="vertical">



        <LinearLayout android:layout_width="match_parent"

                      android:layout_height="@dimen/firstrun_background_height"

                      android:background="@android:color/white"

                      android:gravity="center"

	              android:layout_gravity="center">



            <ImageView android:id="@+id/firstrun_image"

                       android:layout_width="wrap_content"

                   android:layout_height="@dimen/firstrun_background_height"

                   android:layout_marginTop="30dp"

                   android:layout_marginBottom="18dp"

                       android:layout_height="match_parent"

                       android:scaleType="fitCenter"

                       android:layout_gravity="center"

                       android:adjustViewBounds="true"/>

        </LinearLayout>



        <TextView android:id="@+id/firstrun_text"

                  android:layout_width="@dimen/firstrun_content_width"

                  android:layout_height="wrap_content"

                  android:gravity="center"

                  android:gravity="left"

                  android:textAppearance="@style/TextAppearance.FirstrunLight.Main"/>



        <TextView android:id="@+id/firstrun_subtext"

                  android:layout_width="@dimen/firstrun_content_width"

                  android:layout_height="wrap_content"

                  android:paddingTop="20dp"

                  android:gravity="center"

                  android:textAppearance="@style/TextAppearance.FirstrunRegular.Body"/>

                  android:gravity="left"

                  android:lineSpacingExtra="5dp"

                  android:textAppearance="@style/TextAppearance.FirstrunTorRegular.Body"/>



        <android.support.v7.widget.SwitchCompat

                  android:id="@+id/firstrun_switch"
@@ -47,10 +53,10 @@ 
                  android:visibility="invisible"/>



        <TextView android:id="@+id/firstrun_link"

                  android:layout_width="wrap_content"

                  android:layout_width="@dimen/firstrun_content_width"

                  android:layout_height="wrap_content"

                  android:layout_marginBottom="30dp"

                  android:gravity="center"

                  android:gravity="left"

                  android:textAppearance="@style/TextAppearance.Link"

                  android:textAllCaps="true"

                  android:text="@string/firstrun_button_next"/>

mobile/android/app/src/photon/res/values/colors.xml

+3 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ 
    <color name="private_browsing_purple">#CF68FF</color>



    <!-- On boarding -->

    <color name="ob_click">#0A84FF</color>

    <color name="ob_click">#7D4698</color>

    <color name="ob_press">#003EAA</color>

    <color name="ob_title">#212121</color>

    <color name="ob_subtitle">#737373</color>
@@ -151,6 +151,8 @@ 


    <color name="url_bar_shadow_private">#272727</color>



    <color name="tor_tab_inactive_text">#484848</color>

    <color name="tor_tab_active_text">#7D4698</color>

    <!-- Restricted profiles palette -->



    <color name="restricted_profile_background_gold">#ffffcb51</color>

mobile/android/app/src/photon/res/values/styles.xml

+7 −0
Original line number Diff line number Diff line
@@ -729,6 +729,7 @@ 


    <style name="TextAppearance.FirstrunLight"/>

    <style name="TextAppearance.FirstrunRegular"/>

    <style name="TextAppearance.FirstrunTorRegular"/>



    <style name="TextAppearance.FirstrunLight.Main">

        <item name="android:textSize">20sp</item>
@@ -741,6 +742,12 @@ 
        <item name="android:lineSpacingMultiplier">1.25</item>

    </style>



    <style name="TextAppearance.FirstrunTorRegular.Body">

      <item name="android:textSize">16sp</item>

      <item name="android:textColor">@color/ob_subtitle</item>

      <item name="android:lineSpacingMultiplier">2</item>

    </style>



    <style name="TextAppearance.Link">

        <item name="android:textSize">16sp</item>

        <item name="android:textColor">@color/ob_click</item>

mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunLastPanel.java

0 → 100644
+30 −0
Original line number Diff line number Diff line 
/* -*- Mode: Java; c-basic-offset: 4; tab-width: 4; indent-tabs-mode: nil; -*-

 * This Source Code Form is subject to the terms of the Mozilla Public

 * License, v. 2.0. If a copy of the MPL was not distributed with this

 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */



package org.mozilla.gecko.firstrun;



import android.os.Bundle;

import android.support.v4.app.Fragment;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;

import org.mozilla.gecko.R;



public class FirstrunLastPanel extends FirstrunPanel {



    @Override

    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstance) {

        final ViewGroup root = (ViewGroup) super.onCreateView(inflater, container, savedInstance);



        root.findViewById(R.id.firstrun_link).setOnClickListener(new View.OnClickListener() {

            @Override

            public void onClick(View v) {

                close();

            }

        });



        return root;

    }

}