diff --git a/app/build.gradle b/app/build.gradle index 3ca0dfac..b5f8c399 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -38,15 +38,19 @@ android { } productFlavors { pro { + resValue "string", "file_provider", "com.bodyweight.fitness.pro.fileprovider" + applicationId 'com.bodyweight.fitness.pro' - versionCode 140 - versionName "1.4.0" + versionCode 141 + versionName "1.4.1" } free { + resValue "string", "file_provider", "com.bodyweight.fitness.free.fileprovider" + applicationId 'com.bodyweight.fitness.free' - versionCode 140 - versionName "1.4.0" + versionCode 141 + versionName "1.4.1" } } buildTypes { @@ -122,7 +126,7 @@ dependencies { } buildscript { - ext.support_version = '25.0.0' + ext.support_version = '25.1.0' ext.kotlin_version = '1.0.4' repositories { mavenCentral() diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index ffd15fa6..47010cc4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -20,7 +20,7 @@ diff --git a/app/src/main/kotlin/com/bodyweight/fitness/Constants.kt b/app/src/main/kotlin/com/bodyweight/fitness/Constants.kt index 22c8c886..dc77fce9 100644 --- a/app/src/main/kotlin/com/bodyweight/fitness/Constants.kt +++ b/app/src/main/kotlin/com/bodyweight/fitness/Constants.kt @@ -5,7 +5,9 @@ object Constants { val exerciseId = "exerciseId" val googlePlayUrl = "https://play.google.com/store/apps/details?id=com.bodyweight.fitness.pro" - val fileProvider = "com.bodyweight.fitness.fileprovider" + val fileProvider: String by lazy { + App.context!!.getString(R.string.file_provider) + } val maximumNumberOfSets = 12 diff --git a/app/src/main/kotlin/com/bodyweight/fitness/adapter/CalendarListAdapter.kt b/app/src/main/kotlin/com/bodyweight/fitness/adapter/CalendarListAdapter.kt index 58329ab1..b93b38c4 100644 --- a/app/src/main/kotlin/com/bodyweight/fitness/adapter/CalendarListAdapter.kt +++ b/app/src/main/kotlin/com/bodyweight/fitness/adapter/CalendarListAdapter.kt @@ -30,12 +30,6 @@ class CalendarListAdapter : RecyclerView.Adapter() { notifyDataSetChanged() } - fun removeItem(repositoryRoutine: RepositoryRoutine) { - repositoryRoutineList?.remove(repositoryRoutine) - - notifyDataSetChanged() - } - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CalendarRoutinePresenter { val view = parent.inflate(R.layout.view_calendar_card) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4a11cbf1..03194c75 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2,7 +2,7 @@ transition:DASHBOARD Bodyweight Fitness - 1.4.0 + 1.4.1 Choose Exercise Progression About FAQ