Skip to content

not much changes did until now #19

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

Open
klaus19 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

not much changes did until now #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 0 additions & 11 deletions .idea/deploymentTargetDropDown.xml
View file
Open in desktop

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

19 changes: 8 additions & 11 deletions app/src/main/java/com/example/visuallithuanian/DirectionsFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,24 +70,21 @@ class DirectionsFragment : Fragment() {

return listOf(
ImageInfo(R.drawable.north,"North","Šiaurės",listOf(R.drawable.purp), R.drawable.mic,
"",""),
"","","",""),
ImageInfo(R.drawable.south,"South","Pietų",listOf(R.drawable.purp), R.drawable.mic,
"",""),
"","","",""),
ImageInfo(R.drawable.west,"West","Vakarų",listOf(R.drawable.purp), R.drawable.mic,
"",""),
"","","",""),
ImageInfo(R.drawable.east,"East","Rytų",listOf(R.drawable.purp), R.drawable.mic,
"",""),
"","","",""),
ImageInfo(R.drawable.northwest,"North West","Šiaurės vakarai",listOf(R.drawable.purp), R.drawable.mic,
"",""),
"","","",""),
ImageInfo(R.drawable.northeast,"North East","Šiaurės rytai",listOf(R.drawable.purp), R.drawable.mic,
"",""),
"","","",""),
ImageInfo(R.drawable.southwest,"South West","Pietvakariai",listOf(R.drawable.purp), R.drawable.mic,
"",""),
"","","",""),
ImageInfo(R.drawable.southeast,"South East","Pietryčiai",listOf(R.drawable.purp), R.drawable.mic,
"",""),



"","","",""),
)

}
Expand Down
27 changes: 13 additions & 14 deletions app/src/main/java/com/example/visuallithuanian/Solarsystem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,36 +77,35 @@ class Solarsystem : Fragment() {

return listOf(
ImageInfo(R.drawable.sun,"Sun","Saulė",listOf(R.drawable.purp), R.drawable.mic,
"",""),
"","","",""),
ImageInfo(
R.drawable.star,"Star","Žvaigždė",listOf(R.drawable.purp), R.drawable.mic,
"",""),
"","","",""),
ImageInfo(R.drawable.meteor,"Meteor","Meteoras",listOf(R.drawable.purp), R.drawable.mic,
"",""),
"","","",""),
ImageInfo(R.drawable.comet,"Comet","Kometa",listOf(R.drawable.purp), R.drawable.mic,
"",""),
"","","",""),
ImageInfo(
R.drawable.mercury,"Mercury","Merkurijus",listOf(R.drawable.purp), R.drawable.mic,
"",""),
"","","",""),
ImageInfo(R.drawable.venus,"Venus","Venera",listOf(R.drawable.purp), R.drawable.mic,
"",""),
"","","",""),
ImageInfo(R.drawable.earth,"Earth","Žemė",listOf(R.drawable.purp), R.drawable.mic,
"",""),
"","","",""),
ImageInfo(
R.drawable.mars,"Mars","Marsas",listOf(R.drawable.purp), R.drawable.mic,
"",""),
"","","",""),
ImageInfo(R.drawable.jupiter,"Jupiter","Jupiteris",listOf(R.drawable.purp), R.drawable.mic,
"",""),
"","","",""),
ImageInfo(R.drawable.saturn,"Saturn","Saturnas",listOf(R.drawable.purp), R.drawable.mic,
"",""),
"","","",""),
ImageInfo(
R.drawable.uranus,"","Uranas",listOf(R.drawable.purp), R.drawable.mic,
"",""),
"","","",""),
ImageInfo(R.drawable.moon,"Moon","Mėnulis",listOf(R.drawable.purp), R.drawable.mic,
"",""),
"","","",""),
ImageInfo(R.drawable.planets,"Planets","Planetos",listOf(R.drawable.purp), R.drawable.mic,
"",""),

