Skip to content

Commit b928fa5

Browse files
committed
Merge remote-tracking branch 'origin/develop' into 55-feature-mission-subway-line-merge
# Conflicts: # presentation/src/main/java/com/stop/AlarmWorker.kt # presentation/src/main/java/com/stop/ui/map/MapFragment.kt # presentation/src/main/java/com/stop/ui/map/MapTMap.kt # presentation/src/main/java/com/stop/ui/mission/MissionFragment.kt # presentation/src/main/java/com/stop/ui/mission/MissionTMap.kt # presentation/src/main/java/com/stop/ui/util/TMap.kt
2 parents 313e466 + fd3f0da commit b928fa5

36 files changed

+505
-264
lines changed

presentation/build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,10 @@ dependencies {
7474

7575
// LiveData
7676
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1'
77+
78+
// Lottie
79+
implementation 'com.airbnb.android:lottie:3.6.1'
80+
81+
// Splash
82+
implementation 'androidx.core:core-splashscreen:1.0.0'
7783
}
15.4 KB
Loading
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3+
<background android:drawable="@color/ic_bus_background"/>
4+
<foreground android:drawable="@mipmap/ic_bus_foreground"/>
5+
</adaptive-icon>
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3+
<background android:drawable="@color/ic_bus_background"/>
4+
<foreground android:drawable="@mipmap/ic_bus_foreground"/>
5+
</adaptive-icon>
1.81 KB
Loading
2.05 KB
Loading
3.64 KB
Loading
1.25 KB
Loading
1.38 KB
Loading
2.31 KB
Loading

0 commit comments

Comments
 (0)