Revert "Post visual update: Center NTP logo (#6700)"

This reverts commit 549d05e.

Author: 0nko

app/src/main/java/com/duckduckgo/app/browser/HomeBackgroundLogo.kt

@@ -18,20 +18,16 @@ package com.duckduckgo.app.browser
 
 import android.view.View
 import android.view.animation.AccelerateInterpolator
-import com.duckduckgo.app.browser.omnibar.model.OmnibarPosition
 import com.duckduckgo.common.ui.view.gone
 import com.duckduckgo.common.ui.view.show
 import logcat.LogPriority.VERBOSE
 import logcat.logcat
 
-class HomeBackgroundLogo(
-    private val ddgLogoView: View,
-) {
+class HomeBackgroundLogo(private var ddgLogoView: View) {
 
     private var readyToShowLogo = false
 
-    fun showLogo(omnibarPosition: OmnibarPosition) {
-        updateLogoConstraint(omnibarPosition)
+    fun showLogo() {
         this.readyToShowLogo = true
         update()
     }
@@ -65,21 +61,6 @@ class HomeBackgroundLogo(
         ddgLogoView.gone()
     }
 
-    private fun updateLogoConstraint(omnibarPosition: OmnibarPosition) {
-        val params = ddgLogoView.layoutParams as? androidx.constraintlayout.widget.ConstraintLayout.LayoutParams ?: return
-        when (omnibarPosition) {
-            OmnibarPosition.TOP -> {
-                params.topToTop = R.id.guidelineTop
-                params.topToBottom = androidx.constraintlayout.widget.ConstraintLayout.LayoutParams.UNSET
-            }
-            OmnibarPosition.BOTTOM -> {
-                params.topToTop = R.id.guidelineBottom
-                params.topToBottom = androidx.constraintlayout.widget.ConstraintLayout.LayoutParams.UNSET
-            }
-        }
-        ddgLogoView.layoutParams = params
-    }
-
     companion object {
         private const val FADE_IN_DURATION = 50L
     }

app/src/main/java/com/duckduckgo/app/browser/newtab/NewTabLegacyPageView.kt

@@ -47,7 +47,6 @@ import com.duckduckgo.app.browser.newtab.NewTabLegacyPageViewModel.ViewState
 import com.duckduckgo.app.browser.remotemessage.SharePromoLinkRMFBroadCastReceiver
 import com.duckduckgo.app.browser.remotemessage.asMessage
 import com.duckduckgo.app.global.view.launchDefaultAppActivity
-import com.duckduckgo.app.settings.db.SettingsDataStore
 import com.duckduckgo.app.statistics.pixels.Pixel
 import com.duckduckgo.app.tabs.BrowserNav
 import com.duckduckgo.common.ui.store.AppTheme
@@ -97,9 +96,6 @@ class NewTabLegacyPageView @JvmOverloads constructor(
     @Inject
     lateinit var dispatchers: DispatcherProvider
 
-    @Inject
-    lateinit var settingsDataStore: SettingsDataStore
-
     private val binding: ViewNewTabLegacyBinding by viewBinding()
 
     private val homeBackgroundLogo by lazy { HomeBackgroundLogo(binding.ddgLogo) }
@@ -144,7 +140,7 @@ class NewTabLegacyPageView @JvmOverloads constructor(
         onHasContent?.invoke(viewState.hasContent)
 
         if (viewState.shouldShowLogo) {
-            homeBackgroundLogo.showLogo(settingsDataStore.omnibarPosition)
+            homeBackgroundLogo.showLogo()
         } else {
             homeBackgroundLogo.hideLogo()
         }

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

@@ -52,14 +52,16 @@
 
         <androidx.core.widget.NestedScrollView
             android:id="@+id/newTabContainerScrollView"
-            android:fillViewport="true"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
             <FrameLayout
                 android:id="@+id/newTabContainerLayout"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+                android:layout_height="match_parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
 
         </androidx.core.widget.NestedScrollView>
 

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

@@ -33,36 +33,22 @@
         android:layout_height="wrap_content"/>
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/ddgLogoContainer"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/guidelineTop"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            app:layout_constraintGuide_percent="0.365" />
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/guidelineBottom"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            app:layout_constraintGuide_percent="0.44" />
+        android:layout_height="wrap_content">
 
         <ImageView
             android:id="@+id/ddgLogo"
             android:layout_height="wrap_content"
             android:layout_width="@dimen/ntpDaxLogoIconWidth"
+            android:layout_marginTop="@dimen/homeTabDdgLogoTopMargin"
             android:adjustViewBounds="true"
             android:alpha="0"
             android:contentDescription="@string/duckDuckGoLogoDescription"
             android:maxWidth="180dp"
             android:maxHeight="180dp"
             app:srcCompat="@drawable/logo_full"
             android:visibility="gone"
-            app:layout_constraintTop_toTopOf="@id/guidelineTop"
+            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />
 

duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/inputscreen/ui/InputScreenFragment.kt

@@ -23,7 +23,6 @@ import android.view.View
 import androidx.activity.OnBackPressedCallback
 import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
-import androidx.core.view.postDelayed
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback
@@ -127,7 +126,7 @@ class InputScreenFragment : DuckDuckGoFragment(R.layout.fragment_input_screen) {
         binding.actionSend.setOnClickListener {
             binding.inputModeWidget.submitMessage()
         }
-        binding.inputModeWidget.inputField.postDelayed(300) {
+        binding.inputModeWidget.inputField.post {
             showKeyboard(binding.inputModeWidget.inputField)
         }
         binding.actionNewLine.setOnClickListener {

duckchat/duckchat-impl/src/main/res/layout/fragment_input_screen.xml

@@ -31,23 +31,17 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guidelineTop"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        app:layout_constraintGuide_percent="0.465" />
-
     <ImageView
         android:id="@+id/ddgLogo"
         android:layout_width="@dimen/ntpDaxLogoIconWidth"
         android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/homeTabDdgLogoTopMargin"
         android:adjustViewBounds="true"
         android:maxWidth="180dp"
         android:maxHeight="180dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/guidelineTop"
+        app:layout_constraintTop_toBottomOf="@id/inputModeWidget"
         app:srcCompat="@drawable/logo_full" />
 
     <androidx.viewpager2.widget.ViewPager2