Revert "Merge branch 'add-login-prompt' into master" (schibsted#77)

This reverts commit 249267b, reversing
changes made to 96b90bc.

Author: bogdan-niculescu-sch

app/build.gradle

@@ -2,12 +2,12 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion 32
 
     defaultConfig {
         applicationId "com.schibsted.account"
         minSdkVersion 21
-        targetSdkVersion 32
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
 

app/src/main/java/com/schibsted/account/example/MainActivity.kt

@@ -8,7 +8,6 @@ import androidx.lifecycle.Observer
 import com.schibsted.account.databinding.ActivityMainBinding
 import com.schibsted.account.webflows.activities.AuthResultLiveData
 import com.schibsted.account.webflows.activities.NotAuthed
-import com.schibsted.account.webflows.loginPrompt.LoginPromptFragment
 import com.schibsted.account.webflows.user.User
 import com.schibsted.account.webflows.util.Either
 import timber.log.Timber
@@ -40,11 +39,6 @@ class MainActivity : AppCompatActivity() {
         binding.manualLoginButton.setOnClickListener {
             startActivity(Intent(this, ManualLoginActivity::class.java))
         }
-
-        binding.showLoginPrompt.setOnClickListener {
-            val loginPromptFragment = LoginPromptFragment()
-            loginPromptFragment.show(supportFragmentManager, "12345")
-        }
     }
 
     private fun observeAuthResultLiveData() {

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

@@ -25,15 +25,4 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="@id/loginButton" />
-
-    <Button
-            android:id="@+id/showLoginPrompt"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Trigger login prompt"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="@id/manualLoginButton" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values/colors.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#3274D4</color>
-    <color name="colorPrimaryDark">#2196F3</color>
+    <color name="colorPrimary">#6200EE</color>
+    <color name="colorPrimaryDark">#3700B3</color>
     <color name="colorAccent">#03DAC5</color>
 </resources>

app/src/main/res/values/styles.xml

@@ -1,15 +1,10 @@
 <resources>
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.MaterialComponents.DayNight">
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
-        <item name="toolbarStyle">@style/AppToolbar</item>
-    </style>
-
-    <style name="AppToolbar" parent="Widget.MaterialComponents.Toolbar.Primary">
-        <item name="titleTextColor">@android:color/white</item>
     </style>
 
 </resources>

webflows/build.gradle

@@ -6,11 +6,11 @@ apply plugin: 'maven-publish'
 apply plugin: 'signing'
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion 32
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 30
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -21,10 +21,6 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    buildFeatures {
-        viewBinding true
-    }
-
     buildTypes {
         release {
             minifyEnabled false
@@ -64,18 +60,15 @@ dependencies {
 
     api "androidx.browser:browser:1.4.0"
     implementation 'com.nimbusds:nimbus-jose-jwt:9.24.3'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.0'
 
     //Logging
     implementation "com.jakewharton.timber:timber:$timber_version"
-    implementation 'androidx.constraintlayout:constraintlayout:2.2.0-alpha09'
-    implementation 'com.google.android.material:material:1.8.0'
 
     testImplementation 'junit:junit:4.13.2'
     testImplementation "io.mockk:mockk:${mockkVersion}"
     testImplementation "com.squareup.okhttp3:mockwebserver:${okHttpVersion}"
 
-    testImplementation 'org.robolectric:robolectric:4.9.1'
+    testImplementation 'org.robolectric:robolectric:4.8.2'
     testImplementation 'androidx.test.ext:junit:1.1.3'
     testImplementation "androidx.test.espresso:espresso-core:${espressoVersion}"
     testImplementation "androidx.test.espresso:espresso-intents:${espressoVersion}"

webflows/src/main/java/com/schibsted/account/webflows/api/UserProfileResponse.kt

@@ -92,7 +92,7 @@ data class Address(
         @SerializedName("invoice")
         INVOICE;
 
-        override fun toString(): String = super.toString().lowercase(Locale.ROOT)
+        override fun toString(): String = super.toString().toLowerCase(Locale.ROOT)
     }
 }
 

webflows/src/main/java/com/schibsted/account/webflows/client/Client.kt

@@ -23,7 +23,6 @@ import com.schibsted.account.webflows.util.Either
 import com.schibsted.account.webflows.util.Either.Left
 import com.schibsted.account.webflows.util.Either.Right
 import com.schibsted.account.webflows.util.Util
-import com.schibsted.account.webflows.util.Util.isCustomTabsSupported
 import okhttp3.HttpUrl.Companion.toHttpUrl
 import okhttp3.OkHttpClient
 import org.json.JSONException
@@ -96,7 +95,7 @@ class Client {
     @JvmOverloads
     fun getAuthenticationIntent(context: Context, authRequest: AuthRequest = AuthRequest()): Intent {
         val loginUrl = generateLoginUrl(authRequest)
-        val intent: Intent = if (isCustomTabsSupported(context)) {
+        val intent: Intent = if (this.isCustomTabsSupported(context)) {
             buildCustomTabsIntent()
                 .apply {
                     intent.data = loginUrl
@@ -115,7 +114,7 @@ class Client {
     @JvmOverloads
     fun launchAuth(context: Context, authRequest: AuthRequest = AuthRequest()) {
         val loginUrl = generateLoginUrl(authRequest)
-        if (isCustomTabsSupported(context)) {
+        if (this.isCustomTabsSupported(context)) {
             buildCustomTabsIntent().launchUrl(context, loginUrl)
         } else {
             val intent = Intent(Intent.ACTION_VIEW, loginUrl).addCategory(Intent.CATEGORY_BROWSABLE)
@@ -134,6 +133,13 @@ class Client {
         return Uri.parse(loginUrl)
     }
 
+    private fun isCustomTabsSupported(context: Context): Boolean {
+        val serviceIntent = Intent(CustomTabsService.ACTION_CUSTOM_TABS_CONNECTION)
+        val resolveInfos = context.packageManager.queryIntentServices(serviceIntent, 0)
+
+        return !resolveInfos.isEmpty()
+    }
+
     /**
      * Call this with the intent received via deep link to complete the login flow.
      *

webflows/src/main/java/com/schibsted/account/webflows/loginPrompt/LoginPromptFragment.kt

@@ -1,8 +1,5 @@
 package com.schibsted.account.webflows.util
 
-import android.content.Context
-import android.content.Intent
-import androidx.browser.customtabs.CustomTabsService
 import java.net.URLDecoder
 import kotlin.random.Random
 
@@ -45,11 +42,4 @@ internal object Util {
 
         return "${split[0]}.${split[1]}"
     }
-
-    fun isCustomTabsSupported(context: Context): Boolean {
-        val serviceIntent = Intent(CustomTabsService.ACTION_CUSTOM_TABS_CONNECTION)
-        val resolveInfos = context.packageManager.queryIntentServices(serviceIntent, 0)
-
-        return !resolveInfos.isEmpty()
-    }
 }