Merge pull request #58 from zouhir96/develop

release 1.1.0 .

Author: zouhir96

README.md

@@ -3,7 +3,7 @@
 <table align="center">
 <tr>
 <td>
-<img src="imgs/preview.png" alt="Preview image" /> 
+<img src="imgs/preview.svg" alt="Preview image" /> 
 </td>
 </tr>
 </table>
@@ -21,6 +21,16 @@ 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>
@@ -53,12 +63,12 @@ details.
 - [x] Contact support by email.
 - [x] Support large screens (Tablet and Ipad).
 - [x] System light/dark mode support.
+- [x] Migrate to Kotlin multiplatform and compose multiplatform.
 
 ### Development
 
 - [ ] Add offline first support
 - [ ] Add onboarding and app install setup
-- [ ] Migrate to kmp/cmp
 
 ## 🧩 Requirements
 

app/proguard-rules.pro

@@ -20,8 +20,6 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 
-# Keep class names of Hilt injected ViewModels since their name are used as a multibinding map key.
--keepnames @dagger.hilt.android.lifecycle.HiltViewModel class * extends androidx.lifecycle.ViewModel
 
 -keepattributes *Annotation*
 -keepclassmembers enum androidx.lifecycle.Lifecycle$Event {
@@ -46,14 +44,7 @@
 -keep class * extends com.google.protobuf.GeneratedMessageLite { *; }
 -keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation
 
-## Rules for Gson
-# For using GSON @Expose annotation
--keepattributes Signature
--keepattributes *Annotation*
-# Gson specific classes
--keep class com.google.gson.stream.** { *; }
--keep class com.google.gson.reflect.TypeToken { *; }
--keep class * extends com.google.gson.reflect.TypeToken
+-keep class com.zrcoding.database.data.local.entities.** {*;}
+-keep class com.zrcoding.hackertab.network.dtos.** {*;}
 
--keep class com.zrcoding.hackertab.database.entities.** {*;}
--keep class com.zrcoding.hackertab.network.dtos.** {*;}
+-dontwarn org.slf4j.impl.StaticLoggerBinder

core/design/src/commonMain/composeResources/values/strings.xml

@@ -7,16 +7,16 @@
     <string name="github">github</string>
 
 
-    <string name="score">%d points</string>
-    <string name="comments">%d comments</string>
-    <string name="reactions">%d reactions</string>
-    <string name="stars">%s stars</string>
-    <string name="forks">%s forks</string>
-    <string name="claps">%s claps</string>
-    <string name="subreddit">r/ %s</string>
+    <string name="score">%1$s points</string>
+    <string name="comments">%1$s comments</string>
+    <string name="reactions">%1$s reactions</string>
+    <string name="stars">%1$s stars</string>
+    <string name="forks">%1$s forks</string>
+    <string name="claps">%1$s claps</string>
+    <string name="subreddit">r/ %1$s</string>
     <string name="loading">Loading …</string>
-    <string name="empty_source_msg">No articles found for %s !!</string>
-    <string name="failed_to_load_source">Failed to load articles found for %s !!</string>
+    <string name="empty_source_msg">No articles found for %1$s !!</string>
+    <string name="failed_to_load_source">Failed to load articles found for %1$s !!</string>
     <string name="no_internet_connect">Please verify you internet connection and !!</string>
     <string name="no_source_selected">You didn\'t select any source yet!!\n you can enable sources in settings -> sources</string>
     <string name="common_retry">Retry</string>

core/network/build.gradle.kts

@@ -21,7 +21,7 @@ kotlin {
             implementation(libs.ktor.loggingInterceptor)
         }
         androidMain.dependencies {
-            implementation(libs.ktor.okhttp)
+            implementation(libs.ktor.cio)
         }
         iosMain.dependencies {
             implementation(libs.ktor.darwin)

gradle/libs.versions.toml

@@ -63,7 +63,7 @@ kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serializa
 kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinxDatetime" }
 kotlinx-atomicfu = { module = "org.jetbrains.kotlinx:atomicfu", version.ref = "atomicfu" }
 ktor-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
-ktor-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor" }
+ktor-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
 ktor-darwin = { module = "io.ktor:ktor-client-darwin", version.ref = "ktor" }
 ktor-contentNegotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" }
 ktor-serialization = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" }