Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion AndroidApp/.idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions AndroidApp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@
- 結果
- https://github.com/ptkNktq/AndroidNotificationNotifier/tree/develop/AndroidApp/ui/build/reports/screenshotTest/preview/debug/.html

###### 注意事項

- ⚠ Windows環境だと、`CreateProcess error=206, ファイル名または拡張子が長すぎます。`というエラーが出る可能性がある
- 諦めてwsl2等使おう

### 注意事項

- AGPの更新をするときはAndroid Studioとの互換性を確認すること
Expand Down
5 changes: 0 additions & 5 deletions AndroidApp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,3 @@ plugins {
alias(libs.plugins.com.google.devtools.ksp) apply false
alias(libs.plugins.com.jaredsburrows.license) apply false
}

// https://github.com/facebook/react-native/issues/44501#issuecomment-2112926438
gradle.startParameter.excludedTaskNames.addAll(
gradle.startParameter.taskNames.filter { it.contains("testClasses") }
)
1 change: 1 addition & 0 deletions AndroidApp/gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ androidx-test-ext-junit = { module = "androidx.test.ext:junit", version.ref = "a
androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "androidx-test-espresso" }
mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
mockk-android = { module = "io.mockk:mockk-android", version.ref = "mockk" }
screenshot-validation-api = { group = "com.android.tools.screenshot", name = "screenshot-validation-api", version.ref = "androidx-compose-screenshot" }

# for build-logic
android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref = "agp" }
Expand Down
2 changes: 1 addition & 1 deletion AndroidApp/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
6 changes: 1 addition & 5 deletions AndroidApp/ui/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,10 @@ dependencies {
androidTestImplementation(composeBom)
debugImplementation(libs.androidx.compose.ui.tooling)
screenshotTestImplementation(libs.androidx.compose.ui.tooling)
screenshotTestImplementation(libs.screenshot.validation.api)
implementation(libs.bundles.androidx.compose)

// その他
implementation(libs.io.insert.koin)
implementation(libs.io.insert.koin.compose)
}

tasks.withType<Test>().configureEach {
// FIXME: ScreenshotTestを全部コメントアウトしてるので一時的にfalseにしておく
failOnNoDiscoveredTests = false
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,162 @@

body {
margin: 0;
padding: 0;
font-family: sans-serif;
font-size: 12pt;
}

body, a, a:visited {
color: #303030;
}

#content {
padding-left: 50px;
padding-right: 50px;
padding-top: 30px;
padding-bottom: 30px;
}

#content h1 {
font-size: 160%;
margin-bottom: 10px;
}

#footer {
margin-top: 100px;
font-size: 80%;
white-space: nowrap;
}

#footer, #footer a {
color: #a0a0a0;
}

ul {
margin-left: 0;
}

h1, h2, h3 {
white-space: nowrap;
}

h2 {
font-size: 120%;
}

ul.tabLinks {
padding-left: 0;
padding-top: 10px;
padding-bottom: 10px;
overflow: auto;
min-width: 800px;
width: auto !important;
width: 800px;
}

ul.tabLinks li {
float: left;
height: 100%;
list-style: none;
padding-left: 10px;
padding-right: 10px;
padding-top: 5px;
padding-bottom: 5px;
margin-bottom: 0;
-moz-border-radius: 7px;
border-radius: 7px;
margin-right: 25px;
border: solid 1px #d4d4d4;
background-color: #f0f0f0;
behavior: url(css3-pie-1.0beta3.htc);
}

ul.tabLinks li:hover {
background-color: #fafafa;
}

ul.tabLinks li.selected {
background-color: #c5f0f5;
border-color: #c5f0f5;
}

ul.tabLinks a {
font-size: 120%;
display: block;
outline: none;
text-decoration: none;
margin: 0;
padding: 0;
}

ul.tabLinks li h2 {
margin: 0;
padding: 0;
}

div.tab {
}

div.selected {
display: block;
}

div.deselected {
display: none;
}

div.tab table {
min-width: 350px;
width: auto !important;
width: 350px;
border-collapse: collapse;
}

div.tab th, div.tab table {
border-bottom: solid #d0d0d0 1px;
}

div.tab th {
text-align: left;
white-space: nowrap;
padding-left: 6em;
}

div.tab th:first-child {
padding-left: 0;
}

div.tab td {
white-space: nowrap;
padding-left: 6em;
padding-top: 5px;
padding-bottom: 5px;
}

div.tab td:first-child {
padding-left: 0;
}

div.tab td.numeric, div.tab th.numeric {
text-align: right;
}

span.code {
display: inline-block;
margin-top: 0em;
margin-bottom: 1em;
}

span.code pre {
font-size: 11pt;
padding-top: 10px;
padding-bottom: 10px;
padding-left: 10px;
padding-right: 10px;
margin: 0;
background-color: #f7f7f7;
border: solid 1px #d0d0d0;
min-width: 700px;
width: auto !important;
width: 700px;
}
Comment on lines +1 to +162
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
# Check .gitignore for build directory exclusions
echo "=== .gitignore content ==="
if [ -f .gitignore ]; then
    cat .gitignore
