Formalize new package structure and cleanup (#1017)

Author: SUPERCILEX

app/src/main/java/com/firebase/uidemo/database/firestore/FirestoreChatActivity.java

@@ -14,7 +14,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.firebase.ui.auth.ui.ImeHelper;
+import com.firebase.ui.auth.util.ui.ImeHelper;
 import com.firebase.ui.firestore.FirestoreRecyclerAdapter;
 import com.firebase.ui.firestore.FirestoreRecyclerOptions;
 import com.firebase.uidemo.R;

app/src/main/java/com/firebase/uidemo/database/realtime/RealtimeDbChatActivity.java

@@ -14,7 +14,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.firebase.ui.auth.ui.ImeHelper;
+import com.firebase.ui.auth.util.ui.ImeHelper;
 import com.firebase.ui.database.FirebaseRecyclerAdapter;
 import com.firebase.ui.database.FirebaseRecyclerOptions;
 import com.firebase.uidemo.R;

auth/src/main/AndroidManifest.xml

@@ -27,24 +27,24 @@
             android:exported="false" />
 
         <activity
-            android:name=".ui.email.RegisterEmailActivity"
+            android:name=".ui.email.EmailActivity"
             android:label="@string/fui_sign_in_default"
             android:exported="false"
             android:windowSoftInputMode="adjustResize" />
 
         <activity
-            android:name=".ui.phone.PhoneVerificationActivity"
+            android:name=".ui.phone.PhoneActivity"
             android:label="@string/fui_sign_in_with_phone_number"
             android:exported="false"
             android:windowSoftInputMode="adjustResize|stateAlwaysVisible" />
 
         <activity
-            android:name=".ui.accountlink.WelcomeBackIdpPrompt"
+            android:name=".ui.idp.WelcomeBackIdpPrompt"
             android:label="@string/fui_title_welcome_back_idp_prompt"
             android:exported="false" />
 
         <activity
-            android:name=".ui.accountlink.WelcomeBackPasswordPrompt"
+            android:name=".ui.email.WelcomeBackPasswordPrompt"
             android:label="@string/fui_title_welcome_back_password_prompt"
             android:exported="false"
             android:windowSoftInputMode="adjustResize" />

auth/src/main/java/com/firebase/ui/auth/AuthUI.java

@@ -29,13 +29,13 @@
 import android.text.TextUtils;
 
 import com.facebook.login.LoginManager;
+import com.firebase.ui.auth.data.model.FlowParameters;
 import com.firebase.ui.auth.provider.TwitterProvider;
-import com.firebase.ui.auth.ui.ExtraConstants;
-import com.firebase.ui.auth.ui.FlowParameters;
 import com.firebase.ui.auth.ui.idp.AuthMethodPickerActivity;
+import com.firebase.ui.auth.util.ExtraConstants;
 import com.firebase.ui.auth.util.GoogleApiUtils;
 import com.firebase.ui.auth.util.Preconditions;
-import com.firebase.ui.auth.util.signincontainer.SaveSmartLock;
+import com.firebase.ui.auth.util.data.ProviderUtils;
 import com.google.android.gms.auth.api.credentials.Credential;
 import com.google.android.gms.auth.api.credentials.CredentialsClient;
 import com.google.android.gms.auth.api.signin.GoogleSignIn;
@@ -313,7 +313,7 @@ private static List<Credential> getCredentialsFromFirebaseUser(@NonNull Firebase
                 continue;
             }
 
-            String type = SaveSmartLock.providerIdToAccountType(userInfo.getProviderId());
+            String type = ProviderUtils.providerIdToAccountType(userInfo.getProviderId());
 
             credentials.add(new Credential.Builder(
                     user.getEmail() == null ? user.getPhoneNumber() : user.getEmail())

auth/src/main/java/com/firebase/ui/auth/IdpResponse.java

@@ -24,7 +24,8 @@
 import android.text.TextUtils;
 
 import com.firebase.ui.auth.data.model.FirebaseUiException;
-import com.firebase.ui.auth.ui.ExtraConstants;
+import com.firebase.ui.auth.data.model.User;
+import com.firebase.ui.auth.util.ExtraConstants;
 import com.google.firebase.auth.TwitterAuthProvider;
 
 /**

auth/src/main/java/com/firebase/ui/auth/KickoffActivity.java

@@ -8,9 +8,9 @@
 import android.support.annotation.RestrictTo;
 import android.util.Log;
 
-import com.firebase.ui.auth.ui.ExtraConstants;
-import com.firebase.ui.auth.ui.FlowParameters;
+import com.firebase.ui.auth.data.model.FlowParameters;
 import com.firebase.ui.auth.ui.HelperActivityBase;
+import com.firebase.ui.auth.util.ExtraConstants;
 import com.firebase.ui.auth.util.PlayServicesHelper;
 import com.firebase.ui.auth.util.signincontainer.SignInDelegate;
 

auth/src/main/java/com/firebase/ui/auth/ui/phone/CountryListLoadTask.java renamed to auth/src/main/java/com/firebase/ui/auth/data/client/CountryListLoadTask.java

@@ -16,18 +16,20 @@
  * Modifications copyright (C) 2017 Google Inc
  */
 
-package com.firebase.ui.auth.ui.phone;
+package com.firebase.ui.auth.data.client;
 
 import android.os.AsyncTask;
 
+import com.firebase.ui.auth.data.model.CountryInfo;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 
-// We need to move away from ListView and AsyncTask in the future and use (say)
+// TODO We need to move away from ListView and AsyncTask in the future and use (say)
 // RecyclerView and Task/ThreadPoolExecutor .
-final class CountryListLoadTask extends AsyncTask<Void, Void, List<CountryInfo>> {
+public final class CountryListLoadTask extends AsyncTask<Void, Void, List<CountryInfo>> {
     public interface Listener {
         void onLoadComplete(List<CountryInfo> result);
     }
@@ -294,7 +296,7 @@ protected List<CountryInfo> doInBackground(Void... params) {
     }
 
     @Override
-    protected void onPostExecute(List<CountryInfo> result) {
+    public void onPostExecute(List<CountryInfo> result) {
         if (listener != null) {
             listener.onLoadComplete(result);
         }

auth/src/main/java/com/firebase/ui/auth/ui/phone/CountryInfo.java renamed to auth/src/main/java/com/firebase/ui/auth/data/model/CountryInfo.java

@@ -16,12 +16,12 @@
  * Modifications copyright (C) 2017 Google Inc
  *
  */
-package com.firebase.ui.auth.ui.phone;
+package com.firebase.ui.auth.data.model;
 
 import java.text.Collator;
 import java.util.Locale;
 
-final class CountryInfo implements Comparable<CountryInfo> {
+public final class CountryInfo implements Comparable<CountryInfo> {
     private final Collator collator;
     public final Locale locale;
     public final int countryCode;
@@ -68,11 +68,11 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return localeToEmoji(locale) + " " + this.locale.getDisplayCountry() + " +" + countryCode;
+        return localeToEmoji(locale) + " " + locale.getDisplayCountry() + " +" + countryCode;
     }
 
     @Override
     public int compareTo(CountryInfo info) {
-        return collator.compare(this.locale.getDisplayCountry(), info.locale.getDisplayCountry());
+        return collator.compare(locale.getDisplayCountry(), info.locale.getDisplayCountry());
     }
 }

auth/src/main/java/com/firebase/ui/auth/ui/FlowParameters.java renamed to auth/src/main/java/com/firebase/ui/auth/data/model/FlowParameters.java

@@ -11,7 +11,7 @@
  * express or implied. See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.firebase.ui.auth.ui;
+package com.firebase.ui.auth.data.model;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -24,6 +24,7 @@
 import android.support.annotation.StyleRes;
 
 import com.firebase.ui.auth.AuthUI.IdpConfig;
+import com.firebase.ui.auth.util.ExtraConstants;
 import com.firebase.ui.auth.util.Preconditions;
 
 import java.util.Collections;

auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneNumber.java renamed to auth/src/main/java/com/firebase/ui/auth/data/model/PhoneNumber.java

@@ -15,11 +15,11 @@
  *
  * Modifications copyright (C) 2017 Google Inc
  */
-package com.firebase.ui.auth.ui.phone;
+package com.firebase.ui.auth.data.model;
 
 import android.text.TextUtils;
 
-final class PhoneNumber {
+public final class PhoneNumber {
     private static final PhoneNumber EMPTY_PHONE_NUMBER = new PhoneNumber("", "", "");
 
     private final String phoneNumber;