"","","",""),
)

}
Expand Down
21 changes: 10 additions & 11 deletions app/src/main/java/com/example/visuallithuanian/VegetablesFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,32 +58,31 @@ class VegetablesFragment : Fragment() {
private fun generateVegetablesList(): List<ImageInfo> {
return listOf(
ImageInfo(R.drawable.potato,"Potato","Bulvė",listOf(R.drawable.purp), R.drawable.mic,
"Potato is popular in Lithuania","Bulvės populiarios Lietuvoje"),
"Potato is popular in Lithuania","Bulvės populiarios Lietuvoje","",""),
ImageInfo(
R.drawable.cabbage,"Cabbage","Kopūstai",listOf(R.drawable.purp), R.drawable.mic,
"I don't eat cabbage","Aš nevalgau kopūstų"),
"I don't eat cabbage","Aš nevalgau kopūstų","",""),
ImageInfo(R.drawable.zucchini,"Zucchini","Cukinijos",listOf(R.drawable.purp), R.drawable.mic,
"",""),
"","","",""),
ImageInfo(
R.drawable.carrot,"Carrot","Morkos",listOf(R.drawable.purp), R.drawable.mic,
"",""),
"","","",""),
ImageInfo(R.drawable.beet,"Beet","burokėliai",listOf(R.drawable.purp), R.drawable.mic,
"",""),
"","","",""),
ImageInfo(
R.drawable.onion,"Onion","Svogūnai",listOf(R.drawable.purp), R.drawable.mic,
"",""),
"","","",""),
ImageInfo(R.drawable.pepper,"Pepper","Pipirai",listOf(R.drawable.purp), R.drawable.mic,
"",""),
"","","",""),
ImageInfo(
R.drawable.tomato,"Tomatoes","Pomidorai",listOf(R.drawable.purp), R.drawable.mic,
"",""),
"","","",""),
ImageInfo(R.drawable.cucumber,"Cucumber","Agurkai",listOf(R.drawable.purp), R.drawable.mic,
"",""),
"","","",""),
ImageInfo(
R.drawable.radish,"Radish","Ridikas",listOf(R.drawable.purp), R.drawable.mic,
"",""),
"","","",""),
)

}

}
30 changes: 17 additions & 13 deletions app/src/main/java/com/example/visuallithuanian/adapter/ImageAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,16 @@ import android.animation.AnimatorListenerAdapter
import android.animation.ObjectAnimator
import android.os.Build
import android.view.LayoutInflater
import android.view.MotionEvent
import android.view.View
import android.view.ViewGroup
import android.view.animation.AnimationUtils
import android.widget.ImageView
import android.widget.TextView
import androidx.annotation.RequiresApi
import androidx.cardview.widget.CardView
import androidx.recyclerview.widget.RecyclerView
import com.example.visuallithuanian.R
import com.example.visuallithuanian.data.ImageInfo
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
Expand All @@ -23,36 +26,38 @@ class ImageAdapter(private val imageList:List<ImageInfo>) : RecyclerView.Adapter


class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
val imageView: ImageView = itemView.findViewById(com.example.visuallithuanian.R.id.imageView)
val textView1: TextView = itemView.findViewById(com.example.visuallithuanian.R.id.name1TextView)
val textView2: TextView = itemView.findViewById(com.example.visuallithuanian.R.id.name2TextView)
val englishTextView: TextView = itemView.findViewById(com.example.visuallithuanian.R.id.hiddenTextViewEnglish)
val lithuanianTextView: TextView = itemView.findViewById(com.example.visuallithuanian.R.id.hiddenTextViewLithuanian)
val imageView: ImageView = itemView.findViewById(R.id.imageView)
val textView1: TextView = itemView.findViewById(R.id.name1TextView)
val textView2: TextView = itemView.findViewById(R.id.name2TextView)
val englishTextView: TextView = itemView.findViewById(R.id.hiddenTextViewEnglish)
val lithuanianTextView: TextView = itemView.findViewById(R.id.hiddenTextViewLithuanian)
val pluralEnglish:TextView = itemView.findViewById(R.id.pluralEnglish)
val pluralLithuanian:TextView = itemView.findViewById(R.id.pluralLithuanian)
}