else
    echo ".gitignore not found in root"
fi

echo ""
echo "=== Check for .gitignore in AndroidApp directory ==="
if [ -f AndroidApp/.gitignore ]; then
    cat AndroidApp/.gitignore
else
    echo "AndroidApp/.gitignore not found"
fi

echo ""
echo "=== Check for .gitignore in AndroidApp/ui directory ==="
if [ -f AndroidApp/ui/.gitignore ]; then
    cat AndroidApp/ui/.gitignore
else
    echo "AndroidApp/ui/.gitignore not found"
fi

echo ""
echo "=== Git-tracked files in build directories ==="
git ls-files 'AndroidApp/**/build/**' 2>/dev/null | head -20 || echo "No files found or git command failed"

echo ""
echo "=== Check if the specific CSS file is tracked ==="
git ls-files 'AndroidApp/ui/build/reports/screenshotTest/preview/debug/css/base-style.css' 2>/dev/null

Repository: ptkNktq/AndroidNotificationNotifier

Length of output: 4587


AndroidApp/ui/.gitignore のビルド成果物除外ルールを修正してください

AndroidApp/ui/build/reports/screenshotTest/ ディレクトリ内のファイルがバージョン管理にコミットされています。このディレクトリは Gradle によって自動生成されるスクリーンショットテストレポートで、ビルド成果物として扱うべきです。

AndroidApp/ui/.gitignore で以下のルールが存在します:

  • /build/* - build ディレクトリを除外
  • !/build/reports - reports を例外として含める
  • !/build/reports/screenshotTest - screenshotTest を例外として含める

これらの例外パターンを削除し、すべての build 成果物をバージョン管理から除外してください。

🧰 Tools
🪛 Biome (2.1.2)

[error] 54-54: Duplicate properties can lead to unexpected behavior and may override previous declarations unintentionally.

width is already defined here.

Remove or rename the duplicate property to ensure consistent styling.

(lint/suspicious/noDuplicateProperties)


[error] 111-111: Duplicate properties can lead to unexpected behavior and may override previous declarations unintentionally.

width is already defined here.

Remove or rename the duplicate property to ensure consistent styling.

(lint/suspicious/noDuplicateProperties)


[error] 161-161: Duplicate properties can lead to unexpected behavior and may override previous declarations unintentionally.

width is already defined here.

Remove or rename the duplicate property to ensure consistent styling.

(lint/suspicious/noDuplicateProperties)

🤖 Prompt for AI Agents
In `@AndroidApp/ui/build/reports/screenshotTest/preview/debug/css/base-style.css`
around lines 1 - 162, Remove the gitignore exception lines that re-include
reports under the ui module: delete the patterns '!/build/reports' and
'!/build/reports/screenshotTest' from AndroidApp/ui/.gitignore while keeping the
existing '/build/*' rule so all build outputs are ignored; after updating
.gitignore, remove any already-committed build artifacts from version control
(e.g., git rm --cached) and commit the change.

Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
#summary {
margin-top: 30px;
margin-bottom: 40px;
}

#summary table {
border-collapse: collapse;
}

#summary td {
vertical-align: top;
}

.breadcrumbs, .breadcrumbs a {
color: #606060;
}

.infoBox {
width: 110px;
padding-top: 15px;
padding-bottom: 15px;
text-align: center;
}

.infoBox p {
margin: 0;
}

.grid {
background: linear-gradient(-90deg, rgba(0, 0, 0, .05) 1px, transparent 1px), linear-gradient(rgba(0, 0, 0, .05) 1px, transparent 1px), linear-gradient(-90deg, rgba(0, 0, 0, .04) 1px, transparent 1px), linear-gradient(rgba(0, 0, 0, .04) 1px, transparent 1px), linear-gradient(transparent 3px, #f2f2f2 3px, #f2f2f2 98px, transparent 98px), linear-gradient(-90deg, #aaa 1px, transparent 1px), linear-gradient(-90deg, transparent 3px, #f2f2f2 3px, #f2f2f2 98px, transparent 98px), linear-gradient(#aaa 1px, transparent 1px), #f2f2f2;
background-size: 10px 10px, 10px 10px, 100px 100px, 100px 100px, 100px 100px, 100px 100px, 100px 100px, 100px 100px;
}

.counter, .percent {
font-size: 120%;
font-weight: bold;
margin-bottom: 8px;
}

#duration {
width: 125px;
}

#successRate, .summaryGroup {
border: solid 2px #d0d0d0;
-moz-border-radius: 10px;
border-radius: 10px;
behavior: url(css3-pie-1.0beta3.htc);
}

#successRate {
width: 140px;
margin-left: 35px;
}

#successRate .percent {
font-size: 180%;
}

.success, .success a {
color: #008000;
}

div.success, #successRate.success {
background-color: #bbd9bb;
border-color: #008000;
}

.failures, .failures a {
color: #b60808;
}

div.failures, #successRate.failures {
background-color: #ecdada;
border-color: #b60808;
}

ul.linkList {
padding-left: 0;
}

ul.linkList li {
list-style: none;
margin-bottom: 5px;
}
Loading