Skip to content

Commit 0091f99

Browse files
Merge pull request #5 from MubarakNative/main
Merge main commit into features branch
2 parents 8eff3b8 + 02a94f2 commit 0091f99

File tree

4 files changed

+330
-2
lines changed

4 files changed

+330
-2
lines changed

.idea/other.xml

+318
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/src/main/java/com/mubarak/wikinews/di/NetworkModule.kt

+6-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,12 @@ object NetworkModule {
4242
}
4343
install(Logging) {
4444
logger = Logger.ANDROID // logs on LogCat
45-
// level = LogLevel.ALL
45+
level = LogLevel.ALL
46+
}
47+
48+
engine {
49+
connectTimeout = 100_000
50+
socketTimeout = 100_000
4651
}
4752
}
4853
}

app/src/main/java/com/mubarak/wikinews/ui/home/HomeViewModel.kt

+6
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,14 @@ class HomeViewModel @Inject constructor(
3939
HomeUiState.Success(newsRepository.getNewsFeed())
4040
} catch (e: IOException) {
4141
HomeUiState.Error
42+
} catch (e:Exception){
43+
HomeUiState.Error
4244
}
4345
}
4446
}
4547

48+
fun retryNews(){
49+
getNewsFeed()
50+
}
51+
4652
}

app/src/main/java/com/mubarak/wikinews/utils/TimeStampConvertor.kt

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ object TimeStampConvertor {
1212
// Define the formatter for the desired format
1313
val formatter = DateTimeFormatter.ofPattern("MMMM d, yyyy")
1414
.withZone(ZoneId.of("UTC"))
15-
//,'at 'h:mm:ss a
1615

1716
// Format the instant to the desired format
1817
return formatter.format(instant)

0 commit comments

Comments
 (0)