diff --git a/app/build.gradle b/app/build.gradle index 8759de04f..60d1c8990 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -67,6 +67,11 @@ dependencies { implementation Deps.kotlin_stdlib implementation Deps.androidx_appcompat implementation Deps.androidx_constraintlayout + + implementation Deps.mozilla_browser_awesomebar + implementation Deps.mozilla_browser_toolbar + + testImplementation Deps.junit androidTestImplementation Deps.tools_test_runner androidTestImplementation Deps.tools_espresso_core diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt index 3fe68584a..e02d5f94a 100644 --- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt +++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt @@ -9,7 +9,6 @@ import androidx.appcompat.app.AppCompatActivity import org.mozilla.fenix.home.HomeFragment class HomeActivity : AppCompatActivity() { - override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_home) @@ -18,6 +17,5 @@ class HomeActivity : AppCompatActivity() { replace(R.id.container, HomeFragment.create()) commit() } - } } diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt index f9e21dad7..56e79cfa6 100644 --- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt @@ -9,6 +9,7 @@ import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import kotlinx.android.synthetic.main.fragment_home.* import org.mozilla.fenix.R @@ -20,6 +21,11 @@ class HomeFragment : Fragment() { return inflater.inflate(R.layout.fragment_home, container, false) } + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + toolbar_wrapper.clipToOutline = false + } + companion object { fun create() = HomeFragment() diff --git a/app/src/main/res/drawable/home_search_background.xml b/app/src/main/res/drawable/home_search_background.xml new file mode 100644 index 000000000..6a2e34dd0 --- /dev/null +++ b/app/src/main/res/drawable/home_search_background.xml @@ -0,0 +1,17 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 505884247..c6c57cb16 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -2,11 +2,14 @@ - + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 69b22338c..0932a4ced 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -3,4 +3,6 @@ #008577 #00574B #D81B60 + + #331b215e diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt index eba9806eb..da9db5bb2 100644 --- a/buildSrc/src/main/java/Dependencies.kt +++ b/buildSrc/src/main/java/Dependencies.kt @@ -10,6 +10,8 @@ private object Versions { const val androidx_appcompat = "1.0.2" const val androidx_constraint_layout = "1.1.3" + const val mozilla_android_components = "0.37.0" + const val junit = "4.12" const val test_tools = "1.0.2" const val espresso_core = "2.2.2" @@ -27,6 +29,9 @@ object Deps { const val androidx_appcompat = "androidx.appcompat:appcompat:${Versions.androidx_appcompat}" const val androidx_constraintlayout = "androidx.constraintlayout:constraintlayout:${Versions.androidx_constraint_layout}" + const val mozilla_browser_awesomebar = "org.mozilla.components:browser-awesomebar:${Versions.mozilla_android_components}" + const val mozilla_browser_toolbar = "org.mozilla.components:browser-toolbar:${Versions.mozilla_android_components}" + const val junit = "junit:junit:${Versions.junit}" const val tools_test_runner = "com.android.support.test:runner:${Versions.test_tools}" const val tools_espresso_core = "com.android.support.test.espresso:espresso-core:${Versions.espresso_core}"