Merge branch 'email-and-url-variant' into 'master'

Add URL and email variants for US layout

Closes #65

See merge request World/Phosh/squeekboard!495

src/data/loading.rs

@@ -166,11 +166,13 @@ fn get_directory_string(
 
     let layout_purpose = match overlay {
         None => match content_purpose {
-            ContentPurpose::Number => Special("number"),
+            ContentPurpose::Email => Special("email"),
             ContentPurpose::Digits => Special("number"),
+            ContentPurpose::Number => Special("number"),
             ContentPurpose::Phone => Special("number"),
-            ContentPurpose::Terminal => Special("terminal"),
             ContentPurpose::Pin => Special("pin"),
+            ContentPurpose::Terminal => Special("terminal"),
+            ContentPurpose::Url => Special("url"),
             _ => Default,
         },
         Some(overlay) => Special(overlay),

src/resources.rs

@@ -91,6 +91,12 @@ static KEYBOARDS: &[(&'static str, &'static str)] = &[
     ("us+dvorak", include_str!("../data/keyboards/us+dvorak.yaml")),
     ("us+dvorak_wide", include_str!("../data/keyboards/us+dvorak_wide.yaml")),
 
+    // Email
+    ("email/us", include_str!("../data/keyboards/email/us.yaml")),
+
+    // URL
+    ("url/us", include_str!("../data/keyboards/url/us.yaml")),
+
     // Others
     ("number/us", include_str!("../data/keyboards/number/us.yaml")),
     ("pin/us", include_str!("../data/keyboards/pin/us.yaml")),