DesarrolloAntonio · DesarrolloAntonio · Jul 12, 2024 · Jun 14, 2024 · Jun 14, 2024 · Jun 14, 2024
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -5,11 +5,39 @@ on:
     branches:
       - master
       - develop
+      - testing
 
 jobs:
-  build:
+  unit_tests:
     runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: 17
+      - name: Run Unit Tests
+        run: ./gradlew testDebugUnitTest
+
+  android_tests:
+    runs-on: macos-12
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: 17
+      - name: Start Emulator and Run Instrumented Tests
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: 29
+          script: ./gradlew connectedDebugAndroidTest
 
+  build_and_release:
+    runs-on: ubuntu-latest
+    needs: [unit_tests, android_tests]
     steps:
       - uses: actions/checkout@v3
 
@@ -26,9 +54,6 @@ jobs:
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
 
-      - name: Run Unit Tests
-        run: ./gradlew test
-
       - name: Build app
         run: ./gradlew assembleRelease
         env:
@@ -42,7 +67,7 @@ jobs:
 
       - name: Create Release on GitHub
         uses: softprops/action-gh-release@v1
-        if: github.ref == 'refs/heads/master' # Solo crea releases para commits en master
+        if: github.ref == 'refs/heads/master'
         env:
           GITHUB_TOKEN: ${{ secrets.SHIORI_TOKEN }}
         with:

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/build.gradle b/build.gradle
@@ -8,8 +8,8 @@ buildscript {
     }
 }// Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.3.1' apply false
-    id 'com.android.library' version '8.3.1' apply false
+    id 'com.android.application' version '8.5.0' apply false
+    id 'com.android.library' version '8.5.0' apply false
     id 'org.jetbrains.kotlin.android' version '2.0.0' apply false
     id 'org.jetbrains.kotlin.plugin.compose' version '2.0.0' apply false
 }
