refactor: change package name (#33)

DauthSDK/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="edu.nitt.delta">
+    package="edu.nitt.delta.auth">
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission
         android:name="android.permission.AUTHENTICATE_ACCOUNTS"

DauthSDK/src/main/java/edu/nitt/delta/DAuth.kt → DauthSDK/src/main/java/edu/nitt/delta/auth/DAuth.kt

@@ -1,4 +1,4 @@
-package edu.nitt.delta
+package edu.nitt.delta.auth
 
 import android.accounts.Account
 import android.accounts.AccountManager
@@ -7,18 +7,18 @@ import android.app.AlertDialog
 import android.net.Uri
 import android.util.Base64
 import com.google.gson.GsonBuilder
-import edu.nitt.delta.api.RetrofitInstance
-import edu.nitt.delta.constants.AccountManagerConstants
-import edu.nitt.delta.constants.ErrorMessageConstants
-import edu.nitt.delta.constants.WebViewConstants.BaseAuthority
-import edu.nitt.delta.constants.WebViewConstants.BaseUrl
-import edu.nitt.delta.constants.WebViewConstants.Scheme
-import edu.nitt.delta.helpers.PkceUtil
-import edu.nitt.delta.helpers.isNetworkAvailable
-import edu.nitt.delta.helpers.openWebView
-import edu.nitt.delta.helpers.toMap
-import edu.nitt.delta.interfaces.ResultListener
-import edu.nitt.delta.models.*
+import edu.nitt.delta.auth.api.RetrofitInstance
+import edu.nitt.delta.auth.constants.AccountManagerConstants
+import edu.nitt.delta.auth.constants.ErrorMessageConstants
+import edu.nitt.delta.auth.constants.WebViewConstants.BaseAuthority
+import edu.nitt.delta.auth.constants.WebViewConstants.BaseUrl
+import edu.nitt.delta.auth.constants.WebViewConstants.Scheme
+import edu.nitt.delta.auth.helpers.PkceUtil
+import edu.nitt.delta.auth.helpers.isNetworkAvailable
+import edu.nitt.delta.auth.helpers.openWebView
+import edu.nitt.delta.auth.helpers.toMap
+import edu.nitt.delta.auth.interfaces.ResultListener
+import edu.nitt.delta.auth.models.*
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response

DauthSDK/src/main/java/edu/nitt/delta/DAuthAuthenticatorActivity.kt → DauthSDK/src/main/java/edu/nitt/delta/auth/DAuthAuthenticatorActivity.kt

@@ -1,18 +1,18 @@
-package edu.nitt.delta
+package edu.nitt.delta.auth
 
 import android.accounts.Account
 import android.accounts.AccountAuthenticatorResponse
 import android.accounts.AccountManager
 import android.app.Activity
 import android.net.Uri
 import android.os.Bundle
-import edu.nitt.delta.constants.AccountManagerConstants
-import edu.nitt.delta.constants.ErrorCodeConstants
-import edu.nitt.delta.constants.ErrorMessageConstants
-import edu.nitt.delta.constants.WebViewConstants
-import edu.nitt.delta.helpers.toFormatString
-import edu.nitt.delta.helpers.openWebView
-import edu.nitt.delta.helpers.retrieveCookie
+import edu.nitt.delta.auth.constants.AccountManagerConstants
+import edu.nitt.delta.auth.constants.ErrorCodeConstants
+import edu.nitt.delta.auth.constants.ErrorMessageConstants
+import edu.nitt.delta.auth.constants.WebViewConstants
+import edu.nitt.delta.auth.helpers.toFormatString
+import edu.nitt.delta.auth.helpers.openWebView
+import edu.nitt.delta.auth.helpers.retrieveCookie
 import java.util.*
 
 /**

DauthSDK/src/main/java/edu/nitt/delta/DauthAccountAuthenticator.kt → DauthSDK/src/main/java/edu/nitt/delta/auth/DauthAccountAuthenticator.kt

@@ -1,4 +1,4 @@
-package edu.nitt.delta
+package edu.nitt.delta.auth
 
 import android.accounts.AbstractAccountAuthenticator
 import android.accounts.Account
@@ -7,12 +7,11 @@ import android.accounts.AccountManager
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.util.Log
-import edu.nitt.delta.api.RetrofitInstance
-import edu.nitt.delta.constants.ErrorCodeConstants
-import edu.nitt.delta.constants.ErrorMessageConstants
-import edu.nitt.delta.helpers.toDate
-import edu.nitt.delta.helpers.toFormatString
+import edu.nitt.delta.auth.api.RetrofitInstance
+import edu.nitt.delta.auth.constants.ErrorCodeConstants
+import edu.nitt.delta.auth.constants.ErrorMessageConstants
+import edu.nitt.delta.auth.helpers.toDate
+import edu.nitt.delta.auth.helpers.toFormatString
 import okhttp3.ResponseBody
 import retrofit2.Call
 import retrofit2.Callback

DauthSDK/src/main/java/edu/nitt/delta/DauthAuthenticatorService.kt → DauthSDK/src/main/java/edu/nitt/delta/auth/DauthAuthenticatorService.kt

@@ -1,4 +1,4 @@
-package edu.nitt.delta
+package edu.nitt.delta.auth
 
 import android.app.Service
 import android.content.Intent

DauthSDK/src/main/java/edu/nitt/delta/api/ApiRoutes.kt → DauthSDK/src/main/java/edu/nitt/delta/auth/api/ApiRoutes.kt

@@ -1,4 +1,4 @@
-package edu.nitt.delta.api
+package edu.nitt.delta.auth.api
 
 /**
  * Singleton object containing the [api routes](https://delta.github.io/DAuth-Docs/#endpoints)

DauthSDK/src/main/java/edu/nitt/delta/api/DAuthApi.kt → DauthSDK/src/main/java/edu/nitt/delta/auth/api/DAuthApi.kt

@@ -1,8 +1,8 @@
-package edu.nitt.delta.api
+package edu.nitt.delta.auth.api
 
-import edu.nitt.delta.models.Token
-import edu.nitt.delta.models.User
-import edu.nitt.delta.models.jwks
+import edu.nitt.delta.auth.models.Token
+import edu.nitt.delta.auth.models.User
+import edu.nitt.delta.auth.models.jwks
 import okhttp3.ResponseBody
 import retrofit2.Call
 import retrofit2.http.*

DauthSDK/src/main/java/edu/nitt/delta/api/RetrofitInstance.kt → DauthSDK/src/main/java/edu/nitt/delta/auth/api/RetrofitInstance.kt

@@ -1,4 +1,4 @@
-package edu.nitt.delta.api
+package edu.nitt.delta.auth.api
 
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor

DauthSDK/src/main/java/edu/nitt/delta/constants/AccountManagerConstants.kt → DauthSDK/src/main/java/edu/nitt/delta/auth/constants/AccountManagerConstants.kt

@@ -1,4 +1,4 @@
-package edu.nitt.delta.constants
+package edu.nitt.delta.auth.constants
 
 object AccountManagerConstants {
     const val AccountType = "auth.delta.nitt.edu"

DauthSDK/src/main/java/edu/nitt/delta/constants/ErrorCodeConstants.kt → DauthSDK/src/main/java/edu/nitt/delta/auth/constants/ErrorCodeConstants.kt

@@ -1,4 +1,4 @@
-package edu.nitt.delta.constants
+package edu.nitt.delta.auth.constants
 
 object ErrorCodeConstants {
     const val InternalError=404

DauthSDK/src/main/java/edu/nitt/delta/constants/ErrorMessageConstants.kt → DauthSDK/src/main/java/edu/nitt/delta/auth/constants/ErrorMessageConstants.kt

@@ -1,4 +1,4 @@
-package edu.nitt.delta.constants
+package edu.nitt.delta.auth.constants
 
 object ErrorMessageConstants {
     const val NoAccount="Account Not Found"

DauthSDK/src/main/java/edu/nitt/delta/constants/WebViewConstants.kt → DauthSDK/src/main/java/edu/nitt/delta/auth/constants/WebViewConstants.kt

@@ -1,4 +1,4 @@
-package edu.nitt.delta.constants
+package edu.nitt.delta.auth.constants
 
 internal object WebViewConstants {
     const val Scheme = "https"

DauthSDK/src/main/java/edu/nitt/delta/deltaButton/DeltaButton.kt → DauthSDK/src/main/java/edu/nitt/delta/auth/deltaButton/DeltaButton.kt

@@ -1,4 +1,4 @@
-package edu.nitt.delta.deltaButton
+package edu.nitt.delta.auth.deltaButton
 
 import android.annotation.SuppressLint
 import android.content.Context
@@ -10,9 +10,9 @@ import android.graphics.Color
 import android.graphics.Paint
 import android.graphics.Rect
 import androidx.core.content.ContextCompat
-import edu.nitt.delta.R
-import edu.nitt.delta.helpers.ViewUtils.dpToPixel
-import edu.nitt.delta.helpers.ViewUtils.drawableToBitmap
+import edu.nitt.delta.auth.R
+import edu.nitt.delta.auth.helpers.ViewUtils.dpToPixel
+import edu.nitt.delta.auth.helpers.ViewUtils.drawableToBitmap
 
 /**
  * An open [DeltaButton] class to integrate with the client UI

DauthSDK/src/main/java/edu/nitt/delta/helpers/Connectivity.kt → DauthSDK/src/main/java/edu/nitt/delta/auth/helpers/Connectivity.kt

@@ -1,4 +1,4 @@
-package edu.nitt.delta.helpers
+package edu.nitt.delta.auth.helpers
 
 import android.content.Context
 import android.net.ConnectivityManager

DauthSDK/src/main/java/edu/nitt/delta/helpers/DateUtils.kt → DauthSDK/src/main/java/edu/nitt/delta/auth/helpers/DateUtils.kt

@@ -1,4 +1,4 @@
-package edu.nitt.delta.helpers
+package edu.nitt.delta.auth.helpers
 
 import java.text.SimpleDateFormat
 import java.util.*

DauthSDK/src/main/java/edu/nitt/delta/helpers/GsonHelper.kt → DauthSDK/src/main/java/edu/nitt/delta/auth/helpers/GsonHelper.kt

@@ -1,4 +1,4 @@
-package edu.nitt.delta.helpers
+package edu.nitt.delta.auth.helpers
 
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken

DauthSDK/src/main/java/edu/nitt/delta/helpers/PkceUtils.kt → DauthSDK/src/main/java/edu/nitt/delta/auth/helpers/PkceUtils.kt

@@ -1,4 +1,4 @@
-package edu.nitt.delta.helpers
+package edu.nitt.delta.auth.helpers
 
 import android.util.Base64
 import java.security.MessageDigest

DauthSDK/src/main/java/edu/nitt/delta/helpers/ViewUtils.kt → DauthSDK/src/main/java/edu/nitt/delta/auth/helpers/ViewUtils.kt

@@ -1,4 +1,4 @@
-package edu.nitt.delta.helpers
+package edu.nitt.delta.auth.helpers
 
 import android.content.Context
 import android.content.res.Resources

DauthSDK/src/main/java/edu/nitt/delta/helpers/WebViewHelper.kt → DauthSDK/src/main/java/edu/nitt/delta/auth/helpers/WebViewHelper.kt

@@ -1,4 +1,4 @@
-package edu.nitt.delta.helpers
+package edu.nitt.delta.auth.helpers
 
 import android.R
 import android.app.Dialog

DauthSDK/src/main/java/edu/nitt/delta/interfaces/ResultListener.kt → DauthSDK/src/main/java/edu/nitt/delta/auth/interfaces/ResultListener.kt

@@ -1,4 +1,4 @@
-package edu.nitt.delta.interfaces
+package edu.nitt.delta.auth.interfaces
 
 interface ResultListener<T> {
     fun onSuccess(value: T)

DauthSDK/src/main/java/edu/nitt/delta/models/AuthorizationErrorType.kt → DauthSDK/src/main/java/edu/nitt/delta/auth/models/AuthorizationErrorType.kt

@@ -1,4 +1,4 @@
-package edu.nitt.delta.models
+package edu.nitt.delta.auth.models
 
 enum class AuthorizationErrorType {
     NetworkError,

DauthSDK/src/main/java/edu/nitt/delta/models/AuthorizationRequest.kt → DauthSDK/src/main/java/edu/nitt/delta/auth/models/AuthorizationRequest.kt

@@ -1,4 +1,4 @@
-package edu.nitt.delta.models
+package edu.nitt.delta.auth.models
 
 data class AuthorizationRequest(
     val response_type: ResponseType,

DauthSDK/src/main/java/edu/nitt/delta/models/AuthorizationResponse.kt → DauthSDK/src/main/java/edu/nitt/delta/auth/models/AuthorizationResponse.kt

@@ -1,4 +1,4 @@
-package edu.nitt.delta.models
+package edu.nitt.delta.auth.models
 
 data class AuthorizationResponse(
     val authorizationCode : String,

DauthSDK/src/main/java/edu/nitt/delta/models/ClientCredentials.kt → DauthSDK/src/main/java/edu/nitt/delta/auth/models/ClientCredentials.kt

@@ -1,4 +1,4 @@
-package edu.nitt.delta.models
+package edu.nitt.delta.auth.models
 
 data class ClientCredentials(
     val clientId: String,

DauthSDK/src/main/java/edu/nitt/delta/models/GrantType.kt → DauthSDK/src/main/java/edu/nitt/delta/auth/models/GrantType.kt

@@ -1,4 +1,4 @@
-package edu.nitt.delta.models
+package edu.nitt.delta.auth.models
 
 enum class GrantType {
     AuthorizationCode {

DauthSDK/src/main/java/edu/nitt/delta/models/Key.kt → DauthSDK/src/main/java/edu/nitt/delta/auth/models/Key.kt

@@ -1,4 +1,4 @@
-package edu.nitt.delta.models
+package edu.nitt.delta.auth.models
 
 data class Key(
     val e: String,

DauthSDK/src/main/java/edu/nitt/delta/models/ResponseType.kt → DauthSDK/src/main/java/edu/nitt/delta/auth/models/ResponseType.kt

@@ -1,4 +1,4 @@
-package edu.nitt.delta.models
+package edu.nitt.delta.auth.models
 
 enum class ResponseType {
     Code{

DauthSDK/src/main/java/edu/nitt/delta/models/Result.kt → DauthSDK/src/main/java/edu/nitt/delta/auth/models/Result.kt

@@ -1,4 +1,4 @@
-package edu.nitt.delta.models
+package edu.nitt.delta.auth.models
 
 data class Result(
     val user: User?,

DauthSDK/src/main/java/edu/nitt/delta/models/Scope.kt → DauthSDK/src/main/java/edu/nitt/delta/auth/models/Scope.kt

@@ -1,4 +1,4 @@
-package edu.nitt.delta.models
+package edu.nitt.delta.auth.models
 
 enum class Scope {
     OpenID {

DauthSDK/src/main/java/edu/nitt/delta/models/Token.kt → DauthSDK/src/main/java/edu/nitt/delta/auth/models/Token.kt

@@ -1,4 +1,4 @@
-package edu.nitt.delta.models
+package edu.nitt.delta.auth.models
 
 data class Token(
     val access_token: String,

DauthSDK/src/main/java/edu/nitt/delta/models/TokenRequest.kt → DauthSDK/src/main/java/edu/nitt/delta/auth/models/TokenRequest.kt

@@ -1,4 +1,4 @@
-package edu.nitt.delta.models
+package edu.nitt.delta.auth.models
 
 data class TokenRequest(
     val grant_type:String,

DauthSDK/src/main/java/edu/nitt/delta/models/User.kt → DauthSDK/src/main/java/edu/nitt/delta/auth/models/User.kt

@@ -1,4 +1,4 @@
-package edu.nitt.delta.models
+package edu.nitt.delta.auth.models
 
 data class User(
     val id: Int,

DauthSDK/src/main/java/edu/nitt/delta/models/jwks.kt → DauthSDK/src/main/java/edu/nitt/delta/auth/models/jwks.kt

@@ -1,4 +1,4 @@
-package edu.nitt.delta.models
+package edu.nitt.delta.auth.models
 
 data class jwks (
     val key: List<Key>

DauthSDK/src/main/java/edu/nitt/delta/models/jwt.kt → DauthSDK/src/main/java/edu/nitt/delta/auth/models/jwt.kt

@@ -1,4 +1,4 @@
-package edu.nitt.delta.models
+package edu.nitt.delta.auth.models
 
 data class jwt(
     val header: Header,

DauthSDK/src/main/res/layout/activity_dauth_authenticator.xml

@@ -4,5 +4,5 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".DAuthAuthenticatorActivity">
+    tools:context=".auth.DAuthAuthenticatorActivity">
 </androidx.constraintlayout.widget.ConstraintLayout>

sampleApp/build.gradle

@@ -7,7 +7,7 @@ android {
     compileSdk 30
 
     defaultConfig {
-        applicationId "edu.nitt.delta"
+        applicationId "edu.nitt.delta.auth.sample"
         minSdk 21
         targetSdk 30
         versionCode 1

sampleApp/src/Java/java/edu/nitt/delta/MainActivity.java → sampleApp/src/Java/java/edu/nitt/delta/auth/sample/MainActivity.java

@@ -1,4 +1,4 @@
-package edu.nitt.delta;
+package edu.nitt.delta.auth.sample;
 
 import android.os.Bundle;
 import android.util.Log;
@@ -8,14 +8,14 @@
 import androidx.appcompat.app.AppCompatActivity;
 import java.util.ArrayList;
 import java.util.List;
-import edu.nitt.delta.deltaButton.DeltaButton;
-import edu.nitt.delta.interfaces.ResultListener;
-import edu.nitt.delta.models.AuthorizationRequest;
-import edu.nitt.delta.models.GrantType;
-import edu.nitt.delta.models.ResponseType;
-import edu.nitt.delta.models.Result;
-import edu.nitt.delta.models.Scope;
-import edu.nitt.delta.models.User;
+import edu.nitt.delta.auth.DAuth;
+import edu.nitt.delta.auth.deltaButton.DeltaButton;
+import edu.nitt.delta.auth.interfaces.ResultListener;
+import edu.nitt.delta.auth.models.AuthorizationRequest;
+import edu.nitt.delta.auth.models.GrantType;
+import edu.nitt.delta.auth.models.ResponseType;
+import edu.nitt.delta.auth.models.Result;
+import edu.nitt.delta.auth.models.Scope;
 
 /**
  * Sample activity in java to show the use of DAuth sign in

sampleApp/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="edu.nitt.delta">
+    package="edu.nitt.delta.auth.sample">
 
     <application
         android:allowBackup="false"

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

@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
-    <edu.nitt.delta.deltaButton.DeltaButton
+    <edu.nitt.delta.auth.deltaButton.DeltaButton
         android:id="@+id/sign_in_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"