Merge pull request #60 from zouhir96/develop

release 2.0.1

Author: zouhir96

README.md

@@ -3,7 +3,7 @@
 <table align="center">
 <tr>
 <td>
-<img src="imgs/preview.svg" alt="Preview image" /> 
+<img src="imgs/thumbnail.png" alt="Preview image" /> 
 </td>
 </tr>
 </table>
@@ -21,19 +21,37 @@ TypeScript all visualized in an intuitive interface.
 This is the Mobile(Non official) version of [hackertab.dev](https://hackertab.dev) extension brought to your
 phone now so you stay always posted even if you’re not on your pc.
 
-## Demo
-
-<table align="center">
-<tr>
-<td>
-<img src="imgs/demo.gif" alt="Hackertab Android & IOS" /> 
-</td>
-</tr>
-</table>
-
 ## ⬇️ Download
 
-[<img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png" alt="Get it on Google Play" height="90"/>](https://play.google.com/store/apps/details?id=com.zrcoding.hackertab)<br>
+<div style="display: flex; flex-wrap: wrap; justify-content: center; gap: 20px; align-items: center;">
+  <a href="https://play.google.com/store/apps/details?id=com.zrcoding.hackertab" style="display: inline-block;">
+    <img src="imgs/playstore.png" alt="Get it on Google Play" height="80" style="max-width: 100%; height: auto;"/>
+  </a>
+  <a href="https://apps.apple.com/us/app/hackertab-unofficial/id6746347807" style="display: inline-block;">
+    <img src="imgs/appstore.png" alt="Get it on App Store" height="80" style="max-width: 100%; height: auto;"/>
+  </a>
+</div>
+
+<style>
+/* Responsive layout for download buttons */
+@media (max-width: 768px) {
+  div[style*="display: flex"] {
+    flex-direction: column !important;
+    gap: 15px !important;
+  }
+}
+
+@media (min-width: 769px) {
+  div[style*="display: flex"] {
+    flex-direction: row !important;
+    justify-content: center !important;
+    gap: 30px !important;
+  }
+}
+</style>
+
+<br>
+
 You can check the [releases](https://github.com/zouhir96/hackertab-android/releases/latest) page for
 details.
 
@@ -50,14 +68,16 @@ details.
 - Github actions: Run tests, deploy to google play
 
 ## 🛠️ Resources
+
 - Figma: [Design file](https://www.figma.com/file/IMFz1yU7jLCIQL1ZM0X8t7/Hackertab?type=design&node-id=0-1&mode=design&t=7yYklSUnlheLkOaN-0)
 - Trello: [Project board](https://trello.com/b/OaxWzI96/hackertab)
 
 ### Features
 
 - [x] 11 sources of news: Github, Hackernews, Conferences, Devto, Producthunt, Reddit, Lobsters,
-  Hashnode, Freecodecamp, IndieHackers and Medium.
+      Hashnode, Freecodecamp, IndieHackers and Medium.
 - [x] 26 Topics to follow: Android, Kotlin, Java, JavaScript, TypeScript ...
+- [x] Onboarding and app setup
 - [x] Possibility to configure which sources to follow.
 - [x] Possibility to configure which topics to follow.
 - [x] Contact support by email.
@@ -68,7 +88,6 @@ details.
 ### Development
 
 - [ ] Add offline first support
-- [ ] Add onboarding and app install setup
 
 ## 🧩 Requirements
 

app/build.gradle.kts

@@ -49,10 +49,6 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 
-    kotlinOptions {
-        jvmTarget = libs.versions.jvmTarget.get()
-    }
-
     buildFeatures {
         buildConfig = true
     }
@@ -63,6 +59,10 @@ android {
     }
 }
 
+kotlin {
+    jvmToolchain(17)
+}
+
 dependencies {
     implementation(project(":shared"))
 

core/analytics/src/commonMain/kotlin/com/zrcoding/hackertab/analytics/models/AnalyticsEvent.kt

@@ -20,6 +20,7 @@ data class AnalyticsEvent(
         const val SETUP_COMPLETED = "setup_completed"
         const val TOPIC_SELECTION_CHANGED = "topic_selection_changed"
         const val SOURCE_SELECTION_CHANGED = "source_selection_changed"
+        const val SOURCE_FILTER_CHANGED = "source_filter_changed"
         const val TOPIC_FILTER_CHANGED = "topic_filter_changed"
         // Add more standard event types here
     }

core/data/src/commonMain/kotlin/com/zrcoding/hackertab/data/mappers/Mappers.kt

@@ -16,12 +16,14 @@ import com.zrcoding.hackertab.network.dtos.ConferenceDto
 import com.zrcoding.hackertab.network.dtos.GithubDto
 import com.zrcoding.hackertab.network.dtos.IndieHackersDto
 import com.zrcoding.hackertab.network.dtos.ProductHuntDto
-import kotlinx.datetime.Clock
-import kotlinx.datetime.Instant
 import kotlinx.datetime.LocalDateTime
 import kotlinx.datetime.TimeZone
 import kotlinx.datetime.toLocalDateTime
+import kotlin.time.Clock
+import kotlin.time.ExperimentalTime
+import kotlin.time.Instant
 
+@OptIn(ExperimentalTime::class)
 fun Long.toZonedLocalDate(): LocalDateTime = Instant.fromEpochMilliseconds(this)
     .toLocalDateTime(TimeZone.currentSystemDefault())
 
@@ -32,12 +34,12 @@ fun ArticleDto.toFreeCodeCamp() = FreeCodeCamp(
     title = title,
     url = url,
     isoDate = publishedAt.toZonedLocalDate(),
-    categories = tags.orEmpty()
+    categories = tags.orEmpty().take(4)
 )
 
 fun GithubDto.toGithubRepo() = GithubRepo(
     id = id,
-    name = title,
+    title = title,
     description = description,
     owner = owner,
     url = url,
@@ -108,6 +110,7 @@ fun ProductHuntDto.toProductHunt() = ProductHunt(
     tags = tags.orEmpty().take(1)
 )
 
+@OptIn(ExperimentalTime::class)
 fun IndieHackersDto.toIndieHackers() = IndieHackers(
     id = id ?: Clock.System.now().toEpochMilliseconds().toString(),
     title = title,

core/design/src/commonMain/composeResources/drawable/ic_hackertab.xml

@@ -4,6 +4,6 @@
     android:viewportWidth="364.016"
     android:viewportHeight="28.141">
   <path
-      android:fillColor="@color/black"
+      android:fillColor="#000000"
       android:pathData="M7.008,24.626L0.008,24.626L0.008,0.126L7.008,0.126L7.008,7.126L21.008,7.126L21.008,10.626L24.508,10.626L24.508,24.626L17.508,24.626L17.508,10.626L7.008,10.626L7.008,24.626ZM52.503,24.626L31.503,24.626L31.503,21.126L28.003,21.126L28.003,17.626L31.503,17.626L31.503,14.126L45.503,14.126L45.503,10.626L31.503,10.626L31.503,7.126L49.003,7.126L49.003,10.626L52.503,10.626L52.503,24.626ZM35.003,17.626L35.003,21.126L45.503,21.126L45.503,17.626L35.003,17.626ZM80.499,24.626L59.499,24.626L59.499,21.126L55.999,21.126L55.999,10.626L59.499,10.626L59.499,7.126L80.499,7.126L80.499,10.626L62.999,10.626L62.999,21.126L80.499,21.126L80.499,24.626ZM90.994,24.626L83.994,24.626L83.994,0.126L90.994,0.126L90.994,14.126L97.994,14.126L97.994,10.626L101.494,10.626L101.494,7.126L108.494,7.126L108.494,10.626L104.994,10.626L104.994,14.126L101.494,14.126L101.494,17.626L104.994,17.626L104.994,21.126L108.494,21.126L108.494,24.626L101.494,24.626L101.494,21.126L97.994,21.126L97.994,17.626L90.994,17.626L90.994,24.626ZM132.989,24.626L115.489,24.626L115.489,21.126L111.989,21.126L111.989,10.626L115.489,10.626L115.489,7.126L132.989,7.126L132.989,10.626L136.489,10.626L136.489,17.626L118.989,17.626L118.989,21.126L132.989,21.126L132.989,24.626ZM118.989,10.626L118.989,14.126L129.489,14.126L129.489,10.626L118.989,10.626ZM150.485,7.126L150.485,10.626L153.985,10.626L153.985,14.126L150.485,14.126L150.485,24.626L143.485,24.626L143.485,7.126L150.485,7.126ZM153.985,7.126L164.485,7.126L164.485,10.626L153.985,10.626L153.985,7.126ZM185.48,24.626L178.48,24.626L178.48,10.626L171.48,10.626L171.48,7.126L178.48,7.126L178.48,0.126L185.48,0.126L185.48,7.126L192.48,7.126L192.48,10.626L185.48,10.626L185.48,24.626ZM220.476,24.626L199.476,24.626L199.476,21.126L195.976,21.126L195.976,17.626L199.476,17.626L199.476,14.126L213.476,14.126L213.476,10.626L199.476,10.626L199.476,7.126L216.976,7.126L216.976,10.626L220.476,10.626L220.476,24.626ZM202.976,17.626L202.976,21.126L213.476,21.126L213.476,17.626L202.976,17.626ZM244.971,24.626L227.471,24.626L227.471,21.126L223.971,21.126L223.971,0.126L230.971,0.126L230.971,7.126L244.971,7.126L244.971,10.626L248.471,10.626L248.471,21.126L244.971,21.126L244.971,24.626ZM230.971,10.626L230.971,21.126L241.471,21.126L241.471,10.626L230.971,10.626ZM265.966,24.626L258.966,24.626L258.966,17.626L265.966,17.626L265.966,24.626ZM304.462,24.626L283.462,24.626L283.462,21.126L279.962,21.126L279.962,10.626L283.462,10.626L283.462,7.126L297.462,7.126L297.462,0.126L304.462,0.126L304.462,24.626ZM286.962,10.626L286.962,21.126L297.462,21.126L297.462,10.626L286.962,10.626ZM328.957,24.626L311.457,24.626L311.457,21.126L307.957,21.126L307.957,10.626L311.457,10.626L311.457,7.126L328.957,7.126L328.957,10.626L332.457,10.626L332.457,17.626L314.957,17.626L314.957,21.126L328.957,21.126L328.957,24.626ZM314.957,10.626L314.957,14.126L325.457,14.126L325.457,10.626L314.957,10.626ZM353.452,24.626L346.452,24.626L346.452,21.126L342.952,21.126L342.952,17.626L339.452,17.626L339.452,7.126L346.452,7.126L346.452,17.626L353.452,17.626L353.452,7.126L360.452,7.126L360.452,17.626L356.952,17.626L356.952,21.126L353.452,21.126L353.452,24.626Z"/>
 </vector>

core/design/src/commonMain/kotlin/com/zrcoding/hackertab/design/theme/Color.kt

@@ -2,11 +2,14 @@ package com.zrcoding.hackertab.design.theme
 
 import androidx.compose.ui.graphics.Color
 
+val Black = Color(0xFF000000)
+val Black900 = Color(0xFF272728)
+val Black700 = Color(0xFF575758)
+val Black400 = Color(0xFF9F9F9F)
 
 val Blue = Color(0XFF0366D6)
 val Flamingo = Color(0xFFf6682f)
 val ChestnutRose = Color(0xFFCF6679)
 val ChineseBlack = Color(0xFF0D1116)
-val Black900 = Color(0xFF272728)
 val HawkesBlue = Color(0xFFEFF6FE)
 val White600 = Color(0xFFF9F9F9)

core/design/src/commonMain/kotlin/com/zrcoding/hackertab/design/theme/Theme.kt

@@ -5,13 +5,12 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.material.darkColors
 import androidx.compose.material.lightColors
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.Color
 
 private val DarkColorPalette = darkColors(
     primary = Blue,
     primaryVariant = ChineseBlack,
     secondary = Black900,
-    secondaryVariant = Color.Black,
+    secondaryVariant = Black900,
     background = ChineseBlack,
     error = ChestnutRose
 )
@@ -20,7 +19,7 @@ private val LightColorPalette = lightColors(
     primary = Blue,
     primaryVariant = HawkesBlue,
     secondary = White600,
-    secondaryVariant = Color.White,
+    secondaryVariant = White600,
     background = HawkesBlue,
     error = ChestnutRose
 )

core/design/src/commonMain/kotlin/com/zrcoding/hackertab/design/theme/Type.kt

@@ -30,13 +30,13 @@ val Typography: Typography
             fontSize = 20.sp
         ),
         subtitle1 = TextStyle(
-            fontFamily = FontFamily(Font(Res.font.nunito_regular)),
+            fontFamily = FontFamily(Font(Res.font.nunito_medium)),
             fontWeight = FontWeight.Normal,
-            fontSize = 16.sp,
+            fontSize = 18.sp,
             letterSpacing = 0.15.sp
         ),
         subtitle2 = TextStyle(
-            fontFamily = FontFamily(Font(Res.font.nunito_medium)),
+            fontFamily = FontFamily(Font(Res.font.nunito_regular)),
             fontWeight = FontWeight.W500,
             fontSize = 14.sp,
             letterSpacing = 0.1.sp

core/domain/src/commonMain/kotlin/com/zrcoding/hackertab/domain/models/GithubRepo.kt

@@ -2,7 +2,7 @@ package com.zrcoding.hackertab.domain.models
 
 data class GithubRepo(
     override val id: String,
-    val name: String,
+    val title: String,
     val description: String,
     val owner: String,
     val url: String,

core/domain/src/commonMain/kotlin/com/zrcoding/hackertab/domain/usecases/BuildConferenceDisplayedDateUseCase.kt

@@ -14,7 +14,7 @@ object BuildConferenceDisplayedDateUseCase {
                     if (startDate.month != endDate.month) {
                         "$start - ${toMonthWithDay(endDate)}"
                     } else {
-                        "$start - ${endDate.dayOfMonth}"
+                        "$start - ${endDate.day}"
                     }
                 }
             }
@@ -25,6 +25,6 @@ object BuildConferenceDisplayedDateUseCase {
         val month = date.month.name.lowercase().replaceFirstChar {
             if (it.isLowerCase()) it.titlecase() else it.toString()
         }
-        return "$month ${date.dayOfMonth}"
+        return "$month ${date.day}"
     }
 }