diff --git a/.gitignore b/.gitignore index ffa2efa..d946907 100644 --- a/.gitignore +++ b/.gitignore @@ -15,8 +15,9 @@ bin/ gen/ out/ + # Uncomment the following line in case you need and you don't have the release build type files in your app -# release/ +release/ # Gradle files .gradle/ diff --git a/app/build.gradle b/app/build.gradle index dfa7db0..dff453a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -35,31 +35,26 @@ dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9' + implementation 'androidx.core:core-ktx:1.3.2' implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'androidx.constraintlayout:constraintlayout:2.0.2' implementation 'androidx.navigation:navigation-fragment:2.3.0' implementation 'androidx.navigation:navigation-ui:2.3.0' - implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' implementation 'androidx.navigation:navigation-fragment-ktx:2.3.0' implementation 'androidx.navigation:navigation-ui-ktx:2.3.0' implementation 'androidx.security:security-crypto:1.1.0-alpha02' implementation 'com.google.android.material:material:1.2.1' implementation 'com.google.code.gson:gson:2.8.6' - - implementation 'org.jsoup:jsoup:1.13.1' - implementation 'com.github.bumptech.glide:glide:4.11.0' - implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'androidx.recyclerview:recyclerview:1.1.0' - implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0' - implementation 'com.google.android.exoplayer:exoplayer-core:2.12.0' implementation 'com.google.android.exoplayer:exoplayer-hls:2.12.0' implementation 'com.google.android.exoplayer:exoplayer-dash:2.12.0' implementation 'com.google.android.exoplayer:exoplayer-ui:2.12.0' + implementation 'org.jsoup:jsoup:1.13.1' + implementation 'com.github.bumptech.glide:glide:4.11.0' + testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test.ext:junit:1.1.2' androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' diff --git a/app/src/main/java/org/mosad/teapod/ui/home/HomeFragment.kt b/app/src/main/java/org/mosad/teapod/ui/home/HomeFragment.kt index aba569c..c936b14 100644 --- a/app/src/main/java/org/mosad/teapod/ui/home/HomeFragment.kt +++ b/app/src/main/java/org/mosad/teapod/ui/home/HomeFragment.kt @@ -4,29 +4,22 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.TextView import androidx.fragment.app.Fragment -import androidx.lifecycle.Observer -import androidx.lifecycle.ViewModelProviders +import kotlinx.android.synthetic.main.fragment_home.* import org.mosad.teapod.R class HomeFragment : Fragment() { - private lateinit var homeViewModel: HomeViewModel override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { - homeViewModel = ViewModelProviders.of(this).get(HomeViewModel::class.java) - val root = inflater.inflate(R.layout.fragment_home, container, false) - val textView: TextView = root.findViewById(R.id.text_home) - homeViewModel.text.observe(viewLifecycleOwner, Observer { - textView.text = it - }) - return root + return inflater.inflate(R.layout.fragment_home, container, false) } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) + text_home.text = "This is the home fragment" + println("HomeFragment created") } } \ No newline at end of file diff --git a/app/src/main/java/org/mosad/teapod/ui/home/HomeViewModel.kt b/app/src/main/java/org/mosad/teapod/ui/home/HomeViewModel.kt deleted file mode 100644 index 7468fb9..0000000 --- a/app/src/main/java/org/mosad/teapod/ui/home/HomeViewModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package org.mosad.teapod.ui.home - -import androidx.lifecycle.LiveData -import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.ViewModel - -class HomeViewModel : ViewModel() { - - private val _text = MutableLiveData().apply { - value = "This is the home Fragment" - } - val text: LiveData = _text -} \ No newline at end of file diff --git a/app/src/main/java/org/mosad/teapod/ui/search/SearchFragment.kt b/app/src/main/java/org/mosad/teapod/ui/search/SearchFragment.kt index a762a79..529ab1d 100644 --- a/app/src/main/java/org/mosad/teapod/ui/search/SearchFragment.kt +++ b/app/src/main/java/org/mosad/teapod/ui/search/SearchFragment.kt @@ -4,28 +4,18 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.TextView import androidx.fragment.app.Fragment -import androidx.lifecycle.Observer -import androidx.lifecycle.ViewModelProviders +import kotlinx.android.synthetic.main.fragment_search.* import org.mosad.teapod.R class SearchFragment : Fragment() { - private lateinit var notificationsViewModel: SearchViewModel + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + return inflater.inflate(R.layout.fragment_search, container, false) + } - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { - notificationsViewModel = - ViewModelProviders.of(this).get(SearchViewModel::class.java) - val root = inflater.inflate(R.layout.fragment_search, container, false) - val textView: TextView = root.findViewById(R.id.text_notifications) - notificationsViewModel.text.observe(viewLifecycleOwner, Observer { - textView.text = it - }) - return root + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + text_search.text = "This is the search Fragment" } } \ No newline at end of file diff --git a/app/src/main/java/org/mosad/teapod/ui/search/SearchViewModel.kt b/app/src/main/java/org/mosad/teapod/ui/search/SearchViewModel.kt deleted file mode 100644 index a8797d9..0000000 --- a/app/src/main/java/org/mosad/teapod/ui/search/SearchViewModel.kt +++ /dev/null @@ -1,13 +0,0 @@ -package org.mosad.teapod.ui.search - -import androidx.lifecycle.LiveData -import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.ViewModel - -class SearchViewModel : ViewModel() { - - private val _text = MutableLiveData().apply { - value = "This is the search Fragment" - } - val text: LiveData = _text -} \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml index b3f70a4..52a93c2 100644 --- a/app/src/main/res/layout/fragment_search.xml +++ b/app/src/main/res/layout/fragment_search.xml @@ -8,7 +8,7 @@ tools:context=".ui.search.SearchFragment">