Merge pull request #292 from TheInfiniteKind/master

Release 3.0.15

AndroidManifest.xml

@@ -2,18 +2,19 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.duckduckgo.mobile.android"
     android:installLocation="auto"
-    android:versionCode="76"
-    android:versionName="3.0.14">
+    android:versionCode="77"
+    android:versionName="3.0.15">
 
     <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="23" />
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
 
     <application
         android:hardwareAccelerated="true"
         android:icon="@drawable/icon"
-        android:theme="@style/DDGTheme"
+        android:theme="@style/DDGTheme.Launcher"
         android:label="@string/AppName"
         android:name="DDGApplication">
 
@@ -85,6 +86,10 @@
 	        android:excludeFromRecents="true"
 	        android:finishOnTaskLaunch="true" />
 
+        <activity android:name=".activity.OnboardingActivity"
+            android:screenOrientation="sensorPortrait"
+            android:theme="@style/DDGTheme.ClearStatusBar"/>
+
 		<provider android:name=".providers.DuckDuckGoProvider"
 				android:authorities="com.duckduckgo.mobile.android.providers.DuckDuckGoProvider" />
 

res/drawable/instruction_background.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#fff"/>
+    <corners android:radius="4dp"/>
+</shape>

res/drawable/instruction_background_2.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/transparent"/>
+        </shape>
+    </item>
+    <item
+        android:top="50dp">
+        <shape android:shape="rectangle">
+            <solid android:color="#ffffff"/>
+            <corners android:radius="4dp"/>
+        </shape>
+    </item>
+</layer-list>

res/drawable/instruction_bullet_point_background.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <size android:height="20dp" android:width="20dp"/>
+    <solid android:color="#bbbbbb"/>
+</shape>

res/drawable/onboarding_banner_button_background.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/onboarding_accent"/>
+    <corners android:radius="4dp"/>
+</shape>

res/drawable/onboarding_button_background.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/onboarding_button_background"/>
+    <corners android:radius="4dp"/>
+</shape>

res/drawable/onboarding_pageindicator.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="#64000000"/>
+            <stroke android:width="2dp" android:color="#ff0000"/>
+            <size android:width="10dp" android:height="10dp"/>
+        </shape>
+    </item>
+    <item android:id="@+id/foreground">
+        <shape android:shape="oval">
+            <solid android:color="#ffffff"/>
+        </shape>
+    </item>
+</layer-list>

res/drawable/onboarding_pageindicator_background.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@android:color/transparent"/>
+            <size android:width="10dp" android:height="10dp"/>
+        </shape>
+    </item>
+    <item
+          android:left="1dp"
+          android:top="1dp"
+          android:right="1dp"
+          android:bottom="1dp">
+        <shape android:shape="oval">
+            <solid android:color="@color/page_indicator_unselected"/>
+            <size android:width="8dp" android:height="8dp"/>
+        </shape>
+    </item>
+</layer-list>

res/layout-land/activity_onboarding.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout 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"
+             android:id="@+id/activity_onboarding"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             tools:context="com.duckduckgo.mobile.android.activity.OnboardingActivity">
+    <android.support.v4.view.ViewPager
+        android:id="@+id/view_pager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+    <Button
+        android:id="@+id/add_to_home_screen_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/onboarding_screen_bottom_margin_landscape"
+        android:layout_gravity="bottom|center_horizontal"
+        android:text="@string/add_to"
+        android:textColor="#ffffff"
+        android:background="@drawable/onboarding_button_background"
+        android:paddingEnd="24dp"
+        android:paddingStart="24dp"
+        android:textSize="16sp"/>
+    <com.duckduckgo.mobile.android.views.pageindicator.OnboardingPageIndicator
+        android:id="@+id/page_indicator"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="38dp"
+        android:layout_marginEnd="14dp"
+        android:layout_marginRight="14dp"
+        android:layout_gravity="top|end"/>
+</FrameLayout>

res/layout/activity_onboarding.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout 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"
+    android:id="@+id/activity_onboarding"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.duckduckgo.mobile.android.activity.OnboardingActivity">
+    <android.support.v4.view.ViewPager
+        android:id="@+id/view_pager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+    <LinearLayout
+        android:id="@+id/container_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_gravity="bottom|center_horizontal"
+        android:gravity="center_horizontal"
+        android:layout_marginBottom="@dimen/onboarding_screen_bottom_margin">
+        <Button
+            android:id="@+id/add_to_home_screen_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="22dp"
+            android:minHeight="48dp"
+            android:text="@string/add_to"
+            android:textColor="#ffffff"
+            android:background="@drawable/onboarding_button_background"
+            android:foreground="?attr/selectableItemBackground"
+            android:paddingEnd="24dp"
+            android:paddingStart="24dp"
+            android:textSize="16sp"/>
+        <com.duckduckgo.mobile.android.views.pageindicator.OnboardingPageIndicator
+            android:id="@+id/page_indicator"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+    </LinearLayout>
+</FrameLayout>