Merge pull request #37 from wordpress-mobile/merge/woocommerce-android/dark-mode

Merge WooCommerce Dark Mode changes

Author: renanferrari

libs/login/build.gradle

@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:3.5.3'
     }
 }
 

libs/login/src/main/java/org/wordpress/android/login/LoginMagicLinkRequestFragment.java

@@ -156,7 +156,7 @@ public void onClick(View v) {
             View avatarContainerView = view.findViewById(R.id.avatar_container);
 
             LayoutParams lp = avatarContainerView.getLayoutParams();
-            lp.width = getContext().getResources().getDimensionPixelSize(R.dimen.magic_link_sent_illustration_sz);
+            lp.width = LayoutParams.WRAP_CONTENT;
             lp.height = getContext().getResources().getDimensionPixelSize(R.dimen.magic_link_sent_illustration_sz);
             avatarContainerView.setLayoutParams(lp);
 

libs/login/src/main/java/org/wordpress/android/login/LoginSiteAddressHelpDialogFragment.java

@@ -48,7 +48,11 @@ public void onAttach(Context context) {
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         AlertDialog.Builder alert = new MaterialAlertDialogBuilder(getActivity());
-        alert.setTitle(R.string.login_site_address_help_title);
+        if (mLoginListener.getLoginMode() != LoginMode.WOO_LOGIN_MODE) {
+            // Only set the title if not the woo app, since the woo app specifies an override
+            // layout that includes the title.
+            alert.setTitle(R.string.login_site_address_help_title);
+        }
 
         //noinspection InflateParams
         alert.setView(getActivity().getLayoutInflater().inflate(R.layout.login_alert_site_address_help, null));

libs/login/src/main/java/org/wordpress/android/login/LoginUsernamePasswordFragment.java

@@ -156,9 +156,8 @@ protected void setupContent(ViewGroup rootView) {
         siteAddressView.setText(UrlUtils.removeScheme(UrlUtils.removeXmlrpcSuffix(mInputSiteAddress)));
         siteAddressView.setVisibility(mInputSiteAddress != null ? View.VISIBLE : View.GONE);
 
-        String inputSiteAddressWithoutProtocol = UrlUtils.removeScheme(mInputSiteAddress);
         mInputSiteAddressWithoutSuffix = (mEndpointAddress == null || mEndpointAddress.isEmpty())
-                ? inputSiteAddressWithoutProtocol : UrlUtils.removeXmlrpcSuffix(mEndpointAddress);
+                ? mInputSiteAddress : UrlUtils.removeXmlrpcSuffix(mEndpointAddress);
 
         mUsernameInput = rootView.findViewById(R.id.login_username_row);
         mUsernameInput.setText(mInputUsername);
@@ -194,6 +193,9 @@ public void onClick(View v) {
                     if (mIsWpcom) {
                         mLoginListener.forgotPassword(FORGOT_PASSWORD_URL_WPCOM);
                     } else {
+                        if (!mInputSiteAddressWithoutSuffix.endsWith("/")) {
+                            mInputSiteAddressWithoutSuffix += "/";
+                        }
                         mLoginListener.forgotPassword(mInputSiteAddressWithoutSuffix);
                     }
                 }

libs/login/src/main/java/org/wordpress/android/login/util/SiteUtils.java

@@ -22,9 +22,18 @@ public static ArrayList<Integer> getCurrentSiteIds(SiteStore siteStore, boolean
 
     @Nullable
     public static SiteModel getXMLRPCSiteByUrl(SiteStore siteStore, String url) {
-        List<SiteModel> selfhostedSites = siteStore.getSitesAccessedViaXMLRPC();
-        if (selfhostedSites != null && !selfhostedSites.isEmpty()) {
-            for (SiteModel siteModel : selfhostedSites) {
+        return getSiteByMatchingUrl(siteStore.getSitesAccessedViaXMLRPC(), url);
+    }
+
+    @Nullable
+    public static SiteModel getSiteByMatchingUrl(SiteStore siteStore, String url) {
+        return getSiteByMatchingUrl(siteStore.getSites(), url);
+    }
+
+    @Nullable
+    private static SiteModel getSiteByMatchingUrl(List<SiteModel> siteModelList, String url) {
+        if (siteModelList != null && !siteModelList.isEmpty()) {
+            for (SiteModel siteModel : siteModelList) {
                 String storedSiteUrl = UrlUtils.removeScheme(siteModel.getUrl()).replace("/", "");
                 String incomingSiteUrl = UrlUtils.removeScheme(url).replace("/", "");
                 if (storedSiteUrl.equalsIgnoreCase(incomingSiteUrl)) {

libs/login/src/main/res/layout-land/login_magic_link_sent_screen.xml

@@ -16,7 +16,7 @@
 
         <ImageView
             android:id="@+id/image"
-            android:layout_width="@dimen/magic_link_sent_illustration_sz"
+            android:layout_width="wrap_content"
             android:layout_height="@dimen/magic_link_sent_illustration_sz"
             android:contentDescription="@null"
             android:scaleType="centerInside"

libs/login/src/main/res/layout-land/signup_magic_link.xml

@@ -16,7 +16,7 @@
 
         <ImageView
             android:id="@+id/signup_magic_link_image"
-            android:layout_width="@dimen/magic_link_sent_illustration_sz"
+            android:layout_width="wrap_content"
             android:layout_height="@dimen/magic_link_sent_illustration_sz"
             android:contentDescription="@null"
             android:scaleType="centerInside"

libs/login/src/main/res/layout/login_magic_link_sent_screen.xml

@@ -9,7 +9,7 @@
 
     <ImageView
         android:id="@+id/image"
-        android:layout_width="@dimen/magic_link_sent_illustration_sz"
+        android:layout_width="wrap_content"
         android:layout_height="@dimen/magic_link_sent_illustration_sz"
         android:layout_marginTop="@dimen/margin_extra_extra_large"
         android:contentDescription="@null"

libs/login/src/main/res/layout/signup_magic_link.xml

@@ -13,7 +13,7 @@
 
         <ImageView
             android:id="@+id/signup_magic_link_image"
-            android:layout_width="@dimen/magic_link_sent_illustration_sz"
+            android:layout_width="wrap_content"
             android:layout_height="@dimen/magic_link_sent_illustration_sz"
             android:layout_centerHorizontal="true"
             android:contentDescription="@null"

libs/login/src/main/res/values/strings.xml

@@ -22,7 +22,7 @@
     <string name="open_mail">Open mail</string>
     <string name="alternatively">Alternatively:</string>
     <string name="enter_site_address_instead">Log in by entering your site address.</string>
-    <string name="enter_site_credentials_instead">Log in with site credentials</string>
+    <string name="enter_site_credentials_instead">Log in with site credentials.</string>
     <string name="enter_username_instead">Log in with your username.</string>
     <string name="enter_verification_code">Almost there! Please enter the verification code from your Authenticator app.</string>
     <string name="enter_verification_code_sms">We sent a text message to the phone number ending in %s. Please enter the verification code in the SMS.</string>