Skip to content

Commit 0e8048f

Browse files
raphaelbussaraphaelbussa
committed
version 3.0.0
- update libs
1 parent 1167924 commit 0e8048f

File tree

12 files changed

+113
-92
lines changed

12 files changed

+113
-92
lines changed

‎build.gradle‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,23 @@ buildscript {
2828

2929
ext {
3030
var = [
31-
compileSdk: 27,
31+
compileSdk: 28,
3232
minSdk : 14,
33-
targetSdk : 27,
34-
version : "2.0.7",
35-
supportLib: "27.1.1"
33+
targetSdk : 28,
34+
version : "3.0.0",
35+
supportLib: "1.0.0-rc02"
3636
]
3737
}
3838

3939
repositories {
4040
jcenter()
4141
maven { url "https://maven.google.com" }
42+
google()
4243
}
4344

4445
dependencies {
45-
classpath 'com.android.tools.build:gradle:3.1.1'
46-
classpath 'com.novoda:bintray-release:0.8.0'
46+
classpath 'com.android.tools.build:gradle:3.3.0-alpha11'
47+
classpath 'guru.stefma.bintrayrelease:bintrayrelease:1.0.0'
4748
}
4849
}
4950

‎library/build.gradle‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424

2525
apply plugin: 'com.android.library'
26-
apply plugin: 'com.novoda.bintray-release'
26+
apply plugin: "guru.stefma.bintrayrelease"
2727

