Merge pull request #169 from ptkNktq/develop

🎉 Release v1.1

.github/workflows/android-build.yml

@@ -10,9 +10,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: set up JDK 17
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: '17'
         distribution: 'temurin'

AndroidApp/.gitignore

@@ -1,3 +1,13 @@
+### 手動で追加
+# 署名関係
+*.jks
+*.keystore
+*.pepk
+
+.idea/androidTestResultsUserPreferences.xml
+app/release/output-metadata.json
+
+### 自動で追加
 # Created by https://www.toptal.com/developers/gitignore/api/android,androidstudio
 # Edit at https://www.toptal.com/developers/gitignore?templates=android,androidstudio
 
@@ -54,11 +64,6 @@ captures/
 # Comment next line if keeping position of elements in Navigation Editor is relevant for you
 .idea/navEditor.xml
 
-# Keystore files
-# Uncomment the following lines if you do not want to check your keystore files in.
-#*.jks
-#*.keystore
-
 # External native build folder generated in Android Studio 2.2 and later
 .externalNativeBuild
 .cxx/
@@ -128,10 +133,6 @@ output.json
 *~
 *.swp
 
-# Keystore files
-*.jks
-*.keystore
-
 # Google Services (e.g. APIs or Firebase)
 # google-services.json
 

AndroidApp/app/build.gradle.kts

@@ -1,56 +1,25 @@
 plugins {
-    id("com.android.application")
-    id("kotlin-android")
-    id("com.cookpad.android.plugin.license-tools")
+    id("common.android")
 }
 
 android {
     namespace = "me.nya_n.notificationnotifier"
-    compileSdk = Versions.COMPILE_SDK
-    buildToolsVersion = "30.0.3"
 
     defaultConfig {
         applicationId = "me.nya_n.notificationnotifier"
-        minSdk = Versions.MIN_SDK
-        targetSdk = Versions.TARGET_SDK
-        versionCode = 1
-        versionName = "1.0"
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
-            )
-        }
-    }
-
-    compileOptions {
-        sourceCompatibility = Versions.JAVA_VERSION
-        targetCompatibility = Versions.JAVA_VERSION
-    }
-
-    kotlinOptions {
-        jvmTarget = Versions.JVM_TARGET
     }
-
     packaging {
         resources.excludes.add("META-INF/DEPENDENCIES")
     }
 }
 
 dependencies {
-    implementation(libs.org.jetbrains.kotlin.stdlib)
     implementation(project(":ui"))
     // diのために必要
     implementation(project(":domain"))
     implementation(project(":data:repository"))
 
     // その他
     implementation(libs.io.insert.koin)
-    implementation(libs.com.squareup.leakcanary.android)
+    debugImplementation(libs.com.squareup.leakcanary.android)
 }

AndroidApp/app/src/main/AndroidManifest.xml

@@ -14,12 +14,11 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme.SplashScreen">
 
         <activity
-            android:name="me.nya_n.notificationnotifier.ui.screen.MainActivity"
-            android:exported="true"
-            android:theme="@style/AppTheme.NoActionBar">
+            android:name="me.nya_n.notificationnotifier.ui.MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />