Merge pull request #8 from nerufuyo/dev

Merge from dev to main
nerufuyo · Jul 16, 2023 · 956d61c · 956d61c
2 parents 23932ab + 18e2bd7
commit 956d61c
Show file tree

Hide file tree

Showing 101 changed files with 5 additions and 989 deletions.
diff --git a/.env b/.env
diff --git a/.gitignore b/.gitignore
@@ -9,9 +9,9 @@
 .history
 .svn/
 migrate_working_dir/
-# .env
-# .json
-# /lib/assets/
+.env
+.json
+/lib/assets/
 
 
 # IntelliJ related

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -48,7 +48,7 @@ android {
         applicationId "com.example.indoscape"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
-        minSdkVersion 33
+        minSdkVersion 28
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName

diff --git a/lib/assets/images/IndonesiaMap.jpg b/lib/assets/images/IndonesiaMap.jpg
diff --git a/lib/assets/images/agung.jpg b/lib/assets/images/agung.jpg
diff --git a/lib/assets/images/angklung.jpg b/lib/assets/images/angklung.jpg
diff --git a/lib/assets/images/bajidorKahot.jpg b/lib/assets/images/bajidorKahot.jpg
diff --git a/lib/assets/images/bakso.jpg b/lib/assets/images/bakso.jpg
diff --git a/lib/assets/images/bali.jpg b/lib/assets/images/bali.jpg
diff --git a/lib/assets/images/bandaIsland.jpg b/lib/assets/images/bandaIsland.jpg
diff --git a/lib/assets/images/bandung.jpg b/lib/assets/images/bandung.jpg
diff --git a/lib/assets/images/batik.jpg b/lib/assets/images/batik.jpg
diff --git a/lib/assets/images/bgBromo.jpg b/lib/assets/images/bgBromo.jpg
diff --git a/lib/assets/images/binaiya.jpg b/lib/assets/images/binaiya.jpg
diff --git a/lib/assets/images/borobudur.jpg b/lib/assets/images/borobudur.jpg
diff --git a/lib/assets/images/bromo.jpg b/lib/assets/images/bromo.jpg
diff --git a/lib/assets/images/bukitRaya.jpg b/lib/assets/images/bukitRaya.jpg
diff --git a/lib/assets/images/bunaken.jpg b/lib/assets/images/bunaken.jpg
diff --git a/lib/assets/images/cikuray.jpg b/lib/assets/images/cikuray.jpg
diff --git a/lib/assets/images/ciremai.jpg b/lib/assets/images/ciremai.jpg
diff --git a/lib/assets/images/city.png b/lib/assets/images/city.png
diff --git a/lib/assets/images/culture.png b/lib/assets/images/culture.png
diff --git a/lib/assets/images/derawanIsland.jpg b/lib/assets/images/derawanIsland.jpg
diff --git a/lib/assets/images/film.png b/lib/assets/images/film.png
diff --git a/lib/assets/images/food.png b/lib/assets/images/food.png
diff --git a/lib/assets/images/gadoGado.jpg b/lib/assets/images/gadoGado.jpg
diff --git a/lib/assets/images/gamelan.jpg b/lib/assets/images/gamelan.jpg
diff --git a/lib/assets/images/giliIsland.jpg b/lib/assets/images/giliIsland.jpg
diff --git a/lib/assets/images/info.png b/lib/assets/images/info.png
diff --git a/lib/assets/images/intro1.jpg b/lib/assets/images/intro1.jpg
diff --git a/lib/assets/images/intro2.jpg b/lib/assets/images/intro2.jpg
diff --git a/lib/assets/images/intro3.jpg b/lib/assets/images/intro3.jpg
diff --git a/lib/assets/images/jakarta.jpg b/lib/assets/images/jakarta.jpg
diff --git a/lib/assets/images/joglo.jpg b/lib/assets/images/joglo.jpg
diff --git a/lib/assets/images/kecak.jpg b/lib/assets/images/kecak.jpg
diff --git a/lib/assets/images/kelimutu.jpg b/lib/assets/images/kelimutu.jpg
diff --git a/lib/assets/images/kerakTelor.jpg b/lib/assets/images/kerakTelor.jpg
diff --git a/lib/assets/images/kerinci.jpg b/lib/assets/images/kerinci.jpg
diff --git a/lib/assets/images/keris.jpg b/lib/assets/images/keris.jpg
diff --git a/lib/assets/images/ketoprak.jpg b/lib/assets/images/ketoprak.jpg
diff --git a/lib/assets/images/klabat.jpg b/lib/assets/images/klabat.jpg
diff --git a/lib/assets/images/komodoNationalPark.jpg b/lib/assets/images/komodoNationalPark.jpg
diff --git a/lib/assets/images/krakatoa.jpg b/lib/assets/images/krakatoa.jpg
diff --git a/lib/assets/images/lawu.jpg b/lib/assets/images/lawu.jpg
diff --git a/lib/assets/images/lombok.jpg b/lib/assets/images/lombok.jpg
diff --git a/lib/assets/images/lontongCapGomeh.jpg b/lib/assets/images/lontongCapGomeh.jpg
diff --git a/lib/assets/images/lumpia.jpg b/lib/assets/images/lumpia.jpg
diff --git a/lib/assets/images/manado.jpg b/lib/assets/images/manado.jpg
diff --git a/lib/assets/images/martabak.jpg b/lib/assets/images/martabak.jpg
diff --git a/lib/assets/images/merapi.jpg b/lib/assets/images/merapi.jpg
diff --git a/lib/assets/images/merbabu.jpg b/lib/assets/images/merbabu.jpg
diff --git a/lib/assets/images/mountIjen.jpg b/lib/assets/images/mountIjen.jpg
diff --git a/lib/assets/images/mountain.png b/lib/assets/images/mountain.png
diff --git a/lib/assets/images/museum.png b/lib/assets/images/museum.png
diff --git a/lib/assets/images/nasiGoreng.jpg b/lib/assets/images/nasiGoreng.jpg
diff --git a/lib/assets/images/nasiKunyit.jpg b/lib/assets/images/nasiKunyit.jpg
diff --git a/lib/assets/images/nasiPadang.jpg b/lib/assets/images/nasiPadang.jpg
diff --git a/lib/assets/images/nasiUduk.JPG b/lib/assets/images/nasiUduk.JPG
diff --git a/lib/assets/images/nusaPenida.jpg b/lib/assets/images/nusaPenida.jpg
diff --git a/lib/assets/images/patuha.jpg b/lib/assets/images/patuha.jpg
diff --git a/lib/assets/images/pecelLele.jpg b/lib/assets/images/pecelLele.jpg
diff --git a/lib/assets/images/pempek.jpg b/lib/assets/images/pempek.jpg
diff --git a/lib/assets/images/pencakSilat.jpg b/lib/assets/images/pencakSilat.jpg
diff --git a/lib/assets/images/pindangIkan.jpg b/lib/assets/images/pindangIkan.jpg
diff --git a/lib/assets/images/pisBolong.jpg b/lib/assets/images/pisBolong.jpg
diff --git a/lib/assets/images/pisangGoreng.jpg b/lib/assets/images/pisangGoreng.jpg
diff --git a/lib/assets/images/prambanan.jpg b/lib/assets/images/prambanan.jpg
diff --git a/lib/assets/images/province.png b/lib/assets/images/province.png
diff --git a/lib/assets/images/puncakJaya.jpg b/lib/assets/images/puncakJaya.jpg
diff --git a/lib/assets/images/rajaAmpat.jpg b/lib/assets/images/rajaAmpat.jpg
diff --git a/lib/assets/images/raung.jpg b/lib/assets/images/raung.jpg
diff --git a/lib/assets/images/rejang.jpg b/lib/assets/images/rejang.jpg
diff --git a/lib/assets/images/rendang.jpg b/lib/assets/images/rendang.jpg
diff --git a/lib/assets/images/reogPonorogo.jpg b/lib/assets/images/reogPonorogo.jpg
diff --git a/lib/assets/images/rinjani.jpg b/lib/assets/images/rinjani.jpg
diff --git a/lib/assets/images/rujak.jpg b/lib/assets/images/rujak.jpg
diff --git a/lib/assets/images/rujakCingur.jpg b/lib/assets/images/rujakCingur.jpg
diff --git a/lib/assets/images/sambalGorengTempe.jpg b/lib/assets/images/sambalGorengTempe.jpg
diff --git a/lib/assets/images/sasando.jpg b/lib/assets/images/sasando.jpg
diff --git a/lib/assets/images/sateAyam.jpg b/lib/assets/images/sateAyam.jpg
diff --git a/lib/assets/images/semeru.jpg b/lib/assets/images/semeru.jpg
diff --git a/lib/assets/images/sindoro.jpg b/lib/assets/images/sindoro.jpg
diff --git a/lib/assets/images/slamet.jpg b/lib/assets/images/slamet.jpg
diff --git a/lib/assets/images/sotoAyam.jpg b/lib/assets/images/sotoAyam.jpg
diff --git a/lib/assets/images/sotoBetawi.jpg b/lib/assets/images/sotoBetawi.jpg
diff --git a/lib/assets/images/sumba.jpg b/lib/assets/images/sumba.jpg
diff --git a/lib/assets/images/sumbing.jpg b/lib/assets/images/sumbing.jpg
diff --git a/lib/assets/images/tambora.jpg b/lib/assets/images/tambora.jpg
diff --git a/lib/assets/images/tanaToraja.jpg b/lib/assets/images/tanaToraja.jpg
diff --git a/lib/assets/images/topeng.jpg b/lib/assets/images/topeng.jpg
diff --git a/lib/assets/images/travel.png b/lib/assets/images/travel.png
diff --git a/lib/assets/images/tumpeng.jpg b/lib/assets/images/tumpeng.jpg
diff --git a/lib/assets/images/ubud.jpg b/lib/assets/images/ubud.jpg
diff --git a/lib/assets/images/wayang.jpg b/lib/assets/images/wayang.jpg
diff --git a/lib/assets/images/wayangKulit.jpg b/lib/assets/images/wayangKulit.jpg
diff --git a/lib/assets/images/yogyakarta.jpg b/lib/assets/images/yogyakarta.jpg
diff --git a/lib/assets/json/culture.json b/lib/assets/json/culture.json