Skip to content

Update new stores #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bypasstom merged 5 commits into from
Apr 19, 2026
Merged

Update new stores #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7586188
[Store] Update B's Mart
bypasstom Apr 19, 2026
3ad26ca
[Store] Update Circle K
bypasstom Apr 19, 2026
19fae61
[Store] Update Family Mart
bypasstom Apr 19, 2026
1b85355
[Store] Update Mini Stop
bypasstom Apr 19, 2026
28225f5
[Store] Add new 711
bypasstom Apr 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/src/main/java/com/iceteaviet/fastfoodfinder/ui/main/search/SearchFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class SearchFragment : Fragment() {
private lateinit var quickSearchMiniStop: CircleImageView
private lateinit var quickSearchLoadMore: CircleImageView
private lateinit var quickSearchBsMart: CircleImageView
private lateinit var quickSearchShopNGo: CircleImageView
private lateinit var quickSearch7Eleven: CircleImageView

private lateinit var cvActionContainer: CardView
private lateinit var cvRecentlyContainer: CardView
Expand Down Expand Up @@ -143,7 +143,7 @@ class SearchFragment : Fragment() {
quickSearchMiniStop = binding.btnSearchMiniStop
quickSearchLoadMore = binding.btnLoadMore
quickSearchBsMart = binding.btnSearchBsmart
quickSearchShopNGo = binding.btnSearchShopNGo
quickSearch7Eleven = binding.btnSearch7Eleven
cardViewQuickSearch = binding.cvActionContainer
searchMoreLayout = binding.llLoadMoreContainer
searchContainer = binding.svSearchContainer
Expand Down Expand Up @@ -181,8 +181,8 @@ class SearchFragment : Fragment() {
viewModel.onQuickSearchItemClick(StoreType.TYPE_BSMART)
}

quickSearchShopNGo.setOnClickListener {
viewModel.onQuickSearchItemClick(StoreType.TYPE_SHOP_N_GO)
quickSearch7Eleven.setOnClickListener {
viewModel.onQuickSearchItemClick(StoreType.TYPE_7_ELEVEN)
}

quickSearchLoadMore.setOnClickListener {
Expand Down
4 changes: 2 additions & 2 deletions .../java/com/iceteaviet/fastfoodfinder/ui/settings/discountnotify/DiscountNotifyViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ class DiscountNotifyViewModel @Inject constructor() : ViewModel() {
const val KEY_MINI_STOP = "mini_stop"
const val KEY_FAMILY_MART = "family_mark"
const val KEY_BSMART = "bsmart"
const val KEY_SHOP_N_GO = "shop_n_go"
const val KEY_711 = "711"

val LIST_STORES = arrayOf(KEY_BSMART, KEY_CIRCLE_K, KEY_FAMILY_MART, KEY_MINI_STOP, KEY_SHOP_N_GO)
val LIST_STORES = arrayOf(KEY_BSMART, KEY_CIRCLE_K, KEY_FAMILY_MART, KEY_MINI_STOP, KEY_711)
}
}
8 changes: 4 additions & 4 deletions app/src/main/java/com/iceteaviet/fastfoodfinder/utils/DataUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,8 +327,8 @@ fun getStoreType(key: String?): Int {
StoreType.TYPE_FAMILY_MART
else if (key == "bsmart")
StoreType.TYPE_BSMART
else if (key == "shop_n_go")
StoreType.TYPE_SHOP_N_GO
else if (key == "711")
StoreType.TYPE_7_ELEVEN
else
StoreType.TYPE_CIRCLE_K
}
Expand All @@ -339,7 +339,7 @@ fun getStoreSearchString(storeType: Int): String {
StoreType.TYPE_MINI_STOP -> "Mini Stop"
StoreType.TYPE_FAMILY_MART -> "Family Mart"
StoreType.TYPE_BSMART -> "B'smart"
StoreType.TYPE_SHOP_N_GO -> "Shop and Go"
StoreType.TYPE_7_ELEVEN -> "7-Eleven"
else -> ""
}
}
Expand Down Expand Up @@ -397,7 +397,7 @@ fun getStoreNameByKey(key: String?): String {
DiscountNotifyViewModel.KEY_BSMART -> return "B\u2019s mart"
DiscountNotifyViewModel.KEY_FAMILY_MART -> return "Family mart"
DiscountNotifyViewModel.KEY_MINI_STOP -> return "Ministop"
DiscountNotifyViewModel.KEY_SHOP_N_GO -> return "Shop & Go"
DiscountNotifyViewModel.KEY_711 -> return "7-Eleven"
else -> return ""
}
}
6 changes: 3 additions & 3 deletions app/src/main/java/com/iceteaviet/fastfoodfinder/utils/FormatUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,9 @@ fun getStoreTypeFromQuery(queryString: String): Int {
return StoreType.TYPE_MINI_STOP
else if (trimmedQuery == "family mart" || trimmedQuery == "familymart" || trimmedQuery == "famima")
return StoreType.TYPE_FAMILY_MART
else if (trimmedQuery == "shop and go" || trimmedQuery == "shopandgo"
|| trimmedQuery == "shop n go" || trimmedQuery == "shopngo")
return StoreType.TYPE_SHOP_N_GO
else if (trimmedQuery == "711" || trimmedQuery == "seven eleven"
|| trimmedQuery == "7 eleven" || trimmedQuery == "7 11")
return StoreType.TYPE_7_ELEVEN
else if (trimmedQuery == "bsmart" || trimmedQuery == "b smart" || trimmedQuery == "bs mart"
|| trimmedQuery == "bmart" || trimmedQuery == "b'smart" || trimmedQuery == "b's mart" || trimmedQuery == "bs'mart")
return StoreType.TYPE_BSMART
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/com/iceteaviet/fastfoodfinder/utils/StoreType.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ object StoreType {
const val TYPE_FAMILY_MART = 2
const val TYPE_BSMART = 3
const val TYPE_SHOP_N_GO = 4
const val TYPE_7_ELEVEN = 5
}
1 change: 1 addition & 0 deletions app/src/main/java/com/iceteaviet/fastfoodfinder/utils/ui/UiUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ fun getStoreLogoDrawableRes(type: Int): Int {
StoreType.TYPE_FAMILY_MART -> R.drawable.logo_familymart_50
StoreType.TYPE_BSMART -> R.drawable.logo_bsmart_50
StoreType.TYPE_SHOP_N_GO -> R.drawable.logo_shopngo_50
StoreType.TYPE_7_ELEVEN -> R.drawable.logo_711_50
else -> R.drawable.logo_circlek_50
}
}
Expand Down
Binary file added app/src/main/res/drawable-hdpi/logo_711_50.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed app/src/main/res/drawable-mdpi/logo_bsmart_50.png
View file
Open in desktop
Binary file not shown.
Binary file removed app/src/main/res/drawable-mdpi/logo_circlek_50.png
View file
Open in desktop
Binary file not shown.
Binary file removed app/src/main/res/drawable-mdpi/logo_familymart_50.png
View file
Open in desktop
Binary file not shown.
Binary file removed app/src/main/res/drawable-mdpi/logo_ministop_50.png
View file
Open in desktop
Binary file not shown.
Binary file removed app/src/main/res/drawable-mdpi/logo_shopngo_50.png
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/res/drawable-xhdpi/logo_711_50.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-xxhdpi/logo_711_50.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable-xxxhdpi/logo_711_50.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/logo_711_red.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions app/src/main/res/layout/fragment_search.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,11 @@
android:visibility="gone">

<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/btn_search_shop_n_go"
android:id="@+id/btn_search_7_eleven"
android:layout_width="0dp"
android:layout_height="56dp"
android:layout_weight="1"
android:src="@drawable/logo_shopngo_red"
android:src="@drawable/logo_711_50"
app:civ_border_color="@color/googleRed"
app:civ_circle_background_color="@color/googleRed" />

Expand Down
8 changes: 4 additions & 4 deletions app/src/test/java/com/iceteaviet/fastfoodfinder/utils/DataUtilsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ class DataUtilsTest {
assertThat(getStoreType("mini_stop")).isEqualTo(StoreType.TYPE_MINI_STOP)
assertThat(getStoreType("family_mart")).isEqualTo(StoreType.TYPE_FAMILY_MART)
assertThat(getStoreType("bsmart")).isEqualTo(StoreType.TYPE_BSMART)
assertThat(getStoreType("shop_n_go")).isEqualTo(StoreType.TYPE_SHOP_N_GO)
assertThat(getStoreType("711")).isEqualTo(StoreType.TYPE_7_ELEVEN)
}

@Test
Expand All @@ -91,7 +91,7 @@ class DataUtilsTest {
fun getStoreSearchStringTest() {
assertThat(getStoreSearchString(StoreType.TYPE_CIRCLE_K)).isEqualTo("Circle K")
assertThat(getStoreSearchString(StoreType.TYPE_BSMART)).isEqualTo("B'smart")
assertThat(getStoreSearchString(StoreType.TYPE_SHOP_N_GO)).isEqualTo("Shop and Go")
assertThat(getStoreSearchString(StoreType.TYPE_7_ELEVEN)).isEqualTo("7-Eleven")
assertThat(getStoreSearchString(StoreType.TYPE_FAMILY_MART)).isEqualTo("Family Mart")
assertThat(getStoreSearchString(StoreType.TYPE_MINI_STOP)).isEqualTo("Mini Stop")
assertThat(getStoreSearchString(-1)).isEqualTo("")
Expand Down Expand Up @@ -133,7 +133,7 @@ class DataUtilsTest {
assertThat(getStoreNameByKey(KEY_BSMART)).isEqualTo("B’s mart")
assertThat(getStoreNameByKey(KEY_FAMILY_MART)).isEqualTo("Family mart")
assertThat(getStoreNameByKey(KEY_MINI_STOP)).isEqualTo("Ministop")
assertThat(getStoreNameByKey(KEY_SHOP_N_GO)).isEqualTo("Shop & Go")
assertThat(getStoreNameByKey(KEY_711)).isEqualTo("7-Eleven")

assertThat(getStoreNameByKey(null)).isEmpty()
assertThat(getStoreNameByKey("")).isEmpty()
Expand Down Expand Up @@ -194,7 +194,7 @@ class DataUtilsTest {
const val KEY_MINI_STOP = "mini_stop"
const val KEY_FAMILY_MART = "family_mark"
const val KEY_BSMART = "bsmart"
const val KEY_SHOP_N_GO = "shop_n_go"
const val KEY_711 = "711"

}
}
7 changes: 3 additions & 4 deletions app/src/test/java/com/iceteaviet/fastfoodfinder/utils/FormatUtilsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,9 @@ class FormatUtilsTest {
assertEquals(StoreType.TYPE_BSMART, getStoreTypeFromQuery("b smart"))
assertEquals(StoreType.TYPE_BSMART, getStoreTypeFromQuery("bs mart"))

assertEquals(StoreType.TYPE_SHOP_N_GO, getStoreTypeFromQuery("shopngo"))
assertEquals(StoreType.TYPE_SHOP_N_GO, getStoreTypeFromQuery(" shop n go"))
assertEquals(StoreType.TYPE_SHOP_N_GO, getStoreTypeFromQuery("shopandgo"))
assertEquals(StoreType.TYPE_SHOP_N_GO, getStoreTypeFromQuery(" shop and go "))
assertEquals(StoreType.TYPE_7_ELEVEN, getStoreTypeFromQuery("711"))
assertEquals(StoreType.TYPE_7_ELEVEN, getStoreTypeFromQuery(" seven eleven"))
assertEquals(StoreType.TYPE_7_ELEVEN, getStoreTypeFromQuery("7 eleven"))

assertEquals(StoreType.TYPE_FAMILY_MART, getStoreTypeFromQuery("familymart"))
assertEquals(StoreType.TYPE_FAMILY_MART, getStoreTypeFromQuery("famima"))
Expand Down
Loading
Loading