From baadf29d34fe0cc4d3c1cf167b9811e47f7872a2 Mon Sep 17 00:00:00 2001 From: Eljo Date: Mon, 24 Jun 2019 22:35:03 +0200 Subject: [PATCH 1/2] -fixed, text gets cut on widget #284 --- app/build.gradle | 14 +++++++------- .../notes/pro/helpers/MyWidgetProvider.kt | 4 ++-- app/src/main/res/layout/widget.xml | 18 ++++++++++++------ 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c92fcc5c..ebcd0723 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,9 +3,9 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' -def keystorePropertiesFile = rootProject.file("keystore.properties") -def keystoreProperties = new Properties() -keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) +//def keystorePropertiesFile = rootProject.file("keystore.properties") +//def keystoreProperties = new Properties() +//keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) android { compileSdkVersion 28 @@ -21,23 +21,23 @@ android { } signingConfigs { - release { + /* release { keyAlias keystoreProperties['keyAlias'] keyPassword keystoreProperties['keyPassword'] storeFile file(keystoreProperties['storeFile']) storePassword keystoreProperties['storePassword'] - } + }*/ } buildTypes { debug { applicationIdSuffix ".debug" } - release { + /*release { minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' signingConfig signingConfigs.release - } + }*/ } sourceSets { diff --git a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/MyWidgetProvider.kt b/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/MyWidgetProvider.kt index 965456b3..b9187fb8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/MyWidgetProvider.kt +++ b/app/src/main/kotlin/com/simplemobiletools/notes/pro/helpers/MyWidgetProvider.kt @@ -29,7 +29,7 @@ class MyWidgetProvider : AppWidgetProvider() { Thread { context.widgetsDB.getWidgets().forEach { val views = RemoteViews(context.packageName, R.layout.widget) - views.setBackgroundColor(R.id.notes_widget_holder, context.config.widgetBgColor) + views.setBackgroundColor(R.id.frame_widget, context.config.widgetBgColor) setupAppOpenIntent(context, views, R.id.notes_widget_holder, it) Intent(context, WidgetService::class.java).apply { @@ -57,4 +57,4 @@ class MyWidgetProvider : AppWidgetProvider() { } }.start() } -} +} \ No newline at end of file diff --git a/app/src/main/res/layout/widget.xml b/app/src/main/res/layout/widget.xml index ea3e025f..44f4ca0e 100644 --- a/app/src/main/res/layout/widget.xml +++ b/app/src/main/res/layout/widget.xml @@ -1,14 +1,20 @@ - + android:layout_height="match_parent" + android:orientation="vertical"> - + + + + \ No newline at end of file From 2e4cffd67f01097df9a565617764c83de0936771 Mon Sep 17 00:00:00 2001 From: Eljo Date: Tue, 25 Jun 2019 20:19:22 +0200 Subject: [PATCH 2/2] -uncommented grandle properties --- app/build.gradle | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ebcd0723..c92fcc5c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,9 +3,9 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' -//def keystorePropertiesFile = rootProject.file("keystore.properties") -//def keystoreProperties = new Properties() -//keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) +def keystorePropertiesFile = rootProject.file("keystore.properties") +def keystoreProperties = new Properties() +keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) android { compileSdkVersion 28 @@ -21,23 +21,23 @@ android { } signingConfigs { - /* release { + release { keyAlias keystoreProperties['keyAlias'] keyPassword keystoreProperties['keyPassword'] storeFile file(keystoreProperties['storeFile']) storePassword keystoreProperties['storePassword'] - }*/ + } } buildTypes { debug { applicationIdSuffix ".debug" } - /*release { + release { minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' signingConfig signingConfigs.release - }*/ + } } sourceSets {