override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
val view = LayoutInflater.from(parent.context).inflate(com.example.visuallithuanian.R.layout.item_image, parent, false)
val view = LayoutInflater.from(parent.context).inflate(R.layout.item_image, parent, false)
return ViewHolder(view)
}

@RequiresApi(Build.VERSION_CODES.KITKAT)
override fun onBindViewHolder(holder: ViewHolder, position: Int) {
val currentItem = imageList[position]
holder.imageView.setImageResource(currentItem.imageId)
holder.textView1.text = currentItem.name1
holder.textView2.text = currentItem.name2
holder.englishTextView.text = currentItem.english
holder.lithuanianTextView.text = currentItem.lithuanian
holder.pluralEnglish.text = currentItem.pluralEnglish
holder.pluralLithuanian.text = currentItem.pluralLithuanian

val imageIcon =
holder.itemView.findViewById<ImageView>(com.example.visuallithuanian.R.id.gemCount)
holder.itemView.findViewById<ImageView>(R.id.gemCount)
val cardAnimals =
holder.itemView.findViewById<CardView>(com.example.visuallithuanian.R.id.cardAnimals)
holder.itemView.findViewById<CardView>(R.id.cardAnimals)
val textHiddenEnglish =
holder.itemView.findViewById<TextView>(com.example.visuallithuanian.R.id.hiddenTextViewEnglish)
holder.itemView.findViewById<TextView>(R.id.hiddenTextViewEnglish)

//Code for the emoji bouncy animation
val txtLithuanian = holder.itemView.findViewById<TextView>(com.example.visuallithuanian.R.id.hiddenTextViewLithuanian)
val txtLithuanian = holder.itemView.findViewById<TextView>(R.id.hiddenTextViewLithuanian)

//Code where the cardview moves to left and Textview gets shown behind it.
imageIcon.setOnClickListener {
Expand All @@ -74,7 +79,6 @@ class ImageAdapter(private val imageList:List<ImageInfo>) : RecyclerView.Adapter
}
})
}

}
override fun getItemCount() = imageList.size
}
3 changes: 2 additions & 1 deletion app/src/main/java/com/example/visuallithuanian/data/ImageInfo.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ import androidx.room.Entity


data class ImageInfo(
val imageId:Int, val name1:String, val name2:String, var list:List<Int>?,val voice:Int?,val english:String,val lithuanian:String)
val imageId:Int, val name1:String, val name2:String, var list:List<Int>?,
val voice:Int?,val english:String,val lithuanian:String,val pluralEnglish:String,val pluralLithuanian:String)

