refactor: change package name (#33)

dhruv1294 · web-flow · commit 13025e4a5efb · 2021-12-20T10:05:26.000+05:30
diff --git a/DauthSDK/src/main/AndroidManifest.xml b/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"
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/auth/DAuth.kt b/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
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/auth/DAuthAuthenticatorActivity.kt b/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.*
 
 /**
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/auth/DauthAccountAuthenticator.kt b/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
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/auth/DauthAuthenticatorService.kt b/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
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/auth/api/ApiRoutes.kt b/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)
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/auth/api/DAuthApi.kt b/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.*
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/auth/api/RetrofitInstance.kt b/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
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/auth/constants/AccountManagerConstants.kt b/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"
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/auth/constants/ErrorCodeConstants.kt b/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
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/auth/constants/ErrorMessageConstants.kt b/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"
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/auth/constants/WebViewConstants.kt b/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"
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/auth/deltaButton/DeltaButton.kt b/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
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/auth/helpers/Connectivity.kt b/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
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/auth/helpers/DateUtils.kt b/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.*
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/auth/helpers/GsonHelper.kt b/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
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/auth/helpers/PkceUtils.kt b/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
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/auth/helpers/ViewUtils.kt b/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
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/auth/helpers/WebViewHelper.kt b/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
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/auth/interfaces/ResultListener.kt b/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)
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/auth/models/AuthorizationErrorType.kt b/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,
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/auth/models/AuthorizationRequest.kt b/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,
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/auth/models/AuthorizationResponse.kt b/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,
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/auth/models/ClientCredentials.kt b/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,
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/auth/models/GrantType.kt b/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 {
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/auth/models/Key.kt b/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,
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/auth/models/ResponseType.kt b/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{
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/auth/models/Result.kt b/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?,
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/auth/models/Scope.kt b/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 {
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/auth/models/Token.kt b/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,
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/auth/models/TokenRequest.kt b/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,
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/auth/models/User.kt b/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,
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/auth/models/jwks.kt b/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>
diff --git a/DauthSDK/src/main/java/edu/nitt/delta/auth/models/jwt.kt b/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,
diff --git a/DauthSDK/src/main/res/layout/activity_dauth_authenticator.xml b/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>
diff --git a/sampleApp/build.gradle b/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
diff --git a/sampleApp/src/Java/java/edu/nitt/delta/auth/sample/MainActivity.java b/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
diff --git a/sampleApp/src/Kotlin/java/edu/nitt/delta/auth/sample/MainActivity.kt b/sampleApp/src/Kotlin/java/edu/nitt/delta/auth/sample/MainActivity.kt
diff --git a/sampleApp/src/main/AndroidManifest.xml b/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"
diff --git a/sampleApp/src/main/res/layout/activity_main.xml b/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"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package edu.nitt.delta`
	`1`	`+package edu.nitt.delta.auth`
`2`	`2`
`3`	`3`	`import android.app.Service`
`4`	`4`	`import android.content.Intent`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package edu.nitt.delta.api`
	`1`	`+package edu.nitt.delta.auth.api`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* Singleton object containing the [api routes](https://delta.github.io/DAuth-Docs/#endpoints)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package edu.nitt.delta.constants`
	`1`	`+package edu.nitt.delta.auth.constants`
`2`	`2`
`3`	`3`	`object AccountManagerConstants {`
`4`	`4`	`const val AccountType = "auth.delta.nitt.edu"`