diff --git a/Credits.md b/Credits.md index d59fc508..419f519f 100644 --- a/Credits.md +++ b/Credits.md @@ -15,8 +15,11 @@ The app itself is based on the original iteration [Potate da home!](https://gith - [Stefan Möller](https://github.com/stupo) for his [suggestions](https://github.com/enricocid/VectorifyDaHome/issues/2)! +- [Jnss98b](https://github.com/Jnss98b) for his [support](https://github.com/enricocid/VectorifyDaHome/issues/3)! + - [Toastcode](https://toastco.de/) for the wunderbar [Screener - Better screenshots](https://play.google.com/store/apps/details?id=de.toastcode.screener) app + - Icons from [material.io](https://material.io/resources/icons), [materialdesignicons](https://materialdesignicons.com/), [Wikimedia](https://commons.wikimedia.org/wiki/Main_Page), [svgrepo](https://www.svgrepo.com) and [iconfinder](https://www.iconfinder.com)! - [Chernoff faces](https://commons.wikimedia.org/wiki/File:Chernoff_faces_for_evaluations_of_US_judges.svg) by [Chernoff (1973)](https://en.wikipedia.org/wiki/Chernoff_face)! diff --git a/README.md b/README.md index 85fabb86..1e4a3d26 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Vectorify da home! -###### Current version: [(29) 1.6.1](https://github.com/enricocid/VectorifyDaHome/releases/tag/v1.6.1) +###### Current version: [(30) 1.6.2](https://github.com/enricocid/VectorifyDaHome/releases/tag/v1.6.2) [![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) diff --git a/fastlane/metadata/android/en-US/changelogs/30.txt b/fastlane/metadata/android/en-US/changelogs/30.txt new file mode 100644 index 00000000..7fc12aec --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/30.txt @@ -0,0 +1,4 @@ +- Add 4 new Android logos +- Update dependencies + +Thanks to Jnss98b (https://github.com/Jnss98b) for support :D diff --git a/fastlane/metadata/android/it/changelogs/30.txt b/fastlane/metadata/android/it/changelogs/30.txt new file mode 100644 index 00000000..7bd27207 --- /dev/null +++ b/fastlane/metadata/android/it/changelogs/30.txt @@ -0,0 +1,4 @@ +- Aggiunti 4 nuovi loghi Android +- Aggiornate dipendenze + +Grazie a Jnss98b (https://github.com/Jnss98b) per il supporto :D diff --git a/project/app/build.gradle b/project/app/build.gradle index dc773a18..c4140541 100644 --- a/project/app/build.gradle +++ b/project/app/build.gradle @@ -11,8 +11,8 @@ android { applicationId "com.iven.iconify" minSdkVersion 21 targetSdkVersion 29 - versionCode 29 - versionName "1.6.1" + versionCode 30 + versionName "1.6.2" } // Configure only for each module that uses Java 8 diff --git a/project/app/src/main/java/com/iven/vectorify/RecentSetupsFragment.kt b/project/app/src/main/java/com/iven/vectorify/RecentSetupsFragment.kt index de70c6f1..ceb89c46 100644 --- a/project/app/src/main/java/com/iven/vectorify/RecentSetupsFragment.kt +++ b/project/app/src/main/java/com/iven/vectorify/RecentSetupsFragment.kt @@ -23,7 +23,11 @@ class RecentSetupsFragment : BottomSheetDialogFragment() { override fun getTheme(): Int = R.style.BottomSheetDialogTheme - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { return inflater.inflate(R.layout.recent_setups_fragment, container, false) } @@ -56,7 +60,7 @@ class RecentSetupsFragment : BottomSheetDialogFragment() { dismiss() } - override fun onDismiss(dialog: DialogInterface?) { + override fun onDismiss(dialog: DialogInterface) { if (sError) { MaterialDialog(context!!).show { cornerRadius(res = R.dimen.md_corner_radius) diff --git a/project/app/src/main/java/com/iven/vectorify/VectorifyActivity.kt b/project/app/src/main/java/com/iven/vectorify/VectorifyActivity.kt index 522b1ad3..b943f72f 100644 --- a/project/app/src/main/java/com/iven/vectorify/VectorifyActivity.kt +++ b/project/app/src/main/java/com/iven/vectorify/VectorifyActivity.kt @@ -1,5 +1,6 @@ package com.iven.vectorify +import android.annotation.SuppressLint import android.content.Intent import android.content.res.ColorStateList import android.graphics.Color @@ -397,6 +398,7 @@ class VectorifyActivity : AppCompatActivity() { } //returns formatted hex string + @SuppressLint("DefaultLocale") private fun getHexCode(color: Int): String { return getString(R.string.hex, Integer.toHexString(color)).toUpperCase() } diff --git a/project/app/src/main/java/com/iven/vectorify/adapters/PresetsAdapter.kt b/project/app/src/main/java/com/iven/vectorify/adapters/PresetsAdapter.kt index c6f64d5b..12d20857 100644 --- a/project/app/src/main/java/com/iven/vectorify/adapters/PresetsAdapter.kt +++ b/project/app/src/main/java/com/iven/vectorify/adapters/PresetsAdapter.kt @@ -1,5 +1,6 @@ package com.iven.vectorify.adapters +import android.annotation.SuppressLint import android.content.Context import android.view.LayoutInflater import android.view.View @@ -55,7 +56,13 @@ class PresetsAdapter(@NonNull private val context: Context) : ) override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ColorsHolder { - return ColorsHolder(LayoutInflater.from(parent.context).inflate(R.layout.preset_option, parent, false)) + return ColorsHolder( + LayoutInflater.from(parent.context).inflate( + R.layout.preset_option, + parent, + false + ) + ) } override fun getItemCount(): Int { @@ -68,6 +75,7 @@ class PresetsAdapter(@NonNull private val context: Context) : inner class ColorsHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { + @SuppressLint("DefaultLocale") fun bindItems(combo: Pair) { val colorItem = itemView as MaterialCardView @@ -101,7 +109,11 @@ class PresetsAdapter(@NonNull private val context: Context) : DynamicToast.make( context, - context.getString(R.string.selected_preset, backgroundColorName, vectorColorName), + context.getString( + R.string.selected_preset, + backgroundColorName, + vectorColorName + ), null, selectedVectorColor, selectedBackgroundColor @@ -110,7 +122,11 @@ class PresetsAdapter(@NonNull private val context: Context) : } catch (e: Exception) { e.printStackTrace() - DynamicToast.makeError(context, context.getString(R.string.error_get_resource), Toast.LENGTH_LONG) + DynamicToast.makeError( + context, + context.getString(R.string.error_get_resource), + Toast.LENGTH_LONG + ) .show() } return@setOnLongClickListener false diff --git a/project/app/src/main/java/com/iven/vectorify/adapters/VectorsAdapter.kt b/project/app/src/main/java/com/iven/vectorify/adapters/VectorsAdapter.kt index 0ffa59ad..a072997a 100644 --- a/project/app/src/main/java/com/iven/vectorify/adapters/VectorsAdapter.kt +++ b/project/app/src/main/java/com/iven/vectorify/adapters/VectorsAdapter.kt @@ -1,5 +1,6 @@ package com.iven.vectorify.adapters +import android.annotation.SuppressLint import android.content.Context import android.view.LayoutInflater import android.view.View @@ -61,6 +62,7 @@ class VectorsAdapter(private val context: Context) : RecyclerView.Adapter(R.id.vector_button) diff --git a/project/build.gradle b/project/build.gradle index c005cc4d..327160ad 100644 --- a/project/build.gradle +++ b/project/build.gradle @@ -1,13 +1,13 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.3.41' + ext.kotlin_version = '1.3.50' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.4.2' + classpath 'com.android.tools.build:gradle:3.5.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files