Fixes and drone build should work.
Some checks failed
continuous-integration/drone/push Build is failing
Some checks failed
continuous-integration/drone/push Build is failing
This commit is contained in:
@ -1,5 +1,7 @@
|
||||
import java.io.ByteArrayOutputStream
|
||||
|
||||
val ignoreGitVersion: String by project
|
||||
|
||||
plugins {
|
||||
id("com.android.application")
|
||||
kotlin("android")
|
||||
@ -32,11 +34,19 @@ fun gitVersion(): String {
|
||||
}
|
||||
|
||||
fun versionCodeFromGit(): Int {
|
||||
if (ignoreGitVersion == "true") {
|
||||
// don't care
|
||||
return 1
|
||||
}
|
||||
println("version code " + gitVersion())
|
||||
return gitVersion().toInt()
|
||||
}
|
||||
|
||||
fun versionNameFromGit(): String {
|
||||
if (ignoreGitVersion == "true") {
|
||||
// don't care
|
||||
return "1"
|
||||
}
|
||||
println("version name " + gitVersion())
|
||||
return gitVersion()
|
||||
}
|
||||
|
@ -1,32 +0,0 @@
|
||||
// TODO
|
||||
//package bou.amine.apps.readerforselfossv2.android.utils
|
||||
//
|
||||
//import bou.amine.apps.readerforselfossv2.android.utils.Config
|
||||
//import bou.amine.apps.readerforselfossv2.android.utils.parseDate
|
||||
//import org.junit.Test
|
||||
//
|
||||
//class DateUtilsTest {
|
||||
//
|
||||
// @Test
|
||||
// fun parseDateV4() {
|
||||
//
|
||||
// Config.apiVersion = 4
|
||||
// val dateString = "2013-04-07T13:43:00+01:00"
|
||||
//
|
||||
// val milliseconds = parseDate(dateString).toEpochMilli()
|
||||
// val correctMilliseconds : Long = 1365338580000
|
||||
//
|
||||
// assert(milliseconds == correctMilliseconds)
|
||||
// }
|
||||
//
|
||||
// @Test
|
||||
// fun parseDateV1() {
|
||||
// Config.apiVersion = 0
|
||||
// val dateString = "2013-04-07 13:43:00"
|
||||
//
|
||||
// val milliseconds = parseDate(dateString).toEpochMilli()
|
||||
// val correctMilliseconds = 1365342180000
|
||||
//
|
||||
// assert(milliseconds == correctMilliseconds)
|
||||
// }
|
||||
//}
|
@ -46,16 +46,16 @@ class AppColors(a: Activity) {
|
||||
|
||||
colorBackground = if (isDarkTheme) {
|
||||
a.setTheme(R.style.NoBarDark)
|
||||
R.color.darkBackground
|
||||
a.resources.getColor(R.color.darkBackground)
|
||||
} else {
|
||||
a.setTheme(R.style.NoBar)
|
||||
R.color.grey_50
|
||||
a.resources.getColor(R.color.grey_50)
|
||||
}
|
||||
|
||||
textColor = if (isDarkTheme) {
|
||||
R.color.white
|
||||
a.resources.getColor(R.color.white)
|
||||
} else {
|
||||
R.color.grey_900
|
||||
a.resources.getColor(R.color.grey_900)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user