Skip to content
This repository was archived by the owner on Aug 11, 2024. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: SuhasDissa/Food-E-App
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.2
Choose a base ref
...
head repository: SuhasDissa/Food-E-App
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
5 contributors
Loading
Showing with 7,876 additions and 3,076 deletions.
  1. +13 −0 .github/FUNDING.yml
  2. +41 −29 .github/workflows/main.yml
  3. +15 −15 .gitignore
  4. +3 −3 .idea/.gitignore
  5. +123 −122 .idea/codeStyles/Project.xml
  6. +4 −4 .idea/codeStyles/codeStyleConfig.xml
  7. +5 −5 .idea/compiler.xml
  8. +24 −36 .idea/deploymentTargetDropDown.xml
  9. +18 −18 .idea/gradle.xml
  10. +40 −40 .idea/inspectionProfiles/Project_Default.xml
  11. +5 −5 .idea/kotlinc.xml
  12. +7 −0 .idea/ktlint.xml
  13. +5 −5 .idea/vcs.xml
  14. +3 −0 Gemfile
  15. +674 −674 LICENSE
  16. +68 −0 README.de-DE.md
  17. +65 −0 README.ja-JP.md
  18. +65 −37 README.md
  19. +68 −0 README.or-IN.md
  20. +68 −0 README.ru-RU.md
  21. +68 −0 README.si-LK.md
  22. +0 −98 app/build.gradle
  23. +111 −0 app/build.gradle.kts
  24. +15 −8 app/proguard-rules.pro
  25. +46 −0 app/schemas/app.suhasdissa.foode.backend.database.BarcodeDatabase/1.json
  26. +53 −0 app/schemas/app.suhasdissa.foode.backend.database.BarcodeDatabase/2.json
  27. +57 −57 app/schemas/app.suhasdissa.foode.backend.database.ENumberDatabase/1.json
  28. +4 −0 app/src/debug/res/values/strings.xml
  29. +44 −27 app/src/main/AndroidManifest.xml
  30. BIN app/src/main/assets/databases/database.db
  31. BIN app/src/main/ic_launcher-playstore.png
  32. +47 −23 app/src/main/java/app/suhasdissa/foode/AppContainer.kt
  33. +69 −0 app/src/main/java/app/suhasdissa/foode/BarcodeScannerActivity.kt
  34. +25 −30 app/src/main/java/app/suhasdissa/foode/Destinations.kt
  35. +23 −19 app/src/main/java/app/suhasdissa/foode/FoodeApplication.kt
  36. +22 −22 app/src/main/java/app/suhasdissa/foode/MainActivity.kt
  37. +119 −92 app/src/main/java/app/suhasdissa/foode/NavHost.kt
  38. +38 −0 app/src/main/java/app/suhasdissa/foode/backend/api/LingvaTranslate.kt
  39. +45 −0 app/src/main/java/app/suhasdissa/foode/backend/api/OpenFoodFactsAPI.kt
  40. +40 −0 app/src/main/java/app/suhasdissa/foode/backend/database/BarcodeDatabase.kt
  41. +33 −31 app/src/main/java/app/suhasdissa/foode/backend/database/ENumberDatabase.kt
  42. +23 −22 app/src/main/java/app/suhasdissa/foode/backend/database/dao/AdditivesDao.kt
  43. +20 −0 app/src/main/java/app/suhasdissa/foode/backend/database/dao/BarcodeHistoryDao.kt
  44. +17 −16 app/src/main/java/app/suhasdissa/foode/backend/database/entities/AdditivesEntity.kt
  45. +19 −0 app/src/main/java/app/suhasdissa/foode/backend/database/entities/BarcodeEntity.kt
  46. +13 −0 app/src/main/java/app/suhasdissa/foode/backend/models/NutrientLevels.kt
  47. +242 −0 app/src/main/java/app/suhasdissa/foode/backend/models/Nutriments.kt
  48. +6 −0 app/src/main/java/app/suhasdissa/foode/backend/models/NutritionTableData.kt
  49. +10 −0 app/src/main/java/app/suhasdissa/foode/backend/models/OpenFoodFactsResponse.kt
  50. +17 −0 app/src/main/java/app/suhasdissa/foode/backend/models/OpenFoodFactsSearchResponse.kt
  51. +65 −0 app/src/main/java/app/suhasdissa/foode/backend/models/Product.kt
  52. +8 −0 app/src/main/java/app/suhasdissa/foode/backend/models/lingva/LVTranslationResponse.kt
  53. +9 −0 app/src/main/java/app/suhasdissa/foode/backend/models/lingva/Language.kt
  54. +8 −0 app/src/main/java/app/suhasdissa/foode/backend/models/lingva/LvLanguage.kt
  55. +12 −13 app/src/main/java/app/suhasdissa/foode/backend/repositories/AdditivesRepository.kt
  56. +12 −0 app/src/main/java/app/suhasdissa/foode/backend/repositories/BarcodeHistoryRepository.kt
  57. +13 −0 app/src/main/java/app/suhasdissa/foode/backend/repositories/BarcodeHistoryRepositoryImpl.kt
  58. +17 −27 app/src/main/java/app/suhasdissa/foode/backend/repositories/LocalAdditivesRepository.kt
  59. +19 −0 app/src/main/java/app/suhasdissa/foode/backend/repositories/OpenFoodFactRepository.kt
  60. +8 −0 app/src/main/java/app/suhasdissa/foode/backend/repositories/TranslationRepository.kt
  61. +12 −0 app/src/main/java/app/suhasdissa/foode/backend/repositories/TranslationRepositoryImpl.kt
  62. +114 −56 app/src/main/java/app/suhasdissa/foode/backend/viewmodels/AdditiveDetailViewModel.kt
  63. +51 −0 app/src/main/java/app/suhasdissa/foode/backend/viewmodels/BarcodeHistoryViewModel.kt
  64. +24 −32 app/src/main/java/app/suhasdissa/foode/backend/viewmodels/CheckUpdateViewModel.kt
  65. +69 −0 app/src/main/java/app/suhasdissa/foode/backend/viewmodels/FFSearchViewModel.kt
  66. +135 −0 app/src/main/java/app/suhasdissa/foode/backend/viewmodels/FoodFactsViewModel.kt
  67. +0 −46 app/src/main/java/app/suhasdissa/foode/backend/viewmodels/MainAdditivesModel.kt
  68. +38 −0 app/src/main/java/app/suhasdissa/foode/backend/viewmodels/MainAdditivesViewModel.kt
  69. +38 −40 app/src/main/java/app/suhasdissa/foode/backend/viewmodels/SearchViewModel.kt
  70. +15 −0 app/src/main/java/app/suhasdissa/foode/backend/viewmodels/states/FFSearchState.kt
  71. +8 −8 app/src/main/java/app/suhasdissa/foode/backend/viewmodels/states/SearchState.kt
  72. +9 −0 app/src/main/java/app/suhasdissa/foode/backend/viewmodels/states/TranslationState.kt
  73. +27 −30 app/src/main/java/app/suhasdissa/foode/ui/FoodeApp.kt
  74. +84 −0 app/src/main/java/app/suhasdissa/foode/ui/components/BarcodeHistoryCard.kt
  75. +128 −0 app/src/main/java/app/suhasdissa/foode/ui/components/BarcodeOptionSheet.kt
  76. +32 −33 app/src/main/java/app/suhasdissa/foode/ui/components/CardGrid.kt
  77. +69 −0 app/src/main/java/app/suhasdissa/foode/ui/components/ErrorScreen.kt
  78. +82 −0 app/src/main/java/app/suhasdissa/foode/ui/components/FoodProductCard.kt
  79. +105 −0 app/src/main/java/app/suhasdissa/foode/ui/components/IllustratedMessageScreen.kt
  80. +39 −0 app/src/main/java/app/suhasdissa/foode/ui/components/ItemCard.kt
  81. +70 −0 app/src/main/java/app/suhasdissa/foode/ui/components/ItemCardImage.kt
  82. +15 −0 app/src/main/java/app/suhasdissa/foode/ui/components/LoadingScreen.kt
  83. +24 −21 app/src/main/java/app/suhasdissa/foode/ui/components/MessageScreen.kt
  84. +145 −0 app/src/main/java/app/suhasdissa/foode/ui/components/NavDrawerContent.kt
  85. +81 −0 app/src/main/java/app/suhasdissa/foode/ui/components/NutrientCard.kt
  86. +101 −0 app/src/main/java/app/suhasdissa/foode/ui/components/NutritionTable.kt
  87. +69 −0 app/src/main/java/app/suhasdissa/foode/ui/components/ProductNotFoundScreen.kt
  88. +90 −61 app/src/main/java/app/suhasdissa/foode/ui/components/SettingItem.kt
  89. +51 −41 app/src/main/java/app/suhasdissa/foode/ui/components/TextCard.kt
  90. +42 −0 app/src/main/java/app/suhasdissa/foode/ui/components/TranslationStateDialog.kt
  91. +31 −33 app/src/main/java/app/suhasdissa/foode/ui/components/TwoPaneScreen.kt
  92. +93 −136 app/src/main/java/app/suhasdissa/foode/ui/screens/AboutScreen.kt
  93. +336 −179 app/src/main/java/app/suhasdissa/foode/ui/screens/AdditiveDetailScreen.kt
  94. +0 −86 app/src/main/java/app/suhasdissa/foode/ui/screens/HomeScreen.kt
  95. +80 −78 app/src/main/java/app/suhasdissa/foode/ui/screens/SearchScreen.kt
  96. +61 −43 app/src/main/java/app/suhasdissa/foode/ui/screens/SettingsScreen.kt
  97. +37 −0 app/src/main/java/app/suhasdissa/foode/ui/screens/additives/AdditivesScreen.kt
  98. +39 −0 app/src/main/java/app/suhasdissa/foode/ui/screens/additives/FavouritesScreen.kt
  99. +90 −0 app/src/main/java/app/suhasdissa/foode/ui/screens/additives/MainAdditivesScreen.kt
  100. +174 −0 app/src/main/java/app/suhasdissa/foode/ui/screens/food_fact_screen/FoodFactIngredients.kt
  101. +100 −0 app/src/main/java/app/suhasdissa/foode/ui/screens/food_fact_screen/FoodFactNutrition.kt
  102. +175 −0 app/src/main/java/app/suhasdissa/foode/ui/screens/food_fact_screen/FoodFactOverview.kt
  103. +78 −0 app/src/main/java/app/suhasdissa/foode/ui/screens/food_fact_screen/FoodFactView.kt
  104. +69 −0 app/src/main/java/app/suhasdissa/foode/ui/screens/food_fact_screen/FoodFactsScreen.kt
  105. +94 −0 app/src/main/java/app/suhasdissa/foode/ui/screens/food_fact_screen/MainBarcodeHistoryScreen.kt
  106. +142 −0 app/src/main/java/app/suhasdissa/foode/ui/screens/food_fact_search/FoodFactSearchScreen.kt
  107. +110 −0 app/src/main/java/app/suhasdissa/foode/ui/screens/home/HomeScreen.kt
  108. +66 −0 app/src/main/java/app/suhasdissa/foode/ui/screens/home/ScanHistoryScreen.kt
  109. +67 −68 app/src/main/java/app/suhasdissa/foode/ui/theme/Color.kt
  110. +112 −100 app/src/main/java/app/suhasdissa/foode/ui/theme/Theme.kt
  111. +41 −41 app/src/main/java/app/suhasdissa/foode/ui/theme/Type.kt
  112. +12 −0 app/src/main/java/app/suhasdissa/foode/utils/Mapper.kt
  113. +13 −13 app/src/main/java/app/suhasdissa/foode/utils/OpenBrowser.kt
  114. +40 −0 app/src/main/java/app/suhasdissa/foode/utils/Preferences.kt
  115. +83 −79 app/src/main/java/app/suhasdissa/foode/utils/UpdateUtil.kt
  116. +54 −0 app/src/main/res/drawable/barcode_icon.xml
  117. +9 −0 app/src/main/res/drawable/blob.xml
  118. +20 −0 app/src/main/res/drawable/broken_egg_icon.xml
  119. +23 −0 app/src/main/res/drawable/egg_not_found_icon.xml
  120. +80 −0 app/src/main/res/drawable/empty_barcode_list_icon.xml
  121. +45 −0 app/src/main/res/drawable/empty_favourites_list_icon.xml
  122. +42 −0 app/src/main/res/drawable/halal_certified_stamp.xml
  123. +0 −12 app/src/main/res/drawable/ic_foode_full.xml
  124. +0 −9 app/src/main/res/drawable/ic_github.xml
  125. +25 −17 app/src/main/res/drawable/ic_launcher_foreground.xml
  126. +25 −0 app/src/main/res/drawable/ic_launcher_monochrome.xml
  127. +0 −9 app/src/main/res/drawable/ic_twitter.xml
  128. +34 −0 app/src/main/res/drawable/open_food_fact_icon.xml
  129. +11 −0 app/src/main/res/layout/codescanner.xml
  130. +5 −4 app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
  131. BIN app/src/main/res/mipmap-hdpi/ic_launcher.png
  132. BIN app/src/main/res/mipmap-mdpi/ic_launcher.png
  133. BIN app/src/main/res/mipmap-xhdpi/ic_launcher.png
  134. BIN app/src/main/res/mipmap-xxhdpi/ic_launcher.png
  135. BIN app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
  136. +1 −0 app/src/main/res/resources.properties
  137. +86 −14 app/src/main/res/values-de-rDE/strings.xml
  138. +97 −0 app/src/main/res/values-ja-rJP/strings.xml
  139. +96 −0 app/src/main/res/values-or-rIN/strings.xml
  140. +86 −14 app/src/main/res/values-ru-rRU/strings.xml
  141. +88 −16 app/src/main/res/values-si-rLK/strings.xml
  142. +3 −3 app/src/main/res/values/ic_launcher_background.xml
  143. +97 −26 app/src/main/res/values/strings.xml
  144. +4 −4 app/src/main/res/values/themes.xml
  145. +8 −0 app/src/main/res/xml/locales_config.xml
  146. +0 −6 build.gradle
  147. +8 −0 build.gradle.kts
  148. +5 −3 crowdin.yml
  149. +4 −0 fastlane/metadata/android/en-US/full_description.txt
  150. BIN fastlane/metadata/android/en-US/images/icon.png
  151. BIN fastlane/metadata/android/en-US/images/phoneScreenshots/1.png
  152. BIN fastlane/metadata/android/en-US/images/phoneScreenshots/2.png
  153. BIN fastlane/metadata/android/en-US/images/phoneScreenshots/3.png
  154. BIN fastlane/metadata/android/en-US/images/phoneScreenshots/4.png
  155. BIN fastlane/metadata/android/en-US/images/phoneScreenshots/5.png
  156. BIN fastlane/metadata/android/en-US/images/phoneScreenshots/6.png
  157. BIN fastlane/metadata/android/en-US/images/phoneScreenshots/7.png
  158. BIN fastlane/metadata/android/en-US/images/phoneScreenshots/8.png
  159. +1 −0 fastlane/metadata/android/en-US/short_description.txt
  160. +22 −22 gradle.properties
  161. BIN gradle/wrapper/gradle-wrapper.jar
  162. +3 −2 gradle/wrapper/gradle-wrapper.properties
  163. +164 −105 gradlew
  164. +92 −89 gradlew.bat
  165. BIN logo.png
  166. +0 −3 logo.svg
  167. BIN screenshots/Food-E-Screenshot1.png
  168. BIN screenshots/Food-E-Screenshot2.png
  169. +17 −16 settings.gradle
