-
Notifications
You must be signed in to change notification settings - Fork 206
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into feature/add-side-event-list
- Loading branch information
Showing
33 changed files
with
307 additions
and
98 deletions.
There are no files selected for viewing
Validating CODEOWNERS rules …
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,2 @@ | ||
* @DroidKaigi/ConferenceApp2023Reviewer | ||
/app-ios/ @DroidKaigi/appios |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file removed
BIN
-2.78 KB
app-ios/Modules/Sources/Assets/Resources/Icons.xcassets/badge.imageset/badge.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion
2
...Icons.xcassets/map.imageset/Contents.json → ...xcassets/floor_map.imageset/Contents.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"filename" : "map.pdf", | ||
"filename" : "floormap.pdf", | ||
"idiom" : "universal" | ||
} | ||
], | ||
|
Binary file added
BIN
+1.5 KB
app-ios/Modules/Sources/Assets/Resources/Icons.xcassets/floor_map.imageset/floormap.pdf
Binary file not shown.
12 changes: 12 additions & 0 deletions
12
...Modules/Sources/Assets/Resources/Icons.xcassets/floor_map_fill_off.imageset/Contents.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"filename" : "floormap_fill_off.pdf", | ||
"idiom" : "universal" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
File renamed without changes.
Binary file modified
BIN
-497 Bytes
(85%)
app-ios/Modules/Sources/Assets/Resources/Icons.xcassets/info.imageset/info.pdf
Binary file not shown.
12 changes: 12 additions & 0 deletions
12
app-ios/Modules/Sources/Assets/Resources/Icons.xcassets/info_fill_off.imageset/Contents.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"filename" : "info_fill_off.pdf", | ||
"idiom" : "universal" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
Binary file added
BIN
+3.2 KB
.../Modules/Sources/Assets/Resources/Icons.xcassets/info_fill_off.imageset/info_fill_off.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion
2
...ons.xcassets/badge.imageset/Contents.json → ...ons.xcassets/stamp.imageset/Contents.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"filename" : "badge.pdf", | ||
"filename" : "stamp.pdf", | ||
"idiom" : "universal" | ||
} | ||
], | ||
|
Binary file added
BIN
+1.47 KB
app-ios/Modules/Sources/Assets/Resources/Icons.xcassets/stamp.imageset/stamp.pdf
Binary file not shown.
12 changes: 12 additions & 0 deletions
12
...ios/Modules/Sources/Assets/Resources/Icons.xcassets/stamp_fill_off.imageset/Contents.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"filename" : "stamp_fill_off.pdf", | ||
"idiom" : "universal" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
Binary file added
BIN
+1.77 KB
...odules/Sources/Assets/Resources/Icons.xcassets/stamp_fill_off.imageset/stamp_fill_off.pdf
Binary file not shown.
12 changes: 12 additions & 0 deletions
12
...Modules/Sources/Assets/Resources/Icons.xcassets/timetable_fill_off.imageset/Contents.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
{ | ||
"images" : [ | ||
{ | ||
"filename" : "timetable_fill_off.pdf", | ||
"idiom" : "universal" | ||
} | ||
], | ||
"info" : { | ||
"author" : "xcode", | ||
"version" : 1 | ||
} | ||
} |
Binary file added
BIN
+4.94 KB
...ources/Assets/Resources/Icons.xcassets/timetable_fill_off.imageset/timetable_fill_off.pdf
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
core/testing/src/main/java/io/github/droidkaigi/confsched2023/testing/TimeZoneTestRule.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
package io.github.droidkaigi.confsched2023.testing | ||
|
||
import org.junit.rules.TestWatcher | ||
import org.junit.runner.Description | ||
import java.util.TimeZone | ||
|
||
class TimeZoneTestRule : TestWatcher() { | ||
private lateinit var evacuatedTimeZone: TimeZone | ||
|
||
override fun starting(description: Description) { | ||
evacuatedTimeZone = TimeZone.getDefault() | ||
TimeZone.setDefault(TimeZone.getTimeZone("Asia/Tokyo")) | ||
} | ||
|
||
override fun finished(description: Description) { | ||
TimeZone.setDefault(evacuatedTimeZone) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.