Skip to content

Commit 7f875b9

Browse files
committed
Обновил скриншоты
1 parent 993e6b8 commit 7f875b9

8 files changed

Lines changed: 27 additions & 55 deletions

File tree

app/src/androidTest/java/com/dayscounter/screenshots/ScreenshotsTest.kt

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -215,17 +215,25 @@ class ScreenshotsTest {
215215
try {
216216
// Проверяем, что кнопка доступна перед нажатием
217217
// Используем onFirst, чтобы выбрать конкретную кнопку, если их несколько
218-
// Сначала скроллим к кнопке для маленьких экранов
219-
composeTestRule.onAllNodesWithText(activity.getString(R.string.save))
218+
// Пытаемся скроллим к кнопке для маленьких экранов (если она в скроллируемом контейнере)
219+
val saveButton = composeTestRule.onAllNodesWithText(activity.getString(R.string.save))
220220
.onFirst()
221-
.performScrollTo()
222-
.assertExists()
223-
.assertIsEnabled()
221+
222+
try {
223+
saveButton.performScrollTo()
224+
Log.d("ScreenshotsTest", "Выполнен скролл к кнопке сохранения")
225+
} catch (e: AssertionError) {
226+
// Кнопка не в скроллируемом контейнере - это нормально, продолжаем
227+
Log.d(
228+
"ScreenshotsTest",
229+
"Кнопка не требует скролла (не в скроллируемом контейнере)"
230+
)
231+
}
232+
233+
saveButton.assertExists().assertIsEnabled()
224234

225235
Log.d("ScreenshotsTest", "Кнопка сохранения доступна, нажимаем")
226-
composeTestRule.onAllNodesWithText(activity.getString(R.string.save))
227-
.onFirst()
228-
.performClick()
236+
saveButton.performClick()
229237
} catch (e: AssertionError) {
230238
Log.e("ScreenshotsTest", "Кнопка сохранения недоступна: ${e.message}")
231239
Log.e("ScreenshotsTest", "Это означает, что дата не выбрана. Тест будет остановлен.")
121 KB
Loading
86.8 KB
Loading
75.2 KB
Loading
128 KB
Loading
131 KB
Loading

fastlane/metadata/android/screenshots.html

Lines changed: 10 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -65,42 +65,6 @@
6565
</style>
6666
</head>
6767
<body>
68-
<h1 id="en-US" class="language">en-US</h1>
69-
<hr>
70-
<table>
71-
<tr>
72-
<th colspan="5">
73-
<a id="en-US-phoneScreenshots" class="deviceName" href="#en-US-phoneScreenshots">phoneScreenshots</a>
74-
</th>
75-
</tr>
76-
<tr>
77-
<td>
78-
<a href="./en-US/images/phoneScreenshots/1-demoList_1768663419083.png" target="_blank" class="screenshotLink">
79-
<img class="screenshot" src="./en-US/images/phoneScreenshots/1-demoList_1768663419083.png" style="width: 100%;" alt="en-US phoneScreenshots" data-counter="1">
80-
</a>
81-
</td>
82-
<td>
83-
<a href="./en-US/images/phoneScreenshots/2-chooseDate_1768663424313.png" target="_blank" class="screenshotLink">
84-
<img class="screenshot" src="./en-US/images/phoneScreenshots/2-chooseDate_1768663424313.png" style="width: 100%;" alt="en-US phoneScreenshots" data-counter="2">
85-
</a>
86-
</td>
87-
<td>
88-
<a href="./en-US/images/phoneScreenshots/3-chooseDisplayOption_1768663425050.png" target="_blank" class="screenshotLink">
89-
<img class="screenshot" src="./en-US/images/phoneScreenshots/3-chooseDisplayOption_1768663425050.png" style="width: 100%;" alt="en-US phoneScreenshots" data-counter="3">
90-
</a>
91-
</td>
92-
<td>
93-
<a href="./en-US/images/phoneScreenshots/4-beforeSave_1768663426735.png" target="_blank" class="screenshotLink">
94-
<img class="screenshot" src="./en-US/images/phoneScreenshots/4-beforeSave_1768663426735.png" style="width: 100%;" alt="en-US phoneScreenshots" data-counter="4">
95-
</a>
96-
</td>
97-
<td>
98-
<a href="./en-US/images/phoneScreenshots/5-sortByDate_1768663429299.png" target="_blank" class="screenshotLink">
99-
<img class="screenshot" src="./en-US/images/phoneScreenshots/5-sortByDate_1768663429299.png" style="width: 100%;" alt="en-US phoneScreenshots" data-counter="5">
100-
</a>
101-
</td>
102-
</tr>
103-
</table>
10468
<h1 id="ru-RU" class="language">ru-RU</h1>
10569
<hr>
10670
<table>
@@ -111,28 +75,28 @@ <h1 id="ru-RU" class="language">ru-RU</h1>
11175
</tr>
11276
<tr>
11377
<td>
114-
<a href="./ru-RU/images/phoneScreenshots/1-demoList_1768663402836.png" target="_blank" class="screenshotLink">
115-
<img class="screenshot" src="./ru-RU/images/phoneScreenshots/1-demoList_1768663402836.png" style="width: 100%;" alt="ru-RU phoneScreenshots" data-counter="6">
78+
<a href="./ru-RU/images/phoneScreenshots/1-demoList_1771606647609.png" target="_blank" class="screenshotLink">
79+
<img class="screenshot" src="./ru-RU/images/phoneScreenshots/1-demoList_1771606647609.png" style="width: 100%;" alt="ru-RU phoneScreenshots" data-counter="1">
11680
</a>
11781
</td>
11882
<td>
119-
<a href="./ru-RU/images/phoneScreenshots/2-chooseDate_1768663408046.png" target="_blank" class="screenshotLink">
120-
<img class="screenshot" src="./ru-RU/images/phoneScreenshots/2-chooseDate_1768663408046.png" style="width: 100%;" alt="ru-RU phoneScreenshots" data-counter="7">
83+
<a href="./ru-RU/images/phoneScreenshots/2-chooseDate_1771606652813.png" target="_blank" class="screenshotLink">
84+
<img class="screenshot" src="./ru-RU/images/phoneScreenshots/2-chooseDate_1771606652813.png" style="width: 100%;" alt="ru-RU phoneScreenshots" data-counter="2">
12185
</a>
12286
</td>
12387
<td>
124-
<a href="./ru-RU/images/phoneScreenshots/3-chooseDisplayOption_1768663408770.png" target="_blank" class="screenshotLink">
125-
<img class="screenshot" src="./ru-RU/images/phoneScreenshots/3-chooseDisplayOption_1768663408770.png" style="width: 100%;" alt="ru-RU phoneScreenshots" data-counter="8">
88+
<a href="./ru-RU/images/phoneScreenshots/3-chooseDisplayOption_1771606653503.png" target="_blank" class="screenshotLink">
89+
<img class="screenshot" src="./ru-RU/images/phoneScreenshots/3-chooseDisplayOption_1771606653503.png" style="width: 100%;" alt="ru-RU phoneScreenshots" data-counter="3">
12690
</a>
12791
</td>
12892
<td>
129-
<a href="./ru-RU/images/phoneScreenshots/4-beforeSave_1768663410399.png" target="_blank" class="screenshotLink">
130-
<img class="screenshot" src="./ru-RU/images/phoneScreenshots/4-beforeSave_1768663410399.png" style="width: 100%;" alt="ru-RU phoneScreenshots" data-counter="9">
93+
<a href="./ru-RU/images/phoneScreenshots/4-beforeSave_1771606655086.png" target="_blank" class="screenshotLink">
94+
<img class="screenshot" src="./ru-RU/images/phoneScreenshots/4-beforeSave_1771606655086.png" style="width: 100%;" alt="ru-RU phoneScreenshots" data-counter="4">
13195
</a>
13296
</td>
13397
<td>
134-
<a href="./ru-RU/images/phoneScreenshots/5-sortByDate_1768663412968.png" target="_blank" class="screenshotLink">
135-
<img class="screenshot" src="./ru-RU/images/phoneScreenshots/5-sortByDate_1768663412968.png" style="width: 100%;" alt="ru-RU phoneScreenshots" data-counter="10">
98+
<a href="./ru-RU/images/phoneScreenshots/5-sortByDate_1771606657572.png" target="_blank" class="screenshotLink">
99+
<img class="screenshot" src="./ru-RU/images/phoneScreenshots/5-sortByDate_1771606657572.png" style="width: 100%;" alt="ru-RU phoneScreenshots" data-counter="5">
136100
</a>
137101
</td>
138102
</tr>

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ org.gradle.configuration-cache=true
2828
org.gradle.configuration-cache.problems=warn
2929
# App version (versionName: displayed in App Store, versionCode: build number)
3030
VERSION_NAME=1.2
31-
VERSION_CODE=6
31+
VERSION_CODE=7
3232
android.uniquePackageNames=false
3333
android.dependency.useConstraints=true
3434
android.r8.strictFullModeForKeepRules=false

0 commit comments

Comments
 (0)