13 changes: 13 additions & 0 deletions .github/FUNDING.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# These are supported funding model platforms

github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
patreon: # Replace with a single Patreon username
open_collective: # Replace with a single Open Collective username
ko_fi: # Replace with a single Ko-fi username
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
liberapay: suhas_d
issuehunt: # Replace with a single IssueHunt username
otechie: # Replace with a single Otechie username
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']
70 changes: 41 additions & 29 deletions .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,41 @@
name: Create Apk

on:
push:
paths-ignore:
- "README*.md"
- "app/src/res/**"
- ".github/**"
branches:
- main

jobs:
apk:
name: Generate APK
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v1
- name: Setup JDK
uses: actions/setup-java@v1
with:
java-version: 17
- name: Build APK
run: bash ./gradlew assembleRelease --stacktrace
- name: Upload APK
uses: actions/upload-artifact@v1
with:
name: release
path: app/build/outputs/apk/release/
name: Create Apk

on:
push:
paths-ignore:
- "README*.md"
- "app/src/main/res/**"
- ".github/**"
branches:
- main
pull_request:
paths-ignore:
- "README*.md"
- "app/src/main/res/**"
- ".github/**"
branches:
- main
workflow_dispatch:

jobs:
apk:
name: Generate APK
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@v2
- name: Setup JDK
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: 17
cache: "gradle"
- name: Build APK
run: bash ./gradlew assembleReleaseGithub --stacktrace
- name: Upload APK
uses: actions/upload-artifact@v4
with:
name: release
path: app/build/outputs/apk/releaseGithub/
30 changes: 15 additions & 15 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
*.iml
.gradle
/local.properties
/.idea/caches
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
/.idea/navEditor.xml
/.idea/assetWizardSettings.xml
.DS_Store
/build
/captures
.externalNativeBuild
.cxx
local.properties
*.iml
.gradle
/local.properties
/.idea/caches
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
/.idea/navEditor.xml
/.idea/assetWizardSettings.xml
.DS_Store
/build
/captures
.externalNativeBuild
.cxx
local.properties
6 changes: 3 additions & 3 deletions .idea/.gitignore
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

245 changes: 123 additions & 122 deletions .idea/codeStyles/Project.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions .idea/codeStyles/codeStyleConfig.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions .idea/compiler.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading