From 0962f012c9095cff46bdae39f9c57fe2acb2c6b1 Mon Sep 17 00:00:00 2001 From: enricocid Date: Sat, 10 Aug 2019 16:01:04 +0200 Subject: [PATCH] Bump to 1.3.3 + init temp prefs in main activity Signed-off-by: enricocid --- README.md | 2 +- project/app/build.gradle | 4 ++-- .../src/main/java/com/iven/vectorify/VectorifyActivity.kt | 8 ++++++++ .../app/src/main/java/com/iven/vectorify/VectorifyApp.kt | 7 ------- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 51beeabd..f97eabf9 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ -###### Current version: [(15) 1.3.2](https://github.com/enricocid/VectorifyDaHome/releases/tag/v1.3.2) +###### Current version: [(16) 1.3.3](https://github.com/enricocid/VectorifyDaHome/releases/tag/v1.3.3) ###### Based on the project [Potate da home](https://github.com/enricocid/PotateDaHome) ![Screenshots](https://raw.githubusercontent.com/enricocid/VectorifyDaHome/master/vdh3.gif) diff --git a/project/app/build.gradle b/project/app/build.gradle index e4cc2557..572afe23 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 15 - versionName "1.3.2.1" + versionCode 16 + versionName "1.3.3" } // Configure only for each module that uses Java 8 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 43fcefee..d3bb112c 100644 --- a/project/app/src/main/java/com/iven/vectorify/VectorifyActivity.kt +++ b/project/app/src/main/java/com/iven/vectorify/VectorifyActivity.kt @@ -63,6 +63,14 @@ class VectorifyActivity : AppCompatActivity() { mVectorColor = mVectorifyPreferences.vectorColor mVector = mVectorifyPreferences.vector + //init temp preferences + mTempPreferences.tempBackgroundColor = mBackgroundColor + mTempPreferences.tempVectorColor = mVectorColor + mTempPreferences.tempVector = mVector + mTempPreferences.isBackgroundAccentSet = mVectorifyPreferences.isBackgroundAccented + mTempPreferences.isVectorAccentSet = mVectorifyPreferences.isVectorAccented + mTempPreferences.tempScale = mVectorifyPreferences.scale + //get system accent grabbers mBackgroundSystemAccentGrabber = background_system_accent mVectorSystemAccentGrabber = vector_system_accent diff --git a/project/app/src/main/java/com/iven/vectorify/VectorifyApp.kt b/project/app/src/main/java/com/iven/vectorify/VectorifyApp.kt index ddf4556d..77a19455 100644 --- a/project/app/src/main/java/com/iven/vectorify/VectorifyApp.kt +++ b/project/app/src/main/java/com/iven/vectorify/VectorifyApp.kt @@ -29,13 +29,6 @@ class VectorifyApp : Application() { prefs = VectorifyPreferences(applicationContext) tempPrefs = TempPreferences() - tempPrefs.tempBackgroundColor = prefs.backgroundColor - tempPrefs.tempVectorColor = prefs.vectorColor - tempPrefs.tempVector = prefs.vector - tempPrefs.isBackgroundAccentSet = prefs.isBackgroundAccented - tempPrefs.isVectorAccentSet = prefs.isVectorAccented - tempPrefs.tempScale = prefs.scale - //retrieve display specifications val window = applicationContext.getSystemService(Context.WINDOW_SERVICE) as WindowManager val d = DisplayMetrics()