Merge pull request #32 from raccoongang/develop

Develop to main. Release v1.2.1

Documentation/Documentation.md

@@ -0,0 +1,200 @@
+# Documentation
+
+Content:
+* [Architecture](#architecture)
+  + [Philosophy](#philosophy)
+  + [Concept](#concept)
+  + [What is Clean Architecture?](#what-is-clean-architecture)
+  + [Layers](#layers)
+      - [Presentation](#presentation)
+      - [Domain](#domain)
+      - [Data](#data)
+  + [Example](#example)
+  + [FAQ](#faq)
+      - [How does Clean Architecture improve software development?](#how-does-clean-architecture-improve-software-development)
+      - [Can Clean Architecture be used with any programming language?](#can-clean-architecture-be-used-with-any-programming-language)
+      - [Is Clean Architecture applicable only for large-scale applications?](#is-clean-architecture-applicable-only-for-large-scale-applications)
+      - [How is data validation handled in Clean Architecture?](#how-is-data-validation-handled-in-clean-architecture)
+      - [How are errors handled in Clean Architecture?](#how-are-errors-handled-in-clean-architecture)
+      - [What are Interactors in Clean Architecture?](#what-are-interactors-in-clean-architecture)
+      - [How do you deal with performance in Clean Architecture?](#how-do-you-deal-with-performance-in-clean-architecture)
+      - [Is Clean Architecture the same as Hexagonal Architecture?](#is-clean-architecture-the-same-as-hexagonal-architecture)
+  + [Useful links](#useful-links)
+* [Project structure and Modularity](#project-structure-and-modularity)
+    - [Main rule](#main-rule)
+    - [Structure](#structure)
+    - [Responsibility](#responsibility)
+    - [Benefits](#benefits)
+    - [How to create a module for your new feature?](#how-to-create-a-module-for-your-new-feature)
+* [Tech Stack](#tech-stack)
+
+# Architecture
+
+## Philosophy
+Remember ☝️
+
+Architecture is a crucial part of developing software, but it's not a dogma.
+
+Architecture is a set of recommendations to save you from trivial mistakes and make life easier, but if for your purpose you need to break it - you can do it.
+
+## Concept
+This project follows the architectural concept of The Clean Architecture:
+
+[<img src="Resources/CleanArchitecture.jpg" height="357"/>](Resources/CleanArchitecture.jpg)
+
+## What is Clean Architecture?
+It is an architectural approach that emphasizes the separation of concerns, the use of dependency inversion, and the creation of testable and maintainable code.  
+It promotes flexibility by separating the application into different layers of abstraction.  
+This allows for easier maintenance and testing of individual components, as well as the ability to swap out underlying technologies without affecting the overall architecture.
+
+Architecture was popularized by Robert C. Martin ("Uncle Bob").
+
+## Layers
+Usually, implementation consists of the following three layers/packages/folders: Presentation, Domain, and Data.
+
+[<img src="Resources/CALayers.png" width="600"/>](Resources/CALayers.png)
+
+### Presentation
+Presentation is all about Displaying data, User input handling, Data validation, and Navigation.  
+If the Presentation Layer needs data or business logic, it calls Domain Layer.
+
+### Domain
+The Domain layer, also known as the Business layer, is a key component that focuses on the core business logic, rules, and entities specific to the problem domain the application is designed to address.  
+The Domain layer is **independent of any technology or infrastructure concerns**, such as databases, user interfaces, or external services.  
+This separation allows the business logic to be more easily understood, maintained, and tested, without being affected by changes in other layers or components of the application.
+
+### Data
+The Data layer, or the Persistence layer, is a component of an application's architecture responsible for managing data storage, retrieval, and manipulation.
+This layer serves as an abstraction between the application's core logic and the underlying data storage technology, such as databases, file systems, or external APIs.
+
+## Example
+Examples can be found in most project modules, but let's take a look at the `Course` module.  
+For instance, here we can find the next structure:  
+`CourseOutlineFragment` and `CourseOutlineViewModel` as a representation of the Presentation Layer.  
+`CourseInteractor` as a representation of the Domain Layer.  
+And `CourseRepository` as a representation of the Data Layer.
+
+The best way to determine **what a module does** is to open its Interactor.  
+Here you can find all the business cases covered by the module.
+
+But if you want to know **how it does it**, you must delve into its Presentation and Data layers.
+
+## FAQ
+
+### How does Clean Architecture improve software development?
+Clean Architecture separates the concerns of software components, reduces coupling, and improves the independence of software systems.  
+This makes the system more flexible, maintainable, and testable. It also ensures that the software can survive changes in technology, user interface, and even some business rules.
+
+### Can Clean Architecture be used with any programming language?
+Yes, Clean Architecture is not tied to any specific programming language.  
+It's a design philosophy that can be applied to any language as long as it supports the principles of object-oriented design.
+
+### Is Clean Architecture applicable only for large-scale applications?
+No, Clean Architecture is not exclusively for large-scale applications.  
+It can be implemented in small projects as well, providing similar benefits of maintainability, scalability, and testability.  
+However, for very simple or small-scale applications, implementing Clean Architecture might be overkill and lead to unnecessary complexity.
+
+### How is data validation handled in Clean Architecture?
+Data validation can be considered at various levels in Clean Architecture. Simple, technical validations like checking for null or validating data formats can be done in the outer layers. Business rule validations, on the other hand, should be handled by Entities or Use Cases in the inner layers. This helps to ensure that invalid data never reaches the core business logic.
+
+### How are errors handled in Clean Architecture?
+Error handling in Clean Architecture typically depends on the type of error.  
+Domain-specific errors (those that relate to the core business rules) should be handled within the Entities or Use Cases.  
+Technical errors (like a database connection failing) should be handled at the outer layers, with the necessary information relayed back to the inner layers through predefined interfaces.
+
+### What are Interactors in Clean Architecture?
+Interactors, also known as Use Cases, represent specific applications of the business rules.  
+They orchestrate the flow of data between Entities and the outer layers of the system.  
+Interactors contain the logic to fulfill each use case of the system and maintain a decoupled relationship with the Entities and outer layers via interfaces.
+
+### How do you deal with performance in Clean Architecture?
+While Clean Architecture is not specifically designed to optimize performance, it does not inherently cause performance issues either.  
+If performance becomes a concern, then performance optimization strategies can be applied in the relevant layers or components.  
+However, it is recommended to keep these optimizations isolated from the business rules to preserve the separation of concerns.
+
+### Is Clean Architecture the same as Hexagonal Architecture?
+While there are similarities between Clean Architecture and Hexagonal Architecture (also known as Ports and Adapters) in terms of their goal of separation of concerns and testability, they are not the same.  
+Both architectures advocate for isolating business logic from external concerns, but they use different metaphors and structures.  
+Clean Architecture tends to focus more on layers, while Hexagonal Architecture emphasizes the interaction points (ports) and their implementations (adapters).
+
+## Useful links
+If you want to delve deeper into the topic of CA, you can find useful links below.
+
+Article: [Clean Architecture for mobile: To be, or not to be](https://medium.com/globant/clean-architecture-for-mobile-to-be-or-not-to-be-2ffc8d46e402)
+
+Video: [Robert C Martin - Clean Architecture and Design](https://www.youtube.com/watch?v=Nsjsiz2A9mg)
+
+Book: [Clean Architecture: A Craftsman's Guide to Software Structure and Design (Robert C. Martin Series)](https://www.amazon.com/Clean-Architecture-Craftsmans-Software-Structure/dp/0134494164)
+
+# Project structure and Modularity
+Modular architecture in applications pertains to the practice of decomposing an app's elements into smaller, reusable, and interchangeable modules.  
+Each Feature in the application is represented by a specific module, so you will not have problems finding the right class or functionality.
+
+## Main rule
+Lower modules don't know anything about the higher modules.  
+It helps avoid conflicts with circular dependencies.
+
+If you need to pass some logic from one independent module to another, it is not a good idea to link modules to each other, this will eventually lead to circular dependencies and the broken project.  
+The better way is an abstraction in the core, implementation in the module, and dependency injection.
+
+## Structure
+[<img src="Resources/Modules.jpg" width="600"/>](Resources/Modules.jpg)
+
+## Responsibility
+Each module is centered around a specific set of features or functionality.
+1. App module - app lifecycle management, routing, dependency control.
+2. Auth Module - anything related to the user authorization process.
+3. Discovery Module - anything related to the course catalog and search.
+4. Dashboard Module - anything related to the course dashboard.
+5. Profile Module - anything related to a user profile and settings.
+6. Course Module - anything related to course structure, certificates, and assessments.
+7. Discussion Module - anything related to course discussions.
+8. Core Module - a set of utilities and abstractions required by each module.
+
+## Benefits
+Modular approach has several benefits such as:
+
+#####  Improved code organization
+By separating components into modules, developers can better understand and manage the structure of the codebase.  
+This organization facilitates code navigation and makes it easier to locate specific functionalities.
+
+#####  Scalability
+Since modules are self-contained, it's easier to add or remove features as the application grows.  
+This flexibility allows developers to build scalable apps that can evolve with changing requirements.
+
+#####  Reusability
+Modular architecture promotes the creation of reusable components, which can be easily shared across multiple projects or within different parts of the same project.  
+This reusability can lead to increased productivity and reduced development time.
+
+#####  Faster build time
+Modular architecture allows incremental builds, where only the modified modules are recompiled.  
+This approach can significantly reduce build times and improve the development workflow.
+
+## How to create a module for your new feature?
+1. Go to File -> New -> New Module...
+
+[<img src="Resources/Create_module_step1.png" width="600"/>](Resources/Create_module_step1.png)
+
+2. Select Android Library from Templates, change your module name and click the Finish button.
+
+[<img src="Resources/Create_module_step2.png" width="600"/>](Resources/Create_module_step2.png)
+
+3. For the final step don't forget to add core module dependency to your module and add your module to the App module.
+
+[<img src="Resources/Create_module_step3.png" width="600"/>](Resources/Create_module_step3.png)
+
+# Tech Stack
+The project tries to use only the required number of libraries and frameworks and avoid unnecessary dependencies.  
+
+The following technologies are used in the project:
+- Kotlin, the main programming language
+- Kotlin Coroutines, the main toolkit for managing async jobs.
+- AndroidX set of libraries, a necessary part of modern Android applications.
+- Jetpack Compose, the main toolkit for building UI.
+- Retrofit2, a type-safe HTTP client for Android and Java.
+- Room, abstraction layer over SQLite.
+- Koin, dependency injection framework.
+- Koil, images loading library.
+- Firebase, infrastructure.
+- JUnit, unit testing framework.
+- Mockk, mocking library for Kotlin.

README.md

@@ -1,8 +1,9 @@
-
 # EducationX Android
 
 Modern vision of the mobile application for the Open EdX platform from Raccoon Gang.
 
+[Documentation](Documentation/Documentation.md)
+
 ## Building
 1. Check out the source code:
 
@@ -12,7 +13,7 @@ Modern vision of the mobile application for the Open EdX platform from Raccoon G
 
 3. Choose ``educationx-app-android``.
 
-4. Configure the [``config.yaml`` file](https://github.com/raccoongang/educationx-app-android/blob/main/config.yaml) with URLs and OAuth credentials for your Open edX instance.
+4. Configure the [config.yaml](config.yaml) with URLs and OAuth credentials for your Open edX instance.
 
 5. Select the build variant ``develop``, ``stage``, or ``prod``.
 

core/build.gradle

@@ -119,7 +119,6 @@ android {
 
 dependencies {
     api fileTree(dir: 'libs', include: ['*.jar'])
-    //implementation 'org.yaml:snakeyaml:1.33'
 
     api "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
@@ -133,12 +132,18 @@ dependencies {
     api "androidx.constraintlayout:constraintlayout:$constraintlayout_version"
     api "androidx.viewpager2:viewpager2:$viewpager2_version"
     api "androidx.window:window:$window_version"
+    api "androidx.work:work-runtime-ktx:$work_version"
 
     //Android Jetpack
     api "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
     api "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
     api "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
 
+    // Room
+    api "androidx.room:room-runtime:$room_version"
+    api "androidx.room:room-ktx:$room_version"
+    kapt "androidx.room:room-compiler:$room_version"
+
     //Compose
     api "androidx.compose.runtime:runtime:$compose_version"
     api "androidx.compose.runtime:runtime-livedata:$compose_version"
@@ -165,14 +170,6 @@ dependencies {
 
     api "org.jsoup:jsoup:$jsoup_version"
 
-    // Room
-    api "androidx.room:room-runtime:$room_version"
-    api "androidx.room:room-ktx:$room_version"
-    kapt "androidx.room:room-compiler:$room_version"
-
-    api "androidx.work:work-runtime-ktx:$work_version"
-
-
     api platform("com.google.firebase:firebase-bom:$firebase_version")
     api 'com.google.firebase:firebase-common-ktx'
     api "com.google.firebase:firebase-crashlytics-ktx"

course/src/main/java/org/openedx/course/presentation/unit/video/YoutubeVideoFullScreenFragment.kt

@@ -113,7 +113,7 @@ class YoutubeVideoFullScreenFragment : Fragment(R.layout.fragment_youtube_video_
                 binding.youtubePlayerView.setCustomPlayerUi(defPlayerUiController.rootView)
 
                 val videoId = viewModel.videoUrl.split("watch?v=")[1]
-                youTubePlayer.cueVideo(videoId, viewModel.currentVideoTime.toFloat() / 1000)
+                youTubePlayer.loadVideo(videoId, viewModel.currentVideoTime.toFloat() / 1000)
                 youTubePlayer.addListener(youtubeTrackerListener)
 
             }

discussion/src/main/java/org/openedx/discussion/presentation/threads/DiscussionAddThreadFragment.kt

@@ -2,7 +2,6 @@
 
 package org.openedx.discussion.presentation.threads
 
-import android.content.res.Configuration
 import android.content.res.Configuration.UI_MODE_NIGHT_NO
 import android.content.res.Configuration.UI_MODE_NIGHT_YES
 import android.os.Bundle
@@ -23,7 +22,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.ComposeView
-import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.platform.ViewCompositionStrategy
@@ -38,13 +36,13 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
+import kotlinx.coroutines.launch
+import org.koin.androidx.viewmodel.ext.android.viewModel
+import org.koin.core.parameter.parametersOf
 import org.openedx.core.UIMessage
 import org.openedx.core.ui.*
 import org.openedx.core.ui.theme.*
 import org.openedx.discussion.domain.model.DiscussionType
-import kotlinx.coroutines.launch
-import org.koin.androidx.viewmodel.ext.android.viewModel
-import org.koin.core.parameter.parametersOf
 import org.openedx.discussion.R as discussionR
 
 class DiscussionAddThreadFragment : Fragment() {
@@ -391,7 +389,7 @@ private fun DiscussionAddThreadScreen(
                                         onClick = {
                                             onPostDiscussionClick(
                                                 discussionType,
-                                                topicData.second,
+                                                postToTopic.second,
                                                 titleValue,
                                                 discussionValue,
                                                 followPost