41 changes: 20 additions & 21 deletions app/src/main/java/com/example/visuallithuanian/ui/activities/fragments/AnimalsFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,66 +83,65 @@ class AnimalsFragment : Fragment() {
return listOf(
ImageInfo(
R.drawable.fox,"Red Fox","Raudona lapė",listOf(R.drawable.purp), R.drawable.mic,
"A red fox ran across the field","Raudona lapė bėgo per lauką"),
"A red fox ran across the field","Raudona lapė bėgo per lauką","",""),
ImageInfo(
R.drawable.wolf,"Wolf","Vilkas", listOf(R.drawable.purp), R.drawable.mic,
"The wolf howled towards the moon" , "Vilkas šaukė į mėnulį"),
"The wolf howled towards the moon" , "Vilkas šaukė į mėnulį","",""),
ImageInfo(
R.drawable.lion,"Lion","Liūtas", listOf(R.drawable.purp), R.drawable.mic,
"The lion roared loudly", "Liūtas garsiai riaumojo"),
"The lion roared loudly", "Liūtas garsiai riaumojo","",""),
ImageInfo(
R.drawable.tiger,"Tiger","Tigras", listOf(R.drawable.purp),
R.drawable.mic,"The tiger was walking","Tigras vaikščiojo"),
R.drawable.mic,"The tiger was walking","Tigras vaikščiojo","",""),
ImageInfo(
R.drawable.squir,"Squirrel","Voverė", listOf(R.drawable.purp),
R.drawable.mic,"The squirrel climbed up the tree","Voveraitė kopė į medį"),
R.drawable.mic,"The squirrel climbed up the tree","Voveraitė kopė į medį","",""),
ImageInfo(
R.drawable.moose,"Moose","Briedis", listOf(R.drawable.purp),
R.drawable.mic,"The moose was standing in the pond","Briedis stovėjo ežere"),
R.drawable.mic,"The moose was standing in the pond","Briedis stovėjo ežere","",""),
ImageInfo(
R.drawable.deer,"Deer","elnias", listOf(R.drawable.purp),
R.drawable.mic,"The deer was grazing in the meadow","Elnias žiūrėjo pievoje "),
R.drawable.mic,"The deer was grazing in the meadow","Elnias žiūrėjo pievoje ","",""),
ImageInfo(
R.drawable.beaver,"Beaver","Bebras", listOf(R.drawable.purp),
R.drawable.mic,"The beaver was swimming in the river","Bebras plaukiojo upėje"),
R.drawable.mic,"The beaver was swimming in the river","Bebras plaukiojo upėje","",""),
ImageInfo(
R.drawable.bison,"Bison","bizonų", listOf(R.drawable.purp),
R.drawable.mic,"The bison roamed the prairie","Bizonas klajojo per prerijas"),
R.drawable.mic,"The bison roamed the prairie","Bizonas klajojo per prerijas","",""),
ImageInfo(
R.drawable.frog,"Frog","Varlė", listOf(R.drawable.purp),
R.drawable.mic,"The frog jumped into the pond","Varlė šoko į ežerą"),
R.drawable.mic,"The frog jumped into the pond","Varlė šoko į ežerą","",""),
ImageInfo(
R.drawable.fish,"Fish","Žuvis", listOf(R.drawable.purp),
R.drawable.mic,"The fish swam within the stream","Žuvis plaukiojo srovėje"),
R.drawable.mic,"The fish swam within the stream","Žuvis plaukiojo srovėje","",""),
ImageInfo(
R.drawable.cat,"Cat","Katė", listOf(R.drawable.purp),
R.drawable.mic,"The cat was sleeping on the windowsill","Katė miegojo ant palangės"),
R.drawable.mic,"The cat was sleeping on the windowsill","Katė miegojo ant palangės","",""),
ImageInfo(
R.drawable.dog,"Dog","šuo", listOf(R.drawable.purp),
R.drawable.mic,"The dog barked at the mailman","Šuo lojo ant pašto darbuotoją"),
R.drawable.mic,"The dog barked at the mailman","Šuo lojo ant pašto darbuotoją","",""),
ImageInfo(
R.drawable.rabbit,"Rabbit","Triušis", listOf(R.drawable.purp),
R.drawable.mic,"The rabbit was hopping across the garden","Triušis šokinėjo per sodą"),
R.drawable.mic,"The rabbit was hopping across the garden","Triušis šokinėjo per sodą","",""),
ImageInfo(
R.drawable.snake,"Snake","Gyvatė", listOf(R.drawable.purp),
R.drawable.mic,"The snake was moving","Gyvatė judėjo"),
R.drawable.mic,"The snake was moving","Gyvatė judėjo","",""),
ImageInfo(
R.drawable.boar,"Wild Boar","Šernas", listOf(R.drawable.purp),
R.drawable.mic,"The wild boar was searching for food","Šernas ieškojo maisto"),
R.drawable.mic,"The wild boar was searching for food","Šernas ieškojo maisto","",""),
ImageInfo(
R.drawable.polarbear,"Polar Bear","Baltoji meška", listOf(R.drawable.purp),
R.drawable.mic,"The polar bear hunted the seal on the ice",
"Baltoji meška medžiojo ruonius ant ledo"),
"Baltoji meška medžiojo ruonius ant ledo","",""),
ImageInfo(
R.drawable.bear,"Bear","Meška", listOf(R.drawable.purp), R.drawable.mic,
"The bear was searching for honey inside the forest","Meška ieškojo medaus girioje"),
"The bear was searching for honey inside the forest","Meška ieškojo medaus girioje","",""),
ImageInfo(
R.drawable.cow,"Cow","Karvė", listOf(R.drawable.purp), R.drawable.mic,
"The cow gives milk","Karvė duoda pieno"),
"The cow gives milk","Karvė duoda pieno","",""),
ImageInfo(
R.drawable.horse,"Horse","Arklys", listOf(R.drawable.purp), R.drawable.mic,
"The horse is running","Arklys bėga"),