2828
android {
2929

@@ -50,14 +50,15 @@ android {
5050
}
5151

5252
dependencies {
53-
implementation "com.android.support:support-v13:${var.supportLib}"
53+
implementation "androidx.legacy:legacy-support-v13:${var.supportLib}"
54+
implementation "androidx.fragment:fragment:${var.supportLib}"
5455
}
5556

57+
version = '3.0.0'
58+
group = 'rebus'
5659
publish {
5760
userOrg = 'raphaelbussa'
58-
groupId = 'rebus'
5961
artifactId = 'permission-utils'
60-
publishVersion = "${var.version}"
6162
desc = 'Check marshmallow permission easily'
62-
website = 'https://github.com/rebus007/PermissionUtils'
63+
website = 'https://rebus007.github.io/PermissionUtils/'
6364
}

‎library/src/main/java/rebus/permissionutils/PermissionEnum.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626

2727
import android.Manifest;
2828
import android.annotation.SuppressLint;
29-
import android.support.annotation.NonNull;
29+
30+
import androidx.annotation.NonNull;
3031

3132
/**
3233
* Created by raphaelbussa on 22/06/16.
3334
*/
34-
@SuppressWarnings("SpellCheckingInspection")
3535
@SuppressLint("InlinedApi")
3636
public enum PermissionEnum {
3737

@@ -87,6 +87,7 @@ public static PermissionEnum fromManifestPermission(@NonNull String value) {
8787
return NULL;
8888
}
8989

90+
@NonNull
9091
@Override
9192
public String toString() {
9293
return permission;

‎library/src/main/java/rebus/permissionutils/PermissionManager.java‎

Lines changed: 29 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,18 @@
2626

2727
import android.content.pm.PackageManager;
2828
import android.os.Build;
29-
import android.support.annotation.NonNull;
30-
import android.support.v13.app.FragmentCompat;
31-
import android.support.v4.app.ActivityCompat;
3229

3330
import java.util.ArrayList;
3431
import java.util.Collections;
3532

33+
import androidx.annotation.NonNull;
34+
import androidx.core.app.ActivityCompat;
35+
import androidx.legacy.app.FragmentCompat;
36+
3637
/**
3738
* Created by raphaelbussa on 22/06/16.
3839
*/
40+
@SuppressWarnings("unused")
3941
public class PermissionManager {
4042

4143
private static PermissionManager instance;
@@ -76,13 +78,13 @@ public static void handleResult(@NonNull android.app.Activity activity, int requ
7678
}
7779

7880
/**
79-
* @param v4fragment target v4 fragment
81+
* @param fragmentX target v4 fragment
8082
* @param requestCode requestCode
8183
* @param permissions permissions
8284
* @param grantResults grantResults
8385
*/
84-
public static void handleResult(@NonNull android.support.v4.app.Fragment v4fragment, int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
85-
handleResult(null, v4fragment, null, requestCode, permissions, grantResults);
86+
public static void handleResult(@NonNull androidx.fragment.app.Fragment fragmentX, int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
87+
handleResult(null, fragmentX, null, requestCode, permissions, grantResults);
8688
}
8789

8890
/**
@@ -91,11 +93,13 @@ public static void handleResult(@NonNull android.support.v4.app.Fragment v4fragm
9193
* @param permissions permissions
9294
* @param grantResults grantResults
9395
*/
96+
@Deprecated
9497
public static void handleResult(@NonNull android.app.Fragment fragment, int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
9598
handleResult(null, null, fragment, requestCode, permissions, grantResults);
9699
}
97100

98-
private static void handleResult(final android.app.Activity activity, final android.support.v4.app.Fragment v4fragment, final android.app.Fragment fragment, int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
101+
@SuppressWarnings("deprecation")
102+
private static void handleResult(final android.app.Activity activity, final androidx.fragment.app.Fragment fragmentX, final android.app.Fragment fragment, int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
99103
if (instance == null) return;
100104
if (requestCode == instance.key) {
101105
for (int i = 0; i < permissions.length; i++) {
@@ -107,8 +111,8 @@ private static void handleResult(final android.app.Activity activity, final andr
107111
permissionsDeniedForever = ActivityCompat.shouldShowRequestPermissionRationale(activity, permissions[i]);
108112
} else if (fragment != null) {
109113
permissionsDeniedForever = FragmentCompat.shouldShowRequestPermissionRationale(fragment, permissions[i]);
110-
} else if (v4fragment != null) {
111-
permissionsDeniedForever = v4fragment.shouldShowRequestPermissionRationale(permissions[i]);
114+
} else if (fragmentX != null) {
115+
permissionsDeniedForever = fragmentX.shouldShowRequestPermissionRationale(permissions[i]);
112116
}
113117
if (!permissionsDeniedForever) {
114118
instance.permissionsDeniedForever.add(PermissionEnum.fromManifestPermission(permissions[i]));
@@ -124,14 +128,14 @@ private static void handleResult(final android.app.Activity activity, final andr
124128
@Override
125129
public void result(boolean askAgain) {
126130
if (askAgain) {
127-
instance.ask(activity, v4fragment, fragment);
131+
instance.ask(activity, fragmentX, fragment);
128132
} else {
129133
instance.showResult();
130134
}
131135
}
132136
});
133137
} else {
134-
instance.ask(activity, v4fragment, fragment);
138+
instance.ask(activity, fragmentX, fragment);
135139
}
136140
} else {
137141
instance.showResult();
@@ -238,34 +242,36 @@ public void ask(android.app.Activity activity) {
238242
}
239243

240244
/**
241-
* @param v4fragment target v4 fragment
242-
* just start all permission manager
245+
* @param fragmentX target v4 fragment
246+
* just start all permission manager
243247
*/
244-
public void ask(android.support.v4.app.Fragment v4fragment) {
245-
ask(null, v4fragment, null);
248+
public void ask(androidx.fragment.app.Fragment fragmentX) {
249+
ask(null, fragmentX, null);
246250
}
247251

248252
/**
249253
* @param fragment target fragment
250254
* just start all permission manager
251255
*/
256+
@Deprecated
252257
public void ask(android.app.Fragment fragment) {
253258
ask(null, null, fragment);
254259
}
255260

256-
private void ask(android.app.Activity activity, android.support.v4.app.Fragment v4fragment, android.app.Fragment fragment) {
261+
@SuppressWarnings("deprecation")
262+
private void ask(android.app.Activity activity, androidx.fragment.app.Fragment fragmentX, android.app.Fragment fragment) {
257263
initArray();
258264
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
259-
String[] permissionToAsk = permissionToAsk(activity, v4fragment, fragment);
265+
String[] permissionToAsk = permissionToAsk(activity, fragmentX, fragment);
260266
if (permissionToAsk.length == 0) {
261267
showResult();
262268
} else {
263269
if (activity != null) {
264270
ActivityCompat.requestPermissions(activity, permissionToAsk, key);
265271
} else if (fragment != null) {
266272
FragmentCompat.requestPermissions(fragment, permissionToAsk, key);
267-
} else if (v4fragment != null) {
268-
v4fragment.requestPermissions(permissionToAsk, key);
273+
} else if (fragmentX != null) {
274+
fragmentX.requestPermissions(permissionToAsk, key);
269275
}
270276
}
271277
} else {
@@ -277,17 +283,18 @@ private void ask(android.app.Activity activity, android.support.v4.app.Fragment
277283
/**
278284
* @return permission that you really need to ask
279285
*/
286+
@SuppressWarnings("ToArrayCallWithZeroLengthArrayArgument")
280287
@NonNull
281-
private String[] permissionToAsk(android.app.Activity activity, android.support.v4.app.Fragment v4fragment, android.app.Fragment fragment) {
288+
private String[] permissionToAsk(android.app.Activity activity, androidx.fragment.app.Fragment fragmentX, android.app.Fragment fragment) {
282289
ArrayList<String> permissionToAsk = new ArrayList<>();
283290
for (PermissionEnum permission : permissions) {
284291
boolean isGranted = false;
285292
if (activity != null) {
286293
isGranted = PermissionUtils.isGranted(activity, permission);
287294
} else if (fragment != null) {
288295
isGranted = PermissionUtils.isGranted(fragment.getActivity(), permission);
289-
} else if (v4fragment != null) {
290-
isGranted = PermissionUtils.isGranted(v4fragment.getActivity(), permission);
296+
} else if (fragmentX != null) {
297+
isGranted = PermissionUtils.isGranted(fragmentX.getActivity(), permission);
291298
}
292299
if (!isGranted) {
293300
permissionToAsk.add(permission.toString());

‎library/src/main/java/rebus/permissionutils/PermissionUtils.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,13 @@
2929
import android.content.pm.PackageManager;
3030
import android.net.Uri;
3131
import android.os.Build;
32-
import android.support.v4.content.ContextCompat;
32+
33+
import androidx.core.content.ContextCompat;
3334

3435
/**
3536
* Created by raphaelbussa on 22/06/16.
3637
*/
38+
@SuppressWarnings({"unused", "WeakerAccess"})
3739
public class PermissionUtils {
3840

3941
/**

‎sample/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,6 @@ android {
4848

4949
dependencies {
5050
implementation project(':library')
51-
implementation "com.android.support:appcompat-v7:${var.supportLib}"
52-
implementation "com.android.support:design:${var.supportLib}"
51+
implementation "com.google.android.material:material:${var.supportLib}"
52+
implementation "androidx.appcompat:appcompat:${var.supportLib}"
5353
}

‎sample/src/main/java/rebus/permissionutils/sample/FragmentActivity.java‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,31 +25,33 @@
2525
package rebus.permissionutils.sample;
2626

2727
import android.os.Bundle;
28-
import android.support.v7.app.AppCompatActivity;
2928
import android.view.MenuItem;
3029

30+
import androidx.appcompat.app.AppCompatActivity;
31+
3132
public class FragmentActivity extends AppCompatActivity {
3233

3334
private final static String SECOND_FRAGMENT = "SECOND_FRAGMENT";
34-
private final static String SECOND_FRAGMENT_V4 = "SECOND_FRAGMENT_V4";
35+
private final static String SECOND_FRAGMENT_X = "SECOND_FRAGMENT_X";
3536

37+
@SuppressWarnings("ConstantConditions")
3638
@Override
3739
protected void onCreate(Bundle savedInstanceState) {
3840
super.onCreate(savedInstanceState);
3941
setContentView(R.layout.activity_fragment);
4042

41-
boolean isFragmentV4 = getIntent().getExtras().getBoolean("IS_FRAGMENT_V4");
43+
boolean isFragmentX = getIntent().getExtras().getBoolean("IS_FRAGMENT_X");
4244

4345
if (getSupportActionBar() != null) {
4446
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
45-
getSupportActionBar().setSubtitle(isFragmentV4 ? "Fragment V4" : "Fragment");
47+
getSupportActionBar().setSubtitle(isFragmentX ? "Fragment V4" : "Fragment");
4648
}
4749

48-
if (isFragmentV4) {
50+
if (isFragmentX) {
4951
if (savedInstanceState == null) {
50-
android.support.v4.app.Fragment fragment = android.support.v4.app.Fragment.instantiate(this, SecondFragmentV4.class.getName());
52+
androidx.fragment.app.Fragment fragment = androidx.fragment.app.Fragment.instantiate(this, SecondFragmentX.class.getName());
5153
getSupportFragmentManager().beginTransaction()
52-
.add(R.id.container, fragment, SECOND_FRAGMENT_V4)
54+
.add(R.id.container, fragment, SECOND_FRAGMENT_X)
5355
.commit();
5456
}
5557
} else {

‎sample/src/main/java/rebus/permissionutils/sample/MainActivity.java‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@
2828
import android.content.Intent;
2929
import android.os.Build;
3030
import android.os.Bundle;
31-
import android.support.annotation.NonNull;
32-
import android.support.v7.app.AlertDialog;
33-
import android.support.v7.app.AppCompatActivity;
3431
import android.text.Html;
3532
import android.text.Spanned;
3633
import android.text.method.LinkMovementMethod;
@@ -44,6 +41,9 @@
4441
import java.util.ArrayList;
4542
import java.util.List;
4643

44+
import androidx.annotation.NonNull;
45+
import androidx.appcompat.app.AlertDialog;
46+
import androidx.appcompat.app.AppCompatActivity;
4747
import rebus.permissionutils.AskAgainCallback;
4848
import rebus.permissionutils.FullCallback;
4949
import rebus.permissionutils.PermissionEnum;
@@ -63,14 +63,14 @@ protected void onCreate(Bundle savedInstanceState) {
6363
getSupportActionBar().setSubtitle("Activity");
6464
}
6565

66-
Button askOnePermission = (Button) findViewById(R.id.ask_one_permission);
67-
Button askThreePermission = (Button) findViewById(R.id.ask_three_permission);
68-
Button askOnePermissionSimple = (Button) findViewById(R.id.ask_one_permission_simple);
69-
Button askThreePermissionSimple = (Button) findViewById(R.id.ask_three_permission_simple);
70-
Button askOnePermissionSmart = (Button) findViewById(R.id.ask_one_permission_smart);
71-
Button askThreePermissionSmart = (Button) findViewById(R.id.ask_three_permission_smart);
66+
Button askOnePermission = findViewById(R.id.ask_one_permission);
67+
Button askThreePermission = findViewById(R.id.ask_three_permission);
68+
Button askOnePermissionSimple = findViewById(R.id.ask_one_permission_simple);
69+
Button askThreePermissionSimple = findViewById(R.id.ask_three_permission_simple);
70+
Button askOnePermissionSmart = findViewById(R.id.ask_one_permission_smart);
71+
Button askThreePermissionSmart = findViewById(R.id.ask_three_permission_smart);
7272

73-
Button checkPermission = (Button) findViewById(R.id.check_permission);
73+
Button checkPermission = findViewById(R.id.check_permission);
7474

7575
askOnePermission.setOnClickListener(new View.OnClickListener() {
7676
@Override
@@ -210,6 +210,7 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
210210
PermissionManager.handleResult(this, requestCode, permissions, grantResults);
211211
}
212212

213+
@SuppressWarnings("ToArrayCallWithZeroLengthArrayArgument")
213214
@Override
214215
public void result(ArrayList<PermissionEnum> permissionsGranted, ArrayList<PermissionEnum> permissionsDenied, ArrayList<PermissionEnum> permissionsDeniedForever, ArrayList<PermissionEnum> permissionsAsked) {
215216
List<String> msg = new ArrayList<>();
@@ -243,6 +244,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
243244
return super.onCreateOptionsMenu(menu);
244245
}
245246

247+
@SuppressWarnings("ConstantConditions")
246248
@Override
247249
public boolean onOptionsItemSelected(MenuItem item) {
248250
switch (item.getItemId()) {
@@ -251,12 +253,12 @@ public boolean onOptionsItemSelected(MenuItem item) {
251253
break;
252254
case R.id.action_fragment_v4:
253255
Intent fragmentV4 = new Intent(MainActivity.this, FragmentActivity.class);
254-
fragmentV4.putExtra("IS_FRAGMENT_V4", true);
256+
fragmentV4.putExtra("IS_FRAGMENT_X", true);
255257
startActivity(fragmentV4);
256258
break;
257259
case R.id.action_fragment:
258260
Intent fragment = new Intent(MainActivity.this, FragmentActivity.class);
259-
fragment.putExtra("IS_FRAGMENT_V4", false);
261+
fragment.putExtra("IS_FRAGMENT_X", false);
260262
startActivity(fragment);
261263
break;
262264
case R.id.action_info:
@@ -266,7 +268,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
266268
builder.setPositiveButton(getString(R.string.close), null);
267269
AlertDialog dialog = builder.create();
268270
dialog.show();
269-
TextView textView = (TextView) dialog.findViewById(android.R.id.message);
271+
TextView textView = dialog.findViewById(android.R.id.message);
270272
if (textView != null) {
271273
textView.setMovementMethod(LinkMovementMethod.getInstance());
272274
}
@@ -295,6 +297,7 @@ public void onClick(DialogInterface dialogInterface, int i) {
295297
.show();
296298
}
297299

300+
@SuppressWarnings("deprecation")
298301
private Spanned fromHtml(String value) {
299302
if (value == null) {
300303
value = "";

0 commit comments

Comments
 (0)