Skip to content

Commit 162a851

Browse files
authored
Merge pull request #169 from ptkNktq/develop
🎉 Release v1.1
2 parents 8384063 + c83de76 commit 162a851

160 files changed

Lines changed: 2606 additions & 2429 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/android-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414
- name: set up JDK 17
15-
uses: actions/setup-java@v3
15+
uses: actions/setup-java@v4
1616
with:
1717
java-version: '17'
1818
distribution: 'temurin'

AndroidApp/.gitignore

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
### 手動で追加
2+
# 署名関係
3+
*.jks
4+
*.keystore
5+
*.pepk
6+
7+
.idea/androidTestResultsUserPreferences.xml
8+
app/release/output-metadata.json
9+
10+
### 自動で追加
111
# Created by https://www.toptal.com/developers/gitignore/api/android,androidstudio
212
# Edit at https://www.toptal.com/developers/gitignore?templates=android,androidstudio
313

@@ -54,11 +64,6 @@ captures/
5464
# Comment next line if keeping position of elements in Navigation Editor is relevant for you
5565
.idea/navEditor.xml
5666

57-
# Keystore files
58-
# Uncomment the following lines if you do not want to check your keystore files in.
59-
#*.jks
60-
#*.keystore
61-
6267
# External native build folder generated in Android Studio 2.2 and later
6368
.externalNativeBuild
6469
.cxx/
@@ -128,10 +133,6 @@ output.json
128133
*~
129134
*.swp
130135

131-
# Keystore files
132-
*.jks
133-
*.keystore
134-
135136
# Google Services (e.g. APIs or Firebase)
136137
# google-services.json
137138

AndroidApp/.idea/deploymentTargetDropDown.xml

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

AndroidApp/.idea/kotlinc.xml

Lines changed: 8 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

AndroidApp/.idea/migrations.xml

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

AndroidApp/app/build.gradle.kts

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,25 @@
11
plugins {
2-
id("com.android.application")
3-
id("kotlin-android")
4-
id("com.cookpad.android.plugin.license-tools")
2+
id("common.android")
53
}
64

75
android {
86
namespace = "me.nya_n.notificationnotifier"
9-
compileSdk = Versions.COMPILE_SDK
10-
buildToolsVersion = "30.0.3"
117

128
defaultConfig {
139
applicationId = "me.nya_n.notificationnotifier"
14-
minSdk = Versions.MIN_SDK
15-
targetSdk = Versions.TARGET_SDK
16-
versionCode = 1
17-
versionName = "1.0"
18-
19-
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
20-
}
21-
22-
buildTypes {
23-
release {
24-
isMinifyEnabled = false
25-
proguardFiles(
26-
getDefaultProguardFile("proguard-android-optimize.txt"),
27-
"proguard-rules.pro"
28-
)
29-
}
30-
}
31-
32-
compileOptions {
33-
sourceCompatibility = Versions.JAVA_VERSION
34-
targetCompatibility = Versions.JAVA_VERSION
35-
}
36-
37-
kotlinOptions {
38-
jvmTarget = Versions.JVM_TARGET
3910
}
40-
4111
packaging {
4212
resources.excludes.add("META-INF/DEPENDENCIES")
4313
}
4414
}
4515

4616
dependencies {
47-
implementation(libs.org.jetbrains.kotlin.stdlib)
4817
implementation(project(":ui"))
4918
// diのために必要
5019
implementation(project(":domain"))
5120
implementation(project(":data:repository"))
5221

5322
// その他
5423
implementation(libs.io.insert.koin)
55-
implementation(libs.com.squareup.leakcanary.android)
24+
debugImplementation(libs.com.squareup.leakcanary.android)
5625
}

AndroidApp/app/src/main/AndroidManifest.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@
1414
android:label="@string/app_name"
1515
android:roundIcon="@mipmap/ic_launcher_round"
1616
android:supportsRtl="true"
17-
android:theme="@style/AppTheme">
17+
android:theme="@style/AppTheme.SplashScreen">
1818

1919
<activity
20-
android:name="me.nya_n.notificationnotifier.ui.screen.MainActivity"
21-
android:exported="true"
22-
android:theme="@style/AppTheme.NoActionBar">
20+
android:name="me.nya_n.notificationnotifier.ui.MainActivity"
21+
android:exported="true">
2322
<intent-filter>
2423
<action android:name="android.intent.action.MAIN" />
2524
<category android:name="android.intent.category.LAUNCHER" />

0 commit comments

Comments
 (0)