"The horse is running","Arklys bėga","",""),
)

}
Expand Down
24 changes: 13 additions & 11 deletions app/src/main/java/com/example/visuallithuanian/ui/activities/fragments/FruitsFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,34 +88,36 @@ class FruitsFragment : Fragment() {
return listOf(
ImageInfo(
R.drawable.apple,"Apple","obuolys",listOf(R.drawable.purp),
R.drawable.mic,"I love to eat a red apple ","Mėgstu valgyti raudoną obuolį"),
R.drawable.mic,"I love to eat a red apple ","Mėgstu valgyti raudoną obuolį",
"Apples","Obuoliai"),
ImageInfo(
R.drawable.orange,"Orange","Apelsinas",listOf(R.drawable.purp),
R.drawable.mic,"This orange is very sweet"," Šis apelsinas yra labai saldus"),
R.drawable.mic,"This orange is very sweet"," Šis apelsinas yra labai saldus",
"",""),
ImageInfo(
R.drawable.raspberry,"Raspberries","Avietės",listOf(R.drawable.purp),
R.drawable.mic,"I like raspberry juice","Mėgstu aviečių sultis"),
R.drawable.mic,"I like raspberry juice","Mėgstu aviečių sultis","",""),
ImageInfo(
R.drawable.gooseberry,"GooseBerry","agrastas",listOf(R.drawable.purp),
R.drawable.mic,"I don't like GooseBerry","Nemėgstu agrastas"),
R.drawable.mic,"I don't like GooseBerry","Nemėgstu agrastas","",""),
ImageInfo(R.drawable.plum,"Plum","Slyvos",listOf(R.drawable.purp), R.drawable.mic,
"The plum was juicy and delicious","Slyva buvo sultinga ir skani"),
"The plum was juicy and delicious","Slyva buvo sultinga ir skani","",""),
ImageInfo(R.drawable.pear,"Pear","Kriaušė",listOf(R.drawable.purp), R.drawable.mic,
"I like pears a lot","Man labai patinka kriaušės"),
"I like pears a lot","Man labai patinka kriaušės","",""),
ImageInfo(
R.drawable.grape,"Grapes","Vynuogės",listOf(R.drawable.purp),
R.drawable.mic,"He ate grapes as a healthy snack","Jis valgė vynuoges kaip sveiką užkandį"),
R.drawable.mic,"He ate grapes as a healthy snack","Jis valgė vynuoges kaip sveiką užkandį","",""),
ImageInfo(
R.drawable.banana,"Banana","Bananas",listOf(R.drawable.purp),
R.drawable.mic,"She likes to eat bananas","Ji mėgsta valgyti bananus"),
R.drawable.mic,"She likes to eat bananas","Ji mėgsta valgyti bananus","",""),
ImageInfo(
R.drawable.blackcurrant,"Black currant","Juodieji serbentai",listOf(R.drawable.purp),
R.drawable.mic,"Black currants are sweet","Juodieji serbentai yra saldūs"),
R.drawable.mic,"Black currants are sweet","Juodieji serbentai yra saldūs","",""),
ImageInfo(R.drawable.mango,"Mango","Mango",listOf(R.drawable.purp), R.drawable.mic,
"I made jam from black currants","Gaminau uogienę iš juodųjų serbentų"),
"I made jam from black currants","Gaminau uogienę iš juodųjų serbentų","",""),
ImageInfo(
R.drawable.strawberry,"Strawberry","braškių",listOf(R.drawable.purp), R.drawable.mic,
"I love to eat fresh strawberries in the summer","Vasarą mėgstu valgyti šviežias braškes")
"I love to eat fresh strawberries in the summer","Vasarą mėgstu valgyti šviežias braškes","","")
)


Expand Down
Loading