key removed from gradle properties

This commit is contained in:
2020-05-17 18:36:52 +01:00
parent 14293254ec
commit 4330421ac8
6 changed files with 11 additions and 21 deletions

Binary file not shown.

View File

@@ -1,5 +1,8 @@
<component name="ProjectCodeStyleConfiguration"> <component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173"> <code_scheme name="Project" version="173">
<JetCodeStyleSettings>
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
</JetCodeStyleSettings>
<codeStyleSettings language="XML"> <codeStyleSettings language="XML">
<indentOptions> <indentOptions>
<option name="CONTINUATION_INDENT_SIZE" value="4" /> <option name="CONTINUATION_INDENT_SIZE" value="4" />
@@ -112,5 +115,8 @@
</rules> </rules>
</arrangement> </arrangement>
</codeStyleSettings> </codeStyleSettings>
<codeStyleSettings language="kotlin">
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
</codeStyleSettings>
</code_scheme> </code_scheme>
</component> </component>

View File

@@ -19,23 +19,11 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
} }
} }
// testOptions {
// unitTests.returnDefaultValues = true
// }
dataBinding { dataBinding {
enabled = true enabled = true
} }
viewBinding.enabled = true viewBinding.enabled = true
buildTypes.each {
Properties properties = new Properties()
properties.load(project.rootProject.file("local.properties").newDataInputStream())
def ccApiKey = properties.getProperty("cc_api_key", "")
it.buildConfigField 'String', "CC_API_KEY", ccApiKey
it.resValue 'string', "api_key", ccApiKey
}
} }
dependencies { dependencies {

View File

@@ -17,7 +17,7 @@ class QueryInterceptor() : Interceptor {
val originalHttpUrl: HttpUrl = original.url() val originalHttpUrl: HttpUrl = original.url()
val url = originalHttpUrl.newBuilder() val url = originalHttpUrl.newBuilder()
.addQueryParameter("apiKey", BuildConfig.CC_API_KEY) .addQueryParameter("apiKey", "a4f93cc2ff05dd772321")
.build() .build()
// Add amended Url back to request // Add amended Url back to request

View File

@@ -78,7 +78,6 @@ class MainViewModel(
val bottomVal1 = (fromValDouble * conversionRate) val bottomVal1 = (fromValDouble * conversionRate)
bottomVal1.toTwoDpString() bottomVal1.toTwoDpString()
}catch (e: NumberFormatException) { }catch (e: NumberFormatException) {
Log.e(TAG, "no numbers inserted")
null null
} }
} }
@@ -89,7 +88,6 @@ class MainViewModel(
val newTopVal = toDoubleVal.times((1/conversionRate)) val newTopVal = toDoubleVal.times((1/conversionRate))
newTopVal.toTwoDpString() newTopVal.toTwoDpString()
} catch (e: NumberFormatException) { } catch (e: NumberFormatException) {
Log.e(TAG, "no numbers inserted")
null null
} }
} }

View File

@@ -1,19 +1,17 @@
# Project-wide Gradle settings. # Project-wide Gradle settings.
# IDE (e.g. Android Studio) users: # IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override* # Gradle settings configured through the IDE *will override*
# any settings specified in this file. # any settings specified in this file.
# For more details on how to configure your build environment visit # For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html # http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process. # Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings. # The setting is particularly useful for tweaking memory settings.
android.enableJetifier=true
android.useAndroidX=true
org.gradle.jvmargs=-Xmx1536m org.gradle.jvmargs=-Xmx1536m
# When configured, Gradle will run in incubating parallel mode. # When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit # This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true # org.gradle.parallel=true
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
android.useAndroidX=true
android.enableJetifier=true