Merge pull request #148 from iHub/bugfixes

Merging bugfixes & updates.

app/src/main/AndroidManifest.xml

@@ -69,21 +69,21 @@
                 <data android:scheme="mozilladso" android:pathPrefix="/tutorials/*"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name=".activities.ActionsActivity"
-            android:label="@string/app_name"
-            android:windowSoftInputMode="stateHidden">
-            <!-- handle app links -->
-            <intent-filter android:label="@string/app_name_actions">
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <!--<data android:mimeType="vnd.android.cursor.item/vnd.mozilladso2016.action" />-->
-                <data
-                    android:pathPrefix="/actions/*"
-                    android:scheme="mozilladso" />
-            </intent-filter>
-        </activity>
+        <!--<activity-->
+            <!--android:name=".activities.ActionsActivity"-->
+            <!--android:label="@string/app_name"-->
+            <!--android:windowSoftInputMode="stateHidden">-->
+            <!--&lt;!&ndash; handle app links &ndash;&gt;-->
+            <!--<intent-filter android:label="@string/app_name_actions">-->
+                <!--<action android:name="android.intent.action.VIEW" />-->
+                <!--<category android:name="android.intent.category.BROWSABLE" />-->
+                <!--<category android:name="android.intent.category.DEFAULT" />-->
+                <!--&lt;!&ndash;<data android:mimeType="vnd.android.cursor.item/vnd.mozilladso2016.action" />&ndash;&gt;-->
+                <!--<data-->
+                    <!--android:pathPrefix="/actions/*"-->
+                    <!--android:scheme="mozilladso" />-->
+            <!--</intent-filter>-->
+        <!--</activity>-->
         <activity
             android:name=".activities.TopicListActivity"
             android:label="@string/title_activity_topiclist"

app/src/main/res/layout/fragment_screen_slide_page.xml

@@ -5,7 +5,6 @@
     android:scrollbarStyle="outsideOverlay"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-
     <!-- Dummy content. -->
     <LinearLayout
         android:layout_width="match_parent"
@@ -37,7 +36,7 @@
         <org.sufficientlysecure.htmltextview.HtmlTextView
             android:id="@+id/step_description"
             style="?android:textAppearanceMedium"
-            android:lineSpacingMultiplier="1.2"
+            android:lineSpacingMultiplier="1.1"
             android:textColor="@color/colorTextPrimary"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

app/src/main/res/raw/bootstrap_data.json

@@ -8,7 +8,7 @@
         "id": "1",
         "title": "What is Wi-Fi?",
         "gifUrl": "wifi1",