diff --git a/data/build.gradle.kts b/data/build.gradle.kts
@@ -34,10 +34,15 @@ android {
     kotlinOptions {
         jvmTarget = "17"
     }
-    // JUnit 5 will bundle in files with identical paths, exclude them
     packagingOptions {
-        exclude("META-INF/LICENSE*")
+        jniLibs {
+            excludes += setOf("META-INF/LICENSE*")
+        }
+        resources {
+            excludes += setOf("META-INF/LICENSE*")
+        }
     }
+    // JUnit 5 will bundle in files with identical paths, exclude them
 }
 
 java {

diff --git a/data/src/androidTest/java/com/desarrollodroide/data/local/room/BookmarkHtmlDaoTest.kt b/data/src/androidTest/java/com/desarrollodroide/data/local/room/BookmarkHtmlDaoTest.kt
@@ -0,0 +1,59 @@
+package com.desarrollodroide.data.local.room
+
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider
+import com.desarrollodroide.data.local.room.dao.BookmarkHtmlDao
+import com.desarrollodroide.data.local.room.database.BookmarksDatabase
+import com.desarrollodroide.data.local.room.entity.BookmarkHtmlEntity
+import kotlinx.coroutines.runBlocking
+import org.junit.After
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+class BookmarkHtmlDaoTest {
+
+    private lateinit var database: BookmarksDatabase
+    private lateinit var bookmarkHtmlDao: BookmarkHtmlDao
+
+    private val bookmarkHtml = BookmarkHtmlEntity(
+        id = 1,
+        url = "http://example.com",
+        readableContentHtml = "<html>Test Content</html>"
+    )
+
+    @Before
+    fun setup() {
+        database = Room.inMemoryDatabaseBuilder(
+            ApplicationProvider.getApplicationContext(),
+            BookmarksDatabase::class.java
+        )
+            .allowMainThreadQueries()
+            .build()
+
+        bookmarkHtmlDao = database.bookmarkHtmlDao()
+    }
+
+    @After
+    fun tearDown() {
+        database.close()
+    }
+
+    @Test
+    fun testInsertAndFetchBookmarkHtml(): Unit = runBlocking {
+        bookmarkHtmlDao.insertOrUpdate(bookmarkHtml)
+        val retrievedHtml = bookmarkHtmlDao.getHtmlContent(bookmarkHtml.id)
+        Assert.assertEquals(bookmarkHtml.readableContentHtml, retrievedHtml)
+        bookmarkHtmlDao.getBookmarkHtml(bookmarkHtml.id)?.let {
+            Assert.assertEquals(bookmarkHtml, it)
+        }
+    }
+
+    @Test
+    fun testUpdateBookmarkHtml() = runBlocking {
+        bookmarkHtmlDao.insertOrUpdate(bookmarkHtml)
+        val updatedBookmarkHtml = bookmarkHtml.copy(readableContentHtml = "<html>Updated Content</html>")
+        bookmarkHtmlDao.insertOrUpdate(updatedBookmarkHtml)
+        val retrievedHtml = bookmarkHtmlDao.getHtmlContent(bookmarkHtml.id)
+        Assert.assertEquals(updatedBookmarkHtml.readableContentHtml, retrievedHtml)
+    }
+}
diff --git a/data/src/androidTest/java/com/desarrollodroide/data/local/room/TagsDaoTest.kt b/data/src/androidTest/java/com/desarrollodroide/data/local/room/TagsDaoTest.kt
@@ -0,0 +1,71 @@
+package com.desarrollodroide.data.local.room
+
+import androidx.room.Room
+import androidx.test.core.app.ApplicationProvider
+import com.desarrollodroide.data.local.room.dao.TagDao
+import com.desarrollodroide.data.local.room.database.BookmarksDatabase
+import com.desarrollodroide.data.local.room.entity.TagEntity
+import junit.framework.TestCase.assertFalse
+import junit.framework.TestCase.assertTrue
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.runBlocking
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+
+class TagDaoTest {
+
+    private lateinit var database: BookmarksDatabase
+    private lateinit var tagDao: TagDao
+
+    private val tag = TagEntity(
+        id = 1,
+        name = "Test Tag",
+        nBookmarks = 5
+    )
+
+    @Before
+    fun setup() {
+        database = Room.inMemoryDatabaseBuilder(
+            ApplicationProvider.getApplicationContext(),
+            BookmarksDatabase::class.java
+        )
+            .allowMainThreadQueries()
+            .build()
+
+        tagDao = database.tagDao()
+    }
+
+    @After
+    fun tearDown() {
+        database.close()
+    }
+
+    @Test
+    fun testInsertAndFetchTags() = runBlocking {
+        tagDao.insertTag(tag)
+        val retrievedTags = tagDao.getAllTags().first()
+        assertTrue(retrievedTags.contains(tag))
+        tagDao.deleteAllTags()
+        assertTrue(tagDao.getAllTags().first().isEmpty())
+    }
+
+    @Test
+    fun testDeleteTag() = runBlocking {
+        tagDao.insertTag(tag)
+        tagDao.deleteTag(tag)
+        val retrievedTags = tagDao.getAllTags().first()
+        assertFalse(retrievedTags.contains(tag))
+    }
+
+    @Test
+    fun testInsertAndFetchMultipleTags() = runBlocking {
+        val tags = listOf(
+            TagEntity(1, "Tag1", 2),
+            TagEntity(2, "Tag2", 3)
+        )
+        tagDao.insertAllTags(tags)
+        val retrievedTags = tagDao.getAllTags().first()
+        assertTrue(retrievedTags.containsAll(tags))
+    }
+}
diff --git a/data/src/main/java/com/desarrollodroide/data/di/DataModule.kt b/data/src/main/java/com/desarrollodroide/data/di/DataModule.kt
@@ -6,6 +6,7 @@ import androidx.datastore.preferences.core.PreferenceDataStoreFactory
 import androidx.datastore.preferences.core.emptyPreferences
 import androidx.datastore.preferences.preferencesDataStoreFile
 import com.desarrollodroide.common.result.ErrorHandler
+import com.desarrollodroide.data.local.datastore.HideTagSerializer
 import com.desarrollodroide.data.local.datastore.RememberUserPreferencesSerializer
 import com.desarrollodroide.data.local.datastore.UserPreferencesSerializer
 import com.desarrollodroide.data.local.preferences.SettingsPreferenceDataSource
@@ -33,6 +34,7 @@ fun dataModule() = module {
     val preferencesDataStoreQualifier = named("preferencesDataStore")
     val protoDataStoreQualifier = named("protoDataStore")
     val protoRememberUserDataStoreQualifier = named("protoRememberUserDataStore")
+    val protoHideTagDataStoreQualifier = named("protoHideTagDataStore")
 
     single(preferencesDataStoreQualifier) {
         PreferenceDataStoreFactory.create(
@@ -59,10 +61,19 @@ fun dataModule() = module {
         )
     }
 
+    single(protoHideTagDataStoreQualifier) {
+        DataStoreFactory.create(
+            serializer = HideTagSerializer,
+            produceFile = { androidContext().preferencesDataStoreFile("hide_tag_data")},
+            corruptionHandler = null,
+        )
+    }
+
     single { SettingsPreferencesDataSourceImpl(
         dataStore = get(preferencesDataStoreQualifier),
         protoDataStore = get(protoDataStoreQualifier),
-        rememberUserProtoDataStore = get(protoRememberUserDataStoreQualifier)
+        rememberUserProtoDataStore = get(protoRememberUserDataStoreQualifier),
+        hideTagDataStore = get(protoHideTagDataStoreQualifier)
     ) as SettingsPreferenceDataSource }
 
     single { AuthRepositoryImpl(
@@ -102,8 +113,6 @@ fun dataModule() = module {
         ) as TagsRepository
     }
 
-
-
     single { FileRemoteDataSource() }
     single { ErrorHandlerImpl() as ErrorHandler }
 

diff --git a/data/src/main/java/com/desarrollodroide/data/local/datastore/HideTagSerializer.kt b/data/src/main/java/com/desarrollodroide/data/local/datastore/HideTagSerializer.kt
@@ -0,0 +1,25 @@
+package com.desarrollodroide.data.local.datastore
+
+import androidx.datastore.core.CorruptionException
+import androidx.datastore.core.Serializer
+import com.desarrollodroide.data.HideTag
+import com.google.protobuf.InvalidProtocolBufferException
+import java.io.InputStream
+import java.io.OutputStream
+
+/**
+ * Serializer for the [HideTag] object defined in your .proto file.
+ */
+object HideTagSerializer : Serializer<HideTag> {
+    override val defaultValue: HideTag = HideTag.getDefaultInstance()
+
+    override suspend fun readFrom(input: InputStream): HideTag {
+        try {
+            return HideTag.parseFrom(input)
+        } catch (exception: InvalidProtocolBufferException) {
+            throw CorruptionException("Cannot read proto.", exception)
+        }
+    }
+
+    override suspend fun writeTo(t: HideTag, output: OutputStream) = t.writeTo(output)
+}
diff --git a/...src/main/java/com/desarrollodroide/data/local/preferences/SettingsPreferenceDataSource.kt b/...src/main/java/com/desarrollodroide/data/local/preferences/SettingsPreferenceDataSource.kt
@@ -3,6 +3,7 @@ package com.desarrollodroide.data.local.preferences
 import com.desarrollodroide.data.UserPreferences
 import com.desarrollodroide.data.helpers.ThemeMode
 import com.desarrollodroide.model.Account
+import com.desarrollodroide.model.Tag
 import com.desarrollodroide.model.User
 import kotlinx.coroutines.flow.Flow
 
@@ -46,4 +47,6 @@ interface SettingsPreferenceDataSource {
 
     fun getUseDynamicColors(): Boolean
     fun setUseDynamicColors(newValue: Boolean)
+    suspend fun getHideTag(): Tag?
+    suspend fun setHideTag(tag: Tag?)
 }
diff --git a/...ain/java/com/desarrollodroide/data/local/preferences/SettingsPreferencesDataSourceImpl.kt b/...ain/java/com/desarrollodroide/data/local/preferences/SettingsPreferencesDataSourceImpl.kt
@@ -15,17 +15,20 @@ import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.edit
+import com.desarrollodroide.data.HideTag
 import com.desarrollodroide.data.RememberUserPreferences
 import com.desarrollodroide.data.helpers.ThemeMode
+import com.desarrollodroide.model.Tag
 import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.runBlocking
 
 class SettingsPreferencesDataSourceImpl(
     private val dataStore: DataStore<Preferences>,
     private val protoDataStore: DataStore<UserPreferences>,
-    private val rememberUserProtoDataStore: DataStore<RememberUserPreferences>
+    private val rememberUserProtoDataStore: DataStore<RememberUserPreferences>,
+    private val hideTagDataStore: DataStore<HideTag>,
 
-) : SettingsPreferenceDataSource {
+    ) : SettingsPreferenceDataSource {
 
     val THEME_MODE_KEY = stringPreferencesKey("theme_mode")
     val COMPACT_VIEW = booleanPreferencesKey("compact_view")
@@ -249,4 +252,23 @@ class SettingsPreferencesDataSourceImpl(
         }
     }
 
+    override suspend fun setHideTag(tag: Tag?) {
+        hideTagDataStore.updateData { currentHideTag ->
+            when (tag) {
+                null -> HideTag.getDefaultInstance()
+                else -> currentHideTag.toBuilder()
+                    .setId(tag.id)
+                    .setName(tag.name)
+                    .build()
+            }
+        }
+    }
+
+    override suspend fun getHideTag(): Tag? {
+        return hideTagDataStore.data.first().let { hideTag ->
+            if (hideTag == HideTag.getDefaultInstance()) null
+            else Tag(id = hideTag.id, name = hideTag.name, selected = false, nBookmarks = 0)
+        }
+    }
+
 }
diff --git a/data/src/main/proto/prefs.proto b/data/src/main/proto/prefs.proto
@@ -28,3 +28,11 @@ message RememberUserPreferences {
   bool createArchive = 7;
 
 }
+
+
+message HideTag {
+
+  int32 id = 1;
+  string name = 2;
+
+}