Merge pull request #135 from ParkSangGwon/split-tedpermission-util

Split tedpermission util
ParkSangGwon · Oct 27, 2021 · b97ba2e · b97ba2e
2 parents c0fac70 + 393f046
commit b97ba2e
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 18 deletions.
diff --git a/app/src/main/java/com/gun0912/tedpermissiondemo/MainActivity.java b/app/src/main/java/com/gun0912/tedpermissiondemo/MainActivity.java
@@ -9,6 +9,7 @@
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import com.gun0912.tedpermission.TedPermissionUtil;
 import com.gun0912.tedpermission.normal.TedPermission;
 
 import java.util.List;
@@ -27,9 +28,9 @@ protected void onCreate(Bundle savedInstanceState) {
         findViewById(R.id.btn_coroutine).setOnClickListener(this);
         findViewById(R.id.btn_windowPermission).setOnClickListener(this);
 
-        boolean isGranted = TedPermission.isGranted(Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.ACCESS_FINE_LOCATION);
+        boolean isGranted = TedPermissionUtil.isGranted(Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.ACCESS_FINE_LOCATION);
         Log.d("ted", "isGranted: " + isGranted);
-        List<String> deniedPermissions = TedPermission.getDeniedPermissions(Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.ACCESS_FINE_LOCATION);
+        List<String> deniedPermissions = TedPermissionUtil.getDeniedPermissions(Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.ACCESS_FINE_LOCATION);
         Log.d("ted", "deniedPermissions: " + deniedPermissions);
     }
 

diff --git a/app/src/main/java/com/gun0912/tedpermissiondemo/WindowPermissionActivity.java b/app/src/main/java/com/gun0912/tedpermissiondemo/WindowPermissionActivity.java
@@ -9,6 +9,7 @@
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.gun0912.tedpermission.PermissionListener;
+import com.gun0912.tedpermission.TedPermissionUtil;
 import com.gun0912.tedpermission.normal.TedPermission;
 
 import java.util.List;