-        "description": "Wi-Fi <a href=\"mozilladso:///actions/connect_wifi\"><img src=\"ic_network_wifi_white_24dp\"/></a> is a technology that helps your phone connect to the internet, similar to airtime or mobile data. However, <b>Wi-Fi doesn't use your airtime or mobile data.</b> Wi-Fi can often be free in coffee shops, or accessible at a small fee."
+        "description": "Wi-Fi <img src=\"ic_network_wifi_white_24dp\"/> is a technology that helps your phone connect to the internet, similar to airtime or mobile data. However, <b>Wi-Fi doesn't use your airtime or mobile data.</b> Wi-Fi can often be free in coffee shops, or accessible at a small fee."
     }, {
         "id": "2",
         "title": "Where do I get it? Who owns it?",
@@ -39,7 +39,7 @@
         "id": "2",
         "title": "Turning on Wi-Fi",
         "gifUrl": "connectwifi2",
-        "description": "On most Android phones, you can swipe down the Notification Bar at the top of the screen and tap the Wi-Fi <a href=\"mozilladso:///actions/connect_wifi\"><img src=\"ic_network_wifi_white_24dp\"/></a> icon. If you are close to a Wi-Fi network you have joined before, <b>your phone will try to connect to it automatically</b>. You can also manage your Wi-Fi connection by clicking on the Settings <img src=\"ic_settings_applications_white_24dp\"/> and checking out the Wi-Fi section."
+        "description": "On most Android phones, you can swipe down the Notification Bar at the top of the screen and tap the Wi-Fi <img src=\"ic_network_wifi_white_24dp\"/> icon. If you are close to a Wi-Fi network you have joined before, <b>your phone will try to connect to it automatically</b>. You can also manage your Wi-Fi connection by clicking on the Settings <img src=\"ic_settings_applications_white_24dp\"/> and checking out the Wi-Fi section."
     }, {
         "id": "3",
         "title": "Finding your hotspot in the Wi-Fi list",
@@ -57,9 +57,9 @@
         "description": "If you have problems connecting to a Wi-Fi hotspot, here is a list of things you can try:<ul><li>Make sure you have the right hotspot name.</li><li>Make sure you have the right password.</li><li>If you have the right password, make sure it's entered correctly.</li><li>Talk to the hotspot owner (shopkeeper, librarian, IT assistant, etc.) and explain your problems. They may be able to help solve your problem.</li><li>In the Wi-Fi menu, delete the hotspot by holding its name until a menu appears. Then, choose <b>\"Forget Network\"</b>, and connect again.</li></ul>"
     }, {
         "id": "6",
-        "title": "Enjoy :happy:",
+        "title": "Enjoy :-)",
         "gifUrl": "connectwifi9",
-        "description": "Now, you should be connected! Enjoy! :happy:"
+        "description": "Now, you should be connected! Enjoy! :-)"
       }]
   }, {
     "id": "3",

app/src/main/res/raw/keep.xml

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools"
-    tools:keep="@drawable/connectwifi1,@drawable/connectwifi2,@drawable/connectwifi3,@drawable/connectwifi4,@drawable/connectwifi5,@drawable/connectwifi6,@drawable/airplanemode1,@drawable/airplanemode2,@drawable/airplanemode3,@drawable/airplanemode4,@drawable/accounts1,@drawable/accounts2,@drawable/accounts3,@drawable/accounts4,@drawable/accounts5,@drawable/accounts6,@drawable/data1,@drawable/data2,@drawable/data3,@drawable/data4,@drawable/data5,@drawable/data6,@drawable/wifi2,@drawable/wifi3,@drawable/wifi4,@drawable/trackingdata1,@drawable/trackingdata2,@drawable/trackingdata3,@drawable/trackingdata4,@drawable/playstore1,@drawable/playstore2,@drawable/playstore5,@drawable/gmail_2dp,@drawable/gmail_48dp"/>
+    tools:keep="@drawable/connectwifi1,@drawable/connectwifi2,@drawable/connectwifi3,@drawable/connectwifi4,@drawable/connectwifi5,@drawable/connectwifi6,@drawable/airplanemode1,@drawable/airplanemode2,@drawable/airplanemode3,@drawable/airplanemode4,@drawable/accounts1,@drawable/accounts2,@drawable/accounts3,@drawable/accounts4,@drawable/accounts5,@drawable/accounts6,@drawable/data1,@drawable/data2,@drawable/data3,@drawable/data4,@drawable/data5,@drawable/data6,@drawable/wifi2,@drawable/wifi3,@drawable/wifi4,@drawable/trackingdata1,@drawable/trackingdata2,@drawable/trackingdata3,@drawable/trackingdata4,@drawable/playstore1,@drawable/playstore2,@drawable/playstore5,@drawable/gmail_24dp,@drawable/gmail_48dp,@drawable/ic_airplanemode_active_white_24dp, @drawable/ic_settings_applications_white_24dp, @drawable/ic_storage_white_24dp, @drawable/ic_blur_circular_white_24dp, @drawable/ic_network_wifi_white_24dp, @drawable/ic_wifi_tethering_white_24dp, @drawable/ic_data_usage_white_24dp" />

gradle.properties

@@ -14,7 +14,7 @@
 # If versions end in odd numbers they are development builds, even versions are release candidates.
 # The AndroidManifest.xml must also be updated currently.
 org.gradle.jvmargs=-Xmx2048M
-version=0.2.1-SNAPSHOT
+version=0.2.2-SNAPSHOT
 
 # Using these variables to sync dependency version numbers across sub-projects.
 android_support_lib_version = 23.4.0