-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' of https://github.com/AdultOfNineteen/WINEY-Android …
…into dev
- Loading branch information
Showing
62 changed files
with
762 additions
and
448 deletions.
There are no files selected for viewing
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
5 changes: 5 additions & 0 deletions
5
core/common/src/main/java/com/teamwiney/core/common/model/MessageStatus.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,5 @@ | ||
package com.teamwiney.core.common.model | ||
|
||
enum class MessageStatus { | ||
PENDING, VERIFIED, FAILED, NONE | ||
} |
5 changes: 5 additions & 0 deletions
5
core/common/src/main/java/com/teamwiney/core/common/model/PreferenceStatus.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,5 @@ | ||
package com.teamwiney.core.common.model | ||
|
||
enum class PreferenceStatus { | ||
DONE, NONE | ||
} |
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
15 changes: 0 additions & 15 deletions
15
core/common/src/main/java/com/teamwiney/core/common/util/manageBottomBarState.kt
This file was deleted.
Oops, something went wrong.
20 changes: 20 additions & 0 deletions
20
core/design/src/main/res/drawable/ic_bottleshop_marker_29.xml
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,20 @@ | ||
<vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:width="29dp" | ||
android:height="29dp" | ||
android:viewportWidth="29" | ||
android:viewportHeight="29"> | ||
<path | ||
android:pathData="M14.5,14.5m-14.5,0a14.5,14.5 0,1 1,29 0a14.5,14.5 0,1 1,-29 0" | ||
android:fillColor="#3A3D40"/> | ||
<path | ||
android:pathData="M14.5,14.5m-11.5,0a11.5,11.5 0,1 1,23 0a11.5,11.5 0,1 1,-23 0" | ||
android:strokeAlpha="0.7" | ||
android:fillColor="#9542FF" | ||
android:fillAlpha="0.7"/> | ||
<path | ||
android:pathData="M14.04,6H15.4L16.08,13.48H13.36L14.04,6Z" | ||
android:fillColor="#ffffff"/> | ||
<path | ||
android:pathData="M12,14.16C12,12.657 13.218,11.439 14.72,11.439C16.222,11.439 17.44,12.657 17.44,14.16V23H12V14.16Z" | ||
android:fillColor="#ffffff"/> | ||
</vector> |
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,20 @@ | ||
<vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:width="29dp" | ||
android:height="29dp" | ||
android:viewportWidth="29" | ||
android:viewportHeight="29"> | ||
<path | ||
android:pathData="M14.5,14.5m-14.5,0a14.5,14.5 0,1 1,29 0a14.5,14.5 0,1 1,-29 0" | ||
android:fillColor="#3A3D40"/> | ||
<path | ||
android:pathData="M14.5,14.5m-11.5,0a11.5,11.5 0,1 1,23 0a11.5,11.5 0,1 1,-23 0" | ||
android:fillColor="#AA50D4"/> | ||
<path | ||
android:pathData="M10.235,12.193C10.113,11.575 10.587,11 11.217,11H17.795C18.421,11 18.893,11.569 18.778,12.184L17.653,18.184C17.564,18.657 17.151,19 16.67,19H12.4C11.922,19 11.511,18.662 11.419,18.194L10.235,12.193Z" | ||
android:fillColor="#ffffff"/> | ||
<path | ||
android:strokeWidth="1" | ||
android:pathData="M17.71,17.467C18.71,17.653 19.681,16.934 19.881,15.862C20.08,14.79 19.431,13.771 18.432,13.585" | ||
android:fillColor="#00000000" | ||
android:strokeColor="#ffffff"/> | ||
</vector> |
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,19 @@ | ||
<vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:width="29dp" | ||
android:height="29dp" | ||
android:viewportWidth="29" | ||
android:viewportHeight="29"> | ||
<path | ||
android:pathData="M14.5,14.5m-14.5,0a14.5,14.5 0,1 1,29 0a14.5,14.5 0,1 1,-29 0" | ||
android:fillColor="#3A3D40"/> | ||
<path | ||
android:pathData="M14.5,14.5m-11.5,0a11.5,11.5 0,1 1,23 0a11.5,11.5 0,1 1,-23 0" | ||
android:strokeAlpha="0.8" | ||
android:fillColor="#AC8FFE" | ||
android:fillAlpha="0.8"/> | ||
<path | ||
android:pathData="M11,9.3V19.36C11,19.614 11.296,19.753 11.492,19.591L14.308,17.248C14.419,17.155 14.581,17.155 14.692,17.248L17.508,19.591C17.704,19.753 18,19.614 18,19.36V9.3C18,9.134 17.866,9 17.7,9H11.3C11.134,9 11,9.134 11,9.3Z" | ||
android:strokeWidth="1.5" | ||
android:fillColor="#ffffff" | ||
android:strokeColor="#ffffff"/> | ||
</vector> |
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,5 @@ | ||
<vector android:height="24dp" android:viewportHeight="25" | ||
android:viewportWidth="25" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> | ||
<path android:fillColor="#3A3D40" android:pathData="M12.5,12.5m-12.5,0a12.5,12.5 0,1 1,25 0a12.5,12.5 0,1 1,-25 0"/> | ||
<path android:fillColor="#AC8FFE" android:pathData="M12.5,12.5m-6.5,0a6.5,6.5 0,1 1,13 0a6.5,6.5 0,1 1,-13 0"/> | ||
</vector> |
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,27 @@ | ||
<vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:width="29dp" | ||
android:height="29dp" | ||
android:viewportWidth="29" | ||
android:viewportHeight="29"> | ||
<path | ||
android:pathData="M14.5,14.5m-14.5,0a14.5,14.5 0,1 1,29 0a14.5,14.5 0,1 1,-29 0" | ||
android:fillColor="#3A3D40"/> | ||
<path | ||
android:pathData="M14.5,14.5m-11.5,0a11.5,11.5 0,1 1,23 0a11.5,11.5 0,1 1,-23 0" | ||
android:fillColor="#505DD4"/> | ||
<path | ||
android:pathData="M14.5,16C17.538,16 20,13.761 20,11H9C9,13.761 11.462,16 14.5,16Z" | ||
android:fillColor="#ffffff"/> | ||
<path | ||
android:pathData="M14.393,15V19.489" | ||
android:strokeWidth="1.4" | ||
android:fillColor="#00000000" | ||
android:strokeColor="#ffffff" | ||
android:strokeLineCap="round"/> | ||
<path | ||
android:pathData="M11,19.788L17.778,19.788" | ||
android:strokeWidth="1.4" | ||
android:fillColor="#00000000" | ||
android:strokeColor="#ffffff" | ||
android:strokeLineCap="round"/> | ||
</vector> |
35 changes: 35 additions & 0 deletions
35
core/design/src/main/res/drawable/ic_restaurant_marker_29.xml
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,35 @@ | ||
<vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:width="29dp" | ||
android:height="29dp" | ||
android:viewportWidth="29" | ||
android:viewportHeight="29"> | ||
<path | ||
android:pathData="M14.5,14.5m-14.5,0a14.5,14.5 0,1 1,29 0a14.5,14.5 0,1 1,-29 0" | ||
android:fillColor="#3A3D40"/> | ||
<path | ||
android:pathData="M14.5,14.5m-11.5,0a11.5,11.5 0,1 1,23 0a11.5,11.5 0,1 1,-23 0" | ||
android:fillColor="#7342FF"/> | ||
<path | ||
android:strokeWidth="1" | ||
android:pathData="M12.9,12C12.9,12.733 12.681,13.377 12.352,13.826C12.023,14.274 11.61,14.5 11.2,14.5C10.79,14.5 10.377,14.274 10.048,13.826C9.719,13.377 9.5,12.733 9.5,12C9.5,11.267 9.719,10.623 10.048,10.174C10.377,9.726 10.79,9.5 11.2,9.5C11.61,9.5 12.023,9.726 12.352,10.174C12.681,10.623 12.9,11.267 12.9,12Z" | ||
android:fillColor="#ffffff" | ||
android:strokeColor="#ffffff"/> | ||
<path | ||
android:pathData="M10.55,21C10.55,21.359 10.841,21.65 11.2,21.65C11.559,21.65 11.85,21.359 11.85,21H10.55ZM10.55,14V21H11.85V14H10.55Z" | ||
android:fillColor="#ffffff"/> | ||
<path | ||
android:pathData="M17.15,21C17.15,21.359 17.441,21.65 17.8,21.65C18.159,21.65 18.45,21.359 18.45,21H17.15ZM17.15,14V21H18.45V14H17.15Z" | ||
android:fillColor="#ffffff"/> | ||
<path | ||
android:strokeWidth="1" | ||
android:pathData="M15.6,10V13C15.6,13.552 16.048,14 16.6,14H19C19.552,14 20,13.552 20,13V10" | ||
android:fillColor="#00000000" | ||
android:strokeColor="#ffffff" | ||
android:strokeLineCap="round"/> | ||
<path | ||
android:strokeWidth="1" | ||
android:pathData="M17.8,10V14" | ||
android:fillColor="#00000000" | ||
android:strokeColor="#ffffff" | ||
android:strokeLineCap="round"/> | ||
</vector> |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
<vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:width="24dp" | ||
android:height="24dp" | ||
android:viewportWidth="24" | ||
android:viewportHeight="24"> | ||
<path | ||
android:pathData="M12,12m-12,0a12,12 0,1 1,24 0a12,12 0,1 1,-24 0" | ||
android:fillColor="#2C2F33"/> | ||
<path | ||
android:pathData="M8,16L16,8" | ||
android:strokeWidth="2.3" | ||
android:fillColor="#00000000" | ||
android:strokeColor="#63666A" | ||
android:strokeLineCap="round"/> | ||
<path | ||
android:pathData="M8,8L16,16" | ||
android:strokeWidth="2.3" | ||
android:fillColor="#00000000" | ||
android:strokeColor="#63666A" | ||
android:strokeLineCap="round"/> | ||
</vector> |
40 changes: 40 additions & 0 deletions
40
core/design/src/main/res/drawable/ic_winebar_marker_29.xml
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,40 @@ | ||
<vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:width="29dp" | ||
android:height="29dp" | ||
android:viewportWidth="29" | ||
android:viewportHeight="29"> | ||
<path | ||
android:pathData="M14.5,14.5m-14.5,0a14.5,14.5 0,1 1,29 0a14.5,14.5 0,1 1,-29 0" | ||
android:fillColor="#3A3D40"/> | ||
<path | ||
android:pathData="M14.5,14.5m-11.5,0a11.5,11.5 0,1 1,23 0a11.5,11.5 0,1 1,-23 0" | ||
android:strokeAlpha="0.7" | ||
android:fillColor="#7342FF" | ||
android:fillAlpha="0.7"/> | ||
<path | ||
android:pathData="M14.5,14.5m-11.5,0a11.5,11.5 0,1 1,23 0a11.5,11.5 0,1 1,-23 0" | ||
android:strokeAlpha="0.7" | ||
android:fillColor="#7342FF" | ||
android:fillAlpha="0.7"/> | ||
<path | ||
android:pathData="M15.582,16.446C19.5,15.5 18.111,10.941 18,9.5H14.5H12.5C11,14 12.992,17.072 15.582,16.446Z" | ||
android:strokeWidth="0.853333" | ||
android:fillColor="#ffffff" | ||
android:strokeColor="#ffffff"/> | ||
<path | ||
android:pathData="M14.893,16.944V20.933" | ||
android:strokeWidth="1.4" | ||
android:fillColor="#00000000" | ||
android:strokeColor="#ffffff"/> | ||
<path | ||
android:pathData="M11.5,21.233L18.278,21.232" | ||
android:strokeWidth="1.4" | ||
android:fillColor="#00000000" | ||
android:strokeColor="#ffffff" | ||
android:strokeLineCap="round"/> | ||
<path | ||
android:pathData="M18.051,9.133H11.735C9.574,17.61 15.503,17.585 17.22,16.114C19.086,14.513 18.549,11.183 18.051,9.133Z" | ||
android:strokeWidth="0.853333" | ||
android:fillColor="#00000000" | ||
android:strokeColor="#ffffff"/> | ||
</vector> |
Binary file modified
BIN
+240 KB
(220%)
core/design/src/main/res/mipmap-hdpi/img_splash_background.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
-228 KB
(48%)
core/design/src/main/res/mipmap-mdpi/img_splash_background.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+5.03 KB
(100%)
core/design/src/main/res/mipmap-xhdpi/img_splash_background.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+27.3 KB
(100%)
core/design/src/main/res/mipmap-xxhdpi/img_splash_background.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified
BIN
+29.1 KB
(100%)
core/design/src/main/res/mipmap-xxxhdpi/img_splash_background.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
Oops, something went wrong.