From 1afbac4788fbea89a01e711516a8b387c2b42da1 Mon Sep 17 00:00:00 2001 From: Siddharth Dubey <122088830+sidcr7-likeminds@users.noreply.github.com> Date: Sat, 13 Jul 2024 21:38:49 +0530 Subject: [PATCH 01/51] updated versions --- lm-feed-root-dependencies.gradle | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lm-feed-root-dependencies.gradle b/lm-feed-root-dependencies.gradle index e1dfce95..c76fd2ea 100644 --- a/lm-feed-root-dependencies.gradle +++ b/lm-feed-root-dependencies.gradle @@ -1,12 +1,12 @@ ext.feed_versions = [:] def feed_versions = [:] -feed_versions.compile_sdk = 33 +feed_versions.compile_sdk = 34 feed_versions.min_sdk = 24 -feed_versions.target_sdk = 33 +feed_versions.target_sdk = 34 feed_versions.sdk_version_major = '1' -feed_versions.sdk_version_minor = '1' -feed_versions.sdk_version_patch = '1' -feed_versions.sdk_version_code = 18 +feed_versions.sdk_version_minor = '2' +feed_versions.sdk_version_patch = '0' +feed_versions.sdk_version_code = 19 feed_versions.core = "1.8.0" feed_versions.appcompat = "1.6.1" feed_versions.material_design = "1.6.1" @@ -25,9 +25,9 @@ feed_versions.swipe_refresh_layout = '1.1.0' feed_versions.work_manager = '2.7.1' feed_versions.aws_s3 = '2.47.0' feed_versions.firebase = '30.1.0' -feed_versions.custom_gallery = '1.1.1' -feed_versions.user_tagging = '1.0.1' -feed_versions.feed_data = "1.9.1" +feed_versions.custom_gallery = '1.2.0' +feed_versions.user_tagging = '1.1.0' +feed_versions.feed_data = "1.11.0" ext.feed_versions = feed_versions ext.feed_deps = [:] From b8c9b4ccffbaa5f9dbb050e3cb2b4cb8debf40e8 Mon Sep 17 00:00:00 2001 From: Siddharth Dubey <122088830+sidcr7-likeminds@users.noreply.github.com> Date: Sun, 28 Jul 2024 21:21:19 +0530 Subject: [PATCH 02/51] renamed module --- .gitignore | 2 +- settings.gradle | 2 +- {example => social-feed}/.gitignore | 0 {example => social-feed}/build.gradle | 6 +++--- .../lm-feed-social-dependencies.gradle | 0 {example => social-feed}/proguard-rules.pro | 0 .../feedsocial}/ExampleInstrumentedTest.kt | 2 +- .../src/main/AndroidManifest.xml | 4 ++-- .../java/com/likeminds/feedsocial}/GetTokensTask.kt | 6 +++--- .../java/com/likeminds/feedsocial}/LMFeedExample.kt | 4 ++-- .../feedsocial}/LMFeedExampleMessagingService.kt | 2 +- .../java/com/likeminds/feedsocial}/MainActivity.kt | 8 ++++---- .../feedsocial}/auth/util/AuthPreferences.kt | 2 +- .../likeminds/feedsocial}/auth/view/AuthActivity.kt | 10 +++++----- .../CustomLMUniversalFeedAdminFragment.kt | 2 +- .../main/res/drawable/ic_launcher_background.xml | 0 .../main/res/drawable/ic_launcher_foreground.xml | 0 .../src/main/res/font/roboto.ttf | Bin .../src/main/res/font/roboto_bold.ttf | Bin .../src/main/res/font/roboto_medium.ttf | Bin .../src/main/res/layout/activity_auth.xml | 0 .../src/main/res/layout/activity_main.xml | 0 .../src/main/res/layout/fragment_main.xml | 0 .../src/main/res/mipmap-anydpi-v26/ic_launcher.xml | 0 .../res/mipmap-anydpi-v26/ic_launcher_round.xml | 0 .../src/main/res/mipmap-hdpi/ic_app_icon.png | Bin .../src/main/res/mipmap-hdpi/ic_app_icon_round.png | Bin .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin .../src/main/res/mipmap-hdpi/ic_launcher_round.webp | Bin .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin .../src/main/res/mipmap-mdpi/ic_launcher_round.webp | Bin .../src/main/res/mipmap-xhdpi/ic_app_icon.png | Bin .../src/main/res/mipmap-xhdpi/ic_app_icon_round.png | Bin .../src/main/res/mipmap-xhdpi/ic_launcher.webp | Bin .../main/res/mipmap-xhdpi/ic_launcher_round.webp | Bin .../src/main/res/mipmap-xxhdpi/ic_launcher.webp | Bin .../main/res/mipmap-xxhdpi/ic_launcher_round.webp | Bin .../src/main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin .../main/res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin .../src/main/res/values-night/themes.xml | 0 .../src/main/res/values/colors.xml | 0 .../src/main/res/values/strings.xml | 0 .../src/main/res/values/styles.xml | 0 .../src/main/res/values/themes.xml | 0 .../src/main/res/xml/backup_rules.xml | 0 .../src/main/res/xml/data_extraction_rules.xml | 0 .../com/likeminds/feedsocial}/ExampleUnitTest.kt | 2 +- 47 files changed, 26 insertions(+), 26 deletions(-) rename {example => social-feed}/.gitignore (100%) rename {example => social-feed}/build.gradle (89%) rename example/lm-feed-example-dependencies.gradle => social-feed/lm-feed-social-dependencies.gradle (100%) rename {example => social-feed}/proguard-rules.pro (100%) rename {example/src/androidTest/java/com/likeminds/feedexample => social-feed/src/androidTest/java/com/likeminds/feedsocial}/ExampleInstrumentedTest.kt (94%) rename {example => social-feed}/src/main/AndroidManifest.xml (94%) rename {example/src/main/java/com/likeminds/feedexample => social-feed/src/main/java/com/likeminds/feedsocial}/GetTokensTask.kt (94%) rename {example/src/main/java/com/likeminds/feedexample => social-feed/src/main/java/com/likeminds/feedsocial}/LMFeedExample.kt (94%) rename {example/src/main/java/com/likeminds/feedexample => social-feed/src/main/java/com/likeminds/feedsocial}/LMFeedExampleMessagingService.kt (96%) rename {example/src/main/java/com/likeminds/feedexample => social-feed/src/main/java/com/likeminds/feedsocial}/MainActivity.kt (88%) rename {example/src/main/java/com/likeminds/feedexample => social-feed/src/main/java/com/likeminds/feedsocial}/auth/util/AuthPreferences.kt (97%) rename {example/src/main/java/com/likeminds/feedexample => social-feed/src/main/java/com/likeminds/feedsocial}/auth/view/AuthActivity.kt (92%) rename {example/src/main/java/com/likeminds/feedexample => social-feed/src/main/java/com/likeminds/feedsocial}/universalfeed/CustomLMUniversalFeedAdminFragment.kt (76%) rename {example => social-feed}/src/main/res/drawable/ic_launcher_background.xml (100%) rename {example => social-feed}/src/main/res/drawable/ic_launcher_foreground.xml (100%) rename {example => social-feed}/src/main/res/font/roboto.ttf (100%) rename {example => social-feed}/src/main/res/font/roboto_bold.ttf (100%) rename {example => social-feed}/src/main/res/font/roboto_medium.ttf (100%) rename {example => social-feed}/src/main/res/layout/activity_auth.xml (100%) rename {example => social-feed}/src/main/res/layout/activity_main.xml (100%) rename {example => social-feed}/src/main/res/layout/fragment_main.xml (100%) rename {example => social-feed}/src/main/res/mipmap-anydpi-v26/ic_launcher.xml (100%) rename {example => social-feed}/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml (100%) rename {example => social-feed}/src/main/res/mipmap-hdpi/ic_app_icon.png (100%) rename {example => social-feed}/src/main/res/mipmap-hdpi/ic_app_icon_round.png (100%) rename {example => social-feed}/src/main/res/mipmap-hdpi/ic_launcher.webp (100%) rename {example => social-feed}/src/main/res/mipmap-hdpi/ic_launcher_round.webp (100%) rename {example => social-feed}/src/main/res/mipmap-mdpi/ic_launcher.webp (100%) rename {example => social-feed}/src/main/res/mipmap-mdpi/ic_launcher_round.webp (100%) rename {example => social-feed}/src/main/res/mipmap-xhdpi/ic_app_icon.png (100%) rename {example => social-feed}/src/main/res/mipmap-xhdpi/ic_app_icon_round.png (100%) rename {example => social-feed}/src/main/res/mipmap-xhdpi/ic_launcher.webp (100%) rename {example => social-feed}/src/main/res/mipmap-xhdpi/ic_launcher_round.webp (100%) rename {example => social-feed}/src/main/res/mipmap-xxhdpi/ic_launcher.webp (100%) rename {example => social-feed}/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp (100%) rename {example => social-feed}/src/main/res/mipmap-xxxhdpi/ic_launcher.webp (100%) rename {example => social-feed}/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp (100%) rename {example => social-feed}/src/main/res/values-night/themes.xml (100%) rename {example => social-feed}/src/main/res/values/colors.xml (100%) rename {example => social-feed}/src/main/res/values/strings.xml (100%) rename {example => social-feed}/src/main/res/values/styles.xml (100%) rename {example => social-feed}/src/main/res/values/themes.xml (100%) rename {example => social-feed}/src/main/res/xml/backup_rules.xml (100%) rename {example => social-feed}/src/main/res/xml/data_extraction_rules.xml (100%) rename {example/src/test/java/com/likeminds/feedexample => social-feed/src/test/java/com/likeminds/feedsocial}/ExampleUnitTest.kt (90%) diff --git a/.gitignore b/.gitignore index 9429f9b0..5f87a54a 100644 --- a/.gitignore +++ b/.gitignore @@ -31,7 +31,7 @@ render.experimental.xml *.keystore # Google Services (e.g. APIs or Firebase) -example/src/main/google-services.json +social-feed/src/main/google-services.json # Android Profiling *.hprof diff --git a/settings.gradle b/settings.gradle index 876657c7..02d47830 100644 --- a/settings.gradle +++ b/settings.gradle @@ -18,5 +18,5 @@ dependencyResolutionManagement { } rootProject.name = "likeminds-feed-android" -include ':example' +include ':social-feed' include ':likeminds-feed-android-core' diff --git a/example/.gitignore b/social-feed/.gitignore similarity index 100% rename from example/.gitignore rename to social-feed/.gitignore diff --git a/example/build.gradle b/social-feed/build.gradle similarity index 89% rename from example/build.gradle rename to social-feed/build.gradle index 4dc6bf7c..dbaf0ab8 100644 --- a/example/build.gradle +++ b/social-feed/build.gradle @@ -6,11 +6,11 @@ plugins { } android { - namespace 'com.likeminds.feedexample' + namespace 'com.likeminds.feedsocial' compileSdk feed_versions.compile_sdk defaultConfig { - applicationId "com.likeminds.feedexample" + applicationId "com.likeminds.feedsocial" minSdk feed_versions.min_sdk targetSdk feed_versions.target_sdk versionCode feed_versions.sdk_version_code @@ -44,4 +44,4 @@ android { } } -apply from: "lm-feed-example-dependencies.gradle" +apply from: "lm-feed-social-dependencies.gradle" diff --git a/example/lm-feed-example-dependencies.gradle b/social-feed/lm-feed-social-dependencies.gradle similarity index 100% rename from example/lm-feed-example-dependencies.gradle rename to social-feed/lm-feed-social-dependencies.gradle diff --git a/example/proguard-rules.pro b/social-feed/proguard-rules.pro similarity index 100% rename from example/proguard-rules.pro rename to social-feed/proguard-rules.pro diff --git a/example/src/androidTest/java/com/likeminds/feedexample/ExampleInstrumentedTest.kt b/social-feed/src/androidTest/java/com/likeminds/feedsocial/ExampleInstrumentedTest.kt similarity index 94% rename from example/src/androidTest/java/com/likeminds/feedexample/ExampleInstrumentedTest.kt rename to social-feed/src/androidTest/java/com/likeminds/feedsocial/ExampleInstrumentedTest.kt index 9fffc7f5..97eb081c 100644 --- a/example/src/androidTest/java/com/likeminds/feedexample/ExampleInstrumentedTest.kt +++ b/social-feed/src/androidTest/java/com/likeminds/feedsocial/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package com.likeminds.feedexample +package com.likeminds.feedsocial import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 diff --git a/example/src/main/AndroidManifest.xml b/social-feed/src/main/AndroidManifest.xml similarity index 94% rename from example/src/main/AndroidManifest.xml rename to social-feed/src/main/AndroidManifest.xml index a167330b..128a38e1 100644 --- a/example/src/main/AndroidManifest.xml +++ b/social-feed/src/main/AndroidManifest.xml @@ -30,10 +30,10 @@ diff --git a/example/src/main/java/com/likeminds/feedexample/GetTokensTask.kt b/social-feed/src/main/java/com/likeminds/feedsocial/GetTokensTask.kt similarity index 94% rename from example/src/main/java/com/likeminds/feedexample/GetTokensTask.kt rename to social-feed/src/main/java/com/likeminds/feedsocial/GetTokensTask.kt index 2d5c87b6..1f254a9a 100644 --- a/example/src/main/java/com/likeminds/feedexample/GetTokensTask.kt +++ b/social-feed/src/main/java/com/likeminds/feedsocial/GetTokensTask.kt @@ -1,9 +1,9 @@ -package com.likeminds.feedexample +package com.likeminds.feedsocial import android.content.Context import android.util.Log -import com.likeminds.feedexample.LMFeedExample.Companion.LM_FEED_EXAMPLE_TAG -import com.likeminds.feedexample.auth.util.AuthPreferences +import com.likeminds.feedsocial.LMFeedExample.Companion.LM_FEED_EXAMPLE_TAG +import com.likeminds.feedsocial.auth.util.AuthPreferences import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.json.JSONObject diff --git a/example/src/main/java/com/likeminds/feedexample/LMFeedExample.kt b/social-feed/src/main/java/com/likeminds/feedsocial/LMFeedExample.kt similarity index 94% rename from example/src/main/java/com/likeminds/feedexample/LMFeedExample.kt rename to social-feed/src/main/java/com/likeminds/feedsocial/LMFeedExample.kt index ce6b4c44..63cd00d6 100644 --- a/example/src/main/java/com/likeminds/feedexample/LMFeedExample.kt +++ b/social-feed/src/main/java/com/likeminds/feedsocial/LMFeedExample.kt @@ -1,4 +1,4 @@ -package com.likeminds.feedexample +package com.likeminds.feedsocial import android.annotation.SuppressLint import android.app.Application @@ -24,7 +24,7 @@ class LMFeedExample : Application(), LMFeedCoreCallback { application = this, enablePushNotifications = true, deviceId = deviceId, - domain = "https://www.examplefeed.com", + domain = "https://www.samplefeed.com", lmFeedCoreCallback = this ) } diff --git a/example/src/main/java/com/likeminds/feedexample/LMFeedExampleMessagingService.kt b/social-feed/src/main/java/com/likeminds/feedsocial/LMFeedExampleMessagingService.kt similarity index 96% rename from example/src/main/java/com/likeminds/feedexample/LMFeedExampleMessagingService.kt rename to social-feed/src/main/java/com/likeminds/feedsocial/LMFeedExampleMessagingService.kt index f6980c5f..33892114 100644 --- a/example/src/main/java/com/likeminds/feedexample/LMFeedExampleMessagingService.kt +++ b/social-feed/src/main/java/com/likeminds/feedsocial/LMFeedExampleMessagingService.kt @@ -1,4 +1,4 @@ -package com.likeminds.feedexample +package com.likeminds.feedsocial import android.util.Log import com.google.firebase.messaging.FirebaseMessagingService diff --git a/example/src/main/java/com/likeminds/feedexample/MainActivity.kt b/social-feed/src/main/java/com/likeminds/feedsocial/MainActivity.kt similarity index 88% rename from example/src/main/java/com/likeminds/feedexample/MainActivity.kt rename to social-feed/src/main/java/com/likeminds/feedsocial/MainActivity.kt index cf4df4a1..75d0b6c2 100644 --- a/example/src/main/java/com/likeminds/feedexample/MainActivity.kt +++ b/social-feed/src/main/java/com/likeminds/feedsocial/MainActivity.kt @@ -1,12 +1,12 @@ -package com.likeminds.feedexample +package com.likeminds.feedsocial import android.os.Bundle import android.util.Log import androidx.appcompat.app.AppCompatActivity import com.likeminds.feed.android.core.LMFeedCore -import com.likeminds.feedexample.LMFeedExample.Companion.LM_FEED_EXAMPLE_TAG -import com.likeminds.feedexample.auth.util.AuthPreferences -import com.likeminds.feedexample.universalfeed.CustomLMUniversalFeedAdminFragment +import com.likeminds.feedsocial.LMFeedExample.Companion.LM_FEED_EXAMPLE_TAG +import com.likeminds.feedsocial.auth.util.AuthPreferences +import com.likeminds.feedsocial.universalfeed.CustomLMUniversalFeedAdminFragment import kotlinx.coroutines.* class MainActivity : AppCompatActivity() { diff --git a/example/src/main/java/com/likeminds/feedexample/auth/util/AuthPreferences.kt b/social-feed/src/main/java/com/likeminds/feedsocial/auth/util/AuthPreferences.kt similarity index 97% rename from example/src/main/java/com/likeminds/feedexample/auth/util/AuthPreferences.kt rename to social-feed/src/main/java/com/likeminds/feedsocial/auth/util/AuthPreferences.kt index bb90341f..4fb3a32b 100644 --- a/example/src/main/java/com/likeminds/feedexample/auth/util/AuthPreferences.kt +++ b/social-feed/src/main/java/com/likeminds/feedsocial/auth/util/AuthPreferences.kt @@ -1,4 +1,4 @@ -package com.likeminds.feedexample.auth.util +package com.likeminds.feedsocial.auth.util import android.annotation.SuppressLint import android.content.Context diff --git a/example/src/main/java/com/likeminds/feedexample/auth/view/AuthActivity.kt b/social-feed/src/main/java/com/likeminds/feedsocial/auth/view/AuthActivity.kt similarity index 92% rename from example/src/main/java/com/likeminds/feedexample/auth/view/AuthActivity.kt rename to social-feed/src/main/java/com/likeminds/feedsocial/auth/view/AuthActivity.kt index 5d4b0403..c32102bf 100644 --- a/example/src/main/java/com/likeminds/feedexample/auth/view/AuthActivity.kt +++ b/social-feed/src/main/java/com/likeminds/feedsocial/auth/view/AuthActivity.kt @@ -1,14 +1,14 @@ -package com.likeminds.feedexample.auth.view +package com.likeminds.feedsocial.auth.view import android.content.Intent import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import com.likeminds.feed.android.core.utils.LMFeedRoute import com.likeminds.feed.android.core.utils.LMFeedViewUtils -import com.likeminds.feedexample.MainActivity -import com.likeminds.feedexample.R -import com.likeminds.feedexample.auth.util.AuthPreferences -import com.likeminds.feedexample.databinding.ActivityAuthBinding +import com.likeminds.feedsocial.MainActivity +import com.likeminds.feedsocial.R +import com.likeminds.feedsocial.auth.util.AuthPreferences +import com.likeminds.feedsocial.databinding.ActivityAuthBinding class AuthActivity : AppCompatActivity() { diff --git a/example/src/main/java/com/likeminds/feedexample/universalfeed/CustomLMUniversalFeedAdminFragment.kt b/social-feed/src/main/java/com/likeminds/feedsocial/universalfeed/CustomLMUniversalFeedAdminFragment.kt similarity index 76% rename from example/src/main/java/com/likeminds/feedexample/universalfeed/CustomLMUniversalFeedAdminFragment.kt rename to social-feed/src/main/java/com/likeminds/feedsocial/universalfeed/CustomLMUniversalFeedAdminFragment.kt index 30c2645f..0531bf30 100644 --- a/example/src/main/java/com/likeminds/feedexample/universalfeed/CustomLMUniversalFeedAdminFragment.kt +++ b/social-feed/src/main/java/com/likeminds/feedsocial/universalfeed/CustomLMUniversalFeedAdminFragment.kt @@ -1,4 +1,4 @@ -package com.likeminds.feedexample.universalfeed +package com.likeminds.feedsocial.universalfeed import com.likeminds.feed.android.core.universalfeed.view.LMFeedUniversalFeedFragment diff --git a/example/src/main/res/drawable/ic_launcher_background.xml b/social-feed/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from example/src/main/res/drawable/ic_launcher_background.xml rename to social-feed/src/main/res/drawable/ic_launcher_background.xml diff --git a/example/src/main/res/drawable/ic_launcher_foreground.xml b/social-feed/src/main/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from example/src/main/res/drawable/ic_launcher_foreground.xml rename to social-feed/src/main/res/drawable/ic_launcher_foreground.xml diff --git a/example/src/main/res/font/roboto.ttf b/social-feed/src/main/res/font/roboto.ttf similarity index 100% rename from example/src/main/res/font/roboto.ttf rename to social-feed/src/main/res/font/roboto.ttf diff --git a/example/src/main/res/font/roboto_bold.ttf b/social-feed/src/main/res/font/roboto_bold.ttf similarity index 100% rename from example/src/main/res/font/roboto_bold.ttf rename to social-feed/src/main/res/font/roboto_bold.ttf diff --git a/example/src/main/res/font/roboto_medium.ttf b/social-feed/src/main/res/font/roboto_medium.ttf similarity index 100% rename from example/src/main/res/font/roboto_medium.ttf rename to social-feed/src/main/res/font/roboto_medium.ttf diff --git a/example/src/main/res/layout/activity_auth.xml b/social-feed/src/main/res/layout/activity_auth.xml similarity index 100% rename from example/src/main/res/layout/activity_auth.xml rename to social-feed/src/main/res/layout/activity_auth.xml diff --git a/example/src/main/res/layout/activity_main.xml b/social-feed/src/main/res/layout/activity_main.xml similarity index 100% rename from example/src/main/res/layout/activity_main.xml rename to social-feed/src/main/res/layout/activity_main.xml diff --git a/example/src/main/res/layout/fragment_main.xml b/social-feed/src/main/res/layout/fragment_main.xml similarity index 100% rename from example/src/main/res/layout/fragment_main.xml rename to social-feed/src/main/res/layout/fragment_main.xml diff --git a/example/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/social-feed/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from example/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to social-feed/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/example/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/social-feed/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from example/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to social-feed/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/example/src/main/res/mipmap-hdpi/ic_app_icon.png b/social-feed/src/main/res/mipmap-hdpi/ic_app_icon.png similarity index 100% rename from example/src/main/res/mipmap-hdpi/ic_app_icon.png rename to social-feed/src/main/res/mipmap-hdpi/ic_app_icon.png diff --git a/example/src/main/res/mipmap-hdpi/ic_app_icon_round.png b/social-feed/src/main/res/mipmap-hdpi/ic_app_icon_round.png similarity index 100% rename from example/src/main/res/mipmap-hdpi/ic_app_icon_round.png rename to social-feed/src/main/res/mipmap-hdpi/ic_app_icon_round.png diff --git a/example/src/main/res/mipmap-hdpi/ic_launcher.webp b/social-feed/src/main/res/mipmap-hdpi/ic_launcher.webp similarity index 100% rename from example/src/main/res/mipmap-hdpi/ic_launcher.webp rename to social-feed/src/main/res/mipmap-hdpi/ic_launcher.webp diff --git a/example/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/social-feed/src/main/res/mipmap-hdpi/ic_launcher_round.webp similarity index 100% rename from example/src/main/res/mipmap-hdpi/ic_launcher_round.webp rename to social-feed/src/main/res/mipmap-hdpi/ic_launcher_round.webp diff --git a/example/src/main/res/mipmap-mdpi/ic_launcher.webp b/social-feed/src/main/res/mipmap-mdpi/ic_launcher.webp similarity index 100% rename from example/src/main/res/mipmap-mdpi/ic_launcher.webp rename to social-feed/src/main/res/mipmap-mdpi/ic_launcher.webp diff --git a/example/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/social-feed/src/main/res/mipmap-mdpi/ic_launcher_round.webp similarity index 100% rename from example/src/main/res/mipmap-mdpi/ic_launcher_round.webp rename to social-feed/src/main/res/mipmap-mdpi/ic_launcher_round.webp diff --git a/example/src/main/res/mipmap-xhdpi/ic_app_icon.png b/social-feed/src/main/res/mipmap-xhdpi/ic_app_icon.png similarity index 100% rename from example/src/main/res/mipmap-xhdpi/ic_app_icon.png rename to social-feed/src/main/res/mipmap-xhdpi/ic_app_icon.png diff --git a/example/src/main/res/mipmap-xhdpi/ic_app_icon_round.png b/social-feed/src/main/res/mipmap-xhdpi/ic_app_icon_round.png similarity index 100% rename from example/src/main/res/mipmap-xhdpi/ic_app_icon_round.png rename to social-feed/src/main/res/mipmap-xhdpi/ic_app_icon_round.png diff --git a/example/src/main/res/mipmap-xhdpi/ic_launcher.webp b/social-feed/src/main/res/mipmap-xhdpi/ic_launcher.webp similarity index 100% rename from example/src/main/res/mipmap-xhdpi/ic_launcher.webp rename to social-feed/src/main/res/mipmap-xhdpi/ic_launcher.webp diff --git a/example/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/social-feed/src/main/res/mipmap-xhdpi/ic_launcher_round.webp similarity index 100% rename from example/src/main/res/mipmap-xhdpi/ic_launcher_round.webp rename to social-feed/src/main/res/mipmap-xhdpi/ic_launcher_round.webp diff --git a/example/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/social-feed/src/main/res/mipmap-xxhdpi/ic_launcher.webp similarity index 100% rename from example/src/main/res/mipmap-xxhdpi/ic_launcher.webp rename to social-feed/src/main/res/mipmap-xxhdpi/ic_launcher.webp diff --git a/example/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/social-feed/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp similarity index 100% rename from example/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp rename to social-feed/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp diff --git a/example/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/social-feed/src/main/res/mipmap-xxxhdpi/ic_launcher.webp similarity index 100% rename from example/src/main/res/mipmap-xxxhdpi/ic_launcher.webp rename to social-feed/src/main/res/mipmap-xxxhdpi/ic_launcher.webp diff --git a/example/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/social-feed/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp similarity index 100% rename from example/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp rename to social-feed/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp diff --git a/example/src/main/res/values-night/themes.xml b/social-feed/src/main/res/values-night/themes.xml similarity index 100% rename from example/src/main/res/values-night/themes.xml rename to social-feed/src/main/res/values-night/themes.xml diff --git a/example/src/main/res/values/colors.xml b/social-feed/src/main/res/values/colors.xml similarity index 100% rename from example/src/main/res/values/colors.xml rename to social-feed/src/main/res/values/colors.xml diff --git a/example/src/main/res/values/strings.xml b/social-feed/src/main/res/values/strings.xml similarity index 100% rename from example/src/main/res/values/strings.xml rename to social-feed/src/main/res/values/strings.xml diff --git a/example/src/main/res/values/styles.xml b/social-feed/src/main/res/values/styles.xml similarity index 100% rename from example/src/main/res/values/styles.xml rename to social-feed/src/main/res/values/styles.xml diff --git a/example/src/main/res/values/themes.xml b/social-feed/src/main/res/values/themes.xml similarity index 100% rename from example/src/main/res/values/themes.xml rename to social-feed/src/main/res/values/themes.xml diff --git a/example/src/main/res/xml/backup_rules.xml b/social-feed/src/main/res/xml/backup_rules.xml similarity index 100% rename from example/src/main/res/xml/backup_rules.xml rename to social-feed/src/main/res/xml/backup_rules.xml diff --git a/example/src/main/res/xml/data_extraction_rules.xml b/social-feed/src/main/res/xml/data_extraction_rules.xml similarity index 100% rename from example/src/main/res/xml/data_extraction_rules.xml rename to social-feed/src/main/res/xml/data_extraction_rules.xml diff --git a/example/src/test/java/com/likeminds/feedexample/ExampleUnitTest.kt b/social-feed/src/test/java/com/likeminds/feedsocial/ExampleUnitTest.kt similarity index 90% rename from example/src/test/java/com/likeminds/feedexample/ExampleUnitTest.kt rename to social-feed/src/test/java/com/likeminds/feedsocial/ExampleUnitTest.kt index cf3bc967..36922cd1 100644 --- a/example/src/test/java/com/likeminds/feedexample/ExampleUnitTest.kt +++ b/social-feed/src/test/java/com/likeminds/feedsocial/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package com.likeminds.feedexample +package com.likeminds.feedsocial import org.junit.Test From 3165fc3ff38302c6b704cce2840848f80b21b5dd Mon Sep 17 00:00:00 2001 From: Siddharth Dubey <122088830+sidcr7-likeminds@users.noreply.github.com> Date: Sun, 28 Jul 2024 21:48:40 +0530 Subject: [PATCH 03/51] renamed universal feed to social feed --- .gitignore | 3 --- likeminds-feed-android-core/consumer-rules.pro | 2 +- .../feed/android/core/poll/util/LMFeedPollUtil.kt | 2 -- .../post/create/view/LMFeedCreatePostFragment.kt | 6 +++--- .../post/detail/adapter/LMFeedPostDetailAdapter.kt | 4 ++-- .../post/detail/view/LMFeedPostDetailFragment.kt | 6 +++--- .../post/detail/view/LMFeedPostDetailListView.kt | 5 ++--- .../detail/viewmodel/LMFeedPostDetailViewModel.kt | 2 +- .../core/post/edit/view/LMFeedEditPostFragment.kt | 8 ++++---- .../post/edit/viewmodel/LMFeedEditPostViewModel.kt | 2 +- .../feed/android/core/post/util/LMFeedPostEvent.kt | 2 +- .../adapter/LMFeedDocumentsPostAdapter.kt | 4 ++-- .../adapter/LMFeedMultipleMediaPostAdapter.kt | 6 +++--- .../adapter/LMFeedUniversalFeedAdapter.kt | 6 +++--- .../adapter/LMFeedUniversalSelectedTopicAdapter.kt | 4 ++-- .../LMFeedItemPostDocumentsViewDataBinder.kt | 8 ++++---- .../databinders/LMFeedItemPostLinkViewDataBinder.kt | 8 ++++---- .../LMFeedItemPostMultipleMediaViewDataBinder.kt | 11 ++++------- .../databinders/LMFeedItemPostPollViewDataBinder.kt | 8 ++++---- .../LMFeedItemPostSingleImageViewDataBinder.kt | 11 ++++------- .../LMFeedItemPostSingleVideoViewDataBinder.kt | 8 ++++---- .../LMFeedItemPostTextOnlyViewDataBinder.kt | 8 ++++---- .../LMFeedItemSelectedFilterTopicViewDataBinder.kt | 4 ++-- .../LMFeedItemDocumentViewDataBinder.kt | 6 +++--- .../LMFeedItemMultipleMediaImageViewDataBinder.kt | 6 +++--- .../LMFeedItemMultipleMediaVideoViewDataBinder.kt | 4 ++-- .../model/LMFeedMediaViewData.kt | 2 +- .../model/LMFeedPostContentViewData.kt | 2 +- .../model/LMFeedPostFooterViewData.kt | 2 +- .../model/LMFeedPostHeaderViewData.kt | 2 +- .../model/LMFeedPostViewData.kt | 2 +- .../model/LMFeedSDKClientInfoViewData.kt | 2 +- .../style/LMFeedPostingViewStyle.kt | 2 +- .../style/LMFeedUniversalFeedFragmentViewStyle.kt | 2 +- .../LMFeedUniversalTopicSelectorBarViewStyle.kt | 2 +- .../util/LMFeedPostBinderUtils.kt | 6 +++--- .../view/LMFeedDocumentListView.kt | 8 ++++---- .../view/LMFeedPostingView.kt | 4 ++-- .../view/LMFeedUniversalFeedFragment.kt | 12 ++++++------ .../view/LMFeedUniversalFeedListView.kt | 10 ++++------ .../view/LMFeedUniversalSelectedTopicListView.kt | 6 +++--- .../view/LMFeedUniversalTopicSelectorBarView.kt | 6 +++--- .../viewmodel/LMFeedUniversalFeedViewModel.kt | 4 ++-- .../postmedia/view/LMFeedPostDocumentsMediaView.kt | 4 ++-- .../postmedia/view/LMFeedPostMultipleMediaView.kt | 4 ++-- .../android/core/utils/LMFeedStyleTransformer.kt | 2 +- .../android/core/utils/LMFeedViewDataConvertor.kt | 2 +- .../android/core/utils/analytics/LMFeedAnalytics.kt | 2 +- .../core/utils/base/PostItemViewDataBinder.kt | 2 +- .../android/core/utils/user/LMFeedUserViewData.kt | 2 +- .../utils/video/LMFeedPostVideoAutoPlayHelper.kt | 4 ++-- .../res/layout/lm_feed_fragment_universal_feed.xml | 6 +++--- .../main/res/layout/lm_feed_item_post_documents.xml | 2 +- .../src/main/res/layout/lm_feed_item_post_link.xml | 2 +- .../res/layout/lm_feed_item_post_multiple_media.xml | 2 +- .../src/main/res/layout/lm_feed_item_post_poll.xml | 2 +- .../res/layout/lm_feed_item_post_single_image.xml | 2 +- .../res/layout/lm_feed_item_post_single_video.xml | 2 +- .../main/res/layout/lm_feed_item_post_text_only.xml | 2 +- .../res/layout/lm_feed_post_documents_media_view.xml | 2 +- .../layout/lm_feed_universal_topic_selector_bar.xml | 2 +- .../CustomLMUniversalFeedAdminFragment.kt | 2 +- 62 files changed, 126 insertions(+), 140 deletions(-) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/{universalfeed => socialfeed}/adapter/LMFeedDocumentsPostAdapter.kt (81%) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/{universalfeed => socialfeed}/adapter/LMFeedMultipleMediaPostAdapter.kt (75%) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/{universalfeed => socialfeed}/adapter/LMFeedUniversalFeedAdapter.kt (97%) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/{universalfeed => socialfeed}/adapter/LMFeedUniversalSelectedTopicAdapter.kt (83%) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/{universalfeed => socialfeed}/adapter/databinders/LMFeedItemPostDocumentsViewDataBinder.kt (94%) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/{universalfeed => socialfeed}/adapter/databinders/LMFeedItemPostLinkViewDataBinder.kt (94%) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/{universalfeed => socialfeed}/adapter/databinders/LMFeedItemPostMultipleMediaViewDataBinder.kt (91%) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/{universalfeed => socialfeed}/adapter/databinders/LMFeedItemPostPollViewDataBinder.kt (95%) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/{universalfeed => socialfeed}/adapter/databinders/LMFeedItemPostSingleImageViewDataBinder.kt (91%) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/{universalfeed => socialfeed}/adapter/databinders/LMFeedItemPostSingleVideoViewDataBinder.kt (93%) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/{universalfeed => socialfeed}/adapter/databinders/LMFeedItemPostTextOnlyViewDataBinder.kt (92%) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/{universalfeed => socialfeed}/adapter/databinders/LMFeedItemSelectedFilterTopicViewDataBinder.kt (92%) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/{universalfeed => socialfeed}/adapter/databinders/postdocuments/LMFeedItemDocumentViewDataBinder.kt (92%) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/{universalfeed => socialfeed}/adapter/databinders/postmultiplemedia/LMFeedItemMultipleMediaImageViewDataBinder.kt (92%) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/{universalfeed => socialfeed}/adapter/databinders/postmultiplemedia/LMFeedItemMultipleMediaVideoViewDataBinder.kt (94%) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/{universalfeed => socialfeed}/model/LMFeedMediaViewData.kt (96%) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/{universalfeed => socialfeed}/model/LMFeedPostContentViewData.kt (93%) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/{universalfeed => socialfeed}/model/LMFeedPostFooterViewData.kt (95%) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/{universalfeed => socialfeed}/model/LMFeedPostHeaderViewData.kt (96%) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/{universalfeed => socialfeed}/model/LMFeedPostViewData.kt (98%) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/{universalfeed => socialfeed}/model/LMFeedSDKClientInfoViewData.kt (94%) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/{universalfeed => socialfeed}/style/LMFeedPostingViewStyle.kt (98%) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/{universalfeed => socialfeed}/style/LMFeedUniversalFeedFragmentViewStyle.kt (99%) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/{universalfeed => socialfeed}/style/LMFeedUniversalTopicSelectorBarViewStyle.kt (98%) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/{universalfeed => socialfeed}/util/LMFeedPostBinderUtils.kt (98%) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/{universalfeed => socialfeed}/view/LMFeedDocumentListView.kt (91%) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/{universalfeed => socialfeed}/view/LMFeedPostingView.kt (97%) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/{universalfeed => socialfeed}/view/LMFeedUniversalFeedFragment.kt (99%) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/{universalfeed => socialfeed}/view/LMFeedUniversalFeedListView.kt (93%) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/{universalfeed => socialfeed}/view/LMFeedUniversalSelectedTopicListView.kt (88%) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/{universalfeed => socialfeed}/view/LMFeedUniversalTopicSelectorBarView.kt (95%) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/{universalfeed => socialfeed}/viewmodel/LMFeedUniversalFeedViewModel.kt (99%) diff --git a/.gitignore b/.gitignore index 5f87a54a..9b4c35e2 100644 --- a/.gitignore +++ b/.gitignore @@ -30,9 +30,6 @@ render.experimental.xml *.jks *.keystore -# Google Services (e.g. APIs or Firebase) -social-feed/src/main/google-services.json - # Android Profiling *.hprof diff --git a/likeminds-feed-android-core/consumer-rules.pro b/likeminds-feed-android-core/consumer-rules.pro index 2a6b882e..cd766d86 100644 --- a/likeminds-feed-android-core/consumer-rules.pro +++ b/likeminds-feed-android-core/consumer-rules.pro @@ -16,7 +16,7 @@ -keep class com.likeminds.feed.android.core.topicselection.model.** { *; } -keep class com.likeminds.feed.android.core.ui.theme.model.** { *; } -keep class com.likeminds.feed.android.core.ui.widgets.poll.model.** { *; } --keep class com.likeminds.feed.android.core.universalfeed.model.** { *; } +-keep class com.likeminds.feed.android.core.socialfeed.model.** { *; } -keep class com.likeminds.feed.android.core.utils.base.model.** { *; } -keep class com.likeminds.feed.android.core.utils.pluralize.model.** { *; } diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/poll/util/LMFeedPollUtil.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/poll/util/LMFeedPollUtil.kt index 6c69bbe3..269bbdd4 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/poll/util/LMFeedPollUtil.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/poll/util/LMFeedPollUtil.kt @@ -1,8 +1,6 @@ package com.likeminds.feed.android.core.poll.util import com.likeminds.feed.android.core.poll.result.model.LMFeedPollViewData -import com.likeminds.feed.android.core.post.detail.viewmodel.LMFeedPostDetailViewModel -import com.likeminds.feed.android.core.universalfeed.model.LMFeedPostViewData object LMFeedPollUtil { diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/create/view/LMFeedCreatePostFragment.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/create/view/LMFeedCreatePostFragment.kt index 1614c372..34d9fefa 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/create/view/LMFeedCreatePostFragment.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/create/view/LMFeedCreatePostFragment.kt @@ -47,9 +47,9 @@ import com.likeminds.feed.android.core.ui.widgets.poll.view.LMFeedPostPollView import com.likeminds.feed.android.core.ui.widgets.post.postheaderview.view.LMFeedPostHeaderView import com.likeminds.feed.android.core.ui.widgets.post.postmedia.style.LMFeedPostImageMediaViewStyle import com.likeminds.feed.android.core.ui.widgets.post.postmedia.view.* -import com.likeminds.feed.android.core.universalfeed.adapter.LMFeedUniversalFeedAdapterListener -import com.likeminds.feed.android.core.universalfeed.model.LMFeedMediaViewData -import com.likeminds.feed.android.core.universalfeed.util.LMFeedPostBinderUtils +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.model.LMFeedMediaViewData +import com.likeminds.feed.android.core.socialfeed.util.LMFeedPostBinderUtils import com.likeminds.feed.android.core.utils.* import com.likeminds.feed.android.core.utils.LMFeedValueUtils.getUrlIfExist import com.likeminds.feed.android.core.utils.LMFeedValueUtils.pluralizeOrCapitalize diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/detail/adapter/LMFeedPostDetailAdapter.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/detail/adapter/LMFeedPostDetailAdapter.kt index dbcd5218..33b1e580 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/detail/adapter/LMFeedPostDetailAdapter.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/detail/adapter/LMFeedPostDetailAdapter.kt @@ -5,8 +5,8 @@ import com.likeminds.feed.android.core.post.detail.adapter.databinders.LMFeedIte import com.likeminds.feed.android.core.post.detail.adapter.databinders.LMFeedItemCommentsCountViewDataBinder import com.likeminds.feed.android.core.post.detail.adapter.databinders.LMFeedItemNoCommentsFoundViewDataBinder import com.likeminds.feed.android.core.post.detail.model.LMFeedCommentViewData -import com.likeminds.feed.android.core.universalfeed.adapter.LMFeedUniversalFeedAdapterListener -import com.likeminds.feed.android.core.universalfeed.adapter.databinders.* +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.adapter.databinders.* import com.likeminds.feed.android.core.utils.LMFeedValueUtils.getItemInList import com.likeminds.feed.android.core.utils.base.LMFeedBaseRecyclerAdapter import com.likeminds.feed.android.core.utils.base.LMFeedBaseViewType diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/detail/view/LMFeedPostDetailFragment.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/detail/view/LMFeedPostDetailFragment.kt index 6283e09c..efcf4a78 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/detail/view/LMFeedPostDetailFragment.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/detail/view/LMFeedPostDetailFragment.kt @@ -37,9 +37,9 @@ import com.likeminds.feed.android.core.ui.widgets.headerview.view.LMFeedHeaderVi import com.likeminds.feed.android.core.ui.widgets.overflowmenu.view.LMFeedOverflowMenu import com.likeminds.feed.android.core.ui.widgets.poll.model.LMFeedAddPollOptionExtras import com.likeminds.feed.android.core.ui.widgets.poll.view.* -import com.likeminds.feed.android.core.universalfeed.adapter.LMFeedUniversalFeedAdapterListener -import com.likeminds.feed.android.core.universalfeed.model.LMFeedPostViewData -import com.likeminds.feed.android.core.universalfeed.util.LMFeedPostBinderUtils +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData +import com.likeminds.feed.android.core.socialfeed.util.LMFeedPostBinderUtils import com.likeminds.feed.android.core.utils.* import com.likeminds.feed.android.core.utils.LMFeedValueUtils.pluralizeOrCapitalize import com.likeminds.feed.android.core.utils.analytics.LMFeedAnalytics diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/detail/view/LMFeedPostDetailListView.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/detail/view/LMFeedPostDetailListView.kt index a6b15e49..09b6dd58 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/detail/view/LMFeedPostDetailListView.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/detail/view/LMFeedPostDetailListView.kt @@ -2,12 +2,11 @@ package com.likeminds.feed.android.core.post.detail.view import android.content.Context import android.util.AttributeSet -import android.util.Log import androidx.recyclerview.widget.* import com.likeminds.feed.android.core.post.detail.adapter.* import com.likeminds.feed.android.core.post.detail.model.LMFeedCommentViewData -import com.likeminds.feed.android.core.universalfeed.adapter.LMFeedUniversalFeedAdapterListener -import com.likeminds.feed.android.core.universalfeed.model.LMFeedPostViewData +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData import com.likeminds.feed.android.core.utils.LMFeedEndlessRecyclerViewScrollListener import com.likeminds.feed.android.core.utils.LMFeedViewUtils import com.likeminds.feed.android.core.utils.base.LMFeedBaseViewType diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/detail/viewmodel/LMFeedPostDetailViewModel.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/detail/viewmodel/LMFeedPostDetailViewModel.kt index e0d1f46a..de72a037 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/detail/viewmodel/LMFeedPostDetailViewModel.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/detail/viewmodel/LMFeedPostDetailViewModel.kt @@ -5,7 +5,7 @@ import androidx.lifecycle.* import com.likeminds.feed.android.core.R import com.likeminds.feed.android.core.poll.util.LMFeedPollUtil import com.likeminds.feed.android.core.post.detail.model.LMFeedCommentViewData -import com.likeminds.feed.android.core.universalfeed.model.LMFeedPostViewData +import com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData import com.likeminds.feed.android.core.utils.LMFeedViewDataConvertor import com.likeminds.feed.android.core.utils.analytics.LMFeedAnalytics import com.likeminds.feed.android.core.utils.coroutine.launchIO diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/edit/view/LMFeedEditPostFragment.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/edit/view/LMFeedEditPostFragment.kt index 6faf91f8..048ffdb7 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/edit/view/LMFeedEditPostFragment.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/edit/view/LMFeedEditPostFragment.kt @@ -45,10 +45,10 @@ import com.likeminds.feed.android.core.ui.widgets.headerview.view.LMFeedHeaderVi import com.likeminds.feed.android.core.ui.widgets.poll.view.LMFeedPostPollView import com.likeminds.feed.android.core.ui.widgets.post.postheaderview.view.LMFeedPostHeaderView import com.likeminds.feed.android.core.ui.widgets.post.postmedia.view.* -import com.likeminds.feed.android.core.universalfeed.adapter.LMFeedUniversalFeedAdapterListener -import com.likeminds.feed.android.core.universalfeed.model.LMFeedMediaViewData -import com.likeminds.feed.android.core.universalfeed.model.LMFeedPostViewData -import com.likeminds.feed.android.core.universalfeed.util.LMFeedPostBinderUtils.customizePostTopicsGroup +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.model.LMFeedMediaViewData +import com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData +import com.likeminds.feed.android.core.socialfeed.util.LMFeedPostBinderUtils.customizePostTopicsGroup import com.likeminds.feed.android.core.utils.* import com.likeminds.feed.android.core.utils.LMFeedValueUtils.getUrlIfExist import com.likeminds.feed.android.core.utils.LMFeedValueUtils.pluralizeOrCapitalize diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/edit/viewmodel/LMFeedEditPostViewModel.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/edit/viewmodel/LMFeedEditPostViewModel.kt index 5e46001c..bdfb0f3c 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/edit/viewmodel/LMFeedEditPostViewModel.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/edit/viewmodel/LMFeedEditPostViewModel.kt @@ -5,7 +5,7 @@ import com.likeminds.feed.android.core.poll.result.model.LMFeedPollViewData import com.likeminds.feed.android.core.post.model.LMFeedAttachmentViewData import com.likeminds.feed.android.core.post.model.LMFeedLinkOGTagsViewData import com.likeminds.feed.android.core.topics.model.LMFeedTopicViewData -import com.likeminds.feed.android.core.universalfeed.model.LMFeedPostViewData +import com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData import com.likeminds.feed.android.core.utils.LMFeedViewDataConvertor import com.likeminds.feed.android.core.utils.analytics.LMFeedAnalytics import com.likeminds.feed.android.core.utils.coroutine.launchIO diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/util/LMFeedPostEvent.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/util/LMFeedPostEvent.kt index 9240a08c..b6657383 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/util/LMFeedPostEvent.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/util/LMFeedPostEvent.kt @@ -1,6 +1,6 @@ package com.likeminds.feed.android.core.post.util -import com.likeminds.feed.android.core.universalfeed.model.LMFeedPostViewData +import com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData // to trigger post change events and notify observers class LMFeedPostEvent { diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/LMFeedDocumentsPostAdapter.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/LMFeedDocumentsPostAdapter.kt similarity index 81% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/LMFeedDocumentsPostAdapter.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/LMFeedDocumentsPostAdapter.kt index a459b90c..edbde6c5 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/LMFeedDocumentsPostAdapter.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/LMFeedDocumentsPostAdapter.kt @@ -1,6 +1,6 @@ -package com.likeminds.feed.android.core.universalfeed.adapter +package com.likeminds.feed.android.core.socialfeed.adapter -import com.likeminds.feed.android.core.universalfeed.adapter.databinders.postdocuments.LMFeedItemDocumentViewDataBinder +import com.likeminds.feed.android.core.socialfeed.adapter.databinders.postdocuments.LMFeedItemDocumentViewDataBinder import com.likeminds.feed.android.core.utils.base.* class LMFeedDocumentsAdapter( diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/LMFeedMultipleMediaPostAdapter.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/LMFeedMultipleMediaPostAdapter.kt similarity index 75% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/LMFeedMultipleMediaPostAdapter.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/LMFeedMultipleMediaPostAdapter.kt index 395c38de..5a4de9fb 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/LMFeedMultipleMediaPostAdapter.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/LMFeedMultipleMediaPostAdapter.kt @@ -1,7 +1,7 @@ -package com.likeminds.feed.android.core.universalfeed.adapter +package com.likeminds.feed.android.core.socialfeed.adapter -import com.likeminds.feed.android.core.universalfeed.adapter.databinders.postmultiplemedia.LMFeedItemMultipleMediaImageViewDataBinder -import com.likeminds.feed.android.core.universalfeed.adapter.databinders.postmultiplemedia.LMFeedItemMultipleMediaVideoViewDataBinder +import com.likeminds.feed.android.core.socialfeed.adapter.databinders.postmultiplemedia.LMFeedItemMultipleMediaImageViewDataBinder +import com.likeminds.feed.android.core.socialfeed.adapter.databinders.postmultiplemedia.LMFeedItemMultipleMediaVideoViewDataBinder import com.likeminds.feed.android.core.utils.base.* class LMFeedMultipleMediaPostAdapter( diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/LMFeedUniversalFeedAdapter.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/LMFeedUniversalFeedAdapter.kt similarity index 97% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/LMFeedUniversalFeedAdapter.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/LMFeedUniversalFeedAdapter.kt index 2e4dfe4d..5a982309 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/LMFeedUniversalFeedAdapter.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/LMFeedUniversalFeedAdapter.kt @@ -1,10 +1,10 @@ -package com.likeminds.feed.android.core.universalfeed.adapter +package com.likeminds.feed.android.core.socialfeed.adapter import android.view.View import com.likeminds.feed.android.core.poll.result.model.LMFeedPollOptionViewData import com.likeminds.feed.android.core.post.model.LMFeedAttachmentViewData -import com.likeminds.feed.android.core.universalfeed.adapter.databinders.* -import com.likeminds.feed.android.core.universalfeed.model.LMFeedPostViewData +import com.likeminds.feed.android.core.socialfeed.adapter.databinders.* +import com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData import com.likeminds.feed.android.core.utils.LMFeedValueUtils.getItemInList import com.likeminds.feed.android.core.utils.base.* diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/LMFeedUniversalSelectedTopicAdapter.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/LMFeedUniversalSelectedTopicAdapter.kt similarity index 83% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/LMFeedUniversalSelectedTopicAdapter.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/LMFeedUniversalSelectedTopicAdapter.kt index 16082a04..27f5ee23 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/LMFeedUniversalSelectedTopicAdapter.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/LMFeedUniversalSelectedTopicAdapter.kt @@ -1,7 +1,7 @@ -package com.likeminds.feed.android.core.universalfeed.adapter +package com.likeminds.feed.android.core.socialfeed.adapter import com.likeminds.feed.android.core.topics.model.LMFeedTopicViewData -import com.likeminds.feed.android.core.universalfeed.adapter.databinders.LMFeedItemSelectedFilterTopicViewDataBinder +import com.likeminds.feed.android.core.socialfeed.adapter.databinders.LMFeedItemSelectedFilterTopicViewDataBinder import com.likeminds.feed.android.core.utils.base.* class LMFeedUniversalSelectedTopicAdapter( diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/databinders/LMFeedItemPostDocumentsViewDataBinder.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostDocumentsViewDataBinder.kt similarity index 94% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/databinders/LMFeedItemPostDocumentsViewDataBinder.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostDocumentsViewDataBinder.kt index f7e6cb1c..dc665237 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/databinders/LMFeedItemPostDocumentsViewDataBinder.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostDocumentsViewDataBinder.kt @@ -1,11 +1,11 @@ -package com.likeminds.feed.android.core.universalfeed.adapter.databinders +package com.likeminds.feed.android.core.socialfeed.adapter.databinders import android.view.LayoutInflater import android.view.ViewGroup import com.likeminds.feed.android.core.databinding.LmFeedItemPostDocumentsBinding -import com.likeminds.feed.android.core.universalfeed.adapter.LMFeedUniversalFeedAdapterListener -import com.likeminds.feed.android.core.universalfeed.model.LMFeedPostViewData -import com.likeminds.feed.android.core.universalfeed.util.LMFeedPostBinderUtils +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData +import com.likeminds.feed.android.core.socialfeed.util.LMFeedPostBinderUtils import com.likeminds.feed.android.core.utils.LMFeedStyleTransformer import com.likeminds.feed.android.core.utils.base.LMFeedViewDataBinder import com.likeminds.feed.android.core.utils.base.model.ITEM_POST_DOCUMENTS diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/databinders/LMFeedItemPostLinkViewDataBinder.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostLinkViewDataBinder.kt similarity index 94% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/databinders/LMFeedItemPostLinkViewDataBinder.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostLinkViewDataBinder.kt index a514eb51..050f96ea 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/databinders/LMFeedItemPostLinkViewDataBinder.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostLinkViewDataBinder.kt @@ -1,11 +1,11 @@ -package com.likeminds.feed.android.core.universalfeed.adapter.databinders +package com.likeminds.feed.android.core.socialfeed.adapter.databinders import android.view.LayoutInflater import android.view.ViewGroup import com.likeminds.feed.android.core.databinding.LmFeedItemPostLinkBinding -import com.likeminds.feed.android.core.universalfeed.adapter.LMFeedUniversalFeedAdapterListener -import com.likeminds.feed.android.core.universalfeed.model.LMFeedPostViewData -import com.likeminds.feed.android.core.universalfeed.util.LMFeedPostBinderUtils +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData +import com.likeminds.feed.android.core.socialfeed.util.LMFeedPostBinderUtils import com.likeminds.feed.android.core.utils.LMFeedStyleTransformer import com.likeminds.feed.android.core.utils.base.LMFeedViewDataBinder import com.likeminds.feed.android.core.utils.base.model.ITEM_POST_LINK diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/databinders/LMFeedItemPostMultipleMediaViewDataBinder.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostMultipleMediaViewDataBinder.kt similarity index 91% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/databinders/LMFeedItemPostMultipleMediaViewDataBinder.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostMultipleMediaViewDataBinder.kt index 5db3e28a..927e7473 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/databinders/LMFeedItemPostMultipleMediaViewDataBinder.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostMultipleMediaViewDataBinder.kt @@ -1,17 +1,14 @@ -package com.likeminds.feed.android.core.universalfeed.adapter.databinders +package com.likeminds.feed.android.core.socialfeed.adapter.databinders -import android.text.util.Linkify import android.view.LayoutInflater import android.view.ViewGroup -import androidx.core.text.util.LinkifyCompat import com.likeminds.feed.android.core.databinding.LmFeedItemPostMultipleMediaBinding -import com.likeminds.feed.android.core.universalfeed.adapter.LMFeedUniversalFeedAdapterListener -import com.likeminds.feed.android.core.universalfeed.model.LMFeedPostViewData -import com.likeminds.feed.android.core.universalfeed.util.LMFeedPostBinderUtils +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData +import com.likeminds.feed.android.core.socialfeed.util.LMFeedPostBinderUtils import com.likeminds.feed.android.core.utils.LMFeedStyleTransformer import com.likeminds.feed.android.core.utils.base.LMFeedViewDataBinder import com.likeminds.feed.android.core.utils.base.model.ITEM_POST_MULTIPLE_MEDIA -import com.likeminds.feed.android.core.utils.link.LMFeedLinkMovementMethod class LMFeedItemPostMultipleMediaViewDataBinder( private val universalFeedAdapterListener: LMFeedUniversalFeedAdapterListener diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/databinders/LMFeedItemPostPollViewDataBinder.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostPollViewDataBinder.kt similarity index 95% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/databinders/LMFeedItemPostPollViewDataBinder.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostPollViewDataBinder.kt index cedbd1d1..f608f13b 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/databinders/LMFeedItemPostPollViewDataBinder.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostPollViewDataBinder.kt @@ -1,13 +1,13 @@ -package com.likeminds.feed.android.core.universalfeed.adapter.databinders +package com.likeminds.feed.android.core.socialfeed.adapter.databinders import android.view.LayoutInflater import android.view.ViewGroup import com.likeminds.feed.android.core.databinding.LmFeedItemPostPollBinding import com.likeminds.feed.android.core.poll.result.model.LMFeedPollOptionViewData import com.likeminds.feed.android.core.ui.widgets.poll.adapter.LMFeedPollOptionsAdapterListener -import com.likeminds.feed.android.core.universalfeed.adapter.LMFeedUniversalFeedAdapterListener -import com.likeminds.feed.android.core.universalfeed.model.LMFeedPostViewData -import com.likeminds.feed.android.core.universalfeed.util.LMFeedPostBinderUtils +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData +import com.likeminds.feed.android.core.socialfeed.util.LMFeedPostBinderUtils import com.likeminds.feed.android.core.utils.LMFeedStyleTransformer import com.likeminds.feed.android.core.utils.base.LMFeedViewDataBinder import com.likeminds.feed.android.core.utils.base.model.ITEM_POST_POLL diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/databinders/LMFeedItemPostSingleImageViewDataBinder.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostSingleImageViewDataBinder.kt similarity index 91% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/databinders/LMFeedItemPostSingleImageViewDataBinder.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostSingleImageViewDataBinder.kt index 2fbbed69..f2ea036e 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/databinders/LMFeedItemPostSingleImageViewDataBinder.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostSingleImageViewDataBinder.kt @@ -1,17 +1,14 @@ -package com.likeminds.feed.android.core.universalfeed.adapter.databinders +package com.likeminds.feed.android.core.socialfeed.adapter.databinders -import android.text.util.Linkify import android.view.LayoutInflater import android.view.ViewGroup -import androidx.core.text.util.LinkifyCompat import com.likeminds.feed.android.core.databinding.LmFeedItemPostSingleImageBinding -import com.likeminds.feed.android.core.universalfeed.adapter.LMFeedUniversalFeedAdapterListener -import com.likeminds.feed.android.core.universalfeed.model.LMFeedPostViewData -import com.likeminds.feed.android.core.universalfeed.util.LMFeedPostBinderUtils +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData +import com.likeminds.feed.android.core.socialfeed.util.LMFeedPostBinderUtils import com.likeminds.feed.android.core.utils.LMFeedStyleTransformer import com.likeminds.feed.android.core.utils.base.LMFeedViewDataBinder import com.likeminds.feed.android.core.utils.base.model.ITEM_POST_SINGLE_IMAGE -import com.likeminds.feed.android.core.utils.link.LMFeedLinkMovementMethod class LMFeedItemPostSingleImageViewDataBinder( private val universalFeedAdapterListener: LMFeedUniversalFeedAdapterListener diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/databinders/LMFeedItemPostSingleVideoViewDataBinder.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostSingleVideoViewDataBinder.kt similarity index 93% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/databinders/LMFeedItemPostSingleVideoViewDataBinder.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostSingleVideoViewDataBinder.kt index 777d4219..faf69799 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/databinders/LMFeedItemPostSingleVideoViewDataBinder.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostSingleVideoViewDataBinder.kt @@ -1,11 +1,11 @@ -package com.likeminds.feed.android.core.universalfeed.adapter.databinders +package com.likeminds.feed.android.core.socialfeed.adapter.databinders import android.view.LayoutInflater import android.view.ViewGroup import com.likeminds.feed.android.core.databinding.LmFeedItemPostSingleVideoBinding -import com.likeminds.feed.android.core.universalfeed.adapter.LMFeedUniversalFeedAdapterListener -import com.likeminds.feed.android.core.universalfeed.model.LMFeedPostViewData -import com.likeminds.feed.android.core.universalfeed.util.LMFeedPostBinderUtils +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData +import com.likeminds.feed.android.core.socialfeed.util.LMFeedPostBinderUtils import com.likeminds.feed.android.core.utils.LMFeedStyleTransformer import com.likeminds.feed.android.core.utils.base.LMFeedViewDataBinder import com.likeminds.feed.android.core.utils.base.model.ITEM_POST_SINGLE_VIDEO diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/databinders/LMFeedItemPostTextOnlyViewDataBinder.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostTextOnlyViewDataBinder.kt similarity index 92% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/databinders/LMFeedItemPostTextOnlyViewDataBinder.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostTextOnlyViewDataBinder.kt index ce543e7d..139b8d29 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/databinders/LMFeedItemPostTextOnlyViewDataBinder.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostTextOnlyViewDataBinder.kt @@ -1,11 +1,11 @@ -package com.likeminds.feed.android.core.universalfeed.adapter.databinders +package com.likeminds.feed.android.core.socialfeed.adapter.databinders import android.view.LayoutInflater import android.view.ViewGroup import com.likeminds.feed.android.core.databinding.LmFeedItemPostTextOnlyBinding -import com.likeminds.feed.android.core.universalfeed.adapter.LMFeedUniversalFeedAdapterListener -import com.likeminds.feed.android.core.universalfeed.model.LMFeedPostViewData -import com.likeminds.feed.android.core.universalfeed.util.LMFeedPostBinderUtils +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData +import com.likeminds.feed.android.core.socialfeed.util.LMFeedPostBinderUtils import com.likeminds.feed.android.core.utils.base.LMFeedViewDataBinder import com.likeminds.feed.android.core.utils.base.model.ITEM_POST_TEXT_ONLY diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/databinders/LMFeedItemSelectedFilterTopicViewDataBinder.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemSelectedFilterTopicViewDataBinder.kt similarity index 92% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/databinders/LMFeedItemSelectedFilterTopicViewDataBinder.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemSelectedFilterTopicViewDataBinder.kt index b72d7628..e94c8628 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/databinders/LMFeedItemSelectedFilterTopicViewDataBinder.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemSelectedFilterTopicViewDataBinder.kt @@ -1,11 +1,11 @@ -package com.likeminds.feed.android.core.universalfeed.adapter.databinders +package com.likeminds.feed.android.core.socialfeed.adapter.databinders import android.view.LayoutInflater import android.view.ViewGroup import com.likeminds.feed.android.core.databinding.LmFeedItemSelectedFilterTopicBinding import com.likeminds.feed.android.core.topics.model.LMFeedTopicViewData import com.likeminds.feed.android.core.ui.base.styles.setStyle -import com.likeminds.feed.android.core.universalfeed.adapter.LMFeedUniversalSelectedTopicAdapterListener +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalSelectedTopicAdapterListener import com.likeminds.feed.android.core.utils.LMFeedStyleTransformer import com.likeminds.feed.android.core.utils.base.LMFeedViewDataBinder import com.likeminds.feed.android.core.utils.base.model.ITEM_TOPIC diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/databinders/postdocuments/LMFeedItemDocumentViewDataBinder.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/postdocuments/LMFeedItemDocumentViewDataBinder.kt similarity index 92% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/databinders/postdocuments/LMFeedItemDocumentViewDataBinder.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/postdocuments/LMFeedItemDocumentViewDataBinder.kt index 0251f3bf..8f31961a 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/databinders/postdocuments/LMFeedItemDocumentViewDataBinder.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/postdocuments/LMFeedItemDocumentViewDataBinder.kt @@ -1,4 +1,4 @@ -package com.likeminds.feed.android.core.universalfeed.adapter.databinders.postdocuments +package com.likeminds.feed.android.core.socialfeed.adapter.databinders.postdocuments import android.view.LayoutInflater import android.view.ViewGroup @@ -7,8 +7,8 @@ import com.likeminds.feed.android.core.R import com.likeminds.feed.android.core.databinding.LmFeedItemDocumentBinding import com.likeminds.feed.android.core.post.model.LMFeedAttachmentViewData import com.likeminds.feed.android.core.ui.base.styles.LMFeedIconStyle -import com.likeminds.feed.android.core.universalfeed.adapter.LMFeedUniversalFeedAdapterListener -import com.likeminds.feed.android.core.universalfeed.util.LMFeedPostBinderUtils +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.util.LMFeedPostBinderUtils import com.likeminds.feed.android.core.utils.LMFeedStyleTransformer import com.likeminds.feed.android.core.utils.base.LMFeedViewDataBinder import com.likeminds.feed.android.core.utils.base.model.ITEM_POST_DOCUMENTS_ITEM diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/databinders/postmultiplemedia/LMFeedItemMultipleMediaImageViewDataBinder.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/postmultiplemedia/LMFeedItemMultipleMediaImageViewDataBinder.kt similarity index 92% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/databinders/postmultiplemedia/LMFeedItemMultipleMediaImageViewDataBinder.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/postmultiplemedia/LMFeedItemMultipleMediaImageViewDataBinder.kt index a073a8d7..10e4358a 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/databinders/postmultiplemedia/LMFeedItemMultipleMediaImageViewDataBinder.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/postmultiplemedia/LMFeedItemMultipleMediaImageViewDataBinder.kt @@ -1,4 +1,4 @@ -package com.likeminds.feed.android.core.universalfeed.adapter.databinders.postmultiplemedia +package com.likeminds.feed.android.core.socialfeed.adapter.databinders.postmultiplemedia import android.view.LayoutInflater import android.view.ViewGroup @@ -7,8 +7,8 @@ import com.likeminds.feed.android.core.R import com.likeminds.feed.android.core.databinding.LmFeedItemMultipleMediaImageBinding import com.likeminds.feed.android.core.post.model.LMFeedAttachmentViewData import com.likeminds.feed.android.core.ui.base.styles.LMFeedIconStyle -import com.likeminds.feed.android.core.universalfeed.adapter.LMFeedUniversalFeedAdapterListener -import com.likeminds.feed.android.core.universalfeed.util.LMFeedPostBinderUtils +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.util.LMFeedPostBinderUtils import com.likeminds.feed.android.core.utils.LMFeedStyleTransformer import com.likeminds.feed.android.core.utils.base.LMFeedViewDataBinder import com.likeminds.feed.android.core.utils.base.model.ITEM_MULTIPLE_MEDIA_IMAGE diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/databinders/postmultiplemedia/LMFeedItemMultipleMediaVideoViewDataBinder.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/postmultiplemedia/LMFeedItemMultipleMediaVideoViewDataBinder.kt similarity index 94% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/databinders/postmultiplemedia/LMFeedItemMultipleMediaVideoViewDataBinder.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/postmultiplemedia/LMFeedItemMultipleMediaVideoViewDataBinder.kt index 0dcf36f5..7dc02790 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/adapter/databinders/postmultiplemedia/LMFeedItemMultipleMediaVideoViewDataBinder.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/postmultiplemedia/LMFeedItemMultipleMediaVideoViewDataBinder.kt @@ -1,4 +1,4 @@ -package com.likeminds.feed.android.core.universalfeed.adapter.databinders.postmultiplemedia +package com.likeminds.feed.android.core.socialfeed.adapter.databinders.postmultiplemedia import android.view.LayoutInflater import android.view.ViewGroup @@ -7,7 +7,7 @@ import com.likeminds.feed.android.core.R import com.likeminds.feed.android.core.databinding.LmFeedItemMultipleMediaVideoBinding import com.likeminds.feed.android.core.post.model.LMFeedAttachmentViewData import com.likeminds.feed.android.core.ui.base.styles.LMFeedIconStyle -import com.likeminds.feed.android.core.universalfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener import com.likeminds.feed.android.core.utils.LMFeedStyleTransformer import com.likeminds.feed.android.core.utils.base.LMFeedViewDataBinder import com.likeminds.feed.android.core.utils.base.model.ITEM_MULTIPLE_MEDIA_VIDEO diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/model/LMFeedMediaViewData.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/model/LMFeedMediaViewData.kt similarity index 96% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/model/LMFeedMediaViewData.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/model/LMFeedMediaViewData.kt index ed5b9a71..308cd6b0 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/model/LMFeedMediaViewData.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/model/LMFeedMediaViewData.kt @@ -1,4 +1,4 @@ -package com.likeminds.feed.android.core.universalfeed.model +package com.likeminds.feed.android.core.socialfeed.model import com.likeminds.feed.android.core.post.model.LMFeedAttachmentViewData import com.likeminds.feed.android.core.utils.base.LMFeedBaseViewType diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/model/LMFeedPostContentViewData.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/model/LMFeedPostContentViewData.kt similarity index 93% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/model/LMFeedPostContentViewData.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/model/LMFeedPostContentViewData.kt index a39159e3..cf7e0ad8 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/model/LMFeedPostContentViewData.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/model/LMFeedPostContentViewData.kt @@ -1,4 +1,4 @@ -package com.likeminds.feed.android.core.universalfeed.model +package com.likeminds.feed.android.core.socialfeed.model import com.likeminds.feed.android.core.utils.base.LMFeedBaseViewType import com.likeminds.feed.android.core.utils.base.model.ITEM_POST_CONTENT diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/model/LMFeedPostFooterViewData.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/model/LMFeedPostFooterViewData.kt similarity index 95% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/model/LMFeedPostFooterViewData.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/model/LMFeedPostFooterViewData.kt index e1d4a816..6c92cc7d 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/model/LMFeedPostFooterViewData.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/model/LMFeedPostFooterViewData.kt @@ -1,4 +1,4 @@ -package com.likeminds.feed.android.core.universalfeed.model +package com.likeminds.feed.android.core.socialfeed.model import com.likeminds.feed.android.core.post.detail.model.LMFeedCommentViewData diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/model/LMFeedPostHeaderViewData.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/model/LMFeedPostHeaderViewData.kt similarity index 96% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/model/LMFeedPostHeaderViewData.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/model/LMFeedPostHeaderViewData.kt index 40d5800d..dbe10469 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/model/LMFeedPostHeaderViewData.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/model/LMFeedPostHeaderViewData.kt @@ -1,4 +1,4 @@ -package com.likeminds.feed.android.core.universalfeed.model +package com.likeminds.feed.android.core.socialfeed.model import com.likeminds.feed.android.core.overflowmenu.model.LMFeedOverflowMenuItemViewData import com.likeminds.feed.android.core.utils.user.LMFeedUserViewData diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/model/LMFeedPostViewData.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/model/LMFeedPostViewData.kt similarity index 98% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/model/LMFeedPostViewData.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/model/LMFeedPostViewData.kt index 6cfe7481..14ff07a5 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/model/LMFeedPostViewData.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/model/LMFeedPostViewData.kt @@ -1,4 +1,4 @@ -package com.likeminds.feed.android.core.universalfeed.model +package com.likeminds.feed.android.core.socialfeed.model import com.likeminds.feed.android.core.post.model.* import com.likeminds.feed.android.core.topics.model.LMFeedTopicViewData diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/model/LMFeedSDKClientInfoViewData.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/model/LMFeedSDKClientInfoViewData.kt similarity index 94% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/model/LMFeedSDKClientInfoViewData.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/model/LMFeedSDKClientInfoViewData.kt index ed866690..82181a0b 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/model/LMFeedSDKClientInfoViewData.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/model/LMFeedSDKClientInfoViewData.kt @@ -1,4 +1,4 @@ -package com.likeminds.feed.android.core.universalfeed.model +package com.likeminds.feed.android.core.socialfeed.model import android.os.Parcelable import kotlinx.parcelize.Parcelize diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/style/LMFeedPostingViewStyle.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/style/LMFeedPostingViewStyle.kt similarity index 98% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/style/LMFeedPostingViewStyle.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/style/LMFeedPostingViewStyle.kt index 4469c106..636c1776 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/style/LMFeedPostingViewStyle.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/style/LMFeedPostingViewStyle.kt @@ -1,4 +1,4 @@ -package com.likeminds.feed.android.core.universalfeed.style +package com.likeminds.feed.android.core.socialfeed.style import android.text.TextUtils import androidx.annotation.ColorRes diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/style/LMFeedUniversalFeedFragmentViewStyle.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/style/LMFeedUniversalFeedFragmentViewStyle.kt similarity index 99% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/style/LMFeedUniversalFeedFragmentViewStyle.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/style/LMFeedUniversalFeedFragmentViewStyle.kt index 18a81499..de2ea83b 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/style/LMFeedUniversalFeedFragmentViewStyle.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/style/LMFeedUniversalFeedFragmentViewStyle.kt @@ -1,4 +1,4 @@ -package com.likeminds.feed.android.core.universalfeed.style +package com.likeminds.feed.android.core.socialfeed.style import android.text.TextUtils import com.likeminds.feed.android.core.R diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/style/LMFeedUniversalTopicSelectorBarViewStyle.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/style/LMFeedUniversalTopicSelectorBarViewStyle.kt similarity index 98% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/style/LMFeedUniversalTopicSelectorBarViewStyle.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/style/LMFeedUniversalTopicSelectorBarViewStyle.kt index eb989588..c2e29ac6 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/style/LMFeedUniversalTopicSelectorBarViewStyle.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/style/LMFeedUniversalTopicSelectorBarViewStyle.kt @@ -1,4 +1,4 @@ -package com.likeminds.feed.android.core.universalfeed.style +package com.likeminds.feed.android.core.socialfeed.style import androidx.annotation.ColorRes import androidx.annotation.DimenRes diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/util/LMFeedPostBinderUtils.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/util/LMFeedPostBinderUtils.kt similarity index 98% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/util/LMFeedPostBinderUtils.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/util/LMFeedPostBinderUtils.kt index c6b55ea8..7b2be878 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/util/LMFeedPostBinderUtils.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/util/LMFeedPostBinderUtils.kt @@ -1,4 +1,4 @@ -package com.likeminds.feed.android.core.universalfeed.util +package com.likeminds.feed.android.core.socialfeed.util import android.content.Context import android.text.* @@ -23,8 +23,8 @@ import com.likeminds.feed.android.core.ui.widgets.poll.view.LMFeedPostPollView import com.likeminds.feed.android.core.ui.widgets.post.postfooterview.view.LMFeedPostFooterView import com.likeminds.feed.android.core.ui.widgets.post.postheaderview.view.LMFeedPostHeaderView import com.likeminds.feed.android.core.ui.widgets.post.postmedia.view.* -import com.likeminds.feed.android.core.universalfeed.adapter.LMFeedUniversalFeedAdapterListener -import com.likeminds.feed.android.core.universalfeed.model.* +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.model.* import com.likeminds.feed.android.core.utils.* import com.likeminds.feed.android.core.utils.LMFeedValueUtils.getValidTextForLinkify import com.likeminds.feed.android.core.utils.LMFeedValueUtils.pluralizeOrCapitalize diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/view/LMFeedDocumentListView.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedDocumentListView.kt similarity index 91% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/view/LMFeedDocumentListView.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedDocumentListView.kt index 0ace59b2..21b2f54b 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/view/LMFeedDocumentListView.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedDocumentListView.kt @@ -1,4 +1,4 @@ -package com.likeminds.feed.android.core.universalfeed.view +package com.likeminds.feed.android.core.socialfeed.view import android.content.Context import android.util.AttributeSet @@ -6,9 +6,9 @@ import androidx.core.content.ContextCompat import androidx.recyclerview.widget.* import com.likeminds.feed.android.core.R import com.likeminds.feed.android.core.ui.base.views.LMFeedTextView -import com.likeminds.feed.android.core.universalfeed.adapter.LMFeedDocumentsAdapter -import com.likeminds.feed.android.core.universalfeed.adapter.LMFeedUniversalFeedAdapterListener -import com.likeminds.feed.android.core.universalfeed.model.LMFeedMediaViewData +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedDocumentsAdapter +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.model.LMFeedMediaViewData import com.likeminds.feed.android.core.utils.LMFeedStyleTransformer import com.likeminds.feed.android.core.utils.LMFeedViewUtils.hide import com.likeminds.feed.android.core.utils.LMFeedViewUtils.show diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/view/LMFeedPostingView.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedPostingView.kt similarity index 97% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/view/LMFeedPostingView.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedPostingView.kt index 029da4c3..556aa42f 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/view/LMFeedPostingView.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedPostingView.kt @@ -1,4 +1,4 @@ -package com.likeminds.feed.android.core.universalfeed.view +package com.likeminds.feed.android.core.socialfeed.view import android.content.Context import android.content.res.ColorStateList @@ -10,7 +10,7 @@ import androidx.core.content.ContextCompat import androidx.core.view.isVisible import com.likeminds.feed.android.core.databinding.LmFeedLayoutPostingBinding import com.likeminds.feed.android.core.ui.base.styles.* -import com.likeminds.feed.android.core.universalfeed.style.LMFeedPostingViewStyle +import com.likeminds.feed.android.core.socialfeed.style.LMFeedPostingViewStyle import com.likeminds.feed.android.core.utils.LMFeedImageBindingUtil import com.likeminds.feed.android.core.utils.LMFeedStyleTransformer import com.likeminds.feed.android.core.utils.LMFeedViewUtils.hide diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/view/LMFeedUniversalFeedFragment.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedUniversalFeedFragment.kt similarity index 99% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/view/LMFeedUniversalFeedFragment.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedUniversalFeedFragment.kt index 9a8d5124..0c9da741 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/view/LMFeedUniversalFeedFragment.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedUniversalFeedFragment.kt @@ -1,4 +1,4 @@ -package com.likeminds.feed.android.core.universalfeed.view +package com.likeminds.feed.android.core.socialfeed.view import android.app.Activity import android.content.res.ColorStateList @@ -54,11 +54,11 @@ import com.likeminds.feed.android.core.ui.widgets.noentitylayout.view.LMFeedNoEn import com.likeminds.feed.android.core.ui.widgets.overflowmenu.view.LMFeedOverflowMenu import com.likeminds.feed.android.core.ui.widgets.poll.model.LMFeedAddPollOptionExtras import com.likeminds.feed.android.core.ui.widgets.poll.view.* -import com.likeminds.feed.android.core.universalfeed.adapter.LMFeedUniversalFeedAdapterListener -import com.likeminds.feed.android.core.universalfeed.adapter.LMFeedUniversalSelectedTopicAdapterListener -import com.likeminds.feed.android.core.universalfeed.model.LMFeedPostViewData -import com.likeminds.feed.android.core.universalfeed.util.LMFeedPostBinderUtils -import com.likeminds.feed.android.core.universalfeed.viewmodel.LMFeedUniversalFeedViewModel +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalSelectedTopicAdapterListener +import com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData +import com.likeminds.feed.android.core.socialfeed.util.LMFeedPostBinderUtils +import com.likeminds.feed.android.core.socialfeed.viewmodel.LMFeedUniversalFeedViewModel import com.likeminds.feed.android.core.utils.* import com.likeminds.feed.android.core.utils.LMFeedValueUtils.pluralizeOrCapitalize import com.likeminds.feed.android.core.utils.LMFeedViewUtils.hide diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/view/LMFeedUniversalFeedListView.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedUniversalFeedListView.kt similarity index 93% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/view/LMFeedUniversalFeedListView.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedUniversalFeedListView.kt index f1ae9580..a1ead428 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/view/LMFeedUniversalFeedListView.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedUniversalFeedListView.kt @@ -1,15 +1,13 @@ -package com.likeminds.feed.android.core.universalfeed.view +package com.likeminds.feed.android.core.socialfeed.view import android.content.Context import android.util.AttributeSet -import android.util.Log import androidx.core.content.ContextCompat import androidx.recyclerview.widget.* import com.likeminds.feed.android.core.R -import com.likeminds.feed.android.core.ui.widgets.poll.adapter.LMFeedPollOptionsAdapterListener -import com.likeminds.feed.android.core.universalfeed.adapter.LMFeedUniversalFeedAdapter -import com.likeminds.feed.android.core.universalfeed.adapter.LMFeedUniversalFeedAdapterListener -import com.likeminds.feed.android.core.universalfeed.model.LMFeedPostViewData +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapter +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData import com.likeminds.feed.android.core.utils.LMFeedEndlessRecyclerViewScrollListener import com.likeminds.feed.android.core.utils.LMFeedViewUtils import com.likeminds.feed.android.core.utils.base.LMFeedBaseViewType diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/view/LMFeedUniversalSelectedTopicListView.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedUniversalSelectedTopicListView.kt similarity index 88% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/view/LMFeedUniversalSelectedTopicListView.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedUniversalSelectedTopicListView.kt index 08bf282e..ca2ffb43 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/view/LMFeedUniversalSelectedTopicListView.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedUniversalSelectedTopicListView.kt @@ -1,11 +1,11 @@ -package com.likeminds.feed.android.core.universalfeed.view +package com.likeminds.feed.android.core.socialfeed.view import android.content.Context import android.util.AttributeSet import androidx.recyclerview.widget.* import com.likeminds.feed.android.core.topics.model.LMFeedTopicViewData -import com.likeminds.feed.android.core.universalfeed.adapter.LMFeedUniversalSelectedTopicAdapter -import com.likeminds.feed.android.core.universalfeed.adapter.LMFeedUniversalSelectedTopicAdapterListener +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalSelectedTopicAdapter +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalSelectedTopicAdapterListener import com.likeminds.feed.android.core.utils.base.LMFeedBaseViewType class LMFeedUniversalSelectedTopicListView @JvmOverloads constructor( diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/view/LMFeedUniversalTopicSelectorBarView.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedUniversalTopicSelectorBarView.kt similarity index 95% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/view/LMFeedUniversalTopicSelectorBarView.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedUniversalTopicSelectorBarView.kt index 2c497122..cbc439b9 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/view/LMFeedUniversalTopicSelectorBarView.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedUniversalTopicSelectorBarView.kt @@ -1,4 +1,4 @@ -package com.likeminds.feed.android.core.universalfeed.view +package com.likeminds.feed.android.core.socialfeed.view import android.content.Context import android.util.AttributeSet @@ -10,8 +10,8 @@ import com.likeminds.feed.android.core.databinding.LmFeedUniversalTopicSelectorB import com.likeminds.feed.android.core.topics.model.LMFeedTopicViewData import com.likeminds.feed.android.core.ui.base.styles.LMFeedTextStyle import com.likeminds.feed.android.core.ui.base.styles.setStyle -import com.likeminds.feed.android.core.universalfeed.adapter.LMFeedUniversalSelectedTopicAdapterListener -import com.likeminds.feed.android.core.universalfeed.style.LMFeedUniversalTopicSelectorBarViewStyle +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalSelectedTopicAdapterListener +import com.likeminds.feed.android.core.socialfeed.style.LMFeedUniversalTopicSelectorBarViewStyle import com.likeminds.feed.android.core.utils.base.LMFeedBaseViewType import com.likeminds.feed.android.core.utils.listeners.LMFeedOnClickListener diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/viewmodel/LMFeedUniversalFeedViewModel.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/viewmodel/LMFeedUniversalFeedViewModel.kt similarity index 99% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/viewmodel/LMFeedUniversalFeedViewModel.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/viewmodel/LMFeedUniversalFeedViewModel.kt index c8006248..e1102b6f 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/universalfeed/viewmodel/LMFeedUniversalFeedViewModel.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/viewmodel/LMFeedUniversalFeedViewModel.kt @@ -1,4 +1,4 @@ -package com.likeminds.feed.android.core.universalfeed.viewmodel +package com.likeminds.feed.android.core.socialfeed.viewmodel import android.annotation.SuppressLint import android.content.Context @@ -11,7 +11,7 @@ import com.likeminds.feed.android.core.post.create.util.LMFeedPostAttachmentUplo import com.likeminds.feed.android.core.post.model.IMAGE import com.likeminds.feed.android.core.post.model.VIDEO import com.likeminds.feed.android.core.topics.model.LMFeedTopicViewData -import com.likeminds.feed.android.core.universalfeed.model.LMFeedPostViewData +import com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData import com.likeminds.feed.android.core.utils.LMFeedViewDataConvertor import com.likeminds.feed.android.core.utils.analytics.LMFeedAnalytics import com.likeminds.feed.android.core.utils.base.LMFeedBaseViewType diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/ui/widgets/post/postmedia/view/LMFeedPostDocumentsMediaView.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/ui/widgets/post/postmedia/view/LMFeedPostDocumentsMediaView.kt index 913cb107..5492da4d 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/ui/widgets/post/postmedia/view/LMFeedPostDocumentsMediaView.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/ui/widgets/post/postmedia/view/LMFeedPostDocumentsMediaView.kt @@ -8,8 +8,8 @@ import com.likeminds.feed.android.core.databinding.LmFeedPostDocumentsMediaViewB import com.likeminds.feed.android.core.ui.base.styles.LMFeedTextStyle import com.likeminds.feed.android.core.ui.base.styles.setStyle import com.likeminds.feed.android.core.ui.widgets.post.postmedia.style.LMFeedPostDocumentsMediaViewStyle -import com.likeminds.feed.android.core.universalfeed.adapter.LMFeedUniversalFeedAdapterListener -import com.likeminds.feed.android.core.universalfeed.model.LMFeedMediaViewData +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.model.LMFeedMediaViewData import com.likeminds.feed.android.core.utils.LMFeedViewUtils.show import com.likeminds.feed.android.core.utils.listeners.LMFeedOnClickListener diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/ui/widgets/post/postmedia/view/LMFeedPostMultipleMediaView.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/ui/widgets/post/postmedia/view/LMFeedPostMultipleMediaView.kt index c63b1bf9..e99a65b7 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/ui/widgets/post/postmedia/view/LMFeedPostMultipleMediaView.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/ui/widgets/post/postmedia/view/LMFeedPostMultipleMediaView.kt @@ -8,8 +8,8 @@ import androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback import com.likeminds.feed.android.core.databinding.LmFeedPostMultipleMediaViewBinding import com.likeminds.feed.android.core.post.model.* import com.likeminds.feed.android.core.ui.widgets.post.postmedia.style.LMFeedPostMultipleMediaViewStyle -import com.likeminds.feed.android.core.universalfeed.adapter.LMFeedMultipleMediaPostAdapter -import com.likeminds.feed.android.core.universalfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedMultipleMediaPostAdapter +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener import com.likeminds.feed.android.core.utils.base.model.ITEM_MULTIPLE_MEDIA_IMAGE import com.likeminds.feed.android.core.utils.base.model.ITEM_MULTIPLE_MEDIA_VIDEO diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/utils/LMFeedStyleTransformer.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/utils/LMFeedStyleTransformer.kt index 17c1f25a..d81f09ee 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/utils/LMFeedStyleTransformer.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/utils/LMFeedStyleTransformer.kt @@ -14,7 +14,7 @@ import com.likeminds.feed.android.core.report.style.LMFeedReportFragmentViewStyl import com.likeminds.feed.android.core.topicselection.style.LMFeedTopicSelectionFragmentViewStyle import com.likeminds.feed.android.core.ui.widgets.poll.style.LMFeedAddPollOptionBottomSheetFragmentStyle import com.likeminds.feed.android.core.ui.widgets.poll.style.LMFeedAnonymousPollDialogFragmentStyle -import com.likeminds.feed.android.core.universalfeed.style.LMFeedUniversalFeedFragmentViewStyle +import com.likeminds.feed.android.core.socialfeed.style.LMFeedUniversalFeedFragmentViewStyle object LMFeedStyleTransformer { diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/utils/LMFeedViewDataConvertor.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/utils/LMFeedViewDataConvertor.kt index b86e730e..56b6cd57 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/utils/LMFeedViewDataConvertor.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/utils/LMFeedViewDataConvertor.kt @@ -14,7 +14,7 @@ import com.likeminds.feed.android.core.post.detail.model.LMFeedCommentsCountView import com.likeminds.feed.android.core.post.model.* import com.likeminds.feed.android.core.report.model.LMFeedReportTagViewData import com.likeminds.feed.android.core.topics.model.LMFeedTopicViewData -import com.likeminds.feed.android.core.universalfeed.model.* +import com.likeminds.feed.android.core.socialfeed.model.* import com.likeminds.feed.android.core.utils.LMFeedValueUtils.findBooleanOrDefault import com.likeminds.feed.android.core.utils.LMFeedValueUtils.findIntOrDefault import com.likeminds.feed.android.core.utils.LMFeedValueUtils.findLongOrDefault diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/utils/analytics/LMFeedAnalytics.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/utils/analytics/LMFeedAnalytics.kt index ccb36351..06e90222 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/utils/analytics/LMFeedAnalytics.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/utils/analytics/LMFeedAnalytics.kt @@ -4,7 +4,7 @@ import android.util.Log import com.likeminds.feed.android.core.LMFeedCoreApplication import com.likeminds.feed.android.core.LMFeedCoreApplication.Companion.LOG_TAG import com.likeminds.feed.android.core.post.detail.model.LMFeedCommentViewData -import com.likeminds.feed.android.core.universalfeed.model.LMFeedPostViewData +import com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData import com.likeminds.feed.android.core.utils.LMFeedViewUtils object LMFeedAnalytics { diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/utils/base/PostItemViewDataBinder.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/utils/base/PostItemViewDataBinder.kt index 1dbf48a1..9648b8ad 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/utils/base/PostItemViewDataBinder.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/utils/base/PostItemViewDataBinder.kt @@ -2,7 +2,7 @@ package com.likeminds.feed.android.core.utils.base import android.view.ViewGroup import androidx.databinding.ViewDataBinding -import com.likeminds.feed.android.core.universalfeed.model.LMFeedPostViewData +import com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData import com.likeminds.feed.android.core.utils.base.model.LMFeedViewType abstract class PostItemViewDataBinder : diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/utils/user/LMFeedUserViewData.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/utils/user/LMFeedUserViewData.kt index 4b17857e..c788dbfd 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/utils/user/LMFeedUserViewData.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/utils/user/LMFeedUserViewData.kt @@ -1,7 +1,7 @@ package com.likeminds.feed.android.core.utils.user import android.os.Parcelable -import com.likeminds.feed.android.core.universalfeed.model.LMFeedSDKClientInfoViewData +import com.likeminds.feed.android.core.socialfeed.model.LMFeedSDKClientInfoViewData import com.likeminds.feed.android.core.utils.base.LMFeedBaseViewType import com.likeminds.feed.android.core.utils.base.model.ITEM_USER import kotlinx.parcelize.Parcelize diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/utils/video/LMFeedPostVideoAutoPlayHelper.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/utils/video/LMFeedPostVideoAutoPlayHelper.kt index 51492feb..cea1232b 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/utils/video/LMFeedPostVideoAutoPlayHelper.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/utils/video/LMFeedPostVideoAutoPlayHelper.kt @@ -8,8 +8,8 @@ import androidx.recyclerview.widget.RecyclerView import com.likeminds.feed.android.core.databinding.* import com.likeminds.feed.android.core.post.detail.adapter.LMFeedPostDetailAdapter import com.likeminds.feed.android.core.ui.base.views.LMFeedVideoView -import com.likeminds.feed.android.core.universalfeed.adapter.LMFeedUniversalFeedAdapter -import com.likeminds.feed.android.core.universalfeed.model.LMFeedPostViewData +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapter +import com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData import com.likeminds.feed.android.core.utils.LMFeedViewUtils import com.likeminds.feed.android.core.utils.base.LMFeedDataBoundViewHolder import com.likeminds.feed.android.core.utils.base.model.ITEM_POST_MULTIPLE_MEDIA diff --git a/likeminds-feed-android-core/src/main/res/layout/lm_feed_fragment_universal_feed.xml b/likeminds-feed-android-core/src/main/res/layout/lm_feed_fragment_universal_feed.xml index e4234109..69c5d083 100644 --- a/likeminds-feed-android-core/src/main/res/layout/lm_feed_fragment_universal_feed.xml +++ b/likeminds-feed-android-core/src/main/res/layout/lm_feed_fragment_universal_feed.xml @@ -16,7 +16,7 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> - - - + type="com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData" /> + type="com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData" /> + type="com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData" /> + type="com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData" /> + type="com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData" /> + type="com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData" /> + type="com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData" /> - - Date: Sun, 28 Jul 2024 22:16:57 +0530 Subject: [PATCH 04/51] renamed universal feed fragment and other components --- .../delete/view/LMFeedReasonChooseListView.kt | 2 +- .../create/view/LMFeedCreatePostFragment.kt | 4 +- .../detail/adapter/LMFeedPostDetailAdapter.kt | 18 +- .../detail/view/LMFeedPostDetailFragment.kt | 4 +- .../detail/view/LMFeedPostDetailListView.kt | 8 +- .../style/LMFeedEditPostFragmentViewStyle.kt | 2 +- .../post/edit/view/LMFeedEditPostFragment.kt | 4 +- .../adapter/LMFeedDocumentsPostAdapter.kt | 4 +- .../adapter/LMFeedMultipleMediaPostAdapter.kt | 2 +- ...dAdapter.kt => LMFeedSocialFeedAdapter.kt} | 20 +- ...kt => LMFeedSocialSelectedTopicAdapter.kt} | 6 +- .../LMFeedItemPostDocumentsViewDataBinder.kt | 24 +- .../LMFeedItemPostLinkViewDataBinder.kt | 22 +- ...FeedItemPostMultipleMediaViewDataBinder.kt | 22 +- .../LMFeedItemPostPollViewDataBinder.kt | 38 +-- ...LMFeedItemPostSingleImageViewDataBinder.kt | 22 +- ...LMFeedItemPostSingleVideoViewDataBinder.kt | 22 +- .../LMFeedItemPostTextOnlyViewDataBinder.kt | 20 +- ...edItemSelectedFilterTopicViewDataBinder.kt | 6 +- .../LMFeedItemDocumentViewDataBinder.kt | 4 +- ...eedItemMultipleMediaImageViewDataBinder.kt | 4 +- ...eedItemMultipleMediaVideoViewDataBinder.kt | 4 +- ...t => LMFeedSocialFeedFragmentViewStyle.kt} | 24 +- ... LMFeedSocialTopicSelectorBarViewStyle.kt} | 6 +- .../socialfeed/util/LMFeedPostBinderUtils.kt | 22 +- .../socialfeed/view/LMFeedDocumentListView.kt | 4 +- .../core/socialfeed/view/LMFeedPostingView.kt | 2 +- ...ragment.kt => LMFeedSocialFeedFragment.kt} | 244 +++++++++--------- ...istView.kt => LMFeedSocialFeedListView.kt} | 50 ++-- ...t => LMFeedSocialSelectedTopicListView.kt} | 12 +- ...kt => LMFeedSocialTopicSelectorBarView.kt} | 18 +- ...wModel.kt => LMFeedSocialFeedViewModel.kt} | 18 +- .../style/LMFeedPostLinkMediaViewStyle.kt | 2 +- .../view/LMFeedPostDocumentsMediaView.kt | 4 +- .../view/LMFeedPostMultipleMediaView.kt | 4 +- .../core/utils/LMFeedStyleTransformer.kt | 6 +- .../core/utils/LMFeedViewDataConvertor.kt | 4 +- .../core/utils/analytics/LMFeedAnalytics.kt | 4 +- .../video/LMFeedPostVideoAutoPlayHelper.kt | 6 +- ...d.xml => lm_feed_fragment_social_feed.xml} | 12 +- .../main/res/layout/lm_feed_header_view.xml | 8 +- ... => lm_feed_social_topic_selector_bar.xml} | 2 +- .../src/main/res/values/dimen.xml | 4 +- .../com/likeminds/feedsocial/MainActivity.kt | 4 +- .../CustomLMUniversalFeedAdminFragment.kt | 5 - 45 files changed, 361 insertions(+), 366 deletions(-) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/{LMFeedUniversalFeedAdapter.kt => LMFeedSocialFeedAdapter.kt} (90%) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/{LMFeedUniversalSelectedTopicAdapter.kt => LMFeedSocialSelectedTopicAdapter.kt} (84%) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/style/{LMFeedUniversalFeedFragmentViewStyle.kt => LMFeedSocialFeedFragmentViewStyle.kt} (85%) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/style/{LMFeedUniversalTopicSelectorBarViewStyle.kt => LMFeedSocialTopicSelectorBarViewStyle.kt} (94%) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/{LMFeedUniversalFeedFragment.kt => LMFeedSocialFeedFragment.kt} (88%) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/{LMFeedUniversalFeedListView.kt => LMFeedSocialFeedListView.kt} (75%) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/{LMFeedUniversalSelectedTopicListView.kt => LMFeedSocialSelectedTopicListView.kt} (83%) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/{LMFeedUniversalTopicSelectorBarView.kt => LMFeedSocialTopicSelectorBarView.kt} (87%) rename likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/viewmodel/{LMFeedUniversalFeedViewModel.kt => LMFeedSocialFeedViewModel.kt} (97%) rename likeminds-feed-android-core/src/main/res/layout/{lm_feed_fragment_universal_feed.xml => lm_feed_fragment_social_feed.xml} (94%) rename likeminds-feed-android-core/src/main/res/layout/{lm_feed_universal_topic_selector_bar.xml => lm_feed_social_topic_selector_bar.xml} (97%) delete mode 100644 social-feed/src/main/java/com/likeminds/feedsocial/universalfeed/CustomLMUniversalFeedAdminFragment.kt diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/delete/view/LMFeedReasonChooseListView.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/delete/view/LMFeedReasonChooseListView.kt index fc4e4a1c..1ee6bfa7 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/delete/view/LMFeedReasonChooseListView.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/delete/view/LMFeedReasonChooseListView.kt @@ -32,7 +32,7 @@ class LMFeedReasonChooseListView @JvmOverloads constructor( adapter = reasonChooseAdapter } - //replaces the reasons in the universal feed adapter with the provided [reasons] + //replaces the reasons in the social feed adapter with the provided [reasons] fun replaceReasons(reasons: List) { reasonChooseAdapter.replace(reasons) } diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/create/view/LMFeedCreatePostFragment.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/create/view/LMFeedCreatePostFragment.kt index 34d9fefa..995b1112 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/create/view/LMFeedCreatePostFragment.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/create/view/LMFeedCreatePostFragment.kt @@ -47,7 +47,7 @@ import com.likeminds.feed.android.core.ui.widgets.poll.view.LMFeedPostPollView import com.likeminds.feed.android.core.ui.widgets.post.postheaderview.view.LMFeedPostHeaderView import com.likeminds.feed.android.core.ui.widgets.post.postmedia.style.LMFeedPostImageMediaViewStyle import com.likeminds.feed.android.core.ui.widgets.post.postmedia.view.* -import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedSocialFeedAdapterListener import com.likeminds.feed.android.core.socialfeed.model.LMFeedMediaViewData import com.likeminds.feed.android.core.socialfeed.util.LMFeedPostBinderUtils import com.likeminds.feed.android.core.utils.* @@ -72,7 +72,7 @@ import kotlinx.coroutines.FlowPreview import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.* -open class LMFeedCreatePostFragment : Fragment(), LMFeedUniversalFeedAdapterListener { +open class LMFeedCreatePostFragment : Fragment(), LMFeedSocialFeedAdapterListener { private lateinit var binding: LmFeedFragmentCreatePostBinding private lateinit var lmFeedCreatePostExtras: LMFeedCreatePostExtras diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/detail/adapter/LMFeedPostDetailAdapter.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/detail/adapter/LMFeedPostDetailAdapter.kt index 33b1e580..3c0f7d05 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/detail/adapter/LMFeedPostDetailAdapter.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/detail/adapter/LMFeedPostDetailAdapter.kt @@ -5,7 +5,7 @@ import com.likeminds.feed.android.core.post.detail.adapter.databinders.LMFeedIte import com.likeminds.feed.android.core.post.detail.adapter.databinders.LMFeedItemCommentsCountViewDataBinder import com.likeminds.feed.android.core.post.detail.adapter.databinders.LMFeedItemNoCommentsFoundViewDataBinder import com.likeminds.feed.android.core.post.detail.model.LMFeedCommentViewData -import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedSocialFeedAdapterListener import com.likeminds.feed.android.core.socialfeed.adapter.databinders.* import com.likeminds.feed.android.core.utils.LMFeedValueUtils.getItemInList import com.likeminds.feed.android.core.utils.base.LMFeedBaseRecyclerAdapter @@ -13,7 +13,7 @@ import com.likeminds.feed.android.core.utils.base.LMFeedBaseViewType import com.likeminds.feed.android.core.utils.base.LMFeedViewDataBinder class LMFeedPostDetailAdapter( - private val universalFeedAdapterListener: LMFeedUniversalFeedAdapterListener, + private val socialFeedAdapterListener: LMFeedSocialFeedAdapterListener, private val postDetailAdapterListener: LMFeedPostDetailAdapterListener, private val replyAdapterListener: LMFeedReplyAdapterListener ) : LMFeedBaseRecyclerAdapter() { @@ -33,31 +33,31 @@ class LMFeedPostDetailAdapter( viewDataBinders.add(itemCommentViewDataBinder) val itemPostTextOnlyBinder = - LMFeedItemPostTextOnlyViewDataBinder(universalFeedAdapterListener) + LMFeedItemPostTextOnlyViewDataBinder(socialFeedAdapterListener) viewDataBinders.add(itemPostTextOnlyBinder) val itemPostSingleImageViewDataBinder = - LMFeedItemPostSingleImageViewDataBinder(universalFeedAdapterListener) + LMFeedItemPostSingleImageViewDataBinder(socialFeedAdapterListener) viewDataBinders.add(itemPostSingleImageViewDataBinder) val itemPostSingleVideoViewDataBinder = - LMFeedItemPostSingleVideoViewDataBinder(universalFeedAdapterListener) + LMFeedItemPostSingleVideoViewDataBinder(socialFeedAdapterListener) viewDataBinders.add(itemPostSingleVideoViewDataBinder) val itemPostLinkViewDataBinder = - LMFeedItemPostLinkViewDataBinder(universalFeedAdapterListener) + LMFeedItemPostLinkViewDataBinder(socialFeedAdapterListener) viewDataBinders.add(itemPostLinkViewDataBinder) val lmFeedItemPostDocumentsViewDataBinder = - LMFeedItemPostDocumentsViewDataBinder(universalFeedAdapterListener) + LMFeedItemPostDocumentsViewDataBinder(socialFeedAdapterListener) viewDataBinders.add(lmFeedItemPostDocumentsViewDataBinder) val itemPostMultipleMediaViewDataBinder = - LMFeedItemPostMultipleMediaViewDataBinder(universalFeedAdapterListener) + LMFeedItemPostMultipleMediaViewDataBinder(socialFeedAdapterListener) viewDataBinders.add(itemPostMultipleMediaViewDataBinder) val itemPostPollViewDataBinder = - LMFeedItemPostPollViewDataBinder(universalFeedAdapterListener) + LMFeedItemPostPollViewDataBinder(socialFeedAdapterListener) viewDataBinders.add(itemPostPollViewDataBinder) val itemNoCommentsFoundBinder = LMFeedItemNoCommentsFoundViewDataBinder() diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/detail/view/LMFeedPostDetailFragment.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/detail/view/LMFeedPostDetailFragment.kt index efcf4a78..765a35de 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/detail/view/LMFeedPostDetailFragment.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/detail/view/LMFeedPostDetailFragment.kt @@ -37,7 +37,7 @@ import com.likeminds.feed.android.core.ui.widgets.headerview.view.LMFeedHeaderVi import com.likeminds.feed.android.core.ui.widgets.overflowmenu.view.LMFeedOverflowMenu import com.likeminds.feed.android.core.ui.widgets.poll.model.LMFeedAddPollOptionExtras import com.likeminds.feed.android.core.ui.widgets.poll.view.* -import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedSocialFeedAdapterListener import com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData import com.likeminds.feed.android.core.socialfeed.util.LMFeedPostBinderUtils import com.likeminds.feed.android.core.utils.* @@ -59,7 +59,7 @@ import kotlinx.coroutines.flow.onEach open class LMFeedPostDetailFragment : Fragment(), - LMFeedUniversalFeedAdapterListener, + LMFeedSocialFeedAdapterListener, LMFeedPostDetailAdapterListener, LMFeedReplyAdapterListener, LMFeedAdminDeleteDialogListener, diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/detail/view/LMFeedPostDetailListView.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/detail/view/LMFeedPostDetailListView.kt index 09b6dd58..0c92c5e5 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/detail/view/LMFeedPostDetailListView.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/detail/view/LMFeedPostDetailListView.kt @@ -5,7 +5,7 @@ import android.util.AttributeSet import androidx.recyclerview.widget.* import com.likeminds.feed.android.core.post.detail.adapter.* import com.likeminds.feed.android.core.post.detail.model.LMFeedCommentViewData -import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedSocialFeedAdapterListener import com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData import com.likeminds.feed.android.core.utils.LMFeedEndlessRecyclerViewScrollListener import com.likeminds.feed.android.core.utils.LMFeedViewUtils @@ -64,19 +64,19 @@ class LMFeedPostDetailListView @JvmOverloads constructor( //sets the adapter with the provided listeners to the post detail recycler view fun setAdapter( - universalFeedAdapterListener: LMFeedUniversalFeedAdapterListener, + socialFeedAdapterListener: LMFeedSocialFeedAdapterListener, postDetailAdapterListener: LMFeedPostDetailAdapterListener, replyAdapterListener: LMFeedReplyAdapterListener ) { postDetailAdapter = LMFeedPostDetailAdapter( - universalFeedAdapterListener, + socialFeedAdapterListener, postDetailAdapterListener, replyAdapterListener ) adapter = postDetailAdapter } - //sets the pagination scroll listener to the universal feed recycler view + //sets the pagination scroll listener to the social feed recycler view fun setPaginationScrollListener(scrollListener: LMFeedEndlessRecyclerViewScrollListener) { paginationScrollListener = scrollListener addOnScrollListener(scrollListener) diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/edit/style/LMFeedEditPostFragmentViewStyle.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/edit/style/LMFeedEditPostFragmentViewStyle.kt index 1ff574f5..a7a58c2d 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/edit/style/LMFeedEditPostFragmentViewStyle.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/edit/style/LMFeedEditPostFragmentViewStyle.kt @@ -12,7 +12,7 @@ import com.likeminds.feed.android.core.utils.LMFeedViewStyle import com.likeminds.feed.android.core.utils.model.LMFeedPadding /** - * [LMFeedEditPostFragmentViewStyle] helps you to customize the universal feed fragment [LMFeedEditPostFragment] + * [LMFeedEditPostFragmentViewStyle] helps you to customize the edit post fragment [LMFeedEditPostFragment] * * @property headerViewStyle : [LMFeedHeaderViewStyle] this will help you to customize the header view in the edit post fragment * @property postHeaderViewStyle : [LMFeedPostHeaderViewStyle] this will help you to customize the post header view in the edit post fragment diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/edit/view/LMFeedEditPostFragment.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/edit/view/LMFeedEditPostFragment.kt index 048ffdb7..e77b7431 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/edit/view/LMFeedEditPostFragment.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/post/edit/view/LMFeedEditPostFragment.kt @@ -45,7 +45,7 @@ import com.likeminds.feed.android.core.ui.widgets.headerview.view.LMFeedHeaderVi import com.likeminds.feed.android.core.ui.widgets.poll.view.LMFeedPostPollView import com.likeminds.feed.android.core.ui.widgets.post.postheaderview.view.LMFeedPostHeaderView import com.likeminds.feed.android.core.ui.widgets.post.postmedia.view.* -import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedSocialFeedAdapterListener import com.likeminds.feed.android.core.socialfeed.model.LMFeedMediaViewData import com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData import com.likeminds.feed.android.core.socialfeed.util.LMFeedPostBinderUtils.customizePostTopicsGroup @@ -75,7 +75,7 @@ import kotlinx.coroutines.flow.* open class LMFeedEditPostFragment : Fragment(), - LMFeedUniversalFeedAdapterListener { + LMFeedSocialFeedAdapterListener { private lateinit var binding: LmFeedFragmentEditPostBinding diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/LMFeedDocumentsPostAdapter.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/LMFeedDocumentsPostAdapter.kt index edbde6c5..96f1a03f 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/LMFeedDocumentsPostAdapter.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/LMFeedDocumentsPostAdapter.kt @@ -5,7 +5,7 @@ import com.likeminds.feed.android.core.utils.base.* class LMFeedDocumentsAdapter( private val parentPosition: Int, - private val universalFeedAdapterListener: LMFeedUniversalFeedAdapterListener, + private val socialFeedAdapterListener: LMFeedSocialFeedAdapterListener, private val isMediaRemovable: Boolean = false ) : LMFeedBaseRecyclerAdapter() { @@ -19,7 +19,7 @@ class LMFeedDocumentsAdapter( val documentsBinder = LMFeedItemDocumentViewDataBinder( parentPosition, - universalFeedAdapterListener, + socialFeedAdapterListener, isMediaRemovable ) viewDataBinders.add(documentsBinder) diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/LMFeedMultipleMediaPostAdapter.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/LMFeedMultipleMediaPostAdapter.kt index 5a4de9fb..33b7babd 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/LMFeedMultipleMediaPostAdapter.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/LMFeedMultipleMediaPostAdapter.kt @@ -6,7 +6,7 @@ import com.likeminds.feed.android.core.utils.base.* class LMFeedMultipleMediaPostAdapter( private val parentPosition: Int, - private val listener: LMFeedUniversalFeedAdapterListener, + private val listener: LMFeedSocialFeedAdapterListener, private val isMediaRemovable: Boolean = false ) : LMFeedBaseRecyclerAdapter() { diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/LMFeedUniversalFeedAdapter.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/LMFeedSocialFeedAdapter.kt similarity index 90% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/LMFeedUniversalFeedAdapter.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/LMFeedSocialFeedAdapter.kt index 5a982309..7e55a756 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/LMFeedUniversalFeedAdapter.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/LMFeedSocialFeedAdapter.kt @@ -8,8 +8,8 @@ import com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData import com.likeminds.feed.android.core.utils.LMFeedValueUtils.getItemInList import com.likeminds.feed.android.core.utils.base.* -class LMFeedUniversalFeedAdapter( - private val universalFeedAdapterListener: LMFeedUniversalFeedAdapterListener, +class LMFeedSocialFeedAdapter( + private val socialFeedAdapterListener: LMFeedSocialFeedAdapterListener, ) : LMFeedBaseRecyclerAdapter() { init { @@ -20,31 +20,31 @@ class LMFeedUniversalFeedAdapter( val viewDataBinders = ArrayList>(7) val itemPostTextOnlyBinder = - LMFeedItemPostTextOnlyViewDataBinder(universalFeedAdapterListener) + LMFeedItemPostTextOnlyViewDataBinder(socialFeedAdapterListener) viewDataBinders.add(itemPostTextOnlyBinder) val itemPostSingleImageViewDataBinder = - LMFeedItemPostSingleImageViewDataBinder(universalFeedAdapterListener) + LMFeedItemPostSingleImageViewDataBinder(socialFeedAdapterListener) viewDataBinders.add(itemPostSingleImageViewDataBinder) val itemPostSingleVideoViewDataBinder = - LMFeedItemPostSingleVideoViewDataBinder(universalFeedAdapterListener) + LMFeedItemPostSingleVideoViewDataBinder(socialFeedAdapterListener) viewDataBinders.add(itemPostSingleVideoViewDataBinder) val itemPostLinkViewDataBinder = - LMFeedItemPostLinkViewDataBinder(universalFeedAdapterListener) + LMFeedItemPostLinkViewDataBinder(socialFeedAdapterListener) viewDataBinders.add(itemPostLinkViewDataBinder) val itemPostDocumentsViewDataBinder = - LMFeedItemPostDocumentsViewDataBinder(universalFeedAdapterListener) + LMFeedItemPostDocumentsViewDataBinder(socialFeedAdapterListener) viewDataBinders.add(itemPostDocumentsViewDataBinder) val itemPostMultipleMediaViewDataBinder = - LMFeedItemPostMultipleMediaViewDataBinder(universalFeedAdapterListener) + LMFeedItemPostMultipleMediaViewDataBinder(socialFeedAdapterListener) viewDataBinders.add(itemPostMultipleMediaViewDataBinder) val itemPostPollViewDataBinder = - LMFeedItemPostPollViewDataBinder(universalFeedAdapterListener) + LMFeedItemPostPollViewDataBinder(socialFeedAdapterListener) viewDataBinders.add(itemPostPollViewDataBinder) return viewDataBinders @@ -65,7 +65,7 @@ class LMFeedUniversalFeedAdapter( } } -interface LMFeedUniversalFeedAdapterListener { +interface LMFeedSocialFeedAdapterListener { fun onPostContentClicked(position: Int, postViewData: LMFeedPostViewData) { //triggered when the user clicks on post content diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/LMFeedUniversalSelectedTopicAdapter.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/LMFeedSocialSelectedTopicAdapter.kt similarity index 84% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/LMFeedUniversalSelectedTopicAdapter.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/LMFeedSocialSelectedTopicAdapter.kt index 27f5ee23..4e990e3d 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/LMFeedUniversalSelectedTopicAdapter.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/LMFeedSocialSelectedTopicAdapter.kt @@ -4,8 +4,8 @@ import com.likeminds.feed.android.core.topics.model.LMFeedTopicViewData import com.likeminds.feed.android.core.socialfeed.adapter.databinders.LMFeedItemSelectedFilterTopicViewDataBinder import com.likeminds.feed.android.core.utils.base.* -class LMFeedUniversalSelectedTopicAdapter( - private val listener: LMFeedUniversalSelectedTopicAdapterListener +class LMFeedSocialSelectedTopicAdapter( + private val listener: LMFeedSocialSelectedTopicAdapterListener ) : LMFeedBaseRecyclerAdapter() { init { @@ -23,7 +23,7 @@ class LMFeedUniversalSelectedTopicAdapter( } } -interface LMFeedUniversalSelectedTopicAdapterListener { +interface LMFeedSocialSelectedTopicAdapterListener { fun onTopicRemoved(position: Int, topicViewData: LMFeedTopicViewData) { //triggered when the user removes a selected topic filter } diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostDocumentsViewDataBinder.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostDocumentsViewDataBinder.kt index dc665237..e860cf23 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostDocumentsViewDataBinder.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostDocumentsViewDataBinder.kt @@ -3,7 +3,7 @@ package com.likeminds.feed.android.core.socialfeed.adapter.databinders import android.view.LayoutInflater import android.view.ViewGroup import com.likeminds.feed.android.core.databinding.LmFeedItemPostDocumentsBinding -import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedSocialFeedAdapterListener import com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData import com.likeminds.feed.android.core.socialfeed.util.LMFeedPostBinderUtils import com.likeminds.feed.android.core.utils.LMFeedStyleTransformer @@ -11,7 +11,7 @@ import com.likeminds.feed.android.core.utils.base.LMFeedViewDataBinder import com.likeminds.feed.android.core.utils.base.model.ITEM_POST_DOCUMENTS class LMFeedItemPostDocumentsViewDataBinder( - private val universalFeedAdapterListener: LMFeedUniversalFeedAdapterListener + private val socialFeedAdapterListener: LMFeedSocialFeedAdapterListener ) : LMFeedViewDataBinder() { override val viewType: Int @@ -69,7 +69,7 @@ class LMFeedItemPostDocumentsViewDataBinder( data, position, postTopicsGroup, - universalFeedAdapterListener, + socialFeedAdapterListener, returnBinder = { return@setPostBindData }, executeBinder = { @@ -78,7 +78,7 @@ class LMFeedItemPostDocumentsViewDataBinder( position, postDocumentsMediaView, data.mediaViewData, - universalFeedAdapterListener + socialFeedAdapterListener ) } ) @@ -89,7 +89,7 @@ class LMFeedItemPostDocumentsViewDataBinder( binding.apply { postHeader.setMenuIconClickListener { val post = postViewData ?: return@setMenuIconClickListener - universalFeedAdapterListener.onPostMenuIconClicked( + socialFeedAdapterListener.onPostMenuIconClicked( position, postHeader.headerMenu, post @@ -98,13 +98,13 @@ class LMFeedItemPostDocumentsViewDataBinder( postHeader.setAuthorFrameClickListener { val post = postViewData ?: return@setAuthorFrameClickListener - universalFeedAdapterListener.onPostAuthorHeaderClicked(position, post) + socialFeedAdapterListener.onPostAuthorHeaderClicked(position, post) } postDocumentsMediaView.setShowMoreTextClickListener { val post = postViewData ?: return@setShowMoreTextClickListener val updatedPostData = LMFeedPostBinderUtils.updatePostForDocumentExpanded(post) - universalFeedAdapterListener.onPostMultipleDocumentsExpanded( + socialFeedAdapterListener.onPostMultipleDocumentsExpanded( position, updatedPostData ) @@ -113,13 +113,13 @@ class LMFeedItemPostDocumentsViewDataBinder( postFooter.setLikeIconClickListener { val post = postViewData ?: return@setLikeIconClickListener val updatedPost = LMFeedPostBinderUtils.updatePostForLike(post) - universalFeedAdapterListener.onPostLikeClicked(position, updatedPost) + socialFeedAdapterListener.onPostLikeClicked(position, updatedPost) } postFooter.setLikesCountClickListener { val post = postViewData ?: return@setLikesCountClickListener if (post.footerViewData.likesCount > 0) { - universalFeedAdapterListener.onPostLikesCountClicked(position, post) + socialFeedAdapterListener.onPostLikesCountClicked(position, post) } else { return@setLikesCountClickListener } @@ -127,18 +127,18 @@ class LMFeedItemPostDocumentsViewDataBinder( postFooter.setCommentsCountClickListener { val post = postViewData ?: return@setCommentsCountClickListener - universalFeedAdapterListener.onPostCommentsCountClicked(position, post) + socialFeedAdapterListener.onPostCommentsCountClicked(position, post) } postFooter.setSaveIconListener { val post = postViewData ?: return@setSaveIconListener val updatedPost = LMFeedPostBinderUtils.updatePostForSave(post) - universalFeedAdapterListener.onPostSaveClicked(position, updatedPost) + socialFeedAdapterListener.onPostSaveClicked(position, updatedPost) } postFooter.setShareIconListener { val post = postViewData ?: return@setShareIconListener - universalFeedAdapterListener.onPostShareClicked(position, post) + socialFeedAdapterListener.onPostShareClicked(position, post) } } } diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostLinkViewDataBinder.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostLinkViewDataBinder.kt index 050f96ea..d41ca092 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostLinkViewDataBinder.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostLinkViewDataBinder.kt @@ -3,7 +3,7 @@ package com.likeminds.feed.android.core.socialfeed.adapter.databinders import android.view.LayoutInflater import android.view.ViewGroup import com.likeminds.feed.android.core.databinding.LmFeedItemPostLinkBinding -import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedSocialFeedAdapterListener import com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData import com.likeminds.feed.android.core.socialfeed.util.LMFeedPostBinderUtils import com.likeminds.feed.android.core.utils.LMFeedStyleTransformer @@ -11,7 +11,7 @@ import com.likeminds.feed.android.core.utils.base.LMFeedViewDataBinder import com.likeminds.feed.android.core.utils.base.model.ITEM_POST_LINK class LMFeedItemPostLinkViewDataBinder( - private val universalFeedAdapterListener: LMFeedUniversalFeedAdapterListener + private val socialFeedAdapterListener: LMFeedSocialFeedAdapterListener ) : LMFeedViewDataBinder() { override val viewType: Int @@ -72,7 +72,7 @@ class LMFeedItemPostLinkViewDataBinder( data, position, postTopicsGroup, - universalFeedAdapterListener, + socialFeedAdapterListener, returnBinder = { return@setPostBindData }, executeBinder = { @@ -90,7 +90,7 @@ class LMFeedItemPostLinkViewDataBinder( binding.apply { postHeader.setMenuIconClickListener { val post = postViewData ?: return@setMenuIconClickListener - universalFeedAdapterListener.onPostMenuIconClicked( + socialFeedAdapterListener.onPostMenuIconClicked( position, postHeader.headerMenu, post @@ -99,24 +99,24 @@ class LMFeedItemPostLinkViewDataBinder( postHeader.setAuthorFrameClickListener { val post = postViewData ?: return@setAuthorFrameClickListener - universalFeedAdapterListener.onPostAuthorHeaderClicked(position, post) + socialFeedAdapterListener.onPostAuthorHeaderClicked(position, post) } postLinkView.setLinkClickListener { val post = postViewData ?: return@setLinkClickListener - universalFeedAdapterListener.onPostLinkMediaClicked(position, post) + socialFeedAdapterListener.onPostLinkMediaClicked(position, post) } postFooter.setLikeIconClickListener { val post = postViewData ?: return@setLikeIconClickListener val updatedPost = LMFeedPostBinderUtils.updatePostForLike(post) - universalFeedAdapterListener.onPostLikeClicked(position, updatedPost) + socialFeedAdapterListener.onPostLikeClicked(position, updatedPost) } postFooter.setLikesCountClickListener { val post = postViewData ?: return@setLikesCountClickListener if (post.footerViewData.likesCount > 0) { - universalFeedAdapterListener.onPostLikesCountClicked(position, post) + socialFeedAdapterListener.onPostLikesCountClicked(position, post) } else { return@setLikesCountClickListener } @@ -124,18 +124,18 @@ class LMFeedItemPostLinkViewDataBinder( postFooter.setCommentsCountClickListener { val post = postViewData ?: return@setCommentsCountClickListener - universalFeedAdapterListener.onPostCommentsCountClicked(position, post) + socialFeedAdapterListener.onPostCommentsCountClicked(position, post) } postFooter.setSaveIconListener { val post = postViewData ?: return@setSaveIconListener val updatedPost = LMFeedPostBinderUtils.updatePostForSave(post) - universalFeedAdapterListener.onPostSaveClicked(position, updatedPost) + socialFeedAdapterListener.onPostSaveClicked(position, updatedPost) } postFooter.setShareIconListener { val post = postViewData ?: return@setShareIconListener - universalFeedAdapterListener.onPostShareClicked(position, post) + socialFeedAdapterListener.onPostShareClicked(position, post) } } } diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostMultipleMediaViewDataBinder.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostMultipleMediaViewDataBinder.kt index 927e7473..5a233eea 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostMultipleMediaViewDataBinder.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostMultipleMediaViewDataBinder.kt @@ -3,7 +3,7 @@ package com.likeminds.feed.android.core.socialfeed.adapter.databinders import android.view.LayoutInflater import android.view.ViewGroup import com.likeminds.feed.android.core.databinding.LmFeedItemPostMultipleMediaBinding -import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedSocialFeedAdapterListener import com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData import com.likeminds.feed.android.core.socialfeed.util.LMFeedPostBinderUtils import com.likeminds.feed.android.core.utils.LMFeedStyleTransformer @@ -11,7 +11,7 @@ import com.likeminds.feed.android.core.utils.base.LMFeedViewDataBinder import com.likeminds.feed.android.core.utils.base.model.ITEM_POST_MULTIPLE_MEDIA class LMFeedItemPostMultipleMediaViewDataBinder( - private val universalFeedAdapterListener: LMFeedUniversalFeedAdapterListener + private val socialFeedAdapterListener: LMFeedSocialFeedAdapterListener ) : LMFeedViewDataBinder() { override val viewType: Int @@ -69,7 +69,7 @@ class LMFeedItemPostMultipleMediaViewDataBinder( data, position, postTopicsGroup, - universalFeedAdapterListener, + socialFeedAdapterListener, returnBinder = { return@setPostBindData }, executeBinder = { @@ -77,7 +77,7 @@ class LMFeedItemPostMultipleMediaViewDataBinder( position, multipleMediaView, data.mediaViewData, - universalFeedAdapterListener + socialFeedAdapterListener ) } ) @@ -88,7 +88,7 @@ class LMFeedItemPostMultipleMediaViewDataBinder( binding.apply { postHeader.setMenuIconClickListener { val post = postViewData ?: return@setMenuIconClickListener - universalFeedAdapterListener.onPostMenuIconClicked( + socialFeedAdapterListener.onPostMenuIconClicked( position, postHeader.headerMenu, post @@ -97,19 +97,19 @@ class LMFeedItemPostMultipleMediaViewDataBinder( postHeader.setAuthorFrameClickListener { val post = postViewData ?: return@setAuthorFrameClickListener - universalFeedAdapterListener.onPostAuthorHeaderClicked(position, post) + socialFeedAdapterListener.onPostAuthorHeaderClicked(position, post) } postFooter.setLikeIconClickListener { val post = postViewData ?: return@setLikeIconClickListener val updatedPost = LMFeedPostBinderUtils.updatePostForLike(post) - universalFeedAdapterListener.onPostLikeClicked(position, updatedPost) + socialFeedAdapterListener.onPostLikeClicked(position, updatedPost) } postFooter.setLikesCountClickListener { val post = postViewData ?: return@setLikesCountClickListener if (post.footerViewData.likesCount > 0) { - universalFeedAdapterListener.onPostLikesCountClicked(position, post) + socialFeedAdapterListener.onPostLikesCountClicked(position, post) } else { return@setLikesCountClickListener } @@ -117,18 +117,18 @@ class LMFeedItemPostMultipleMediaViewDataBinder( postFooter.setCommentsCountClickListener { val post = postViewData ?: return@setCommentsCountClickListener - universalFeedAdapterListener.onPostCommentsCountClicked(position, post) + socialFeedAdapterListener.onPostCommentsCountClicked(position, post) } postFooter.setSaveIconListener { val post = postViewData ?: return@setSaveIconListener val updatedPost = LMFeedPostBinderUtils.updatePostForSave(post) - universalFeedAdapterListener.onPostSaveClicked(position, updatedPost) + socialFeedAdapterListener.onPostSaveClicked(position, updatedPost) } postFooter.setShareIconListener { val post = postViewData ?: return@setShareIconListener - universalFeedAdapterListener.onPostShareClicked(position, post) + socialFeedAdapterListener.onPostShareClicked(position, post) } } } diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostPollViewDataBinder.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostPollViewDataBinder.kt index f608f13b..1db637d3 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostPollViewDataBinder.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostPollViewDataBinder.kt @@ -5,7 +5,7 @@ import android.view.ViewGroup import com.likeminds.feed.android.core.databinding.LmFeedItemPostPollBinding import com.likeminds.feed.android.core.poll.result.model.LMFeedPollOptionViewData import com.likeminds.feed.android.core.ui.widgets.poll.adapter.LMFeedPollOptionsAdapterListener -import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedSocialFeedAdapterListener import com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData import com.likeminds.feed.android.core.socialfeed.util.LMFeedPostBinderUtils import com.likeminds.feed.android.core.utils.LMFeedStyleTransformer @@ -13,7 +13,7 @@ import com.likeminds.feed.android.core.utils.base.LMFeedViewDataBinder import com.likeminds.feed.android.core.utils.base.model.ITEM_POST_POLL class LMFeedItemPostPollViewDataBinder( - private val universalFeedAdapterListener: LMFeedUniversalFeedAdapterListener, + private val socialFeedAdapterListener: LMFeedSocialFeedAdapterListener, ) : LMFeedViewDataBinder(), LMFeedPollOptionsAdapterListener { @@ -72,7 +72,7 @@ class LMFeedItemPostPollViewDataBinder( data, position, postTopicsGroup, - universalFeedAdapterListener, + socialFeedAdapterListener, returnBinder = { return@setPostBindData }, executeBinder = { @@ -92,7 +92,7 @@ class LMFeedItemPostPollViewDataBinder( binding.apply { postHeader.setMenuIconClickListener { val post = postViewData ?: return@setMenuIconClickListener - universalFeedAdapterListener.onPostMenuIconClicked( + socialFeedAdapterListener.onPostMenuIconClicked( position, postHeader.headerMenu, post @@ -101,54 +101,54 @@ class LMFeedItemPostPollViewDataBinder( postHeader.setAuthorFrameClickListener { val post = this.postViewData ?: return@setAuthorFrameClickListener - universalFeedAdapterListener.onPostAuthorHeaderClicked(position, post) + socialFeedAdapterListener.onPostAuthorHeaderClicked(position, post) } postPollView.setPollTitleClicked { val post = this.postViewData ?: return@setPollTitleClicked - universalFeedAdapterListener.onPostPollTitleClicked(position, post) + socialFeedAdapterListener.onPostPollTitleClicked(position, post) } postPollView.setEditPollClicked { val post = this.postViewData ?: return@setEditPollClicked - universalFeedAdapterListener.onPostEditPollClicked(position, post) + socialFeedAdapterListener.onPostEditPollClicked(position, post) } postPollView.setClearPollClicked { val post = this.postViewData ?: return@setClearPollClicked - universalFeedAdapterListener.onPostClearPollClicked(position, post) + socialFeedAdapterListener.onPostClearPollClicked(position, post) } postPollView.setAddPollOptionClicked { val post = this.postViewData ?: return@setAddPollOptionClicked - universalFeedAdapterListener.onPostAddPollOptionClicked(position, post) + socialFeedAdapterListener.onPostAddPollOptionClicked(position, post) } postPollView.setSubmitPollVoteClicked { val post = this.postViewData ?: return@setSubmitPollVoteClicked - universalFeedAdapterListener.onPostSubmitPollVoteClicked(position, post) + socialFeedAdapterListener.onPostSubmitPollVoteClicked(position, post) } postPollView.setMemberVotedCountClicked { val post = this.postViewData ?: return@setMemberVotedCountClicked - universalFeedAdapterListener.onPostMemberVotedCountClicked(position, post) + socialFeedAdapterListener.onPostMemberVotedCountClicked(position, post) } postPollView.setEditPollVoteClicked { val post = this.postViewData ?: return@setEditPollVoteClicked - universalFeedAdapterListener.onPostEditPollVoteClicked(position, post) + socialFeedAdapterListener.onPostEditPollVoteClicked(position, post) } postFooter.setLikeIconClickListener { val post = this.postViewData ?: return@setLikeIconClickListener val updatedPost = LMFeedPostBinderUtils.updatePostForLike(post) - universalFeedAdapterListener.onPostLikeClicked(position, updatedPost) + socialFeedAdapterListener.onPostLikeClicked(position, updatedPost) } postFooter.setLikesCountClickListener { val post = this.postViewData ?: return@setLikesCountClickListener if (post.footerViewData.likesCount > 0) { - universalFeedAdapterListener.onPostLikesCountClicked(position, post) + socialFeedAdapterListener.onPostLikesCountClicked(position, post) } else { return@setLikesCountClickListener } @@ -156,18 +156,18 @@ class LMFeedItemPostPollViewDataBinder( postFooter.setCommentsCountClickListener { val post = this.postViewData ?: return@setCommentsCountClickListener - universalFeedAdapterListener.onPostCommentsCountClicked(position, post) + socialFeedAdapterListener.onPostCommentsCountClicked(position, post) } postFooter.setSaveIconListener { val post = this.postViewData ?: return@setSaveIconListener val updatedPost = LMFeedPostBinderUtils.updatePostForSave(post) - universalFeedAdapterListener.onPostSaveClicked(position, updatedPost) + socialFeedAdapterListener.onPostSaveClicked(position, updatedPost) } postFooter.setShareIconListener { val post = this.postViewData ?: return@setShareIconListener - universalFeedAdapterListener.onPostShareClicked(position, post) + socialFeedAdapterListener.onPostShareClicked(position, post) } } } @@ -183,7 +183,7 @@ class LMFeedItemPostPollViewDataBinder( pollOptionViewData ) - universalFeedAdapterListener.onPollOptionClicked( + socialFeedAdapterListener.onPollOptionClicked( pollPosition, pollOptionPosition, pollOptionViewData @@ -201,7 +201,7 @@ class LMFeedItemPostPollViewDataBinder( pollOptionViewData ) - universalFeedAdapterListener.onPollOptionVoteCountClicked( + socialFeedAdapterListener.onPollOptionVoteCountClicked( pollPosition, pollOptionPosition, pollOptionViewData diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostSingleImageViewDataBinder.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostSingleImageViewDataBinder.kt index f2ea036e..8036fa93 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostSingleImageViewDataBinder.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostSingleImageViewDataBinder.kt @@ -3,7 +3,7 @@ package com.likeminds.feed.android.core.socialfeed.adapter.databinders import android.view.LayoutInflater import android.view.ViewGroup import com.likeminds.feed.android.core.databinding.LmFeedItemPostSingleImageBinding -import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedSocialFeedAdapterListener import com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData import com.likeminds.feed.android.core.socialfeed.util.LMFeedPostBinderUtils import com.likeminds.feed.android.core.utils.LMFeedStyleTransformer @@ -11,7 +11,7 @@ import com.likeminds.feed.android.core.utils.base.LMFeedViewDataBinder import com.likeminds.feed.android.core.utils.base.model.ITEM_POST_SINGLE_IMAGE class LMFeedItemPostSingleImageViewDataBinder( - private val universalFeedAdapterListener: LMFeedUniversalFeedAdapterListener + private val socialFeedAdapterListener: LMFeedSocialFeedAdapterListener ) : LMFeedViewDataBinder() { override val viewType: Int @@ -68,7 +68,7 @@ class LMFeedItemPostSingleImageViewDataBinder( data, position, postTopicsGroup, - universalFeedAdapterListener, + socialFeedAdapterListener, returnBinder = { return@setPostBindData }, executeBinder = { @@ -86,7 +86,7 @@ class LMFeedItemPostSingleImageViewDataBinder( binding.apply { postHeader.setMenuIconClickListener { val post = postViewData ?: return@setMenuIconClickListener - universalFeedAdapterListener.onPostMenuIconClicked( + socialFeedAdapterListener.onPostMenuIconClicked( position, postHeader.headerMenu, post @@ -95,24 +95,24 @@ class LMFeedItemPostSingleImageViewDataBinder( postHeader.setAuthorFrameClickListener { val post = postViewData ?: return@setAuthorFrameClickListener - universalFeedAdapterListener.onPostAuthorHeaderClicked(position, post) + socialFeedAdapterListener.onPostAuthorHeaderClicked(position, post) } postImageView.setOnClickListener { val post = postViewData ?: return@setOnClickListener - universalFeedAdapterListener.onPostImageMediaClicked(position, post) + socialFeedAdapterListener.onPostImageMediaClicked(position, post) } postFooter.setLikeIconClickListener { val post = postViewData ?: return@setLikeIconClickListener val updatedPost = LMFeedPostBinderUtils.updatePostForLike(post) - universalFeedAdapterListener.onPostLikeClicked(position, updatedPost) + socialFeedAdapterListener.onPostLikeClicked(position, updatedPost) } postFooter.setLikesCountClickListener { val post = postViewData ?: return@setLikesCountClickListener if (post.footerViewData.likesCount > 0) { - universalFeedAdapterListener.onPostLikesCountClicked(position, post) + socialFeedAdapterListener.onPostLikesCountClicked(position, post) } else { return@setLikesCountClickListener } @@ -120,18 +120,18 @@ class LMFeedItemPostSingleImageViewDataBinder( postFooter.setCommentsCountClickListener { val post = postViewData ?: return@setCommentsCountClickListener - universalFeedAdapterListener.onPostCommentsCountClicked(position, post) + socialFeedAdapterListener.onPostCommentsCountClicked(position, post) } postFooter.setSaveIconListener { val post = postViewData ?: return@setSaveIconListener val updatedPost = LMFeedPostBinderUtils.updatePostForSave(post) - universalFeedAdapterListener.onPostSaveClicked(position, updatedPost) + socialFeedAdapterListener.onPostSaveClicked(position, updatedPost) } postFooter.setShareIconListener { val post = postViewData ?: return@setShareIconListener - universalFeedAdapterListener.onPostShareClicked(position, post) + socialFeedAdapterListener.onPostShareClicked(position, post) } } } diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostSingleVideoViewDataBinder.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostSingleVideoViewDataBinder.kt index faf69799..c434e536 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostSingleVideoViewDataBinder.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostSingleVideoViewDataBinder.kt @@ -3,7 +3,7 @@ package com.likeminds.feed.android.core.socialfeed.adapter.databinders import android.view.LayoutInflater import android.view.ViewGroup import com.likeminds.feed.android.core.databinding.LmFeedItemPostSingleVideoBinding -import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedSocialFeedAdapterListener import com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData import com.likeminds.feed.android.core.socialfeed.util.LMFeedPostBinderUtils import com.likeminds.feed.android.core.utils.LMFeedStyleTransformer @@ -11,7 +11,7 @@ import com.likeminds.feed.android.core.utils.base.LMFeedViewDataBinder import com.likeminds.feed.android.core.utils.base.model.ITEM_POST_SINGLE_VIDEO class LMFeedItemPostSingleVideoViewDataBinder( - private val universalFeedAdapterListener: LMFeedUniversalFeedAdapterListener + private val socialFeedAdapterListener: LMFeedSocialFeedAdapterListener ) : LMFeedViewDataBinder() { override val viewType: Int @@ -69,7 +69,7 @@ class LMFeedItemPostSingleVideoViewDataBinder( data, position, postTopicsGroup, - universalFeedAdapterListener, + socialFeedAdapterListener, returnBinder = { return@setPostBindData }, executeBinder = {} @@ -81,7 +81,7 @@ class LMFeedItemPostSingleVideoViewDataBinder( binding.apply { postHeader.setMenuIconClickListener { val post = postViewData ?: return@setMenuIconClickListener - universalFeedAdapterListener.onPostMenuIconClicked( + socialFeedAdapterListener.onPostMenuIconClicked( position, postHeader.headerMenu, post @@ -90,24 +90,24 @@ class LMFeedItemPostSingleVideoViewDataBinder( postHeader.setAuthorFrameClickListener { val post = postViewData ?: return@setAuthorFrameClickListener - universalFeedAdapterListener.onPostAuthorHeaderClicked(position, post) + socialFeedAdapterListener.onPostAuthorHeaderClicked(position, post) } postVideoView.setOnClickListener { val post = postViewData ?: return@setOnClickListener - universalFeedAdapterListener.onPostVideoMediaClicked(position, post) + socialFeedAdapterListener.onPostVideoMediaClicked(position, post) } postFooter.setLikeIconClickListener { val post = postViewData ?: return@setLikeIconClickListener val updatedPost = LMFeedPostBinderUtils.updatePostForLike(post) - universalFeedAdapterListener.onPostLikeClicked(position, updatedPost) + socialFeedAdapterListener.onPostLikeClicked(position, updatedPost) } postFooter.setLikesCountClickListener { val post = postViewData ?: return@setLikesCountClickListener if (post.footerViewData.likesCount > 0) { - universalFeedAdapterListener.onPostLikesCountClicked(position, post) + socialFeedAdapterListener.onPostLikesCountClicked(position, post) } else { return@setLikesCountClickListener } @@ -115,18 +115,18 @@ class LMFeedItemPostSingleVideoViewDataBinder( postFooter.setCommentsCountClickListener { val post = postViewData ?: return@setCommentsCountClickListener - universalFeedAdapterListener.onPostCommentsCountClicked(position, post) + socialFeedAdapterListener.onPostCommentsCountClicked(position, post) } postFooter.setSaveIconListener { val post = postViewData ?: return@setSaveIconListener val updatedPost = LMFeedPostBinderUtils.updatePostForSave(post) - universalFeedAdapterListener.onPostSaveClicked(position, updatedPost) + socialFeedAdapterListener.onPostSaveClicked(position, updatedPost) } postFooter.setShareIconListener { val post = postViewData ?: return@setShareIconListener - universalFeedAdapterListener.onPostShareClicked(position, post) + socialFeedAdapterListener.onPostShareClicked(position, post) } } } diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostTextOnlyViewDataBinder.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostTextOnlyViewDataBinder.kt index 139b8d29..46c99d03 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostTextOnlyViewDataBinder.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemPostTextOnlyViewDataBinder.kt @@ -3,14 +3,14 @@ package com.likeminds.feed.android.core.socialfeed.adapter.databinders import android.view.LayoutInflater import android.view.ViewGroup import com.likeminds.feed.android.core.databinding.LmFeedItemPostTextOnlyBinding -import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedSocialFeedAdapterListener import com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData import com.likeminds.feed.android.core.socialfeed.util.LMFeedPostBinderUtils import com.likeminds.feed.android.core.utils.base.LMFeedViewDataBinder import com.likeminds.feed.android.core.utils.base.model.ITEM_POST_TEXT_ONLY class LMFeedItemPostTextOnlyViewDataBinder( - private val universalFeedAdapterListener: LMFeedUniversalFeedAdapterListener + private val socialFeedAdapterListener: LMFeedSocialFeedAdapterListener ) : LMFeedViewDataBinder() { override val viewType: Int @@ -60,7 +60,7 @@ class LMFeedItemPostTextOnlyViewDataBinder( data, position, postTopicsGroup, - universalFeedAdapterListener, + socialFeedAdapterListener, returnBinder = { return@setPostBindData }, executeBinder = {} @@ -72,7 +72,7 @@ class LMFeedItemPostTextOnlyViewDataBinder( binding.apply { postHeader.setMenuIconClickListener { val post = postViewData ?: return@setMenuIconClickListener - universalFeedAdapterListener.onPostMenuIconClicked( + socialFeedAdapterListener.onPostMenuIconClicked( position, postHeader.headerMenu, post @@ -81,19 +81,19 @@ class LMFeedItemPostTextOnlyViewDataBinder( postHeader.setAuthorFrameClickListener { val post = this.postViewData ?: return@setAuthorFrameClickListener - universalFeedAdapterListener.onPostAuthorHeaderClicked(position, post) + socialFeedAdapterListener.onPostAuthorHeaderClicked(position, post) } postFooter.setLikeIconClickListener { val post = this.postViewData ?: return@setLikeIconClickListener val updatedPost = LMFeedPostBinderUtils.updatePostForLike(post) - universalFeedAdapterListener.onPostLikeClicked(position, updatedPost) + socialFeedAdapterListener.onPostLikeClicked(position, updatedPost) } postFooter.setLikesCountClickListener { val post = this.postViewData ?: return@setLikesCountClickListener if (post.footerViewData.likesCount > 0) { - universalFeedAdapterListener.onPostLikesCountClicked(position, post) + socialFeedAdapterListener.onPostLikesCountClicked(position, post) } else { return@setLikesCountClickListener } @@ -101,18 +101,18 @@ class LMFeedItemPostTextOnlyViewDataBinder( postFooter.setCommentsCountClickListener { val post = this.postViewData ?: return@setCommentsCountClickListener - universalFeedAdapterListener.onPostCommentsCountClicked(position, post) + socialFeedAdapterListener.onPostCommentsCountClicked(position, post) } postFooter.setSaveIconListener { val post = this.postViewData ?: return@setSaveIconListener val updatedPost = LMFeedPostBinderUtils.updatePostForSave(post) - universalFeedAdapterListener.onPostSaveClicked(position, updatedPost) + socialFeedAdapterListener.onPostSaveClicked(position, updatedPost) } postFooter.setShareIconListener { val post = this.postViewData ?: return@setShareIconListener - universalFeedAdapterListener.onPostShareClicked(position, post) + socialFeedAdapterListener.onPostShareClicked(position, post) } } } diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemSelectedFilterTopicViewDataBinder.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemSelectedFilterTopicViewDataBinder.kt index e94c8628..eca07e81 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemSelectedFilterTopicViewDataBinder.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/LMFeedItemSelectedFilterTopicViewDataBinder.kt @@ -5,13 +5,13 @@ import android.view.ViewGroup import com.likeminds.feed.android.core.databinding.LmFeedItemSelectedFilterTopicBinding import com.likeminds.feed.android.core.topics.model.LMFeedTopicViewData import com.likeminds.feed.android.core.ui.base.styles.setStyle -import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalSelectedTopicAdapterListener +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedSocialSelectedTopicAdapterListener import com.likeminds.feed.android.core.utils.LMFeedStyleTransformer import com.likeminds.feed.android.core.utils.base.LMFeedViewDataBinder import com.likeminds.feed.android.core.utils.base.model.ITEM_TOPIC class LMFeedItemSelectedFilterTopicViewDataBinder( - private val listener: LMFeedUniversalSelectedTopicAdapterListener + private val listener: LMFeedSocialSelectedTopicAdapterListener ) : LMFeedViewDataBinder() { override val viewType: Int @@ -29,7 +29,7 @@ class LMFeedItemSelectedFilterTopicViewDataBinder( //set styles val topicSelectorBarStyle = - LMFeedStyleTransformer.universalFeedFragmentViewStyle.topicSelectorBarStyle + LMFeedStyleTransformer.socialFeedFragmentViewStyle.topicSelectorBarStyle tvTopicName.setStyle(topicSelectorBarStyle.selectedTopicTextStyle) ivCross.setStyle(topicSelectorBarStyle.removeSelectedTopicIconStyle) diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/postdocuments/LMFeedItemDocumentViewDataBinder.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/postdocuments/LMFeedItemDocumentViewDataBinder.kt index 8f31961a..0d7dc4a3 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/postdocuments/LMFeedItemDocumentViewDataBinder.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/postdocuments/LMFeedItemDocumentViewDataBinder.kt @@ -7,7 +7,7 @@ import com.likeminds.feed.android.core.R import com.likeminds.feed.android.core.databinding.LmFeedItemDocumentBinding import com.likeminds.feed.android.core.post.model.LMFeedAttachmentViewData import com.likeminds.feed.android.core.ui.base.styles.LMFeedIconStyle -import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedSocialFeedAdapterListener import com.likeminds.feed.android.core.socialfeed.util.LMFeedPostBinderUtils import com.likeminds.feed.android.core.utils.LMFeedStyleTransformer import com.likeminds.feed.android.core.utils.base.LMFeedViewDataBinder @@ -15,7 +15,7 @@ import com.likeminds.feed.android.core.utils.base.model.ITEM_POST_DOCUMENTS_ITEM class LMFeedItemDocumentViewDataBinder( private val parentPosition: Int, - private val listener: LMFeedUniversalFeedAdapterListener, + private val listener: LMFeedSocialFeedAdapterListener, private val isMediaRemovable: Boolean ) : LMFeedViewDataBinder() { diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/postmultiplemedia/LMFeedItemMultipleMediaImageViewDataBinder.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/postmultiplemedia/LMFeedItemMultipleMediaImageViewDataBinder.kt index 10e4358a..55e98272 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/postmultiplemedia/LMFeedItemMultipleMediaImageViewDataBinder.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/postmultiplemedia/LMFeedItemMultipleMediaImageViewDataBinder.kt @@ -7,7 +7,7 @@ import com.likeminds.feed.android.core.R import com.likeminds.feed.android.core.databinding.LmFeedItemMultipleMediaImageBinding import com.likeminds.feed.android.core.post.model.LMFeedAttachmentViewData import com.likeminds.feed.android.core.ui.base.styles.LMFeedIconStyle -import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedSocialFeedAdapterListener import com.likeminds.feed.android.core.socialfeed.util.LMFeedPostBinderUtils import com.likeminds.feed.android.core.utils.LMFeedStyleTransformer import com.likeminds.feed.android.core.utils.base.LMFeedViewDataBinder @@ -15,7 +15,7 @@ import com.likeminds.feed.android.core.utils.base.model.ITEM_MULTIPLE_MEDIA_IMAG class LMFeedItemMultipleMediaImageViewDataBinder( private val parentPosition: Int, - private val listener: LMFeedUniversalFeedAdapterListener, + private val listener: LMFeedSocialFeedAdapterListener, private val isMediaRemovable: Boolean ) : LMFeedViewDataBinder() { diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/postmultiplemedia/LMFeedItemMultipleMediaVideoViewDataBinder.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/postmultiplemedia/LMFeedItemMultipleMediaVideoViewDataBinder.kt index 7dc02790..e26f7c1e 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/postmultiplemedia/LMFeedItemMultipleMediaVideoViewDataBinder.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/adapter/databinders/postmultiplemedia/LMFeedItemMultipleMediaVideoViewDataBinder.kt @@ -7,14 +7,14 @@ import com.likeminds.feed.android.core.R import com.likeminds.feed.android.core.databinding.LmFeedItemMultipleMediaVideoBinding import com.likeminds.feed.android.core.post.model.LMFeedAttachmentViewData import com.likeminds.feed.android.core.ui.base.styles.LMFeedIconStyle -import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedSocialFeedAdapterListener import com.likeminds.feed.android.core.utils.LMFeedStyleTransformer import com.likeminds.feed.android.core.utils.base.LMFeedViewDataBinder import com.likeminds.feed.android.core.utils.base.model.ITEM_MULTIPLE_MEDIA_VIDEO class LMFeedItemMultipleMediaVideoViewDataBinder( private val parentPosition: Int, - private val listener: LMFeedUniversalFeedAdapterListener, + private val listener: LMFeedSocialFeedAdapterListener, private val isMediaRemovable: Boolean ) : LMFeedViewDataBinder() { diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/style/LMFeedUniversalFeedFragmentViewStyle.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/style/LMFeedSocialFeedFragmentViewStyle.kt similarity index 85% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/style/LMFeedUniversalFeedFragmentViewStyle.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/style/LMFeedSocialFeedFragmentViewStyle.kt index de2ea83b..20ff3897 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/style/LMFeedUniversalFeedFragmentViewStyle.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/style/LMFeedSocialFeedFragmentViewStyle.kt @@ -10,15 +10,15 @@ import com.likeminds.feed.android.core.utils.LMFeedViewStyle import com.likeminds.feed.android.core.utils.model.LMFeedPadding /** - * [LMFeedUniversalFeedFragmentViewStyle] helps you to customize the universal feed fragment [LMFeedUniversalFeedFragment] + * [LMFeedSocialFeedFragmentViewStyle] helps you to customize the social feed fragment [LMFeedSocialFeedFragment] * - * @property headerViewStyle : [LMFeedHeaderViewStyle] this will help you to customize the header view in the universal feed fragment - * @property createNewPostButtonViewStyle : [LMFeedFABStyle] this will help you to customize the create new post fab in the universal feed fragment - * @property noPostLayoutViewStyle: [LMFeedNoEntityLayoutViewStyle] this will help you to customize the no post layout in the universal feed fragment - * @property postingViewStyle: [LMFeedPostingViewStyle] this will help you to customize the posting progress view in the universal feed fragment - * @property topicSelectorBarStyle: [LMFeedUniversalTopicSelectorBarViewStyle] this will help you to customize the topic selector bar in the universal feed fragment + * @property headerViewStyle : [LMFeedHeaderViewStyle] this will help you to customize the header view in the social feed fragment + * @property createNewPostButtonViewStyle : [LMFeedFABStyle] this will help you to customize the create new post fab in the social feed fragment + * @property noPostLayoutViewStyle: [LMFeedNoEntityLayoutViewStyle] this will help you to customize the no post layout in the social feed fragment + * @property postingViewStyle: [LMFeedPostingViewStyle] this will help you to customize the posting progress view in the social feed fragment + * @property topicSelectorBarStyle: [LMFeedSocialTopicSelectorBarViewStyle] this will help you to customize the topic selector bar in the social feed fragment * */ -class LMFeedUniversalFeedFragmentViewStyle private constructor( +class LMFeedSocialFeedFragmentViewStyle private constructor( //header val headerViewStyle: LMFeedHeaderViewStyle, //create post button @@ -28,7 +28,7 @@ class LMFeedUniversalFeedFragmentViewStyle private constructor( //posting view val postingViewStyle: LMFeedPostingViewStyle, //topic selector bar view - val topicSelectorBarStyle: LMFeedUniversalTopicSelectorBarViewStyle + val topicSelectorBarStyle: LMFeedSocialTopicSelectorBarViewStyle ) : LMFeedViewStyle { class Builder { @@ -120,8 +120,8 @@ class LMFeedUniversalFeedFragmentViewStyle private constructor( private var postingViewStyle: LMFeedPostingViewStyle = LMFeedPostingViewStyle.Builder() .build() - private var topicSelectorBarStyle: LMFeedUniversalTopicSelectorBarViewStyle = - LMFeedUniversalTopicSelectorBarViewStyle.Builder() + private var topicSelectorBarStyle: LMFeedSocialTopicSelectorBarViewStyle = + LMFeedSocialTopicSelectorBarViewStyle.Builder() .backgroundColor(R.color.lm_feed_white) .build() @@ -141,12 +141,12 @@ class LMFeedUniversalFeedFragmentViewStyle private constructor( this.postingViewStyle = postingViewStyle } - fun topicSelectorBarStyle(topicSelectorBarStyle: LMFeedUniversalTopicSelectorBarViewStyle) = + fun topicSelectorBarStyle(topicSelectorBarStyle: LMFeedSocialTopicSelectorBarViewStyle) = apply { this.topicSelectorBarStyle = topicSelectorBarStyle } - fun build() = LMFeedUniversalFeedFragmentViewStyle( + fun build() = LMFeedSocialFeedFragmentViewStyle( headerViewStyle, createNewPostButtonViewStyle, noPostLayoutViewStyle, diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/style/LMFeedUniversalTopicSelectorBarViewStyle.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/style/LMFeedSocialTopicSelectorBarViewStyle.kt similarity index 94% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/style/LMFeedUniversalTopicSelectorBarViewStyle.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/style/LMFeedSocialTopicSelectorBarViewStyle.kt index c2e29ac6..afd27e7a 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/style/LMFeedUniversalTopicSelectorBarViewStyle.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/style/LMFeedSocialTopicSelectorBarViewStyle.kt @@ -8,7 +8,7 @@ import com.likeminds.feed.android.core.ui.theme.LMFeedTheme import com.likeminds.feed.android.core.utils.LMFeedViewStyle /** - * [LMFeedUniversalTopicSelectorBarViewStyle] helps you to customize the likes fragment [LMFeedUniversalTopicSelectorBarView] + * [LMFeedSocialTopicSelectorBarViewStyle] helps you to customize the likes fragment [LMFeedSocialTopicSelectorBarView] * * @property allTopicsSelectorStyle : [LMFeedTextStyle] this will help you to customize the all topics selector text of the topic selector bar * @property clearTopicFilterStyle : [LMFeedTextStyle] this will help you to customize the clear topic filter text of the topic selector bar @@ -17,7 +17,7 @@ import com.likeminds.feed.android.core.utils.LMFeedViewStyle * @property backgroundColor: [Int] should be in format of [ColorRes] this will help you to customize the background color of the topic selector bar | Default value = [null] * @property elevation: [Int] should be in format of [DimenRes] to add custom elevation of the topic selector bar | Default value = [null] * */ -class LMFeedUniversalTopicSelectorBarViewStyle private constructor( +class LMFeedSocialTopicSelectorBarViewStyle private constructor( //all topics selector style val allTopicsSelectorStyle: LMFeedTextStyle, //clear topic filter view style @@ -83,7 +83,7 @@ class LMFeedUniversalTopicSelectorBarViewStyle private constructor( this.elevation = elevation } - fun build() = LMFeedUniversalTopicSelectorBarViewStyle( + fun build() = LMFeedSocialTopicSelectorBarViewStyle( allTopicsSelectorStyle, clearTopicFilterStyle, selectedTopicTextStyle, diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/util/LMFeedPostBinderUtils.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/util/LMFeedPostBinderUtils.kt index 7b2be878..edbd242d 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/util/LMFeedPostBinderUtils.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/util/LMFeedPostBinderUtils.kt @@ -23,7 +23,7 @@ import com.likeminds.feed.android.core.ui.widgets.poll.view.LMFeedPostPollView import com.likeminds.feed.android.core.ui.widgets.post.postfooterview.view.LMFeedPostFooterView import com.likeminds.feed.android.core.ui.widgets.post.postheaderview.view.LMFeedPostHeaderView import com.likeminds.feed.android.core.ui.widgets.post.postmedia.view.* -import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedSocialFeedAdapterListener import com.likeminds.feed.android.core.socialfeed.model.* import com.likeminds.feed.android.core.utils.* import com.likeminds.feed.android.core.utils.LMFeedValueUtils.getValidTextForLinkify @@ -81,13 +81,13 @@ object LMFeedPostBinderUtils { data: LMFeedPostViewData, position: Int, topicsView: LMFeedChipGroup, - universalFeedAdapterListener: LMFeedUniversalFeedAdapterListener, + socialFeedAdapterListener: LMFeedSocialFeedAdapterListener, returnBinder: () -> Unit, executeBinder: () -> Unit ) { if (data.fromPostLiked || data.fromPostSaved || data.fromVideoAction) { // update fromLiked/fromSaved variables and return from binder - universalFeedAdapterListener.updateFromLikedSaved(position, data) + socialFeedAdapterListener.updateFromLikedSaved(position, data) returnBinder() } else { // call all the common functions @@ -102,7 +102,7 @@ object LMFeedPostBinderUtils { setPostContentViewData( contentView, data, - universalFeedAdapterListener, + socialFeedAdapterListener, position ) @@ -138,7 +138,7 @@ object LMFeedPostBinderUtils { private fun setPostContentViewData( contentView: LMFeedTextView, postViewData: LMFeedPostViewData, - universalFeedAdapterListener: LMFeedUniversalFeedAdapterListener, + socialFeedAdapterListener: LMFeedSocialFeedAdapterListener, position: Int, ) { contentView.apply { @@ -177,7 +177,7 @@ object LMFeedPostBinderUtils { } alreadySeenFullContent = true val updatedPost = updatePostForSeeFullContent(postViewData) - universalFeedAdapterListener.onPostContentSeeMoreClicked(position, updatedPost) + socialFeedAdapterListener.onPostContentSeeMoreClicked(position, updatedPost) } override fun updateDrawState(textPaint: TextPaint) { @@ -188,7 +188,7 @@ object LMFeedPostBinderUtils { // post is used here to get lines count in the text view post { setOnClickListener { - universalFeedAdapterListener.onPostContentClicked(position, postViewData) + socialFeedAdapterListener.onPostContentClicked(position, postViewData) } UserTaggingDecoder.decodeRegexIntoSpannableText( @@ -207,7 +207,7 @@ object LMFeedPostBinderUtils { ?: route.lastPathSegment ?: return@decodeRegexIntoSpannableText - universalFeedAdapterListener.onPostTaggedMemberClicked(position, uuid) + socialFeedAdapterListener.onPostTaggedMemberClicked(position, uuid) } val shortText: String? = LMFeedSeeMoreUtil.getShortContent( @@ -248,7 +248,7 @@ object LMFeedPostBinderUtils { return@setOnClickListener } - universalFeedAdapterListener.onPostContentLinkClicked(url) + socialFeedAdapterListener.onPostContentLinkClicked(url) true } } @@ -479,7 +479,7 @@ object LMFeedPostBinderUtils { position: Int, postDocumentsMediaView: LMFeedPostDocumentsMediaView, mediaData: LMFeedMediaViewData, - listener: LMFeedUniversalFeedAdapterListener + listener: LMFeedSocialFeedAdapterListener ) { //sets documents adapter and handles show more functionality of documents postDocumentsMediaView.setAdapter( @@ -523,7 +523,7 @@ object LMFeedPostBinderUtils { position: Int, multipleMediaView: LMFeedPostMultipleMediaView, data: LMFeedMediaViewData, - listener: LMFeedUniversalFeedAdapterListener + listener: LMFeedSocialFeedAdapterListener ) { multipleMediaView.apply { //sets multiple media view pager diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedDocumentListView.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedDocumentListView.kt index 21b2f54b..87fa3e7a 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedDocumentListView.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedDocumentListView.kt @@ -7,7 +7,7 @@ import androidx.recyclerview.widget.* import com.likeminds.feed.android.core.R import com.likeminds.feed.android.core.ui.base.views.LMFeedTextView import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedDocumentsAdapter -import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedSocialFeedAdapterListener import com.likeminds.feed.android.core.socialfeed.model.LMFeedMediaViewData import com.likeminds.feed.android.core.utils.LMFeedStyleTransformer import com.likeminds.feed.android.core.utils.LMFeedViewUtils.hide @@ -50,7 +50,7 @@ class LMFeedDocumentListView @JvmOverloads constructor( parentPosition: Int, mediaViewData: LMFeedMediaViewData, tvShowMore: LMFeedTextView, - listener: LMFeedUniversalFeedAdapterListener, + listener: LMFeedSocialFeedAdapterListener, isMediaRemovable: Boolean ) { documentsAdapter = LMFeedDocumentsAdapter(parentPosition, listener, isMediaRemovable) diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedPostingView.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedPostingView.kt index 556aa42f..987ed888 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedPostingView.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedPostingView.kt @@ -113,7 +113,7 @@ class LMFeedPostingView : ConstraintLayout { if (uri != null) { show() val thumbnailStyle = - LMFeedStyleTransformer.universalFeedFragmentViewStyle.postingViewStyle.attachmentThumbnailImageStyle + LMFeedStyleTransformer.socialFeedFragmentViewStyle.postingViewStyle.attachmentThumbnailImageStyle LMFeedImageBindingUtil.loadImage( view = this, file = uri, diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedUniversalFeedFragment.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedSocialFeedFragment.kt similarity index 88% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedUniversalFeedFragment.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedSocialFeedFragment.kt index 0c9da741..196b9bc0 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedUniversalFeedFragment.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedSocialFeedFragment.kt @@ -17,7 +17,7 @@ import androidx.work.WorkManager import com.likeminds.feed.android.core.LMFeedCoreApplication import com.likeminds.feed.android.core.R import com.likeminds.feed.android.core.activityfeed.view.LMFeedActivityFeedActivity -import com.likeminds.feed.android.core.databinding.LmFeedFragmentUniversalFeedBinding +import com.likeminds.feed.android.core.databinding.LmFeedFragmentSocialFeedBinding import com.likeminds.feed.android.core.delete.model.DELETE_TYPE_POST import com.likeminds.feed.android.core.delete.model.LMFeedDeleteExtras import com.likeminds.feed.android.core.delete.view.* @@ -54,11 +54,11 @@ import com.likeminds.feed.android.core.ui.widgets.noentitylayout.view.LMFeedNoEn import com.likeminds.feed.android.core.ui.widgets.overflowmenu.view.LMFeedOverflowMenu import com.likeminds.feed.android.core.ui.widgets.poll.model.LMFeedAddPollOptionExtras import com.likeminds.feed.android.core.ui.widgets.poll.view.* -import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener -import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalSelectedTopicAdapterListener +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedSocialFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedSocialSelectedTopicAdapterListener import com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData import com.likeminds.feed.android.core.socialfeed.util.LMFeedPostBinderUtils -import com.likeminds.feed.android.core.socialfeed.viewmodel.LMFeedUniversalFeedViewModel +import com.likeminds.feed.android.core.socialfeed.viewmodel.LMFeedSocialFeedViewModel import com.likeminds.feed.android.core.utils.* import com.likeminds.feed.android.core.utils.LMFeedValueUtils.pluralizeOrCapitalize import com.likeminds.feed.android.core.utils.LMFeedViewUtils.hide @@ -73,19 +73,19 @@ import com.likeminds.likemindsfeed.post.model.PollMultiSelectState import kotlinx.coroutines.flow.onEach import java.util.UUID -open class LMFeedUniversalFeedFragment : +open class LMFeedSocialFeedFragment : Fragment(), - LMFeedUniversalFeedAdapterListener, + LMFeedSocialFeedAdapterListener, LMFeedAdminDeleteDialogListener, LMFeedSelfDeleteDialogListener, - LMFeedUniversalSelectedTopicAdapterListener, + LMFeedSocialSelectedTopicAdapterListener, LMFeedAddPollOptionBottomSheetListener, LMFeedPostObserver { - private lateinit var binding: LmFeedFragmentUniversalFeedBinding + private lateinit var binding: LmFeedFragmentSocialFeedBinding private lateinit var mSwipeRefreshLayout: SwipeRefreshLayout - private val universalFeedViewModel: LMFeedUniversalFeedViewModel by viewModels() + private val socialFeedViewModel: LMFeedSocialFeedViewModel by viewModels() // variable to check if there is a post already uploading private var alreadyPosting: Boolean = false @@ -100,11 +100,11 @@ open class LMFeedUniversalFeedFragment : container: ViewGroup?, savedInstanceState: Bundle? ): View { - binding = LmFeedFragmentUniversalFeedBinding.inflate(layoutInflater) + binding = LmFeedFragmentSocialFeedBinding.inflate(layoutInflater) binding.apply { customizeCreateNewPostButton(fabNewPost) - customizeUniversalFeedHeaderView(headerViewUniversal) + customizeSocialFeedHeaderView(headerViewSocial) customizeNoPostLayout(layoutNoPost) customizePostingLayout(layoutPosting) customizeTopicSelectorBar(topicSelectorBar) @@ -132,26 +132,26 @@ open class LMFeedUniversalFeedFragment : // sends feed opened event LMFeedAnalytics.sendFeedOpenedEvent() - universalFeedViewModel.fetchPendingPostFromDB() - binding.rvUniversal.initiateVideoAutoPlayer() + socialFeedViewModel.fetchPendingPostFromDB() + binding.rvSocial.initiateVideoAutoPlayer() } private fun fetchData() { - universalFeedViewModel.getLoggedInUser() - universalFeedViewModel.getCreatePostRights() - universalFeedViewModel.getUnreadNotificationCount() - universalFeedViewModel.getFeed(1, null) + socialFeedViewModel.getLoggedInUser() + socialFeedViewModel.getCreatePostRights() + socialFeedViewModel.getUnreadNotificationCount() + socialFeedViewModel.getFeed(1, null) } private fun initUI() { - initUniversalFeedRecyclerView() + initSocialFeedRecyclerView() initSwipeRefreshLayout() initSelectedTopicRecyclerView() } override fun onPause() { super.onPause() - binding.rvUniversal.destroyVideoAutoPlayer() + binding.rvSocial.destroyVideoAutoPlayer() } override fun onDestroy() { @@ -162,7 +162,7 @@ open class LMFeedUniversalFeedFragment : override fun onDestroyView() { super.onDestroyView() - binding.rvUniversal.destroyVideoAutoPlayer() + binding.rvSocial.destroyVideoAutoPlayer() } private fun initListeners() { @@ -171,7 +171,7 @@ open class LMFeedUniversalFeedFragment : onCreateNewPostClick(true) } - headerViewUniversal.setNotificationIconClickListener { + headerViewSocial.setNotificationIconClickListener { onNotificationIconClicked() } @@ -189,8 +189,8 @@ open class LMFeedUniversalFeedFragment : observePosting() //observes user response LiveData - universalFeedViewModel.userResponse.observe(viewLifecycleOwner) { - binding.headerViewUniversal.apply { + socialFeedViewModel.userResponse.observe(viewLifecycleOwner) { + binding.headerViewSocial.apply { setUserProfileClickListener { onUserProfileClicked(it) } @@ -199,12 +199,12 @@ open class LMFeedUniversalFeedFragment : } // observes hasCreatePostRights LiveData - universalFeedViewModel.hasCreatePostRights.observe(viewLifecycleOwner) { - universalFeedViewModel.getLoggedInUser() + socialFeedViewModel.hasCreatePostRights.observe(viewLifecycleOwner) { + socialFeedViewModel.getLoggedInUser() initNewPostClick(it) } - universalFeedViewModel.universalFeedResponse.observe(viewLifecycleOwner) { response -> + socialFeedViewModel.socialFeedResponse.observe(viewLifecycleOwner) { response -> LMFeedProgressBarHelper.hideProgress(binding.progressBar) val page = response.first val posts = response.second @@ -218,14 +218,14 @@ open class LMFeedUniversalFeedFragment : if (page == 1) { checkPostsAndReplace(posts) } else { - binding.rvUniversal.addPosts(posts) - binding.rvUniversal.refreshVideoAutoPlayer() + binding.rvSocial.addPosts(posts) + binding.rvSocial.refreshVideoAutoPlayer() } } // observes deletePostResponse LiveData - universalFeedViewModel.deletePostResponse.observe(viewLifecycleOwner) { postId -> - binding.rvUniversal.apply { + socialFeedViewModel.deletePostResponse.observe(viewLifecycleOwner) { postId -> + binding.rvSocial.apply { val indexToRemove = getIndexAndPostFromAdapter(postId)?.first ?: return@observe removePostAtIndex(indexToRemove) checkForNoPost(allPosts()) @@ -241,7 +241,7 @@ open class LMFeedUniversalFeedFragment : } } - universalFeedViewModel.showTopicFilter.observe(viewLifecycleOwner) { showTopicFilter -> + socialFeedViewModel.showTopicFilter.observe(viewLifecycleOwner) { showTopicFilter -> binding.topicSelectorBar.apply { isVisible = showTopicFilter setAllTopicsTextVisibility(showTopicFilter) @@ -249,11 +249,11 @@ open class LMFeedUniversalFeedFragment : } } - universalFeedViewModel.unreadNotificationCount.observe(viewLifecycleOwner) { unreadNotificationCount -> - binding.headerViewUniversal.setNotificationCountText(unreadNotificationCount) + socialFeedViewModel.unreadNotificationCount.observe(viewLifecycleOwner) { unreadNotificationCount -> + binding.headerViewSocial.setNotificationCountText(unreadNotificationCount) } - universalFeedViewModel.postSavedResponse.observe(viewLifecycleOwner) { postViewData -> + socialFeedViewModel.postSavedResponse.observe(viewLifecycleOwner) { postViewData -> //create toast message val toastMessage = if (postViewData.footerViewData.isSaved) { getString( @@ -271,7 +271,7 @@ open class LMFeedUniversalFeedFragment : LMFeedViewUtils.showShortToast(requireContext(), toastMessage) } - universalFeedViewModel.postPinnedResponse.observe(viewLifecycleOwner) { postViewData -> + socialFeedViewModel.postPinnedResponse.observe(viewLifecycleOwner) { postViewData -> //show toast message val toastMessage = if (postViewData.headerViewData.isPinned) { getString( @@ -290,38 +290,38 @@ open class LMFeedUniversalFeedFragment : } //observers get post response - universalFeedViewModel.postResponse.observe(viewLifecycleOwner) { postViewData -> - binding.rvUniversal.apply { + socialFeedViewModel.postResponse.observe(viewLifecycleOwner) { postViewData -> + binding.rvSocial.apply { val index = getIndexAndPostFromAdapter(postViewData.id)?.first ?: return@observe updatePostItem(index, postViewData) } } - universalFeedViewModel.errorMessageEventFlow.onEach { response -> + socialFeedViewModel.errorMessageEventFlow.onEach { response -> when (response) { - is LMFeedUniversalFeedViewModel.ErrorMessageEvent.UniversalFeed -> { + is LMFeedSocialFeedViewModel.ErrorMessageEvent.SocialFeed -> { val errorMessage = response.errorMessage mSwipeRefreshLayout.isRefreshing = false LMFeedProgressBarHelper.hideProgress(binding.progressBar) LMFeedViewUtils.showErrorMessageToast(requireContext(), errorMessage) } - is LMFeedUniversalFeedViewModel.ErrorMessageEvent.AddPost -> { + is LMFeedSocialFeedViewModel.ErrorMessageEvent.AddPost -> { LMFeedViewUtils.showErrorMessageToast(requireContext(), response.errorMessage) removePostingView() } - is LMFeedUniversalFeedViewModel.ErrorMessageEvent.DeletePost -> { + is LMFeedSocialFeedViewModel.ErrorMessageEvent.DeletePost -> { val errorMessage = response.errorMessage LMFeedViewUtils.showErrorMessageToast(requireContext(), errorMessage) } - is LMFeedUniversalFeedViewModel.ErrorMessageEvent.LikePost -> { + is LMFeedSocialFeedViewModel.ErrorMessageEvent.LikePost -> { val postId = response.postId //get post and index val pair = - binding.rvUniversal.getIndexAndPostFromAdapter(postId) ?: return@onEach + binding.rvSocial.getIndexAndPostFromAdapter(postId) ?: return@onEach val post = pair.second val index = pair.first @@ -345,14 +345,14 @@ open class LMFeedUniversalFeedFragment : .fromPostLiked(true) .build() - binding.rvUniversal.updatePostItem(index, updatedPostData) + binding.rvSocial.updatePostItem(index, updatedPostData) //show error message LMFeedViewUtils.showSomethingWentWrongToast(requireContext()) } - is LMFeedUniversalFeedViewModel.ErrorMessageEvent.PinPost -> { - binding.rvUniversal.apply { + is LMFeedSocialFeedViewModel.ErrorMessageEvent.PinPost -> { + binding.rvSocial.apply { val postId = response.postId //get post and index @@ -378,8 +378,8 @@ open class LMFeedUniversalFeedFragment : } } - is LMFeedUniversalFeedViewModel.ErrorMessageEvent.SavePost -> { - binding.rvUniversal.apply { + is LMFeedSocialFeedViewModel.ErrorMessageEvent.SavePost -> { + binding.rvSocial.apply { val postId = response.postId //get post and index @@ -406,24 +406,24 @@ open class LMFeedUniversalFeedFragment : } } - is LMFeedUniversalFeedViewModel.ErrorMessageEvent.GetTopic -> { + is LMFeedSocialFeedViewModel.ErrorMessageEvent.GetTopic -> { LMFeedViewUtils.showSomethingWentWrongToast(requireContext()) } - is LMFeedUniversalFeedViewModel.ErrorMessageEvent.GetUnreadNotificationCount -> { - binding.headerViewUniversal.setNotificationIconVisibility(false) + is LMFeedSocialFeedViewModel.ErrorMessageEvent.GetUnreadNotificationCount -> { + binding.headerViewSocial.setNotificationIconVisibility(false) LMFeedViewUtils.showErrorMessageToast(requireContext(), response.errorMessage) } - is LMFeedUniversalFeedViewModel.ErrorMessageEvent.SubmitVote -> { + is LMFeedSocialFeedViewModel.ErrorMessageEvent.SubmitVote -> { LMFeedViewUtils.showErrorMessageToast(requireContext(), response.errorMessage) } - is LMFeedUniversalFeedViewModel.ErrorMessageEvent.AddPollOption -> { + is LMFeedSocialFeedViewModel.ErrorMessageEvent.AddPollOption -> { LMFeedViewUtils.showErrorMessageToast(requireContext(), response.errorMessage) } - is LMFeedUniversalFeedViewModel.ErrorMessageEvent.GetPost -> { + is LMFeedSocialFeedViewModel.ErrorMessageEvent.GetPost -> { LMFeedViewUtils.showErrorMessageToast(requireContext(), response.errorMessage) } } @@ -432,10 +432,10 @@ open class LMFeedUniversalFeedFragment : // observes post live data private fun observePosting() { - universalFeedViewModel.postDataEventFlow.onEach { response -> + socialFeedViewModel.postDataEventFlow.onEach { response -> when (response) { // when the post data comes from local db - is LMFeedUniversalFeedViewModel.PostDataEvent.PostDbData -> { + is LMFeedSocialFeedViewModel.PostDataEvent.PostDbData -> { val post = response.post if (post.isPosted) { removePostingView() @@ -464,7 +464,7 @@ open class LMFeedUniversalFeedFragment : } // when the post data comes from api response - is LMFeedUniversalFeedViewModel.PostDataEvent.PostResponseData -> { + is LMFeedSocialFeedViewModel.PostDataEvent.PostResponseData -> { binding.apply { LMFeedViewUtils.showShortToast( requireContext(), @@ -520,7 +520,7 @@ open class LMFeedUniversalFeedFragment : setRetryVisibility(false) setPostSuccessfulVisibility(true) } - universalFeedViewModel.addPost(postingData) + socialFeedViewModel.addPost(postingData) } WorkInfo.State.FAILED -> { @@ -564,7 +564,7 @@ open class LMFeedUniversalFeedFragment : if (hasCreatePostRights) { val fabButtonColor = - LMFeedStyleTransformer.universalFeedFragmentViewStyle.createNewPostButtonViewStyle.backgroundColor + LMFeedStyleTransformer.socialFeedFragmentViewStyle.createNewPostButtonViewStyle.backgroundColor //sets color of fab button as per user rights layoutNoPost.setActionFABColor(fabButtonColor) @@ -593,7 +593,7 @@ open class LMFeedUniversalFeedFragment : } private fun checkPostsAndReplace(posts: List) { - binding.rvUniversal.apply { + binding.rvSocial.apply { checkForNoPost(posts) replacePosts(posts) scrollToPosition(0) @@ -601,18 +601,18 @@ open class LMFeedUniversalFeedFragment : } } - private fun initUniversalFeedRecyclerView() { + private fun initSocialFeedRecyclerView() { LMFeedProgressBarHelper.showProgress(binding.progressBar) - binding.rvUniversal.apply { - setAdapter(this@LMFeedUniversalFeedFragment) + binding.rvSocial.apply { + setAdapter(this@LMFeedSocialFeedFragment) val paginationScrollListener = object : LMFeedEndlessRecyclerViewScrollListener(linearLayoutManager) { override fun onLoadMore(currentPage: Int) { if (currentPage > 0) { - universalFeedViewModel.getFeed( + socialFeedViewModel.getFeed( currentPage, - universalFeedViewModel.getTopicIdsFromAdapterList(binding.topicSelectorBar.getAllSelectedTopics()) + socialFeedViewModel.getTopicIdsFromAdapterList(binding.topicSelectorBar.getAllSelectedTopics()) ) } } @@ -640,8 +640,8 @@ open class LMFeedUniversalFeedFragment : //init selected topic recycler view private fun initSelectedTopicRecyclerView() { binding.topicSelectorBar.apply { - universalFeedViewModel.getAllTopics(false) - setSelectedTopicAdapter(this@LMFeedUniversalFeedFragment) + socialFeedViewModel.getAllTopics(false) + setSelectedTopicAdapter(this@LMFeedSocialFeedFragment) setClearSelectedTopicsClickListener { clearSelectedTopics() @@ -654,9 +654,9 @@ open class LMFeedUniversalFeedFragment : binding.apply { //call api topicSelectorBar.clearSelectedTopicsAndNotify() - rvUniversal.resetScrollListenerData() + rvSocial.resetScrollListenerData() LMFeedProgressBarHelper.showProgress(progressBar, true) - universalFeedViewModel.getFeed(1, null) + socialFeedViewModel.getFeed(1, null) //show layout accordingly topicSelectorBar.setSelectedTopicFilterVisibility(false) @@ -669,13 +669,13 @@ open class LMFeedUniversalFeedFragment : binding.apply { layoutNoPost.hide() fabNewPost.show() - rvUniversal.show() + rvSocial.show() } } else { binding.apply { layoutNoPost.show() fabNewPost.hide() - rvUniversal.hide() + rvSocial.hide() } } } @@ -696,13 +696,13 @@ open class LMFeedUniversalFeedFragment : val loggedInUUID = userPreferences.getUUID() //call api - universalFeedViewModel.likePost( + socialFeedViewModel.likePost( postViewData.id, postViewData.footerViewData.isLiked, loggedInUUID ) - binding.rvUniversal.apply { + binding.rvSocial.apply { val adapterPosition = getIndexAndPostFromAdapter(postViewData.id)?.first ?: return //update recycler @@ -732,9 +732,9 @@ open class LMFeedUniversalFeedFragment : override fun onPostSaveClicked(position: Int, postViewData: LMFeedPostViewData) { //call api - universalFeedViewModel.savePost(postViewData) + socialFeedViewModel.savePost(postViewData) - binding.rvUniversal.apply { + binding.rvSocial.apply { val adapterPosition = getIndexAndPostFromAdapter(postViewData.id)?.first ?: return //update recycler @@ -761,14 +761,14 @@ open class LMFeedUniversalFeedFragment : .fromPostSaved(false) .build() - binding.rvUniversal.updatePostWithoutNotifying(position, updatedPostData) + binding.rvSocial.updatePostWithoutNotifying(position, updatedPostData) } //updates [alreadySeenFullContent] for the post override fun onPostContentSeeMoreClicked(position: Int, postViewData: LMFeedPostViewData) { - binding.rvUniversal.apply { + binding.rvSocial.apply { - binding.rvUniversal.apply { + binding.rvSocial.apply { val adapterPosition = getIndexAndPostFromAdapter(postViewData.id)?.first ?: return //update recycler @@ -889,12 +889,12 @@ open class LMFeedUniversalFeedFragment : //called when the page in the multiple media post is changed override fun onPostMultipleMediaPageChangeCallback(position: Int, parentPosition: Int) { //processes the current video whenever view pager's page is changed - binding.rvUniversal.refreshVideoAutoPlayer() + binding.rvSocial.refreshVideoAutoPlayer() } //called when show more is clicked in the documents type post override fun onPostMultipleDocumentsExpanded(position: Int, postViewData: LMFeedPostViewData) { - binding.rvUniversal.apply { + binding.rvSocial.apply { if (position == itemCount - 1) { scrollToPositionWithOffset(position) } @@ -910,7 +910,7 @@ open class LMFeedUniversalFeedFragment : .fromPostLiked(false) .build() - binding.rvUniversal.apply { + binding.rvSocial.apply { val adapterPosition = getIndexAndPostFromAdapter(updatedPostViewData.id)?.first ?: return @@ -930,14 +930,14 @@ open class LMFeedUniversalFeedFragment : override fun onEntityDeletedByAdmin(deleteExtras: LMFeedDeleteExtras, reason: String) { val post = - binding.rvUniversal.getIndexAndPostFromAdapter(deleteExtras.postId)?.second ?: return - universalFeedViewModel.deletePost(post, reason) + binding.rvSocial.getIndexAndPostFromAdapter(deleteExtras.postId)?.second ?: return + socialFeedViewModel.deletePost(post, reason) } override fun onEntityDeletedByAuthor(deleteExtras: LMFeedDeleteExtras) { val post = - binding.rvUniversal.getIndexAndPostFromAdapter(deleteExtras.postId)?.second ?: return - universalFeedViewModel.deletePost(post) + binding.rvSocial.getIndexAndPostFromAdapter(deleteExtras.postId)?.second ?: return + socialFeedViewModel.deletePost(post) } override fun onTopicRemoved(position: Int, topicViewData: LMFeedTopicViewData) { @@ -952,12 +952,12 @@ open class LMFeedUniversalFeedFragment : topicSelectorBar.removeTopicAndNotify(position) //call apis - rvUniversal.resetScrollListenerData() - rvUniversal.clearPostsAndNotify() + rvSocial.resetScrollListenerData() + rvSocial.clearPostsAndNotify() LMFeedProgressBarHelper.showProgress(binding.progressBar, true) - universalFeedViewModel.getFeed( + socialFeedViewModel.getFeed( 1, - universalFeedViewModel.getTopicIdsFromAdapterList(selectedTopics) + socialFeedViewModel.getTopicIdsFromAdapterList(selectedTopics) ) } } @@ -967,7 +967,7 @@ open class LMFeedUniversalFeedFragment : override fun update(postData: Pair) { val postId = postData.first // fetches post from adapter - binding.rvUniversal.apply { + binding.rvSocial.apply { val postIndex = getIndexAndPostFromAdapter(postId)?.first ?: return val updatedPost = postData.second @@ -1061,7 +1061,7 @@ open class LMFeedUniversalFeedFragment : val selectedOptionIds = selectedOptions.map { it.id } validateSelectedPollOptions(pollViewData, selectedOptions.size) { - universalFeedViewModel.submitPollVote( + socialFeedViewModel.submitPollVote( requireContext(), postViewData.id, pollViewData.id, @@ -1129,7 +1129,7 @@ open class LMFeedUniversalFeedFragment : override fun onPostEditPollVoteClicked(position: Int, postViewData: LMFeedPostViewData) { super.onPostEditPollVoteClicked(position, postViewData) - binding.rvUniversal.apply { + binding.rvSocial.apply { val postIndex = getIndexAndPostFromAdapter(postViewData.id)?.first ?: return val attachment = postViewData.mediaViewData.attachments.firstOrNull() ?: return @@ -1177,7 +1177,7 @@ open class LMFeedUniversalFeedFragment : pollOptionViewData ) - val postViewData = binding.rvUniversal.allPosts()[pollPosition] as LMFeedPostViewData + val postViewData = binding.rvSocial.allPosts()[pollPosition] as LMFeedPostViewData val attachment = postViewData.mediaViewData.attachments.firstOrNull() ?: return val pollViewData = attachment.attachmentMeta.poll ?: return @@ -1200,7 +1200,7 @@ open class LMFeedUniversalFeedFragment : } //call api to submit vote - universalFeedViewModel.submitPollVote( + socialFeedViewModel.submitPollVote( requireContext(), postViewData.id, pollViewData.id, @@ -1258,7 +1258,7 @@ open class LMFeedUniversalFeedFragment : .build() //update the recycler view - binding.rvUniversal.updatePostItem(pollPosition, updatedPostViewData) + binding.rvSocial.updatePostItem(pollPosition, updatedPostViewData) } } @@ -1283,7 +1283,7 @@ open class LMFeedUniversalFeedFragment : pollOptionViewData ) - val postViewData = binding.rvUniversal.allPosts()[pollPosition] as LMFeedPostViewData + val postViewData = binding.rvSocial.allPosts()[pollPosition] as LMFeedPostViewData val attachment = postViewData.mediaViewData.attachments.firstOrNull() ?: return val pollViewData = attachment.attachmentMeta.poll ?: return @@ -1314,9 +1314,9 @@ open class LMFeedUniversalFeedFragment : pollId: String, option: String ) { - val post = binding.rvUniversal.getIndexAndPostFromAdapter(postId)?.second ?: return + val post = binding.rvSocial.getIndexAndPostFromAdapter(postId)?.second ?: return - universalFeedViewModel.addPollOption( + socialFeedViewModel.addPollOption( post, option ) @@ -1325,7 +1325,7 @@ open class LMFeedUniversalFeedFragment : //customizes the create new post fab protected open fun customizeCreateNewPostButton(fabNewPost: LMFeedFAB) { fabNewPost.apply { - setStyle(LMFeedStyleTransformer.universalFeedFragmentViewStyle.createNewPostButtonViewStyle) + setStyle(LMFeedStyleTransformer.socialFeedFragmentViewStyle.createNewPostButtonViewStyle) text = getString( R.string.lm_feed_new_s, @@ -1345,7 +1345,7 @@ open class LMFeedUniversalFeedFragment : LMFeedCreatePostActivity.RESULT_UPLOAD_POST -> { // post with attachments created, now upload and post it from db - universalFeedViewModel.fetchPendingPostFromDB() + socialFeedViewModel.fetchPendingPostFromDB() } } } @@ -1372,7 +1372,7 @@ open class LMFeedUniversalFeedFragment : LMFeedAnalytics.sendPostCreationStartedEvent() val createPostExtras = LMFeedCreatePostExtras.Builder() - .source(LMFeedAnalytics.Source.UNIVERSAL_FEED) + .source(LMFeedAnalytics.Source.SOCIAL_FEED) .build() val intent = LMFeedCreatePostActivity.getIntent( @@ -1395,9 +1395,9 @@ open class LMFeedUniversalFeedFragment : } //customizes the header view - protected open fun customizeUniversalFeedHeaderView(headerViewUniversal: LMFeedHeaderView) { - headerViewUniversal.apply { - setStyle(LMFeedStyleTransformer.universalFeedFragmentViewStyle.headerViewStyle) + protected open fun customizeSocialFeedHeaderView(headerViewSocial: LMFeedHeaderView) { + headerViewSocial.apply { + setStyle(LMFeedStyleTransformer.socialFeedFragmentViewStyle.headerViewStyle) setTitleText(getString(R.string.lm_feed_feed)) } @@ -1420,7 +1420,7 @@ open class LMFeedUniversalFeedFragment : layoutNoPost.apply { val postAsVariable = LMFeedCommunityUtil.getPostVariable() - setStyle(LMFeedStyleTransformer.universalFeedFragmentViewStyle.noPostLayoutViewStyle) + setStyle(LMFeedStyleTransformer.socialFeedFragmentViewStyle.noPostLayoutViewStyle) setTitleText( getString( @@ -1446,7 +1446,7 @@ open class LMFeedUniversalFeedFragment : //customizes the posting layout protected open fun customizePostingLayout(layoutPosting: LMFeedPostingView) { layoutPosting.apply { - setStyle(LMFeedStyleTransformer.universalFeedFragmentViewStyle.postingViewStyle) + setStyle(LMFeedStyleTransformer.socialFeedFragmentViewStyle.postingViewStyle) setPostingText( getString( @@ -1460,9 +1460,9 @@ open class LMFeedUniversalFeedFragment : } //customizes the topic selector bar - protected open fun customizeTopicSelectorBar(topicSelectorBar: LMFeedUniversalTopicSelectorBarView) { + protected open fun customizeTopicSelectorBar(topicSelectorBar: LMFeedSocialTopicSelectorBarView) { topicSelectorBar.apply { - setStyle(LMFeedStyleTransformer.universalFeedFragmentViewStyle.topicSelectorBarStyle) + setStyle(LMFeedStyleTransformer.socialFeedFragmentViewStyle.topicSelectorBarStyle) setAllTopicsText(getString(R.string.lm_feed_all_topics)) setClearTopicsText(getString(R.string.lm_feed_clear)) @@ -1470,7 +1470,7 @@ open class LMFeedUniversalFeedFragment : } protected open fun onRetryUploadClicked(temporaryId: Long?, attachmentCount: Int) { - universalFeedViewModel.createRetryPostMediaWorker( + socialFeedViewModel.createRetryPostMediaWorker( requireContext(), temporaryId, attachmentCount @@ -1494,8 +1494,8 @@ open class LMFeedUniversalFeedFragment : //handles result after selecting filters and show recyclers views private fun handleTopicSelectionResult(resultExtras: LMFeedTopicSelectionResultExtras) { binding.apply { - rvUniversal.resetScrollListenerData() - rvUniversal.clearPostsAndNotify() + rvSocial.resetScrollListenerData() + rvSocial.clearPostsAndNotify() if (resultExtras.isAllTopicSelected) { //show layouts accordingly @@ -1504,7 +1504,7 @@ open class LMFeedUniversalFeedFragment : //call api LMFeedProgressBarHelper.showProgress(progressBar, true) - universalFeedViewModel.getFeed(1, null) + socialFeedViewModel.getFeed(1, null) } else { //show layouts accordingly topicSelectorBar.setAllTopicsTextVisibility(false) @@ -1516,9 +1516,9 @@ open class LMFeedUniversalFeedFragment : //call api LMFeedProgressBarHelper.showProgress(progressBar, true) - universalFeedViewModel.getFeed( + socialFeedViewModel.getFeed( 1, - universalFeedViewModel.getTopicIdsFromAdapterList(selectedTopics) + socialFeedViewModel.getTopicIdsFromAdapterList(selectedTopics) ) } } @@ -1542,11 +1542,11 @@ open class LMFeedUniversalFeedFragment : protected open fun onFeedRefreshed() { binding.apply { mSwipeRefreshLayout.isRefreshing = true - rvUniversal.resetScrollListenerData() - universalFeedViewModel.getUnreadNotificationCount() - universalFeedViewModel.getFeed( + rvSocial.resetScrollListenerData() + socialFeedViewModel.getUnreadNotificationCount() + socialFeedViewModel.getFeed( 1, - universalFeedViewModel.getTopicIdsFromAdapterList(topicSelectorBar.getAllSelectedTopics()) + socialFeedViewModel.getTopicIdsFromAdapterList(topicSelectorBar.getAllSelectedTopics()) ) } } @@ -1700,9 +1700,9 @@ open class LMFeedUniversalFeedFragment : post: LMFeedPostViewData ) { //call api - universalFeedViewModel.pinPost(post) + socialFeedViewModel.pinPost(post) - binding.rvUniversal.apply { + binding.rvSocial.apply { val adapterPosition = getIndexAndPostFromAdapter(post.id)?.first ?: return //update recycler @@ -1717,9 +1717,9 @@ open class LMFeedUniversalFeedFragment : post: LMFeedPostViewData ) { //call api - universalFeedViewModel.pinPost(post) + socialFeedViewModel.pinPost(post) - binding.rvUniversal.apply { + binding.rvSocial.apply { val adapterPosition = getIndexAndPostFromAdapter(post.id)?.first ?: return //update recycler diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedUniversalFeedListView.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedSocialFeedListView.kt similarity index 75% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedUniversalFeedListView.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedSocialFeedListView.kt index a1ead428..7ece0f2e 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedUniversalFeedListView.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedSocialFeedListView.kt @@ -5,8 +5,8 @@ import android.util.AttributeSet import androidx.core.content.ContextCompat import androidx.recyclerview.widget.* import com.likeminds.feed.android.core.R -import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapter -import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedSocialFeedAdapter +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedSocialFeedAdapterListener import com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData import com.likeminds.feed.android.core.utils.LMFeedEndlessRecyclerViewScrollListener import com.likeminds.feed.android.core.utils.LMFeedViewUtils @@ -14,9 +14,9 @@ import com.likeminds.feed.android.core.utils.base.LMFeedBaseViewType import com.likeminds.feed.android.core.utils.video.LMFeedPostVideoAutoPlayHelper /** - * Represents a recycler view with list of posts in the universal feed fragment + * Represents a recycler view with list of posts in the social feed fragment */ -class LMFeedUniversalFeedListView @JvmOverloads constructor( +class LMFeedSocialFeedListView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 @@ -25,11 +25,11 @@ class LMFeedUniversalFeedListView @JvmOverloads constructor( val linearLayoutManager: LinearLayoutManager private val dividerDecoration = DividerItemDecoration(context, DividerItemDecoration.VERTICAL) - private lateinit var universalFeedAdapter: LMFeedUniversalFeedAdapter + private lateinit var socialFeedAdapter: LMFeedSocialFeedAdapter private var postVideoAutoPlayHelper: LMFeedPostVideoAutoPlayHelper? = null private lateinit var paginationScrollListener: LMFeedEndlessRecyclerViewScrollListener - val itemCount: Int get() = universalFeedAdapter.itemCount + val itemCount: Int get() = socialFeedAdapter.itemCount init { setHasFixedSize(true) @@ -80,14 +80,14 @@ class LMFeedUniversalFeedListView @JvmOverloads constructor( } } - //sets the adapter with the provided [listener] to the universal feed recycler view - fun setAdapter(universalFeedAdapterListener: LMFeedUniversalFeedAdapterListener) { + //sets the adapter with the provided [listener] to the social feed recycler view + fun setAdapter(socialFeedAdapterListener: LMFeedSocialFeedAdapterListener) { //setting adapter - universalFeedAdapter = LMFeedUniversalFeedAdapter(universalFeedAdapterListener) - adapter = universalFeedAdapter + socialFeedAdapter = LMFeedSocialFeedAdapter(socialFeedAdapterListener) + adapter = socialFeedAdapter } - //sets the pagination scroll listener to the universal feed recycler view + //sets the pagination scroll listener to the social feed recycler view fun setPaginationScrollListener(scrollListener: LMFeedEndlessRecyclerViewScrollListener) { paginationScrollListener = scrollListener addOnScrollListener(scrollListener) @@ -100,29 +100,29 @@ class LMFeedUniversalFeedListView @JvmOverloads constructor( } } - //returns the list of all the posts in the universal feed adapter + //returns the list of all the posts in the social feed adapter fun allPosts(): List { - return universalFeedAdapter.items() + return socialFeedAdapter.items() } - //replaces the [posts] in the universal feed adapter with the provided posts + //replaces the [posts] in the social feed adapter with the provided posts fun replacePosts(posts: List) { - universalFeedAdapter.replace(posts) + socialFeedAdapter.replace(posts) } - //adds the provided [posts] in the universal feed adapter + //adds the provided [posts] in the social feed adapter fun addPosts(posts: List) { - universalFeedAdapter.addAll(posts) + socialFeedAdapter.addAll(posts) } - //removes the post at the provided [index] in the universal feed adapter + //removes the post at the provided [index] in the social feed adapter fun removePostAtIndex(index: Int) { - universalFeedAdapter.removeIndex(index) + socialFeedAdapter.removeIndex(index) } - //clears all the posts in the universal feed adapter and notifies the recycler view + //clears all the posts in the social feed adapter and notifies the recycler view fun clearPostsAndNotify() { - universalFeedAdapter.clearAndNotify() + socialFeedAdapter.clearAndNotify() } /** @@ -131,7 +131,7 @@ class LMFeedUniversalFeedListView @JvmOverloads constructor( //get index and post from the adapter using postId fun getIndexAndPostFromAdapter(postId: String): Pair? { - val index = universalFeedAdapter.items().indexOfFirst { + val index = socialFeedAdapter.items().indexOfFirst { (it is LMFeedPostViewData) && (it.id == postId) } @@ -146,17 +146,17 @@ class LMFeedUniversalFeedListView @JvmOverloads constructor( //get post from the adapter using index private fun getPostFromAdapter(position: Int): LMFeedPostViewData? { - return universalFeedAdapter.items()[position] as? LMFeedPostViewData + return socialFeedAdapter.items()[position] as? LMFeedPostViewData } //updates the post item at the provided position without notifying the recycler view fun updatePostWithoutNotifying(position: Int, postItem: LMFeedPostViewData) { - universalFeedAdapter.updateWithoutNotifyingRV(position, postItem) + socialFeedAdapter.updateWithoutNotifyingRV(position, postItem) } //returns the post item at the provided index fun updatePostItem(position: Int, updatedPostItem: LMFeedPostViewData) { - universalFeedAdapter.update(position, updatedPostItem) + socialFeedAdapter.update(position, updatedPostItem) } /** diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedUniversalSelectedTopicListView.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedSocialSelectedTopicListView.kt similarity index 83% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedUniversalSelectedTopicListView.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedSocialSelectedTopicListView.kt index ca2ffb43..d1ce7ef8 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedUniversalSelectedTopicListView.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedSocialSelectedTopicListView.kt @@ -4,11 +4,11 @@ import android.content.Context import android.util.AttributeSet import androidx.recyclerview.widget.* import com.likeminds.feed.android.core.topics.model.LMFeedTopicViewData -import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalSelectedTopicAdapter -import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalSelectedTopicAdapterListener +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedSocialSelectedTopicAdapter +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedSocialSelectedTopicAdapterListener import com.likeminds.feed.android.core.utils.base.LMFeedBaseViewType -class LMFeedUniversalSelectedTopicListView @JvmOverloads constructor( +class LMFeedSocialSelectedTopicListView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 @@ -16,7 +16,7 @@ class LMFeedUniversalSelectedTopicListView @JvmOverloads constructor( val linearLayoutManager: LinearLayoutManager - private lateinit var selectedTopicAdapter: LMFeedUniversalSelectedTopicAdapter + private lateinit var selectedTopicAdapter: LMFeedSocialSelectedTopicAdapter init { setHasFixedSize(true) @@ -33,8 +33,8 @@ class LMFeedUniversalSelectedTopicListView @JvmOverloads constructor( } //sets the adapter with the provided [listener] to the selected topic recycler view - fun setAdapter(listener: LMFeedUniversalSelectedTopicAdapterListener) { - selectedTopicAdapter = LMFeedUniversalSelectedTopicAdapter(listener) + fun setAdapter(listener: LMFeedSocialSelectedTopicAdapterListener) { + selectedTopicAdapter = LMFeedSocialSelectedTopicAdapter(listener) adapter = selectedTopicAdapter } diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedUniversalTopicSelectorBarView.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedSocialTopicSelectorBarView.kt similarity index 87% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedUniversalTopicSelectorBarView.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedSocialTopicSelectorBarView.kt index cbc439b9..f5dda781 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedUniversalTopicSelectorBarView.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/view/LMFeedSocialTopicSelectorBarView.kt @@ -6,16 +6,16 @@ import android.view.LayoutInflater import androidx.constraintlayout.widget.ConstraintLayout import androidx.core.content.ContextCompat import androidx.core.view.isVisible -import com.likeminds.feed.android.core.databinding.LmFeedUniversalTopicSelectorBarBinding +import com.likeminds.feed.android.core.databinding.LmFeedSocialTopicSelectorBarBinding import com.likeminds.feed.android.core.topics.model.LMFeedTopicViewData import com.likeminds.feed.android.core.ui.base.styles.LMFeedTextStyle import com.likeminds.feed.android.core.ui.base.styles.setStyle -import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalSelectedTopicAdapterListener -import com.likeminds.feed.android.core.socialfeed.style.LMFeedUniversalTopicSelectorBarViewStyle +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedSocialSelectedTopicAdapterListener +import com.likeminds.feed.android.core.socialfeed.style.LMFeedSocialTopicSelectorBarViewStyle import com.likeminds.feed.android.core.utils.base.LMFeedBaseViewType import com.likeminds.feed.android.core.utils.listeners.LMFeedOnClickListener -class LMFeedUniversalTopicSelectorBarView : ConstraintLayout { +class LMFeedSocialTopicSelectorBarView : ConstraintLayout { constructor(context: Context) : super(context) @@ -30,11 +30,11 @@ class LMFeedUniversalTopicSelectorBarView : ConstraintLayout { private val inflater = (context.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater) - private val binding: LmFeedUniversalTopicSelectorBarBinding = - LmFeedUniversalTopicSelectorBarBinding.inflate(inflater, this, true) + private val binding: LmFeedSocialTopicSelectorBarBinding = + LmFeedSocialTopicSelectorBarBinding.inflate(inflater, this, true) //sets the provided [topicSelectorBarStyle] to the topic selector bar - fun setStyle(topicSelectorBarStyle: LMFeedUniversalTopicSelectorBarViewStyle) { + fun setStyle(topicSelectorBarStyle: LMFeedSocialTopicSelectorBarViewStyle) { topicSelectorBarStyle.apply { //sets background color @@ -44,7 +44,7 @@ class LMFeedUniversalTopicSelectorBarView : ConstraintLayout { //sets the elevation of the header view elevation?.let { - this@LMFeedUniversalTopicSelectorBarView.elevation = resources.getDimension(it) + this@LMFeedSocialTopicSelectorBarView.elevation = resources.getDimension(it) } //configures all the views in the topic selector bar @@ -124,7 +124,7 @@ class LMFeedUniversalTopicSelectorBarView : ConstraintLayout { */ //exposed function to set the adapter with the provided [listener] to the selected topic recycler view - fun setSelectedTopicAdapter(listener: LMFeedUniversalSelectedTopicAdapterListener) { + fun setSelectedTopicAdapter(listener: LMFeedSocialSelectedTopicAdapterListener) { binding.rvSelectedTopics.setAdapter(listener) } diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/viewmodel/LMFeedUniversalFeedViewModel.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/viewmodel/LMFeedSocialFeedViewModel.kt similarity index 97% rename from likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/viewmodel/LMFeedUniversalFeedViewModel.kt rename to likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/viewmodel/LMFeedSocialFeedViewModel.kt index e1102b6f..eba656ad 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/viewmodel/LMFeedUniversalFeedViewModel.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/socialfeed/viewmodel/LMFeedSocialFeedViewModel.kt @@ -29,18 +29,18 @@ import com.likeminds.usertagging.util.UserTaggingDecoder import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.flow.receiveAsFlow -class LMFeedUniversalFeedViewModel : ViewModel() { +class LMFeedSocialFeedViewModel : ViewModel() { private val lmFeedClient: LMFeedClient by lazy { LMFeedClient.getInstance() } - private val _universalFeedResponse by lazy { + private val _socialFeedResponse by lazy { MutableLiveData>>() } - val universalFeedResponse: LiveData>> by lazy { - _universalFeedResponse + val socialFeedResponse: LiveData>> by lazy { + _socialFeedResponse } @@ -117,7 +117,7 @@ class LMFeedUniversalFeedViewModel : ViewModel() { } sealed class ErrorMessageEvent { - data class UniversalFeed(val errorMessage: String?) : ErrorMessageEvent() + data class SocialFeed(val errorMessage: String?) : ErrorMessageEvent() data class LikePost(val postId: String, val errorMessage: String?) : ErrorMessageEvent() @@ -231,7 +231,7 @@ class LMFeedUniversalFeedViewModel : ViewModel() { .topicIds(topicsIds) .build() - //call universal feed api + //call get feed api val response = lmFeedClient.getFeed(request) if (response.success) { @@ -243,7 +243,7 @@ class LMFeedUniversalFeedViewModel : ViewModel() { //convert to view data val listOfPostViewData = - LMFeedViewDataConvertor.convertUniversalFeedPosts( + LMFeedViewDataConvertor.convertGetFeedPosts( posts, usersMap, topicsMap, @@ -251,10 +251,10 @@ class LMFeedUniversalFeedViewModel : ViewModel() { ) //send it to ui - _universalFeedResponse.postValue(Pair(page, listOfPostViewData)) + _socialFeedResponse.postValue(Pair(page, listOfPostViewData)) } else { //for error - errorMessageChannel.send(ErrorMessageEvent.UniversalFeed(response.errorMessage)) + errorMessageChannel.send(ErrorMessageEvent.SocialFeed(response.errorMessage)) } } } diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/ui/widgets/post/postmedia/style/LMFeedPostLinkMediaViewStyle.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/ui/widgets/post/postmedia/style/LMFeedPostLinkMediaViewStyle.kt index a15ed547..2f69846b 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/ui/widgets/post/postmedia/style/LMFeedPostLinkMediaViewStyle.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/ui/widgets/post/postmedia/style/LMFeedPostLinkMediaViewStyle.kt @@ -9,7 +9,7 @@ import com.likeminds.feed.android.core.ui.base.styles.* import com.likeminds.feed.android.core.utils.LMFeedViewStyle /** - * [LMFeedPostLinkMediaViewStyle] helps you to customize the universal feed fragment [LMFeedPostLinkMediaView] + * [LMFeedPostLinkMediaViewStyle] helps you to customize the post link media view [LMFeedPostLinkMediaView] * * @property linkTitleStyle : [LMFeedTextStyle] this will help you to customize the title text in the link media view * @property linkDescriptionStyle : [LMFeedTextStyle] this will help you to customize the description text in the link media view diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/ui/widgets/post/postmedia/view/LMFeedPostDocumentsMediaView.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/ui/widgets/post/postmedia/view/LMFeedPostDocumentsMediaView.kt index 5492da4d..9afd15fd 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/ui/widgets/post/postmedia/view/LMFeedPostDocumentsMediaView.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/ui/widgets/post/postmedia/view/LMFeedPostDocumentsMediaView.kt @@ -8,7 +8,7 @@ import com.likeminds.feed.android.core.databinding.LmFeedPostDocumentsMediaViewB import com.likeminds.feed.android.core.ui.base.styles.LMFeedTextStyle import com.likeminds.feed.android.core.ui.base.styles.setStyle import com.likeminds.feed.android.core.ui.widgets.post.postmedia.style.LMFeedPostDocumentsMediaViewStyle -import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedSocialFeedAdapterListener import com.likeminds.feed.android.core.socialfeed.model.LMFeedMediaViewData import com.likeminds.feed.android.core.utils.LMFeedViewUtils.show import com.likeminds.feed.android.core.utils.listeners.LMFeedOnClickListener @@ -49,7 +49,7 @@ class LMFeedPostDocumentsMediaView : ConstraintLayout { fun setAdapter( parentPosition: Int, mediaData: LMFeedMediaViewData, - listener: LMFeedUniversalFeedAdapterListener, + listener: LMFeedSocialFeedAdapterListener, isMediaRemovable: Boolean = false ) { binding.apply { diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/ui/widgets/post/postmedia/view/LMFeedPostMultipleMediaView.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/ui/widgets/post/postmedia/view/LMFeedPostMultipleMediaView.kt index e99a65b7..25af922e 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/ui/widgets/post/postmedia/view/LMFeedPostMultipleMediaView.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/ui/widgets/post/postmedia/view/LMFeedPostMultipleMediaView.kt @@ -9,7 +9,7 @@ import com.likeminds.feed.android.core.databinding.LmFeedPostMultipleMediaViewBi import com.likeminds.feed.android.core.post.model.* import com.likeminds.feed.android.core.ui.widgets.post.postmedia.style.LMFeedPostMultipleMediaViewStyle import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedMultipleMediaPostAdapter -import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapterListener +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedSocialFeedAdapterListener import com.likeminds.feed.android.core.utils.base.model.ITEM_MULTIPLE_MEDIA_IMAGE import com.likeminds.feed.android.core.utils.base.model.ITEM_MULTIPLE_MEDIA_VIDEO @@ -83,7 +83,7 @@ class LMFeedPostMultipleMediaView : ConstraintLayout { //sets the view pager to the multiple media type post with the provided listeners and attachments fun setViewPager( parentPosition: Int, - listener: LMFeedUniversalFeedAdapterListener, + listener: LMFeedSocialFeedAdapterListener, attachments: List, isMediaRemovable: Boolean = false ) { diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/utils/LMFeedStyleTransformer.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/utils/LMFeedStyleTransformer.kt index d81f09ee..fd1a248b 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/utils/LMFeedStyleTransformer.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/utils/LMFeedStyleTransformer.kt @@ -14,13 +14,13 @@ import com.likeminds.feed.android.core.report.style.LMFeedReportFragmentViewStyl import com.likeminds.feed.android.core.topicselection.style.LMFeedTopicSelectionFragmentViewStyle import com.likeminds.feed.android.core.ui.widgets.poll.style.LMFeedAddPollOptionBottomSheetFragmentStyle import com.likeminds.feed.android.core.ui.widgets.poll.style.LMFeedAnonymousPollDialogFragmentStyle -import com.likeminds.feed.android.core.socialfeed.style.LMFeedUniversalFeedFragmentViewStyle +import com.likeminds.feed.android.core.socialfeed.style.LMFeedSocialFeedFragmentViewStyle object LMFeedStyleTransformer { @JvmStatic - var universalFeedFragmentViewStyle: LMFeedUniversalFeedFragmentViewStyle = - LMFeedUniversalFeedFragmentViewStyle.Builder().build() + var socialFeedFragmentViewStyle: LMFeedSocialFeedFragmentViewStyle = + LMFeedSocialFeedFragmentViewStyle.Builder().build() @JvmStatic var postViewStyle: LMFeedPostViewStyle = LMFeedPostViewStyle.Builder().build() diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/utils/LMFeedViewDataConvertor.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/utils/LMFeedViewDataConvertor.kt index 56b6cd57..3e650803 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/utils/LMFeedViewDataConvertor.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/utils/LMFeedViewDataConvertor.kt @@ -131,8 +131,8 @@ object LMFeedViewDataConvertor { .build() } - // converts response of the universal feed post to list of LMFeedPostViewData - fun convertUniversalFeedPosts( + // converts response of the get feed post to list of LMFeedPostViewData + fun convertGetFeedPosts( posts: List, usersMap: Map, topicsMap: Map, diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/utils/analytics/LMFeedAnalytics.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/utils/analytics/LMFeedAnalytics.kt index 06e90222..2a4b4636 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/utils/analytics/LMFeedAnalytics.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/utils/analytics/LMFeedAnalytics.kt @@ -72,7 +72,7 @@ object LMFeedAnalytics { object Source { const val DEEP_LINK = "deep_link" const val NOTIFICATION = "notification" - const val UNIVERSAL_FEED = "universal_feed" + const val SOCIAL_FEED = "social_feed" const val POST_DETAIL = "post_detail" } @@ -104,7 +104,7 @@ object LMFeedAnalytics { track( Events.FEED_OPENED, mapOf( - "feed_type" to "universal_feed" + "feed_type" to "social_feed" ) ) } diff --git a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/utils/video/LMFeedPostVideoAutoPlayHelper.kt b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/utils/video/LMFeedPostVideoAutoPlayHelper.kt index cea1232b..4c025834 100644 --- a/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/utils/video/LMFeedPostVideoAutoPlayHelper.kt +++ b/likeminds-feed-android-core/src/main/java/com/likeminds/feed/android/core/utils/video/LMFeedPostVideoAutoPlayHelper.kt @@ -8,7 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.likeminds.feed.android.core.databinding.* import com.likeminds.feed.android.core.post.detail.adapter.LMFeedPostDetailAdapter import com.likeminds.feed.android.core.ui.base.views.LMFeedVideoView -import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedUniversalFeedAdapter +import com.likeminds.feed.android.core.socialfeed.adapter.LMFeedSocialFeedAdapter import com.likeminds.feed.android.core.socialfeed.model.LMFeedPostViewData import com.likeminds.feed.android.core.utils.LMFeedViewUtils import com.likeminds.feed.android.core.utils.base.LMFeedDataBoundViewHolder @@ -42,7 +42,7 @@ class LMFeedPostVideoAutoPlayHelper private constructor(private val recyclerView when (recyclerView.adapter) { // the recycler view is of [FeedFragment] - is LMFeedUniversalFeedAdapter -> { + is LMFeedSocialFeedAdapter -> { playMostVisibleItem() } @@ -196,7 +196,7 @@ class LMFeedPostVideoAutoPlayHelper private constructor(private val recyclerView private fun attachVideoPlayerAt(pos: Int) { recyclerView.adapter.apply { when (this) { - is LMFeedUniversalFeedAdapter -> { + is LMFeedSocialFeedAdapter -> { val item = this[pos] handleVideoPlay( pos, diff --git a/likeminds-feed-android-core/src/main/res/layout/lm_feed_fragment_universal_feed.xml b/likeminds-feed-android-core/src/main/res/layout/lm_feed_fragment_social_feed.xml similarity index 94% rename from likeminds-feed-android-core/src/main/res/layout/lm_feed_fragment_universal_feed.xml rename to likeminds-feed-android-core/src/main/res/layout/lm_feed_fragment_social_feed.xml index 69c5d083..57b465c3 100644 --- a/likeminds-feed-android-core/src/main/res/layout/lm_feed_fragment_universal_feed.xml +++ b/likeminds-feed-android-core/src/main/res/layout/lm_feed_fragment_social_feed.xml @@ -9,7 +9,7 @@ android:background="@color/lm_feed_cultured"> + app:layout_constraintTop_toBottomOf="@id/header_view_social" /> - - + app:layout_constraintTop_toBottomOf="@id/header_view_social" /> \ No newline at end of file diff --git a/likeminds-feed-android-core/src/main/res/layout/lm_feed_header_view.xml b/likeminds-feed-android-core/src/main/res/layout/lm_feed_header_view.xml index 8cec0adc..b9636d2a 100644 --- a/likeminds-feed-android-core/src/main/res/layout/lm_feed_header_view.xml +++ b/likeminds-feed-android-core/src/main/res/layout/lm_feed_header_view.xml @@ -95,8 +95,8 @@ - 4dp - + 15sp 20dp 4dp - 36dp + 36dp 30dp 10sp 6dp diff --git a/social-feed/src/main/java/com/likeminds/feedsocial/MainActivity.kt b/social-feed/src/main/java/com/likeminds/feedsocial/MainActivity.kt index 75d0b6c2..0ef61d90 100644 --- a/social-feed/src/main/java/com/likeminds/feedsocial/MainActivity.kt +++ b/social-feed/src/main/java/com/likeminds/feedsocial/MainActivity.kt @@ -4,9 +4,9 @@ import android.os.Bundle import android.util.Log import androidx.appcompat.app.AppCompatActivity import com.likeminds.feed.android.core.LMFeedCore +import com.likeminds.feed.android.core.socialfeed.view.LMFeedSocialFeedFragment import com.likeminds.feedsocial.LMFeedExample.Companion.LM_FEED_EXAMPLE_TAG import com.likeminds.feedsocial.auth.util.AuthPreferences -import com.likeminds.feedsocial.universalfeed.CustomLMUniversalFeedAdminFragment import kotlinx.coroutines.* class MainActivity : AppCompatActivity() { @@ -51,7 +51,7 @@ class MainActivity : AppCompatActivity() { private fun replaceFragment() { val containerViewId = R.id.frame_layout - val fragment = CustomLMUniversalFeedAdminFragment() + val fragment = LMFeedSocialFeedFragment() val transaction = supportFragmentManager.beginTransaction() transaction.replace(containerViewId, fragment, containerViewId.toString()) diff --git a/social-feed/src/main/java/com/likeminds/feedsocial/universalfeed/CustomLMUniversalFeedAdminFragment.kt b/social-feed/src/main/java/com/likeminds/feedsocial/universalfeed/CustomLMUniversalFeedAdminFragment.kt deleted file mode 100644 index 5bd20c6c..00000000 --- a/social-feed/src/main/java/com/likeminds/feedsocial/universalfeed/CustomLMUniversalFeedAdminFragment.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.likeminds.feedsocial.universalfeed - -import com.likeminds.feed.android.core.socialfeed.view.LMFeedUniversalFeedFragment - -class CustomLMUniversalFeedAdminFragment : LMFeedUniversalFeedFragment() \ No newline at end of file From 2044c44e85a0b7971fc788f71b2f1dd207a9bce5 Mon Sep 17 00:00:00 2001 From: Siddharth Dubey <122088830+sidcr7-likeminds@users.noreply.github.com> Date: Mon, 29 Jul 2024 22:52:58 +0530 Subject: [PATCH 05/51] created video feed module --- .DS_Store | Bin 10244 -> 10244 bytes settings.gradle | 1 + social-feed/src/main/AndroidManifest.xml | 6 +- .../com/likeminds/feedsocial/GetTokensTask.kt | 16 +- .../{LMFeedExample.kt => LMSocialFeed.kt} | 10 +- ...ice.kt => LMSocialFeedMessagingService.kt} | 2 +- .../com/likeminds/feedsocial/MainActivity.kt | 12 +- ...nces.kt => LMSocialFeedAuthPreferences.kt} | 6 +- ...ctivity.kt => LMSocialFeedAuthActivity.kt} | 24 +-- ...auth.xml => activity_feed_social_auth.xml} | 0 social-feed/src/main/res/values/strings.xml | 2 +- video-feed/.gitignore | 1 + video-feed/build.gradle | 47 +++++ video-feed/lm-feed-video-dependencies.gradle | 15 ++ video-feed/proguard-rules.pro | 21 +++ .../feedvideo/ExampleInstrumentedTest.kt | 24 +++ video-feed/src/main/AndroidManifest.xml | 57 ++++++ .../com/likeminds/feedvideo/GetTokensTask.kt | 85 +++++++++ .../com/likeminds/feedvideo/LMVideoFeed.kt | 55 ++++++ .../feedvideo/LMVideoFeedMessagingService.kt | 29 +++ .../com/likeminds/feedvideo/MainActivity.kt | 54 ++++++ .../auth/util/LMVideoFeedAuthPreferences.kt | 68 +++++++ .../auth/view/LMVideoFeedAuthActivity.kt | 103 +++++++++++ .../res/drawable/ic_launcher_background.xml | 170 ++++++++++++++++++ .../res/drawable/ic_launcher_foreground.xml | 30 ++++ .../res/layout/activity_feed_video_auth.xml | 123 +++++++++++++ .../src/main/res/layout/activity_main.xml | 19 ++ .../src/main/res/layout/fragment_main.xml | 21 +++ .../res/mipmap-anydpi-v26/ic_launcher.xml | 6 + .../mipmap-anydpi-v26/ic_launcher_round.xml | 6 + .../src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 1404 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 0 -> 2898 bytes .../src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 982 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 0 -> 1772 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 1900 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 0 -> 3918 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 2884 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 0 -> 5914 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 3844 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 0 -> 7778 bytes .../src/main/res/values-night/themes.xml | 16 ++ video-feed/src/main/res/values/colors.xml | 10 ++ video-feed/src/main/res/values/strings.xml | 11 ++ video-feed/src/main/res/values/themes.xml | 16 ++ .../likeminds/feedvideo/ExampleUnitTest.kt | 17 ++ 45 files changed, 1044 insertions(+), 39 deletions(-) rename social-feed/src/main/java/com/likeminds/feedsocial/{LMFeedExample.kt => LMSocialFeed.kt} (85%) rename social-feed/src/main/java/com/likeminds/feedsocial/{LMFeedExampleMessagingService.kt => LMSocialFeedMessagingService.kt} (93%) rename social-feed/src/main/java/com/likeminds/feedsocial/auth/util/{AuthPreferences.kt => LMSocialFeedAuthPreferences.kt} (88%) rename social-feed/src/main/java/com/likeminds/feedsocial/auth/view/{AuthActivity.kt => LMSocialFeedAuthActivity.kt} (76%) rename social-feed/src/main/res/layout/{activity_auth.xml => activity_feed_social_auth.xml} (100%) create mode 100644 video-feed/.gitignore create mode 100644 video-feed/build.gradle create mode 100644 video-feed/lm-feed-video-dependencies.gradle create mode 100644 video-feed/proguard-rules.pro create mode 100644 video-feed/src/androidTest/java/com/likeminds/feedvideo/ExampleInstrumentedTest.kt create mode 100644 video-feed/src/main/AndroidManifest.xml create mode 100644 video-feed/src/main/java/com/likeminds/feedvideo/GetTokensTask.kt create mode 100644 video-feed/src/main/java/com/likeminds/feedvideo/LMVideoFeed.kt create mode 100644 video-feed/src/main/java/com/likeminds/feedvideo/LMVideoFeedMessagingService.kt create mode 100644 video-feed/src/main/java/com/likeminds/feedvideo/MainActivity.kt create mode 100644 video-feed/src/main/java/com/likeminds/feedvideo/auth/util/LMVideoFeedAuthPreferences.kt create mode 100644 video-feed/src/main/java/com/likeminds/feedvideo/auth/view/LMVideoFeedAuthActivity.kt create mode 100644 video-feed/src/main/res/drawable/ic_launcher_background.xml create mode 100644 video-feed/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 video-feed/src/main/res/layout/activity_feed_video_auth.xml create mode 100644 video-feed/src/main/res/layout/activity_main.xml create mode 100644 video-feed/src/main/res/layout/fragment_main.xml create mode 100644 video-feed/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 video-feed/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 video-feed/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 video-feed/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 video-feed/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 video-feed/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 video-feed/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 video-feed/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 video-feed/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 video-feed/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 video-feed/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 video-feed/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 video-feed/src/main/res/values-night/themes.xml create mode 100644 video-feed/src/main/res/values/colors.xml create mode 100644 video-feed/src/main/res/values/strings.xml create mode 100644 video-feed/src/main/res/values/themes.xml create mode 100644 video-feed/src/test/java/com/likeminds/feedvideo/ExampleUnitTest.kt diff --git a/.DS_Store b/.DS_Store index 206b66e2de7a64a33b6df4d6d64ba3dc3707d2ba..f923b85ce95c938779ad84ec6e5f5bca3e12654a 100644 GIT binary patch delta 469 zcmZn(XbITBDa_5vki<~Rkjaq4kTO|9Kz=f(u*GBrQQpmrqL-QM6@bFI47vhv z0%R32fNFEV`imwn64ae6B2ggD4V23Vo0ABXgWEbeOGw@thg?~3QC?1dUOEE< z10xV~F_Zyq0J$t5N&h|pc}1);$htQcPGg_gAibGg;TOy1E-^30!Q**NqCF1)cfn?f delta 486 zcmZn(XbITBDLmO&*rJ}DA(f$mA(0`Mp@1QWA=NV{KRGEUKZ${XL4bjQ=_-)c`ws>{ z76SvC>ZJ1G0;uYpNd-BX#U%y?*BF_YSyuu5=%;pof3b-Kd&S)GcUCWtRpie6{sdAJTosPzuYOmG%uwXtT`AW!NJMF z880ANU2S4)rlVkFXk4qKP;F>v0_2z*o7UEHa)>JHTL;Bw=j7()cY|Hdz{m)p8F-;I zn5qYoJwS}+v7B_n;N<+=0)0JYwxT(xEVw8yCqFM8C diff --git a/settings.gradle b/settings.gradle index 02d47830..aa423049 100644 --- a/settings.gradle +++ b/settings.gradle @@ -20,3 +20,4 @@ dependencyResolutionManagement { rootProject.name = "likeminds-feed-android" include ':social-feed' include ':likeminds-feed-android-core' +include ':video-feed' diff --git a/social-feed/src/main/AndroidManifest.xml b/social-feed/src/main/AndroidManifest.xml index 128a38e1..fb519a8d 100644 --- a/social-feed/src/main/AndroidManifest.xml +++ b/social-feed/src/main/AndroidManifest.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools"> @@ -45,7 +45,7 @@ android:theme="@style/LMFeedAppTheme.NoActionBar" /> diff --git a/social-feed/src/main/java/com/likeminds/feedsocial/GetTokensTask.kt b/social-feed/src/main/java/com/likeminds/feedsocial/GetTokensTask.kt index 1f254a9a..4766001c 100644 --- a/social-feed/src/main/java/com/likeminds/feedsocial/GetTokensTask.kt +++ b/social-feed/src/main/java/com/likeminds/feedsocial/GetTokensTask.kt @@ -2,8 +2,8 @@ package com.likeminds.feedsocial import android.content.Context import android.util.Log -import com.likeminds.feedsocial.LMFeedExample.Companion.LM_FEED_EXAMPLE_TAG -import com.likeminds.feedsocial.auth.util.AuthPreferences +import com.likeminds.feedsocial.LMSocialFeed.Companion.LM_SOCIAL_FEED_TAG +import com.likeminds.feedsocial.auth.util.LMSocialFeedAuthPreferences import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.json.JSONObject @@ -13,7 +13,7 @@ import java.net.URL class GetTokensTask { - private lateinit var authPreferences: AuthPreferences + private lateinit var lmSocialFeedAuthPreferences: LMSocialFeedAuthPreferences // Get tokens from the server suspend fun getTokens(context: Context, isProd: Boolean): Pair { @@ -25,7 +25,7 @@ class GetTokensTask { "https://betaauth.likeminds.community/sdk/initiate" } - authPreferences = AuthPreferences(context) + lmSocialFeedAuthPreferences = LMSocialFeedAuthPreferences(context) // Create connection val url = URL(apiUrl) @@ -39,7 +39,7 @@ class GetTokensTask { "Content-Type", "application/json" ) - setRequestProperty("x-api-key", authPreferences.getApiKey()) + setRequestProperty("x-api-key", lmSocialFeedAuthPreferences.getApiKey()) setRequestProperty("x-version-code", "15") setRequestProperty("x-platform-code", "an") setRequestProperty("x-sdk-source", "feed") @@ -47,8 +47,8 @@ class GetTokensTask { // Create request body val request = JSONObject().apply { - put("uuid", authPreferences.getUserId()) - put("user_name", authPreferences.getUserName()) + put("uuid", lmSocialFeedAuthPreferences.getUserId()) + put("user_name", lmSocialFeedAuthPreferences.getUserName()) put("token_expiry_beta", 1) put("rtm_token_expiry_beta", 2) } @@ -77,7 +77,7 @@ class GetTokensTask { val refreshToken = data.getString("refresh_token") Pair(accessToken, refreshToken) } else { - Log.e(LM_FEED_EXAMPLE_TAG, "Error: HTTP $responseCode") + Log.e(LM_SOCIAL_FEED_TAG, "Error: HTTP $responseCode") Pair("", "") } } diff --git a/social-feed/src/main/java/com/likeminds/feedsocial/LMFeedExample.kt b/social-feed/src/main/java/com/likeminds/feedsocial/LMSocialFeed.kt similarity index 85% rename from social-feed/src/main/java/com/likeminds/feedsocial/LMFeedExample.kt rename to social-feed/src/main/java/com/likeminds/feedsocial/LMSocialFeed.kt index 63cd00d6..9c038852 100644 --- a/social-feed/src/main/java/com/likeminds/feedsocial/LMFeedExample.kt +++ b/social-feed/src/main/java/com/likeminds/feedsocial/LMSocialFeed.kt @@ -9,10 +9,10 @@ import com.likeminds.feed.android.core.LMFeedCoreCallback import kotlinx.coroutines.runBlocking -class LMFeedExample : Application(), LMFeedCoreCallback { +class LMSocialFeed : Application(), LMFeedCoreCallback { companion object { - const val LM_FEED_EXAMPLE_TAG = "LMFeedExample" + const val LM_SOCIAL_FEED_TAG = "LMSocialFeed" } @SuppressLint("HardwareIds") @@ -31,7 +31,7 @@ class LMFeedExample : Application(), LMFeedCoreCallback { override fun onAccessTokenExpiredAndRefreshed(accessToken: String, refreshToken: String) { Log.d( - LM_FEED_EXAMPLE_TAG, """ + LM_SOCIAL_FEED_TAG, """ Example Layer Callback -> onAccessTokenExpiredAndRefreshed accessToken: $accessToken refreshToken: $refreshToken @@ -42,14 +42,14 @@ class LMFeedExample : Application(), LMFeedCoreCallback { override fun onRefreshTokenExpired(): Pair { return runBlocking { Log.d( - LM_FEED_EXAMPLE_TAG, """ + LM_SOCIAL_FEED_TAG, """ Example Layer Callback -> onRefreshTokenExpired """.trimIndent() ) val task = GetTokensTask() val tokens = task.getTokens(applicationContext, false) - Log.d(LM_FEED_EXAMPLE_TAG, "tokens: $tokens") + Log.d(LM_SOCIAL_FEED_TAG, "tokens: $tokens") tokens } } diff --git a/social-feed/src/main/java/com/likeminds/feedsocial/LMFeedExampleMessagingService.kt b/social-feed/src/main/java/com/likeminds/feedsocial/LMSocialFeedMessagingService.kt similarity index 93% rename from social-feed/src/main/java/com/likeminds/feedsocial/LMFeedExampleMessagingService.kt rename to social-feed/src/main/java/com/likeminds/feedsocial/LMSocialFeedMessagingService.kt index 33892114..7b883af8 100644 --- a/social-feed/src/main/java/com/likeminds/feedsocial/LMFeedExampleMessagingService.kt +++ b/social-feed/src/main/java/com/likeminds/feedsocial/LMSocialFeedMessagingService.kt @@ -6,7 +6,7 @@ import com.google.firebase.messaging.RemoteMessage import com.likeminds.feed.android.core.LMFeedCoreApplication.Companion.LOG_TAG import com.likeminds.feed.android.core.pushnotification.LMFeedNotificationHandler -class LMFeedExampleMessagingService : FirebaseMessagingService() { +class LMSocialFeedMessagingService : FirebaseMessagingService() { private lateinit var mNotificationHandler: LMFeedNotificationHandler diff --git a/social-feed/src/main/java/com/likeminds/feedsocial/MainActivity.kt b/social-feed/src/main/java/com/likeminds/feedsocial/MainActivity.kt index 0ef61d90..d0a30f24 100644 --- a/social-feed/src/main/java/com/likeminds/feedsocial/MainActivity.kt +++ b/social-feed/src/main/java/com/likeminds/feedsocial/MainActivity.kt @@ -5,19 +5,19 @@ import android.util.Log import androidx.appcompat.app.AppCompatActivity import com.likeminds.feed.android.core.LMFeedCore import com.likeminds.feed.android.core.socialfeed.view.LMFeedSocialFeedFragment -import com.likeminds.feedsocial.LMFeedExample.Companion.LM_FEED_EXAMPLE_TAG -import com.likeminds.feedsocial.auth.util.AuthPreferences +import com.likeminds.feedsocial.LMSocialFeed.Companion.LM_SOCIAL_FEED_TAG +import com.likeminds.feedsocial.auth.util.LMSocialFeedAuthPreferences import kotlinx.coroutines.* class MainActivity : AppCompatActivity() { - private lateinit var authPreferences: AuthPreferences + private lateinit var lmSocialFeedAuthPreferences: LMSocialFeedAuthPreferences override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) - authPreferences = AuthPreferences(this) + lmSocialFeedAuthPreferences = LMSocialFeedAuthPreferences(this) //without API Key Security // LMFeedCore.showFeed( @@ -43,7 +43,7 @@ class MainActivity : AppCompatActivity() { replaceFragment() }, error = { - Log.e(LM_FEED_EXAMPLE_TAG, "$it") + Log.e(LM_SOCIAL_FEED_TAG, "$it") } ) } @@ -62,7 +62,7 @@ class MainActivity : AppCompatActivity() { CoroutineScope(Dispatchers.IO).launch { val task = GetTokensTask() val tokens = task.getTokens(applicationContext, false) - Log.d(LM_FEED_EXAMPLE_TAG, "tokens: $tokens") + Log.d(LM_SOCIAL_FEED_TAG, "tokens: $tokens") callback(tokens.first, tokens.second) } } diff --git a/social-feed/src/main/java/com/likeminds/feedsocial/auth/util/AuthPreferences.kt b/social-feed/src/main/java/com/likeminds/feedsocial/auth/util/LMSocialFeedAuthPreferences.kt similarity index 88% rename from social-feed/src/main/java/com/likeminds/feedsocial/auth/util/AuthPreferences.kt rename to social-feed/src/main/java/com/likeminds/feedsocial/auth/util/LMSocialFeedAuthPreferences.kt index 4fb3a32b..4a6d2210 100644 --- a/social-feed/src/main/java/com/likeminds/feedsocial/auth/util/AuthPreferences.kt +++ b/social-feed/src/main/java/com/likeminds/feedsocial/auth/util/LMSocialFeedAuthPreferences.kt @@ -5,10 +5,10 @@ import android.content.Context import android.content.SharedPreferences import android.provider.Settings -class AuthPreferences(context: Context) { +class LMSocialFeedAuthPreferences(context: Context) { companion object { - const val AUTH_PREFS = "auth_prefs" + const val SOCIAL_FEED_AUTH_PREFS = "social_feed_auth_prefs" const val API_KEY = "api_key" const val USER_NAME = "user_name" const val USER_ID = "user_id" @@ -16,7 +16,7 @@ class AuthPreferences(context: Context) { } private val preferences: SharedPreferences = - context.getSharedPreferences(AUTH_PREFS, Context.MODE_PRIVATE) + context.getSharedPreferences(SOCIAL_FEED_AUTH_PREFS, Context.MODE_PRIVATE) @SuppressLint("HardwareIds") private val deviceId = diff --git a/social-feed/src/main/java/com/likeminds/feedsocial/auth/view/AuthActivity.kt b/social-feed/src/main/java/com/likeminds/feedsocial/auth/view/LMSocialFeedAuthActivity.kt similarity index 76% rename from social-feed/src/main/java/com/likeminds/feedsocial/auth/view/AuthActivity.kt rename to social-feed/src/main/java/com/likeminds/feedsocial/auth/view/LMSocialFeedAuthActivity.kt index c32102bf..758b78f2 100644 --- a/social-feed/src/main/java/com/likeminds/feedsocial/auth/view/AuthActivity.kt +++ b/social-feed/src/main/java/com/likeminds/feedsocial/auth/view/LMSocialFeedAuthActivity.kt @@ -7,23 +7,23 @@ import com.likeminds.feed.android.core.utils.LMFeedRoute import com.likeminds.feed.android.core.utils.LMFeedViewUtils import com.likeminds.feedsocial.MainActivity import com.likeminds.feedsocial.R -import com.likeminds.feedsocial.auth.util.AuthPreferences -import com.likeminds.feedsocial.databinding.ActivityAuthBinding +import com.likeminds.feedsocial.auth.util.LMSocialFeedAuthPreferences +import com.likeminds.feedsocial.databinding.ActivityFeedSocialAuthBinding -class AuthActivity : AppCompatActivity() { +class LMSocialFeedAuthActivity : AppCompatActivity() { - private lateinit var binding: ActivityAuthBinding + private lateinit var binding: ActivityFeedSocialAuthBinding - private lateinit var authPreferences: AuthPreferences + private lateinit var lmSocialFeedAuthPreferences: LMSocialFeedAuthPreferences override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - authPreferences = AuthPreferences(this) - binding = ActivityAuthBinding.inflate(layoutInflater) + lmSocialFeedAuthPreferences = LMSocialFeedAuthPreferences(this) + binding = ActivityFeedSocialAuthBinding.inflate(layoutInflater) setContentView(binding.root) - val isLoggedIn = authPreferences.getIsLoggedIn() + val isLoggedIn = lmSocialFeedAuthPreferences.getIsLoggedIn() if (isLoggedIn) { // user already logged in, navigate using deep linking or to [MainActivity] @@ -91,10 +91,10 @@ class AuthActivity : AppCompatActivity() { } // save login details to auth prefs - authPreferences.saveIsLoggedIn(true) - authPreferences.saveApiKey(apiKey) - authPreferences.saveUserName(userName) - authPreferences.saveUserId(userId) + lmSocialFeedAuthPreferences.saveIsLoggedIn(true) + lmSocialFeedAuthPreferences.saveApiKey(apiKey) + lmSocialFeedAuthPreferences.saveUserName(userName) + lmSocialFeedAuthPreferences.saveUserId(userId) navigateToMainActivity() } diff --git a/social-feed/src/main/res/layout/activity_auth.xml b/social-feed/src/main/res/layout/activity_feed_social_auth.xml similarity index 100% rename from social-feed/src/main/res/layout/activity_auth.xml rename to social-feed/src/main/res/layout/activity_feed_social_auth.xml diff --git a/social-feed/src/main/res/values/strings.xml b/social-feed/src/main/res/values/strings.xml index 4cc449a8..b0f0c7a6 100644 --- a/social-feed/src/main/res/values/strings.xml +++ b/social-feed/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - LikeMinds Feed Android Example + LikeMinds Social Feed Android Start Api Key Enter API Key diff --git a/video-feed/.gitignore b/video-feed/.gitignore new file mode 100644 index 00000000..42afabfd --- /dev/null +++ b/video-feed/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/video-feed/build.gradle b/video-feed/build.gradle new file mode 100644 index 00000000..02b70a84 --- /dev/null +++ b/video-feed/build.gradle @@ -0,0 +1,47 @@ +plugins { + id 'com.android.application' + id 'org.jetbrains.kotlin.android' + id 'kotlin-kapt' + id 'com.google.gms.google-services' +} + +android { + namespace 'com.likeminds.feedvideo' + compileSdk feed_versions.compile_sdk + + defaultConfig { + applicationId "com.likeminds.feedvideo" + minSdk feed_versions.min_sdk + targetSdk feed_versions.target_sdk + versionCode feed_versions.sdk_version_code + versionName "$feed_versions.sdk_version_major.$feed_versions.sdk_version_minor.$feed_versions.sdk_version_patch" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + + buildTypes { + release { + minifyEnabled true + shrinkResources true + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + signingConfig signingConfigs.debug + } + debug { + minifyEnabled false + shrinkResources false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + buildFeatures { + dataBinding = true + } + compileOptions { + sourceCompatibility JavaVersion.VERSION_11 + targetCompatibility JavaVersion.VERSION_11 + } + kotlinOptions { + jvmTarget = JavaVersion.VERSION_11 + } +} + +apply from: "lm-feed-video-dependencies.gradle" \ No newline at end of file diff --git a/video-feed/lm-feed-video-dependencies.gradle b/video-feed/lm-feed-video-dependencies.gradle new file mode 100644 index 00000000..10f73eb7 --- /dev/null +++ b/video-feed/lm-feed-video-dependencies.gradle @@ -0,0 +1,15 @@ +dependencies { + implementation feed_deps.android_core.core + implementation feed_deps.android_core.appcompat + implementation feed_deps.ui.material_design + implementation feed_deps.ui.constraint_layout + + implementation platform(feed_deps.firebase.bom) + implementation feed_deps.firebase.messaging + + testImplementation feed_deps.testing.junit + androidTestImplementation feed_deps.testing.android_junit + androidTestImplementation feed_deps.testing.espresso_core + + implementation project(":likeminds-feed-android-core") +} \ No newline at end of file diff --git a/video-feed/proguard-rules.pro b/video-feed/proguard-rules.pro new file mode 100644 index 00000000..481bb434 --- /dev/null +++ b/video-feed/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/video-feed/src/androidTest/java/com/likeminds/feedvideo/ExampleInstrumentedTest.kt b/video-feed/src/androidTest/java/com/likeminds/feedvideo/ExampleInstrumentedTest.kt new file mode 100644 index 00000000..a4c5b7d4 --- /dev/null +++ b/video-feed/src/androidTest/java/com/likeminds/feedvideo/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.likeminds.feedvideo + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("com.likeminds.feedvideo", appContext.packageName) + } +} \ No newline at end of file diff --git a/video-feed/src/main/AndroidManifest.xml b/video-feed/src/main/AndroidManifest.xml new file mode 100644 index 00000000..59dfc4ef --- /dev/null +++ b/video-feed/src/main/AndroidManifest.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/video-feed/src/main/java/com/likeminds/feedvideo/GetTokensTask.kt b/video-feed/src/main/java/com/likeminds/feedvideo/GetTokensTask.kt new file mode 100644 index 00000000..e906e7ea --- /dev/null +++ b/video-feed/src/main/java/com/likeminds/feedvideo/GetTokensTask.kt @@ -0,0 +1,85 @@ +package com.likeminds.feedvideo + +import android.content.Context +import android.util.Log +import com.likeminds.feedvideo.LMVideoFeed.Companion.LM_VIDEO_FEED_TAG +import com.likeminds.feedvideo.auth.util.LMVideoFeedAuthPreferences +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext +import org.json.JSONObject +import java.io.* +import java.net.HttpURLConnection +import java.net.URL + +class GetTokensTask { + + private lateinit var lmVideoFeedAuthPreferences: LMVideoFeedAuthPreferences + + // Get tokens from the server + suspend fun getTokens(context: Context, isProd: Boolean): Pair { + return withContext(Dispatchers.IO) { + //get api url + val apiUrl = if (isProd) { + "https://auth.likeminds.community/sdk/initiate" + } else { + "https://betaauth.likeminds.community/sdk/initiate" + } + + lmVideoFeedAuthPreferences = LMVideoFeedAuthPreferences(context) + + // Create connection + val url = URL(apiUrl) + val connection = url.openConnection() as HttpURLConnection + + // Set HTTP method and required headers + connection.apply { + requestMethod = "POST" + doOutput = true + setRequestProperty( + "Content-Type", + "application/json" + ) + setRequestProperty("x-api-key", lmVideoFeedAuthPreferences.getApiKey()) + setRequestProperty("x-version-code", "15") + setRequestProperty("x-platform-code", "an") + setRequestProperty("x-sdk-source", "feed") + } + + // Create request body + val request = JSONObject().apply { + put("uuid", lmVideoFeedAuthPreferences.getUserId()) + put("user_name", lmVideoFeedAuthPreferences.getUserName()) + put("token_expiry_beta", 1) + put("rtm_token_expiry_beta", 2) + } + + // Write POST data + val writer = OutputStreamWriter(connection.outputStream) + writer.write(request.toString()) + writer.flush() + writer.close() + + // Get response + val responseCode = connection.responseCode + if (responseCode == HttpURLConnection.HTTP_OK) { + val reader = BufferedReader(InputStreamReader(connection.inputStream)) + val response = StringBuilder() + var line: String? + while (reader.readLine().also { line = it } != null) { + response.append(line) + } + reader.close() + response.toString() + + val responseObject = JSONObject(response.toString()) + val data = responseObject.getJSONObject("data") + val accessToken = data.getString("access_token") + val refreshToken = data.getString("refresh_token") + Pair(accessToken, refreshToken) + } else { + Log.e(LM_VIDEO_FEED_TAG, "Error: HTTP $responseCode") + Pair("", "") + } + } + } +} \ No newline at end of file diff --git a/video-feed/src/main/java/com/likeminds/feedvideo/LMVideoFeed.kt b/video-feed/src/main/java/com/likeminds/feedvideo/LMVideoFeed.kt new file mode 100644 index 00000000..fa9ef988 --- /dev/null +++ b/video-feed/src/main/java/com/likeminds/feedvideo/LMVideoFeed.kt @@ -0,0 +1,55 @@ +package com.likeminds.feedvideo + +import android.annotation.SuppressLint +import android.app.Application +import android.provider.Settings +import android.util.Log +import com.likeminds.feed.android.core.LMFeedCore +import com.likeminds.feed.android.core.LMFeedCoreCallback +import kotlinx.coroutines.runBlocking + +class LMVideoFeed : Application(), LMFeedCoreCallback { + + companion object { + const val LM_VIDEO_FEED_TAG = "LMVideoFeed" + } + + @SuppressLint("HardwareIds") + override fun onCreate() { + super.onCreate() + + val deviceId = Settings.Secure.getString(contentResolver, Settings.Secure.ANDROID_ID) ?: "" + LMFeedCore.setup( + application = this, + enablePushNotifications = true, + deviceId = deviceId, + domain = "https://www.samplefeed.com", + lmFeedCoreCallback = this + ) + } + + override fun onAccessTokenExpiredAndRefreshed(accessToken: String, refreshToken: String) { + Log.d( + LM_VIDEO_FEED_TAG, """ + Example Layer Callback -> onAccessTokenExpiredAndRefreshed + accessToken: $accessToken + refreshToken: $refreshToken + """.trimIndent() + ) + } + + override fun onRefreshTokenExpired(): Pair { + return runBlocking { + Log.d( + LM_VIDEO_FEED_TAG, """ + Example Layer Callback -> onRefreshTokenExpired + """.trimIndent() + ) + + val task = GetTokensTask() + val tokens = task.getTokens(applicationContext, false) + Log.d(LM_VIDEO_FEED_TAG, "tokens: $tokens") + tokens + } + } +} \ No newline at end of file diff --git a/video-feed/src/main/java/com/likeminds/feedvideo/LMVideoFeedMessagingService.kt b/video-feed/src/main/java/com/likeminds/feedvideo/LMVideoFeedMessagingService.kt new file mode 100644 index 00000000..6974c21d --- /dev/null +++ b/video-feed/src/main/java/com/likeminds/feedvideo/LMVideoFeedMessagingService.kt @@ -0,0 +1,29 @@ +package com.likeminds.feedvideo + +import android.util.Log +import com.google.firebase.messaging.FirebaseMessagingService +import com.google.firebase.messaging.RemoteMessage +import com.likeminds.feed.android.core.LMFeedCoreApplication.Companion.LOG_TAG +import com.likeminds.feed.android.core.pushnotification.LMFeedNotificationHandler + +class LMVideoFeedMessagingService : FirebaseMessagingService() { + + private lateinit var mNotificationHandler: LMFeedNotificationHandler + + override fun onCreate() { + super.onCreate() + mNotificationHandler = LMFeedNotificationHandler.getInstance() + mNotificationHandler.create(this.application) + } + + override fun onNewToken(token: String) { + super.onNewToken(token) + Log.d(LOG_TAG, "token generated: $token") + } + + override fun onMessageReceived(message: RemoteMessage) { + super.onMessageReceived(message) + Log.d(LOG_TAG, "message generated: ${message.data}") + mNotificationHandler.handleNotification(message.data) + } +} \ No newline at end of file diff --git a/video-feed/src/main/java/com/likeminds/feedvideo/MainActivity.kt b/video-feed/src/main/java/com/likeminds/feedvideo/MainActivity.kt new file mode 100644 index 00000000..aa4de8ab --- /dev/null +++ b/video-feed/src/main/java/com/likeminds/feedvideo/MainActivity.kt @@ -0,0 +1,54 @@ +package com.likeminds.feedvideo + +import android.os.Bundle +import android.util.Log +import androidx.appcompat.app.AppCompatActivity +import com.likeminds.feed.android.core.LMFeedCore +import com.likeminds.feed.android.core.socialfeed.view.LMFeedSocialFeedFragment +import com.likeminds.feedvideo.LMVideoFeed.Companion.LM_VIDEO_FEED_TAG +import com.likeminds.feedvideo.auth.util.LMVideoFeedAuthPreferences +import kotlinx.coroutines.* + +class MainActivity : AppCompatActivity() { + private lateinit var lmVideoFeedAuthPreferences: LMVideoFeedAuthPreferences + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_main) + + lmVideoFeedAuthPreferences = LMVideoFeedAuthPreferences(this) + + //with API Key Security + callInitiateUser { accessToken, refreshToken -> + LMFeedCore.showFeed( + this, + accessToken, + refreshToken, + success = { + replaceFragment() + }, + error = { + Log.e(LM_VIDEO_FEED_TAG, "$it") + } + ) + } + } + + private fun replaceFragment() { + val containerViewId = R.id.frame_layout + val fragment = LMFeedSocialFeedFragment() + + val transaction = supportFragmentManager.beginTransaction() + transaction.replace(containerViewId, fragment, containerViewId.toString()) + transaction.commit() + } + + private fun callInitiateUser(callback: (String, String) -> Unit) { + CoroutineScope(Dispatchers.IO).launch { + val task = GetTokensTask() + val tokens = task.getTokens(applicationContext, false) + Log.d(LM_VIDEO_FEED_TAG, "tokens: $tokens") + callback(tokens.first, tokens.second) + } + } +} \ No newline at end of file diff --git a/video-feed/src/main/java/com/likeminds/feedvideo/auth/util/LMVideoFeedAuthPreferences.kt b/video-feed/src/main/java/com/likeminds/feedvideo/auth/util/LMVideoFeedAuthPreferences.kt new file mode 100644 index 00000000..0a5b4bb7 --- /dev/null +++ b/video-feed/src/main/java/com/likeminds/feedvideo/auth/util/LMVideoFeedAuthPreferences.kt @@ -0,0 +1,68 @@ +package com.likeminds.feedvideo.auth.util + +import android.annotation.SuppressLint +import android.content.Context +import android.content.SharedPreferences +import android.provider.Settings + +class LMVideoFeedAuthPreferences(context: Context) { + + companion object { + const val VIDEO_FEED_AUTH_PREFS = "video_feed_auth_prefs" + const val API_KEY = "api_key" + const val USER_NAME = "user_name" + const val USER_ID = "user_id" + const val IS_LOGGED_IN = "is_logged_in" + } + + private val preferences: SharedPreferences = + context.getSharedPreferences(VIDEO_FEED_AUTH_PREFS, Context.MODE_PRIVATE) + + @SuppressLint("HardwareIds") + private val deviceId = + Settings.Secure.getString(context.contentResolver, Settings.Secure.ANDROID_ID) + + fun getApiKey(): String { + return preferences.getString(API_KEY, "") ?: "" + } + + fun saveApiKey(apiKey: String) { + preferences.edit().putString(API_KEY, apiKey).apply() + } + + fun getUserName(): String { + return preferences.getString(USER_NAME, "") ?: "" + } + + fun saveUserName(userName: String) { + preferences.edit().putString(USER_NAME, userName).apply() + } + + fun getUserId(): String { + return preferences.getString(USER_ID, "") ?: "" + } + + fun saveUserId(userId: String) { + preferences.edit().putString(USER_ID, userId).apply() + } + + fun getIsLoggedIn(): Boolean { + return preferences.getBoolean(IS_LOGGED_IN, false) + } + + fun saveIsLoggedIn(isLoggedIn: Boolean) { + preferences.edit().putBoolean(IS_LOGGED_IN, isLoggedIn).apply() + } + + @SuppressLint("HardwareIds") + fun getDeviceId(): String { + return deviceId ?: "" + } + + fun clearPrefs() { + saveApiKey("") + saveUserName("") + saveUserId("") + saveIsLoggedIn(false) + } +} diff --git a/video-feed/src/main/java/com/likeminds/feedvideo/auth/view/LMVideoFeedAuthActivity.kt b/video-feed/src/main/java/com/likeminds/feedvideo/auth/view/LMVideoFeedAuthActivity.kt new file mode 100644 index 00000000..307bf3d9 --- /dev/null +++ b/video-feed/src/main/java/com/likeminds/feedvideo/auth/view/LMVideoFeedAuthActivity.kt @@ -0,0 +1,103 @@ +package com.likeminds.feedvideo.auth.view + +import android.content.Intent +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity +import com.likeminds.feed.android.core.utils.LMFeedRoute +import com.likeminds.feed.android.core.utils.LMFeedViewUtils +import com.likeminds.feedvideo.MainActivity +import com.likeminds.feedvideo.R +import com.likeminds.feedvideo.auth.util.LMVideoFeedAuthPreferences +import com.likeminds.feedvideo.databinding.ActivityFeedVideoAuthBinding + +class LMVideoFeedAuthActivity : AppCompatActivity() { + + private lateinit var binding: ActivityFeedVideoAuthBinding + + private lateinit var lmVideoFeedAuthPreferences: LMVideoFeedAuthPreferences + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + lmVideoFeedAuthPreferences = LMVideoFeedAuthPreferences(this) + binding = ActivityFeedVideoAuthBinding.inflate(layoutInflater) + setContentView(binding.root) + + val isLoggedIn = lmVideoFeedAuthPreferences.getIsLoggedIn() + + if (isLoggedIn) { + // user already logged in, navigate using deep linking or to [MainActivity] + if (intent.data != null) { + parseDeepLink() + } else { + navigateToMainActivity() + } + } else { + // user is not logged in, ask login details. + loginUser() + } + } + + // parses deep link to start corresponding activity + private fun parseDeepLink() { + //get intent for route + val intent = LMFeedRoute.handleDeepLink( + this, + intent.data.toString() + ) + startActivity(intent) + finish() + } + + // navigates user to [MainActivity] + private fun navigateToMainActivity() { + val intent = Intent(this, MainActivity::class.java) + startActivity(intent) + finish() + } + + // validates user input and save login details + private fun loginUser() { + binding.apply { + val context = root.context + + btnLogin.setOnClickListener { + val apiKey = etApiKey.text.toString().trim() + val userName = etUserName.text.toString().trim() + val userId = etUserId.text.toString().trim() + + if (apiKey.isEmpty()) { + LMFeedViewUtils.showShortToast( + context, + getString(R.string.enter_api_key) + ) + return@setOnClickListener + } + + if (userName.isEmpty()) { + LMFeedViewUtils.showShortToast( + context, + getString(R.string.enter_user_name) + ) + return@setOnClickListener + } + + if (userId.isEmpty()) { + LMFeedViewUtils.showShortToast( + context, + getString(R.string.enter_user_id) + ) + return@setOnClickListener + } + + // save login details to auth prefs + lmVideoFeedAuthPreferences.saveIsLoggedIn(true) + lmVideoFeedAuthPreferences.saveApiKey(apiKey) + lmVideoFeedAuthPreferences.saveUserName(userName) + lmVideoFeedAuthPreferences.saveUserId(userId) + + navigateToMainActivity() + } + } + } +} \ No newline at end of file diff --git a/video-feed/src/main/res/drawable/ic_launcher_background.xml b/video-feed/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 00000000..07d5da9c --- /dev/null +++ b/video-feed/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/video-feed/src/main/res/drawable/ic_launcher_foreground.xml b/video-feed/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 00000000..2b068d11 --- /dev/null +++ b/video-feed/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/video-feed/src/main/res/layout/activity_feed_video_auth.xml b/video-feed/src/main/res/layout/activity_feed_video_auth.xml new file mode 100644 index 00000000..77271dd1 --- /dev/null +++ b/video-feed/src/main/res/layout/activity_feed_video_auth.xml @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + +