Skip to content

Commit 56af266

Browse files
committedSep 15, 2024
Allowing more values dir names
1 parent 4267efd commit 56af266

File tree

4 files changed

+4
-2
lines changed

4 files changed

+4
-2
lines changed
 

‎android-resource-collector/src/main/java/com/likethesalad/tools/resource/collector/android/data/valuedir/ValueDirFinder.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import java.io.File
66

77
object ValueDirFinder {
88

9-
private val VALUES_FOLDER_NAME_REGEX = Regex("values(-([a-z]{2}(-r[A-Z]{2})*))*")
9+
private val VALUES_FOLDER_NAME_REGEX = Regex("values(-(.+))*")
1010

1111
fun findValueDirs(resDir: ResDir): List<ValueDir> {
1212
val valueFolders = resDir.dir.listFiles { _, name ->

‎android-resource-collector/src/test/dummy/res/values-v30/someFile.txt

Whitespace-only changes.

‎android-resource-collector/src/test/dummy/res/values-v5/someFile.txt

Whitespace-only changes.

‎android-resource-collector/src/test/java/com/likethesalad/tools/resource/collector/android/data/valuedir/ValueDirFinderTest.kt

+3-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ class ValueDirFinderTest {
1919
Truth.assertThat(result).containsExactly(
2020
ValueDir(resDir, getResourceFile("res/values"), Language.Default),
2121
ValueDir(resDir, getResourceFile("res/values-es"), Language.Custom("es")),
22-
ValueDir(resDir, getResourceFile("res/values-es-rUS"), Language.Custom("es-rUS"))
22+
ValueDir(resDir, getResourceFile("res/values-es-rUS"), Language.Custom("es-rUS")),
23+
ValueDir(resDir, getResourceFile("res/values-v5"), Language.Custom("v5")),
24+
ValueDir(resDir, getResourceFile("res/values-v30"), Language.Custom("v30"))
2325
)
2426
}
2527
}

0 commit comments

Comments
 (0)
Please sign in to comment.