@@ -22,7 +23,7 @@ public class WindowPermissionActivity extends AppCompatActivity {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        boolean isAlertWindowPermissionGranted = TedPermission.isGranted(Manifest.permission.SYSTEM_ALERT_WINDOW);
+        boolean isAlertWindowPermissionGranted = TedPermissionUtil.isGranted(Manifest.permission.SYSTEM_ALERT_WINDOW);
         Log.d("ted", "isAlertWindowPermissionGranted: " + isAlertWindowPermissionGranted);
 
 

diff --git a/tedpermission-coroutine/src/main/java/com/gun0912/tedpermission/coroutine/TedPermission.kt b/tedpermission-coroutine/src/main/java/com/gun0912/tedpermission/coroutine/TedPermission.kt
@@ -3,13 +3,12 @@ package com.gun0912.tedpermission.coroutine
 import android.annotation.SuppressLint
 import com.gun0912.tedpermission.PermissionBuilder
 import com.gun0912.tedpermission.PermissionListener
-import com.gun0912.tedpermission.TedPermissionBase
 import com.gun0912.tedpermission.TedPermissionResult
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 
 @SuppressLint("StaticFieldLeak")
-object TedPermission : TedPermissionBase() {
+object TedPermission {
 
     fun create(): Builder = Builder()
 

diff --git a/tedpermission-normal/src/main/java/com/gun0912/tedpermission/normal/TedPermission.java b/tedpermission-normal/src/main/java/com/gun0912/tedpermission/normal/TedPermission.java
@@ -1,9 +1,8 @@
 package com.gun0912.tedpermission.normal;
 
 import com.gun0912.tedpermission.PermissionBuilder;
-import com.gun0912.tedpermission.TedPermissionBase;
 
-public class TedPermission extends TedPermissionBase {
+public class TedPermission  {
     public static final String TAG = TedPermission.class.getSimpleName();
 
     public static Builder create() {

diff --git a/tedpermission-rx2/src/main/java/com/gun0912/tedpermission/rx2/TedPermission.java b/tedpermission-rx2/src/main/java/com/gun0912/tedpermission/rx2/TedPermission.java
@@ -2,7 +2,6 @@
 
 import com.gun0912.tedpermission.PermissionBuilder;
 import com.gun0912.tedpermission.PermissionListener;
-import com.gun0912.tedpermission.TedPermissionBase;
 import com.gun0912.tedpermission.TedPermissionResult;
 
 import java.util.List;
@@ -11,7 +10,7 @@
 import io.reactivex.SingleEmitter;
 import io.reactivex.SingleOnSubscribe;
 
-public class TedPermission extends TedPermissionBase {
+public class TedPermission {
 
     public static Builder create() {
         return new Builder();

diff --git a/tedpermission-rx3/src/main/java/com/gun0912/tedpermission/rx3/TedPermission.java b/tedpermission-rx3/src/main/java/com/gun0912/tedpermission/rx3/TedPermission.java
@@ -2,7 +2,6 @@
 
 import com.gun0912.tedpermission.PermissionBuilder;
 import com.gun0912.tedpermission.PermissionListener;
-import com.gun0912.tedpermission.TedPermissionBase;
 import com.gun0912.tedpermission.TedPermissionResult;
 
 import java.util.List;
@@ -13,7 +12,7 @@
 import io.reactivex.rxjava3.core.SingleOnSubscribe;
 
 
-public class TedPermission extends TedPermissionBase {
+public class TedPermission {
 
     public static Builder create() {
         return new Builder();

diff --git a/tedpermission/src/main/java/com/gun0912/tedpermission/PermissionBuilder.java b/tedpermission/src/main/java/com/gun0912/tedpermission/PermissionBuilder.java
@@ -58,7 +58,7 @@ protected void checkPermissions() {
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         intent.addFlags(Intent.FLAG_ACTIVITY_NO_USER_ACTION);
         TedPermissionActivity.startActivity(context, intent, listener);
-        TedPermissionBase.setFirstRequest(permissions);
+        TedPermissionUtil.setFirstRequest(permissions);
     }
 
     public T setPermissionListener(PermissionListener listener) {

diff --git a/tedpermission/src/main/java/com/gun0912/tedpermission/TedPermissionActivity.java b/tedpermission/src/main/java/com/gun0912/tedpermission/TedPermissionActivity.java
@@ -11,7 +11,6 @@
 import android.os.Bundle;
 import android.provider.Settings;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.WindowManager;
 
 import androidx.annotation.NonNull;
@@ -168,7 +167,7 @@ private void checkPermissions(boolean fromOnActivityResult) {
                     needPermissions.add(permission);
                 }
             } else {
-                if (TedPermissionBase.isDenied(permission)) {
+                if (TedPermissionUtil.isDenied(permission)) {
                     needPermissions.add(permission);
                 }
             }
@@ -259,7 +258,7 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
                                            @NonNull int[] grantResults) {
 
         super.onRequestPermissionsResult(requestCode, permissions, grantResults);
-        List<String> deniedPermissions = TedPermissionBase.getDeniedPermissions(permissions);
+        List<String> deniedPermissions = TedPermissionUtil.getDeniedPermissions(permissions);
 
         if (deniedPermissions.isEmpty()) {
             permissionResult(null);
@@ -297,7 +296,7 @@ public void onClick(DialogInterface dialogInterface, int i) {
             builder.setPositiveButton(settingButtonText, new DialogInterface.OnClickListener() {
                 @Override
                 public void onClick(DialogInterface dialog, int which) {
-                    TedPermissionBase.startSettingActivityForResult(TedPermissionActivity.this);
+                    TedPermissionUtil.startSettingActivityForResult(TedPermissionActivity.this);
 
                 }
             });
@@ -356,7 +355,7 @@ public void onClick(DialogInterface dialog, int which) {
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         switch (requestCode) {
-            case TedPermissionBase.REQ_CODE_REQUEST_SETTING:
+            case TedPermissionUtil.REQ_CODE_REQUEST_SETTING:
                 checkPermissions(true);
                 break;
             case REQ_CODE_SYSTEM_ALERT_WINDOW_PERMISSION_REQUEST:   // 최초 ALERT WINDOW 요청에 대한 결과

diff --git a/...0912/tedpermission/TedPermissionBase.java → ...0912/tedpermission/TedPermissionUtil.java b/...0912/tedpermission/TedPermissionBase.java → ...0912/tedpermission/TedPermissionUtil.java
@@ -25,7 +25,7 @@
  * Created by TedPark on 2017. 9. 26..
  */
 
-public abstract class TedPermissionBase {
+public class TedPermissionUtil {
     public static final int REQ_CODE_REQUEST_SETTING = 2000;
     private static final String PREFS_NAME_PERMISSION = "PREFS_NAME_PERMISSION";
     private static final String PREFS_IS_FIRST_REQUEST = "IS_FIRST_REQUEST";