Skip to content
This repository has been archived by the owner on Jan 4, 2025. It is now read-only.

Commit

Permalink
Review permissions dialog and bump
Browse files Browse the repository at this point in the history
Signed-off-by: enricocid <[email protected]>
  • Loading branch information
enricocid committed Aug 22, 2019
1 parent e7cae6c commit 9e9558c
Show file tree
Hide file tree
Showing 8 changed files with 43 additions and 17 deletions.
12 changes: 12 additions & 0 deletions Credits.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,15 @@ The app itself is based on the original iteration [Potate da home!](https://gith
- [Naruto icon](https://iconscout.com/icon/naruto) by [Alexandru Stoica](https://iconscout.com/contributors/alexandru-stoica) on [iconscout.com](https://iconscout.com)!

- Colors presets taken from [Canva](https://www.canva.com/learn/100-color-combinations)!

- The characters depicted in Star Wars vectors are © by Lucasfilm Ltd.

- The symbols depicted in Dragon Ball vectors are © by Akira Toriyama/Shueisha.

- The symbols depicted in Naruto vector are © by Masashi Kishimoto/Shueisha.

- The symbols/logos depicted in Android versions and other google products vectors are © by Google LLC.

- The symbols/logos depicted in videogame vectors are © by Nintendo, Atari, Bandai Namco.

- The symbols depicted in Android versions and other google products are © by Google LLC.
15 changes: 10 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# <img src ="https://upload.wikimedia.org/wikipedia/commons/b/b5/Kotlin-logo.png" width=24> Vectorify da home!


###### Current version: [(25) 1.5.5](https://github.com/enricocid/VectorifyDaHome/releases/tag/v1.5.5)
###### Current version: [(26) 1.5.6](https://github.com/enricocid/VectorifyDaHome/releases/tag/v1.5.6)


[![API](https://img.shields.io/badge/API-21%2B-blue.svg?style=flat-square)](https://android-arsenal.com/api?level=21) [![Donate on PayPal](https://img.shields.io/badge/PayPal-Donate%20Now-brightgreen.svg)](https://paypal.me/enricocid)
Expand Down Expand Up @@ -37,10 +37,15 @@
The app itself implements a dark/light theme switcher!


# Other info
# License

- The characters depicted in Star Wars vectors are © by Lucasfilm Ltd.
Copyright 2019 Enrico D'Ortenzio

- The symbols depicted in Dragon Ball vectors are © by Akira Toriyama/Sh?eisha.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

- The symbols depited in Naruto vector are © by Masashi Kishimoto/Sh?eisha.
http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and limitations under the License.
2 changes: 2 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/26.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Add new nerdy/symbols vectors
- Review permissions dialog
2 changes: 2 additions & 0 deletions fastlane/metadata/android/it/changelogs/26.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Aggiunte nuove grafiche nerdy e di simboli
- Revisione dialog permessi
4 changes: 2 additions & 2 deletions project/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ android {
applicationId "com.iven.iconify"
minSdkVersion 21
targetSdkVersion 29
versionCode 25
versionName "1.5.5"
versionCode 26
versionName "1.5.6"
}

// Configure only for each module that uses Java 8
Expand Down
21 changes: 11 additions & 10 deletions project/app/src/main/java/com/iven/vectorify/utils/Utils.kt
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,6 @@ object Utils {

//make rationale permission dialog
@JvmStatic
@Suppress("DEPRECATION")
fun makeRationaleDialog(activity: Activity, which: Int, shouldRequestRationale: Boolean) {

val message = if (shouldRequestRationale) R.string.rationale else R.string.rationale_denied
Expand All @@ -160,18 +159,18 @@ object Utils {
cornerRadius(res = R.dimen.md_corner_radius)
title(R.string.title_rationale)
message(message)
positiveButton {
if (shouldRequestRationale) requestPermissions(activity, which)
positiveButton(if (shouldRequestRationale) android.R.string.ok else R.string.go_to_info) {
if (shouldRequestRationale) requestPermissions(activity, which) else
openVectorifyDaHomeDetails(activity)
}
negativeButton {
DynamicToast.makeError(context, activity.getString(R.string.boo), Toast.LENGTH_LONG)
.show()
dismiss()
if (shouldRequestRationale)
DynamicToast.makeError(context, activity.getString(R.string.boo), Toast.LENGTH_LONG)
.show()
else
DynamicToast.makeWarning(context, activity.getString(R.string.boo_info), Toast.LENGTH_LONG)
.show()
}
if (!shouldRequestRationale)
neutralButton(R.string.go_to_info) {
openVectorifyDaHomeDetails(activity)
}
}
}

Expand All @@ -183,6 +182,8 @@ object Utils {
val intent = Intent(android.provider.Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
intent.data = Uri.parse("package:" + context.packageName)
context.startActivity(intent)
DynamicToast.make(context, context.getString(R.string.boo_almost_there), Toast.LENGTH_LONG)
.show()
} catch (e: ActivityNotFoundException) {
e.printStackTrace()
}
Expand Down
2 changes: 2 additions & 0 deletions project/app/src/main/res/values-it/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,6 @@
</string>
<string name="go_to_info">Vai nelle info</string>
<string name="boo">Boo! No accesso no party! Usa il live wallpaper!</string>
<string name="boo_info">Boo! Giusto perché tu lo sappia!</string>
<string name="boo_almost_there">Ora vai nelle Autorizzazioni e abilita l\'accesso all\'Archiviazione!</string>
</resources>
2 changes: 2 additions & 0 deletions project/app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -99,4 +99,6 @@
</string>
<string name="go_to_info">Go to info</string>
<string name="boo">Boo! No access no party! Use the live wallpaper!</string>
<string name="boo_info">Boo! Just so You know!</string>
<string name="boo_almost_there">Now navigate to Permissions and enable storage access!</string>
</resources>

0 comments on commit 9e9558c

Please sign in to comment.