From 12552028e261600e5ea8fec27f39292f2aed25e7 Mon Sep 17 00:00:00 2001 From: theapache64 Date: Wed, 12 Jan 2022 00:05:56 +0530 Subject: [PATCH 1/2] =?UTF-8?q?=E2=9C=A8=20prepare=20for=20next=20developm?= =?UTF-8?q?ent=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.kts | 2 +- data/build.gradle.kts | 2 +- .../com/theapache64/stackzy/di/module/NetworkModule.kt | 6 +++--- src/main/kotlin/com/theapache64/stackzy/App.kt | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 27ec3de..b74489d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,7 +10,7 @@ plugins { } val daggerVersion by extra("2.39.1") -val stackzyVersion by extra("1.1.3") // TODO : Change in App.kt also +val stackzyVersion by extra("1.2.0") // TODO : Change in App.kt also group = "com.theapache64" version = stackzyVersion diff --git a/data/build.gradle.kts b/data/build.gradle.kts index 3e565d0..07546b9 100644 --- a/data/build.gradle.kts +++ b/data/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } group = "com.theapache64.stackzy" -version = "1.1.3" +version = "1.2.0" repositories { mavenCentral() diff --git a/data/src/main/kotlin/com/theapache64/stackzy/di/module/NetworkModule.kt b/data/src/main/kotlin/com/theapache64/stackzy/di/module/NetworkModule.kt index e3dd0dd..52b65ad 100644 --- a/data/src/main/kotlin/com/theapache64/stackzy/di/module/NetworkModule.kt +++ b/data/src/main/kotlin/com/theapache64/stackzy/di/module/NetworkModule.kt @@ -54,7 +54,7 @@ class NetworkModule { ) .addForm( TABLE_UNTRACKED_LIBS, - "https://docs.google.com/forms/d/e/1FAIpQLSdWuRkjXqBkL-w5NfktA_ju_sI2bJTDVb4LoYco4mxEpskU9g/viewform?usp=sf_link" + "https://docs.google.com/forms/d/e/1FAIpQLSdWuRkjXqBkL-w5NfktA_ju_sI2bJTDVb4LoYco4mxEpskU9g/viewform?usp=sf_link", // TODO: Change this ) .addSheet( sheetName = TABLE_RESULTS, @@ -73,7 +73,7 @@ class NetworkModule { ) .addForm( endPoint = TABLE_RESULTS, - formLink = "https://docs.google.com/forms/d/e/1FAIpQLSdiTZz47N2FHUXLSvsdzAxVRKqzWq30xjkpCOQugKbHLJuRGg/viewform?usp=sf_link" + formLink = "https://docs.google.com/forms/d/e/1FAIpQLSdTiqu2iS-dRLV106uvcKnrZUPnX2x-qF1FlWUjxsfmkNJ0-A/viewform?usp=sf_link" ) .build() } @@ -100,7 +100,7 @@ class NetworkModule { return Retrofit.Builder() .client(okHttpClient) - .baseUrl("https://docs.google.com/spreadsheets/d/1KBxVO5tXySbezBr-9rb2Y3qWo5PCMrvkD1aWQxZRepI/") + .baseUrl("https://docs.google.com/spreadsheets/d/1DZ_s2aSJZ4WsgsfZnVQIB1us7Dq7WfxDdpbvLo07pMg/") .addConverterFactory(MoshiConverterFactory.create(moshi)) .addCallAdapterFactory(FlowResourceCallAdapterFactory()) .build() diff --git a/src/main/kotlin/com/theapache64/stackzy/App.kt b/src/main/kotlin/com/theapache64/stackzy/App.kt index 14541b5..22e0418 100644 --- a/src/main/kotlin/com/theapache64/stackzy/App.kt +++ b/src/main/kotlin/com/theapache64/stackzy/App.kt @@ -39,7 +39,7 @@ fun main() { // Parsing application arguments val appArgs = AppArgs( appName = "Stackzy", - version = "v1.1.3", + version = "v1.2.0", versionCode = 20210724 ) From f122817d6163624705718234e2422650006ff344 Mon Sep 17 00:00:00 2001 From: carotkut94 Date: Wed, 12 Jan 2022 02:03:16 +0530 Subject: [PATCH 2/2] feat(sorted-by-name): apps and libraries are sorted by name --- .idea/modules.xml | 8 -------- .idea/stackzy.iml | 12 ------------ .../ui/feature/appdetail/AppDetailViewModel.kt | 2 +- .../stackzy/ui/feature/applist/AppListViewModel.kt | 4 ++-- 4 files changed, 3 insertions(+), 23 deletions(-) delete mode 100644 .idea/modules.xml delete mode 100644 .idea/stackzy.iml diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 04ee412..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/stackzy.iml b/.idea/stackzy.iml deleted file mode 100644 index 891996f..0000000 --- a/.idea/stackzy.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/kotlin/com/theapache64/stackzy/ui/feature/appdetail/AppDetailViewModel.kt b/src/main/kotlin/com/theapache64/stackzy/ui/feature/appdetail/AppDetailViewModel.kt index 4b12919..c317e30 100644 --- a/src/main/kotlin/com/theapache64/stackzy/ui/feature/appdetail/AppDetailViewModel.kt +++ b/src/main/kotlin/com/theapache64/stackzy/ui/feature/appdetail/AppDetailViewModel.kt @@ -378,7 +378,7 @@ class AppDetailViewModel @Inject constructor( trackUntrackedLibs(report) _analysisReport.value = AnalysisReportWrapper( report, - report.libraries.sortedBy { it.id }.map { library -> + report.libraries.sortedBy { it.name }.map { library -> LibraryWrapper(library, prevResult) } ) diff --git a/src/main/kotlin/com/theapache64/stackzy/ui/feature/applist/AppListViewModel.kt b/src/main/kotlin/com/theapache64/stackzy/ui/feature/applist/AppListViewModel.kt index c2f9914..3356423 100644 --- a/src/main/kotlin/com/theapache64/stackzy/ui/feature/applist/AppListViewModel.kt +++ b/src/main/kotlin/com/theapache64/stackzy/ui/feature/applist/AppListViewModel.kt @@ -139,7 +139,7 @@ class AppListViewModel @Inject constructor( } ?: listOf() - _apps.value = Resource.Success(filteredApps.map { AndroidAppWrapper(it) }) + _apps.value = Resource.Success(filteredApps.map { AndroidAppWrapper(it) }.sortedBy { app-> app.getTitle() }) } is ApkSource.PlayStore -> { if (isPlayStoreUrl(newKeyword)) { @@ -151,7 +151,7 @@ class AppListViewModel @Inject constructor( val app = playStoreRepo.find(packageName, api) if (app != null) { // found app in playstore - _apps.value = Resource.Success(listOf(AndroidAppWrapper(app))) + _apps.value = Resource.Success(listOf(AndroidAppWrapper(app)).sortedBy { it->it.getTitle() }) } else { _apps.value = Resource.Error("Invalid PlayStore URL") }