2020-04-16 Version 4.0.1: Updated resources and strings

fartem · Apr 16, 2020 · 353236f · 353236f
1 parent ed88102
commit 353236f
Show file tree

Hide file tree

Showing 20 changed files with 101 additions and 101 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -16,7 +16,7 @@ android {
         minSdkVersion 21
         targetSdkVersion 29
         versionCode 1
-        versionName '4.0.0'
+        versionName '4.0.1'
 
         testInstrumentationRunner 'com.smlnskgmail.jaman.randomnotes.runner.AndroidJacocoTestRunner'
 

diff --git a/app/src/androidTest/java/com/smlnskgmail/jaman/randomnotes/auth/BaseAuthTest.kt b/app/src/androidTest/java/com/smlnskgmail/jaman/randomnotes/auth/BaseAuthTest.kt
@@ -87,12 +87,12 @@ open class BaseAuthTest {
 
     fun openAuthScreen() {
         try {
-            onView(withId(R.id.menu_login_action)).perform(click())
+            onView(withId(R.id.menu_auth_action)).perform(click())
         } catch (e: NoMatchingViewException) {
             openActionBarOverflowOrOptionsMenu(
                 activityTestRule.activity
             )
-            onView(withId(R.id.menu_login_action)).perform(click())
+            onView(withId(R.id.menu_auth_action)).perform(click())
         }
         delay()
     }

diff --git a/app/src/androidTest/java/com/smlnskgmail/jaman/randomnotes/auth/EmailAuthTest.kt b/app/src/androidTest/java/com/smlnskgmail/jaman/randomnotes/auth/EmailAuthTest.kt
@@ -50,7 +50,7 @@ class EmailAuthTest : BaseAuthTest() {
         )
         delay()
 
-        onView(withId(R.id.login_action)).perform(click())
+        onView(withId(R.id.auth_action)).perform(click())
         delay()
     }
 
@@ -67,7 +67,7 @@ class EmailAuthTest : BaseAuthTest() {
     }
 
     @Test
-    fun logInWithEmail() {
+    fun signInWithEmail() {
         whenever(cloudAuth.isValidEmail(any())).thenReturn(true)
         whenever(cloudAuth.isValidPassword(any())).thenReturn(true)
         whenever(cloudAuth.signInWithEmail(any(), any(), any())).thenAnswer {

diff --git a/app/src/androidTest/java/com/smlnskgmail/jaman/randomnotes/auth/FacebookAuthTest.kt b/app/src/androidTest/java/com/smlnskgmail/jaman/randomnotes/auth/FacebookAuthTest.kt
@@ -18,8 +18,8 @@ import org.junit.runner.RunWith
 class FacebookAuthTest : BaseAuthTest() {
 
     @Test
-    fun logInWithFacebook() {
-        whenever(cloudAuth.logInWithFacebook(any(), any())).thenAnswer {
+    fun signInWithFacebook() {
+        whenever(cloudAuth.signInWithFacebook(any(), any())).thenAnswer {
             val callback = it.getArgument(1) as ((e: Exception?) -> Unit)
             callback.invoke(
                 null
@@ -30,7 +30,7 @@ class FacebookAuthTest : BaseAuthTest() {
 
         openAuthScreen()
 
-        onView(withId(R.id.facebook_login)).perform(scrollTo()).perform(click())
+        onView(withId(R.id.facebook_sign_in)).perform(scrollTo()).perform(click())
         delay()
 
         val fragmentManager = activityTestRule.activity.supportFragmentManager
@@ -46,7 +46,7 @@ class FacebookAuthTest : BaseAuthTest() {
 
     @Test
     fun authWithError() {
-        whenever(cloudAuth.logInWithFacebook(any(), any())).thenAnswer {
+        whenever(cloudAuth.signInWithFacebook(any(), any())).thenAnswer {
             val callback = it.getArgument(1) as ((e: Exception?) -> Unit)
             callback.invoke(
                 RuntimeException(
@@ -59,7 +59,7 @@ class FacebookAuthTest : BaseAuthTest() {
 
         openAuthScreen()
 
-        onView(withId(R.id.facebook_login)).perform(scrollTo()).perform(click())
+        onView(withId(R.id.facebook_sign_in)).perform(scrollTo()).perform(click())
         delay()
 
         val fragmentManager = activityTestRule.activity.supportFragmentManager

diff --git a/app/src/androidTest/java/com/smlnskgmail/jaman/randomnotes/auth/GoogleAuthTest.kt b/app/src/androidTest/java/com/smlnskgmail/jaman/randomnotes/auth/GoogleAuthTest.kt
@@ -17,8 +17,8 @@ import org.junit.runner.RunWith
 class GoogleAuthTest : BaseAuthTest() {
 
     @Test
-    fun logInWithGoogle() {
-        whenever(cloudAuth.logInWithGoogle(any(), any())).thenAnswer {
+    fun signInWithGoogle() {
+        whenever(cloudAuth.signInWithGoogle(any(), any())).thenAnswer {
             val callback = it.getArgument(1) as ((e: Exception?) -> Unit)
             callback.invoke(
                 null
@@ -29,7 +29,7 @@ class GoogleAuthTest : BaseAuthTest() {
 
         openAuthScreen()
 
-        onView(withId(R.id.google_login)).perform(click())
+        onView(withId(R.id.google_sign_in)).perform(click())
         delay()
 
         val fragmentManager = activityTestRule.activity.supportFragmentManager
@@ -45,7 +45,7 @@ class GoogleAuthTest : BaseAuthTest() {
 
     @Test
     fun authWithError() {
-        whenever(cloudAuth.logInWithGoogle(any(), any())).thenAnswer {
+        whenever(cloudAuth.signInWithGoogle(any(), any())).thenAnswer {
             val callback = it.getArgument(1) as ((e: Exception?) -> Unit)
             callback.invoke(
                 RuntimeException(
@@ -58,7 +58,7 @@ class GoogleAuthTest : BaseAuthTest() {
 
         openAuthScreen()
 
-        onView(withId(R.id.google_login)).perform(click())
+        onView(withId(R.id.google_sign_in)).perform(click())
         delay()
 
         val fragmentManager = activityTestRule.activity.supportFragmentManager

diff --git a/app/src/main/java/com/smlnskgmail/jaman/randomnotes/MainActivity.kt b/app/src/main/java/com/smlnskgmail/jaman/randomnotes/MainActivity.kt
@@ -28,7 +28,7 @@ class MainActivity : AppCompatActivity() {
         )
     }
 
-    fun showLoginFragment() {
+    fun showAuthFragment() {
         showBaseFragment(
             CloudAuthFragment()
         )

diff --git a/app/src/main/java/com/smlnskgmail/jaman/randomnotes/model/api/cloud/CloudAuth.kt b/app/src/main/java/com/smlnskgmail/jaman/randomnotes/model/api/cloud/CloudAuth.kt
@@ -11,23 +11,23 @@ interface CloudAuth {
         username: String,
         email: String,
         password: String,
-        afterLogin: (e: Exception?) -> Unit
+        signUpResult: (e: Exception?) -> Unit
     )
 
     fun signInWithEmail(
         username: String,
         password: String,
-        afterRegister: (e: Exception?) -> Unit
+        signInResult: (e: Exception?) -> Unit
     )
 
-    fun logInWithGoogle(
+    fun signInWithGoogle(
         activity: Activity,
-        afterFacebookLogin: (e: Exception?) -> Unit
+        signInResult: (e: Exception?) -> Unit
     )
 
-    fun logInWithFacebook(
+    fun signInWithFacebook(
         activity: Activity,
-        afterFacebookLogin: (e: Exception?) -> Unit
+        signInResult: (e: Exception?) -> Unit
     )
 
     fun bindForAuth(

diff --git a/app/src/main/java/com/smlnskgmail/jaman/randomnotes/model/impl/cloud/fake/FakeCloudAuth.kt b/app/src/main/java/com/smlnskgmail/jaman/randomnotes/model/impl/cloud/fake/FakeCloudAuth.kt
@@ -26,40 +26,40 @@ class FakeCloudAuth : CloudAuth {
         username: String,
         email: String,
         password: String,
-        afterLogin: (e: Exception?) -> Unit
+        signUpResult: (e: Exception?) -> Unit
     ) {
         handleAuth()
-        afterLogin(null)
+        signUpResult(null)
     }
 
     override fun signInWithEmail(
         username: String,
         password: String,
-        afterRegister: (e: Exception?) -> Unit
+        signInResult: (e: Exception?) -> Unit
     ) {
         handleAuth()
-        afterRegister(null)
+        signInResult(null)
     }
 
 
-    override fun logInWithFacebook(
+    override fun signInWithFacebook(
         activity: Activity,
-        afterFacebookLogin: (e: Exception?) -> Unit
+        signInResult: (e: Exception?) -> Unit
     ) {
         handleAuth()
-        afterFacebookLogin(null)
+        signInResult(null)
     }
 
     private fun handleAuth() {
         isAuth = true
     }
 
-    override fun logInWithGoogle(
+    override fun signInWithGoogle(
         activity: Activity,
-        afterFacebookLogin: (e: Exception?) -> Unit
+        signInResult: (e: Exception?) -> Unit
     ) {
         handleAuth()
-        afterFacebookLogin(null)
+        signInResult(null)
     }
 
     override fun bindForAuth(

diff --git a/...src/main/java/com/smlnskgmail/jaman/randomnotes/model/impl/cloud/parse/ParseServerAuth.kt b/...src/main/java/com/smlnskgmail/jaman/randomnotes/model/impl/cloud/parse/ParseServerAuth.kt
@@ -31,44 +31,44 @@ class ParseServerAuth : CloudAuth {
         return ParseUser.getCurrentUser() != null
     }
 
-    override fun logInWithFacebook(
+    override fun signInWithFacebook(
         activity: Activity,
-        afterFacebookLogin: (e: Exception?) -> Unit
+        signInResult: (e: Exception?) -> Unit
     ) {
         ParseFacebookUtils.logInWithReadPermissionsInBackground(
             activity,
             listOf("public_profile")
-        ) { _, e -> afterFacebookLogin(e) }
+        ) { _, e -> signInResult(e) }
     }
 
     override fun signUpWithEmail(
         username: String,
         email: String,
         password: String,
-        afterLogin: (e: Exception?) -> Unit
+        signUpResult: (e: Exception?) -> Unit
     ) {
         val parseUser = ParseUser()
         parseUser.username = username
         parseUser.email = email
         parseUser.setPassword(password)
         parseUser.signUpInBackground {
-            afterLogin(it)
+            signUpResult(it)
         }
     }
 
     override fun signInWithEmail(
         username: String,
         password: String,
-        afterRegister: (e: Exception?) -> Unit
+        signInResult: (e: Exception?) -> Unit
     ) {
         ParseUser.logInInBackground(username, password) { _, e ->
-            afterRegister(e)
+            signInResult(e)
         }
     }
 
-    override fun logInWithGoogle(
+    override fun signInWithGoogle(
         activity: Activity,
-        afterFacebookLogin: (e: Exception?) -> Unit
+        signInResult: (e: Exception?) -> Unit
     ) {
         val signInOptions = getGoogleSignInOptions(activity)
         val signInClient = GoogleSignIn.getClient(
@@ -78,7 +78,7 @@ class ParseServerAuth : CloudAuth {
 
         googleAuthCallback = object : GoogleAuthCallback {
             override fun sendResult(exception: Exception?) {
-                afterFacebookLogin(exception)
+                signInResult(exception)
             }
         }
 

diff --git a/app/src/main/java/com/smlnskgmail/jaman/randomnotes/presenter/auth/CloudAuthPresenter.kt b/app/src/main/java/com/smlnskgmail/jaman/randomnotes/presenter/auth/CloudAuthPresenter.kt
@@ -16,15 +16,15 @@ interface CloudAuthPresenter {
         email: String,
         password: String
     )
-    fun logInWithEmail(
+    fun signInWithEmail(
         email: String,
         password: String
     )
 
-    fun logInWithGoogle(
+    fun signInWithGoogle(
         activity: Activity
     )
-    fun logInWithFacebook(
+    fun signInWithFacebook(
         activity: Activity
     )
 

diff --git a/app/src/main/java/com/smlnskgmail/jaman/randomnotes/presenter/auth/CloudAuthPresenterImpl.kt b/app/src/main/java/com/smlnskgmail/jaman/randomnotes/presenter/auth/CloudAuthPresenterImpl.kt
@@ -39,7 +39,7 @@ class CloudAuthPresenterImpl : CloudAuthPresenter {
         }
     }
 
-    override fun logInWithEmail(
+    override fun signInWithEmail(
         email: String,
         password: String
     ) {
@@ -49,18 +49,18 @@ class CloudAuthPresenterImpl : CloudAuthPresenter {
         ) { handleAuthResult(it) }
     }
 
-    override fun logInWithGoogle(
+    override fun signInWithGoogle(
         activity: Activity
     ) {
-        cloudAuth.logInWithGoogle(
+        cloudAuth.signInWithGoogle(
             activity
         ) { handleAuthResult(it) }
     }
 
-    override fun logInWithFacebook(
+    override fun signInWithFacebook(
         activity: Activity
     ) {
-        cloudAuth.logInWithFacebook(
+        cloudAuth.signInWithFacebook(
             activity
         ) { handleAuthResult(it) }
     }