diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 815adac..726026e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -16,9 +16,12 @@ android:theme="@style/Theme.Woka" tools:targetApi="31"> + ) : diff --git a/app/src/main/java/com/woka/home/HomeActivity.kt b/app/src/main/java/com/woka/home/HomeActivity.kt index 2835d33..7b8748c 100644 --- a/app/src/main/java/com/woka/home/HomeActivity.kt +++ b/app/src/main/java/com/woka/home/HomeActivity.kt @@ -149,7 +149,9 @@ class HomeActivity : WokaBaseActivity(), } override fun onBackPressed() { - if (binding.bottomNav.getSelectedTab() != HOME){ + if (binding.homeDrawer.isDrawerOpen(GravityCompat.END)){ + binding.homeDrawer.closeDrawer(GravityCompat.END) + }else if (binding.bottomNav.getSelectedTab() != HOME){ binding.bottomNav.selectTab(HOME) }else { super.onBackPressed() diff --git a/app/src/main/java/com/woka/home/MoreHomeActivity.kt b/app/src/main/java/com/woka/home/MoreHomeActivity.kt index e4aa76a..57dcf4e 100644 --- a/app/src/main/java/com/woka/home/MoreHomeActivity.kt +++ b/app/src/main/java/com/woka/home/MoreHomeActivity.kt @@ -9,7 +9,7 @@ import androidx.core.view.ViewCompat import androidx.core.view.WindowInsetsCompat import com.woka.R import com.woka.databinding.ActivityMoreHomeBinding -import com.woka.modules.BlogsRepository +import com.woka.modules.blogs.BlogsRepository import com.woka.networking.ApiResult import com.woka.utils.WokaBaseActivity import com.woka.utils.hide diff --git a/app/src/main/java/com/woka/home/sidebar/AboutActivity.kt b/app/src/main/java/com/woka/home/sidebar/AboutActivity.kt index 18f938e..e45b839 100644 --- a/app/src/main/java/com/woka/home/sidebar/AboutActivity.kt +++ b/app/src/main/java/com/woka/home/sidebar/AboutActivity.kt @@ -1,12 +1,9 @@ package com.woka.home.sidebar -import android.graphics.Color import android.os.Bundle -import android.transition.Fade import android.transition.Slide import android.view.Gravity.END import androidx.activity.enableEdgeToEdge -import androidx.appcompat.app.AppCompatActivity import androidx.core.view.ViewCompat import androidx.core.view.WindowInsetsCompat import com.woka.R diff --git a/app/src/main/java/com/woka/home/sidebar/FaqActivity.kt b/app/src/main/java/com/woka/home/sidebar/FaqActivity.kt new file mode 100644 index 0000000..fbf83af --- /dev/null +++ b/app/src/main/java/com/woka/home/sidebar/FaqActivity.kt @@ -0,0 +1,21 @@ +package com.woka.home.sidebar + +import android.os.Bundle +import androidx.activity.enableEdgeToEdge +import androidx.appcompat.app.AppCompatActivity +import androidx.core.view.ViewCompat +import androidx.core.view.WindowInsetsCompat +import com.woka.R + +class FaqActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + enableEdgeToEdge() + setContentView(R.layout.activity_faq) + ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main)) { v, insets -> + val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()) + v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom) + insets + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/woka/modules/ModuleApiService.kt b/app/src/main/java/com/woka/modules/ModuleApiService.kt index 08e4833..3a47f42 100644 --- a/app/src/main/java/com/woka/modules/ModuleApiService.kt +++ b/app/src/main/java/com/woka/modules/ModuleApiService.kt @@ -1,12 +1,17 @@ package com.woka.modules -import com.woka.modules.blogs.BlogsResponse +import com.woka.modules.blogs.models.BlogsResponse +import com.woka.modules.faqs.models.FaqResponse import com.woka.networking.ApiResponse import retrofit2.Response import retrofit2.http.GET +import retrofit2.http.POST interface ModuleApiService { @GET("blogs") suspend fun getBlogs(): Response> + + @POST("faq_listing") + suspend fun getFaqs(): Response> } \ No newline at end of file diff --git a/app/src/main/java/com/woka/modules/BlogsRepository.kt b/app/src/main/java/com/woka/modules/blogs/BlogsRepository.kt similarity index 88% rename from app/src/main/java/com/woka/modules/BlogsRepository.kt rename to app/src/main/java/com/woka/modules/blogs/BlogsRepository.kt index 22afcf3..e9e4d79 100644 --- a/app/src/main/java/com/woka/modules/BlogsRepository.kt +++ b/app/src/main/java/com/woka/modules/blogs/BlogsRepository.kt @@ -1,9 +1,9 @@ -package com.woka.modules +package com.woka.modules.blogs import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData -import androidx.lifecycle.viewModelScope -import com.woka.modules.blogs.BlogsResponse +import com.woka.modules.ModuleApiService +import com.woka.modules.blogs.models.BlogsResponse import com.woka.networking.ApiResult import com.woka.networking.RetrofitHelper import com.woka.networking.RetrofitHelper.handleApiCall diff --git a/app/src/main/java/com/woka/modules/blogs/Blog.kt b/app/src/main/java/com/woka/modules/blogs/models/Blog.kt similarity index 87% rename from app/src/main/java/com/woka/modules/blogs/Blog.kt rename to app/src/main/java/com/woka/modules/blogs/models/Blog.kt index 847c83b..61b8d2c 100644 --- a/app/src/main/java/com/woka/modules/blogs/Blog.kt +++ b/app/src/main/java/com/woka/modules/blogs/models/Blog.kt @@ -1,4 +1,4 @@ -package com.woka.modules.blogs +package com.woka.modules.blogs.models data class Blog( val article_url: Any?, diff --git a/app/src/main/java/com/woka/modules/blogs/BlogsResponse.kt b/app/src/main/java/com/woka/modules/blogs/models/BlogsResponse.kt similarity index 68% rename from app/src/main/java/com/woka/modules/blogs/BlogsResponse.kt rename to app/src/main/java/com/woka/modules/blogs/models/BlogsResponse.kt index 050edfc..a2ad1e1 100644 --- a/app/src/main/java/com/woka/modules/blogs/BlogsResponse.kt +++ b/app/src/main/java/com/woka/modules/blogs/models/BlogsResponse.kt @@ -1,4 +1,4 @@ -package com.woka.modules.blogs +package com.woka.modules.blogs.models data class BlogsResponse( val blogs: List?, diff --git a/app/src/main/java/com/woka/modules/blogs/ContentMoreDetail.kt b/app/src/main/java/com/woka/modules/blogs/models/ContentMoreDetail.kt similarity index 84% rename from app/src/main/java/com/woka/modules/blogs/ContentMoreDetail.kt rename to app/src/main/java/com/woka/modules/blogs/models/ContentMoreDetail.kt index 7ff41d1..a7e112a 100644 --- a/app/src/main/java/com/woka/modules/blogs/ContentMoreDetail.kt +++ b/app/src/main/java/com/woka/modules/blogs/models/ContentMoreDetail.kt @@ -1,4 +1,4 @@ -package com.woka.modules.blogs +package com.woka.modules.blogs.models data class ContentMoreDetail( val article: String?, diff --git a/app/src/main/java/com/woka/modules/faqs/FAQsRepository.kt b/app/src/main/java/com/woka/modules/faqs/FAQsRepository.kt new file mode 100644 index 0000000..6cfda2a --- /dev/null +++ b/app/src/main/java/com/woka/modules/faqs/FAQsRepository.kt @@ -0,0 +1,37 @@ +package com.woka.modules.faqs + +import androidx.lifecycle.LiveData +import androidx.lifecycle.MutableLiveData +import com.woka.modules.ModuleApiService +import com.woka.modules.faqs.models.FaqResponse +import com.woka.networking.ApiResult +import com.woka.networking.RetrofitHelper +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch + +object FAQsRepository { + + private val apiService = RetrofitHelper.getRetrofit().create(ModuleApiService::class.java) + + private val _faqLiveData = MutableLiveData>() + val faqLiveData: LiveData?> + get() = _faqLiveData + + init { + loadFaqs() + } + + private suspend fun getBlogs(): ApiResult { + return RetrofitHelper.handleApiCall { + apiService.getFaqs() + } + } + + private fun loadFaqs(){ + CoroutineScope(Dispatchers.IO).launch { + _faqLiveData.postValue(ApiResult.Loading()) + _faqLiveData.postValue(getBlogs()) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/woka/modules/faqs/models/FaqResponse.kt b/app/src/main/java/com/woka/modules/faqs/models/FaqResponse.kt new file mode 100644 index 0000000..6090945 --- /dev/null +++ b/app/src/main/java/com/woka/modules/faqs/models/FaqResponse.kt @@ -0,0 +1,6 @@ +package com.woka.modules.faqs.models + +data class FaqResponse( + val result: List?, + val total_records: Int? +) \ No newline at end of file diff --git a/app/src/main/java/com/woka/modules/faqs/models/Result.kt b/app/src/main/java/com/woka/modules/faqs/models/Result.kt new file mode 100644 index 0000000..5ee236b --- /dev/null +++ b/app/src/main/java/com/woka/modules/faqs/models/Result.kt @@ -0,0 +1,10 @@ +package com.woka.modules.faqs.models + +data class Result( + val category_master_id: Int?, + val english_answer: String?, + val english_question: String?, + val hindi_answer: String?, + val hindi_question: String?, + val id: Int? +) \ No newline at end of file diff --git a/app/src/main/res/drawable/faq_bg.xml b/app/src/main/res/drawable/faq_bg.xml new file mode 100644 index 0000000..9af2e44 --- /dev/null +++ b/app/src/main/res/drawable/faq_bg.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index f9d5dcd..8913e28 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -70,16 +70,16 @@ android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum" + android:text="@string/about_woka_description" android:fontFamily="@font/exo_2" android:textColor="@color/black" - android:textSize="@dimen/_11ssp" + android:textSize="@dimen/_12ssp" + android:textAlignment="center" app:layout_constraintTop_toBottomOf="@id/g1" - android:layout_marginHorizontal="15dp" - android:layout_marginVertical="25dp" - - /> + android:layout_marginStart="15dp" + android:layout_marginEnd="10dp" + android:layout_marginVertical="25dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_faq.xml b/app/src/main/res/layout/activity_faq.xml new file mode 100644 index 0000000..08d4142 --- /dev/null +++ b/app/src/main/res/layout/activity_faq.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4532bff..9b9c4e7 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -138,4 +138,5 @@ Blogs MASILA PLAY TRAILER + WOKA endeavours to make this world a happier and a safe place for Children. A world where families and communities unite joyfully in celebration of their unity and learn from each other\'s diversity. \ No newline at end of file