author int64 658 755k | date stringlengths 19 19 | timezone int64 -46,800 43.2k | hash stringlengths 40 40 | message stringlengths 5 490 | mods list | language stringclasses 20 values | license stringclasses 3 values | repo stringlengths 5 68 | original_message stringlengths 12 491 |
|---|---|---|---|---|---|---|---|---|---|
652,335 | 02.04.2020 12:22:40 | -10,800 | e6691c78722dc195ad63eba97baacd42335f829b | Increase global alpha version counter to 100 [skip ci] [version] | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/components.json",
"new_path": "buildSrc/components.json",
"diff": "{\n\"id\": \"easyadapter\",\n\"version\": \"1.1.0\",\n- \"unstable_version\": 9,\n+ \"unstable_version\": 10,\n\"stable\": false,\n\"dir\": \"easyadapter\",\n\"libs\": [\n{\n\"id\": \"recycler-extension\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 1,\n+ \"unstable_version\": 2,\n\"stable\": false,\n\"dir\": \"recycler-extension\",\n\"libs\": [\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/projectConfiguration.json",
"new_path": "buildSrc/projectConfiguration.json",
"diff": "{\n\"version\": \"0.5.0\",\n\"stable\": false,\n- \"unstable_version\": 99,\n+ \"unstable_version\": 100,\n\"project_snapshot_name\": \"\",\n\"project_snapshot_version\": 0\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Increase global alpha version counter to 100 [skip ci] [version] |
652,327 | 03.04.2020 01:59:28 | -10,800 | 048e687674ca636db5004caf8b60c69b593cbc0e | customize message | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/generate_release_notes_diff/WriteToFileReleaseNotesDiff.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/generate_release_notes_diff/WriteToFileReleaseNotesDiff.kt",
"diff": "@@ -17,7 +17,14 @@ import java.io.File\nopen class WriteToFileReleaseNotesDiff : DefaultTask() {\ncompanion object {\n- const val releaseNotesChangesFileUrl = \"buildSrc/build/tmp/releaseNotesChanges.txt\"\n+ const val RELEASE_NOTES_CHANGES_FILE_URL = \"buildSrc/build/tmp/releaseNotesChanges.txt\"\n+\n+ //customize line const\n+ const val LINE_INFO_REGEX = \"([0-9]+) +([-+]) (\\\\*)?\"\n+ const val NO_BACKWARD_LABEL_REGEX = \"(\\\\*\\\\*)?NO BACKWARD COMPATIBILITY(\\\\*\\\\*)?\"\n+ const val SMILE_WARNING = \":warning:\"\n+ const val SMILE_CHECK_MARK = \":heavy_check_mark:\"\n+ const val SMILE_DELETE = \":small_red_triangle_down:\"\n}\nprivate lateinit var componentName: String\n@@ -51,12 +58,8 @@ open class WriteToFileReleaseNotesDiff : DefaultTask() {\nif (diffs.isNotEmpty()) println()\n}\n- private fun addReleaseNoteChange(chane: String) {\n- releaseNotesChanges += \"$chane\\n\"\n- }\n-\nprivate fun writeChangesToFile() {\n- val file = File(releaseNotesChangesFileUrl)\n+ val file = File(RELEASE_NOTES_CHANGES_FILE_URL)\nwith(file) {\nif (exists()) {\ndelete()\n@@ -110,6 +113,46 @@ open class WriteToFileReleaseNotesDiff : DefaultTask() {\nreturn space.repeat(spacesCount)\n}\n+ private fun addReleaseNoteChange(change: String) {\n+ releaseNotesChanges += customizeRow(change) + \"\\n\"\n+ }\n+\n+ private fun customizeRow(line: String): String {\n+ val matchResult = LINE_INFO_REGEX.toRegex().find(line)\n+ if (matchResult?.value == null) return setBold(setRedBackground(line))\n+\n+ var customizedLine = \"\"\n+ var lineInfo = matchResult.value.trim()\n+ var lineText = line.substring(matchResult.range.last + 1).trim()\n+\n+ val rawEditType = matchResult.groupValues[2]\n+ if (rawEditType == \"-\") customizedLine = setQuote(customizedLine)\n+ lineInfo = lineInfo.replace(rawEditType, \"\")\n+\n+ val isStartParagraph = matchResult.groupValues[3].isNotBlank()\n+ if (isStartParagraph) {\n+ if (rawEditType == \"+\") {\n+ lineInfo = lineInfo.replace(matchResult.groupValues[3], SMILE_CHECK_MARK)\n+ } else {\n+ lineInfo = lineInfo.replace(matchResult.groupValues[3], \"\")\n+ lineInfo = SMILE_DELETE + lineInfo\n+ }\n+ }\n+\n+ lineText = lineText.replace(NO_BACKWARD_LABEL_REGEX.toRegex(), SMILE_WARNING + setBold(setItalic(setRedBackground(\"NO BACKWARD COMPATIBILITY\"))))\n+ customizedLine += lineInfo + lineText\n+\n+ return customizedLine\n+ }\n+\n+ private fun setBold(text: String) = \"*$text*\"\n+\n+ private fun setItalic(text: String) = \"_${text}_\"\n+\n+ private fun setRedBackground(text: String) = \"`$text`\"\n+\n+ private fun setQuote(text: String) = \">$text\"\n+\nprivate fun extractInputArguments() {\ncomponentName = if (!project.hasProperty(GradleProperties.COMPONENT)) {\nEMPTY_STRING\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-984 customize message |
652,327 | 03.04.2020 02:32:41 | -10,800 | 7b30451f1f592a5588f110d19567549ed52abb93 | corrections PR | [
{
"change_type": "MODIFY",
"old_path": "mvi/RELEASE_NOTES.md",
"new_path": "mvi/RELEASE_NOTES.md",
"diff": "@@ -22,4 +22,3 @@ even if stream contains events from UI, which should be reacted directly.\n* Remove listenForResult extension for EventTransformerList + listenForResult from NavigationMiddleware\n* Fixed StandardReactDialogView negative button nullability\n* ANDDEP-928 Remove Timber dependencies\n\\ No newline at end of file\n-* Added instrumental tests for sample\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-991 corrections PR |
652,335 | 03.04.2020 10:17:46 | -10,800 | dff11726bb65ff81aebbb9d261079bb42bded462 | Increase global alpha version counter to 101 [skip ci] [version] | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/components.json",
"new_path": "buildSrc/components.json",
"diff": "{\n\"id\": \"template\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 20,\n+ \"unstable_version\": 21,\n\"stable\": false,\n\"dir\": \"template\",\n\"libs\": [],\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/projectConfiguration.json",
"new_path": "buildSrc/projectConfiguration.json",
"diff": "{\n\"version\": \"0.5.0\",\n\"stable\": false,\n- \"unstable_version\": 100,\n+ \"unstable_version\": 101,\n\"project_snapshot_name\": \"\",\n\"project_snapshot_version\": 0\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Increase global alpha version counter to 101 [skip ci] [version] |
652,312 | 02.04.2020 14:36:13 | -10,800 | 53a1b447cca72b551c3c9922de7e7e85720645f0 | Change getItemId and getItemHash to Object for BaseItemController + refactoring | [
{
"change_type": "MODIFY",
"old_path": "easyadapter/RELEASE_NOTES.md",
"new_path": "easyadapter/RELEASE_NOTES.md",
"diff": "* ANDDEP-785 Added getter in EasyAdapter, for *firstInvisibleItemEnabled* property\n* **NO BACKWARD COMPATIBILITY** ANDDEP-909 Removed\n`setHasStableIds(true)` in EasyAdapter.\n+* **NO BACKWARD COMPATIBILITY** ANDDEP-958 Change getItemId and\n+ getItemHash to Object for BaseItemController\n## 1.0.0\n##### Easyadapter\n* ANDDEP-270 Added support for asynchronous view inflate in ViewHolder\n"
},
{
"change_type": "MODIFY",
"old_path": "easyadapter/lib-easyadapter/src/main/java/ru/surfstudio/android/easyadapter/ItemInfo.kt",
"new_path": "easyadapter/lib-easyadapter/src/main/java/ru/surfstudio/android/easyadapter/ItemInfo.kt",
"diff": "@@ -21,4 +21,4 @@ package ru.surfstudio.android.easyadapter\n* @property id Unique data id.\n* @property hash Data hash.\n*/\n-internal class ItemInfo(val id: String?, val hash: String?)\n\\ No newline at end of file\n+internal class ItemInfo(val id: Object?, val hash: Object?)\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "easyadapter/lib-easyadapter/src/main/java/ru/surfstudio/android/easyadapter/controller/BaseItemController.java",
"new_path": "easyadapter/lib-easyadapter/src/main/java/ru/surfstudio/android/easyadapter/controller/BaseItemController.java",
"diff": "@@ -53,12 +53,12 @@ public abstract class BaseItemController<H extends RecyclerView.ViewHolder, I ex\n/**\n* Create holder inside parent\n*\n- * @param parent parent, to which holder will attach\n+ * @param parent parent which holder will attach to\n*/\npublic abstract H createViewHolder(ViewGroup parent);\n/**\n- * Calls when view, bounded to holder, is no longer active\n+ * Calls when view, which is bounded to holder, is no longer active\n*/\npublic void unbind(H holder, I item) {\n// do nothing\n@@ -75,9 +75,7 @@ public abstract class BaseItemController<H extends RecyclerView.ViewHolder, I ex\n* @param item item\n* @return unique id retrieved from item\n*/\n- public String getItemId(I item) {\n- return String.valueOf(NO_ID);\n- }\n+ public abstract Object getItemId(I item);\n/**\n* Get the item hashcode.\n@@ -86,7 +84,7 @@ public abstract class BaseItemController<H extends RecyclerView.ViewHolder, I ex\n* @param item item\n* @return hashcode of the item\n*/\n- public abstract String getItemHash(I item);\n+ public abstract Object getItemHash(I item);\n/**\n* @return hash code for this {@link BaseItemController} type\n@@ -110,8 +108,4 @@ public abstract class BaseItemController<H extends RecyclerView.ViewHolder, I ex\n}\nreturn id;\n}\n-\n- protected String getTypeStringHashCode() {\n- return String.valueOf(getTypeHashCode());\n- }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "easyadapter/lib-easyadapter/src/main/java/ru/surfstudio/android/easyadapter/controller/BindableItemController.java",
"new_path": "easyadapter/lib-easyadapter/src/main/java/ru/surfstudio/android/easyadapter/controller/BindableItemController.java",
"diff": "@@ -55,12 +55,12 @@ public abstract class BindableItemController<T, H extends BindableViewHolder<T>>\n}\n@Override\n- public final String getItemId(BindableItem<T, H> item) {\n+ public final Object getItemId(BindableItem<T, H> item) {\nreturn getItemId(item.getData());\n}\n@Override\n- public final String getItemHash(BindableItem<T, H> item) {\n+ public final Object getItemHash(BindableItem<T, H> item) {\nreturn getItemHash(item.getData());\n}\n@@ -71,7 +71,7 @@ public abstract class BindableItemController<T, H extends BindableViewHolder<T>>\n* @param data data\n* @return unique id retrieved from data\n*/\n- protected abstract String getItemId(T data);\n+ protected abstract Object getItemId(T data);\n/**\n* Get the data hashcode.\n@@ -80,7 +80,7 @@ public abstract class BindableItemController<T, H extends BindableViewHolder<T>>\n* @param data data\n* @return hashcode of the data\n*/\n- protected String getItemHash(T data) {\n- return String.valueOf(data == null ? 0 : data.hashCode());\n+ protected Object getItemHash(T data) {\n+ return data == null ? 0 : data.hashCode();\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "easyadapter/lib-easyadapter/src/main/java/ru/surfstudio/android/easyadapter/controller/DoubleBindableItemController.java",
"new_path": "easyadapter/lib-easyadapter/src/main/java/ru/surfstudio/android/easyadapter/controller/DoubleBindableItemController.java",
"diff": "@@ -56,12 +56,12 @@ public abstract class DoubleBindableItemController<T1, T2, H extends DoubleBinda\n}\n@Override\n- public final String getItemId(DoubleBindableItem<T1, T2, H> item) {\n+ public final Object getItemId(DoubleBindableItem<T1, T2, H> item) {\nreturn getItemId(item.getFirstData(), item.getSecondData());\n}\n@Override\n- public final String getItemHash(DoubleBindableItem<T1, T2, H> item) {\n+ public final Object getItemHash(DoubleBindableItem<T1, T2, H> item) {\nreturn getItemHash(item.getFirstData(), item.getSecondData());\n}\n@@ -73,7 +73,7 @@ public abstract class DoubleBindableItemController<T1, T2, H extends DoubleBinda\n* @param secondData second data\n* @return unique id retrieved from two blocks of data\n*/\n- protected abstract String getItemId(T1 firstData, T2 secondData);\n+ protected abstract Object getItemId(T1 firstData, T2 secondData);\n/**\n@@ -84,9 +84,8 @@ public abstract class DoubleBindableItemController<T1, T2, H extends DoubleBinda\n* @param secondData second data\n* @return hashcode of data\n*/\n- protected String getItemHash(T1 firstData, T2 secondData) {\n- return String.valueOf(\n- firstData == null ? 0 : firstData.hashCode() +\n- (secondData == null ? 0 : secondData.hashCode()));\n+ protected Object getItemHash(T1 firstData, T2 secondData) {\n+ return firstData == null ? 0 : firstData.hashCode() +\n+ (secondData == null ? 0 : secondData.hashCode());\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "easyadapter/lib-easyadapter/src/main/java/ru/surfstudio/android/easyadapter/controller/NoDataItemController.java",
"new_path": "easyadapter/lib-easyadapter/src/main/java/ru/surfstudio/android/easyadapter/controller/NoDataItemController.java",
"diff": "@@ -37,8 +37,8 @@ public abstract class NoDataItemController<H extends RecyclerView.ViewHolder>\nextends BaseItemController<H, NoDataItem<H>> {\n@Override\n- public String getItemId(NoDataItem<H> item) {\n- return getTypeStringHashCode();\n+ public Object getItemId(NoDataItem<H> item) {\n+ return getTypeHashCode();\n}\n/**\n@@ -60,7 +60,7 @@ public abstract class NoDataItemController<H extends RecyclerView.ViewHolder>\n* @see BaseItemController#getItemHash(BaseItem)\n*/\n@Override\n- public String getItemHash(NoDataItem<H> item) {\n+ public Object getItemHash(NoDataItem<H> item) {\nreturn \"0\";\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "easyadapter/lib-easyadapter/src/main/java/ru/surfstudio/android/easyadapter/pagination/BasePaginationableAdapter.java",
"new_path": "easyadapter/lib-easyadapter/src/main/java/ru/surfstudio/android/easyadapter/pagination/BasePaginationableAdapter.java",
"diff": "@@ -112,7 +112,7 @@ public abstract class BasePaginationableAdapter extends EasyAdapter {\n}\n@Override\n- public void onAttachedToRecyclerView(RecyclerView recyclerView) {\n+ public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {\nsuper.onAttachedToRecyclerView(recyclerView);\nRecyclerView.LayoutManager layoutManager = recyclerView.getLayoutManager();\ninitLayoutManager(layoutManager);\n@@ -122,7 +122,7 @@ public abstract class BasePaginationableAdapter extends EasyAdapter {\nprotected void initPaginationListener(RecyclerView recyclerView, final RecyclerView.LayoutManager layoutManager) {\nrecyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {\n@Override\n- public void onScrolled(RecyclerView recyclerView, int dx, int dy) {\n+ public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {\nsuper.onScrolled(recyclerView, dx, dy);\nif (onShowMoreListener != null && !blockShowMoreEvent) {\nint totalItemCount = layoutManager.getItemCount();\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-958 Change getItemId and getItemHash to Object for BaseItemController + refactoring |
652,300 | 03.04.2020 17:36:26 | -14,400 | 819a6b6d755d164085b5ce9e3cae18b24a757558 | Created base entities for sample of RequestMapper | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/kitties/KittiesActivityView.kt",
"diff": "+package ru.surfstudio.android.core.mvi.sample.ui.screen.kitties\n+\n+import ru.surfstudio.android.core.mvi.ui.BaseReactActivityView\n+import ru.surfstudio.android.core.mvp.configurator.BaseActivityViewConfigurator\n+\n+class KittiesActivityView : BaseReactActivityView() {\n+ override fun createConfigurator(): BaseActivityViewConfigurator<*, *, *> {\n+ TODO(\"Not yet implemented\")\n+ }\n+\n+ override fun getScreenName(): String {\n+ TODO(\"Not yet implemented\")\n+ }\n+\n+ override fun getContentView(): Int {\n+ TODO(\"Not yet implemented\")\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/kitties/KittiesMiddleware.kt",
"diff": "+package ru.surfstudio.android.core.mvi.sample.ui.screen.kitties\n+\n+import io.reactivex.Observable\n+import ru.surfstudio.android.core.mvi.impls.ui.middleware.BaseMiddleware\n+import ru.surfstudio.android.core.mvi.impls.ui.middleware.BaseMiddlewareDependency\n+import ru.surfstudio.android.core.mvi.impls.ui.middleware.navigation.composition.close\n+import ru.surfstudio.android.core.mvi.sample.ui.screen.kitties.KittiesEvent.*\n+import ru.surfstudio.android.core.mvi.sample.ui.screen.kitties.data.Kitty\n+import ru.surfstudio.android.dagger.scope.PerScreen\n+import java.util.concurrent.TimeUnit\n+import javax.inject.Inject\n+\n+@PerScreen\n+internal class KittiesMiddleware @Inject constructor(\n+ baseMiddlewareDependency: BaseMiddlewareDependency\n+) : BaseMiddleware<KittiesEvent>(baseMiddlewareDependency) {\n+\n+ override fun transform(eventStream: Observable<KittiesEvent>): Observable<out KittiesEvent> {\n+ return transformations(eventStream) {\n+ addAll(\n+ Input.BackClicked::class mapTo { closeActivity() },\n+ Input.LoadTopKittyNameClicked::class mapTo { Data.LoadTopKittyName },\n+ Input.LoadKittiesCountClicked::class mapTo { Data.LoadKittiesCount },\n+ Input.LoadKittiesListClicked::class mapTo { Data.LoadKittiesList },\n+ Input.SendMeowClicked::class mapTo { Data.SendMeow },\n+\n+ Data.LoadTopKittyName::class streamMapTo ::onLoadTopKittyName,\n+ Data.LoadKittiesCount::class streamMapTo ::onLoadKittiesCount,\n+ Data.LoadKittiesList::class streamMapTo ::onLoadKittiesList,\n+ Data.SendMeow::class streamMapTo ::onSendMeow\n+ )\n+ }\n+ }\n+\n+ private fun onLoadTopKittyName(observable: Observable<Data.LoadTopKittyName>): Observable<out KittiesEvent> {\n+ return observable.switchMap { loadTopKittyName() }\n+ }\n+\n+ private fun onLoadKittiesCount(observable: Observable<Data.LoadKittiesCount>): Observable<out KittiesEvent> {\n+ return observable.switchMap { loadKittiesCount() }\n+ }\n+\n+ private fun onLoadKittiesList(observable: Observable<Data.LoadKittiesList>): Observable<out KittiesEvent> {\n+ return observable.switchMap { loadKittiesList() }\n+ }\n+\n+ private fun onSendMeow(observable: Observable<Data.SendMeow>): Observable<out KittiesEvent> {\n+ return observable.switchMap { sendMeow() }\n+ }\n+\n+ private fun loadTopKittyName(): Observable<out KittiesEvent> {\n+ return delayedObservable(800L, \"meow\")\n+ .asRequestEvent(LoadTopKittyNameRequestEvent())\n+ }\n+\n+ private fun loadKittiesCount(): Observable<out KittiesEvent> {\n+ return delayedObservable(500L, 2)\n+ .asRequestEvent(LoadKittiesCountRequestEvent())\n+ }\n+\n+ private fun loadKittiesList(): Observable<out KittiesEvent> {\n+ return delayedObservable(1500L, emptyList<Kitty>())\n+ .asRequestEvent(LoadKittiesListRequestEvent())\n+ }\n+\n+ private fun sendMeow(): Observable<out KittiesEvent> {\n+ return delayedObservable(500L, Unit)\n+ .asRequestEvent(SendMeowRequestEvent())\n+ }\n+\n+ private fun closeActivity(): KittiesEvent {\n+ return Navigation().close()\n+ }\n+\n+ private fun <T : Any> delayedObservable(delayMs: Long, content: T): Observable<T> {\n+ return Observable.just(content).delay(delayMs, TimeUnit.MILLISECONDS)\n+ }\n+}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Created base entities for sample of RequestMapper |
652,335 | 06.04.2020 11:24:44 | -10,800 | 8f31ee1e7bfc6e58ff57cc128fe4a899fd29803a | Increase global alpha version counter to 102 [skip ci] [version] | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/components.json",
"new_path": "buildSrc/components.json",
"diff": "{\n\"id\": \"template\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 21,\n+ \"unstable_version\": 22,\n\"stable\": false,\n\"dir\": \"template\",\n\"libs\": [],\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/projectConfiguration.json",
"new_path": "buildSrc/projectConfiguration.json",
"diff": "{\n\"version\": \"0.5.0\",\n\"stable\": false,\n- \"unstable_version\": 101,\n+ \"unstable_version\": 102,\n\"project_snapshot_name\": \"\",\n\"project_snapshot_version\": 0\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Increase global alpha version counter to 102 [skip ci] [version] |
652,335 | 06.04.2020 12:43:16 | -10,800 | d608b6693d47f3bbc8110cdbc8954343e5311821 | Increase global alpha version counter to 103 [skip ci] [version] | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/components.json",
"new_path": "buildSrc/components.json",
"diff": "{\n\"id\": \"common\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 1,\n+ \"unstable_version\": 2,\n\"stable\": false,\n\"dir\": \"common\",\n\"libs\": [\n{\n\"id\": \"mvi\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 12,\n+ \"unstable_version\": 13,\n\"stable\": false,\n\"dir\": \"mvi\",\n\"libs\": [\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/projectConfiguration.json",
"new_path": "buildSrc/projectConfiguration.json",
"diff": "{\n\"version\": \"0.5.0\",\n\"stable\": false,\n- \"unstable_version\": 102,\n+ \"unstable_version\": 103,\n\"project_snapshot_name\": \"\",\n\"project_snapshot_version\": 0\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Increase global alpha version counter to 103 [skip ci] [version] |
652,327 | 06.04.2020 12:52:16 | -10,800 | 99511210b85bc3a6273c443d7bf02a451df63255 | changed jenkins-pipeline-lib url | [
{
"change_type": "MODIFY",
"old_path": "ci-internal/CheckBintrayStableVersionsJenkinsfile.groovy",
"new_path": "ci-internal/CheckBintrayStableVersionsJenkinsfile.groovy",
"diff": "@Library('surf-lib@version-3.0.0-SNAPSHOT')\n-// https://bitbucket.org/surfstudio/jenkins-pipeline-lib/\n+// https://gitlab.com/surfstudio/infrastructure/tools/jenkins-pipeline-lib\nimport ru.surfstudio.ci.*\nimport ru.surfstudio.ci.stage.StageStrategy\nimport ru.surfstudio.ci.pipeline.ScmPipeline\n"
},
{
"change_type": "MODIFY",
"old_path": "ci-internal/ComponentMirroringJobJenkinsfile.groovy",
"new_path": "ci-internal/ComponentMirroringJobJenkinsfile.groovy",
"diff": "-@Library('surf-lib@version-3.0.0-SNAPSHOT') // https://bitbucket.org/surfstudio/jenkins-pipeline-lib/\n+@Library('surf-lib@version-3.0.0-SNAPSHOT') // https://gitlab.com/surfstudio/infrastructure/tools/jenkins-pipeline-lib\nimport groovy.json.JsonSlurperClassic\nimport ru.surfstudio.ci.*\nimport ru.surfstudio.ci.pipeline.ScmPipeline\n"
},
{
"change_type": "MODIFY",
"old_path": "ci-internal/DevDeployJobJenkinsfile.groovy",
"new_path": "ci-internal/DevDeployJobJenkinsfile.groovy",
"diff": "@Library('surf-lib@version-3.0.0-SNAPSHOT')\n-// https://bitbucket.org/surfstudio/jenkins-pipeline-lib/\n+// https://gitlab.com/surfstudio/infrastructure/tools/jenkins-pipeline-lib\nimport groovy.json.JsonSlurper\nimport groovy.json.JsonSlurperClassic\nimport ru.surfstudio.ci.*\n"
},
{
"change_type": "MODIFY",
"old_path": "ci-internal/JenkinsfileMirroring.groovy",
"new_path": "ci-internal/JenkinsfileMirroring.groovy",
"diff": "-@Library('surf-lib@version-1.0.0-SNAPSHOT') // https://bitbucket.org/surfstudio/jenkins-pipeline-lib/\n+@Library('surf-lib@version-1.0.0-SNAPSHOT') // https://gitlab.com/surfstudio/infrastructure/tools/jenkins-pipeline-lib\nimport ru.surfstudio.ci.pipeline.empty.EmptyScmPipeline\nimport ru.surfstudio.ci.stage.StageStrategy\nimport ru.surfstudio.ci.CommonUtil\n"
},
{
"change_type": "MODIFY",
"old_path": "ci-internal/JenkinsfilePullRequestJob.groovy",
"new_path": "ci-internal/JenkinsfilePullRequestJob.groovy",
"diff": "@Library('surf-lib@version-3.0.0-SNAPSHOT')\n-// https://bitbucket.org/surfstudio/jenkins-pipeline-lib/\n+// https://gitlab.com/surfstudio/infrastructure/tools/jenkins-pipeline-lib\nimport ru.surfstudio.ci.*\nimport ru.surfstudio.ci.pipeline.empty.EmptyScmPipeline\n"
},
{
"change_type": "MODIFY",
"old_path": "ci-internal/ProjectSnapshotDeployJobJenkinsfile.groovy",
"new_path": "ci-internal/ProjectSnapshotDeployJobJenkinsfile.groovy",
"diff": "@Library('surf-lib@version-3.0.0-SNAPSHOT')\n-// https://bitbucket.org/surfstudio/jenkins-pipeline-lib/\n+// https://gitlab.com/surfstudio/infrastructure/tools/jenkins-pipeline-lib\nimport groovy.json.JsonSlurperClassic\nimport ru.surfstudio.ci.pipeline.ScmPipeline\nimport ru.surfstudio.ci.pipeline.empty.EmptyScmPipeline\n"
},
{
"change_type": "MODIFY",
"old_path": "ci-internal/ReleaseDeployJobJenkinsfile.groovy",
"new_path": "ci-internal/ReleaseDeployJobJenkinsfile.groovy",
"diff": "@Library('surf-lib@version-3.0.0-SNAPSHOT')\n-// https://bitbucket.org/surfstudio/jenkins-pipeline-lib/\n+// https://gitlab.com/surfstudio/infrastructure/tools/jenkins-pipeline-lib\nimport ru.surfstudio.ci.pipeline.empty.EmptyScmPipeline\nimport ru.surfstudio.ci.stage.StageStrategy\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-1006 changed jenkins-pipeline-lib url |
652,312 | 06.04.2020 13:18:01 | -10,800 | 74627f8a7633f62dbd02d76c2d106128e13bff64 | MR fix | [
{
"change_type": "MODIFY",
"old_path": "easyadapter/RELEASE_NOTES.md",
"new_path": "easyadapter/RELEASE_NOTES.md",
"diff": "* **NO BACKWARD COMPATIBILITY** ANDDEP-909 Removed\n`setHasStableIds(true)` in EasyAdapter.\n* **NO BACKWARD COMPATIBILITY** ANDDEP-958 Change getItemId and\n- getItemHash to Object for BaseItemController\n+ getItemHash to Object for BaseItemController; getItemId became\n+ abstract\n## 1.0.0\n##### Easyadapter\n* ANDDEP-270 Added support for asynchronous view inflate in ViewHolder\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-958 MR fix |
652,335 | 06.04.2020 14:02:23 | -10,800 | fab246e0a6307a2abdaaa59b7166ff0344f40ea9 | Increase global alpha version counter to 104 [skip ci] [version] | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/components.json",
"new_path": "buildSrc/components.json",
"diff": "{\n\"id\": \"broadcast-extension\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 3,\n\"stable\": false,\n\"dir\": \"broadcast-extension\",\n\"libs\": [\n{\n\"id\": \"mvi\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 13,\n+ \"unstable_version\": 14,\n\"stable\": false,\n\"dir\": \"mvi\",\n\"libs\": [\n{\n\"id\": \"core-mvp-binding\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 9,\n+ \"unstable_version\": 10,\n\"stable\": false,\n\"dir\": \"core-mvp-binding\",\n\"libs\": [\n{\n\"id\": \"easyadapter\",\n\"version\": \"1.1.0\",\n- \"unstable_version\": 10,\n+ \"unstable_version\": 11,\n\"stable\": false,\n\"dir\": \"easyadapter\",\n\"libs\": [\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/projectConfiguration.json",
"new_path": "buildSrc/projectConfiguration.json",
"diff": "{\n\"version\": \"0.5.0\",\n\"stable\": false,\n- \"unstable_version\": 103,\n+ \"unstable_version\": 104,\n\"project_snapshot_name\": \"\",\n\"project_snapshot_version\": 0\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Increase global alpha version counter to 104 [skip ci] [version] |
652,327 | 06.04.2020 15:48:08 | -10,800 | 7e2390a35102441edee69e2badf31abd72e28ffe | Added task for getting a list of RELEASE NOTES changes stylized for Slack | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/buildTasks.gradle",
"new_path": "buildSrc/buildTasks.gradle",
"diff": "@@ -84,6 +84,8 @@ task checkConfigurationIsNotProjectSnapshotTask(type: CheckConfigurationIsNotPro\ntask generateReleaseNotesDiff(type: GenerateReleaseNotesDiffTask) // helper\n+task writeToFileReleaseNotesDiffForSlack(type: WriteToFileReleaseNotesDiffForSlack)\n+\ntask writeToFileReleaseNotesDiff(type: WriteToFileReleaseNotesDiff)\ntask checkBintrayStableVersionsTask(type: CheckBintrayStableVersionsTask)\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/generate_release_notes_diff/WriteToFileReleaseNotesDiff.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/generate_release_notes_diff/WriteToFileReleaseNotesDiff.kt",
"diff": "@@ -18,13 +18,6 @@ open class WriteToFileReleaseNotesDiff : DefaultTask() {\ncompanion object {\nconst val RELEASE_NOTES_CHANGES_FILE_URL = \"buildSrc/build/tmp/releaseNotesChanges.txt\"\n-\n- //customize line const\n- const val LINE_INFO_REGEX = \"([0-9]+) +([-+]) (\\\\*)?\"\n- const val NO_BACKWARD_LABEL_REGEX = \"(\\\\*\\\\*)?NO BACKWARD COMPATIBILITY(\\\\*\\\\*)?\"\n- const val SMILE_WARNING = \":warning:\"\n- const val SMILE_CHECK_MARK = \":heavy_check_mark:\"\n- const val SMILE_DELETE = \":small_red_triangle_down:\"\n}\nprivate lateinit var componentName: String\n@@ -46,6 +39,10 @@ open class WriteToFileReleaseNotesDiff : DefaultTask() {\nwriteChangesToFile()\n}\n+ protected open fun addLineChange(change: String) {\n+ releaseNotesChanges += change + \"\\n\"\n+ }\n+\nprivate fun findComponent(): Component =\nComponents.value.find { it.name == componentName }\n?: throw ComponentNotFoundException(componentName)\n@@ -53,7 +50,7 @@ open class WriteToFileReleaseNotesDiff : DefaultTask() {\nprivate fun generateComponentDiff(component: Component) {\nval rawDiff = extractRawDiff(component)\nval diffs = parseRawDiff(rawDiff)\n- if (diffs.isNotEmpty()) addReleaseNoteChange(component.name)\n+ if (diffs.isNotEmpty()) addLineChange(component.name)\nwriteDiff(diffs)\nif (diffs.isNotEmpty()) println()\n}\n@@ -84,7 +81,7 @@ open class WriteToFileReleaseNotesDiff : DefaultTask() {\ndiff.type == GitDiff.Type.SEPARATE -> \"...\"\nelse -> \"${diff.lineNumber}$paddingSpaces${diff.line}\"\n}\n- addReleaseNoteChange(lineToPrint)\n+ addLineChange(lineToPrint)\n}\nprivate fun parseRawDiff(diff: String): List<GitDiff> = SimpleGitDiffParser().parse(diff)\n@@ -113,46 +110,6 @@ open class WriteToFileReleaseNotesDiff : DefaultTask() {\nreturn space.repeat(spacesCount)\n}\n- private fun addReleaseNoteChange(change: String) {\n- releaseNotesChanges += customizeRow(change) + \"\\n\"\n- }\n-\n- private fun customizeRow(line: String): String {\n- val matchResult = LINE_INFO_REGEX.toRegex().find(line)\n- if (matchResult?.value == null) return setBold(setRedBackground(line))\n-\n- var customizedLine = \"\"\n- var lineInfo = matchResult.value.trim()\n- var lineText = line.substring(matchResult.range.last + 1).trim()\n-\n- val rawEditType = matchResult.groupValues[2]\n- if (rawEditType == \"-\") customizedLine = setQuote(customizedLine)\n- lineInfo = lineInfo.replace(rawEditType, \"\")\n-\n- val isStartParagraph = matchResult.groupValues[3].isNotBlank()\n- if (isStartParagraph) {\n- if (rawEditType == \"+\") {\n- lineInfo = lineInfo.replace(matchResult.groupValues[3], SMILE_CHECK_MARK)\n- } else {\n- lineInfo = lineInfo.replace(matchResult.groupValues[3], \"\")\n- lineInfo = SMILE_DELETE + lineInfo\n- }\n- }\n-\n- lineText = lineText.replace(NO_BACKWARD_LABEL_REGEX.toRegex(), SMILE_WARNING + setBold(setItalic(setRedBackground(\"NO BACKWARD COMPATIBILITY\"))))\n- customizedLine += lineInfo + lineText\n-\n- return customizedLine\n- }\n-\n- private fun setBold(text: String) = \"*$text*\"\n-\n- private fun setItalic(text: String) = \"_${text}_\"\n-\n- private fun setRedBackground(text: String) = \"`$text`\"\n-\n- private fun setQuote(text: String) = \">$text\"\n-\nprivate fun extractInputArguments() {\ncomponentName = if (!project.hasProperty(GradleProperties.COMPONENT)) {\nEMPTY_STRING\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/generate_release_notes_diff/WriteToFileReleaseNotesDiffForSlack.kt",
"diff": "+package ru.surfstudio.android.build.tasks.generate_release_notes_diff\n+\n+/**\n+ * Task to see the differences between two revisions of RELEASE_NOTES.md in each module of a project.\n+ */\n+class WriteToFileReleaseNotesDiffForSlack : WriteToFileReleaseNotesDiff() {\n+\n+ companion object {\n+ //stylized line const\n+ const val LINE_INFO_REGEX = \"([0-9]+) +([-+]) (\\\\*)?\"\n+ const val NO_BACKWARD_LABEL_REGEX = \"(\\\\*\\\\*)?NO BACKWARD COMPATIBILITY(\\\\*\\\\*)?\"\n+ const val SMILE_WARNING = \":warning:\"\n+ const val SMILE_CHECK_MARK = \":heavy_check_mark:\"\n+ const val SMILE_DELETE = \":small_red_triangle_down:\"\n+ }\n+\n+ override fun addLineChange(change: String) {\n+ super.addLineChange(styleLine(change))\n+ }\n+\n+ private fun styleLine(line: String): String {\n+ val matchResult = LINE_INFO_REGEX.toRegex().find(line)\n+ if (matchResult?.value == null) return setBold(setRedBackground(line))\n+\n+ var stylizedLine = \"\"\n+ var lineInfo = matchResult.value.trim()\n+ var lineText = line.substring(matchResult.range.last + 1).trim()\n+\n+ val rawEditType = matchResult.groupValues[2]\n+ if (rawEditType == \"-\") stylizedLine = setQuote(stylizedLine)\n+ lineInfo = lineInfo.replace(rawEditType, \"\")\n+\n+ val isStartParagraph = matchResult.groupValues[3].isNotBlank()\n+ if (isStartParagraph) {\n+ if (rawEditType == \"+\") {\n+ lineInfo = lineInfo.replace(matchResult.groupValues[3], SMILE_CHECK_MARK)\n+ } else {\n+ lineInfo = lineInfo.replace(matchResult.groupValues[3], \"\")\n+ lineInfo = SMILE_DELETE + lineInfo\n+ }\n+ }\n+\n+ lineText = lineText.replace(\n+ NO_BACKWARD_LABEL_REGEX.toRegex(),\n+ SMILE_WARNING + setBold(setItalic(setRedBackground(\"NO BACKWARD COMPATIBILITY\")))\n+ )\n+ stylizedLine += lineInfo + lineText\n+\n+ return stylizedLine\n+ }\n+\n+ private fun setBold(text: String) = \"*$text*\"\n+\n+ private fun setItalic(text: String) = \"_${text}_\"\n+\n+ private fun setRedBackground(text: String) = \"`$text`\"\n+\n+ private fun setQuote(text: String) = \">$text\"\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "ci-internal/DevDeployJobJenkinsfile.groovy",
"new_path": "ci-internal/DevDeployJobJenkinsfile.groovy",
"diff": "@@ -109,7 +109,7 @@ pipeline.stages = [\npipeline.stage(NOTIFY_ABOUT_NEW_RELEASE_NOTES, StageStrategy.UNSTABLE_WHEN_STAGE_ERROR, false) {\ndef commitParents = script.sh(returnStdout: true, script: 'git log -1 --pretty=%P').split(' ')\ndef prevCommitHash = commitParents[0]\n- script.sh(\"./gradlew writeToFileReleaseNotesDiff -PrevisionToCompare=${prevCommitHash}\")\n+ script.sh(\"./gradlew WriteToFileReleaseNotesDiffForSlack -PrevisionToCompare=${prevCommitHash}\")\nString releaseNotesChanges = script.readFile(releaseNotesChangesFileUrl)\nif (releaseNotesChanges.trim() != \"\") {\nreleaseNotesChanges = \"Android Standard changes:\\n$releaseNotesChanges\"\n"
},
{
"change_type": "MODIFY",
"old_path": "ci-internal/ProjectSnapshotDeployJobJenkinsfile.groovy",
"new_path": "ci-internal/ProjectSnapshotDeployJobJenkinsfile.groovy",
"diff": "@@ -116,7 +116,7 @@ pipeline.stages = [\npipeline.stage(NOTIFY_ABOUT_NEW_RELEASE_NOTES, StageStrategy.UNSTABLE_WHEN_STAGE_ERROR, false) {\ndef commitParents = script.sh(returnStdout: true, script: 'git log -1 --pretty=%P').split(' ')\ndef prevCommitHash = commitParents[0]\n- script.sh(\"./gradlew writeToFileReleaseNotesDiff -PrevisionToCompare=${prevCommitHash}\")\n+ script.sh(\"./gradlew WriteToFileReleaseNotesDiffForSlack -PrevisionToCompare=${prevCommitHash}\")\nString releaseNotesChanges = script.readFile(releaseNotesChangesFileUrl)\nif (releaseNotesChanges.trim() != \"\") {\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-984 Added task for getting a list of RELEASE NOTES changes stylized for Slack |
652,327 | 06.04.2020 15:55:57 | -10,800 | 3692149117f2e1b9829b9b44367acea5c19b5040 | set WriteToFileReleaseNotesDiffForSlack is open | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/generate_release_notes_diff/WriteToFileReleaseNotesDiffForSlack.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/generate_release_notes_diff/WriteToFileReleaseNotesDiffForSlack.kt",
"diff": "@@ -3,7 +3,7 @@ package ru.surfstudio.android.build.tasks.generate_release_notes_diff\n/**\n* Task to see the differences between two revisions of RELEASE_NOTES.md in each module of a project.\n*/\n-class WriteToFileReleaseNotesDiffForSlack : WriteToFileReleaseNotesDiff() {\n+open class WriteToFileReleaseNotesDiffForSlack : WriteToFileReleaseNotesDiff() {\ncompanion object {\n//stylized line const\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-984 set WriteToFileReleaseNotesDiffForSlack is open |
652,335 | 06.04.2020 17:00:05 | -10,800 | a78532015359ac1f99773a45314718c1182303d6 | Increase global alpha version counter to 105 [skip ci] [version] | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/components.json",
"new_path": "buildSrc/components.json",
"diff": "{\n\"id\": \"standard-dialog\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 3,\n+ \"unstable_version\": 4,\n\"stable\": false,\n\"dir\": \"standard-dialog\",\n\"libs\": [\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/projectConfiguration.json",
"new_path": "buildSrc/projectConfiguration.json",
"diff": "{\n\"version\": \"0.5.0\",\n\"stable\": false,\n- \"unstable_version\": 104,\n+ \"unstable_version\": 105,\n\"project_snapshot_name\": \"\",\n\"project_snapshot_version\": 0\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Increase global alpha version counter to 105 [skip ci] [version] |
652,312 | 06.04.2020 17:24:31 | -10,800 | 0318a41210c464a61f0a7caa16c7dba4cf0dd3f7 | Add validation for mirror commit | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/MirrorManager.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/MirrorManager.kt",
"diff": "@@ -3,14 +3,16 @@ package ru.surfstudio.android.build.tasks.deploy_to_mirror\nimport org.eclipse.jgit.diff.DiffEntry\nimport org.eclipse.jgit.lib.Ref\nimport org.eclipse.jgit.revwalk.RevCommit\n+import org.gradle.api.GradleException\nimport ru.surfstudio.android.build.exceptions.deploy_to_mirror.RevCommitNotFoundException\n+import ru.surfstudio.android.build.tasks.changed_components.CommandLineRunner\nimport ru.surfstudio.android.build.tasks.deploy_to_mirror.model.CommitType\nimport ru.surfstudio.android.build.tasks.deploy_to_mirror.model.CommitWithBranch\nimport ru.surfstudio.android.build.tasks.deploy_to_mirror.repository.MirrorRepository\nimport ru.surfstudio.android.build.tasks.deploy_to_mirror.repository.StandardRepository\nimport ru.surfstudio.android.build.utils.*\n-private const val HEAD = \"HEAD\"\n+private const val GET_MAIN_BRANCH_COMMAND = \"git symbolic-ref refs/remotes/origin/HEAD\"\n/**\n* Class for mirroring android standard to mirror repository\n@@ -54,15 +56,39 @@ class MirrorManager(\nval rootCommit = standardCommits.find { it.name == rootCommitHash }\n?: throw RevCommitNotFoundException(rootCommitHash)\n- val mirrorCommits: Set<RevCommit> = mirrorRepository.getAllBranches()\n- .flatMap { mirrorRepository.getAllCommits(it.objectId.name, mirrorDepthLimit) }\n- .filter { it.mirrorStandardHash.isNotEmpty() }\n+ val mainBranchFullName = CommandLineRunner.runCommandWithResult(\n+ command = GET_MAIN_BRANCH_COMMAND,\n+ workingDir = mirrorRepository.repositoryPath\n+ )?.trim()\n+\n+ if (mainBranchFullName != null) {\n+ val mainBranch = mirrorRepository.getAllBranches()\n+ .first { it.name == mainBranchFullName }\n+\n+ val mirrorCommits: Set<RevCommit> = mirrorRepository.getAllCommits(\n+ mainBranch.objectId.name, mirrorDepthLimit)\n.toSet()\n+ val latestMirrorCommit = mirrorCommits.maxBy { it.commitTime }\n+\n+ if (latestMirrorCommit != null) {\n+ if (latestMirrorCommit.commitTime > rootCommit.commitTime) {\n+ throw GradleException(\"Invalid mirror commit $rootCommitHash: \" +\n+ \"can't be earlier than latest mirror commit ${latestMirrorCommit.standardHash}\")\n+ }\n+\ngitTree.buildGitTree(rootCommit, standardCommits, mirrorCommits)\napplyGitTreeToMirror()\nsetBranches()\nmirrorRepository.push()\n+ } else {\n+ throw GradleException(\"Can't get latest commit in branch $mainBranchFullName \" +\n+ \"for repo ${mirrorRepository.repositoryName}\")\n+ }\n+ } else {\n+ throw GradleException(\"Can't get main branch \" +\n+ \"for repo ${mirrorRepository.repositoryName}\")\n+ }\n}\nprivate fun setBranches() {\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-1009 Add validation for mirror commit |
652,315 | 06.04.2020 18:24:31 | -10,800 | e89a6d1074c25497eef85e327b782b15c092c8fd | Renamed RequestEvent.type to RequestEvent.request.
Replaced RxMiddleware.asRequestEvent Event parameter with EventFactory.
Added state checker methods to Request. | [
{
"change_type": "MODIFY",
"old_path": "mvi/RELEASE_NOTES.md",
"new_path": "mvi/RELEASE_NOTES.md",
"diff": "@@ -22,3 +22,6 @@ even if stream contains events from UI, which should be reacted directly.\n* Remove listenForResult extension for EventTransformerList + listenForResult from NavigationMiddleware\n* Fixed StandardReactDialogView negative button nullability\n* ANDDEP-928 Remove Timber dependencies\n+* **NO BACKWARD COMPATIBILITY** ANDDEP-997 Renamed RequestEvent.type to RequestEvent.request.\n+Replaced RxMiddleware.asRequestEvent `Event` parameter with `EventFactory`.\n+Added state checker methods to Request.\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "mvi/lib-mvi-impls/src/main/java/ru/surfstudio/android/core/mvi/impls/ui/middleware/BaseMiddleware.kt",
"new_path": "mvi/lib-mvi-impls/src/main/java/ru/surfstudio/android/core/mvi/impls/ui/middleware/BaseMiddleware.kt",
"diff": "@@ -12,7 +12,7 @@ import ru.surfstudio.android.core.mvi.impls.ui.middleware.dsl.LifecycleMiddlewar\nimport ru.surfstudio.android.core.mvi.ui.middleware.RxMiddleware\nimport ru.surfstudio.android.core.mvp.binding.rx.builders.RxBuilderHandleError\nimport ru.surfstudio.android.core.mvp.binding.rx.builders.RxBuilderIo\n-import ru.surfstudio.android.core.mvp.binding.rx.request.type.Request\n+import ru.surfstudio.android.core.mvp.binding.rx.request.Request\nimport ru.surfstudio.android.core.mvp.error.ErrorHandler\nimport ru.surfstudio.android.logger.Logger\nimport ru.surfstudio.android.rx.extension.scheduler.SchedulersProvider\n@@ -54,8 +54,8 @@ abstract class BaseMiddleware<T : Event>(\n*/\nprotected fun <D> Observable<Request<D>>.toDataEvent(eventFactory: EventFactory<D, out T>): Observable<out T> {\nreturn flatMap {\n- if (it is Request.Success) {\n- eventFactory(it.data).toObservable()\n+ if (it.isSuccess) {\n+ eventFactory(it.getData()).toObservable()\n} else {\nskip()\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/base/extension/PaginationExtensions.kt",
"new_path": "mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/base/extension/PaginationExtensions.kt",
"diff": "@@ -4,17 +4,16 @@ import io.reactivex.Observable\nimport ru.surfstudio.android.core.mvi.event.RequestEvent\nimport ru.surfstudio.android.core.mvi.sample.ui.base.middleware.experimental.pagination.PaginationEvent\nimport ru.surfstudio.android.core.mvp.binding.rx.request.state.RequestState\n-import ru.surfstudio.android.core.mvp.binding.rx.request.type.Request\n+import ru.surfstudio.android.core.mvp.binding.rx.request.Request\nimport ru.surfstudio.android.datalistpagecount.domain.datalist.DataList\nimport ru.surfstudio.android.easyadapter.pagination.PaginationState\nimport ru.surfstudio.android.rx.extension.toObservable\n-\nfun <T, PE : PaginationEvent> RequestEvent<DataList<T>>.toPaginationEvent(\npaginationEvent: PE,\n- canGetMore: Boolean = type.canGetMore()\n+ canGetMore: Boolean = request.canGetMore()\n): Observable<PE> {\n- return when (this.type) {\n+ return when (this.request) {\nis Request.Loading ->\nObservable.empty()\nis Request.Success -> paginationEvent\n@@ -27,10 +26,10 @@ fun <T, PE : PaginationEvent> RequestEvent<DataList<T>>.toPaginationEvent(\n}\ninline fun <T, reified PE : PaginationEvent> RequestEvent<DataList<T>>.toPaginationEvent(\n- canGetMore: Boolean = type.canGetMore()\n+ canGetMore: Boolean = request.canGetMore()\n): Observable<PE> {\nval paginationEvent = PE::class.java.newInstance()\n- return when (this.type) {\n+ return when (this.request) {\nis Request.Loading ->\nObservable.empty()\nis Request.Success -> paginationEvent\n@@ -42,6 +41,6 @@ inline fun <T, reified PE : PaginationEvent> RequestEvent<DataList<T>>.toPaginat\n}\n}\n-fun <T> Request<DataList<T>>.canGetMore() = (this as? Request.Success)?.data?.canGetMore() == true\n+fun <T> Request<DataList<T>>.canGetMore() = tryGetData()?.canGetMore() ?: false\n-fun <T> RequestState<DataList<T>>.canGetMore() = this.data?.canGetMore() == true\n\\ No newline at end of file\n+fun <T> RequestState<DataList<T>>.canGetMore() = this.data?.canGetMore() ?: false\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/list/ComplexListActivityView.kt",
"new_path": "mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/list/ComplexListActivityView.kt",
"diff": "@@ -24,7 +24,7 @@ import javax.inject.Inject\n*/\nclass ComplexListActivityView : BaseReactActivityView() {\n- private val adapter = PaginationableAdapter { ComplexListEvent.LoadNextPage().emit(hub) }\n+ private val adapter = PaginationableAdapter { ComplexListEvent.LoadNextPage.emit(hub) }\nprivate val controller = ComplexListController()\noverride fun createConfigurator() = ComplexListScreenConfigurator(intent)\n@@ -46,14 +46,14 @@ class ComplexListActivityView : BaseReactActivityView() {\nreactive_rv.adapter = adapter\nreactive_reload_btn.clicks()\n- .emit(ComplexListEvent.Reload(), hub)\n+ .emit(ComplexListEvent.Reload, hub)\nreactive_query_tv.textChanges()\n.skipInitialValue()\n.map { ComplexListEvent.QueryChanged(it.toString()) }\n.emit(hub)\n- reactive_swr.setOnRefreshListener { ComplexListEvent.SwipeRefresh().emit(hub) }\n+ reactive_swr.setOnRefreshListener { ComplexListEvent.SwipeRefresh.emit(hub) }\nsh.list.observeMainLoading() bindTo { reactive_pb.isVisible = it }\nsh.list.observeSwrLoading() bindTo { reactive_swr.isRefreshing = it }\n"
},
{
"change_type": "MODIFY",
"old_path": "mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/list/ComplexListMiddleware.kt",
"new_path": "mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/list/ComplexListMiddleware.kt",
"diff": "@@ -51,7 +51,7 @@ class ComplexListMiddleware @Inject constructor(\nprivate fun loadData(page: Int = 1, isSwr: Boolean = false) = createObservable(page)\n.io()\n.handleError()\n- .asRequestEvent(LoadList(isSwr = isSwr))\n+ .asRequestEvent { LoadList(request = it, isSwr = isSwr) }\nprivate fun createObservable(page: Int) = Observable.timer(2, TimeUnit.SECONDS).map {\nDataList(\n"
},
{
"change_type": "MODIFY",
"old_path": "mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/list/ComplexListReactor.kt",
"new_path": "mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/list/ComplexListReactor.kt",
"diff": "@@ -40,9 +40,9 @@ class ComplexListReactor @Inject constructor() : Reactor<ComplexListEvent, Compl\nsh.list.modify {\nval hasData = data?.isNotEmpty() ?: false\ncopy(\n- data = mapDataList(event.type, data, hasData),\n- load = mapLoading(event.type, hasData, event.isSwr),\n- error = mapError(event.type, hasData)\n+ data = mapDataList(event.request, data, hasData),\n+ load = mapLoading(event.request, hasData, event.isSwr),\n+ error = mapError(event.request, hasData)\n)\n}\n}\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-997 Renamed RequestEvent.type to RequestEvent.request.
Replaced RxMiddleware.asRequestEvent Event parameter with EventFactory.
Added state checker methods to Request. |
652,335 | 07.04.2020 10:31:31 | -10,800 | eec4e01eb9e8b8c584f1f3e938ed7775e29a062c | Increase global alpha version counter to 106 [skip ci] [version] | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/projectConfiguration.json",
"new_path": "buildSrc/projectConfiguration.json",
"diff": "{\n\"version\": \"0.5.0\",\n\"stable\": false,\n- \"unstable_version\": 105,\n+ \"unstable_version\": 106,\n\"project_snapshot_name\": \"\",\n\"project_snapshot_version\": 0\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Increase global alpha version counter to 106 [skip ci] [version] |
652,300 | 07.04.2020 17:01:20 | -14,400 | e517c70983ad0a47a9cf995290c3ff9cf7108505 | KittiesMiddleware: refactored transformations | [
{
"change_type": "MODIFY",
"old_path": "mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/kitties/KittiesMiddleware.kt",
"new_path": "mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/kitties/KittiesMiddleware.kt",
"diff": "@@ -22,7 +22,11 @@ internal class KittiesMiddleware @Inject constructor(\nprivate val kittiesStateHolder: KittiesStateHolder\n) : BaseMiddleware<KittiesEvent>(baseMiddlewareDependency) {\n- private val state: KittiesState get() = kittiesStateHolder.value\n+ private val state get() = kittiesStateHolder.value\n+ private val isTopKittenLoading get() = state.loadTopKittenRequestUi.isLoading\n+ private val isNewKittiesCountLoading get() = state.loadNewKittiesCountRequestUi.isLoading\n+ private val isPopularKittiesLoading get() = state.loadPopularKittiesRequestUi.isLoading\n+ private val isMeowLoading get() = state.isMeowButtonLoading\noverride fun transform(eventStream: Observable<KittiesEvent>): Observable<out KittiesEvent> {\nreturn transformations(eventStream) {\n@@ -31,62 +35,28 @@ internal class KittiesMiddleware @Inject constructor(\nBackClicked::class mapTo { closeScreen() },\nTopKitten.UpdateClicked::class mapTo { TopKitten.Load },\n- TopKitten.Load::class eventMapTo { onTopKittenLoad() },\n+ TopKitten.Load::class.filter { !isTopKittenLoading }.eventMap { loadTopKitten() },\nNewKittiesCount.UpdateClicked::class mapTo { NewKittiesCount.Load },\n- NewKittiesCount.Load::class eventMapTo { onNewKittiesCountLoad() },\n+ NewKittiesCount.Load::class.filter { !isNewKittiesCountLoading }.eventMap { loadNewKittiesCount() },\nPopularKitties.AllClicked::class mapTo { openAllKittiesScreen() },\n- PopularKitties.UpdateClicked::class mapTo { onPopularKittiesUpdateClicked() },\n- PopularKitties.Load::class eventMapTo { onPopularKittiesLoad() },\n+ PopularKitties.UpdateClicked::class mapTo {\n+ kittiesStorage.generateNewKittiesList()\n+ PopularKitties.Load\n+ },\n+ PopularKitties.Load::class.filter { !isPopularKittiesLoading }.eventMap { loadPopularKitties() },\nMeow.Clicked::class mapTo { Meow.Send },\n- Meow.Send::class eventMapTo { onMeowSend() },\n- Meow.UpdateCount::class eventMapTo { onMeowUpdateCount() },\n- Meow.SendReq::class eventMapTo ::onMeowSendRequest,\n+ Meow.Send::class.filter { !isMeowLoading }.eventMap { sendMeow() },\n+ Meow.SendReq::class.filter { it.hasData }.map { Meow.UpdateCount },\n+ Meow.UpdateCount::class.filter { !isMeowLoading }.eventMap { updateMeowCount() },\nNavigation::class decomposeTo navigationMiddleware\n)\n}\n}\n- private fun onPopularKittiesUpdateClicked(): KittiesEvent {\n- kittiesStorage.generateNewKittiesList()\n- return PopularKitties.Load\n- }\n-\n- private fun onTopKittenLoad(): Observable<out KittiesEvent> {\n- return if (state.loadTopKittenRequestUi.isLoading) skip()\n- else loadTopKitten()\n- }\n-\n- private fun onNewKittiesCountLoad(): Observable<out KittiesEvent> {\n- return if (state.loadNewKittiesCountRequestUi.isLoading) skip()\n- else loadNewKittiesCount()\n- }\n-\n- private fun onPopularKittiesLoad(): Observable<out KittiesEvent> {\n- return if (state.loadPopularKittiesRequestUi.isLoading) skip()\n- else loadPopularKitties()\n- }\n-\n- private fun onMeowUpdateCount(): Observable<out KittiesEvent> {\n- return if (state.isMeowButtonLoading) skip()\n- else updateMeowCount()\n- }\n-\n- private fun onMeowSend(): Observable<out KittiesEvent> {\n- return if (state.isMeowButtonLoading) skip()\n- else sendMeow()\n- }\n-\n- private fun onMeowSendRequest(event: Meow.SendReq): Observable<out KittiesEvent> {\n- return when (event.type) {\n- is Request.Success -> Meow.UpdateCount.toObservable()\n- else -> skip()\n- }\n- }\n-\nprivate fun loadAllData(): Observable<out KittiesEvent> {\nval events = listOf(\nTopKitten.Load,\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-968 KittiesMiddleware: refactored transformations |
652,312 | 07.04.2020 17:57:32 | -10,800 | e5456b5125106e9e6371fac62ac3d60ea678279c | Primary working debug code | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/GitTree.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/GitTree.kt",
"diff": "@@ -203,7 +203,11 @@ class GitTree(\nmirrorNodes.forEach { mirrorNode ->\nstandardNodes.find {\nit.value.standardHash == mirrorNode.value.mirrorStandardHash\n- }?.state = END\n+ }?.apply {\n+ println(\"mirrorNode ${mirrorNode.value.shortMessage}\")\n+ println(\"standardNode ${value.shortMessage}\")\n+ state = END\n+ }\n}\n}\n@@ -226,7 +230,7 @@ class GitTree(\nval ends = standardNodes.filter { it.state == END }\nreturn ends.flatMap { end -> buildChain(mutableListOf(end)) }\n- .filter { ends.contains(it.first()) && it.last() == rootNode }\n+ //.filter { ends.contains(it.first()) && it.last() == rootNode }\n}\n/**\n@@ -314,17 +318,25 @@ class GitTree(\n}\n.sortedBy { it.commit.commitTime }\n+ println(\"----------------------------------------\")\n+ standardRepositoryCommitsForMirror.filter { it.commit.shortMessage.startsWith(\"ANDDEP-785\") }.forEach {\n+ println(\"standardRepositoryCommitsForMirror ${it.commit.shortMessage}\")\n+ }\n+ println(\"----------------------------------------\")\n+\n+ /*\nlines.forEach { line ->\nval branchName = BranchCreator.generateBranchName(existedBranchNames)\nline.forEach { node ->\n+ println(\"node ${node.value.shortMessage}\")\nval commit = standardRepositoryCommitsForMirror.find { it.commit == node.value }\nif (commit?.branch?.isEmpty() == true) {\ncommit.branch = branchName\n}\n}\n- }\n+ }*/\n- standardRepositoryCommitsForMirror = standardRepositoryCommitsForMirror.filter { it.branch.isNotEmpty() }\n+ //standardRepositoryCommitsForMirror = standardRepositoryCommitsForMirror.filter { it.branch.isNotEmpty() }\n}\n/**\n@@ -333,20 +345,30 @@ class GitTree(\nprivate fun buildChain(chain: MutableList<Node>): List<List<Node>> {\nval result: MutableList<List<Node>> = mutableListOf()\nvar node = chain.last()\n+ println(\"!!!!!!!!!!!!!!!!!!!! buildChain node ${node.value.shortMessage}\")\nwhile (true) {\nwhen (node.children.size) {\n1 -> {\nval next = node.children.first()\n+ println(\"\\nbuildChain next ${next.value.shortMessage} ${next.value.type}\")\nchain.add(next)\nnode = next\n+ next.value.parents.forEach {\n+ println(\"parents ${it.shortMessage}\")\n+ }\n+ //if (next.value.type == CommitType.MERGE.ordinal) {\n+\n+ //}\n}\n0 -> {\n+ println(\"buildChain no children\")\nresult.add(chain)\nreturn result\n}\nelse -> {\nnode.children.forEach {\n+ println(\"buildChain else ${it.value.shortMessage}\")\nval newChain = chain.toMutableList()\nnewChain.add(it)\nresult.addAll(buildChain(newChain))\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/MirrorManager.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/MirrorManager.kt",
"diff": "@@ -55,6 +55,10 @@ class MirrorManager(\nfun mirror(rootCommitHash: String) {\nval standardCommits = standardRepository.getAllCommits(rootCommitHash, standardDepthLimit)\n+ /*\n+ standardCommits.forEach {\n+ println(\"standardCommits ${it.shortMessage}\")\n+ }*/\nval rootCommit = standardCommits.find { it.name == rootCommitHash }\n?: throw RevCommitNotFoundException(rootCommitHash)\n@@ -114,8 +118,19 @@ class MirrorManager(\n* For all git tree commits apply them to mirror repository\n*/\nprivate fun applyGitTreeToMirror() {\n- gitTree.standardRepositoryCommitsForMirror.forEach { commit ->\n- println(\"commit ${commit.type} ${commit.commit.shortMessage}\")\n+ val index = gitTree.standardRepositoryCommitsForMirror.indexOfFirst {\n+ it.commit.shortMessage.endsWith(\"80 [skip ci] [version]\")\n+ }\n+ val size = gitTree.standardRepositoryCommitsForMirror.size\n+ gitTree.standardRepositoryCommitsForMirror.filter {\n+ it.commit.shortMessage.startsWith(\"ANDDEP-785\")\n+ }.forEach {\n+ println(\"sublist ${it.commit.shortMessage}\")\n+ }\n+ gitTree.standardRepositoryCommitsForMirror.filter {\n+ it.commit.shortMessage.startsWith(\"ANDDEP-785\")\n+ }.forEach { commit ->\n+ println(\"commit ${commit.type} ${commit.commit.shortMessage} ${commit.commit.commitTime}\")\n(when (commit.type) {\nCommitType.SIMPLE -> commit(commit)\nCommitType.MERGE -> merge(commit)\n@@ -171,7 +186,7 @@ class MirrorManager(\nif (parent.mirrorCommitHash.isNotEmpty()) {\ncheckoutCommit(parent.mirrorCommitHash)\n}\n- checkoutBranch(commit.branch)\n+ //checkoutBranch(commit.branch)\n}\n}\n@@ -184,7 +199,6 @@ class MirrorManager(\n*/\nprivate fun merge(commit: CommitWithBranch): RevCommit? {\nstandardRepository.reset(commit.commit)\n- println(\"merge ${commit.commit.shortMessage}\")\nval mainBranch = commit.branch\nval secondBranch = gitTree.getMergeParents(commit)\n@@ -192,11 +206,9 @@ class MirrorManager(\n.firstOrNull { it != mainBranch }\n?: return null\n- println(\"merge $mainBranch ${mirrorRepository.isBranchExists(mainBranch)} $secondBranch ${mirrorRepository.isBranchExists(secondBranch)}\")\n-\nif (!mirrorRepository.isBranchExists(mainBranch) || !mirrorRepository.isBranchExists(secondBranch)) {\n- mirrorRepository.commit(commit.commit)\n- return commit.commit\n+ // mirrorRepository.commit(commit.commit)\n+ return null\n}\nmirrorRepository.checkoutBranch(mainBranch)\n"
},
{
"change_type": "MODIFY",
"old_path": "mirror.sh",
"new_path": "mirror.sh",
"diff": "rm -rf _mirror temp\ngit clone https://github.com/surfstudio/EasyAdapter _mirror\ngit clone --single-branch --branch dev/G-0.5.0 https://gitlab.com/surfstudio/projects/standard/android-standard temp\n-#./gradlew deployToMirror -Pcomponent=easyadapter -Pcommit=34b1f0aa3a3991423a4e79df58a2465de0c425da -PmirrorDir=_mirror -PdepthLimit=100 -PsearchLimit=100\n+./gradlew deployToMirror -Pcomponent=easyadapter -Pcommit=34b1f0aa3a3991423a4e79df58a2465de0c425da -PmirrorDir=_mirror -PdepthLimit=100 -PsearchLimit=100\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-1012 Primary working debug code |
652,335 | 08.04.2020 02:28:48 | -10,800 | 7c7673b4ead24ef50795f99b709fd39d8cb40c10 | Increase global alpha version counter to 107 [skip ci] [version] | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/components.json",
"new_path": "buildSrc/components.json",
"diff": "{\n\"id\": \"mvi\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 14,\n+ \"unstable_version\": 15,\n\"stable\": false,\n\"dir\": \"mvi\",\n\"libs\": [\n{\n\"id\": \"core-mvp-binding\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 10,\n+ \"unstable_version\": 11,\n\"stable\": false,\n\"dir\": \"core-mvp-binding\",\n\"libs\": [\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/projectConfiguration.json",
"new_path": "buildSrc/projectConfiguration.json",
"diff": "{\n\"version\": \"0.5.0\",\n\"stable\": false,\n- \"unstable_version\": 106,\n+ \"unstable_version\": 107,\n\"project_snapshot_name\": \"\",\n\"project_snapshot_version\": 0\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Increase global alpha version counter to 107 [skip ci] [version] |
652,312 | 08.04.2020 10:46:53 | -10,800 | cb72115e5627e8bbf55076e6e5883862ac96ff42 | Fix MIRROR_START_POINT logic | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/MirrorManager.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/MirrorManager.kt",
"diff": "@@ -44,6 +44,8 @@ class MirrorManager(\n\"common\"\n)\n+ private var latestMirrorCommit: RevCommit? = null\n+\n/**\n* Mirrors standard repository to mirror repository.\n* Builds git tree presentation and then applies to mirror repository\n@@ -69,21 +71,18 @@ class MirrorManager(\nmainBranch.objectId.name, mirrorDepthLimit)\n.toSet()\n- val latestMirrorCommit = mirrorCommits.maxBy { it.commitTime }\n-\n- if (latestMirrorCommit != null) {\n- if (latestMirrorCommit.commitTime > rootCommit.commitTime) {\n+ latestMirrorCommit = mirrorCommits.maxBy { it.commitTime }\n+ latestMirrorCommit?.also { safeLatestMirrorCommit ->\n+ if (safeLatestMirrorCommit.commitTime > rootCommit.commitTime) {\nthrow GradleException(\"Invalid mirror commit $rootCommitHash: \" +\n- \"can't be earlier than latest mirror commit ${latestMirrorCommit.standardHash}\")\n+ \"can't be earlier than latest mirror commit ${safeLatestMirrorCommit.standardHash}\")\n}\ngitTree.buildGitTree(rootCommit, standardCommits, mirrorCommits)\napplyGitTreeToMirror()\nsetBranches()\nmirrorRepository.push()\n- } else {\n- throw GradleException(\"Can't get latest commit in branch $mainBranchFullName \" +\n- \"for repo ${mirrorRepository.repositoryName}\")\n+ return\n}\n} else {\nthrow GradleException(\"Can't get main branch \" +\n@@ -115,25 +114,12 @@ class MirrorManager(\n(when (commit.type) {\nCommitType.SIMPLE -> commit(commit)\nCommitType.MERGE -> merge(commit)\n- CommitType.MIRROR_START_POINT -> createMirrorStartCommit(commit)\n+ CommitType.MIRROR_START_POINT -> latestMirrorCommit\nelse -> null\n})?.let { commit.tags.forEach { tag -> mirrorRepository.tag(it, tag) } }\n}\n}\n- /**\n- * creates start commit of git tree in mirror repository\n- *\n- * @param commit start commit\n- */\n- private fun createMirrorStartCommit(commit: CommitWithBranch): RevCommit {\n- val mirrorCommit = gitTree.getStartMirrorCommitByStandardHash(commit.commit.standardHash)\n- mirrorRepository.reset(mirrorCommit.commit)\n- mirrorRepository.checkoutBranch(mirrorCommit.branch)\n- commit.mirrorCommitHash = mirrorCommit.commit.name\n- return mirrorCommit.commit\n- }\n-\n/**\n* creates commit in mirror repository by\n* getting all changes for [commit]\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-1012 Fix MIRROR_START_POINT logic |
652,335 | 08.04.2020 11:16:43 | -10,800 | 4d5d23517ad685e9d2c00fdf8e13c8cb7ab662ce | Increase global alpha version counter to 108 [skip ci] [version] | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/projectConfiguration.json",
"new_path": "buildSrc/projectConfiguration.json",
"diff": "{\n\"version\": \"0.5.0\",\n\"stable\": false,\n- \"unstable_version\": 107,\n+ \"unstable_version\": 108,\n\"project_snapshot_name\": \"\",\n\"project_snapshot_version\": 0\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Increase global alpha version counter to 108 [skip ci] [version] |
652,300 | 08.04.2020 12:16:46 | -14,400 | 91318e425019265b989389b9cabd9721b15ff9f7 | updated newest versions of libraries after merge | [
{
"change_type": "MODIFY",
"old_path": "template/config.gradle",
"new_path": "template/config.gradle",
"diff": "@@ -26,35 +26,35 @@ ext {\nannimonStreamVersion : '1.2.1', //https://bit.ly/2Ke0nlQ,\njetbrainsAnnotationsVersion : '19.0.0', //http://bit.ly/2NYf6Dt\nmultidexVersion : '2.0.1', //http://bit.ly/2KenzA7\n- constraintLayoutVersion : '2.0.0-alpha3', //http://bit.ly/2S1WoNg\n+ constraintLayoutVersion : '2.0.0-beta4', //http://bit.ly/2S1WoNg\nktlintPluginVersion : '2.3.2', //https://bit.ly/2YLc3n8\n- daggerVersion : '2.21', //https://vk.cc/7UFvQo\n+ daggerVersion : '2.27', //https://vk.cc/7UFvQo\njavaInjectVersion : '1', //https://goo.gl/cM9Kcd\n- androidXVersion : '1.0.2', //http://bit.ly/2zjueqh\n- androidxTestCoreVersion : '1.0.0', //http://bit.ly/2P1yKi1\n- androidxTestExtJunitVersion : '1.0.0', //http://bit.ly/2zC6UV1\n- androidxAnnotationVersion : '1.0.1', //http://bit.ly/2P3QBVO\n- androidXTestRunnerVersion : '1.1.0', //http://bit.ly/2ztEfBo\n- androidXEspressoCoreVersion : '3.1.0', //http://bit.ly/2DNc0AA\n- androidXEspressoIntentsVersion : '3.1.0', //http://bit.ly/2SikuDT\n- androidXEspressoContribVersion : '3.1.0', //http://bit.ly/2E0DdAq\n- robolectricVersion : '4.0.2', //http://bit.ly/2xLRICR\n- junitVersion : '4.12', //https://goo.gl/hEcfw1\n- firebaseMessagingVersion : '20.1.0', //http://bit.ly/2Q81pGJ\n- firebaseAnalyticsVersion : '17.2.2', //http://bit.ly/2Q81pGJ\n- firebaseCoreVersion : '17.2.2',\n+ androidXVersion : '1.1.0', //http://bit.ly/2zjueqh\n+ androidxTestCoreVersion : '1.2.0', //http://bit.ly/2P1yKi1\n+ androidxTestExtJunitVersion : '1.1.1', //http://bit.ly/2zC6UV1\n+ androidxAnnotationVersion : '1.1.0', //http://bit.ly/2P3QBVO\n+ androidXTestRunnerVersion : '1.2.0', //http://bit.ly/2ztEfBo\n+ androidXEspressoCoreVersion : '3.2.0', //http://bit.ly/2DNc0AA\n+ androidXEspressoIntentsVersion : '3.2.0', //http://bit.ly/2SikuDT\n+ androidXEspressoContribVersion : '3.2.0', //http://bit.ly/2E0DdAq\n+ robolectricVersion : '4.3.1', //http://bit.ly/2xLRICR\n+ junitVersion : '4.13', //https://goo.gl/hEcfw1\n+ firebaseMessagingVersion : '20.1.3', //http://bit.ly/2Q81pGJ\n+ firebaseAnalyticsVersion : '17.2.3', //http://bit.ly/2Q81pGJ\n+ firebaseCoreVersion : '17.2.3',\nfirebaseAppDistributionVersion : '1.2.0', //http://bit.ly/2Gc2qHh\nfirebaseCrashlyticsVersion : '17.0.0-beta01', //http://bit.ly/2RM7ec2\nfirebaseCrashlyticsGradleVersion: '2.0.0-beta01', //http://bit.ly/2RM7ec2\n- okHttpVersion : '3.12.0', //https://vk.cc/7UFwTd\n- retrofitVersion : '2.5.0', //https://vk.cc/7UFxk3\n+ okHttpVersion : '4.4.1', //https://vk.cc/7UFwTd\n+ retrofitVersion : '2.8.1', //https://vk.cc/7UFxk3\nchuckVersion : '1.1.0', //https://bit.ly/2qCecTE\nrxBinding2Version : '2.2.0', //https://goo.gl/KQ5Vga\n- stethoVersion : '1.5.0', //https://bit.ly/2eZ3YI7\n+ stethoVersion : '1.5.1', //https://bit.ly/2eZ3YI7\ntinyDancerVersion : '0.1.2', //https://bit.ly/2Bluq9P\nprocessPhoenixVersion : '2.0.0', //https://bit.ly/2OAc0po\n- leakCanaryVersion : '1.6.2', //https://goo.gl/w3pm32\n- anrWatchDogVersion : '1.3.0', //http://bit.ly/2NZvjZc\n+ leakCanaryVersion : '2.2', //https://goo.gl/w3pm32\n+ anrWatchDogVersion : '1.4.0', //http://bit.ly/2NZvjZc\nmaterialRangeBarVersion : '1.4.4', //https://bit.ly/2TxqAkm\ntimberVersion : '4.7.1', //http://bit.ly/2LWbLaY\nrxJava2DebugVersion : '1.4.0', //https://bit.ly/322Qzo7\n@@ -147,17 +147,12 @@ ext {\nanrWatchDog : \"com.github.anrwatchdog:anrwatchdog:${versions.anrWatchDogVersion}\",\ntimber : \"com.jakewharton.timber:timber:${versions.timberVersion}\",\nrxJava2Debug : \"com.akaita.java:rxjava2-debug:${versions.rxJava2DebugVersion}\",\n- androidDebugTools: \"com.github.kk121:Android-Debug-Tools:${versions.androidDebugToolsVersion}\"\n+ androidDebugTools: \"com.github.kk121:Android-Debug-Tools:${versions.androidDebugToolsVersion}\",\n+ leakCanary : \"com.squareup.leakcanary:leakcanary-android:${versions.leakCanaryVersion}\"\n]\nstetho = [\ncore : \"com.facebook.stetho:stetho:${versions.stethoVersion}\",\nokHttp: \"com.facebook.stetho:stetho-okhttp3:${versions.stethoVersion}\"\n]\n-\n- leakCanary = [\n- core : \"com.squareup.leakcanary:leakcanary-android:${versions.leakCanaryVersion}\",\n- supportFragment: \"com.squareup.leakcanary:leakcanary-support-fragment:${versions.leakCanaryVersion}\",\n- coreNoOp : \"com.squareup.leakcanary:leakcanary-android-no-op:${versions.leakCanaryVersion}\"\n- ]\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "template/f-debug/build.gradle",
"new_path": "template/f-debug/build.gradle",
"diff": "@@ -15,12 +15,10 @@ dependencies {\nimplementation debug.processPhoenix\nimplementation debug.androidDebugTools\n- implementation leakCanary.core\n- implementation leakCanary.supportFragment\n-\nimplementation network.chuck\nimplementation debug.tinyDancer\n+ implementation debug.leakCanary\nimplementation stetho.core\nimplementation stetho.okHttp\n"
},
{
"change_type": "MODIFY",
"old_path": "template/f-debug/src/main/java/ru/surfstudio/standard/f_debug/DebugInteractor.kt",
"new_path": "template/f-debug/src/main/java/ru/surfstudio/standard/f_debug/DebugInteractor.kt",
"diff": "@@ -102,6 +102,7 @@ class DebugInteractor @Inject constructor(\nokHttpBuilder.addNetworkInterceptor(StethoInterceptor())\n}\n+ //TODO add kotlinoption for jvm_1_8\nokHttpBuilder.addInterceptor {\nTimeUnit.MILLISECONDS.sleep(requestDelay)\nit.proceed(it.request())\n"
},
{
"change_type": "MODIFY",
"old_path": "template/small-test-utils/build.gradle",
"new_path": "template/small-test-utils/build.gradle",
"diff": "@@ -12,7 +12,6 @@ dependencies {\nimplementation test.junit\nimplementation test.robolectric\nimplementation test.shadowsMultidex\n- implementation leakCanary.coreNoOp\nimplementation di.dagger\nkapt di.daggerKapt\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "template/unitTestConfiguration.gradle",
"new_path": "template/unitTestConfiguration.gradle",
"diff": "@@ -16,7 +16,6 @@ dependencies {\ntestImplementation test.junit\ntestImplementation test.robolectric\ntestImplementation test.shadowsMultidex\n- testImplementation leakCanary.coreNoOp\ntestImplementation di.dagger\nkaptTest di.daggerKapt\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-982 updated newest versions of libraries after merge |
652,312 | 08.04.2020 11:52:55 | -10,800 | e3720f7084752c644b04de3f31c6d09c06efe1d3 | Update filter for commits | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/MirrorManager.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/MirrorManager.kt",
"diff": "@@ -115,17 +115,13 @@ class MirrorManager(\n*/\nprivate fun applyGitTreeToMirror() {\nval index = gitTree.standardRepositoryCommitsForMirror.indexOfFirst {\n- it.commit.shortMessage.endsWith(\"80 [skip ci] [version]\")\n+ it.type == CommitType.MIRROR_START_POINT\n}\nval size = gitTree.standardRepositoryCommitsForMirror.size\n- gitTree.standardRepositoryCommitsForMirror.filter {\n- it.commit.shortMessage.startsWith(\"ANDDEP-785\")\n- }.forEach {\n+ gitTree.standardRepositoryCommitsForMirror.subList(index, size).forEach {\nprintln(\"sublist ${it.commit.shortMessage}\")\n}\n- gitTree.standardRepositoryCommitsForMirror.filter {\n- it.commit.shortMessage.startsWith(\"ANDDEP-785\")\n- }.forEach { commit ->\n+ gitTree.standardRepositoryCommitsForMirror.subList(index, size).forEach { commit ->\nprintln(\"commit ${commit.type} ${commit.commit.shortMessage} ${commit.commit.commitTime}\")\n(when (commit.type) {\nCommitType.SIMPLE -> commit(commit)\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-1013 Update filter for commits |
652,300 | 08.04.2020 13:12:09 | -14,400 | c9042231a89ba0a51165caa4a870a3c618cd8145 | PR: mvi-reducer module renamed to mvi-mapper | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/components.json",
"new_path": "buildSrc/components.json",
"diff": "]\n},\n{\n- \"name\": \"mvi-reducer\",\n- \"dir\": \"lib-mvi-reducer\",\n- \"artifact_name\": \"mvi-reducer\",\n+ \"name\": \"mvi-mapper\",\n+ \"dir\": \"lib-mvi-mapper\",\n+ \"artifact_name\": \"mvi-mapper\",\n\"third_party_dependencies\": [\n{\n\"name\": \"junit:junit\",\n"
},
{
"change_type": "RENAME",
"old_path": "mvi/lib-mvi-reducer/src/main/java/ru/surfstudio/android/core/mvi/ui/reducer/Reducer.kt",
"new_path": "mvi/lib-mvi-core/src/main/java/ru/surfstudio/android/core/mvi/ui/reducer/Reducer.kt",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "mvi/lib-mvi-reducer/.gitignore",
"new_path": "mvi/lib-mvi-mapper/.gitignore",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "mvi/lib-mvi-reducer/README.md",
"new_path": "mvi/lib-mvi-mapper/README.md",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "mvi/lib-mvi-reducer/build.gradle",
"new_path": "mvi/lib-mvi-mapper/build.gradle",
"diff": ""
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "mvi/lib-mvi-mapper/src/main/AndroidManifest.xml",
"diff": "+<manifest package=\"ru.surfstudio.android.core.mvi.ui.mapper\" />\n"
},
{
"change_type": "RENAME",
"old_path": "mvi/lib-mvi-reducer/src/main/java/ru/surfstudio/android/core/mvi/ui/reducer/RequestMapperLambdas.kt",
"new_path": "mvi/lib-mvi-mapper/src/main/java/ru/surfstudio/android/core/mvi/ui/mapper/RequestMapperLambdas.kt",
"diff": "-package ru.surfstudio.android.core.mvi.ui.reducer\n+package ru.surfstudio.android.core.mvi.ui.mapper\nimport ru.surfstudio.android.core.mvp.binding.rx.request.data.Loading\nimport ru.surfstudio.android.core.mvp.binding.rx.request.type.Request\n"
},
{
"change_type": "DELETE",
"old_path": "mvi/lib-mvi-reducer/src/main/AndroidManifest.xml",
"new_path": null,
"diff": "-<manifest package=\"ru.surfstudio.android.core.mvi.ui.reducer\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "mvi/sample/build.gradle",
"new_path": "mvi/sample/build.gradle",
"diff": "@@ -27,7 +27,7 @@ dependencies {\nDependencyConfigurator.projectImplementation(project, \"core-mvp-binding\")\nDependencyConfigurator.projectImplementation(project, \"easyadapter\")\nDependencyConfigurator.projectImplementation(project, \"mvi-core\")\n- DependencyConfigurator.projectImplementation(project, \"mvi-reducer\")\n+ DependencyConfigurator.projectImplementation(project, \"mvi-mapper\")\nDependencyConfigurator.projectImplementation(project, \"mvi-impls\")\nDependencyConfigurator.projectImplementation(project, \"mvp-dialog\")\nDependencyConfigurator.projectImplementation(project, \"rxbus\")\n"
},
{
"change_type": "MODIFY",
"old_path": "mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/kitties/KittiesMiddleware.kt",
"new_path": "mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/kitties/KittiesMiddleware.kt",
"diff": "@@ -8,9 +8,7 @@ import ru.surfstudio.android.core.mvi.impls.ui.middleware.navigation.composition\nimport ru.surfstudio.android.core.mvi.impls.ui.middleware.navigation.composition.open\nimport ru.surfstudio.android.core.mvi.sample.ui.screen.kitties.KittiesEvent.*\nimport ru.surfstudio.android.core.mvi.sample.ui.screen.kitties.all.KittiesAllActivityRoute\n-import ru.surfstudio.android.core.mvp.binding.rx.request.type.Request\nimport ru.surfstudio.android.dagger.scope.PerScreen\n-import ru.surfstudio.android.rx.extension.toObservable\nimport java.util.concurrent.TimeUnit\nimport javax.inject.Inject\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-968 PR: mvi-reducer module renamed to mvi-mapper |
652,300 | 08.04.2020 18:59:49 | -14,400 | 25e54a7b8d6cd7f98e49874005ecce1d21e29e92 | added release notes for template | [
{
"change_type": "MODIFY",
"old_path": "template/RELEASE_NOTES.md",
"new_path": "template/RELEASE_NOTES.md",
"diff": "* ANDDEP-980 Fix template build\n* ANDDEP-1002 app module dependencies refactoring\n* ANDDEP-964 Refactored dependency imports in the project template\n+* ANDDEP-982 `gradle-wrapper` version raised: `5.4.1 -> 5.6.4`;\n+* ANDDEP-982 `kotlin` version raised: `1.3.31 -> 1.3.71`;\n+* ANDDEP-982 `leakCanary` version raised: `1.6.2 -> 2.2`. Migration done;\n+* ANDDEP-982 `okHttp` version raised: `3.12.0 -> 4.4.1`. Migration done;\n+* ANDDEP-982 `easyadapter` now depends on `androidx.asynclayoutinflater`;\n+* ANDDEP-982 other libraries versions changed;\n## 0.4.0\n##### Template\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-982 added release notes for template |
652,300 | 08.04.2020 19:09:06 | -14,400 | bd67fdeab079f7e71892f22653007e6f969cf650 | added release notes for android-standard-version-plugin | [
{
"change_type": "MODIFY",
"old_path": "android-standard-version-plugin/RELEASE_NOTES.md",
"new_path": "android-standard-version-plugin/RELEASE_NOTES.md",
"diff": "## 0.5.0-alpha\n##### Android-standard-version-plugin\n* ANDDEP-521 Added gradle plugin for providing artifacts versions\n+* ANDDEP-982 `kotlin` version raised: `1.3.31 -> 1.3.71`;\n+* ANDDEP-982 `gson` version raised: `2.8.5 -> 2.8.6`;\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-982 added release notes for android-standard-version-plugin |
652,300 | 09.04.2020 09:56:25 | -14,400 | da4b0e1c4e64a36c9edcb172bcd1b720411854a4 | Added DelayInterceptor | [
{
"change_type": "MODIFY",
"old_path": "template/f-debug/src/main/java/ru/surfstudio/standard/f_debug/DebugInteractor.kt",
"new_path": "template/f-debug/src/main/java/ru/surfstudio/standard/f_debug/DebugInteractor.kt",
"diff": "@@ -9,10 +9,13 @@ import io.reactivex.Observable\nimport io.reactivex.disposables.Disposables\nimport io.reactivex.subjects.PublishSubject\nimport leakcanary.LeakCanary\n+import okhttp3.Interceptor\nimport okhttp3.OkHttpClient\n+import okhttp3.Response\nimport ru.surfstudio.android.activity.holder.ActiveActivityHolder\nimport ru.surfstudio.android.core.ui.navigation.activity.route.ActivityRoute\nimport ru.surfstudio.android.dagger.scope.PerApplication\n+import ru.surfstudio.standard.f_debug.network.DelayInterceptor\nimport ru.surfstudio.standard.f_debug.notification.DebugNotificationBuilder\nimport ru.surfstudio.standard.f_debug.scalpel.DebugScalpelManager\nimport ru.surfstudio.standard.f_debug.server_settings.reboot.interactor.DebugRebootInteractor\n@@ -102,10 +105,7 @@ class DebugInteractor @Inject constructor(\nokHttpBuilder.addNetworkInterceptor(StethoInterceptor())\n}\n- okHttpBuilder.addInterceptor {\n- TimeUnit.MILLISECONDS.sleep(requestDelay)\n- it.proceed(it.request())\n- }\n+ okHttpBuilder.addInterceptor(DelayInterceptor(requestDelay))\n}\n//endregion\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-982 Added DelayInterceptor |
652,312 | 09.04.2020 15:48:57 | -10,800 | adc3105ceb5f1eb494cf6590bcf9b4ef4dd5de40 | Working debug code | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/GitTree.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/GitTree.kt",
"diff": "@@ -232,7 +232,9 @@ class GitTree(\nwatchedHashed.clear()\nbuildChain(mutableListOf(end))\n}\n- .filter { ends.contains(it.first()) && it.last() == rootNode }\n+ //todo filter using unique commit condition\n+ .filter { ends.contains(it.first()) && it.last() == rootNode\n+ || it.last().value.shortMessage.endsWith(\"64 [skip ci] [version]\")}\n}\n/**\n@@ -347,14 +349,19 @@ class GitTree(\nprintln(\"START BUILD CHAIN FOR NODE: ${node.value.shortMessage} hash = ${node.value.standardHash}\")\nwatchedHashed.add(node.value.standardHash)\nprintln(\"ADD HASH ${node.value.standardHash}\")\n+ val checkMessage = !node.value.shortMessage.endsWith(\"64 [skip ci] [version]\")\n+ if (!checkMessage) {\n+ println(\"-------------------------- STOP ${node.value.shortMessage}\")\n+ result.add(chain)\n+ return result\n+ }\nresult.add(chain)\nnode.parents.forEach {\n//todo filter old parents\n- val checkMessage = !it.value.shortMessage.endsWith(\"64 [skip ci] [version]\")\n//println(\"${it.value.shortMessage} \" +\n// \"${mirrorNodes.map { it.value.standardHash }.contains(it.value.standardHash)}\")\n- if (!watchedHashed.contains(it.value.standardHash) && it.state != END && checkMessage) {\n+ if (!watchedHashed.contains(it.value.standardHash) && it.state != END) {\nprintln(\"parent: ${it.value.shortMessage} ${it.value.standardHash}\")\nval newChain = chain.toMutableList()\nnewChain.add(it)\n@@ -376,10 +383,9 @@ class GitTree(\nprintln(\"NEXT PARENTS FOR: ${next.value.shortMessage}\")\nnext.parents.forEach {\n//todo filter old parents\n- val checkMessage = !it.value.shortMessage.endsWith(\"64 [skip ci] [version]\")\n//println(\"${it.value.shortMessage} \" +\n// \"${mirrorNodes.map { it.value.standardHash }.contains(it.value.standardHash)}\")\n- if (!watchedHashed.contains(it.value.standardHash) && it.state != END && checkMessage) {\n+ if (!watchedHashed.contains(it.value.standardHash) && it.state != END) {\nprintln(\"parent: ${it.value.shortMessage} ${it.value.standardHash}\")\nval newChain = chain.toMutableList()\nnewChain.add(it)\n@@ -392,8 +398,7 @@ class GitTree(\n}\n}\n- val checkMessage = !next.value.shortMessage.endsWith(\"64 [skip ci] [version]\")\n- if (next.state != END && !watchedHashed.contains(next.value.standardHash) && checkMessage) {\n+ if (next.state != END && !watchedHashed.contains(next.value.standardHash)) {\nprintln(\"\\nONLY CHILD = NEXT NODE: ${next.value.shortMessage} \" +\n\"hash = ${next.value.standardHash}\")\nchain.add(next)\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/MirrorManager.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/MirrorManager.kt",
"diff": "@@ -4,6 +4,7 @@ import org.eclipse.jgit.diff.DiffEntry\nimport org.eclipse.jgit.lib.Ref\nimport org.eclipse.jgit.revwalk.RevCommit\nimport org.gradle.api.GradleException\n+import ru.surfstudio.android.build.exceptions.deploy_to_mirror.GitNodeNotFoundException\nimport ru.surfstudio.android.build.exceptions.deploy_to_mirror.RevCommitNotFoundException\nimport ru.surfstudio.android.build.tasks.changed_components.CommandLineRunner\nimport ru.surfstudio.android.build.tasks.deploy_to_mirror.model.CommitType\n@@ -181,7 +182,9 @@ class MirrorManager(\n* @param commit commit\n*/\nprivate fun checkoutMirrorBranchForCommit(commit: CommitWithBranch) {\n+ try {\nwith(mirrorRepository) {\n+ //todo compare commit with start\nval parent = gitTree.getParent(commit)\nif (parent.mirrorCommitHash.isNotEmpty()) {\ncheckoutCommit(parent.mirrorCommitHash)\n@@ -190,6 +193,10 @@ class MirrorManager(\ncheckoutBranch(commit.branch)\n}\n}\n+ } catch (e: GitNodeNotFoundException) {\n+ //todo remove\n+ println(\"SKIP EXCEPTION :(\")\n+ }\n}\n/**\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-1013 Working debug code |
652,300 | 09.04.2020 17:31:23 | -14,400 | 9ceecd62208c343170501404840220e3e950bb35 | First implementation of task. WIP | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/buildTasks.gradle",
"new_path": "buildSrc/buildTasks.gradle",
"diff": "import ru.surfstudio.android.build.Components\nimport ru.surfstudio.android.build.tasks.*\n+import ru.surfstudio.android.build.tasks.check_cross_feature_route.*\nimport ru.surfstudio.android.build.tasks.artifactory_tasks.*\nimport ru.surfstudio.android.build.tasks.bintray_tasks.*\nimport ru.surfstudio.android.build.tasks.bintray_tasks.release.*\n@@ -26,6 +27,8 @@ task checkStableComponentsChanged(type: CheckStableComponentsChangedTask) //pr\ntask createProjectConfiguration(type: CreateProjectConfigurationTask)\n+task checkScreenRoutes(type: CheckScreenRoutesTask)\n+\ntask runCreateProjectConfigurationFromTemp(type: GradleBuild) {\ndir = file('./temp')\ntasks = ['CreateProjectConfiguration']\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/CheckScreenRoutesTask.kt",
"diff": "+package ru.surfstudio.android.build.tasks.check_cross_feature_route\n+\n+import org.gradle.api.DefaultTask\n+import org.gradle.api.tasks.TaskAction\n+import ru.surfstudio.android.build.utils.EMPTY_STRING\n+import java.io.File\n+import kotlin.time.ExperimentalTime\n+import kotlin.time.measureTime\n+\n+@ExperimentalTime\n+open class CheckScreenRoutesTask : DefaultTask() {\n+\n+ private val charDot = '.'\n+ private val charQuote = '\"'\n+ private val charColon = ':'\n+ private val charBraceOpen = '{'\n+ private val charBraceClose = '}'\n+ private val charSlash = '\\\\'\n+\n+ private val scanExcludedNames = listOf(\"build\")\n+\n+ private val keywordClass = \"class \"\n+ private val funTargetClassPath = \"fun targetClassPath()\"\n+\n+ private val isDebugEnabled = true\n+\n+ @TaskAction\n+ fun check() {\n+ \"Check screen routes started.\".log()\n+ val timeTaken = measureTime {\n+ \"Scanning project...\".log()\n+ val scanResult = scanDirectory(project.projectDir)\n+ \"\\nList of found routes:\".log()\n+ scanResult.routes.forEach { it.absolutePath.log() }\n+ \"\\nList of found activities:\".log()\n+ scanResult.activities.forEach { it.absolutePath.log() }\n+ \"\\nList of found fragments:\".log()\n+ scanResult.fragments.forEach { it.absolutePath.log() }\n+ \"\\nScanning for CrossFeatureRoutes...\".log()\n+ val crossFeatureRoutes = scanResult.routes.mapToCrossFeatureRoute()\n+ \"\\nList of found CrossFeatureRoutes:\".log()\n+ crossFeatureRoutes.forEach { it.toString().log() }\n+ \"\\nValidating CrossFeatureRoutes targetClassPath...\".log()\n+ crossFeatureRoutes.forEach { validateTargetClassPath(scanResult, it) }\n+ }\n+ \"\\nCheck screen routes finished. Time taken: ${timeTaken.inSeconds}\"\n+ }\n+\n+ private fun scanDirectory(dir: File): ScanResult {\n+ val filteredFiles = dir.listFiles()?.filter { !scanExcludedNames.contains(it.name) }\n+ ?: arrayListOf()\n+\n+ val kotlinFiles = filteredFiles.filter { it.extension == \"kt\" }\n+ val directories = filteredFiles.filter { it.isDirectory }\n+\n+ val innerRouteFiles = kotlinFiles.filter { it.name.contains(\"Route\") }\n+ val innerActivityFiles = kotlinFiles.filter { it.name.contains(\"ActivityView\") }\n+ val innerFragmentFiles = kotlinFiles.filter { it.name.contains(\"FragmentView\") }\n+ val innerDialogFiles = kotlinFiles.filter { it.name.contains(\"DialogView\") }\n+\n+ val scanResults = mutableListOf<ScanResult>().apply {\n+ add(ScanResult(innerRouteFiles, innerActivityFiles, innerFragmentFiles, innerDialogFiles))\n+ }\n+\n+ directories.forEach { directory ->\n+ scanDirectory(directory).also { scanResults.add(it) }\n+ }\n+\n+ val routeFiles = scanResults.flatMap { it.routes }\n+ val activityFiles = scanResults.flatMap { it.activities }\n+ val fragmentFiles = scanResults.flatMap { it.fragments }\n+ val dialogFiles = scanResults.flatMap { it.dialogs }\n+ return ScanResult(routeFiles, activityFiles, fragmentFiles, dialogFiles)\n+ }\n+\n+ private fun validateTargetClassPath(scanResult: ScanResult, route: CrossFeatureRoute) {\n+ val candidates = when {\n+ route.isActivity -> scanResult.activities.filter { it.name.contains(route.targetClassName) }\n+ route.isFragment -> scanResult.fragments.filter { it.name.contains(route.targetClassName) }\n+ route.isDialog -> scanResult.dialogs.filter { it.name.contains(route.targetClassName) }\n+ else -> error(\"Unknown route type: ${route.name}\")\n+ }\n+\n+ candidates.forEach { candidate ->\n+ if (candidate.absolutePath.contains(route.targetClassSystemPath)) {\n+ \"${route.name} for ${route.targetClassName} is valid\".log()\n+ return\n+ }\n+ }\n+\n+ throw error(\"${route.name} is not valid\")\n+ }\n+\n+ private fun List<File>.mapToCrossFeatureRoute(): List<CrossFeatureRoute> {\n+ return mapNotNull { routeFile ->\n+ val crossFeatureRoute = CrossFeatureRoute(routeFile)\n+ if (crossFeatureRoute.isValid) crossFeatureRoute else null\n+ }\n+ }\n+\n+ private fun String.log() = if (isDebugEnabled) println(this) else Unit\n+\n+ private data class ScanResult(\n+ val routes: List<File>,\n+ val activities: List<File>,\n+ val fragments: List<File>,\n+ val dialogs: List<File>\n+ )\n+\n+ private inner class CrossFeatureRoute(private val file: File) {\n+\n+ val name get() = file.nameWithoutExtension ?: EMPTY_STRING\n+\n+ private val fileContent = file.readText()\n+ val baseClassName = findBaseClassName(fileContent)\n+ val targetClassPath = findTargetClassPath(fileContent)\n+ val targetClassSystemPath = parseTargetClassSystemPath(targetClassPath)\n+ val targetClassName = parseTargetClassName(targetClassPath)\n+ val isActivity = fileContent.contains(\"ActivityRoute\")\n+ val isFragment = fileContent.contains(\"FragmentRoute\")\n+ val isDialog = fileContent.contains(\"DialogRoute\")\n+ val isValid = targetClassPath.isNotBlank()\n+\n+ override fun toString(): String {\n+ return \"${file.nameWithoutExtension} : $baseClassName (targetClassPath = $targetClassPath)\"\n+ }\n+\n+ private fun parseTargetClassName(targetClassPath: String): String {\n+ return if (!targetClassPath.contains(charDot)) EMPTY_STRING\n+ else targetClassPath.substringAfterLast(charDot)\n+ }\n+\n+ private fun parseTargetClassSystemPath(targetClassPath: String): String {\n+ return targetClassPath.replace(charDot, charSlash)\n+ }\n+\n+ private fun findTargetClassPath(fileContent: String): String {\n+ var result = EMPTY_STRING\n+ try {\n+ val funText = fileContent.indexOf(funTargetClassPath).let { startIndex ->\n+ if (startIndex < 0) return result\n+ else fileContent.substring(startIndex)\n+ }\n+\n+ val funBodyStart = funText.indexOf(charBraceOpen) + 1\n+ val funBodyEnd = funText.indexOf(charBraceClose) - 1\n+ val funBodyText = (funBodyStart..funBodyEnd).let { range ->\n+ if (-1 in range) error(\"can't find targetClassPath()-method body\")\n+ else funText.substring(range)\n+ }\n+\n+ val targetClassPathStart = funBodyText.indexOf(charQuote) + 1\n+ val targetClassPathEnd = funBodyText.lastIndexOf(charQuote) - 1\n+ result = (targetClassPathStart..targetClassPathEnd).let { range ->\n+ if (-1 in range) error(\"can't parse targetClassPath()-method body\")\n+ else funBodyText.substring(range)\n+ }\n+ } catch (error: Throwable) {\n+ handleError(error)\n+ }\n+ return result\n+ }\n+\n+ private fun findBaseClassName(fileContent: String): String {\n+ var result = EMPTY_STRING\n+ try {\n+ val classText = fileContent.indexOf(keywordClass).let { startIndex ->\n+ return@let if (startIndex < 0) return result\n+ else fileContent.substring(startIndex)\n+ }\n+\n+ val implsEnd = classText.indexOf(charBraceOpen).let { endIndex ->\n+ return@let if (endIndex < 0) classText.lastIndex\n+ else endIndex\n+ }\n+\n+ val implsStart = run {\n+ (implsEnd downTo 0).forEach { index ->\n+ if (classText[index] == charColon) return@run index\n+ }\n+ return@run -1\n+ }\n+\n+ val implsText = (implsStart..implsEnd).let { range ->\n+ if (-1 in range) return result\n+ else classText.substring(range)\n+ }\n+\n+ val baseStart = implsText.indexOfFirst { it.isLetter() }\n+ val baseEnd = run {\n+ (baseStart..implsText.lastIndex).forEach { index ->\n+ if (!implsText[index].isLetter()) {\n+ return@run index - 1\n+ }\n+ }\n+ return@run -1\n+ }\n+\n+ result = (baseStart..baseEnd).let { range ->\n+ if (-1 in range) return result\n+ else implsText.substring(range)\n+ }\n+ } catch (error: Throwable) {\n+ handleError(error)\n+ }\n+ return result\n+ }\n+\n+ private fun handleError(error: Throwable) {\n+ \"ERROR ${file.nameWithoutExtension}: ${error.message}\".log()\n+ }\n+ }\n+}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-915 First implementation of task. WIP |
652,312 | 09.04.2020 17:40:32 | -10,800 | b9211621333b916a6731fbfb8db3ab49fa7b56f0 | Working refactoring | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/GitTree.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/GitTree.kt",
"diff": "@@ -4,6 +4,7 @@ import org.eclipse.jgit.lib.Ref\nimport org.eclipse.jgit.revwalk.RevCommit\nimport org.eclipse.jgit.revwalk.RevWalk\nimport org.eclipse.jgit.storage.file.FileRepositoryBuilder\n+import org.gradle.api.GradleException\nimport ru.surfstudio.android.build.exceptions.deploy_to_mirror.GitNodeNotFoundException\nimport ru.surfstudio.android.build.exceptions.deploy_to_mirror.ManyBranchesFoundException\nimport ru.surfstudio.android.build.exceptions.deploy_to_mirror.MirrorCommitNotFoundByStandardHashException\n@@ -19,6 +20,8 @@ import ru.surfstudio.android.build.utils.mirrorStandardHash\nimport ru.surfstudio.android.build.utils.standardHash\nimport java.io.File\n+private const val VERSION_LABEL = \"[version]\"\n+\n/**\n* Data structure based on tree\n* Use it to build tree, set root and ends elements and delete other\n@@ -37,6 +40,15 @@ class GitTree(\nlateinit var startMirrorRepositoryCommits: Set<CommitWithBranch>\nlateinit var standardRepositoryCommitsForMirror: List<CommitWithBranch>\n+ private lateinit var stopEndNode: Node\n+\n+ /**\n+ * Function which checks if commit should be skipped during mirroring\n+ */\n+ fun shouldSkipCommit(commit: RevCommit): Boolean =\n+ commit.shortMessage.endsWith(VERSION_LABEL) &&\n+ commit.commitTime < stopEndNode.value.commitTime\n+\n/**\n* Build GitTree representation of standard repository with correct structure\n*/\n@@ -224,17 +236,19 @@ class GitTree(\n*/\nprivate fun createLines(): List<List<Node>> {\nmarkEndNodes()\n-\nval ends = standardNodes.filter { it.state == END }\n+ stopEndNode = ends.minBy { it.value.commitTime }\n+ ?: throw GradleException(\"Can't find a stop end node with min commit time\")\nreturn ends.flatMap { end ->\nprintln(\"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! BUILD CHAIN FOR ${end.value.shortMessage}\")\nwatchedHashed.clear()\nbuildChain(mutableListOf(end))\n}\n- //todo filter using unique commit condition\n- .filter { ends.contains(it.first()) && it.last() == rootNode\n- || it.last().value.shortMessage.endsWith(\"64 [skip ci] [version]\")}\n+ .filter {\n+ ends.contains(it.first()) && it.last() == rootNode\n+ || it.last().value.shortMessage.endsWith(VERSION_LABEL)\n+ }\n}\n/**\n@@ -293,10 +307,13 @@ class GitTree(\n}\n/**\n+ * creates from lines standard repository commit for applying to mirror. For every line branch name is created\n* Marks every commit either as:\n* MIRROR_START_POINT - commits that are already in mirror repository and applying commits started from\n* SIMPLE - usual commit\n* MERGE - merge commit\n+ *\n+ * @param lines created lines in standard repository tree\n*/\nprivate fun buildStandardCommitsForMirror(lines: List<List<Node>>) {\nval existedBranchNames = mirrorRepository.getAllBranches()\n@@ -349,8 +366,8 @@ class GitTree(\nprintln(\"START BUILD CHAIN FOR NODE: ${node.value.shortMessage} hash = ${node.value.standardHash}\")\nwatchedHashed.add(node.value.standardHash)\nprintln(\"ADD HASH ${node.value.standardHash}\")\n- val checkMessage = !node.value.shortMessage.endsWith(\"64 [skip ci] [version]\")\n- if (!checkMessage) {\n+ // every line starts and ends with [version] commit\n+ if (chain.first() != node && node.value.shortMessage.contains(VERSION_LABEL)) {\nprintln(\"-------------------------- STOP ${node.value.shortMessage}\")\nresult.add(chain)\nreturn result\n@@ -358,18 +375,12 @@ class GitTree(\nresult.add(chain)\nnode.parents.forEach {\n- //todo filter old parents\n- //println(\"${it.value.shortMessage} \" +\n- // \"${mirrorNodes.map { it.value.standardHash }.contains(it.value.standardHash)}\")\nif (!watchedHashed.contains(it.value.standardHash) && it.state != END) {\nprintln(\"parent: ${it.value.shortMessage} ${it.value.standardHash}\")\nval newChain = chain.toMutableList()\nnewChain.add(it)\nresult.addAll(buildChain(newChain))\n} else {\n- if (!checkMessage) {\n- return result\n- }\nprintln(\"-------------------------- SKIP ${it.value.shortMessage}\")\n}\n}\n@@ -382,18 +393,12 @@ class GitTree(\nprintln(\"NEXT PARENTS FOR: ${next.value.shortMessage}\")\nnext.parents.forEach {\n- //todo filter old parents\n- //println(\"${it.value.shortMessage} \" +\n- // \"${mirrorNodes.map { it.value.standardHash }.contains(it.value.standardHash)}\")\nif (!watchedHashed.contains(it.value.standardHash) && it.state != END) {\nprintln(\"parent: ${it.value.shortMessage} ${it.value.standardHash}\")\nval newChain = chain.toMutableList()\nnewChain.add(it)\nresult.addAll(buildChain(newChain))\n} else {\n- if (!checkMessage) {\n- return result\n- }\nprintln(\"-------------------------- SKIP ${it.value.shortMessage}\")\n}\n}\n@@ -412,9 +417,7 @@ class GitTree(\nprintln(\"children ${it.value.shortMessage} ${it.value.standardHash}\")\n}\n} else {\n- if (!checkMessage) {\n- println(\"-------------------------- SKIP ${next.value.shortMessage}\")\n- }\n+ println(\"-------------------------- RETURN FOR ${next.value.shortMessage}\")\nreturn result\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/MirrorManager.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/MirrorManager.kt",
"diff": "@@ -4,17 +4,17 @@ import org.eclipse.jgit.diff.DiffEntry\nimport org.eclipse.jgit.lib.Ref\nimport org.eclipse.jgit.revwalk.RevCommit\nimport org.gradle.api.GradleException\n-import ru.surfstudio.android.build.exceptions.deploy_to_mirror.GitNodeNotFoundException\nimport ru.surfstudio.android.build.exceptions.deploy_to_mirror.RevCommitNotFoundException\nimport ru.surfstudio.android.build.tasks.changed_components.CommandLineRunner\nimport ru.surfstudio.android.build.tasks.deploy_to_mirror.model.CommitType\nimport ru.surfstudio.android.build.tasks.deploy_to_mirror.model.CommitWithBranch\nimport ru.surfstudio.android.build.tasks.deploy_to_mirror.repository.MirrorRepository\nimport ru.surfstudio.android.build.tasks.deploy_to_mirror.repository.StandardRepository\n-import ru.surfstudio.android.build.utils.*\n+import ru.surfstudio.android.build.utils.EMPTY_STRING\n+import ru.surfstudio.android.build.utils.extractBranchNames\n+import ru.surfstudio.android.build.utils.standardHash\n+import ru.surfstudio.android.build.utils.type\nimport java.text.SimpleDateFormat\n-import java.time.LocalDateTime\n-import java.time.format.DateTimeFormatter\nimport java.util.*\nprivate const val GET_MAIN_BRANCH_COMMAND = \"git symbolic-ref refs/remotes/origin/HEAD\"\n@@ -119,14 +119,6 @@ class MirrorManager(\n* For all git tree commits apply them to mirror repository\n*/\nprivate fun applyGitTreeToMirror() {\n- val index = gitTree.standardRepositoryCommitsForMirror.indexOfFirst {\n- it.type == CommitType.MIRROR_START_POINT\n- }\n- val size = gitTree.standardRepositoryCommitsForMirror.size\n- gitTree.standardRepositoryCommitsForMirror.forEach {\n- //println(\"sublist ${it.commit.shortMessage}\")\n- }\n- println()\ngitTree.standardRepositoryCommitsForMirror.forEach { commit ->\nval date = Date(1000L * commit.commit.commitTime)\nval format = SimpleDateFormat(\"yyyy-MM-dd'T'HH:mm:ss\", Locale.getDefault())\n@@ -141,20 +133,6 @@ class MirrorManager(\n}\n}\n- /**\n- * creates start commit of git tree in mirror repository\n- *\n- * @param commit start commit\n- */\n- private fun createMirrorStartCommit(commit: CommitWithBranch): RevCommit {\n- val mirrorCommit = gitTree.getStartMirrorCommitByStandardHash(commit.commit.standardHash)\n- println(\"mirrorCommit ${mirrorCommit.commit.shortMessage}\")\n- mirrorRepository.reset(mirrorCommit.commit)\n- mirrorRepository.checkoutBranch(mirrorCommit.branch)\n- commit.mirrorCommitHash = mirrorCommit.commit.name\n- return mirrorCommit.commit\n- }\n-\n/**\n* creates commit in mirror repository by\n* getting all changes for [commit]\n@@ -163,6 +141,11 @@ class MirrorManager(\n* @param commit commit to apply\n*/\nprivate fun commit(commit: CommitWithBranch): RevCommit? {\n+ // for old branches a line could contain an old [version] commit\n+ if (gitTree.shouldSkipCommit(commit.commit)) {\n+ return null\n+ }\n+\nstandardRepository.reset(commit.commit)\nval changes = standardRepository.getChanges(commit.commit).filter(::shouldMirror)\n@@ -182,9 +165,7 @@ class MirrorManager(\n* @param commit commit\n*/\nprivate fun checkoutMirrorBranchForCommit(commit: CommitWithBranch) {\n- try {\nwith(mirrorRepository) {\n- //todo compare commit with start\nval parent = gitTree.getParent(commit)\nif (parent.mirrorCommitHash.isNotEmpty()) {\ncheckoutCommit(parent.mirrorCommitHash)\n@@ -193,10 +174,6 @@ class MirrorManager(\ncheckoutBranch(commit.branch)\n}\n}\n- } catch (e: GitNodeNotFoundException) {\n- //todo remove\n- println(\"SKIP EXCEPTION :(\")\n- }\n}\n/**\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-1013 Working refactoring |
652,315 | 09.04.2020 18:41:39 | -10,800 | 253d2306d113a1f8b9f074a40c9b998fafb69065 | Added DiffResultCalculationListener | [
{
"change_type": "MODIFY",
"old_path": "easyadapter/RELEASE_NOTES.md",
"new_path": "easyadapter/RELEASE_NOTES.md",
"diff": "* **NO BACKWARD COMPATIBILITY** ANDDEP-958 Change getItemId and\ngetItemHash to Object for BaseItemController; getItemId became\nabstract\n+* ANDDEP-1017 Added DiffResultListener invoked after the DiffResult calculation\n## 1.0.0\n##### Easyadapter\n* ANDDEP-270 Added support for asynchronous view inflate in ViewHolder\n"
},
{
"change_type": "MODIFY",
"old_path": "easyadapter/lib-easyadapter/src/main/java/ru/surfstudio/android/easyadapter/EasyAdapter.java",
"new_path": "easyadapter/lib-easyadapter/src/main/java/ru/surfstudio/android/easyadapter/EasyAdapter.java",
"diff": "@@ -43,6 +43,7 @@ import ru.surfstudio.android.easyadapter.diff.async.QueueAllAsyncDiffer;\nimport ru.surfstudio.android.easyadapter.controller.BaseItemController;\nimport ru.surfstudio.android.easyadapter.controller.BindableItemController;\nimport ru.surfstudio.android.easyadapter.controller.NoDataItemController;\n+import ru.surfstudio.android.easyadapter.diff.listener.DiffResultCalculationListener;\nimport ru.surfstudio.android.easyadapter.holder.BaseViewHolder;\nimport ru.surfstudio.android.easyadapter.item.BaseItem;\nimport ru.surfstudio.android.easyadapter.item.NoDataItem;\n@@ -73,6 +74,8 @@ public class EasyAdapter extends RecyclerView.Adapter {\nprivate Differ defaultDiffer = new DefaultDiffer(this::dispatchDiffResult, this::createDiffCallback);\nprivate AsyncDiffer asyncDiffer = new QueueAllAsyncDiffer(this::dispatchDiffResult, this::createDiffCallback);\n+ private DiffResultCalculationListener diffResultCalculationListener;\n+\n/**\n* @see RecyclerView.Adapter#onAttachedToRecyclerView(RecyclerView)\n*/\n@@ -174,6 +177,17 @@ public class EasyAdapter extends RecyclerView.Adapter {\n}\n}\n+ /**\n+ * Set {@link DiffResultCalculationListener} which will be invoked after {@link DiffUtil.DiffResult} calculation.\n+ *\n+ * @param diffResultCalculationListener {@link DiffResultCalculationListener}\n+ */\n+ public final void setDiffResultCalculationListener(\n+ DiffResultCalculationListener diffResultCalculationListener\n+ ) {\n+ this.diffResultCalculationListener = diffResultCalculationListener;\n+ }\n+\n/**\n* Set if we should invoke {@link #autoNotify()} on each call to {@link #setItems(ItemList)}.\n*\n@@ -193,10 +207,8 @@ public class EasyAdapter extends RecyclerView.Adapter {\n}\n/**\n- *\n- * @see FirstInvisibleItemController\n- *\n* @return state of the property {@link FirstInvisibleItemController} enabled\n+ * @see FirstInvisibleItemController\n*/\npublic boolean isFirstInvisibleItemEnabled() {\nreturn firstInvisibleItemEnabled;\n@@ -293,6 +305,10 @@ public class EasyAdapter extends RecyclerView.Adapter {\n}\nprivate void dispatchDiffResult(DiffResultBundle diffResultBundle) {\n+ if (diffResultCalculationListener != null) {\n+ diffResultCalculationListener.onDiffResultCalculated();\n+ }\n+\nfinal ItemList newItems = diffResultBundle.getItems();\nitems.clear();\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "easyadapter/lib-easyadapter/src/main/java/ru/surfstudio/android/easyadapter/diff/listener/DiffResultCalculationListener.java",
"diff": "+/*\n+ * Copyright (c) 2019-present, SurfStudio LLC.\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package ru.surfstudio.android.easyadapter.diff.listener;\n+\n+/**\n+ * Listener invoked after the DiffResult calculation.\n+ */\n+public interface DiffResultCalculationListener {\n+\n+ void onDiffResultCalculated();\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "easyadapter/sample/src/main/java/ru/surfstudio/android/easyadapter/sample/ui/screen/async_diff/AsyncDiffActivityView.kt",
"new_path": "easyadapter/sample/src/main/java/ru/surfstudio/android/easyadapter/sample/ui/screen/async_diff/AsyncDiffActivityView.kt",
"diff": "@@ -53,9 +53,11 @@ class AsyncDiffActivityView : BaseRenderableActivityView<AsyncDiffScreenModel>()\nprivate fun initRecycler() {\nasync_diff_rv.layoutManager = LinearLayoutManager(this)\n- async_diff_rv.adapter = adapter\n- adapter.setFirstInvisibleItemEnabled(true)\n- adapter.setAsyncDiffCalculationEnabled(true)\n- adapter.setAsyncDiffStrategy(AsyncDiffStrategy.APPLY_LATEST)\n+ async_diff_rv.adapter = adapter.apply {\n+ isFirstInvisibleItemEnabled = true\n+ setAsyncDiffCalculationEnabled(true)\n+ setDiffResultCalculationListener { toast(\"Diff calculated!\") }\n+ setAsyncDiffStrategy(AsyncDiffStrategy.APPLY_LATEST)\n+ }\n}\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-1017 Added DiffResultCalculationListener |
652,335 | 09.04.2020 18:51:55 | -10,800 | 69d857628221f7445fdb7e0de2c518cbed0bd505 | Increase global alpha version counter to 109 [skip ci] [version] | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/components.json",
"new_path": "buildSrc/components.json",
"diff": "{\n\"id\": \"custom-view\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 3,\n\"stable\": false,\n\"dir\": \"custom-view\",\n\"libs\": [\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/projectConfiguration.json",
"new_path": "buildSrc/projectConfiguration.json",
"diff": "{\n\"version\": \"0.5.0\",\n\"stable\": false,\n- \"unstable_version\": 108,\n+ \"unstable_version\": 109,\n\"project_snapshot_name\": \"\",\n\"project_snapshot_version\": 0\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Increase global alpha version counter to 109 [skip ci] [version] |
652,315 | 09.04.2020 23:31:07 | -10,800 | e7451f13cbdff36e698a852da3b80ae726337f84 | DiffResultCalculationListener renamed to DiffResultDispatchListener
Moved invokation of the DiffResult listener after diffResult.dispatchUpdatesTo method | [
{
"change_type": "MODIFY",
"old_path": "easyadapter/lib-easyadapter/src/main/java/ru/surfstudio/android/easyadapter/EasyAdapter.java",
"new_path": "easyadapter/lib-easyadapter/src/main/java/ru/surfstudio/android/easyadapter/EasyAdapter.java",
"diff": "@@ -43,7 +43,7 @@ import ru.surfstudio.android.easyadapter.diff.async.QueueAllAsyncDiffer;\nimport ru.surfstudio.android.easyadapter.controller.BaseItemController;\nimport ru.surfstudio.android.easyadapter.controller.BindableItemController;\nimport ru.surfstudio.android.easyadapter.controller.NoDataItemController;\n-import ru.surfstudio.android.easyadapter.diff.listener.DiffResultCalculationListener;\n+import ru.surfstudio.android.easyadapter.diff.listener.DiffResultDispatchListener;\nimport ru.surfstudio.android.easyadapter.holder.BaseViewHolder;\nimport ru.surfstudio.android.easyadapter.item.BaseItem;\nimport ru.surfstudio.android.easyadapter.item.NoDataItem;\n@@ -74,7 +74,7 @@ public class EasyAdapter extends RecyclerView.Adapter {\nprivate Differ defaultDiffer = new DefaultDiffer(this::dispatchDiffResult, this::createDiffCallback);\nprivate AsyncDiffer asyncDiffer = new QueueAllAsyncDiffer(this::dispatchDiffResult, this::createDiffCallback);\n- private DiffResultCalculationListener diffResultCalculationListener;\n+ private DiffResultDispatchListener diffResultDispatchListener;\n/**\n* @see RecyclerView.Adapter#onAttachedToRecyclerView(RecyclerView)\n@@ -178,14 +178,15 @@ public class EasyAdapter extends RecyclerView.Adapter {\n}\n/**\n- * Set {@link DiffResultCalculationListener} which will be invoked after {@link DiffUtil.DiffResult} calculation.\n+ * Set {@link DiffResultDispatchListener} which will be invoked\n+ * after the {@link DiffUtil.DiffResult} dispatching to the {@link RecyclerView}.\n*\n- * @param diffResultCalculationListener {@link DiffResultCalculationListener}\n+ * @param diffResultDispatchListener {@link DiffResultDispatchListener}\n*/\n- public final void setDiffResultCalculationListener(\n- DiffResultCalculationListener diffResultCalculationListener\n+ public final void setDiffResultDispatchListener(\n+ DiffResultDispatchListener diffResultDispatchListener\n) {\n- this.diffResultCalculationListener = diffResultCalculationListener;\n+ this.diffResultDispatchListener = diffResultDispatchListener;\n}\n/**\n@@ -305,9 +306,6 @@ public class EasyAdapter extends RecyclerView.Adapter {\n}\nprivate void dispatchDiffResult(DiffResultBundle diffResultBundle) {\n- if (diffResultCalculationListener != null) {\n- diffResultCalculationListener.onDiffResultCalculated();\n- }\nfinal ItemList newItems = diffResultBundle.getItems();\n@@ -318,6 +316,9 @@ public class EasyAdapter extends RecyclerView.Adapter {\nfinal DiffUtil.DiffResult diffResult = diffResultBundle.getDiffResult();\nObjects.requireNonNull(diffResult);\ndiffResult.dispatchUpdatesTo(this);\n+ if (diffResultDispatchListener != null) {\n+ diffResultDispatchListener.onDiffResultDispatched();\n+ }\nlastItemsInfo = diffResultBundle.getNewItemInfo();\n}\n"
},
{
"change_type": "RENAME",
"old_path": "easyadapter/lib-easyadapter/src/main/java/ru/surfstudio/android/easyadapter/diff/listener/DiffResultCalculationListener.java",
"new_path": "easyadapter/lib-easyadapter/src/main/java/ru/surfstudio/android/easyadapter/diff/listener/DiffResultDispatchListener.java",
"diff": "package ru.surfstudio.android.easyadapter.diff.listener;\n/**\n- * Listener invoked after the DiffResult calculation.\n+ * Listener invoked after the DiffResult dispatching to the RecyclerView.\n*/\n-public interface DiffResultCalculationListener {\n+public interface DiffResultDispatchListener {\n- void onDiffResultCalculated();\n+ void onDiffResultDispatched();\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "easyadapter/sample/src/main/java/ru/surfstudio/android/easyadapter/sample/ui/screen/async_diff/AsyncDiffActivityView.kt",
"new_path": "easyadapter/sample/src/main/java/ru/surfstudio/android/easyadapter/sample/ui/screen/async_diff/AsyncDiffActivityView.kt",
"diff": "@@ -56,7 +56,7 @@ class AsyncDiffActivityView : BaseRenderableActivityView<AsyncDiffScreenModel>()\nasync_diff_rv.adapter = adapter.apply {\nisFirstInvisibleItemEnabled = true\nsetAsyncDiffCalculationEnabled(true)\n- setDiffResultCalculationListener { toast(\"Diff calculated!\") }\n+ setDiffResultDispatchListener { toast(\"Diff dispatched!\") }\nsetAsyncDiffStrategy(AsyncDiffStrategy.APPLY_LATEST)\n}\n}\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-1017 DiffResultCalculationListener renamed to DiffResultDispatchListener
Moved invokation of the DiffResult listener after diffResult.dispatchUpdatesTo method |
652,335 | 10.04.2020 09:15:50 | -10,800 | 674b6e0c666fc7c0ed815c6c24856e1217dc3c78 | Increase global alpha version counter to 110 [skip ci] [version] | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/projectConfiguration.json",
"new_path": "buildSrc/projectConfiguration.json",
"diff": "{\n\"version\": \"0.5.0\",\n\"stable\": false,\n- \"unstable_version\": 109,\n+ \"unstable_version\": 110,\n\"project_snapshot_name\": \"\",\n\"project_snapshot_version\": 0\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Increase global alpha version counter to 110 [skip ci] [version] |
652,312 | 10.04.2020 11:25:02 | -10,800 | e06dad3d9944858bd2f72b6753f72bb7ee093804 | Update push logic | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/GradleProperties.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/GradleProperties.kt",
"diff": "@@ -67,10 +67,15 @@ object GradleProperties {\nconst val COMMIT = \"commit\"\n/**\n- * Mirror url\n+ * Mirror dir\n*/\nconst val MIRROR_DIR = \"mirrorDir\"\n+ /**\n+ * Mirror url\n+ */\n+ const val MIRROR_URL = \"mirrorUrl\"\n+\n/**\n* Depth of standard repository git tree to get commits\n*/\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/DeployToMirrorTask.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/DeployToMirrorTask.kt",
"diff": "@@ -17,6 +17,7 @@ open class DeployToMirrorTask : DefaultTask() {\nprivate lateinit var component: Component\nprivate lateinit var commitHash: String\nprivate lateinit var mirrorDir: String\n+ private lateinit var mirrorUrl: String\nprivate var standardDepthLimit: Int = 0\nprivate var mirrorDepthLimit: Int = 0\n@@ -25,7 +26,7 @@ open class DeployToMirrorTask : DefaultTask() {\nextractParams()\nval standardRepository = StandardRepository()\n- val mirrorRepository = MirrorRepository(mirrorDir)\n+ val mirrorRepository = MirrorRepository(mirrorDir, mirrorUrl)\nval mirrorManager = MirrorManager(\ncomponent.directory,\nstandardRepository,\n@@ -46,6 +47,7 @@ open class DeployToMirrorTask : DefaultTask() {\ncomponent = project.getPropertyComponent()\ncommitHash = project.extractProperty(GradleProperties.COMMIT)\nmirrorDir = project.extractProperty(GradleProperties.MIRROR_DIR)\n+ mirrorUrl = project.extractProperty(GradleProperties.MIRROR_URL)\nstandardDepthLimit = project.extractProperty(GradleProperties.DEPLOY_TO_MIRROR_DEPTH_LIMIT).toInt()\nmirrorDepthLimit = project.extractProperty(GradleProperties.DEPLOY_TO_MIRROR_SEARCH_LIMIT).toInt()\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/MirrorManager.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/MirrorManager.kt",
"diff": "@@ -85,11 +85,7 @@ class MirrorManager(\ngitTree.buildGitTree(rootCommit, standardCommits, mirrorCommits)\napplyGitTreeToMirror()\nsetBranches()\n- CommandLineRunner.runCommandWithResult(\n- command = \"git push\",\n- workingDir = mirrorRepository.repositoryPath\n- )\n- //mirrorRepository.push()\n+ mirrorRepository.push()\nreturn\n}\nthrow GradleException(\"Can't get latest commit in branch $mainBranchFullName \" +\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/repository/MirrorRepository.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/repository/MirrorRepository.kt",
"diff": "@@ -3,39 +3,45 @@ package ru.surfstudio.android.build.tasks.deploy_to_mirror.repository\nimport org.eclipse.jgit.revwalk.RevCommit\nimport org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider\nimport ru.surfstudio.android.build.exceptions.deploy_to_mirror.MirrorCommitNotFoundByStandardHashException\n+import ru.surfstudio.android.build.tasks.changed_components.CommandLineRunner\nimport ru.surfstudio.android.build.utils.STANDARD_COMMIT_HASH_POSTFIX\nimport ru.surfstudio.android.build.utils.STANDARD_COMMIT_HASH_PREFIX\nimport ru.surfstudio.android.build.utils.mirrorStandardHash\nimport ru.surfstudio.android.build.utils.shortHash\nimport java.io.File\n+import java.net.URLEncoder\n+\n+private const val HTTPS_PREFIX = \"https://\"\n+private const val GIT_SUFFIX = \".git\"\n+private const val UTF_8_ENCODER = \"UTF-8\"\n/**\n* Work with local mirror git repository\n*/\n-class MirrorRepository(dirPath: String) : BaseGitRepository() {\n+class MirrorRepository(\n+ dirPath: String,\n+ private val mirrorUrl: String\n+) : BaseGitRepository() {\noverride val repositoryPath = File(dirPath)\noverride val repositoryName = \"Mirror\"\nfun commit(commit: RevCommit): RevCommit? {\n- val resultCommit = git.commit()\n+ return git.commit()\n.setAuthor(commit.authorIdent)\n.setAll(true)\n.setMessage(\"${commit.shortMessage} $STANDARD_COMMIT_HASH_PREFIX${commit.shortHash}$STANDARD_COMMIT_HASH_POSTFIX\")\n.call()\n- return resultCommit\n}\nfun push() {\n- git.push()\n- .setCredentialsProvider(\n- UsernamePasswordCredentialsProvider(\n- GithubConfig.USERNAME,\n- GithubConfig.PASSWORD\n- )\n- )\n- .call()\n+ println(getPushUrl())\n+ /*\n+ CommandLineRunner.runCommandWithResult(\n+ command = \"git push ${getPushUrl()}\",\n+ workingDir = repositoryPath\n+ )*/\n}\nfun tag(commit: RevCommit, tagName: String) = git.tag()\n@@ -48,4 +54,16 @@ class MirrorRepository(dirPath: String) : BaseGitRepository() {\n.call()\n.find { it.mirrorStandardHash == standardHash }\n?: throw MirrorCommitNotFoundByStandardHashException(standardHash)\n+\n+ private fun getPushUrl(): String {\n+ return StringBuilder(mirrorUrl)\n+ .insert(\n+ HTTPS_PREFIX.length,\n+ \"${encodeString(GithubConfig.USERNAME)}:${encodeString(GithubConfig.PASSWORD)}@\"\n+ ).append(GIT_SUFFIX)\n+ .toString()\n+ }\n+\n+ private fun encodeString(string: String): String =\n+ URLEncoder.encode(string, UTF_8_ENCODER)\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "ci-internal/ComponentMirroringJobJenkinsfile.groovy",
"new_path": "ci-internal/ComponentMirroringJobJenkinsfile.groovy",
"diff": "@@ -84,7 +84,8 @@ pipeline.stages = [\nscript.sh \"git clone ${component.mirror_repo} $MIRROR_FOLDER\"\nwithGithubCredentials(script) {\n- script.sh \"./gradlew deployToMirror -Pcomponent=${component.id} -Pcommit=$lastCommit \" +\n+ script.sh \"./gradlew deployToMirror -Pcomponent=${component.id} \" +\n+ \"-Pcommit=$lastCommit -PmirrorUrl=${pipeline.repoUrl}\" +\n\"-PmirrorDir=$MIRROR_FOLDER -PdepthLimit=$DEPTH_LIMIT -PsearchLimit=$SEARCH_LIMIT\"\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "ci-internal/JenkinsfileMirroring.groovy",
"new_path": "ci-internal/JenkinsfileMirroring.groovy",
"diff": "-@Library('surf-lib@version-1.0.0-SNAPSHOT') // https://gitlab.com/surfstudio/infrastructure/tools/jenkins-pipeline-lib\n+@Library('surf-lib@version-3.0.0-SNAPSHOT') // https://gitlab.com/surfstudio/infrastructure/tools/jenkins-pipeline-lib\nimport ru.surfstudio.ci.pipeline.empty.EmptyScmPipeline\nimport ru.surfstudio.ci.stage.StageStrategy\nimport ru.surfstudio.ci.CommonUtil\n@@ -7,7 +7,7 @@ import ru.surfstudio.ci.NodeProvider\nimport ru.surfstudio.ci.Result\nimport java.net.URLEncoder\n-def encodeUrl(string){\n+static def encodeUrl(string){\nURLEncoder.encode(string, \"UTF-8\")\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "mirror.sh",
"new_path": "mirror.sh",
"diff": "rm -rf _mirror temp\ngit clone https://github.com/surfstudio/EasyAdapter _mirror\ngit clone --single-branch --branch dev/G-0.5.0 https://gitlab.com/surfstudio/projects/standard/android-standard temp\n-./gradlew deployToMirror -Pcomponent=easyadapter -Pcommit=34b1f0aa3a3991423a4e79df58a2465de0c425da -PmirrorDir=_mirror -PdepthLimit=100 -PsearchLimit=100\n+./gradlew deployToMirror -Pcomponent=easyadapter -Pcommit=34b1f0aa3a3991423a4e79df58a2465de0c425da -PmirrorDir=_mirror -PdepthLimit=100 -PsearchLimit=100 -PmirrorUrl=https://github.com/surfstudio/EasyAdapter\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-978 Update push logic |
652,312 | 10.04.2020 14:38:26 | -10,800 | 65d09879c739c442e09d39f3401ae367a628ca5d | Fix parent search & debug code | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/GitTree.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/GitTree.kt",
"diff": "@@ -83,11 +83,20 @@ class GitTree(\n*\n* @return parent for commit\n*/\n- fun getParent(commit: CommitWithBranch): CommitWithBranch {\n+ fun getParent(commit: CommitWithBranch): CommitWithBranch? {\n+ if (commit.commit.shortMessage.endsWith(\"Add release notes\")) {\n+ println(\"parents\")\n+ commit.commit.parents.forEach {\n+ println(\"${it.shortMessage} ${it.standardHash}\")\n+ }\n+ }\nval node = standardNodes.find { it.value == commit.commit }\n?: throw GitNodeNotFoundException(commit.commit)\n- return standardRepositoryCommitsForMirror.find { it.commit == node.parents.firstOrNull()?.value }\n- ?: throw GitNodeNotFoundException(node.value)\n+\n+ // for a big git tree we can't always find a node parent with a search depth limit\n+ return standardRepositoryCommitsForMirror.find {\n+ it.commit == node.parents.firstOrNull()?.value\n+ }\n}\n/**\n@@ -236,11 +245,15 @@ class GitTree(\n*/\nprivate fun createLines(): List<List<Node>> {\nmarkEndNodes()\n- val ends = standardNodes.filter { it.state == END }\n- stopEndNode = ends.minBy { it.value.commitTime }\n- ?: throw GradleException(\"Can't find a stop end node with min commit time\")\n+ val ends = standardNodes\n+ .filter { it.state == END && it.value.shortMessage.endsWith(VERSION_LABEL) }\n+\n+ stopEndNode = ends.maxBy { it.value.commitTime }\n+ ?: throw GradleException(\"Can't find a stop end node with a min commit time\")\n+ println(\"stopEndNode ${stopEndNode.value.shortMessage} ${stopEndNode.value.standardHash}\")\nreturn ends.flatMap { end ->\n+ println(\"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! BUILD CHAIN FOR ${end.value.shortMessage}\")\nwatchedHashed.clear()\nbuildChain(mutableListOf(end))\n}\n@@ -337,13 +350,16 @@ class GitTree(\n.sortedBy { it.commit.commitTime }\nlines.forEach { line ->\n+ //println(\"\\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! LINE $line\\n\")\nline.forEach { node ->\n+ // println(\"NODE ${node.value.shortMessage}\")\nval commit = standardRepositoryCommitsForMirror.find { it.commit == node.value }\nif (commit?.branch?.isEmpty() == true) {\ncommit.branch = branchName\n}\n}\n}\n+// println()\nstandardRepositoryCommitsForMirror = standardRepositoryCommitsForMirror.filter { it.branch.isNotEmpty() }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/MirrorManager.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/MirrorManager.kt",
"diff": "@@ -77,10 +77,13 @@ class MirrorManager(\nlatestMirrorCommit = mirrorCommits.maxBy { it.commitTime }\nlatestMirrorCommit?.also { safeLatestMirrorCommit ->\n+ println(\"latestMirrorCommit ${safeLatestMirrorCommit.shortMessage}\")\n+ //todo fix check\n+ /*\nif (safeLatestMirrorCommit.commitTime > rootCommit.commitTime) {\nthrow GradleException(\"Invalid mirror commit $rootCommitHash: \" +\n\"can't be earlier than latest mirror commit ${safeLatestMirrorCommit.standardHash}\")\n- }\n+ }*/\ngitTree.buildGitTree(rootCommit, standardCommits, mirrorCommits)\napplyGitTreeToMirror()\n@@ -116,7 +119,13 @@ class MirrorManager(\n* For all git tree commits apply them to mirror repository\n*/\nprivate fun applyGitTreeToMirror() {\n+ gitTree.standardRepositoryCommitsForMirror.forEach {\n+ println(\"standard ${it.type} ${it.commit.shortMessage} ${it.commit.standardHash}\")\n+ }\n+ println()\n+\ngitTree.standardRepositoryCommitsForMirror.forEach { commit ->\n+ println(\"commit ${commit.type} ${commit.commit.shortMessage} ${commit.commit.standardHash}\")\n(when (commit.type) {\nCommitType.SIMPLE -> commit(commit)\nCommitType.MERGE -> merge(commit)\n@@ -136,6 +145,7 @@ class MirrorManager(\nprivate fun commit(commit: CommitWithBranch): RevCommit? {\n// for old branches a line could contain an old [version] commit\nif (gitTree.shouldSkipCommit(commit.commit)) {\n+ println(\"skip\")\nreturn null\n}\n@@ -159,15 +169,16 @@ class MirrorManager(\n*/\nprivate fun checkoutMirrorBranchForCommit(commit: CommitWithBranch) {\nwith(mirrorRepository) {\n- val parent = gitTree.getParent(commit)\n- if (parent.mirrorCommitHash.isNotEmpty()) {\n- checkoutCommit(parent.mirrorCommitHash)\n+ gitTree.getParent(commit)?.also { safeParent ->\n+ if (safeParent.mirrorCommitHash.isNotEmpty()) {\n+ checkoutCommit(safeParent.mirrorCommitHash)\n}\nif (commit.branch.isNotEmpty()) {\ncheckoutBranch(commit.branch)\n}\n}\n}\n+ }\n/**\n* creates merge commit by getting merge parents for commit\n"
},
{
"change_type": "MODIFY",
"old_path": "core-ui.sh",
"new_path": "core-ui.sh",
"diff": "rm -rf _mirror temp\ngit clone https://github.com/surfstudio/Core-ui _mirror\ngit clone --single-branch --branch dev/G-0.5.0 https://gitlab.com/surfstudio/projects/standard/android-standard temp\n-./gradlew deployToMirror -Pcomponent=core-ui -Pcommit=34b1f0aa3a3991423a4e79df58a2465de0c425da -PmirrorDir=_mirror -PdepthLimit=100 -PsearchLimit=100 -PmirrorUrl=https://github.com/surfstudio/Core-ui\n+# easy adpater test commit\n+#./gradlew deployToMirror -Pcomponent=core-ui -Pcommit=34b1f0aa3a3991423a4e79df58a2465de0c425da -PmirrorDir=_mirror -PdepthLimit=100 -PsearchLimit=100 -PmirrorUrl=https://github.com/surfstudio/Core-ui\n+./gradlew deployToMirror -Pcomponent=core-ui -Pcommit=dbfe7bf791245e46122cac5fd2f1a248a4a4bf12 -PmirrorDir=_mirror -PdepthLimit=100 -PsearchLimit=100 -PmirrorUrl=https://github.com/surfstudio/Core-ui\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "logs",
"diff": "+> Task :buildSrc:compileKotlin\n+> Task :buildSrc:compileJava NO-SOURCE\n+> Task :buildSrc:compileGroovy NO-SOURCE\n+> Task :buildSrc:processResources NO-SOURCE\n+> Task :buildSrc:classes UP-TO-DATE\n+> Task :buildSrc:inspectClassesForKotlinIC\n+> Task :buildSrc:jar\n+> Task :buildSrc:assemble\n+> Task :buildSrc:compileTestKotlin NO-SOURCE\n+> Task :buildSrc:compileTestJava NO-SOURCE\n+> Task :buildSrc:compileTestGroovy NO-SOURCE\n+> Task :buildSrc:processTestResources NO-SOURCE\n+> Task :buildSrc:testClasses UP-TO-DATE\n+> Task :buildSrc:test NO-SOURCE\n+> Task :buildSrc:check UP-TO-DATE\n+> Task :buildSrc:build\n+Remote build cache DISABLED. Need specify 'GRADLE_BUILD_CACHE_USER' and 'GRADLE_BUILD_CACHE_PASS' global variables\n+\n+> Task :deployToMirror\n+latestMirrorCommit Increase global alpha version counter to 72 [skip ci] [version] (9fc795ff)\n+stopEndNode Increase global alpha version counter to 72 [skip ci] [version] 9fc795ff\n+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! BUILD CHAIN FOR Increase global alpha version counter to 72 [skip ci] [version]\n+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! BUILD CHAIN FOR Increase global alpha version counter to 70 [skip ci] [version]\n+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! BUILD CHAIN FOR Increase global alpha version counter to 66 [skip ci] [version]\n+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! BUILD CHAIN FOR Increase global alpha version counter to 59 [skip ci] [version]\n+standard SIMPLE Add release notes e8575f18\n+standard MIRROR_START_POINT Increase global alpha version counter to 59 [skip ci] [version] 4f6d34b2\n+standard SIMPLE ANDDEP-568_codestyle_doc bae33e34\n+standard SIMPLE ANDDEP-392 Add firebase app distribution migration instruction 5f0c1067\n+standard SIMPLE ANDDEP-392 Add deprecated label to fabric instruction 2f90d9a9\n+standard SIMPLE ANDDEP-392 kotlin and build tools version update 31cb78f8\n+standard MIRROR_START_POINT Increase global alpha version counter to 66 [skip ci] [version] 91c0184e\n+standard MERGE Merged in ANDDEP-568_codestyle_focumentation (pull request #743) 72b74033\n+standard MERGE Merged in fix-extras-names (pull request #726) fa5df5b5\n+standard MERGE Merge branch 'dev/G-0.5.0' into ANDDEP-392-firebase-app-distribution-migration-instruction c224c49b\n+standard MERGE Merge branch 'ANDDEP-392-firebase-app-distribution-migration-instruction' into ANDDEP-392-firebase-app-distribution-for-template e9cf1691\n+standard MIRROR_START_POINT Increase global alpha version counter to 70 [skip ci] [version] 658fb0be\n+standard SIMPLE Add logs 3ebbca4c\n+standard MERGE Merge branch 'dev/G-0.5.0' into ANDDEP-392-firebase-app-distribution-for-template a9ae9238\n+standard MIRROR_START_POINT Increase global alpha version counter to 72 [skip ci] [version] 9fc795ff\n+standard SIMPLE ANDDEP-392 Remove logs 003ed6d1\n+standard SIMPLE ANDDEP-392 Add JenkinsfileTagJob 0a037e2c\n+standard SIMPLE ANDDEP-392 Add multiDexEnabled option for android standard module 23d9ab6d\n+standard SIMPLE ANDDEP-392 Fix template build types 671054b0\n+standard SIMPLE ANDDEP-392 Fix template proguard rules 51d61e2f\n+standard SIMPLE ANDDEP-392 Fix android standard configs 03774c97\n+standard SIMPLE Remove comments fc051c01\n+standard SIMPLE ANDDEP-392 Fix template a7af8e91\n+standard SIMPLE ANDDEP-392 Remove old firebase dependencies c4023650\n+standard SIMPLE ANDDEP-392 Disable R8 for template c51c9151\n+standard SIMPLE ANDDEP-392 Fix backward compatibility for RemoteLoggingStrategy 8c1fd395\n+standard SIMPLE ANDDEP-392 Add default keys for setUser params 7972e2e1\n+standard SIMPLE ANDDEP-392 Add removing TEMP_FOLDER_NAME 2afab851\n+standard MERGE Merged in ANDDEP-392-firebase-app-distribution-for-template (pull request #751) 0e7ec143\n+standard SIMPLE Increase global alpha version counter to 73 [skip ci] [version] dbfe7bf7\n+\n+commit SIMPLE Add release notes e8575f18\n+parents\n+Fix extra name for negative button in DefaultSettingsRationalActivity 88684e88\n+commit MIRROR_START_POINT Increase global alpha version counter to 59 [skip ci] [version] 4f6d34b2\n+commit SIMPLE ANDDEP-568_codestyle_doc bae33e34\n+commit SIMPLE ANDDEP-392 Add firebase app distribution migration instruction 5f0c1067\n+commit SIMPLE ANDDEP-392 Add deprecated label to fabric instruction 2f90d9a9\n+commit SIMPLE ANDDEP-392 kotlin and build tools version update 31cb78f8\n+commit MIRROR_START_POINT Increase global alpha version counter to 66 [skip ci] [version] 91c0184e\n+commit MERGE Merged in ANDDEP-568_codestyle_focumentation (pull request #743) 72b74033\n+commit MERGE Merged in fix-extras-names (pull request #726) fa5df5b5\n+commit MERGE Merge branch 'dev/G-0.5.0' into ANDDEP-392-firebase-app-distribution-migration-instruction c224c49b\n+commit MERGE Merge branch 'ANDDEP-392-firebase-app-distribution-migration-instruction' into ANDDEP-392-firebase-app-distribution-for-template e9cf1691\n+commit MIRROR_START_POINT Increase global alpha version counter to 70 [skip ci] [version] 658fb0be\n+commit SIMPLE Add logs 3ebbca4c\n+commit MERGE Merge branch 'dev/G-0.5.0' into ANDDEP-392-firebase-app-distribution-for-template a9ae9238\n+commit MIRROR_START_POINT Increase global alpha version counter to 72 [skip ci] [version] 9fc795ff\n+commit SIMPLE ANDDEP-392 Remove logs 003ed6d1\n+commit SIMPLE ANDDEP-392 Add JenkinsfileTagJob 0a037e2c\n+commit SIMPLE ANDDEP-392 Add multiDexEnabled option for android standard module 23d9ab6d\n+commit SIMPLE ANDDEP-392 Fix template build types 671054b0\n+commit SIMPLE ANDDEP-392 Fix template proguard rules 51d61e2f\n+commit SIMPLE ANDDEP-392 Fix android standard configs 03774c97\n+commit SIMPLE Remove comments fc051c01\n+commit SIMPLE ANDDEP-392 Fix template a7af8e91\n+commit SIMPLE ANDDEP-392 Remove old firebase dependencies c4023650\n+commit SIMPLE ANDDEP-392 Disable R8 for template c51c9151\n+commit SIMPLE ANDDEP-392 Fix backward compatibility for RemoteLoggingStrategy 8c1fd395\n+commit SIMPLE ANDDEP-392 Add default keys for setUser params 7972e2e1\n+commit SIMPLE ANDDEP-392 Add removing TEMP_FOLDER_NAME 2afab851\n+commit MERGE Merged in ANDDEP-392-firebase-app-distribution-for-template (pull request #751) 0e7ec143\n+commit SIMPLE Increase global alpha version counter to 73 [skip ci] [version] dbfe7bf7\n+https://margarita-v:deepsix2015@github.com/surfstudio/Core-ui.git\n+\n+BUILD SUCCESSFUL in 46s\n+1 actionable task: 1 executed\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-978 Fix parent search & debug code |
652,300 | 10.04.2020 16:51:25 | -14,400 | a4f4c6ce6675a7aa03305fafec0812d005063597 | Implemented parsing of routes and views | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/buildTasks.gradle",
"new_path": "buildSrc/buildTasks.gradle",
"diff": "@@ -27,7 +27,7 @@ task checkStableComponentsChanged(type: CheckStableComponentsChangedTask) //pr\ntask createProjectConfiguration(type: CreateProjectConfigurationTask)\n-task checkScreenRoutes(type: CheckScreenRoutesTask)\n+task checkCrossFeatureRoute(type: CheckCrossFeatureRouteTask)\ntask runCreateProjectConfigurationFromTemp(type: GradleBuild) {\ndir = file('./temp')\n"
},
{
"change_type": "DELETE",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/CheckScreenRoutesTask.kt",
"new_path": null,
"diff": "-package ru.surfstudio.android.build.tasks.check_cross_feature_route\n-\n-import org.gradle.api.DefaultTask\n-import org.gradle.api.tasks.TaskAction\n-import ru.surfstudio.android.build.utils.EMPTY_STRING\n-import java.io.File\n-import kotlin.time.ExperimentalTime\n-import kotlin.time.measureTime\n-\n-@ExperimentalTime\n-open class CheckScreenRoutesTask : DefaultTask() {\n-\n- private val charDot = '.'\n- private val charQuote = '\"'\n- private val charColon = ':'\n- private val charBraceOpen = '{'\n- private val charBraceClose = '}'\n- private val charSlash = '\\\\'\n-\n- private val scanExcludedNames = listOf(\"build\")\n-\n- private val keywordClass = \"class \"\n- private val funTargetClassPath = \"fun targetClassPath()\"\n-\n- private val isDebugEnabled = true\n-\n- @TaskAction\n- fun check() {\n- \"Check screen routes started.\".log()\n- val timeTaken = measureTime {\n- \"Scanning project...\".log()\n- val scanResult = scanDirectory(project.projectDir)\n- \"\\nList of found routes:\".log()\n- scanResult.routes.forEach { it.absolutePath.log() }\n- \"\\nList of found activities:\".log()\n- scanResult.activities.forEach { it.absolutePath.log() }\n- \"\\nList of found fragments:\".log()\n- scanResult.fragments.forEach { it.absolutePath.log() }\n- \"\\nScanning for CrossFeatureRoutes...\".log()\n- val crossFeatureRoutes = scanResult.routes.mapToCrossFeatureRoute()\n- \"\\nList of found CrossFeatureRoutes:\".log()\n- crossFeatureRoutes.forEach { it.toString().log() }\n- \"\\nValidating CrossFeatureRoutes targetClassPath...\".log()\n- crossFeatureRoutes.forEach { validateTargetClassPath(scanResult, it) }\n- }\n- \"\\nCheck screen routes finished. Time taken: ${timeTaken.inSeconds}\"\n- }\n-\n- private fun scanDirectory(dir: File): ScanResult {\n- val filteredFiles = dir.listFiles()?.filter { !scanExcludedNames.contains(it.name) }\n- ?: arrayListOf()\n-\n- val kotlinFiles = filteredFiles.filter { it.extension == \"kt\" }\n- val directories = filteredFiles.filter { it.isDirectory }\n-\n- val innerRouteFiles = kotlinFiles.filter { it.name.contains(\"Route\") }\n- val innerActivityFiles = kotlinFiles.filter { it.name.contains(\"ActivityView\") }\n- val innerFragmentFiles = kotlinFiles.filter { it.name.contains(\"FragmentView\") }\n- val innerDialogFiles = kotlinFiles.filter { it.name.contains(\"DialogView\") }\n-\n- val scanResults = mutableListOf<ScanResult>().apply {\n- add(ScanResult(innerRouteFiles, innerActivityFiles, innerFragmentFiles, innerDialogFiles))\n- }\n-\n- directories.forEach { directory ->\n- scanDirectory(directory).also { scanResults.add(it) }\n- }\n-\n- val routeFiles = scanResults.flatMap { it.routes }\n- val activityFiles = scanResults.flatMap { it.activities }\n- val fragmentFiles = scanResults.flatMap { it.fragments }\n- val dialogFiles = scanResults.flatMap { it.dialogs }\n- return ScanResult(routeFiles, activityFiles, fragmentFiles, dialogFiles)\n- }\n-\n- private fun validateTargetClassPath(scanResult: ScanResult, route: CrossFeatureRoute) {\n- val candidates = when {\n- route.isActivity -> scanResult.activities.filter { it.name.contains(route.targetClassName) }\n- route.isFragment -> scanResult.fragments.filter { it.name.contains(route.targetClassName) }\n- route.isDialog -> scanResult.dialogs.filter { it.name.contains(route.targetClassName) }\n- else -> error(\"Unknown route type: ${route.name}\")\n- }\n-\n- candidates.forEach { candidate ->\n- if (candidate.absolutePath.contains(route.targetClassSystemPath)) {\n- \"${route.name} for ${route.targetClassName} is valid\".log()\n- return\n- }\n- }\n-\n- throw error(\"${route.name} is not valid\")\n- }\n-\n- private fun List<File>.mapToCrossFeatureRoute(): List<CrossFeatureRoute> {\n- return mapNotNull { routeFile ->\n- val crossFeatureRoute = CrossFeatureRoute(routeFile)\n- if (crossFeatureRoute.isValid) crossFeatureRoute else null\n- }\n- }\n-\n- private fun String.log() = if (isDebugEnabled) println(this) else Unit\n-\n- private data class ScanResult(\n- val routes: List<File>,\n- val activities: List<File>,\n- val fragments: List<File>,\n- val dialogs: List<File>\n- )\n-\n- private inner class CrossFeatureRoute(private val file: File) {\n-\n- val name get() = file.nameWithoutExtension ?: EMPTY_STRING\n-\n- private val fileContent = file.readText()\n- val baseClassName = findBaseClassName(fileContent)\n- val targetClassPath = findTargetClassPath(fileContent)\n- val targetClassSystemPath = parseTargetClassSystemPath(targetClassPath)\n- val targetClassName = parseTargetClassName(targetClassPath)\n- val isActivity = fileContent.contains(\"ActivityRoute\")\n- val isFragment = fileContent.contains(\"FragmentRoute\")\n- val isDialog = fileContent.contains(\"DialogRoute\")\n- val isValid = targetClassPath.isNotBlank()\n-\n- override fun toString(): String {\n- return \"${file.nameWithoutExtension} : $baseClassName (targetClassPath = $targetClassPath)\"\n- }\n-\n- private fun parseTargetClassName(targetClassPath: String): String {\n- return if (!targetClassPath.contains(charDot)) EMPTY_STRING\n- else targetClassPath.substringAfterLast(charDot)\n- }\n-\n- private fun parseTargetClassSystemPath(targetClassPath: String): String {\n- return targetClassPath.replace(charDot, charSlash)\n- }\n-\n- private fun findTargetClassPath(fileContent: String): String {\n- var result = EMPTY_STRING\n- try {\n- val funText = fileContent.indexOf(funTargetClassPath).let { startIndex ->\n- if (startIndex < 0) return result\n- else fileContent.substring(startIndex)\n- }\n-\n- val funBodyStart = funText.indexOf(charBraceOpen) + 1\n- val funBodyEnd = funText.indexOf(charBraceClose) - 1\n- val funBodyText = (funBodyStart..funBodyEnd).let { range ->\n- if (-1 in range) error(\"can't find targetClassPath()-method body\")\n- else funText.substring(range)\n- }\n-\n- val targetClassPathStart = funBodyText.indexOf(charQuote) + 1\n- val targetClassPathEnd = funBodyText.lastIndexOf(charQuote) - 1\n- result = (targetClassPathStart..targetClassPathEnd).let { range ->\n- if (-1 in range) error(\"can't parse targetClassPath()-method body\")\n- else funBodyText.substring(range)\n- }\n- } catch (error: Throwable) {\n- handleError(error)\n- }\n- return result\n- }\n-\n- private fun findBaseClassName(fileContent: String): String {\n- var result = EMPTY_STRING\n- try {\n- val classText = fileContent.indexOf(keywordClass).let { startIndex ->\n- return@let if (startIndex < 0) return result\n- else fileContent.substring(startIndex)\n- }\n-\n- val implsEnd = classText.indexOf(charBraceOpen).let { endIndex ->\n- return@let if (endIndex < 0) classText.lastIndex\n- else endIndex\n- }\n-\n- val implsStart = run {\n- (implsEnd downTo 0).forEach { index ->\n- if (classText[index] == charColon) return@run index\n- }\n- return@run -1\n- }\n-\n- val implsText = (implsStart..implsEnd).let { range ->\n- if (-1 in range) return result\n- else classText.substring(range)\n- }\n-\n- val baseStart = implsText.indexOfFirst { it.isLetter() }\n- val baseEnd = run {\n- (baseStart..implsText.lastIndex).forEach { index ->\n- if (!implsText[index].isLetter()) {\n- return@run index - 1\n- }\n- }\n- return@run -1\n- }\n-\n- result = (baseStart..baseEnd).let { range ->\n- if (-1 in range) return result\n- else implsText.substring(range)\n- }\n- } catch (error: Throwable) {\n- handleError(error)\n- }\n- return result\n- }\n-\n- private fun handleError(error: Throwable) {\n- \"ERROR ${file.nameWithoutExtension}: ${error.message}\".log()\n- }\n- }\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/data/KotlinClassWrapper.kt",
"diff": "+package ru.surfstudio.android.build.tasks.check_cross_feature_route.data\n+\n+open class KotlinClassWrapper(\n+ val packageName: String,\n+ val className: String,\n+ val baseClassName: String,\n+ val baseClassPackageName: String,\n+ val implementations: List<String>,\n+ val classBody: String\n+)\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/data/KotlinCrossFeatureRouteClassWrapper.kt",
"diff": "+package ru.surfstudio.android.build.tasks.check_cross_feature_route.data\n+\n+class KotlinCrossFeatureRouteClassWrapper(\n+ packageName: String,\n+ className: String,\n+ baseClassName: String,\n+ baseClassPackageName: String,\n+ implementations: List<String>,\n+ classBody: String,\n+ val targetClassPath: String\n+) : KotlinClassWrapper(\n+ packageName,\n+ className,\n+ baseClassName,\n+ baseClassPackageName,\n+ implementations,\n+ classBody\n+) {\n+\n+ val targetClassName: String = targetClassPath.substringAfterLast('.')\n+ val targetPackageName: String = targetClassPath.substringBeforeLast('.')\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/data/KotlinViewClassWrapper.kt",
"diff": "+package ru.surfstudio.android.build.tasks.check_cross_feature_route.data\n+\n+class KotlinViewClassWrapper(\n+ packageName: String,\n+ className: String,\n+ baseClassName: String,\n+ baseClassPackageName: String,\n+ implementations: List<String>,\n+ classBody: String,\n+ val isImplementsCrossFeature: Boolean\n+) : KotlinClassWrapper(\n+ packageName,\n+ className,\n+ baseClassName,\n+ baseClassPackageName,\n+ implementations,\n+ classBody\n+)\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/parser/KotlinClassParser.kt",
"diff": "+package ru.surfstudio.android.build.tasks.check_cross_feature_route.parser\n+\n+import ru.surfstudio.android.build.tasks.check_cross_feature_route.data.KotlinClassWrapper\n+import ru.surfstudio.android.build.utils.DefaultGradleLogger\n+import ru.surfstudio.android.build.utils.EMPTY_STRING\n+import ru.surfstudio.android.build.utils.GradleLogger\n+import java.io.File\n+\n+open class KotlinClassParser(isDebugEnabled: Boolean = false) :\n+ GradleLogger by DefaultGradleLogger(\"KotlinClassFileParser\", isDebugEnabled) {\n+\n+ private companion object {\n+ const val FORMAT_PACKAGE_NAME_START = \"package \"\n+ const val FORMAT_CLASS_NAME_START = \"class \"\n+ const val FORMAT_IMPORT = \"import \"\n+\n+ const val FORMAT_BASE_CLASS_NAME_END = ')'\n+\n+ const val FORMAT_IMPLEMENTATIONS_START = ':'\n+ const val FORMAT_IMPLEMENTATIONS_DELIMITER = ':'\n+ const val FORMAT_IMPLEMENTATIONS_END = '{'\n+\n+ const val FORMAT_CLASS_BODY_START = \" {\"\n+ const val FORMAT_CLASS_BODY_END = '}'\n+ }\n+\n+ open fun parse(file: File): KotlinClassWrapper? {\n+ val fileContent = file.readText()\n+ val packageName = parsePackageName(fileContent)\n+ val className = parseClassName(fileContent)\n+ val baseClassName = parseBaseClassName(fileContent)\n+ val baseClassPackageName = parseBaseClassPackageName(fileContent)\n+ val implementations = parseImplementations(fileContent)\n+ val classBody = parseClassBody(fileContent)\n+\n+ \"------------------------------\".logd()\n+ \"file: ${file.absolutePath}\".logd()\n+ \"packageName: $packageName\".logd()\n+ \"className: $className\".logd()\n+ \"baseClassName: $baseClassName\".logd()\n+ \"implements: ${implementations.joinToString(\", \")}\".logd()\n+\n+ return if (className.isBlank()) null\n+ else KotlinClassWrapper(\n+ packageName,\n+ className,\n+ baseClassName,\n+ baseClassPackageName,\n+ implementations,\n+ classBody\n+ )\n+ }\n+\n+ private fun parsePackageName(target: String): String {\n+ return target.substringSafe(findPackageNameRange(target))\n+ }\n+\n+ private fun parseClassName(target: String): String {\n+ return target.substringSafe(findClassNameRange(target))\n+ }\n+\n+ private fun parseImplementations(target: String): List<String> {\n+ return target.substringSafe(findImplementationsRange(target))\n+ .trim()\n+ .split(FORMAT_IMPLEMENTATIONS_DELIMITER)\n+ }\n+\n+ private fun parseBaseClassName(target: String): String {\n+ return parseImplementations(target)\n+ .filter { item -> item.lastOrNull() == FORMAT_BASE_CLASS_NAME_END }\n+ .map { item -> item.takeWhile { it.isLetterOrDigit() } }\n+ .firstOrNull() ?: EMPTY_STRING\n+ }\n+\n+ private fun parseBaseClassPackageName(target: String): String {\n+ val baseClassName = parseBaseClassName(target)\n+ return target.substringSafe(findBaseClassPackageNameRange(target, baseClassName))\n+ }\n+\n+ private fun parseClassBody(target: String): String {\n+ return target.substringSafe(findClassBodyRange(target))\n+ }\n+\n+ private fun findPackageNameRange(target: String): IntRange {\n+ val packageNameStart = target.indexAfter(FORMAT_PACKAGE_NAME_START)\n+ val packageNameSlice = target.substringSafe(packageNameStart..target.lastIndex)\n+ val packageNameEnd = packageNameStart + packageNameSlice.indexOfFirst { it.isWhitespace() } - 1\n+ return packageNameStart..packageNameEnd\n+ }\n+\n+ private fun findClassNameRange(target: String): IntRange {\n+ val classNameStart = target.indexAfter(FORMAT_CLASS_NAME_START)\n+ val classNameSlice = target.substringSafe(classNameStart..target.lastIndex)\n+ val classNameEnd = classNameStart + classNameSlice.indexOfFirst { !it.isLetterOrDigit() } - 1\n+ return classNameStart..classNameEnd\n+ }\n+\n+ private fun findImplementationsRange(target: String): IntRange {\n+ val classStart = target.indexOf(FORMAT_CLASS_NAME_START)\n+ val classSlice = target.substringSafe(classStart..target.lastIndex)\n+ val implementationsEnd = classStart + classSlice.indexBefore(FORMAT_IMPLEMENTATIONS_END)\n+ val implementationsSlice = classSlice.substringSafe(0..implementationsEnd)\n+ val implementationsStart = classStart + implementationsSlice.lastIndexAfter(FORMAT_IMPLEMENTATIONS_START)\n+ return implementationsStart..implementationsEnd\n+ }\n+\n+ private fun findClassBodyRange(target: String): IntRange {\n+ val classBodyStart = target.indexAfter(FORMAT_CLASS_BODY_START)\n+ val classBodyEnd = target.lastIndexOf(FORMAT_CLASS_BODY_END)\n+ return classBodyStart..classBodyEnd\n+ }\n+\n+ private fun findBaseClassPackageNameRange(target: String, name: String): IntRange {\n+ val line = target.lines()\n+ .find { it.contains(FORMAT_IMPORT) && it.contains(name) } ?: EMPTY_STRING\n+\n+ val start = line.indexOf(name)\n+ val end = line.lastIndex\n+ return start..end\n+ }\n+\n+ protected fun String.substringSafe(range: IntRange): String {\n+ return try {\n+ substring(range)\n+ } catch (error: Throwable) {\n+ EMPTY_STRING\n+ }\n+ }\n+\n+ protected fun String.indexAfter(target: String): Int {\n+ val index = indexOf(target)\n+ return if (index >= 0) index + target.length else index\n+ }\n+\n+ protected fun String.indexAfter(target: Char): Int {\n+ val index = indexOf(target)\n+ return if (index >= 0) index + 1 else index\n+ }\n+\n+ protected fun String.lastIndexAfter(target: String): Int {\n+ val index = lastIndexOf(target)\n+ return if (index >= 0) index + target.length else index\n+ }\n+\n+ protected fun String.lastIndexAfter(target: Char): Int {\n+ val index = lastIndexOf(target)\n+ return if (index >= 0) index + 1 else index\n+ }\n+\n+ protected fun String.indexBefore(target: Char): Int {\n+ val index = indexOf(target)\n+ return if (index >= 0) index - 1 else index\n+ }\n+\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/parser/KotlinViewClassParser.kt",
"diff": "+package ru.surfstudio.android.build.tasks.check_cross_feature_route.parser\n+\n+import ru.surfstudio.android.build.tasks.check_cross_feature_route.data.KotlinClassWrapper\n+import ru.surfstudio.android.build.tasks.check_cross_feature_route.data.KotlinViewClassWrapper\n+import java.io.File\n+\n+class KotlinViewClassParser(\n+ isDebugEnabled: Boolean\n+) : KotlinClassParser(isDebugEnabled) {\n+\n+ private companion object {\n+ const val FORMAT_CLASS_ACTIVITY = \"Activity\"\n+ const val FORMAT_CROSS_FEATURE_FRAGMENT = \"CrossFeatureFragment\"\n+ }\n+\n+ override fun parse(file: File): KotlinClassWrapper? {\n+ val result = super.parse(file) ?: return null\n+ val isImplementsCrossFeature = when {\n+ result.className.contains(FORMAT_CLASS_ACTIVITY) -> true\n+ else -> result.implementations.any { it.contains(FORMAT_CROSS_FEATURE_FRAGMENT) }\n+ }\n+ return KotlinViewClassWrapper(\n+ result.packageName,\n+ result.className,\n+ result.baseClassName,\n+ result.baseClassPackageName,\n+ result.implementations,\n+ result.classBody,\n+ isImplementsCrossFeature\n+ )\n+ }\n+}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-915 Implemented parsing of routes and views |
652,300 | 10.04.2020 17:31:41 | -14,400 | 7b4ce320cb727782775f33543169bd0dd5261356 | Added search of CrossFeatureFragment interface in base view-classes | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/data/KotlinClassWrapper.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/data/KotlinClassWrapper.kt",
"diff": "@@ -7,4 +7,6 @@ open class KotlinClassWrapper(\nval baseClassPackageName: String,\nval implementations: List<String>,\nval classBody: String\n-)\n\\ No newline at end of file\n+) {\n+ val fullName: String = \"$packageName.$className\"\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/data/KotlinCrossFeatureRouteClassWrapper.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/data/KotlinCrossFeatureRouteClassWrapper.kt",
"diff": "@@ -18,5 +18,5 @@ class KotlinCrossFeatureRouteClassWrapper(\n) {\nval targetClassName: String = targetClassPath.substringAfterLast('.')\n- val targetPackageName: String = targetClassPath.substringBeforeLast('.')\n+ val targetClassPackageName: String = targetClassPath.substringBeforeLast('.')\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/util/KotlinCrossFeatureRouteVerifier.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/util/KotlinCrossFeatureRouteVerifier.kt",
"diff": "@@ -14,23 +14,36 @@ class KotlinCrossFeatureRouteVerifier(\n) : GradleLogger by DefaultGradleLogger(\"KotlinRouteVerifier\", isDebugEnabled) {\nfun verify(route: KotlinCrossFeatureRouteClassWrapper): Boolean {\n- val targetView = views.find {\n- it.className == route.targetClassName && it.packageName == route.targetPackageName\n+ \"${route.fullName} verifying\".logd()\n+ val targetView = findViewClass(route.targetClassName, route.targetClassPackageName)\n+ if (targetView == null) {\n+ \"Unable to find view (${route.targetClassPath}) for route ${route.fullName}\".loge()\n+ return false\n}\n-\n- return when {\n- targetView == null -> {\n- \"Unable to find targetClass (${route.targetClassPath}) for route ${route.className}\".loge()\n+ val isViewImplementsCrossFeature = checkIsCrossFeature(targetView)\n+ if (!isViewImplementsCrossFeature) {\n+ \"${targetView.className} is not implements CrossFeatureFragment\".loge()\nreturn false\n}\n+ \"${route.fullName} verified\".logd()\n+ return true\n+ }\n- !targetView.isImplementsCrossFeature -> {\n- \"${route.targetClassPath} is not implements CrossFeatureFragment\".loge()\n- return false\n+ private fun checkIsCrossFeature(view: KotlinViewClassWrapper): Boolean {\n+ return when {\n+ view.isImplementsCrossFeature -> true\n+ else -> {\n+ val targetView = findViewClass(view.baseClassName, view.baseClassPackageName)\n+ targetView?.let(::checkIsCrossFeature) ?: false\n+ }\n+ }\n}\n- else -> true\n+ private fun findViewClass(className: String, packageName: String): KotlinViewClassWrapper? {\n+ return views.find {\n+ it.className == className && it.packageName == packageName\n}\n}\n+\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-915 Added search of CrossFeatureFragment interface in base view-classes |
652,312 | 13.04.2020 11:26:34 | -10,800 | 01baafd751e22eb8c840bf88255d38bf58f50b0a | Fix commit mirror logic | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/MirrorManager.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/MirrorManager.kt",
"diff": "@@ -133,15 +133,6 @@ class MirrorManager(\nelse -> null\n})?.let { commit.tags.forEach { tag -> mirrorRepository.tag(it, tag) } }\n}\n-\n- /*\n- // In case of untracked files add them to the last commit\n- with(mirrorRepository) {\n- if (status().untracked.isNotEmpty()) {\n- add()\n- amend(gitTree.standardRepositoryCommitsForMirror.last().commit.shortMessage)\n- }\n- }*/\n}\n/**\n@@ -165,7 +156,7 @@ class MirrorManager(\ncheckoutMirrorBranchForCommit(commit)\napplyChanges(changes)\n- //mirrorRepository.add()\n+ mirrorRepository.add()\nval newCommit = mirrorRepository.commit(commit.commit)\ncommit.mirrorCommitHash = newCommit?.name ?: EMPTY_STRING\ncommit.type = CommitType.COMMITED\n@@ -218,7 +209,7 @@ class MirrorManager(\ndiffManager.modify(filePath)\n}\n- // mirrorRepository.add()\n+ mirrorRepository.add()\nval newCommit = mirrorRepository.commit(commit.commit)\ncommit.mirrorCommitHash = newCommit?.name ?: EMPTY_STRING\ncommit.type = CommitType.COMMITED\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/repository/MirrorRepository.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/repository/MirrorRepository.kt",
"diff": "package ru.surfstudio.android.build.tasks.deploy_to_mirror.repository\n-import org.eclipse.jgit.api.Status\nimport org.eclipse.jgit.dircache.DirCache\nimport org.eclipse.jgit.revwalk.RevCommit\n-import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider\nimport ru.surfstudio.android.build.exceptions.deploy_to_mirror.MirrorCommitNotFoundByStandardHashException\n-import ru.surfstudio.android.build.tasks.changed_components.CommandLineRunner\nimport ru.surfstudio.android.build.utils.STANDARD_COMMIT_HASH_POSTFIX\nimport ru.surfstudio.android.build.utils.STANDARD_COMMIT_HASH_PREFIX\nimport ru.surfstudio.android.build.utils.mirrorStandardHash\n@@ -43,17 +40,6 @@ class MirrorRepository(\n.call()\n}\n- fun amend(message: String): RevCommit? {\n- return git.commit()\n- .setAmend(true)\n- .setMessage(message)\n- .call()\n- }\n-\n- fun status(): Status {\n- return git.status().call()\n- }\n-\nfun push() {\nprintln(getPushUrl())\n/*\n"
},
{
"change_type": "MODIFY",
"old_path": "core-ui.sh",
"new_path": "core-ui.sh",
"diff": "-COMMIT_HASH=4da918a98ddfa97e5a0d796233309c5fc51b6ad0\n+COMMIT_HASH=e6f6bea373f7a577cb8c71feafc21b2f4db74e94\nrm -rf _mirror temp\ngit clone https://github.com/surfstudio/Core-ui _mirror\ngit clone --single-branch --branch dev/G-0.5.0 https://gitlab.com/surfstudio/projects/standard/android-standard temp\n"
},
{
"change_type": "MODIFY",
"old_path": "easyadapter.sh",
"new_path": "easyadapter.sh",
"diff": "-COMMIT_HASH=4da918a98ddfa97e5a0d796233309c5fc51b6ad0\n+COMMIT_HASH=e6f6bea373f7a577cb8c71feafc21b2f4db74e94 # 87\nrm -rf _mirror temp\ngit clone https://github.com/surfstudio/EasyAdapter _mirror\ngit clone --single-branch --branch dev/G-0.5.0 https://gitlab.com/surfstudio/projects/standard/android-standard temp\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-978 Fix commit mirror logic |
652,300 | 13.04.2020 14:36:39 | -14,400 | f57802a702cbea91e558e261fa824dd82f06a338 | Polished and almost ready to deploy gradle task | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/CheckCrossFeatureRouteTask.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/CheckCrossFeatureRouteTask.kt",
"diff": "@@ -2,11 +2,11 @@ package ru.surfstudio.android.build.tasks.check_cross_feature_route\nimport org.gradle.api.DefaultTask\nimport org.gradle.api.tasks.TaskAction\n-import ru.surfstudio.android.build.tasks.check_cross_feature_route.data.KotlinCrossFeatureRouteClassWrapper\n-import ru.surfstudio.android.build.tasks.check_cross_feature_route.data.KotlinViewClassWrapper\n-import ru.surfstudio.android.build.tasks.check_cross_feature_route.parser.KotlinCrossFeatureRouteClassParser\n-import ru.surfstudio.android.build.tasks.check_cross_feature_route.parser.KotlinViewClassParser\n-import ru.surfstudio.android.build.tasks.check_cross_feature_route.util.KotlinCrossFeatureRouteVerifier\n+import ru.surfstudio.android.build.tasks.check_cross_feature_route.data.KClassCrossFeatureRouteWrapper\n+import ru.surfstudio.android.build.tasks.check_cross_feature_route.data.KClassCrossFeatureViewWrapper\n+import ru.surfstudio.android.build.tasks.check_cross_feature_route.parser.KClassCrossFeatureRouteParser\n+import ru.surfstudio.android.build.tasks.check_cross_feature_route.parser.KClassCrossFeatureViewParser\n+import ru.surfstudio.android.build.tasks.check_cross_feature_route.verifier.KClassCrossFeatureRouteVerifier\nimport ru.surfstudio.android.build.utils.DefaultGradleLogger\nimport ru.surfstudio.android.build.utils.GradleLogger\nimport java.io.File\n@@ -16,7 +16,7 @@ import kotlin.time.measureTime\n@ExperimentalTime\nopen class CheckCrossFeatureRouteTask :\nDefaultTask(),\n- GradleLogger by DefaultGradleLogger(\"CheckCrossFeatureRouteTask\", true) {\n+ GradleLogger by DefaultGradleLogger(\"CheckCrossFeatureRouteTask\") {\nprivate data class ScanResult(val routes: List<File>, val views: List<File>)\n@@ -28,23 +28,23 @@ open class CheckCrossFeatureRouteTask :\n@TaskAction\nfun check() {\nif (!isCheckRequired) {\n- \"task execution disabled.\".logi()\n+ \"Task execution disabled.\".logi()\nreturn\n}\nval timeTaken = measureTime {\n\"Scanning project...\".logi()\n- val scanResult = scanDirectory(project.projectDir)\n- val routeClassParser = KotlinCrossFeatureRouteClassParser(isDebugEnabled)\n- val viewClassParser = KotlinViewClassParser(isDebugEnabled)\n+ val scanResult = scanDirectory(project.rootDir)\n+ val routeParser = KClassCrossFeatureRouteParser()\n+ val viewParser = KClassCrossFeatureViewParser()\nval crossFeatureRouteWrappers = scanResult.routes\n- .mapNotNull { routeClassParser.parse(it) }\n- .filterIsInstance<KotlinCrossFeatureRouteClassWrapper>()\n+ .mapNotNull { routeParser.parse(it) }\n+ .filterIsInstance<KClassCrossFeatureRouteWrapper>()\nval viewWrappers = scanResult.views\n- .mapNotNull { viewClassParser.parse(it) }\n- .filterIsInstance<KotlinViewClassWrapper>()\n+ .mapNotNull { viewParser.parse(it) }\n+ .filterIsInstance<KClassCrossFeatureViewWrapper>()\nif (isDebugEnabled) {\n\"Found CrossFeatureRoutes: ${crossFeatureRouteWrappers.size}\".logd()\n@@ -54,11 +54,11 @@ open class CheckCrossFeatureRouteTask :\ncrossFeatureRouteWrappers.forEachIndexed { index, item -> \"${index + 1}. ${item.className}\".logd() }\n}\n- \"Verifying routes...\".logi()\n- val routeVerifier = KotlinCrossFeatureRouteVerifier(viewWrappers, isDebugEnabled)\n- crossFeatureRouteWrappers.forEach { routeVerifier.verify(it) }\n+ \"Project scanning done. Verifying routes...\".logi()\n+ val crossFeatureRouteVerifier = KClassCrossFeatureRouteVerifier(viewWrappers)\n+ crossFeatureRouteWrappers.forEach { crossFeatureRouteVerifier.verify(it) }\n}\n- \"task executed. Time taken: ${timeTaken.inSeconds}\".logi()\n+ \"Task executed. Time taken: ${timeTaken.inSeconds}\".logi()\n}\nprivate fun scanDirectory(dir: File): ScanResult {\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/data/KClassCrossFeatureRouteWrapper.kt",
"diff": "+package ru.surfstudio.android.build.tasks.check_cross_feature_route.data\n+\n+// TODO doc\n+class KClassCrossFeatureRouteWrapper(\n+ packageName: String,\n+ className: String,\n+ baseClassPackageName: String,\n+ baseClassName: String,\n+ implementations: List<String>,\n+ classBody: String,\n+ val targetClassPath: String\n+) : KClassWrapper(\n+ packageName,\n+ className,\n+ baseClassPackageName,\n+ baseClassName,\n+ implementations,\n+ classBody\n+) {\n+ val targetClassName: String = targetClassPath.substringAfterLast('.')\n+ val targetClassPackageName: String = targetClassPath.substringBeforeLast('.')\n+\n+ override fun toString(): String {\n+ return \"${super.toString()} (target = $targetClassPath)\"\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/data/KClassCrossFeatureViewWrapper.kt",
"diff": "+package ru.surfstudio.android.build.tasks.check_cross_feature_route.data\n+\n+// TODO doc\n+class KClassCrossFeatureViewWrapper(\n+ packageName: String,\n+ className: String,\n+ baseClassPackageName: String,\n+ baseClassName: String,\n+ implementations: List<String>,\n+ classBody: String,\n+ val isImplementsCrossFeature: Boolean\n+) : KClassWrapper(\n+ packageName,\n+ className,\n+ baseClassPackageName,\n+ baseClassName,\n+ implementations,\n+ classBody\n+)\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/data/KClassWrapper.kt",
"diff": "+package ru.surfstudio.android.build.tasks.check_cross_feature_route.data\n+\n+// TODO doc\n+open class KClassWrapper(\n+ val packageName: String,\n+ val className: String,\n+ val baseClassPackageName: String,\n+ val baseClassName: String,\n+ val implementations: List<String>,\n+ val classBody: String\n+) {\n+ val fullName: String = \"$packageName.$className\"\n+\n+ override fun toString(): String {\n+ return \"$className (package $packageName)\"\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/data/KotlinClassWrapper.kt",
"new_path": null,
"diff": "-package ru.surfstudio.android.build.tasks.check_cross_feature_route.data\n-\n-open class KotlinClassWrapper(\n- val packageName: String,\n- val className: String,\n- val baseClassName: String,\n- val baseClassPackageName: String,\n- val implementations: List<String>,\n- val classBody: String\n-) {\n- val fullName: String = \"$packageName.$className\"\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/data/KotlinCrossFeatureRouteClassWrapper.kt",
"new_path": null,
"diff": "-package ru.surfstudio.android.build.tasks.check_cross_feature_route.data\n-\n-class KotlinCrossFeatureRouteClassWrapper(\n- packageName: String,\n- className: String,\n- baseClassName: String,\n- baseClassPackageName: String,\n- implementations: List<String>,\n- classBody: String,\n- val targetClassPath: String\n-) : KotlinClassWrapper(\n- packageName,\n- className,\n- baseClassName,\n- baseClassPackageName,\n- implementations,\n- classBody\n-) {\n-\n- val targetClassName: String = targetClassPath.substringAfterLast('.')\n- val targetClassPackageName: String = targetClassPath.substringBeforeLast('.')\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/data/KotlinViewClassWrapper.kt",
"new_path": null,
"diff": "-package ru.surfstudio.android.build.tasks.check_cross_feature_route.data\n-\n-class KotlinViewClassWrapper(\n- packageName: String,\n- className: String,\n- baseClassName: String,\n- baseClassPackageName: String,\n- implementations: List<String>,\n- classBody: String,\n- val isImplementsCrossFeature: Boolean\n-) : KotlinClassWrapper(\n- packageName,\n- className,\n- baseClassName,\n- baseClassPackageName,\n- implementations,\n- classBody\n-)\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/parser/KClassParser.kt",
"diff": "+package ru.surfstudio.android.build.tasks.check_cross_feature_route.parser\n+\n+import ru.surfstudio.android.build.tasks.check_cross_feature_route.data.KClassWrapper\n+import ru.surfstudio.android.build.utils.DefaultGradleLogger\n+import ru.surfstudio.android.build.utils.EMPTY_STRING\n+import ru.surfstudio.android.build.utils.GradleLogger\n+import java.io.File\n+\n+// todo doc\n+open class KClassParser : GradleLogger {\n+\n+ open protected val logger = DefaultGradleLogger(\"KClassParser\", isDebugEnabled = false)\n+\n+ override var tag: String\n+ get() = logger.tag\n+ set(value) {\n+ logger.tag = value\n+ }\n+\n+ override var isDebugEnabled: Boolean\n+ get() = logger.isDebugEnabled\n+ set(value) {\n+ logger.isDebugEnabled = value\n+ }\n+\n+ override var isInfoEnabled: Boolean\n+ get() = logger.isInfoEnabled\n+ set(value) {\n+ logger.isInfoEnabled = value\n+ }\n+\n+ override var isWarningsEnabled: Boolean\n+ get() = logger.isWarningsEnabled\n+ set(value) {\n+ logger.isWarningsEnabled = value\n+ }\n+\n+ override var isErrorsEnabled: Boolean\n+ get() = logger.isErrorsEnabled\n+ set(value) {\n+ logger.isErrorsEnabled = value\n+ }\n+\n+ override fun logDebug(message: String) = logger.logDebug(message)\n+\n+ override fun logInfo(message: String) = logger.logInfo(message)\n+\n+ override fun logWarning(message: String) = logger.logWarning(message)\n+\n+ override fun logError(message: String) = logger.logError(message)\n+\n+ open fun parse(file: File): KClassWrapper? {\n+ val fileContent = file.readText()\n+ val packageName = parsePackageName(fileContent)\n+ val className = parseClassName(fileContent)\n+ val baseClassName = parseBaseClassName(fileContent)\n+ val baseClassPackageName = parseBaseClassPackageName(fileContent)\n+ val implementations = parseImplementations(fileContent)\n+ val classBody = parseClassBody(fileContent)\n+ val result = when {\n+ className.isNotBlank() -> {\n+ KClassWrapper(\n+ packageName,\n+ className,\n+ baseClassPackageName,\n+ baseClassName,\n+ implementations,\n+ classBody\n+ )\n+ }\n+ else -> null\n+ }\n+\n+ when (result) {\n+ null -> {\n+ \"------------------------------\".logd()\n+ \"file: ${file.absolutePath}\".logd()\n+ \"UNABLE TO PARSE FILE\".logd()\n+ }\n+ else -> {\n+ \"------------------------------\".logd()\n+ \"file: ${file.absolutePath}\".logd()\n+ \"className: $className\".logd()\n+ \"baseClassName: $baseClassName\".logd()\n+ \"implements: ${implementations.joinToString(\", \")}\".logd()\n+ \"classPackageName: $packageName\".logd()\n+ \"baseClassPackageName: $baseClassPackageName\".logd()\n+ }\n+ }\n+\n+ return result\n+ }\n+\n+ protected fun findPackageNameRange(target: String): IntRange {\n+ val packageNameStart = target.indexAfter(\"package \")\n+ val packageNameSlice = target.substringSafe(packageNameStart..target.lastIndex)\n+ val packageNameLen = packageNameSlice.takeWhile { !it.isWhitespace() }.lastIndex\n+ val packageNameEnd = packageNameStart + packageNameLen\n+ return packageNameStart..packageNameEnd\n+ }\n+\n+ protected fun findClassNameRange(target: String): IntRange {\n+ val classNameStart = target.indexAfter(\"class \")\n+ val classNameSlice = target.substringSafe(classNameStart..target.lastIndex)\n+ val classNameLen = classNameSlice.takeWhile { it.isLetterOrDigit() }.lastIndex\n+ val classNameEnd = classNameStart + classNameLen\n+ return classNameStart..classNameEnd\n+ }\n+\n+ protected fun findBaseClassNameRange(target: String): IntRange {\n+ val implsRange = findImplementationsRange(target)\n+ val implsSlice = target.substringSafe(implsRange)\n+ val baseClassNameImplsEnd = implsSlice.indexBefore('(')\n+ val baseClassNameImplsSlice = implsSlice.substringSafe(0..baseClassNameImplsEnd)\n+ val baseClassNameLen = baseClassNameImplsSlice.takeLastWhile { it.isLetterOrDigit() }.lastIndex\n+ val baseClassNameImplsStart = baseClassNameImplsEnd - baseClassNameLen\n+ val baseClassNameStart = implsRange.first + baseClassNameImplsStart\n+ val baseClassNameEnd = implsRange.first + baseClassNameImplsEnd\n+ return baseClassNameStart..baseClassNameEnd\n+ }\n+\n+ protected fun findImplementationsRange(target: String): IntRange {\n+ val implsEnd = target.indexBefore('{')\n+ val implsSlice = target.substringSafe(0..implsEnd)\n+ val implsStart = implsSlice.lastIndexAfter(':')\n+ return implsStart..implsEnd\n+ }\n+\n+ protected fun findClassBodyRange(target: String): IntRange {\n+ val classBodyStart = target.indexAfter('{')\n+ val classBodyEnd = target.lastIndexOf('}')\n+ return classBodyStart..classBodyEnd\n+ }\n+\n+ protected fun findBaseClassPackageNameRange(target: String, baseClassName: String): IntRange {\n+ val line = target.lines()\n+ .find { it.contains(\"import \") && it.contains(baseClassName) } ?: EMPTY_STRING\n+\n+ val packageNameLineEnd = line.indexBefore(baseClassName) - 1 // because of dot -> \"import com.MyClass\"\n+ val packageNameLineStart = line.indexAfter(\"import \")\n+ val importStart = target.indexOf(line)\n+ val packageNameStart = importStart + packageNameLineStart\n+ val packageNameEnd = importStart + packageNameLineEnd\n+ return packageNameStart..packageNameEnd\n+ }\n+\n+ protected fun String.substringSafe(range: IntRange): String {\n+ return try {\n+ substring(range)\n+ } catch (error: Throwable) {\n+ EMPTY_STRING\n+ }\n+ }\n+\n+ protected fun String.indexAfter(target: String): Int {\n+ val index = indexOf(target)\n+ return if (index >= 0) index + target.length else index\n+ }\n+\n+ protected fun String.indexAfter(target: Char): Int {\n+ val index = indexOf(target)\n+ return if (index >= 0) index + 1 else index\n+ }\n+\n+ protected fun String.lastIndexAfter(target: String): Int {\n+ val index = lastIndexOf(target)\n+ return if (index >= 0) index + target.length else index\n+ }\n+\n+ protected fun String.lastIndexAfter(target: Char): Int {\n+ val index = lastIndexOf(target)\n+ return if (index >= 0) index + 1 else index\n+ }\n+\n+ protected fun String.indexBefore(target: String): Int {\n+ val index = indexOf(target)\n+ return if (index >= 0) index - 1 else index\n+ }\n+\n+ protected fun String.indexBefore(target: Char): Int {\n+ val index = indexOf(target)\n+ return if (index >= 0) index - 1 else index\n+ }\n+\n+ private fun parsePackageName(target: String): String {\n+ return target.substringSafe(findPackageNameRange(target))\n+ }\n+\n+ private fun parseClassName(target: String): String {\n+ return target.substringSafe(findClassNameRange(target))\n+ }\n+\n+ private fun parseImplementations(target: String): List<String> {\n+ return target.substringSafe(findImplementationsRange(target))\n+ .split(',')\n+ .map { it.trim() }\n+ }\n+\n+ private fun parseBaseClassName(target: String): String {\n+ return target.substringSafe(findBaseClassNameRange(target))\n+ }\n+\n+ private fun parseBaseClassPackageName(target: String): String {\n+ val baseClassName = parseBaseClassName(target)\n+ return target.substringSafe(findBaseClassPackageNameRange(target, baseClassName))\n+ }\n+\n+ private fun parseClassBody(target: String): String {\n+ return target.substringSafe(findClassBodyRange(target))\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/parser/KotlinClassParser.kt",
"new_path": null,
"diff": "-package ru.surfstudio.android.build.tasks.check_cross_feature_route.parser\n-\n-import ru.surfstudio.android.build.tasks.check_cross_feature_route.data.KotlinClassWrapper\n-import ru.surfstudio.android.build.utils.DefaultGradleLogger\n-import ru.surfstudio.android.build.utils.EMPTY_STRING\n-import ru.surfstudio.android.build.utils.GradleLogger\n-import java.io.File\n-\n-open class KotlinClassParser(isDebugEnabled: Boolean = false) :\n- GradleLogger by DefaultGradleLogger(\"KotlinClassFileParser\", isDebugEnabled) {\n-\n- private companion object {\n- const val FORMAT_PACKAGE_NAME_START = \"package \"\n- const val FORMAT_CLASS_NAME_START = \"class \"\n- const val FORMAT_IMPORT = \"import \"\n-\n- const val FORMAT_BASE_CLASS_NAME_END = ')'\n-\n- const val FORMAT_IMPLEMENTATIONS_START = ':'\n- const val FORMAT_IMPLEMENTATIONS_DELIMITER = ':'\n- const val FORMAT_IMPLEMENTATIONS_END = '{'\n-\n- const val FORMAT_CLASS_BODY_START = \" {\"\n- const val FORMAT_CLASS_BODY_END = '}'\n- }\n-\n- open fun parse(file: File): KotlinClassWrapper? {\n- val fileContent = file.readText()\n- val packageName = parsePackageName(fileContent)\n- val className = parseClassName(fileContent)\n- val baseClassName = parseBaseClassName(fileContent)\n- val baseClassPackageName = parseBaseClassPackageName(fileContent)\n- val implementations = parseImplementations(fileContent)\n- val classBody = parseClassBody(fileContent)\n-\n- \"------------------------------\".logd()\n- \"file: ${file.absolutePath}\".logd()\n- \"packageName: $packageName\".logd()\n- \"className: $className\".logd()\n- \"baseClassName: $baseClassName\".logd()\n- \"implements: ${implementations.joinToString(\", \")}\".logd()\n-\n- return if (className.isBlank()) null\n- else KotlinClassWrapper(\n- packageName,\n- className,\n- baseClassName,\n- baseClassPackageName,\n- implementations,\n- classBody\n- )\n- }\n-\n- private fun parsePackageName(target: String): String {\n- return target.substringSafe(findPackageNameRange(target))\n- }\n-\n- private fun parseClassName(target: String): String {\n- return target.substringSafe(findClassNameRange(target))\n- }\n-\n- private fun parseImplementations(target: String): List<String> {\n- return target.substringSafe(findImplementationsRange(target))\n- .trim()\n- .split(FORMAT_IMPLEMENTATIONS_DELIMITER)\n- }\n-\n- private fun parseBaseClassName(target: String): String {\n- return parseImplementations(target)\n- .filter { item -> item.lastOrNull() == FORMAT_BASE_CLASS_NAME_END }\n- .map { item -> item.takeWhile { it.isLetterOrDigit() } }\n- .firstOrNull() ?: EMPTY_STRING\n- }\n-\n- private fun parseBaseClassPackageName(target: String): String {\n- val baseClassName = parseBaseClassName(target)\n- return target.substringSafe(findBaseClassPackageNameRange(target, baseClassName))\n- }\n-\n- private fun parseClassBody(target: String): String {\n- return target.substringSafe(findClassBodyRange(target))\n- }\n-\n- private fun findPackageNameRange(target: String): IntRange {\n- val packageNameStart = target.indexAfter(FORMAT_PACKAGE_NAME_START)\n- val packageNameSlice = target.substringSafe(packageNameStart..target.lastIndex)\n- val packageNameEnd = packageNameStart + packageNameSlice.indexOfFirst { it.isWhitespace() } - 1\n- return packageNameStart..packageNameEnd\n- }\n-\n- private fun findClassNameRange(target: String): IntRange {\n- val classNameStart = target.indexAfter(FORMAT_CLASS_NAME_START)\n- val classNameSlice = target.substringSafe(classNameStart..target.lastIndex)\n- val classNameEnd = classNameStart + classNameSlice.indexOfFirst { !it.isLetterOrDigit() } - 1\n- return classNameStart..classNameEnd\n- }\n-\n- private fun findImplementationsRange(target: String): IntRange {\n- val classStart = target.indexOf(FORMAT_CLASS_NAME_START)\n- val classSlice = target.substringSafe(classStart..target.lastIndex)\n- val implementationsEnd = classStart + classSlice.indexBefore(FORMAT_IMPLEMENTATIONS_END)\n- val implementationsSlice = classSlice.substringSafe(0..implementationsEnd)\n- val implementationsStart = classStart + implementationsSlice.lastIndexAfter(FORMAT_IMPLEMENTATIONS_START)\n- return implementationsStart..implementationsEnd\n- }\n-\n- private fun findClassBodyRange(target: String): IntRange {\n- val classBodyStart = target.indexAfter(FORMAT_CLASS_BODY_START)\n- val classBodyEnd = target.lastIndexOf(FORMAT_CLASS_BODY_END)\n- return classBodyStart..classBodyEnd\n- }\n-\n- private fun findBaseClassPackageNameRange(target: String, name: String): IntRange {\n- val line = target.lines()\n- .find { it.contains(FORMAT_IMPORT) && it.contains(name) } ?: EMPTY_STRING\n-\n- val start = line.indexOf(name)\n- val end = line.lastIndex\n- return start..end\n- }\n-\n- protected fun String.substringSafe(range: IntRange): String {\n- return try {\n- substring(range)\n- } catch (error: Throwable) {\n- EMPTY_STRING\n- }\n- }\n-\n- protected fun String.indexAfter(target: String): Int {\n- val index = indexOf(target)\n- return if (index >= 0) index + target.length else index\n- }\n-\n- protected fun String.indexAfter(target: Char): Int {\n- val index = indexOf(target)\n- return if (index >= 0) index + 1 else index\n- }\n-\n- protected fun String.lastIndexAfter(target: String): Int {\n- val index = lastIndexOf(target)\n- return if (index >= 0) index + target.length else index\n- }\n-\n- protected fun String.lastIndexAfter(target: Char): Int {\n- val index = lastIndexOf(target)\n- return if (index >= 0) index + 1 else index\n- }\n-\n- protected fun String.indexBefore(target: Char): Int {\n- val index = indexOf(target)\n- return if (index >= 0) index - 1 else index\n- }\n-\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/parser/KotlinViewClassParser.kt",
"new_path": null,
"diff": "-package ru.surfstudio.android.build.tasks.check_cross_feature_route.parser\n-\n-import ru.surfstudio.android.build.tasks.check_cross_feature_route.data.KotlinClassWrapper\n-import ru.surfstudio.android.build.tasks.check_cross_feature_route.data.KotlinViewClassWrapper\n-import java.io.File\n-\n-class KotlinViewClassParser(\n- isDebugEnabled: Boolean\n-) : KotlinClassParser(isDebugEnabled) {\n-\n- private companion object {\n- const val FORMAT_CLASS_ACTIVITY = \"Activity\"\n- const val FORMAT_CROSS_FEATURE_FRAGMENT = \"CrossFeatureFragment\"\n- }\n-\n- override fun parse(file: File): KotlinClassWrapper? {\n- val result = super.parse(file) ?: return null\n- val isImplementsCrossFeature = when {\n- result.className.contains(FORMAT_CLASS_ACTIVITY) -> true\n- else -> result.implementations.any { it.contains(FORMAT_CROSS_FEATURE_FRAGMENT) }\n- }\n- return KotlinViewClassWrapper(\n- result.packageName,\n- result.className,\n- result.baseClassName,\n- result.baseClassPackageName,\n- result.implementations,\n- result.classBody,\n- isImplementsCrossFeature\n- )\n- }\n-}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-915 Polished and almost ready to deploy gradle task |
652,300 | 13.04.2020 16:44:09 | -14,400 | 6904e402e4d9755dbd44c331e7fe5c5645353510 | Refactoring and documentation. Gradle task now runs after build (need tests) | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/buildTasks.gradle",
"new_path": "buildSrc/buildTasks.gradle",
"diff": "@@ -27,7 +27,10 @@ task checkStableComponentsChanged(type: CheckStableComponentsChangedTask) //pr\ntask createProjectConfiguration(type: CreateProjectConfigurationTask)\n-task checkCrossFeatureRoute(type: CheckCrossFeatureRouteTask)\n+task validateCrossFeatureRoutes(type: ValidateCrossFeatureRoutesTask)\n+tasks.whenTaskAdded { Task task ->\n+ if (task.name == \"build\") task.dependsOn(\"validateCrossFeatureRoutes\")\n+}\ntask runCreateProjectConfigurationFromTemp(type: GradleBuild) {\ndir = file('./temp')\n"
},
{
"change_type": "RENAME",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/ValidateCrossFeatureRoutes.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/ValidateCrossFeatureRoutesTask.kt",
"diff": "@@ -4,9 +4,9 @@ import org.gradle.api.DefaultTask\nimport org.gradle.api.tasks.TaskAction\nimport ru.surfstudio.android.build.tasks.check_cross_feature_route.data.KClassCrossFeatureRouteWrapper\nimport ru.surfstudio.android.build.tasks.check_cross_feature_route.data.KClassCrossFeatureViewWrapper\n-import ru.surfstudio.android.build.tasks.check_cross_feature_route.parser.KClassCrossFeatureRouteParser\n-import ru.surfstudio.android.build.tasks.check_cross_feature_route.parser.KClassCrossFeatureViewParser\n-import ru.surfstudio.android.build.tasks.check_cross_feature_route.verifier.KClassCrossFeatureRouteValidator\n+import ru.surfstudio.android.build.tasks.check_cross_feature_route.util.KClassCrossFeatureRouteParser\n+import ru.surfstudio.android.build.tasks.check_cross_feature_route.util.KClassCrossFeatureViewParser\n+import ru.surfstudio.android.build.tasks.check_cross_feature_route.util.KClassCrossFeatureRouteValidator\nimport java.io.File\n/**\n@@ -15,10 +15,9 @@ import java.io.File\n* @param skipValidation skip validation of routes and return immediately.\n* @param ignoredFileNames list of file names which gonna be ignored on project scan.\n* */\n-open class ValidateCrossFeatureRoutes(\n- private val skipValidation: Boolean = false,\n- private val ignoredFileNames: List<String> = listOf(\"build\")\n-) : DefaultTask() {\n+open class ValidateCrossFeatureRoutesTask : DefaultTask() {\n+ val shouldSkipValidation: Boolean = false\n+ val ignoredFileNames: List<String> = listOf(\"build\")\n/**\n* Result of the directory scanning.\n@@ -33,15 +32,15 @@ open class ValidateCrossFeatureRoutes(\n* */\n@TaskAction\nfun check() {\n- if (skipValidation) {\n+ if (shouldSkipValidation) {\nlogger.warn(\"Validation of CrossFeatureRoutes disabled.\")\nreturn\n}\n- logger.info(\"Validating CrossFeatureRoute's...\")\n+ logger.lifecycle(\"Validating CrossFeatureRoute's...\")\nval directoryScanResult = scanDirectory(project.rootDir)\n- val routeParser = KClassCrossFeatureRouteParser()\n- val viewParser = KClassCrossFeatureViewParser()\n+ val routeParser = KClassCrossFeatureRouteParser(logger)\n+ val viewParser = KClassCrossFeatureViewParser(logger)\nval crossFeatureRouteWrappers = directoryScanResult.routes\n.mapNotNull { routeParser.parse(it) }\n@@ -56,6 +55,7 @@ open class ValidateCrossFeatureRoutes(\nval routeValidator = KClassCrossFeatureRouteValidator(logger, crossFeatureViewWrappers)\ncrossFeatureRouteWrappers.forEach { routeValidator.validate(it) }\n+ logger.lifecycle(\"All CrossFeatureRoute's validated.\")\n}\n/**\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/data/KClassCrossFeatureRouteWrapper.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/data/KClassCrossFeatureRouteWrapper.kt",
"diff": "package ru.surfstudio.android.build.tasks.check_cross_feature_route.data\n-// TODO doc\n+/**\n+ * Wrapper that contains parsed information of kotlin class file.\n+ * */\nclass KClassCrossFeatureRouteWrapper(\npackageName: String,\nclassName: String,\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/data/KClassCrossFeatureViewWrapper.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/data/KClassCrossFeatureViewWrapper.kt",
"diff": "package ru.surfstudio.android.build.tasks.check_cross_feature_route.data\n-// TODO doc\n+/**\n+ * Wrapper that contains parsed information of kotlin class file.\n+ * */\nclass KClassCrossFeatureViewWrapper(\npackageName: String,\nclassName: String,\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/data/KClassWrapper.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/data/KClassWrapper.kt",
"diff": "package ru.surfstudio.android.build.tasks.check_cross_feature_route.data\n-// TODO doc\n+/**\n+ * Wrapper that contains parsed information of kotlin class file.\n+ * */\nopen class KClassWrapper(\nval packageName: String,\nval className: String,\n"
},
{
"change_type": "RENAME",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/verifier/KClassCrossFeatureRouteValidator.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/util/KClassCrossFeatureRouteValidator.kt",
"diff": "-package ru.surfstudio.android.build.tasks.check_cross_feature_route.verifier\n+package ru.surfstudio.android.build.tasks.check_cross_feature_route.util\nimport org.gradle.api.logging.Logger\nimport ru.surfstudio.android.build.tasks.check_cross_feature_route.data.KClassCrossFeatureRouteWrapper\n"
},
{
"change_type": "RENAME",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/parser/KClassParser.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/util/KClassParser.kt",
"diff": "-package ru.surfstudio.android.build.tasks.check_cross_feature_route.parser\n+package ru.surfstudio.android.build.tasks.check_cross_feature_route.util\n+import org.gradle.api.logging.Logger\nimport ru.surfstudio.android.build.tasks.check_cross_feature_route.data.KClassWrapper\nimport ru.surfstudio.android.build.utils.DefaultGradleLogger\nimport ru.surfstudio.android.build.utils.EMPTY_STRING\nimport ru.surfstudio.android.build.utils.GradleLogger\nimport java.io.File\n-// todo doc\n-open class KClassParser : GradleLogger {\n-\n- open protected val logger = DefaultGradleLogger(\"KClassParser\", isDebugEnabled = false)\n-\n- override var tag: String\n- get() = logger.tag\n- set(value) {\n- logger.tag = value\n- }\n-\n- override var isDebugEnabled: Boolean\n- get() = logger.isDebugEnabled\n- set(value) {\n- logger.isDebugEnabled = value\n- }\n-\n- override var isInfoEnabled: Boolean\n- get() = logger.isInfoEnabled\n- set(value) {\n- logger.isInfoEnabled = value\n- }\n-\n- override var isWarningsEnabled: Boolean\n- get() = logger.isWarningsEnabled\n- set(value) {\n- logger.isWarningsEnabled = value\n- }\n-\n- override var isErrorsEnabled: Boolean\n- get() = logger.isErrorsEnabled\n- set(value) {\n- logger.isErrorsEnabled = value\n- }\n-\n- override fun logDebug(message: String) = logger.logDebug(message)\n-\n- override fun logInfo(message: String) = logger.logInfo(message)\n-\n- override fun logWarning(message: String) = logger.logWarning(message)\n-\n- override fun logError(message: String) = logger.logError(message)\n+/**\n+ * Kotlin class file parser.\n+ *\n+ * @param logger entity to log messages in to.\n+ * */\n+open class KClassParser(protected val logger: Logger) {\nopen fun parse(file: File): KClassWrapper? {\nval fileContent = file.readText()\n@@ -73,24 +38,50 @@ open class KClassParser : GradleLogger {\nwhen (result) {\nnull -> {\n- \"------------------------------\".logd()\n- \"file: ${file.absolutePath}\".logd()\n- \"UNABLE TO PARSE FILE\".logd()\n+ logger.debug(\"------------------------------\")\n+ logger.debug(\"UNABLE TO PARSE FILE: ${file.absolutePath}\")\n}\nelse -> {\n- \"------------------------------\".logd()\n- \"file: ${file.absolutePath}\".logd()\n- \"className: $className\".logd()\n- \"baseClassName: $baseClassName\".logd()\n- \"implements: ${implementations.joinToString(\", \")}\".logd()\n- \"classPackageName: $packageName\".logd()\n- \"baseClassPackageName: $baseClassPackageName\".logd()\n+ logger.debug(\"------------------------------\")\n+ logger.debug(\"file: ${file.absolutePath}\")\n+ logger.debug(\"className: $className\")\n+ logger.debug(\"baseClassName: $baseClassName\")\n+ logger.debug(\"implements: ${implementations.joinToString(\", \")}\")\n+ logger.debug(\"classPackageName: $packageName\")\n+ logger.debug(\"baseClassPackageName: $baseClassPackageName\")\n}\n}\nreturn result\n}\n+ private fun parsePackageName(target: String): String {\n+ return target.substringSafe(findPackageNameRange(target))\n+ }\n+\n+ private fun parseClassName(target: String): String {\n+ return target.substringSafe(findClassNameRange(target))\n+ }\n+\n+ private fun parseImplementations(target: String): List<String> {\n+ return target.substringSafe(findImplementationsRange(target))\n+ .split(',')\n+ .map { it.trim() }\n+ }\n+\n+ private fun parseBaseClassName(target: String): String {\n+ return target.substringSafe(findBaseClassNameRange(target))\n+ }\n+\n+ private fun parseBaseClassPackageName(target: String): String {\n+ val baseClassName = parseBaseClassName(target)\n+ return target.substringSafe(findBaseClassPackageNameRange(target, baseClassName))\n+ }\n+\n+ private fun parseClassBody(target: String): String {\n+ return target.substringSafe(findClassBodyRange(target))\n+ }\n+\nprotected fun findPackageNameRange(target: String): IntRange {\nval packageNameStart = target.indexAfter(\"package \")\nval packageNameSlice = target.substringSafe(packageNameStart..target.lastIndex)\n@@ -181,31 +172,4 @@ open class KClassParser : GradleLogger {\nval index = indexOf(target)\nreturn if (index >= 0) index - 1 else index\n}\n-\n- private fun parsePackageName(target: String): String {\n- return target.substringSafe(findPackageNameRange(target))\n- }\n-\n- private fun parseClassName(target: String): String {\n- return target.substringSafe(findClassNameRange(target))\n- }\n-\n- private fun parseImplementations(target: String): List<String> {\n- return target.substringSafe(findImplementationsRange(target))\n- .split(',')\n- .map { it.trim() }\n- }\n-\n- private fun parseBaseClassName(target: String): String {\n- return target.substringSafe(findBaseClassNameRange(target))\n- }\n-\n- private fun parseBaseClassPackageName(target: String): String {\n- val baseClassName = parseBaseClassName(target)\n- return target.substringSafe(findBaseClassPackageNameRange(target, baseClassName))\n- }\n-\n- private fun parseClassBody(target: String): String {\n- return target.substringSafe(findClassBodyRange(target))\n- }\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-915 Refactoring and documentation. Gradle task now runs after build (need tests) |
652,300 | 13.04.2020 18:41:45 | -14,400 | 443951b2ce9a0a09229be6658326da9527d0e488 | Added skip task flag | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/ValidateCrossFeatureRoutesTask.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/ValidateCrossFeatureRoutesTask.kt",
"diff": "@@ -8,16 +8,13 @@ import ru.surfstudio.android.build.tasks.check_cross_feature_route.util.KClassCr\nimport ru.surfstudio.android.build.tasks.check_cross_feature_route.util.KClassCrossFeatureRouteValidator\nimport ru.surfstudio.android.build.tasks.check_cross_feature_route.util.KClassCrossFeatureViewParser\nimport java.io.File\n+import kotlin.time.ExperimentalTime\n+import kotlin.time.measureTime\n/**\n* Task validate's all of CrossFeatureRoute's in project.\n- *\n- * @param skipValidation skip validation of routes and return immediately.\n- * @param ignoredFileNames list of file names which gonna be ignored on project scan.\n* */\nopen class ValidateCrossFeatureRoutesTask : DefaultTask() {\n- val shouldSkipValidation: Boolean = false\n- val ignoredFileNames: List<String> = listOf(\"build\")\n/**\n* Result of the directory scanning.\n@@ -27,16 +24,38 @@ open class ValidateCrossFeatureRoutesTask : DefaultTask() {\n* */\nprivate data class DirectoryScanResult(val routes: List<File>, val views: List<File>)\n+ /**\n+ * Flag: true -> skip validation of routes and return immediately.\n+ * */\n+ var shouldSkipValidation: Boolean = false\n+\n+ /**\n+ * List of file names which gonna be ignored on project scan.\n+ * */\n+ var ignoredFileNames: List<String> = listOf(\"build\")\n+\n+ /**\n+ * Flag: true -> time taken by this task gonna be logged in after routes verification.\n+ * */\n+ var shouldMeasurePerformanceImpact: Boolean = true\n+\n/**\n* Validate all of CrossFeatureRoute's in project.\n* */\n+ @ExperimentalTime\n@TaskAction\n- fun check() {\n- if (shouldSkipValidation) {\n- logger.warn(\"Validation of CrossFeatureRoutes disabled.\")\n- return\n+ fun validate() {\n+ when {\n+ shouldSkipValidation -> logger.warn(\"Validation of CrossFeatureRoutes disabled.\")\n+ shouldMeasurePerformanceImpact -> {\n+ val timeTaken = measureTime { validateInternal() }\n+ logger.lifecycle(\"Time taken: ${timeTaken.inSeconds}\")\n+ }\n+ else -> validateInternal()\n+ }\n}\n+ private fun validateInternal() {\nlogger.lifecycle(\"Validating CrossFeatureRoute's...\")\nval directoryScanResult = scanDirectory(project.rootDir)\nval routeParser = KClassCrossFeatureRouteParser(logger)\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-915 Added skip task flag |
652,300 | 13.04.2020 19:00:15 | -14,400 | 83f6b46e5a4939828e49cf2ecd6da6b6d273d375 | added measure time flag | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/ValidateCrossFeatureRoutesTask.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/ValidateCrossFeatureRoutesTask.kt",
"diff": "@@ -35,9 +35,9 @@ open class ValidateCrossFeatureRoutesTask : DefaultTask() {\nvar ignoredFileNames: List<String> = listOf(\"build\")\n/**\n- * Flag: true -> time taken by this task gonna be logged in after routes verification.\n+ * Flag: true -> time taken by this task gonna be logged-in after verification.\n* */\n- var shouldMeasurePerformanceImpact: Boolean = true\n+ var shouldMeasureTime: Boolean = true\n/**\n* Validate all of CrossFeatureRoute's in project.\n@@ -47,7 +47,7 @@ open class ValidateCrossFeatureRoutesTask : DefaultTask() {\nfun validate() {\nwhen {\nshouldSkipValidation -> logger.warn(\"Validation of CrossFeatureRoutes disabled.\")\n- shouldMeasurePerformanceImpact -> {\n+ shouldMeasureTime -> {\nval timeTaken = measureTime { validateInternal() }\nlogger.lifecycle(\"Time taken: ${timeTaken.inSeconds}\")\n}\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-915 added measure time flag |
652,300 | 13.04.2020 19:40:20 | -14,400 | 3a6f822dea0fb78b9b348e78177ab8e485332088 | Removed measureTime task-flag | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/ValidateCrossFeatureRoutesTask.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/ValidateCrossFeatureRoutesTask.kt",
"diff": "@@ -8,8 +8,6 @@ import ru.surfstudio.android.build.tasks.check_cross_feature_route.util.KClassCr\nimport ru.surfstudio.android.build.tasks.check_cross_feature_route.util.KClassCrossFeatureRouteValidator\nimport ru.surfstudio.android.build.tasks.check_cross_feature_route.util.KClassCrossFeatureViewParser\nimport java.io.File\n-import kotlin.time.ExperimentalTime\n-import kotlin.time.measureTime\n/**\n* Task validate's all of CrossFeatureRoute's in project.\n@@ -34,28 +32,16 @@ open class ValidateCrossFeatureRoutesTask : DefaultTask() {\n* */\nvar ignoredFileNames: List<String> = listOf(\"build\")\n- /**\n- * Flag: true -> time taken by this task gonna be logged-in after verification.\n- * */\n- var shouldMeasureTime: Boolean = true\n-\n/**\n* Validate all of CrossFeatureRoute's in project.\n* */\n- @ExperimentalTime\n@TaskAction\nfun validate() {\n- when {\n- shouldSkipValidation -> logger.warn(\"Validation of CrossFeatureRoutes disabled.\")\n- shouldMeasureTime -> {\n- val timeTaken = measureTime { validateInternal() }\n- logger.lifecycle(\"Time taken: ${timeTaken.inSeconds}\")\n- }\n- else -> validateInternal()\n- }\n+ if (shouldSkipValidation) {\n+ logger.warn(\"Validation of CrossFeatureRoutes disabled.\")\n+ return\n}\n- private fun validateInternal() {\nlogger.lifecycle(\"Validating CrossFeatureRoute's...\")\nval directoryScanResult = scanDirectory(project.rootDir)\nval routeParser = KClassCrossFeatureRouteParser(logger)\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-915 Removed measureTime task-flag |
652,312 | 13.04.2020 16:04:00 | -10,800 | 4897b796fa20c9cd7c593e8ec29a58b332b4efce | Add changes for mirror merge commit | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/MirrorManager.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/MirrorManager.kt",
"diff": "@@ -164,7 +164,7 @@ class MirrorManager(\n}\n/**\n- * handles checkout right branch for new commit\n+ * handles checkout right branch for a new commit\n*\n* @param commit commit\n*/\n@@ -187,27 +187,36 @@ class MirrorManager(\n* and merging them.\n* In case of conflicts just copies file from standard repository to mirror repository\n*\n- * todo in case if mirror repo contains unique commits, its content must not be overridden\n- *\n* @param commit commit to apply\n*/\nprivate fun merge(commit: CommitWithBranch): RevCommit? {\n+ val changes = standardRepository.getChanges(commit.commit).filter(::shouldMirror)\n+ if (changes.isEmpty()) return null\n+\nstandardRepository.reset(commit.commit)\nval mainBranch = commit.branch\nval secondBranch = gitTree.getMergeParents(commit)\n.map(CommitWithBranch::branch)\n.firstOrNull { it != mainBranch }\n- ?: return null\n-\n- if (!mirrorRepository.isBranchExists(mainBranch) || !mirrorRepository.isBranchExists(secondBranch)) return null\n+ if (secondBranch != null &&\n+ mirrorRepository.isBranchExists(mainBranch) &&\n+ mirrorRepository.isBranchExists(secondBranch)\n+ ) {\n+ // perform a merge commit if two branches exist\nmirrorRepository.checkoutBranch(mainBranch)\nval conflicts = mirrorRepository.merge(secondBranch)\n+ // todo in case if mirror repo contains unique commits, its content must not be overridden\nconflicts.forEach {\nval filePath = it.replaceFirst(\"${mirrorRepository.repositoryPath.path}/\", EMPTY_STRING)\ndiffManager.modify(filePath)\n}\n+ } else {\n+ // perform a single commit with its changes otherwise\n+ checkoutMirrorBranchForCommit(commit)\n+ applyChanges(changes)\n+ }\nmirrorRepository.add()\nval newCommit = mirrorRepository.commit(commit.commit)\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "command.sh",
"diff": "+COMMIT_HASH=4da918a98ddfa97e5a0d796233309c5fc51b6ad0\n+./gradlew deployToMirror -Pcomponent=core-ui -Pcommit=$COMMIT_HASH -PmirrorDir=_mirror -PdepthLimit=100 -PsearchLimit=100 -PmirrorUrl=https://github.com/surfstudio/Core-ui\n"
},
{
"change_type": "MODIFY",
"old_path": "core-ui.sh",
"new_path": "core-ui.sh",
"diff": "-COMMIT_HASH=e6f6bea373f7a577cb8c71feafc21b2f4db74e94\n+COMMIT_HASH=d608b6693d47f3bbc8110cdbc8954343e5311821\nrm -rf _mirror temp\ngit clone https://github.com/surfstudio/Core-ui _mirror\ngit clone --single-branch --branch dev/G-0.5.0 https://gitlab.com/surfstudio/projects/standard/android-standard temp\n"
},
{
"change_type": "MODIFY",
"old_path": "easyadapter.sh",
"new_path": "easyadapter.sh",
"diff": "-COMMIT_HASH=e6f6bea373f7a577cb8c71feafc21b2f4db74e94 # 87\n+COMMIT_HASH=d608b6693d47f3bbc8110cdbc8954343e5311821 # 103\nrm -rf _mirror temp\ngit clone https://github.com/surfstudio/EasyAdapter _mirror\ngit clone --single-branch --branch dev/G-0.5.0 https://gitlab.com/surfstudio/projects/standard/android-standard temp\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-978 Add changes for mirror merge commit |
652,300 | 14.04.2020 11:33:11 | -14,400 | 2b4bd53874a2cf403384151a59a53dfd2c671b02 | Package name changed | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/buildTasks.gradle",
"new_path": "buildSrc/buildTasks.gradle",
"diff": "import ru.surfstudio.android.build.Components\nimport ru.surfstudio.android.build.tasks.*\n-import ru.surfstudio.android.build.tasks.check_cross_feature_route.*\n+import ru.surfstudio.android.build.tasks.validate_cross_feature_routes.*\nimport ru.surfstudio.android.build.tasks.artifactory_tasks.*\nimport ru.surfstudio.android.build.tasks.bintray_tasks.*\nimport ru.surfstudio.android.build.tasks.bintray_tasks.release.*\n"
},
{
"change_type": "RENAME",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/ValidateCrossFeatureRoutesTask.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/validate_cross_feature_routes/ValidateCrossFeatureRoutesTask.kt",
"diff": "-package ru.surfstudio.android.build.tasks.check_cross_feature_route\n+package ru.surfstudio.android.build.tasks.validate_cross_feature_routes\nimport org.gradle.api.DefaultTask\nimport org.gradle.api.tasks.TaskAction\n-import ru.surfstudio.android.build.tasks.check_cross_feature_route.data.KClassCrossFeatureRouteWrapper\n-import ru.surfstudio.android.build.tasks.check_cross_feature_route.data.KClassCrossFeatureViewWrapper\n-import ru.surfstudio.android.build.tasks.check_cross_feature_route.util.KClassCrossFeatureRouteParser\n-import ru.surfstudio.android.build.tasks.check_cross_feature_route.util.KClassCrossFeatureRouteValidator\n-import ru.surfstudio.android.build.tasks.check_cross_feature_route.util.KClassCrossFeatureViewParser\n+import ru.surfstudio.android.build.tasks.validate_cross_feature_routes.data.KClassCrossFeatureRouteWrapper\n+import ru.surfstudio.android.build.tasks.validate_cross_feature_routes.data.KClassCrossFeatureViewWrapper\n+import ru.surfstudio.android.build.tasks.validate_cross_feature_routes.util.KClassCrossFeatureRouteParser\n+import ru.surfstudio.android.build.tasks.validate_cross_feature_routes.util.KClassCrossFeatureRouteValidator\n+import ru.surfstudio.android.build.tasks.validate_cross_feature_routes.util.KClassCrossFeatureViewParser\nimport java.io.File\n/**\n"
},
{
"change_type": "RENAME",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/data/KClassCrossFeatureRouteWrapper.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/validate_cross_feature_routes/data/KClassCrossFeatureRouteWrapper.kt",
"diff": "-package ru.surfstudio.android.build.tasks.check_cross_feature_route.data\n+package ru.surfstudio.android.build.tasks.validate_cross_feature_routes.data\n/**\n* Wrapper that contains parsed information of kotlin class file.\n"
},
{
"change_type": "RENAME",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/data/KClassCrossFeatureViewWrapper.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/validate_cross_feature_routes/data/KClassCrossFeatureViewWrapper.kt",
"diff": "-package ru.surfstudio.android.build.tasks.check_cross_feature_route.data\n+package ru.surfstudio.android.build.tasks.validate_cross_feature_routes.data\n/**\n* Wrapper that contains parsed information of kotlin class file.\n"
},
{
"change_type": "RENAME",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/data/KClassWrapper.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/validate_cross_feature_routes/data/KClassWrapper.kt",
"diff": "-package ru.surfstudio.android.build.tasks.check_cross_feature_route.data\n+package ru.surfstudio.android.build.tasks.validate_cross_feature_routes.data\n/**\n* Wrapper that contains parsed information of kotlin class file.\n"
},
{
"change_type": "RENAME",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/util/KClassCrossFeatureRouteParser.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/validate_cross_feature_routes/util/KClassCrossFeatureRouteParser.kt",
"diff": "-package ru.surfstudio.android.build.tasks.check_cross_feature_route.util\n+package ru.surfstudio.android.build.tasks.validate_cross_feature_routes.util\nimport org.gradle.api.logging.Logger\n-import ru.surfstudio.android.build.tasks.check_cross_feature_route.data.KClassCrossFeatureRouteWrapper\n-import ru.surfstudio.android.build.tasks.check_cross_feature_route.data.KClassWrapper\n+import ru.surfstudio.android.build.tasks.validate_cross_feature_routes.data.KClassCrossFeatureRouteWrapper\n+import ru.surfstudio.android.build.tasks.validate_cross_feature_routes.data.KClassWrapper\nimport java.io.File\n/**\n"
},
{
"change_type": "RENAME",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/util/KClassCrossFeatureRouteValidator.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/validate_cross_feature_routes/util/KClassCrossFeatureRouteValidator.kt",
"diff": "-package ru.surfstudio.android.build.tasks.check_cross_feature_route.util\n+package ru.surfstudio.android.build.tasks.validate_cross_feature_routes.util\nimport org.gradle.api.logging.Logger\n-import ru.surfstudio.android.build.tasks.check_cross_feature_route.data.KClassCrossFeatureRouteWrapper\n-import ru.surfstudio.android.build.tasks.check_cross_feature_route.data.KClassCrossFeatureViewWrapper\n+import ru.surfstudio.android.build.tasks.validate_cross_feature_routes.data.KClassCrossFeatureRouteWrapper\n+import ru.surfstudio.android.build.tasks.validate_cross_feature_routes.data.KClassCrossFeatureViewWrapper\n/**\n* Validate's CrossFeatureRoute by following steps:\n"
},
{
"change_type": "RENAME",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/util/KClassCrossFeatureViewParser.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/validate_cross_feature_routes/util/KClassCrossFeatureViewParser.kt",
"diff": "-package ru.surfstudio.android.build.tasks.check_cross_feature_route.util\n+package ru.surfstudio.android.build.tasks.validate_cross_feature_routes.util\nimport org.gradle.api.logging.Logger\n-import ru.surfstudio.android.build.tasks.check_cross_feature_route.data.KClassCrossFeatureViewWrapper\n-import ru.surfstudio.android.build.tasks.check_cross_feature_route.data.KClassWrapper\n+import ru.surfstudio.android.build.tasks.validate_cross_feature_routes.data.KClassCrossFeatureViewWrapper\n+import ru.surfstudio.android.build.tasks.validate_cross_feature_routes.data.KClassWrapper\nimport java.io.File\n/**\n"
},
{
"change_type": "RENAME",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_cross_feature_route/util/KClassParser.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/validate_cross_feature_routes/util/KClassParser.kt",
"diff": "-package ru.surfstudio.android.build.tasks.check_cross_feature_route.util\n+package ru.surfstudio.android.build.tasks.validate_cross_feature_routes.util\nimport org.gradle.api.logging.Logger\n-import ru.surfstudio.android.build.tasks.check_cross_feature_route.data.KClassWrapper\n+import ru.surfstudio.android.build.tasks.validate_cross_feature_routes.data.KClassWrapper\nimport ru.surfstudio.android.build.utils.EMPTY_STRING\nimport java.io.File\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-915 Package name changed |
652,328 | 14.04.2020 12:00:51 | 0 | a4c3778057c5bda65906bd15ba9ddabd8a448975 | Edit regexpFilterExpression | [
{
"change_type": "MODIFY",
"old_path": "ci-internal/ProjectSnapshotDeployJobJenkinsfile.groovy",
"new_path": "ci-internal/ProjectSnapshotDeployJobJenkinsfile.groovy",
"diff": "@@ -293,7 +293,7 @@ def static initTriggers(script) {\nprintContributedVariables: true,\nprintPostContent: true,\ncauseString: 'Triggered by Gitlab',\n- regexpFilterExpression: '^(origin\\/)?refs\\/heads\\project-snapshot\\/(.*)$',\n+ regexpFilterExpression: '^(origin\\\\/)?refs\\\\/heads\\\\/project-snapshot\\\\/(.*)$',\nregexpFilterText: '$branchName'\n),\nscript.pollSCM('')\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Edit regexpFilterExpression |
652,300 | 14.04.2020 16:24:59 | -14,400 | 97e4fa45383b3974dcc50b39319d6ea7ac809460 | Task tested on rendezvous and unicredit app, works fine | [
{
"change_type": "MODIFY",
"old_path": "template/validateCrossFeatureRoutes.gradle.kts",
"new_path": "template/validateCrossFeatureRoutes.gradle.kts",
"diff": "@@ -21,6 +21,12 @@ tasks.whenTaskAdded {\n* Task performs `CrossFeatureRoute's` validation. Check's following conditions:\n* 1. `CrossFeatureRoute` have valid `targetClassPath`?;\n* 2. Target view (`Fragment` or `Dialog`) of `CrossFeatureRoute` implements `CrossFeatureFragment` interface?;\n+ *\n+ * ## You can setup this task by modifying these fields:\n+ * * [shouldSkipValidation];\n+ * * [ignoredDirectories];\n+ * * [routeFilterCondition];\n+ * * [viewFilterCondition].\n* */\nopen class ValidateCrossFeatureRoutesTask : DefaultTask() {\n@@ -110,13 +116,16 @@ private class ProjectFileTreeScanner {\nprivate open class KClassParser(protected val logger: Logger? = null) {\nopen fun parse(file: File): KClassWrapper? {\n- logger?.debug(\"------------------------------\")\n- logger?.debug(\"Parsing file: ${file.absolutePath}\")\n+ logger?.info(\"------------------------------\")\n+ logger?.info(\"Parsing file: ${file.absolutePath}\")\nval fileContent = file.readText()\nval packageName = parsePackageName(fileContent)\nval className = parseClassName(fileContent)\nval baseClassName = parseBaseClassName(fileContent)\n- val baseClassPackageName = parseBaseClassPackageName(fileContent)\n+ val baseClassPackageName = parseBaseClassPackageName(fileContent).let {\n+ // if we can't find packageName of baseClass - fallback to current packageName\n+ if (it.isBlank()) packageName else it\n+ }\nval implementations = parseImplementations(fileContent)\nval classBody = parseClassBody(fileContent)\n@@ -136,15 +145,15 @@ private open class KClassParser(protected val logger: Logger? = null) {\nwhen (result) {\nnull -> {\n- logger?.debug(\"Parsing failed.\")\n+ logger?.info(\"Parsing failed.\")\n}\nelse -> {\n- logger?.debug(\"Parsing succeed. Additional info:\")\n- logger?.debug(\"className: $className\")\n- logger?.debug(\"baseClassName: $baseClassName\")\n- logger?.debug(\"implements: ${implementations.joinToString(\", \")}\")\n- logger?.debug(\"classPackageName: $packageName\")\n- logger?.debug(\"baseClassPackageName: $baseClassPackageName\")\n+ logger?.info(\"Parsing succeed. Additional info:\")\n+ logger?.info(\"className: $className\")\n+ logger?.info(\"baseClassName: $baseClassName\")\n+ logger?.info(\"implements: ${implementations.joinToString(\", \")}\")\n+ logger?.info(\"classPackageName: $packageName\")\n+ logger?.info(\"baseClassPackageName: $baseClassPackageName\")\n}\n}\n@@ -380,21 +389,21 @@ private class CrossFeatureRouteValidator(\nerror(\"$routeTargetView is not implements CrossFeatureFragment for $route\")\n}\n- logger?.info(\"Verified: $route\")\n+ logger?.info(\"Validated: $route\")\n}\nprivate fun checkIsImplementsCrossFeature(view: CrossFeatureViewFile): Boolean {\nreturn when {\nview.isImplementsCrossFeature -> true\nelse -> {\n- val routeTargetParent = findViewClass(view.baseClassName, view.baseClassPackageName)\n- routeTargetParent?.let(::checkIsImplementsCrossFeature) ?: false\n+ val baseClass = findViewClass(view.baseClassPackageName, view.baseClassName)\n+ baseClass?.let(::checkIsImplementsCrossFeature) ?: false\n}\n}\n}\nprivate fun findViewClass(packageName: String, className: String): CrossFeatureViewFile? {\n- return views.find { it.className == className && it.packageName == packageName }\n+ return views.find { it.packageName == packageName && it.className == className }\n}\n}\n@@ -402,9 +411,6 @@ private class CrossFeatureRouteValidator(\n//region data\n-/**\n- * Wrapper that contains parsed information of kotlin class file.\n- * */\nprivate open class KClassWrapper(\nval packageName: String,\nval className: String,\n@@ -457,7 +463,10 @@ private class CrossFeatureRouteFile(\nval targetClassPackageName: String = targetClassPath.substringBeforeLast('.')\noverride fun toString(): String {\n- return \"${super.toString()} (target = $targetClassPath)\"\n+ return when {\n+ targetClassPath.isBlank() -> super.toString()\n+ else -> \"${super.toString()} (target = $targetClassPath)\"\n+ }\n}\n}\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-915 Task tested on rendezvous and unicredit app, works fine |
652,300 | 14.04.2020 18:03:07 | -14,400 | b960b382799442bd56d1614eebf425175dcd112c | Added tests, fixed sample possible exception | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "mvi/lib-mvi-mapper/src/test/java/ru/surfstudio/android/core/mvi/ui/mapper/RequestMapperTest.kt",
"diff": "+package ru.surfstudio.android.core.mvi.ui.mapper\n+\n+import org.junit.Test\n+import ru.surfstudio.android.core.mvp.binding.rx.request.Request\n+import ru.surfstudio.android.core.mvp.binding.rx.request.data.RequestUi\n+import ru.surfstudio.android.core.mvp.binding.rx.request.data.SimpleLoading\n+\n+class RequestMapperTest {\n+\n+ @Test\n+ fun emptyMapping() {\n+ val request = Request.Success(\"test\")\n+ val requestUi = RequestUi<String>()\n+ val newRequestUi = RequestMapper.builder(request, requestUi).build()\n+ assert(!newRequestUi.hasData)\n+ assert(!newRequestUi.hasError)\n+ assert(!newRequestUi.isLoading)\n+ }\n+\n+ @Test\n+ fun simpleMapping() {\n+ run { // no data at all, loading\n+ val request = Request.Loading<String>()\n+ val requestUi = RequestUi<String>()\n+ val newRequestUi = RequestMapper.builder(request, requestUi)\n+ .mapData(simpleDataMapper())\n+ .mapLoading(simpleLoadingMapper())\n+ .build()\n+\n+ assert(!newRequestUi.hasData)\n+ assert(newRequestUi.isLoading)\n+ }\n+\n+ run { // request success, no local data\n+ val request = Request.Success(\"newData\")\n+ val requestUi = RequestUi<String>()\n+ val newRequestUi = RequestMapper.builder(request, requestUi)\n+ .mapData(simpleDataMapper())\n+ .mapLoading(simpleLoadingMapper())\n+ .build()\n+\n+ assert(newRequestUi.data == \"newData\")\n+ assert(!newRequestUi.isLoading)\n+ }\n+\n+ run { // request success, local data exist\n+ val request = Request.Success(\"newData\")\n+ val requestUi = RequestUi<String>(\"oldData\")\n+ val newRequestUi = RequestMapper.builder(request, requestUi)\n+ .mapData(simpleDataMapper())\n+ .mapLoading(simpleLoadingMapper())\n+ .build()\n+\n+ assert(newRequestUi.data == \"newData\")\n+ assert(!newRequestUi.isLoading)\n+ }\n+\n+ run { // request failed, local data exist\n+ val request = Request.Error<String>(NoSuchElementException())\n+ val requestUi = RequestUi<String>(\"oldData\")\n+ val newRequestUi = RequestMapper.builder(request, requestUi)\n+ .mapData(simpleDataMapper())\n+ .mapLoading(simpleLoadingMapper())\n+ .build()\n+\n+ assert(newRequestUi.data == \"oldData\")\n+ assert(!newRequestUi.isLoading)\n+ }\n+ }\n+\n+ @Test\n+ fun errorHandling() {\n+ var isErrorHandled = false\n+ val request = Request.Error<String>(NoSuchElementException())\n+ val requestUi = RequestUi<String>(\"oldData\")\n+ val newRequestUi = RequestMapper.builder(request, requestUi)\n+ .mapData(simpleDataMapper())\n+ .handleError { error, _, _ ->\n+ isErrorHandled = error is NoSuchElementException\n+ true\n+ }\n+ .build()\n+\n+ assert(newRequestUi.data == \"oldData\")\n+ assert(!newRequestUi.isLoading)\n+ assert(newRequestUi.error is NoSuchElementException)\n+ assert(isErrorHandled)\n+ }\n+\n+ @Test\n+ fun requestTypeTransformation() {\n+ run { // string to int transformation\n+ val request = Request.Success<String>(\"123\")\n+ val requestUi = RequestUi<Int>(456)\n+ val newRequestUi = RequestMapper.builder(request, requestUi)\n+ .mapRequest { data -> data.toIntOrNull() ?: 0 }\n+ .mapData(simpleDataMapper())\n+ .mapLoading(simpleLoadingMapper())\n+ .build()\n+\n+ assert(newRequestUi.data == 123)\n+ assert(!newRequestUi.isLoading)\n+ }\n+\n+ run { // list of strings to list of ints transformation\n+ val request = Request.Success<List<String>>(listOf(\"1\", \"2\", \"3\"))\n+ val requestUi = RequestUi<List<Int>>()\n+ val newRequestUi = RequestMapper.builder(request, requestUi)\n+ .mapRequest { data -> data.map { it.toIntOrNull() ?: 0 } }\n+ .mapData(simpleDataMapper())\n+ .mapLoading(simpleLoadingMapper())\n+ .build()\n+\n+ assert(newRequestUi.data is List<Int>)\n+ assert(newRequestUi.data?.get(0) == 1)\n+ assert(newRequestUi.data?.get(1) == 2)\n+ assert(newRequestUi.data?.get(2) == 3)\n+ assert(!newRequestUi.isLoading)\n+ }\n+ }\n+\n+ private fun <T> simpleDataMapper(): RequestDataMapper<T, T, T> = { request, data ->\n+ request.getDataOrNull() ?: data\n+ }\n+\n+ private fun <T> simpleLoadingMapper(): RequestLoadingMapper<T, T> = { request, _ ->\n+ SimpleLoading(request.isLoading)\n+ }\n+}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-968 Added tests, fixed sample possible exception |
652,316 | 15.04.2020 09:52:26 | -10,800 | ac94ed32f2a88d71d3f91ff943db19976e644439 | Remove view impls, now all navigators are bound to view | [
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/di/supplier/callbacks/ActivityNavigationSupplierCallbacks.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/di/supplier/callbacks/ActivityNavigationSupplierCallbacks.kt",
"diff": "@@ -8,7 +8,7 @@ import androidx.fragment.app.FragmentActivity\nimport ru.surfstudio.android.navigation.di.IdentifiableScreen\nimport ru.surfstudio.android.navigation.di.supplier.holder.ActivityNavigationHolder\nimport ru.surfstudio.android.navigation.di.supplier.FragmentNavigationSupplier\n-import ru.surfstudio.android.navigation.navigator.activity.view.ViewActivityNavigator\n+import ru.surfstudio.android.navigation.navigator.activity.ActivityNavigator\nimport ru.surfstudio.android.navigation.navigator.dialog.DialogNavigator\nimport java.lang.IllegalStateException\n@@ -69,7 +69,7 @@ class ActivityNavigationSupplierCallbacks(\nactivity: Activity,\nnestedNavigationSupplier: FragmentNavigationSupplier?\n) {\n- nestedNavigationSupplier as? FragmentNavigationSupplierCallbacks ?: return\n+ if (nestedNavigationSupplier !is FragmentNavigationSupplierCallbacks) return\nif (activity !is FragmentActivity) return\nval fragmentManager = activity.supportFragmentManager\nfragmentManager.unregisterFragmentLifecycleCallbacks(nestedNavigationSupplier)\n@@ -94,7 +94,7 @@ class ActivityNavigationSupplierCallbacks(\nval nestedNavigationSupplier = nestedCallbacksCreator()\nregisterNestedNavigationSupplier(activity, nestedNavigationSupplier)\n- val activityNavigator = ViewActivityNavigator(activity)\n+ val activityNavigator = ActivityNavigator(activity)\nval dialogNavigator = DialogNavigator(activity)\nreturn ActivityNavigationHolder(activityNavigator, dialogNavigator, nestedNavigationSupplier)\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/di/supplier/callbacks/FragmentNavigationSupplierCallbacks.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/di/supplier/callbacks/FragmentNavigationSupplierCallbacks.kt",
"diff": "@@ -8,8 +8,8 @@ import ru.surfstudio.android.navigation.di.FragmentContainer\nimport ru.surfstudio.android.navigation.di.IdentifiableScreen\nimport ru.surfstudio.android.navigation.di.supplier.holder.FragmentNavigationHolder\nimport ru.surfstudio.android.navigation.di.supplier.FragmentNavigationSupplier\n-import ru.surfstudio.android.navigation.navigator.fragment.tab.view.ViewTabFragmentNavigator\n-import ru.surfstudio.android.navigation.navigator.fragment.view.ViewFragmentNavigator\n+import ru.surfstudio.android.navigation.navigator.fragment.FragmentNavigator\n+import ru.surfstudio.android.navigation.navigator.fragment.tab.TabFragmentNavigator\n//@PerAct\nclass FragmentNavigationSupplierCallbacks : FragmentManager.FragmentLifecycleCallbacks(), FragmentNavigationSupplier {\n@@ -103,8 +103,8 @@ class FragmentNavigationSupplierCallbacks : FragmentManager.FragmentLifecycleCal\nfm: FragmentManager,\nsavedInstanceState: Bundle?\n) {\n- val fragmentNavigator = ViewFragmentNavigator(fm, containerId, savedInstanceState)\n- val tabFragmentNavigator = ViewTabFragmentNavigator(fm, containerId, savedInstanceState)\n+ val fragmentNavigator = FragmentNavigator(fm, containerId, savedInstanceState)\n+ val tabFragmentNavigator = TabFragmentNavigator(fm, containerId, savedInstanceState)\nval newHolder = FragmentNavigationHolder(id, fragmentNavigator, tabFragmentNavigator)\nval levelHolders = navigatorHolders[level] ?: mutableListOf()\nlevelHolders.add(newHolder)\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/navigator/activity/ActivityNavigator.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/navigator/activity/ActivityNavigator.kt",
"diff": "@@ -6,9 +6,7 @@ import ru.surfstudio.android.navigation.animation.Animations\nimport ru.surfstudio.android.navigation.route.activity.ActivityRoute\nimport ru.surfstudio.android.navigation.utils.ActivityAnimationSupplier\n-abstract class ActivityNavigator : ActivityNavigatorInterface {\n-\n- abstract val activity: AppCompatActivity\n+open class ActivityNavigator(val activity: AppCompatActivity) : ActivityNavigatorInterface {\nprotected open val animationSupplier = ActivityAnimationSupplier()\n"
},
{
"change_type": "DELETE",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/navigator/activity/view/ViewActivityNavigator.kt",
"new_path": null,
"diff": "-package ru.surfstudio.android.navigation.navigator.activity.view\n-\n-import androidx.appcompat.app.AppCompatActivity\n-import ru.surfstudio.android.navigation.navigator.activity.ActivityNavigator\n-\n-data class ViewActivityNavigator(override val activity: AppCompatActivity) : ActivityNavigator()\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/navigator/fragment/FragmentNavigator.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/navigator/fragment/FragmentNavigator.kt",
"diff": "@@ -33,11 +33,15 @@ import ru.surfstudio.android.navigation.utils.FragmentAnimationSupplier\n* To save back stack on configuration changes you must call\n* [onSaveState] and [onRestoreState] methods in corresponding lifecycle callbacks of parent screen.\n*/\n-abstract class FragmentNavigator(\n+open class FragmentNavigator(\n+ protected val fragmentManager: FragmentManager,\n+ protected val containerId: Int,\n+ savedState: Bundle? = null\n) : FragmentNavigatorInterface {\n- protected abstract val fragmentManager: FragmentManager\n- protected abstract val containerId: Int\n+ init {\n+ onRestoreState(savedState)\n+ }\nprotected val backStack: FragmentBackStack = FragmentBackStack()\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/navigator/fragment/tab/TabFragmentNavigator.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/navigator/fragment/tab/TabFragmentNavigator.kt",
"diff": "@@ -25,11 +25,15 @@ import ru.surfstudio.android.navigation.route.fragment.FragmentRoute\n*\n* Delegates all the methods of a [FragmentNavigatorInterface] to an active stack.\n*/\n-abstract class TabFragmentNavigator : FragmentNavigatorInterface {\n-\n- protected abstract val fragmentManager: FragmentManager\n- protected abstract val containerId: Int\n+open class TabFragmentNavigator(\n+ protected val fragmentManager: FragmentManager,\n+ protected val containerId: Int,\n+ savedState: Bundle? = null\n+) : FragmentNavigatorInterface {\n+ init {\n+ onRestoreState(savedState)\n+ }\nprivate var activeTabTag: String = \"\"\nprivate val hostEntries: TabHostEntries = TabHostEntries()\n"
},
{
"change_type": "DELETE",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/navigator/fragment/tab/view/ViewTabFragmentNavigator.kt",
"new_path": null,
"diff": "-package ru.surfstudio.android.navigation.navigator.fragment.tab.view\n-\n-import android.os.Bundle\n-import androidx.fragment.app.FragmentActivity\n-import androidx.fragment.app.FragmentManager\n-import ru.surfstudio.android.navigation.navigator.fragment.tab.TabFragmentNavigator\n-\n-class ViewTabFragmentNavigator(\n- override val fragmentManager: FragmentManager,\n- override val containerId: Int,\n- savedState: Bundle? = null\n-) : TabFragmentNavigator() {\n-\n- init {\n- onRestoreState(savedState)\n- }\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/navigator/fragment/view/ViewFragmentNavigator.kt",
"new_path": null,
"diff": "-package ru.surfstudio.android.navigation.navigator.fragment.view\n-\n-import android.os.Bundle\n-import androidx.fragment.app.FragmentManager\n-import ru.surfstudio.android.navigation.navigator.fragment.FragmentNavigator\n-\n-class ViewFragmentNavigator(\n- override val fragmentManager: FragmentManager,\n- override val containerId: Int,\n- savedState: Bundle? = null\n-) : FragmentNavigator() {\n-\n- init {\n- onRestoreState(savedState)\n- }\n-}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-312 Remove view impls, now all navigators are bound to view |
652,300 | 15.04.2020 11:03:52 | -14,400 | 99c3873502ec37452f4e3e8772eee02c6ae0a15e | `mockito-core` version downgraded (`2.28.2 -> 2.8.9`) due to incompatibility with `powermock:1.7.4` | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/config.gradle",
"new_path": "buildSrc/config.gradle",
"diff": "@@ -76,7 +76,7 @@ ext {\n\"com.squareup.retrofit2:adapter-rxjava2\" : \"2.8.1\", //https://vk.cc/7UFxk3\n\"com.squareup.okhttp3:logging-interceptor\" : \"4.4.1\", //https://vk.cc/7UFwTd\n\"junit:junit\" : \"4.13\", //https://goo.gl/hEcfw1\n- \"org.mockito:mockito-core\" : \"2.28.2\", //https://bit.ly/3bw7XGe\n+ \"org.mockito:mockito-core\" : \"2.8.9\", //https://bit.ly/3bw7XGe\n\"org.powermock:powermock-classloading-xstream\" : \"1.7.4\", //https://goo.gl/hEcfw1\n\"org.powermock:powermock-module-junit4\" : \"1.7.4\", //https://goo.gl/hEcfw1\n\"org.powermock:powermock-module-junit4-rule\" : \"1.7.4\", //https://goo.gl/hEcfw1\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-915 `mockito-core` version downgraded (`2.28.2 -> 2.8.9`) due to incompatibility with `powermock:1.7.4` |
652,312 | 15.04.2020 12:00:13 | -10,800 | b11fa91c21a2307129f0b598d1a214f85cb0974c | Important mirror fix: add common component as a local dependency | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/androidSample.gradle",
"new_path": "buildSrc/androidSample.gradle",
"diff": "@@ -33,7 +33,8 @@ android {\n}\ndependencies {\n- DependencyConfigurator.projectImplementation(project, \"sample-dagger\")\n+ implementation project(\":sample-dagger\")\n+\nDependencyConfigurator.projectImplementation(project, \"dagger-scope\")\nDependencyConfigurator.projectImplementation(project, \"rxbus\")\nDependencyConfigurator.projectImplementation(project, \"core-ui\")\n@@ -51,7 +52,7 @@ dependencies {\nDependencyConfigurator.implementation(project, \"androidx.appcompat:appcompat\")\nDependencyConfigurator.implementation(project, \"androidx.constraintlayout:constraintlayout\")\n- DependencyConfigurator.projectAndroidTestImplementation(project, \"sample-common\")\n+ androidTestImplementation project(\":sample-common\")\n}\ntask printTestInstrumentationRunnerName {\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/components.json",
"new_path": "buildSrc/components.json",
"diff": "{\n\"name\": \"activity-holder\",\n\"type\": \"api\"\n- },\n- {\n- \"name\": \"sample-common\",\n- \"type\": \"api\"\n}\n]\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/Components.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/Components.kt",
"diff": "@@ -51,8 +51,14 @@ object Components {\ncomponent.getModules(skipSamplesBuilding)\n}\n} else {\n- val mirrorComponent = getMirrorComponentByName(mirrorComponentName)\n- mirrorComponent.libraries + mirrorComponent.samples\n+ val mirrorComponent = getComponentByName(mirrorComponentName)\n+ val result = mirrorComponent.libraries + mirrorComponent.samples\n+ if (GradlePropertiesManager.hasCommonComponent()) {\n+ val commonComponent = getComponentByName(GradlePropertiesManager.commonComponentNameForMirror)\n+ result + commonComponent.libraries + commonComponent.samples\n+ } else {\n+ result\n+ }\n}\n}\n@@ -162,9 +168,8 @@ object Components {\n}\n}\n- private fun getMirrorComponentByName(mirrorComponentName: String): Component {\n- val mirrorComponent = value.firstOrNull { it.name == mirrorComponentName }\n-\n- return mirrorComponent ?: throw GradleException()\n+ private fun getComponentByName(componentName: String): Component {\n+ return value.firstOrNull { it.name == componentName }\n+ ?: throw GradleException(\"Component name $componentName not found\")\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/GradlePropertiesManager.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/GradlePropertiesManager.kt",
"diff": "@@ -16,6 +16,7 @@ private const val GRADLE_PROPERTIES_FILE_PATH = \"mirror.properties\"\nprivate const val ANDROID_STANDARD_PROPERTIES_FILE_PATH = \"android-standard/androidStandard.properties\"\nprivate const val MIRROR_COMPONENT_NAME = \"surf.mirrorComponentName\"\n+private const val COMMON_COMPONENT_NAME = \"surf.commonComponentName\"\nprivate const val SKIP_SAMPLES_BUILD_PROPERTY_NAME = \"skipSamplesBuild\"\n/**\n@@ -28,20 +29,32 @@ object GradlePropertiesManager {\nvar componentMirrorName: String = EMPTY_STRING\nprivate set\n+ var commonComponentNameForMirror: String = EMPTY_STRING\n+ private set\n+\nvar skipSamplesBuilding: Boolean = false\nprivate set\nfun init() {\nloadMirrorComponentName()\n+ loadCommonComponentNameForMirror()\nloadSkipSamplesBuildProperty()\n}\n/**\n- * check if current component is mirror\n+ * check if the current component is mirror\n+ *\n+ * @return true if mirror\n+ */\n+ fun isCurrentComponentAMirror(): Boolean = componentMirrorName != EMPTY_STRING\n+\n+ /**\n+ * check if the current component has common component as module.\n+ * The function is used only for mirror components.\n*\n* @return true if mirror\n*/\n- fun isCurrentComponentAMirror() = componentMirrorName != EMPTY_STRING\n+ fun hasCommonComponent(): Boolean = commonComponentNameForMirror != EMPTY_STRING\n/**\n* gets component mirror name as property from file [GRADLE_PROPERTIES_FILE_PATH]\n@@ -56,6 +69,15 @@ object GradlePropertiesManager {\n}\n}\n+ private fun loadCommonComponentNameForMirror() {\n+ loadProperty(\n+ propertiesFileName = GRADLE_PROPERTIES_FILE_PATH,\n+ propertyName = COMMON_COMPONENT_NAME\n+ )?.also { propertyValue ->\n+ commonComponentNameForMirror = propertyValue\n+ }\n+ }\n+\nprivate fun loadSkipSamplesBuildProperty() {\nloadProperty(\npropertiesFileName = ANDROID_STANDARD_PROPERTIES_FILE_PATH,\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/Initializator.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/Initializator.kt",
"diff": "@@ -19,6 +19,7 @@ object Initializator {\n@JvmStatic\nfun init(currentBuildDirectory: String) {\ninitConfigProviderWithCurrentDirectory(currentBuildDirectory)\n+ GradlePropertiesManager.init()\nval jsonComponents = JsonHelper.parseComponentsJson(\"$currentBuildDirectory/$COMPONENTS_JSON_FILE_PATH\")\nif (GradlePropertiesManager.isCurrentComponentAMirror()) {\ncheckOnlyMirrorComponentFolder(jsonComponents, currentBuildDirectory)\n@@ -26,7 +27,6 @@ object Initializator {\ncheckAllComponentsFolders(jsonComponents, currentBuildDirectory)\n}\nComponents.init(jsonComponents)\n- GradlePropertiesManager.init()\n}\n/**\n@@ -36,15 +36,37 @@ object Initializator {\nConfigInfoProvider.currentDirectory = \"$currentDirectory/\"\n}\n- private fun checkOnlyMirrorComponentFolder(jsonComponents: List<ComponentJson>, currentDirectory: String) {\n- val componentMirrorName = GradlePropertiesManager.componentMirrorName\n- val component = jsonComponents.firstOrNull { it.id == componentMirrorName }\n- ?: throw ComponentNotFoundException(componentMirrorName)\n- checkComponentFolders(component, currentDirectory)\n+ private fun checkOnlyMirrorComponentFolder(\n+ jsonComponents: List<ComponentJson>,\n+ currentDirectory: String\n+ ) {\n+ checkComponentFolders(\n+ getComponentJson(\n+ GradlePropertiesManager.componentMirrorName,\n+ jsonComponents\n+ ),\n+ currentDirectory\n+ )\n+ if (GradlePropertiesManager.hasCommonComponent()) {\n+ checkComponentFolders(\n+ getComponentJson(\n+ GradlePropertiesManager.commonComponentNameForMirror,\n+ jsonComponents\n+ ),\n+ currentDirectory\n+ )\n}\n+ }\n+\n+ private fun getComponentJson(\n+ componentName: String,\n+ jsonComponents: List<ComponentJson>\n+ ): ComponentJson =\n+ jsonComponents.firstOrNull { it.id == componentName }\n+ ?: throw ComponentNotFoundException(componentName)\n/**\n- * Check value directories for exist\n+ * Check value directories for existance\n*/\nprivate fun checkAllComponentsFolders(componentJsons: List<ComponentJson>, currentDirectory: String) {\ncomponentJsons.forEach { component ->\n"
},
{
"change_type": "MODIFY",
"old_path": "common/lib-sample-dagger/build.gradle",
"new_path": "common/lib-sample-dagger/build.gradle",
"diff": "@@ -6,3 +6,7 @@ android {\nmultiDexEnabled true\n}\n}\n+\n+dependencies {\n+ api project(\":sample-common\")\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "easyadapter.sh",
"new_path": "easyadapter.sh",
"diff": "-COMMIT_HASH=d608b6693d47f3bbc8110cdbc8954343e5311821 # 103\n+COMMIT_HASH=59d7af1376db6e4f37f5bfd2a3139bd3b0730421 # fuckin last\nrm -rf _mirror temp\ngit clone https://github.com/surfstudio/EasyAdapter _mirror\ngit clone --single-branch --branch dev/G-0.5.0 https://gitlab.com/surfstudio/projects/standard/android-standard temp\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-978 Important mirror fix: add common component as a local dependency |
652,335 | 15.04.2020 12:49:57 | -10,800 | 148f1b56aebb6a4a1c517298970dd68d5bd9cf46 | Increase global alpha version counter to 111 [skip ci] [version] | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/projectConfiguration.json",
"new_path": "buildSrc/projectConfiguration.json",
"diff": "{\n\"version\": \"0.5.0\",\n\"stable\": false,\n- \"unstable_version\": 110,\n+ \"unstable_version\": 111,\n\"project_snapshot_name\": \"\",\n\"project_snapshot_version\": 0\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Increase global alpha version counter to 111 [skip ci] [version] |
652,335 | 15.04.2020 14:24:59 | -10,800 | 64e2d1934b340d552e9e51b3b8af189a021d1a2a | Increase global alpha version counter to 112 [skip ci] [version] | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/components.json",
"new_path": "buildSrc/components.json",
"diff": "{\n\"id\": \"common\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 3,\n\"stable\": false,\n\"dir\": \"common\",\n\"libs\": [\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/projectConfiguration.json",
"new_path": "buildSrc/projectConfiguration.json",
"diff": "{\n\"version\": \"0.5.0\",\n\"stable\": false,\n- \"unstable_version\": 111,\n+ \"unstable_version\": 112,\n\"project_snapshot_name\": \"\",\n\"project_snapshot_version\": 0\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Increase global alpha version counter to 112 [skip ci] [version] |
652,312 | 15.04.2020 16:13:48 | -10,800 | aad89afcc8611111c9f29e010a594402b7dc0156 | Debug code and small fixes | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "assemble.sh",
"diff": "+cd _mirror && chmod +x gradlew && ./gradlew clean assemble && cd ..\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/MirrorManager.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/MirrorManager.kt",
"diff": "@@ -44,7 +44,8 @@ class MirrorManager(\nprivate val foldersToMirror = listOf(\ncomponentDirectory,\n\"buildSrc\",\n- \"common\"\n+ \"common\",\n+ \"gradle\"\n)\nprivate var latestMirrorCommit: RevCommit? = null\n@@ -77,15 +78,16 @@ class MirrorManager(\nlatestMirrorCommit = mirrorCommits.maxBy { it.commitTime }\nlatestMirrorCommit?.also { safeLatestMirrorCommit ->\n+ /*\nif (safeLatestMirrorCommit.commitTime > rootCommit.commitTime) {\nthrow GradleException(\"Invalid mirror commit $rootCommitHash: \" +\n\"can't be earlier than latest mirror commit ${safeLatestMirrorCommit.standardHash}\")\n- }\n+ }*/\ngitTree.buildGitTree(rootCommit, standardCommits, mirrorCommits)\napplyGitTreeToMirror()\nsetBranches()\n- mirrorRepository.push()\n+ //mirrorRepository.push()\nreturn\n}\nthrow GradleException(\"Can't get latest commit in branch $mainBranchFullName \" +\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "clean.sh",
"diff": "+rm -rf _mirror temp\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "core-ui.sh",
"diff": "+COMMIT_HASH=64e2d1934b340d552e9e51b3b8af189a021d1a2a\n+rm -rf _mirror temp\n+git clone https://github.com/surfstudio/Core-ui _mirror\n+git clone --single-branch --branch dev/G-0.5.0 https://gitlab.com/surfstudio/projects/standard/android-standard temp\n+./gradlew deployToMirror -Pcomponent=core-ui -Pcommit=$COMMIT_HASH -PmirrorDir=_mirror -PdepthLimit=100 -PsearchLimit=100 -PmirrorUrl=https://github.com/surfstudio/Core-ui\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "easyadapter.sh",
"diff": "+COMMIT_HASH=64e2d1934b340d552e9e51b3b8af189a021d1a2a # 112\n+rm -rf _mirror temp\n+git clone https://github.com/surfstudio/EasyAdapter _mirror\n+git clone --single-branch --branch dev/G-0.5.0 https://gitlab.com/surfstudio/projects/standard/android-standard temp\n+./gradlew deployToMirror -Pcomponent=easyadapter -Pcommit=$COMMIT_HASH -PmirrorDir=_mirror -PdepthLimit=100 -PsearchLimit=100 -PmirrorUrl=https://github.com/surfstudio/EasyAdapter\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-1020 Debug code and small fixes |
652,312 | 15.04.2020 16:15:53 | -10,800 | 7abf89814ab55c6845b819653d4f37abf3da920c | Add logic for optional property surf.commonComponentName | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/GradlePropertiesManager.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/GradlePropertiesManager.kt",
"diff": "@@ -72,7 +72,8 @@ object GradlePropertiesManager {\nprivate fun loadCommonComponentNameForMirror() {\nloadProperty(\npropertiesFileName = GRADLE_PROPERTIES_FILE_PATH,\n- propertyName = COMMON_COMPONENT_NAME\n+ propertyName = COMMON_COMPONENT_NAME,\n+ required = false\n)?.also { propertyValue ->\ncommonComponentNameForMirror = propertyValue\n}\n@@ -87,7 +88,11 @@ object GradlePropertiesManager {\n}\n}\n- private fun loadProperty(propertiesFileName: String, propertyName: String): String? {\n+ private fun loadProperty(\n+ propertiesFileName: String,\n+ propertyName: String,\n+ required: Boolean = true\n+ ): String? {\nval props = Properties()\nval propFile = File(propertiesFileName)\nif (!propFile.exists()) return null\n@@ -96,8 +101,12 @@ object GradlePropertiesManager {\nif (props.containsKey(propertyName)) {\nreturn props[propertyName].toString()\n} else {\n+ if (required) {\nthrow NoPropertyDefinedInFileException(propertyName, propertiesFileName)\n}\n+ println(\"WARNING: $propertyName not found in $propertiesFileName\")\n+ return null\n+ }\n} else {\nthrow CantReadFileException(propertiesFileName)\n}\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-1020 Add logic for optional property surf.commonComponentName |
652,300 | 15.04.2020 17:42:23 | -14,400 | 838202e2db27af91e62e22d442ba297bb5f2c56e | BaseReactor now doesn't have any map/modify methods and Reducer refactorings | [
{
"change_type": "MODIFY",
"old_path": "mvi/lib-mvi-impls/src/main/java/ru/surfstudio/android/core/mvi/impls/ui/reducer/BaseReducer.kt",
"new_path": "mvi/lib-mvi-impls/src/main/java/ru/surfstudio/android/core/mvi/impls/ui/reducer/BaseReducer.kt",
"diff": "package ru.surfstudio.android.core.mvi.impls.ui.reducer\nimport ru.surfstudio.android.core.mvi.event.Event\n-import ru.surfstudio.android.core.mvi.event.lifecycle.LifecycleEvent\nimport ru.surfstudio.android.core.mvi.impls.ui.reactor.BaseReactor\nimport ru.surfstudio.android.core.mvi.impls.ui.reactor.BaseReactorDependency\nimport ru.surfstudio.android.core.mvi.ui.reducer.Reducer\nimport ru.surfstudio.android.core.mvp.binding.rx.relation.mvp.State\n-import ru.surfstudio.android.core.ui.state.LifecycleStage\n/**\n* Base implementation of [Reducer].\n- *\n- * Contains many useful methods to handle requests easily with error handling (inherited from [BaseReactor]).\n* */\nabstract class BaseReducer<E : Event, S : Any>(\n- baseReactorDependency: BaseReactorDependency,\n- baseReducerDependency: BaseReducerDependency\n+ baseReactorDependency: BaseReactorDependency\n) : BaseReactor<E, State<S>>(baseReactorDependency), Reducer<E, S> {\n- protected val stateTraveller = baseReducerDependency.stateTraveller\n-\noverride fun react(sh: State<S>, event: E) {\nval oldState = sh.value\n- super.react(sh, event)\n- val newState = sh.value\n+ val newState = reduce(oldState, event)\nif (isStateChanged(oldState, newState)) {\n- stateTraveller.accept(newState, sh)\n- }\n+ sh.accept(newState)\n}\n-\n- private fun eraseTravellerOnDestroy(sh: State<S>, event: E) {\n- if (event is LifecycleEvent && event.stage == LifecycleStage.VIEW_DESTROYED) {\n- stateTraveller.erase(sh)\n}\n}\n\\ No newline at end of file\n-\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "mvi/lib-mvi-impls/src/main/java/ru/surfstudio/android/core/mvi/impls/ui/reducer/BaseReducerDependency.kt",
"new_path": null,
"diff": "-package ru.surfstudio.android.core.mvi.impls.ui.reducer\n-\n-/**\n- * Dependency for [BaseReducer].\n- * */\n-class BaseReducerDependency(\n- val stateTraveller: ReducerStateTraveller\n-)\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "mvi/lib-mvi-impls/src/main/java/ru/surfstudio/android/core/mvi/impls/ui/reducer/ReducerStateTraveller.kt",
"new_path": "mvi/lib-mvi-impls/src/main/java/ru/surfstudio/android/core/mvi/impls/ui/reducer/ReducerStateTraveller.kt",
"diff": "@@ -8,6 +8,7 @@ import ru.surfstudio.android.logger.Logger\n/**\n* Experimental mechanism for travelling between states in `MVI-Reducer` approach.\n*/\n+@Deprecated(\"Currently not production ready solution\")\nobject ReducerStateTraveller : StateEmitter {\nprivate val stateMap: HashMap<String, MutableList<TravelEntry<*>>?> = hashMapOf()\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-969 BaseReactor now doesn't have any map/modify methods and Reducer refactorings |
652,316 | 15.04.2020 18:45:20 | -10,800 | 4c9d612a57b706fe5a851c83732d794929ecfe8d | Add postponed command execution | [
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/di/supplier/callbacks/ActivityNavigationSupplierCallbacks.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/di/supplier/callbacks/ActivityNavigationSupplierCallbacks.kt",
"diff": "@@ -31,7 +31,7 @@ class ActivityNavigationSupplierCallbacks(\noverride fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {\nval newHolder = createHolder(activity, savedInstanceState)\nnavigatorHolders[getActivityId(activity)] = newHolder\n- if (savedInstanceState != null) {\n+ if (savedInstanceState == null) {\ncurrentHolder = newHolder\n}\n}\n@@ -105,6 +105,11 @@ class ActivityNavigationSupplierCallbacks(\nval activityNavigator = ActivityNavigator(activity)\nval dialogNavigator = DialogNavigator(activity)\n- return ActivityNavigationHolder(activityNavigator, dialogNavigator, nestedNavigationSupplier)\n+ return ActivityNavigationHolder(\n+ activity,\n+ activityNavigator,\n+ dialogNavigator,\n+ nestedNavigationSupplier\n+ )\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/di/supplier/holder/ActivityNavigationHolder.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/di/supplier/holder/ActivityNavigationHolder.kt",
"diff": "package ru.surfstudio.android.navigation.di.supplier.holder\n+import androidx.appcompat.app.AppCompatActivity\nimport ru.surfstudio.android.navigation.di.supplier.FragmentNavigationSupplier\nimport ru.surfstudio.android.navigation.navigator.activity.ActivityNavigatorInterface\nimport ru.surfstudio.android.navigation.navigator.dialog.DialogNavigatorInterface\nopen class ActivityNavigationHolder(\n+ val activity: AppCompatActivity,\nval activityNavigator: ActivityNavigatorInterface,\nval dialogNavigator: DialogNavigatorInterface,\nval nestedNavigationSupplier: FragmentNavigationSupplier\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/AppCommandExecutor.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/AppCommandExecutor.kt",
"diff": "@@ -21,4 +21,8 @@ open class AppCommandExecutor(\nis DialogNavigationCommand -> dialogCommandExecutor.execute(command)\n}\n}\n+\n+ override fun execute(commands: List<NavigationCommand>) {\n+ TODO(\"Command list execution\")\n+ }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/CommandExecutor.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/CommandExecutor.kt",
"diff": "@@ -5,4 +5,6 @@ import ru.surfstudio.android.navigation.command.NavigationCommand\ninterface CommandExecutor<C: NavigationCommand> {\nfun execute(command: C)\n+\n+ fun execute(commands: List<C>)\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/dialog/DialogCommandExecutor.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/dialog/DialogCommandExecutor.kt",
"diff": "@@ -20,4 +20,8 @@ open class DialogCommandExecutor(\nis Dismiss -> dialogNavigator.dismiss(command.route)\n}\n}\n+\n+ override fun execute(commands: List<DialogNavigationCommand>) {\n+ TODO(\"Activity navigation command list execution\")\n+ }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/fragment/FragmentCommandExecutor.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/fragment/FragmentCommandExecutor.kt",
"diff": "package ru.surfstudio.android.navigation.executor.fragment\n+import android.os.Handler\n+import androidx.lifecycle.Lifecycle\nimport ru.surfstudio.android.navigation.command.fragment.*\nimport ru.surfstudio.android.navigation.command.fragment.base.FragmentNavigationCommand\nimport ru.surfstudio.android.navigation.di.supplier.ActivityNavigationSupplier\n@@ -12,16 +14,19 @@ open class FragmentCommandExecutor(\n) : CommandExecutor<FragmentNavigationCommand> {\noverride fun execute(command: FragmentNavigationCommand) {\n- val fragmentNavigationHolder = activityNavigationSupplier\n- .obtain()\n- .nestedNavigationSupplier\n- .obtain(command)\n+ val activityHolder = activityNavigationSupplier.obtain()\n+ val activity = activityHolder.activity\n+ if (activity.lifecycle.currentState.isAtLeast(Lifecycle.State.RESUMED)) {\n+ val fragmentNavigationHolder = activityHolder.nestedNavigationSupplier.obtain(command)\nval tabFragmentNavigator = fragmentNavigationHolder.tabFragmentNavigator\nval fragmentNavigator = fragmentNavigationHolder.fragmentNavigator\nwhen (command.route) {\nis TabRoute -> execute(command, tabFragmentNavigator)\nelse -> execute(command, fragmentNavigator)\n}\n+ } else {\n+ Handler().post { execute(command) }\n+ }\n}\nprotected open fun execute(command: FragmentNavigationCommand, navigator: FragmentNavigatorInterface) {\n@@ -35,4 +40,8 @@ open class FragmentCommandExecutor(\nis RemoveAll -> navigator.removeAll()\n}\n}\n+\n+ override fun execute(commands: List<FragmentNavigationCommand>) {\n+ TODO(\"Fragment navigation command list execution\")\n+ }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/SingleActivity.kt",
"new_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/SingleActivity.kt",
"diff": "@@ -19,6 +19,6 @@ class SingleActivity : AppCompatActivity(), IdentifiableScreen, FragmentContaine\noverride fun onCreate(savedInstanceState: Bundle?) {\nsuper.onCreate(savedInstanceState)\nsetContentView(R.layout.activity_single)\n- Handler().post { App.navigator.execute(Add(SplashRoute())) }\n+ App.navigator.execute(Add(SplashRoute()))\n}\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-312 Add postponed command execution |
652,316 | 15.04.2020 19:23:18 | -10,800 | eba10137603d373b2595a4b41192d43c6ebb634a | Add buffer to command execution | [
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/di/supplier/ActivityNavigationSupplier.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/di/supplier/ActivityNavigationSupplier.kt",
"diff": "@@ -4,5 +4,18 @@ import ru.surfstudio.android.navigation.di.supplier.holder.ActivityNavigationHol\ninterface ActivityNavigationSupplier {\n+ /**\n+ * Obtains [ActivityNavigationHolder] for current fully visible activity\n+ */\nfun obtain(): ActivityNavigationHolder\n+\n+ /**\n+ * Determines, whether this supplier has current holder, or it is not yet initialized\n+ */\n+ fun hasCurrentHolder(): Boolean\n+\n+ /**\n+ * Sets the listener, which will be invoked when [ActivityNavigationHolder] will become active.\n+ */\n+ fun setOnHolderActiveListenerSingle(listener: (ActivityNavigationHolder) -> Unit)\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/di/supplier/callbacks/ActivityNavigationSupplierCallbacks.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/di/supplier/callbacks/ActivityNavigationSupplierCallbacks.kt",
"diff": "@@ -11,23 +11,29 @@ import ru.surfstudio.android.navigation.di.supplier.holder.ActivityNavigationHol\nimport ru.surfstudio.android.navigation.di.supplier.FragmentNavigationSupplier\nimport ru.surfstudio.android.navigation.navigator.activity.ActivityNavigator\nimport ru.surfstudio.android.navigation.navigator.dialog.DialogNavigator\n-import java.lang.IllegalStateException\n//@PerApp\n-class ActivityNavigationSupplierCallbacks(\n+open class ActivityNavigationSupplierCallbacks(\nprivate val nestedCallbacksCreator: (AppCompatActivity, Bundle?) -> FragmentNavigationSupplierCallbacks\n) : Application.ActivityLifecycleCallbacks, ActivityNavigationSupplier {\n- private val navigatorHolders = hashMapOf<String, ActivityNavigationHolder?>()\n-\n- var currentHolder: ActivityNavigationHolder? = null\n- private set\n+ private val navigatorHolders = hashMapOf<String, ActivityNavigationHolder>()\n+ private var currentHolder: ActivityNavigationHolder? = null\n+ private var onHolderActiveListenerSingle: ((ActivityNavigationHolder) -> Unit)? = null\noverride fun obtain(): ActivityNavigationHolder {\nreturn currentHolder ?: error(\"Navigation holder is empty. You have no visible activity.\")\n}\n+ override fun hasCurrentHolder(): Boolean {\n+ return currentHolder != null\n+ }\n+\n+ override fun setOnHolderActiveListenerSingle(listener: (ActivityNavigationHolder) -> Unit) {\n+ onHolderActiveListenerSingle = listener\n+ }\n+\noverride fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {\nval newHolder = createHolder(activity, savedInstanceState)\nnavigatorHolders[getActivityId(activity)] = newHolder\n@@ -43,6 +49,8 @@ class ActivityNavigationSupplierCallbacks(\noverride fun onActivityResumed(activity: Activity) {\nval currentHolder = navigatorHolders[getActivityId(activity)]\nthis.currentHolder = currentHolder\n+ onHolderActiveListenerSingle?.invoke(currentHolder ?: return)\n+ onHolderActiveListenerSingle = null\n}\noverride fun onActivityPaused(activity: Activity) {\n@@ -54,7 +62,8 @@ class ActivityNavigationSupplierCallbacks(\noverride fun onActivitySaveInstanceState(activity: Activity, outState: Bundle?) {\nval id = getActivityId(activity)\n- navigatorHolders\n+ val nestedCallbacks = navigatorHolders[id]?.nestedNavigationSupplier as? FragmentNavigationSupplierCallbacks\n+ nestedCallbacks?.onActivitySaveState(outState)\n}\noverride fun onActivityStopped(activity: Activity) {\n@@ -68,7 +77,7 @@ class ActivityNavigationSupplierCallbacks(\nprivate fun destroyHolder(activity: Activity) {\nval id = getActivityId(activity)\nunregisterNestedNavigationSupplier(activity, navigatorHolders[id]?.nestedNavigationSupplier)\n- navigatorHolders[id] = null\n+ navigatorHolders.remove(id)\n}\nprivate fun unregisterNestedNavigationSupplier(\n@@ -97,8 +106,8 @@ class ActivityNavigationSupplierCallbacks(\nreturn activityId\n}\n- private fun createHolder(activity: Activity, savedInstanceState: Bundle?): ActivityNavigationHolder? {\n- if (activity !is AppCompatActivity) return null\n+ protected open fun createHolder(activity: Activity, savedInstanceState: Bundle?): ActivityNavigationHolder {\n+ require(activity is AppCompatActivity) { \"All activities should implement AppCompatActivity!\" }\nval nestedNavigationSupplier = nestedCallbacksCreator(activity, savedInstanceState)\nregisterNestedNavigationSupplier(activity, nestedNavigationSupplier)\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/AppCommandExecutor.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/AppCommandExecutor.kt",
"diff": "@@ -4,25 +4,42 @@ import ru.surfstudio.android.navigation.command.NavigationCommand\nimport ru.surfstudio.android.navigation.command.activity.base.ActivityNavigationCommand\nimport ru.surfstudio.android.navigation.command.dialog.base.DialogNavigationCommand\nimport ru.surfstudio.android.navigation.command.fragment.base.FragmentNavigationCommand\n+import ru.surfstudio.android.navigation.di.supplier.ActivityNavigationSupplier\nimport ru.surfstudio.android.navigation.executor.activity.ActivityCommandExecutor\nimport ru.surfstudio.android.navigation.executor.dialog.DialogCommandExecutor\nimport ru.surfstudio.android.navigation.executor.fragment.FragmentCommandExecutor\nopen class AppCommandExecutor(\n+ private val activityNavigationSupplier: ActivityNavigationSupplier,\nprivate val activityCommandExecutor: ActivityCommandExecutor,\nprivate val fragmentCommandExecutor: FragmentCommandExecutor,\nprivate val dialogCommandExecutor: DialogCommandExecutor\n) : CommandExecutor<NavigationCommand> {\n+ protected val buffer = mutableListOf<NavigationCommand>()\n+\noverride fun execute(command: NavigationCommand) {\n+ execute(listOf(command))\n+ }\n+\n+ override fun execute(commands: List<NavigationCommand>) {\n+ if (activityNavigationSupplier.hasCurrentHolder()) {\n+ commands.forEach(::executeInternal) //TODO think about synchronous execution\n+ } else {\n+ activityNavigationSupplier.setOnHolderActiveListenerSingle { executeBuffer() }\n+ }\n+ }\n+\n+ private fun executeBuffer() {\n+ execute(buffer)\n+ buffer.clear()\n+ }\n+\n+ protected fun executeInternal(command: NavigationCommand) {\nwhen (command) {\nis ActivityNavigationCommand -> activityCommandExecutor.execute(command)\nis FragmentNavigationCommand -> fragmentCommandExecutor.execute(command)\nis DialogNavigationCommand -> dialogCommandExecutor.execute(command)\n}\n}\n-\n- override fun execute(commands: List<NavigationCommand>) {\n- TODO(\"Command list execution\")\n- }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/dialog/DialogCommandExecutor.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/dialog/DialogCommandExecutor.kt",
"diff": "@@ -22,6 +22,6 @@ open class DialogCommandExecutor(\n}\noverride fun execute(commands: List<DialogNavigationCommand>) {\n- TODO(\"Activity navigation command list execution\")\n+ TODO(\"Dialog navigation command list execution\")\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/fragment/FragmentCommandExecutor.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/fragment/FragmentCommandExecutor.kt",
"diff": "package ru.surfstudio.android.navigation.executor.fragment\n-import android.os.Handler\n-import androidx.lifecycle.Lifecycle\nimport ru.surfstudio.android.navigation.command.fragment.*\nimport ru.surfstudio.android.navigation.command.fragment.base.FragmentNavigationCommand\nimport ru.surfstudio.android.navigation.di.supplier.ActivityNavigationSupplier\n@@ -15,8 +13,6 @@ open class FragmentCommandExecutor(\noverride fun execute(command: FragmentNavigationCommand) {\nval activityHolder = activityNavigationSupplier.obtain()\n- val activity = activityHolder.activity\n- if (activity.lifecycle.currentState.isAtLeast(Lifecycle.State.RESUMED)) {\nval fragmentNavigationHolder = activityHolder.nestedNavigationSupplier.obtain(command)\nval tabFragmentNavigator = fragmentNavigationHolder.tabFragmentNavigator\nval fragmentNavigator = fragmentNavigationHolder.fragmentNavigator\n@@ -24,9 +20,6 @@ open class FragmentCommandExecutor(\nis TabRoute -> execute(command, tabFragmentNavigator)\nelse -> execute(command, fragmentNavigator)\n}\n- } else {\n- Handler().post { execute(command) }\n- }\n}\nprotected open fun execute(command: FragmentNavigationCommand, navigator: FragmentNavigatorInterface) {\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/App.kt",
"new_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/App.kt",
"diff": "@@ -26,6 +26,7 @@ class App : Application() {\nval activityCallbacks = ActivityNavigationSupplierCallbacks(fragmentCallbacksCreator)\nregisterActivityLifecycleCallbacks(activityCallbacks)\nnavigator = AppCommandExecutor(\n+ activityCallbacks,\nActivityCommandExecutor(activityCallbacks),\nFragmentCommandExecutor(activityCallbacks),\nDialogCommandExecutor(activityCallbacks)\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-312 Add buffer to command execution |
652,300 | 16.04.2020 10:27:59 | -14,400 | 7b9ac2f6cd29c399ba95f4815fe68d244aca389e | removed redundant dependencies of mvi-impls module | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/components.json",
"new_path": "buildSrc/components.json",
"diff": "\"name\": \"mvi-core\",\n\"type\": \"api\"\n},\n- {\n- \"name\": \"datalist-limit-offset\",\n- \"type\": \"implementation\"\n- },\n- {\n- \"name\": \"datalist-page-count\",\n- \"type\": \"implementation\"\n- },\n{\n\"name\": \"logger\",\n\"type\": \"implementation\"\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-969 removed redundant dependencies of mvi-impls module |
652,312 | 15.04.2020 16:36:11 | -10,800 | 2f8e1736dab257c662691b6f6b65023146f74282 | Fix assemble mirror command | [
{
"change_type": "MODIFY",
"old_path": "assemble.sh",
"new_path": "assemble.sh",
"diff": "-cd _mirror && chmod +x gradlew && ./gradlew clean assemble && cd ..\n+cd _mirror && ./gradlew clean assemble && cd ..\n"
},
{
"change_type": "MODIFY",
"old_path": "ci-internal/ComponentMirroringJobJenkinsfile.groovy",
"new_path": "ci-internal/ComponentMirroringJobJenkinsfile.groovy",
"diff": "@@ -93,7 +93,7 @@ pipeline.stages = [\npipeline.stages.add(\npipeline.stage(\"$ASSEMBLE_COMPONENT : ${component.id}\", StageStrategy.UNSTABLE_WHEN_STAGE_ERROR) {\nscript.dir(\"$MIRROR_FOLDER\") {\n- script.sh \"chmod +x gradlew && ./gradlew clean assemble\"\n+ script.sh \"./gradlew clean assemble\"\n}\n}\n)\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-1020 Fix assemble mirror command |
652,312 | 16.04.2020 13:59:26 | -10,800 | 41e2bdc41cd302b559bcbefac7dd7bfc38d78060 | Fix mirror local module dependency build error | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/androidSample.gradle",
"new_path": "buildSrc/androidSample.gradle",
"diff": "import ru.surfstudio.android.build.Components\nimport ru.surfstudio.android.build.DependencyConfigurator\n+import ru.surfstudio.android.build.GradlePropertiesManager\napply from: \"$rootDir/buildSrc/config.gradle\"\napply plugin: 'com.android.application'\n@@ -36,6 +37,12 @@ android {\n}\n}\n+configurations.all {\n+ if (GradlePropertiesManager.isCurrentComponentAMirror()) {\n+ exclude group: \"ru.surfstudio.android\", module: GradlePropertiesManager.componentMirrorName\n+ }\n+}\n+\ndependencies {\nimplementation project(\":sample-dagger\")\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/DependencyConfigurator.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/DependencyConfigurator.kt",
"diff": "@@ -51,7 +51,7 @@ object DependencyConfigurator {\n*/\n@JvmStatic\nfun projectImplementation(project: Project, dependencyName: String) {\n- if (GradlePropertiesManager.isCurrentComponentAMirror() || !isProjectIncluded(project, dependencyName)) {\n+ if (!isProjectIncluded(project, dependencyName)) {\naddDependency(project, IMPLEMENTATION_DEP_TYPE, getDependencyArtifactoryName(dependencyName))\n} else {\naddDependency(project, IMPLEMENTATION_DEP_TYPE, project.rootProject.project(dependencyName))\n@@ -68,7 +68,7 @@ object DependencyConfigurator {\n*/\n@JvmStatic\nfun projectTestImplementation(project: Project, dependencyName: String) {\n- if (GradlePropertiesManager.isCurrentComponentAMirror() || !isProjectIncluded(project, dependencyName)) {\n+ if (!isProjectIncluded(project, dependencyName)) {\naddDependency(project, TEST_IMPLEMENTATION_DEP_TYPE, getDependencyArtifactoryName(dependencyName))\n} else {\naddDependency(project, TEST_IMPLEMENTATION_DEP_TYPE, project.rootProject.project(dependencyName))\n@@ -85,7 +85,7 @@ object DependencyConfigurator {\n*/\n@JvmStatic\nfun projectAndroidTestImplementation(project: Project, dependencyName: String) {\n- if (GradlePropertiesManager.isCurrentComponentAMirror() || !isProjectIncluded(project, dependencyName)) {\n+ if (!isProjectIncluded(project, dependencyName)) {\naddDependency(project, ANDROID_TEST_IMPLEMENTATION_DEP_TYPE, getDependencyArtifactoryName(dependencyName))\n} else {\naddDependency(project, ANDROID_TEST_IMPLEMENTATION_DEP_TYPE, project.rootProject.project(dependencyName))\n@@ -188,7 +188,7 @@ object DependencyConfigurator {\nprivate fun addAndroidStandardDependencies(project: Project, dependencies: List<Dependency>) {\ndependencies.forEach {\n- if (GradlePropertiesManager.isCurrentComponentAMirror() || !isProjectIncluded(project, it.name)) {\n+ if (!isProjectIncluded(project, it.name)) {\naddDependency(project, IMPLEMENTATION_DEP_TYPE, getDependencyArtifactoryName(it.name))\n} else {\naddDependency(project, IMPLEMENTATION_DEP_TYPE, project.rootProject.project(\":${it.name}\"))\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/GradlePropertiesManager.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/GradlePropertiesManager.kt",
"diff": "@@ -46,6 +46,7 @@ object GradlePropertiesManager {\n*\n* @return true if mirror\n*/\n+ @JvmStatic\nfun isCurrentComponentAMirror(): Boolean = componentMirrorName != EMPTY_STRING\n/**\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-1020 Fix mirror local module dependency build error |
652,316 | 16.04.2020 15:04:03 | -10,800 | 7444a6f21f203164e771293f5d136fccf7ec4b87 | Make Activity holder and fragment holder open | [
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/di/supplier/holder/ActivityNavigationHolder.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/di/supplier/holder/ActivityNavigationHolder.kt",
"diff": "@@ -6,7 +6,6 @@ import ru.surfstudio.android.navigation.navigator.activity.ActivityNavigatorInte\nimport ru.surfstudio.android.navigation.navigator.dialog.DialogNavigatorInterface\nopen class ActivityNavigationHolder(\n- val activity: AppCompatActivity,\nval activityNavigator: ActivityNavigatorInterface,\nval dialogNavigator: DialogNavigatorInterface,\nval nestedNavigationSupplier: FragmentNavigationSupplier\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/di/supplier/holder/FragmentNavigationHolder.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/di/supplier/holder/FragmentNavigationHolder.kt",
"diff": "@@ -2,7 +2,7 @@ package ru.surfstudio.android.navigation.di.supplier.holder\nimport ru.surfstudio.android.navigation.navigator.fragment.FragmentNavigatorInterface\n-class FragmentNavigationHolder(\n+open class FragmentNavigationHolder(\nval fragmentNavigator: FragmentNavigatorInterface,\nval tabFragmentNavigator: FragmentNavigatorInterface\n)\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/App.kt",
"new_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/App.kt",
"diff": "package ru.surfstudio.android.navigation.sample.app\nimport android.app.Application\n-import android.os.Bundle\n-import androidx.appcompat.app.AppCompatActivity\nimport ru.surfstudio.android.navigation.di.supplier.callbacks.ActivityNavigationSupplierCallbacks\n-import ru.surfstudio.android.navigation.di.supplier.callbacks.FragmentNavigationSupplierCallbacks\nimport ru.surfstudio.android.navigation.executor.AppCommandExecutor\n-import ru.surfstudio.android.navigation.executor.activity.ActivityCommandExecutor\n-import ru.surfstudio.android.navigation.executor.dialog.DialogCommandExecutor\n-import ru.surfstudio.android.navigation.executor.fragment.FragmentCommandExecutor\nclass App : Application() {\n@@ -22,21 +16,8 @@ class App : Application() {\n}\nprivate fun initExecutor() {\n- val fragmentCallbacksCreator = ::createFragmentNavigationSupplierCallbacks\n- val activityCallbacks = ActivityNavigationSupplierCallbacks(fragmentCallbacksCreator)\n+ val activityCallbacks = ActivityNavigationSupplierCallbacks()\nregisterActivityLifecycleCallbacks(activityCallbacks)\n- navigator = AppCommandExecutor(\n- activityCallbacks,\n- ActivityCommandExecutor(activityCallbacks),\n- FragmentCommandExecutor(activityCallbacks),\n- DialogCommandExecutor(activityCallbacks)\n- )\n- }\n-\n- private fun createFragmentNavigationSupplierCallbacks(\n- activity: AppCompatActivity,\n- savedState: Bundle?\n- ): FragmentNavigationSupplierCallbacks {\n- return FragmentNavigationSupplierCallbacks(activity, savedState)\n+ navigator = AppCommandExecutor(activityCallbacks)\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/SingleActivity.kt",
"new_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/SingleActivity.kt",
"diff": "@@ -19,6 +19,6 @@ class SingleActivity : AppCompatActivity(), IdentifiableScreen, FragmentContaine\noverride fun onCreate(savedInstanceState: Bundle?) {\nsuper.onCreate(savedInstanceState)\nsetContentView(R.layout.activity_single)\n- App.navigator.execute(Add(SplashRoute()))\n+ if (savedInstanceState == null) App.navigator.execute(Add(SplashRoute()))\n}\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-312 Make Activity holder and fragment holder open |
652,316 | 16.04.2020 15:05:39 | -10,800 | f8c0c820c49bbcb76dd5f76efb568e58498babea | Added default constructor parameters to executors and callbacks, easy configuration | [
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/di/supplier/callbacks/ActivityNavigationSupplierCallbacks.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/di/supplier/callbacks/ActivityNavigationSupplierCallbacks.kt",
"diff": "@@ -14,7 +14,7 @@ import ru.surfstudio.android.navigation.navigator.dialog.DialogNavigator\n//@PerApp\nopen class ActivityNavigationSupplierCallbacks(\n- private val nestedCallbacksCreator: (AppCompatActivity, Bundle?) -> FragmentNavigationSupplierCallbacks\n+ private val nestedCallbacksCreator: FragmentNavigationSupplierCallbacksCreator = ::FragmentNavigationSupplierCallbacks\n) : Application.ActivityLifecycleCallbacks, ActivityNavigationSupplier {\n@@ -35,35 +35,43 @@ open class ActivityNavigationSupplierCallbacks(\n}\noverride fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {\n+ safeRequireActivityId(activity) { id ->\nval newHolder = createHolder(activity, savedInstanceState)\n- navigatorHolders[getActivityId(activity)] = newHolder\n- if (savedInstanceState == null) {\n+ navigatorHolders[id] = newHolder\n+ if (savedInstanceState != null) {\ncurrentHolder = newHolder\n}\n}\n+ }\noverride fun onActivityStarted(activity: Activity) {\n//empty\n}\noverride fun onActivityResumed(activity: Activity) {\n- val currentHolder = navigatorHolders[getActivityId(activity)]\n+ safeRequireActivityId(activity) { id ->\n+ val currentHolder = navigatorHolders[id]\nthis.currentHolder = currentHolder\n- onHolderActiveListenerSingle?.invoke(currentHolder ?: return)\n+ onHolderActiveListenerSingle?.invoke(currentHolder ?: return@safeRequireActivityId)\nonHolderActiveListenerSingle = null\n}\n+ }\noverride fun onActivityPaused(activity: Activity) {\n- val currentHolder = navigatorHolders[getActivityId(activity)]\n+ safeRequireActivityId(activity) { id ->\n+ val currentHolder = navigatorHolders[id]\nif (this.currentHolder == currentHolder) {\nthis.currentHolder = null\n}\n}\n+ }\noverride fun onActivitySaveInstanceState(activity: Activity, outState: Bundle?) {\n- val id = getActivityId(activity)\n- val nestedCallbacks = navigatorHolders[id]?.nestedNavigationSupplier as? FragmentNavigationSupplierCallbacks\n- nestedCallbacks?.onActivitySaveState(outState)\n+ safeRequireActivityId(activity) { id ->\n+ val nestedSupplier = navigatorHolders[id]?.nestedNavigationSupplier\n+ val castedNestedSupplier = nestedSupplier as? FragmentNavigationSupplierCallbacks\n+ castedNestedSupplier?.onActivitySaveState(outState)\n+ }\n}\noverride fun onActivityStopped(activity: Activity) {\n@@ -75,19 +83,11 @@ open class ActivityNavigationSupplierCallbacks(\n}\nprivate fun destroyHolder(activity: Activity) {\n- val id = getActivityId(activity)\n- unregisterNestedNavigationSupplier(activity, navigatorHolders[id]?.nestedNavigationSupplier)\n+ safeRequireActivityId(activity) { id ->\n+ val nestedSupplier = navigatorHolders[id]?.nestedNavigationSupplier\n+ unregisterNestedNavigationSupplier(activity, nestedSupplier)\nnavigatorHolders.remove(id)\n}\n-\n- private fun unregisterNestedNavigationSupplier(\n- activity: Activity,\n- nestedNavigationSupplier: FragmentNavigationSupplier?\n- ) {\n- if (nestedNavigationSupplier !is FragmentNavigationSupplierCallbacks) return\n- if (activity !is FragmentActivity) return\n- val fragmentManager = activity.supportFragmentManager\n- fragmentManager.unregisterFragmentLifecycleCallbacks(nestedNavigationSupplier)\n}\nprivate fun registerNestedNavigationSupplier(\n@@ -99,26 +99,35 @@ open class ActivityNavigationSupplierCallbacks(\nfragmentManager.registerFragmentLifecycleCallbacks(nestedNavigationSupplier, true)\n}\n- private fun getActivityId(activity: Activity): String {\n- val identifiableActivity = activity as? IdentifiableScreen\n- val activityId = identifiableActivity?.screenId\n- requireNotNull(activityId) { \"Activity must implement IdentifiableScreen.screenId method\" }\n- return activityId\n+ private fun unregisterNestedNavigationSupplier(\n+ activity: Activity,\n+ nestedNavigationSupplier: FragmentNavigationSupplier?\n+ ) {\n+ if (nestedNavigationSupplier !is FragmentNavigationSupplierCallbacks) return\n+ if (activity !is FragmentActivity) return\n+ val fragmentManager = activity.supportFragmentManager\n+ fragmentManager.unregisterFragmentLifecycleCallbacks(nestedNavigationSupplier)\n}\nprotected open fun createHolder(activity: Activity, savedInstanceState: Bundle?): ActivityNavigationHolder {\n- require(activity is AppCompatActivity) { \"All activities should implement AppCompatActivity!\" }\n+ require(activity is AppCompatActivity) { \"All activities with ActivityNavigationHolders should implement AppCompatActivity!\" }\nval nestedNavigationSupplier = nestedCallbacksCreator(activity, savedInstanceState)\nregisterNestedNavigationSupplier(activity, nestedNavigationSupplier)\nval activityNavigator = ActivityNavigator(activity)\nval dialogNavigator = DialogNavigator(activity)\n+\nreturn ActivityNavigationHolder(\n- activity,\nactivityNavigator,\ndialogNavigator,\nnestedNavigationSupplier\n)\n}\n+\n+ protected open fun safeRequireActivityId(activity: Activity, onActivityReady: (id: String) -> Unit) {\n+ if (activity is AppCompatActivity && activity is IdentifiableScreen) {\n+ onActivityReady(activity.screenId)\n+ }\n+ }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/AppCommandExecutor.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/AppCommandExecutor.kt",
"diff": "@@ -11,9 +11,9 @@ import ru.surfstudio.android.navigation.executor.fragment.FragmentCommandExecuto\nopen class AppCommandExecutor(\nprivate val activityNavigationSupplier: ActivityNavigationSupplier,\n- private val activityCommandExecutor: ActivityCommandExecutor,\n- private val fragmentCommandExecutor: FragmentCommandExecutor,\n- private val dialogCommandExecutor: DialogCommandExecutor\n+ private val activityCommandExecutor: ActivityCommandExecutor = ActivityCommandExecutor(activityNavigationSupplier),\n+ private val fragmentCommandExecutor: FragmentCommandExecutor = FragmentCommandExecutor(activityNavigationSupplier),\n+ private val dialogCommandExecutor: DialogCommandExecutor = DialogCommandExecutor(activityNavigationSupplier)\n) : CommandExecutor<NavigationCommand> {\nprotected val buffer = mutableListOf<NavigationCommand>()\n@@ -26,6 +26,7 @@ open class AppCommandExecutor(\nif (activityNavigationSupplier.hasCurrentHolder()) {\ncommands.forEach(::executeInternal) //TODO think about synchronous execution\n} else {\n+ buffer.addAll(commands)\nactivityNavigationSupplier.setOnHolderActiveListenerSingle { executeBuffer() }\n}\n}\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-312 Added default constructor parameters to executors and callbacks, easy configuration |
652,316 | 16.04.2020 15:06:44 | -10,800 | 3b8b1d83cae770d230f08a8f68ee5798ef367809 | FragmentNavigationSupplier.obtain now takes sourceTag, not FragmentCommand | [
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/command/fragment/base/FragmentNavigationCommand.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/command/fragment/base/FragmentNavigationCommand.kt",
"diff": "@@ -19,8 +19,7 @@ interface FragmentNavigationCommand : NavigationCommand {\n/**\n* Tag of a source screen, which will execute navigation command.\n*\n- * If a source screen is activity, you may just ignore this option,\n- * or pass [ACTIVITY_NAVIGATION_TAG] to explicitly execute command on top level.\n+ * If a source screen is activity, you may just ignore this option\n*\n* If a source screen is fragment, you must pass\n* [androidx.fragment.app.Fragment.getTag] as a source tag,\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/di/supplier/FragmentNavigationSupplier.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/di/supplier/FragmentNavigationSupplier.kt",
"diff": "package ru.surfstudio.android.navigation.di.supplier\n-import ru.surfstudio.android.navigation.command.fragment.base.FragmentNavigationCommand\nimport ru.surfstudio.android.navigation.di.supplier.holder.FragmentNavigationHolder\ninterface FragmentNavigationSupplier {\n- fun obtain(command: FragmentNavigationCommand): FragmentNavigationHolder\n+ /**\n+ * Obtains [FragmentNavigationHolder] for current visible activity.\n+ *\n+ * @param sourceTag Tag of a source fragment, which will execute navigation command.\n+ *\n+ * @see [ru.surfstudio.android.navigation.command.fragment.base.FragmentNavigationCommand.sourceTag]\n+ */\n+ fun obtain(sourceTag: String): FragmentNavigationHolder\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/fragment/FragmentCommandExecutor.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/fragment/FragmentCommandExecutor.kt",
"diff": "@@ -13,7 +13,7 @@ open class FragmentCommandExecutor(\noverride fun execute(command: FragmentNavigationCommand) {\nval activityHolder = activityNavigationSupplier.obtain()\n- val fragmentNavigationHolder = activityHolder.nestedNavigationSupplier.obtain(command)\n+ val fragmentNavigationHolder = activityHolder.nestedNavigationSupplier.obtain(command.sourceTag)\nval tabFragmentNavigator = fragmentNavigationHolder.tabFragmentNavigator\nval fragmentNavigator = fragmentNavigationHolder.fragmentNavigator\nwhen (command.route) {\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-312 FragmentNavigationSupplier.obtain now takes sourceTag, not FragmentCommand |
652,316 | 16.04.2020 15:07:15 | -10,800 | 33b1f446561d74aaa53e2750b55d84dd00fd377a | Fix TabFragmentNavigator savedState | [
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/navigator/fragment/tab/TabFragmentNavigator.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/navigator/fragment/tab/TabFragmentNavigator.kt",
"diff": "@@ -31,9 +31,6 @@ open class TabFragmentNavigator(\nsavedState: Bundle? = null\n) : FragmentNavigatorInterface {\n- init {\n- onRestoreState(savedState)\n- }\nprivate var activeTabTag: String = \"\"\nprivate val hostEntries: TabHostEntries = TabHostEntries()\n@@ -46,6 +43,10 @@ open class TabFragmentNavigator(\noverride val backStackEntryCount: Int\nget() = activeNavigator.backStackEntryCount\n+ init {\n+ onRestoreState(savedState)\n+ }\n+\noverride fun add(route: FragmentRoute, animations: Animations) {\nif (route is TabRootRoute) {\nopenTab(route)\n@@ -90,14 +91,14 @@ open class TabFragmentNavigator(\nreturn activeNavigator.show(route, animations)\n}\n- override fun onSaveState(outState: Bundle?) {\n+ final override fun onSaveState(outState: Bundle?) {\noutState ?: return\noutState.putString(EXTRA_ACTIVE_TAG, activeTabTag)\noutState.putStringArrayList(EXTRA_HOST_TAGS, ArrayList(hostEntries.tags))\nhostEntries.navigators.forEach { it.onSaveState(outState) }\n}\n- override fun onRestoreState(savedInstanceState: Bundle?) {\n+ final override fun onRestoreState(savedInstanceState: Bundle?) {\nsavedInstanceState ?: return\nhostEntries.clear()\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-312 Fix TabFragmentNavigator savedState |
652,316 | 16.04.2020 15:07:51 | -10,800 | de9bb267f04b3c2c23dab6dd54504db0e8cf706d | Fix FragmentNavigation onFragmentCreated logic | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/di/supplier/callbacks/FragmentNavigationSupplierCallbacksCreator.kt",
"diff": "+package ru.surfstudio.android.navigation.di.supplier.callbacks\n+\n+import android.os.Bundle\n+import androidx.appcompat.app.AppCompatActivity\n+\n+typealias FragmentNavigationSupplierCallbacksCreator = (AppCompatActivity, Bundle?) -> FragmentNavigationSupplierCallbacks\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-312 Fix FragmentNavigation onFragmentCreated logic |
652,300 | 16.04.2020 19:06:41 | -14,400 | 2963c364a7adef555b92d28be80b3a6391d6aa6b | Added note about Kotlin into documentation and release_notes | [
{
"change_type": "MODIFY",
"old_path": "template/RELEASE_NOTES.md",
"new_path": "template/RELEASE_NOTES.md",
"diff": "* ANDDEP-982 `okHttp` version raised: `3.12.0 -> 4.4.1`. Migration done;\n* ANDDEP-982 `easyadapter` now depends on `androidx.asynclayoutinflater`;\n* ANDDEP-982 other libraries versions changed;\n-* ANDDEP-915 Added `validateCrossFeatureRoutes.gradle.kts` task;\n+* ANDDEP-915 Added `validateCrossFeatureRoutes.gradle.kts` task. **Note**: supported only `.kt` source files parsing;\n## 0.4.0\n##### Template\n"
},
{
"change_type": "MODIFY",
"old_path": "template/validateCrossFeatureRoutes.gradle.kts",
"new_path": "template/validateCrossFeatureRoutes.gradle.kts",
"diff": "@@ -21,6 +21,8 @@ tasks.whenTaskAdded {\n* 1. `CrossFeatureRoute` have valid `targetClassPath`?;\n* 2. Target view (`Fragment` or `Dialog`) of `CrossFeatureRoute` implements `CrossFeatureFragment` interface?;\n*\n+ * **Note**: supported only `.kt` source files parsing.\n+ *\n* ## You can setup this task by modifying these fields:\n* * [shouldSkipValidation];\n* * [ignoredDirectories];\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-915 Added note about Kotlin into documentation and release_notes |
652,316 | 16.04.2020 18:06:51 | -10,800 | 92c1192d4e1db5d4f620a7e6569ec78e7aa5c145 | Add nested fragments to tabs | [
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/di/supplier/callbacks/FragmentNavigationSupplierCallbacks.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/di/supplier/callbacks/FragmentNavigationSupplierCallbacks.kt",
"diff": "@@ -46,7 +46,7 @@ open class FragmentNavigationSupplierCallbacks(\noverride fun onFragmentActivityCreated(fm: FragmentManager, f: Fragment, savedInstanceState: Bundle?) {\nval id = getFragmentId(f)\nval containerId = getContainerId(f) ?: return\n- addHolder(id, containerId, fm, savedInstanceState)\n+ addHolder(id, containerId, f.childFragmentManager, savedInstanceState)\n}\noverride fun onFragmentSaveInstanceState(fm: FragmentManager, f: Fragment, outState: Bundle) {\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/auth/AuthFragment.kt",
"new_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/auth/AuthFragment.kt",
"diff": "@@ -6,7 +6,7 @@ import android.view.View\nimport android.view.ViewGroup\nimport androidx.fragment.app.Fragment\nimport kotlinx.android.synthetic.main.fragment_auth.*\n-import ru.surfstudio.android.navigation.command.fragment.Replace\n+import ru.surfstudio.android.navigation.command.fragment.ReplaceHard\nimport ru.surfstudio.android.navigation.sample.R\nimport ru.surfstudio.android.navigation.sample.app.App\nimport ru.surfstudio.android.navigation.sample.app.screen.main.MainRoute\n@@ -18,6 +18,6 @@ class AuthFragment : Fragment() {\noverride fun onActivityCreated(savedInstanceState: Bundle?) {\nsuper.onActivityCreated(savedInstanceState)\n- auth_btn.setOnClickListener { App.navigator.execute(Replace(MainRoute())) }\n+ auth_btn.setOnClickListener { App.navigator.execute(ReplaceHard(MainRoute())) }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/tabs/home/HomeTabFragment.kt",
"new_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/tabs/home/HomeTabFragment.kt",
"diff": "@@ -5,11 +5,20 @@ import android.view.LayoutInflater\nimport android.view.View\nimport android.view.ViewGroup\nimport androidx.fragment.app.Fragment\n+import kotlinx.android.synthetic.main.fragment_home.*\n+import ru.surfstudio.android.navigation.command.fragment.Replace\nimport ru.surfstudio.android.navigation.sample.R\n+import ru.surfstudio.android.navigation.sample.app.App\n+import ru.surfstudio.android.navigation.sample.app.screen.main.tabs.home.nested.HomeNestedRoute\nclass HomeTabFragment : Fragment() {\noverride fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {\nreturn inflater.inflate(R.layout.fragment_home, container, false)\n}\n+\n+ override fun onActivityCreated(savedInstanceState: Bundle?) {\n+ super.onActivityCreated(savedInstanceState)\n+ home_add_btn.setOnClickListener { App.navigator.execute(Replace(HomeNestedRoute(), sourceTag = tag!!)) }\n+ }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/tabs/home/nested/HomeNestedFragment.kt",
"diff": "+package ru.surfstudio.android.navigation.sample.app.screen.main.tabs.home.nested\n+\n+import android.os.Bundle\n+import android.view.LayoutInflater\n+import android.view.View\n+import android.view.ViewGroup\n+import androidx.fragment.app.Fragment\n+import kotlinx.android.synthetic.main.fragment_home_nested.*\n+import ru.surfstudio.android.navigation.command.fragment.Replace\n+import ru.surfstudio.android.navigation.sample.R\n+import ru.surfstudio.android.navigation.sample.app.App\n+\n+class HomeNestedFragment : Fragment() {\n+\n+ override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {\n+ return inflater.inflate(R.layout.fragment_home_nested, container, false)\n+ }\n+\n+ override fun onActivityCreated(savedInstanceState: Bundle?) {\n+ super.onActivityCreated(savedInstanceState)\n+ val currentOrder = HomeNestedRoute(arguments).order\n+ home_nested_tv.text = \"Home\\nNested\\nFragment\\n#$currentOrder\"\n+ val nextOrder = currentOrder + 1\n+ home_nested_add_btn.setOnClickListener { App.navigator.execute(Replace(HomeNestedRoute(nextOrder), sourceTag = tag!!)) }\n+ }\n+\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/tabs/home/nested/HomeNestedRoute.kt",
"diff": "+package ru.surfstudio.android.navigation.sample.app.screen.main.tabs.home.nested\n+\n+import android.os.Bundle\n+import androidx.core.os.bundleOf\n+import androidx.fragment.app.Fragment\n+import ru.surfstudio.android.navigation.route.Route\n+import ru.surfstudio.android.navigation.route.fragment.FragmentRoute\n+import ru.surfstudio.android.navigation.route.tab.TabRoute\n+\n+class HomeNestedRoute(\n+ val order: Int = 1\n+) : FragmentRoute(), TabRoute {\n+\n+ constructor(bundle: Bundle?) : this(bundle?.getInt(Route.EXTRA_FIRST) ?: 0)\n+\n+ override fun getScreenClass(): Class<out Fragment>? = HomeNestedFragment::class.java\n+\n+ override fun prepareData(): Bundle? = bundleOf(Route.EXTRA_FIRST to order)\n+\n+ override fun getTag(): String = super.getTag() + order\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/splash/SplashFragment.kt",
"new_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/splash/SplashFragment.kt",
"diff": "@@ -6,18 +6,19 @@ import android.view.LayoutInflater\nimport android.view.View\nimport android.view.ViewGroup\nimport androidx.fragment.app.Fragment\n-import ru.surfstudio.android.navigation.command.fragment.Replace\n+import ru.surfstudio.android.navigation.command.fragment.ReplaceHard\nimport ru.surfstudio.android.navigation.sample.R\nimport ru.surfstudio.android.navigation.sample.app.App\nimport ru.surfstudio.android.navigation.sample.app.screen.auth.AuthRoute\nclass SplashFragment : Fragment() {\n+\noverride fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {\nreturn inflater.inflate(R.layout.fragment_splash, container, false)\n}\noverride fun onActivityCreated(savedInstanceState: Bundle?) {\nsuper.onActivityCreated(savedInstanceState)\n- Handler().postDelayed({ App.navigator.execute(Replace(AuthRoute())) }, 1500L)\n+ Handler().postDelayed({ App.navigator.execute(ReplaceHard(AuthRoute())) }, 1500L)\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/sample/src/main/res/layout/fragment_home.xml",
"new_path": "navigation/sample/src/main/res/layout/fragment_home.xml",
"diff": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n-<TextView xmlns:android=\"http://schemas.android.com/apk/res/android\"\n+<FrameLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"match_parent\"\n+ android:background=\"@android:color/holo_blue_light\">\n+\n+ <TextView\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"match_parent\"\n- android:background=\"@android:color/holo_blue_light\"\nandroid:gravity=\"center\"\nandroid:text=\"Home\\nFragment\"\nandroid:textSize=\"24sp\" />\n+\n+ <Button\n+ android:id=\"@+id/home_add_btn\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"wrap_content\"\n+ android:layout_gravity=\"bottom\"\n+ android:layout_margin=\"16dp\"\n+ android:text=\"Add\" />\n+</FrameLayout>\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "navigation/sample/src/main/res/layout/fragment_home_nested.xml",
"diff": "+<?xml version=\"1.0\" encoding=\"utf-8\"?>\n+<FrameLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"match_parent\"\n+ android:background=\"@android:color/holo_blue_light\">\n+\n+ <TextView\n+ android:id=\"@+id/home_nested_tv\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"match_parent\"\n+ android:gravity=\"center\"\n+ android:text=\"Home\\nFragment\"\n+ android:textSize=\"24sp\" />\n+\n+ <Button\n+ android:id=\"@+id/home_nested_add_btn\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"wrap_content\"\n+ android:layout_gravity=\"bottom\"\n+ android:layout_margin=\"16dp\"\n+ android:text=\"Add screen again\" />\n+</FrameLayout>\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-312 Add nested fragments to tabs |
652,300 | 16.04.2020 19:35:43 | -14,400 | a5918cc2cbf57b292d873f8d99505b8fb2c75f8b | PaginationBundle moved out of datalist modules back to mvi-sample | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/components.json",
"new_path": "buildSrc/components.json",
"diff": "}\n],\n\"android_standard_dependencies\": [\n- {\n- \"name\": \"easyadapter\",\n- \"type\": \"implementation\"\n- },\n{\n\"name\": \"rx-extension\",\n\"type\": \"implementation\"\n}\n],\n\"android_standard_dependencies\": [\n- {\n- \"name\": \"easyadapter\",\n- \"type\": \"implementation\"\n- },\n{\n\"name\": \"logger\",\n\"type\": \"implementation\"\n"
},
{
"change_type": "MODIFY",
"old_path": "datalist/RELEASE_NOTES.md",
"new_path": "datalist/RELEASE_NOTES.md",
"diff": "# Datalist Release Notes\n## 0.5.0-alpha\n##### Datalist-limit-offset\n-* ANDDEP-969 module now depends on `easyadapter` module;\n-* ANDDEP-969 Added `PaginationBundle` class;\n-##### Datalist-page-count\n-* ANDDEP-969 module now depends on `easyadapter` module;\n-* ANDDEP-969 Added `PaginationBundle` class;\n+* TODO\n## 0.4.0\n##### Datalist-limit-offset\n* ANDDEP-242 Added the ability to force filtering in the DataList.merge method according to custom criteria to eliminate the same elements\n"
},
{
"change_type": "DELETE",
"old_path": "datalist/lib-datalist-page-count/src/main/java/ru/surfstudio/android/datalistpagecount/ui/PaginationBundle.kt",
"new_path": null,
"diff": "-package ru.surfstudio.android.datalistpagecount.ui\n-\n-import ru.surfstudio.android.datalistpagecount.domain.datalist.DataList\n-import ru.surfstudio.android.easyadapter.pagination.PaginationState\n-\n-/**\n- * UI representation of paginated `DataList`.\n- * */\n-class PaginationBundle<T>(\n- val data: DataList<T>? = null,\n- val state: PaginationState? = null\n-) {\n-\n- val hasData = !data.isNullOrEmpty()\n-\n- /**\n- * Check that `data` and `state` is exist and if so - execute `callback`,\n- * do nothing otherwise.\n- * */\n- fun safeGet(callback: (DataList<T>, PaginationState) -> Unit) {\n- callback(data ?: return, state ?: return)\n- }\n-\n- /**\n- * Transform type of `PaginationBundle` and it's data.\n- * */\n- fun <R> transform(action: (T) -> R): PaginationBundle<R> {\n- return PaginationBundle(data?.transform(action), state)\n- }\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "RENAME",
"old_path": "datalist/lib-datalist-limit-offset/src/main/java/ru/surfstudio/android/datalistlimitoffset/ui/PaginationBundle.kt",
"new_path": "mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/data/PaginationBundle.kt",
"diff": "-package ru.surfstudio.android.datalistlimitoffset.ui\n+package ru.surfstudio.android.core.mvi.sample.ui.data\nimport ru.surfstudio.android.datalistlimitoffset.domain.datalist.DataList\nimport ru.surfstudio.android.easyadapter.pagination.PaginationState\n"
},
{
"change_type": "MODIFY",
"old_path": "mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/reducer_based/kitties/all/KittiesAllReducer.kt",
"new_path": "mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/reducer_based/kitties/all/KittiesAllReducer.kt",
"diff": "@@ -2,6 +2,7 @@ package ru.surfstudio.android.core.mvi.sample.ui.screen.reducer_based.kitties.al\nimport ru.surfstudio.android.core.mvi.impls.ui.reactor.BaseReactorDependency\nimport ru.surfstudio.android.core.mvi.impls.ui.reducer.BaseReducer\n+import ru.surfstudio.android.core.mvi.sample.ui.data.PaginationBundle\nimport ru.surfstudio.android.core.mvi.sample.ui.screen.reducer_based.kitties.all.KittiesAllEvent.LoadKittiesRequestEvent\nimport ru.surfstudio.android.core.mvi.sample.ui.screen.reducer_based.kitties.data.KittenUi\nimport ru.surfstudio.android.core.mvi.sample.ui.screen.reducer_based.kitties.util.RequestMappers\n@@ -12,7 +13,6 @@ import ru.surfstudio.android.core.mvp.binding.rx.request.data.RequestUi\nimport ru.surfstudio.android.core.mvp.binding.rx.request.data.SwipeRefreshLoading\nimport ru.surfstudio.android.core.mvp.binding.rx.request.data.TransparentLoading\nimport ru.surfstudio.android.dagger.scope.PerScreen\n-import ru.surfstudio.android.datalistlimitoffset.ui.PaginationBundle\nimport javax.inject.Inject\ninternal data class KittiesAllState(\n"
},
{
"change_type": "MODIFY",
"old_path": "mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/reducer_based/kitties/util/RequestMappers.kt",
"new_path": "mvi/sample/src/main/java/ru/surfstudio/android/core/mvi/sample/ui/screen/reducer_based/kitties/util/RequestMappers.kt",
"diff": "package ru.surfstudio.android.core.mvi.sample.ui.screen.reducer_based.kitties.util\n+import ru.surfstudio.android.core.mvi.sample.ui.data.PaginationBundle\nimport ru.surfstudio.android.core.mvi.ui.mapper.RequestDataMapper\nimport ru.surfstudio.android.core.mvi.ui.mapper.RequestErrorHandler\nimport ru.surfstudio.android.core.mvi.ui.mapper.RequestLoadingMapper\nimport ru.surfstudio.android.core.mvp.binding.rx.request.data.*\nimport ru.surfstudio.android.core.mvp.error.ErrorHandler\nimport ru.surfstudio.android.datalistlimitoffset.domain.datalist.DataList\n-import ru.surfstudio.android.datalistlimitoffset.ui.PaginationBundle\nimport ru.surfstudio.android.easyadapter.pagination.PaginationState\nimport ru.surfstudio.android.rx.extension.scheduler.MainThreadImmediateScheduler\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-969 PaginationBundle moved out of datalist modules back to mvi-sample |
652,335 | 16.04.2020 21:42:34 | -10,800 | 4f86473b3032b3fe609e88efc1cd36ef6c3c9bb7 | Increase global alpha version counter to 113 [skip ci] [version] | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/components.json",
"new_path": "buildSrc/components.json",
"diff": "{\n\"id\": \"mvi\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 15,\n+ \"unstable_version\": 16,\n\"stable\": false,\n\"dir\": \"mvi\",\n\"libs\": [\n{\n\"id\": \"core-mvp-binding\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 11,\n+ \"unstable_version\": 12,\n\"stable\": false,\n\"dir\": \"core-mvp-binding\",\n\"libs\": [\n{\n\"id\": \"template\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 22,\n+ \"unstable_version\": 23,\n\"stable\": false,\n\"dir\": \"template\",\n\"libs\": [],\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/projectConfiguration.json",
"new_path": "buildSrc/projectConfiguration.json",
"diff": "{\n\"version\": \"0.5.0\",\n\"stable\": false,\n- \"unstable_version\": 112,\n+ \"unstable_version\": 113,\n\"project_snapshot_name\": \"\",\n\"project_snapshot_version\": 0\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Increase global alpha version counter to 113 [skip ci] [version] |
652,316 | 16.04.2020 22:06:10 | -10,800 | e890483cb4b3ecf9c72a4f75f8df42d07320a08a | Fix tabFragment removal logic | [
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/command/fragment/RemoveLast.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/command/fragment/RemoveLast.kt",
"diff": "@@ -5,14 +5,20 @@ import ru.surfstudio.android.navigation.animation.resource.EmptyResourceAnimatio\nimport ru.surfstudio.android.navigation.command.fragment.base.FragmentNavigationCommand\nimport ru.surfstudio.android.navigation.route.fragment.FragmentRoute\nimport ru.surfstudio.android.navigation.route.stub.StubFragmentRoute\n+import ru.surfstudio.android.navigation.route.stub.StubTabFragmentRoute\n/**\n* Remove last screen from current stack and switch to previous.\n+ *\n+ * @param animations animations [Animations] used to specify navigation transition appearance\n+ * @param sourceTag tag of a source screen, which will execute navigation command.\n+ * @param isTab - are we removing fragment from tab navigator, or from default navigator\n*/\ndata class RemoveLast(\noverride val animations: Animations = EmptyResourceAnimations,\n- override val sourceTag: String = \"\"\n+ override val sourceTag: String = \"\",\n+ val isTab: Boolean = false\n) : FragmentNavigationCommand {\n- override val route: FragmentRoute = StubFragmentRoute\n+ override val route: FragmentRoute = if (isTab) StubTabFragmentRoute else StubFragmentRoute\n}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/route/stub/StubTabFragmentRoute.kt",
"diff": "+package ru.surfstudio.android.navigation.route.stub\n+\n+import ru.surfstudio.android.navigation.route.fragment.FragmentRoute\n+import ru.surfstudio.android.navigation.route.tab.TabRoute\n+\n+object StubTabFragmentRoute : FragmentRoute(), TabRoute\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/MainFragment.kt",
"new_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/MainFragment.kt",
"diff": "@@ -6,6 +6,7 @@ import android.view.View\nimport android.view.ViewGroup\nimport androidx.fragment.app.Fragment\nimport kotlinx.android.synthetic.main.fragment_main.*\n+import ru.surfstudio.android.navigation.command.fragment.RemoveLast\nimport ru.surfstudio.android.navigation.command.fragment.Replace\nimport ru.surfstudio.android.navigation.di.FragmentContainer\nimport ru.surfstudio.android.navigation.route.fragment.FragmentRoute\n@@ -15,6 +16,7 @@ import ru.surfstudio.android.navigation.sample.app.screen.main.MainTabType.*\nimport ru.surfstudio.android.navigation.sample.app.screen.main.tabs.cart.CartTabRoute\nimport ru.surfstudio.android.navigation.sample.app.screen.main.tabs.home.HomeTabRoute\nimport ru.surfstudio.android.navigation.sample.app.screen.main.tabs.profile.ProfileTabRoute\n+import ru.surfstudio.android.navigation.sample.app.utils.addOnBackPressedListener\nclass MainFragment : Fragment(), FragmentContainer {\n@@ -27,6 +29,10 @@ class MainFragment : Fragment(), FragmentContainer {\noverride fun onActivityCreated(savedInstanceState: Bundle?) {\nsuper.onActivityCreated(savedInstanceState)\n+ addOnBackPressedListener {\n+ App.navigator.execute(RemoveLast(sourceTag = tag!!, isTab = true))\n+ }\n+\nif (savedInstanceState == null) {\nhome_tab_btn.post { navigateToTab(HOME) }\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/utils/FragmentExtensions.kt",
"diff": "+package ru.surfstudio.android.navigation.sample.app.utils\n+\n+import androidx.activity.OnBackPressedCallback\n+import androidx.fragment.app.Fragment\n+\n+fun Fragment.addOnBackPressedListener(onBackPressed: () -> Unit) {\n+ requireActivity().onBackPressedDispatcher.addCallback(\n+ this,\n+ object : OnBackPressedCallback(true) {\n+ override fun handleOnBackPressed() {\n+ onBackPressed()\n+ }\n+ }\n+ )\n+}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-312 Fix tabFragment removal logic |
652,316 | 16.04.2020 22:36:35 | -10,800 | 64a51829d13b83ee79e1ae20525464b4d56c8ed4 | Add sample backstack data extraction | [
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/command/activity/Finish.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/command/activity/Finish.kt",
"diff": "@@ -4,8 +4,11 @@ import ru.surfstudio.android.navigation.animation.Animations\nimport ru.surfstudio.android.navigation.animation.resource.EmptyResourceAnimations\nimport ru.surfstudio.android.navigation.command.activity.base.ActivityNavigationCommand\nimport ru.surfstudio.android.navigation.route.activity.ActivityRoute\n+import ru.surfstudio.android.navigation.route.stub.StubActivityRoute\ndata class Finish(\n- override val route: ActivityRoute,\noverride val animations: Animations = EmptyResourceAnimations\n-) : ActivityNavigationCommand\n\\ No newline at end of file\n+) : ActivityNavigationCommand {\n+\n+ override val route: ActivityRoute = StubActivityRoute\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/command/activity/FinishAffinity.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/command/activity/FinishAffinity.kt",
"diff": "@@ -4,11 +4,14 @@ import ru.surfstudio.android.navigation.animation.Animations\nimport ru.surfstudio.android.navigation.animation.resource.EmptyResourceAnimations\nimport ru.surfstudio.android.navigation.command.activity.base.ActivityNavigationCommand\nimport ru.surfstudio.android.navigation.route.activity.ActivityRoute\n+import ru.surfstudio.android.navigation.route.stub.StubActivityRoute\n/**\n* Finish current activity task\n*/\ndata class FinishAffinity(\n- override val route: ActivityRoute,\noverride val animations: Animations = EmptyResourceAnimations\n-) : ActivityNavigationCommand\n\\ No newline at end of file\n+) : ActivityNavigationCommand {\n+\n+ override val route: ActivityRoute = StubActivityRoute\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/command/fragment/RemoveAll.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/command/fragment/RemoveAll.kt",
"diff": "@@ -13,7 +13,7 @@ import ru.surfstudio.android.navigation.route.stub.StubTabFragmentRoute\n*\n* @param animations animations [Animations] used to specify navigation transition appearance\n* @param sourceTag tag of a source screen, which will execute navigation command.\n- * @param isTab - are we removing fragment from tab navigator, or from default navigator\n+ * @param isTab are we removing fragment from tab navigator, or from default navigator\n*/\ndata class RemoveAll(\noverride val animations: Animations = EmptyResourceAnimations,\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/command/fragment/RemoveLast.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/command/fragment/RemoveLast.kt",
"diff": "@@ -12,7 +12,7 @@ import ru.surfstudio.android.navigation.route.stub.StubTabFragmentRoute\n*\n* @param animations animations [Animations] used to specify navigation transition appearance\n* @param sourceTag tag of a source screen, which will execute navigation command.\n- * @param isTab - are we removing fragment from tab navigator, or from default navigator\n+ * @param isTab are we removing fragment from tab navigator, or from default navigator\n*/\ndata class RemoveLast(\noverride val animations: Animations = EmptyResourceAnimations,\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/App.kt",
"new_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/App.kt",
"diff": "package ru.surfstudio.android.navigation.sample.app\nimport android.app.Application\n+import ru.surfstudio.android.navigation.di.supplier.ActivityNavigationSupplier\nimport ru.surfstudio.android.navigation.di.supplier.callbacks.ActivityNavigationSupplierCallbacks\nimport ru.surfstudio.android.navigation.executor.AppCommandExecutor\n@@ -8,6 +9,7 @@ class App : Application() {\ncompanion object {\nlateinit var navigator: AppCommandExecutor\n+ lateinit var supplier: ActivityNavigationSupplier\n}\noverride fun onCreate() {\n@@ -16,8 +18,9 @@ class App : Application() {\n}\nprivate fun initExecutor() {\n- val activityCallbacks = ActivityNavigationSupplierCallbacks()\n- registerActivityLifecycleCallbacks(activityCallbacks)\n- navigator = AppCommandExecutor(activityCallbacks)\n+ val callbacksSupplier = ActivityNavigationSupplierCallbacks()\n+ registerActivityLifecycleCallbacks(callbacksSupplier)\n+ navigator = AppCommandExecutor(callbacksSupplier)\n+ supplier = callbacksSupplier\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/MainFragment.kt",
"new_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/MainFragment.kt",
"diff": "@@ -6,9 +6,13 @@ import android.view.View\nimport android.view.ViewGroup\nimport androidx.fragment.app.Fragment\nimport kotlinx.android.synthetic.main.fragment_main.*\n+import ru.surfstudio.android.navigation.command.activity.Finish\n+import ru.surfstudio.android.navigation.command.fragment.RemoveAll\nimport ru.surfstudio.android.navigation.command.fragment.RemoveLast\nimport ru.surfstudio.android.navigation.command.fragment.Replace\nimport ru.surfstudio.android.navigation.di.FragmentContainer\n+import ru.surfstudio.android.navigation.di.supplier.holder.FragmentNavigationHolder\n+import ru.surfstudio.android.navigation.navigator.fragment.tab.TabFragmentNavigator\nimport ru.surfstudio.android.navigation.route.fragment.FragmentRoute\nimport ru.surfstudio.android.navigation.sample.R\nimport ru.surfstudio.android.navigation.sample.app.App\n@@ -30,8 +34,13 @@ class MainFragment : Fragment(), FragmentContainer {\nsuper.onActivityCreated(savedInstanceState)\naddOnBackPressedListener {\n- App.navigator.execute(RemoveLast(sourceTag = tag!!, isTab = true))\n+ when {\n+ hasTabsInStack() -> App.navigator.execute(RemoveLast(sourceTag = tag!!, isTab = true))\n+ else -> App.navigator.execute(Finish())\n}\n+ }\n+\n+ setActiveTabReopenedListener { App.navigator.execute(RemoveAll(sourceTag = tag!!, isTab = true)) }\nif (savedInstanceState == null) {\nhome_tab_btn.post { navigateToTab(HOME) }\n@@ -42,6 +51,11 @@ class MainFragment : Fragment(), FragmentContainer {\nprofile_tab_btn.setOnClickListener { navigateToTab(PROFILE) }\n}\n+ private fun setActiveTabReopenedListener(listener: () -> Unit) {\n+ val tabFragmentNavigator = getFragmentHolder().tabFragmentNavigator as TabFragmentNavigator\n+ tabFragmentNavigator.setActiveTabReopenedListener { listener() }\n+ }\n+\nprivate fun navigateToTab(type: MainTabType) {\nval route: FragmentRoute = when (type) {\nHOME -> HomeTabRoute()\n@@ -50,4 +64,15 @@ class MainFragment : Fragment(), FragmentContainer {\n}\nApp.navigator.execute(Replace(route, sourceTag = tag!!))\n}\n+\n+ private fun hasTabsInStack(): Boolean {\n+ val backStackCount = getFragmentHolder()\n+ .tabFragmentNavigator\n+ .backStackEntryCount\n+ return backStackCount > 1\n+ }\n+\n+ private fun getFragmentHolder(): FragmentNavigationHolder {\n+ return App.supplier.obtain().nestedNavigationSupplier.obtain(tag!!)\n+ }\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-312 Add sample backstack data extraction |
652,316 | 16.04.2020 22:37:03 | -10,800 | 3129b94b17d053f3e329a615942f90f81582567a | Fragment holder creation moved to onViewCreated stage | [
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/di/supplier/callbacks/FragmentNavigationSupplierCallbacks.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/di/supplier/callbacks/FragmentNavigationSupplierCallbacks.kt",
"diff": "package ru.surfstudio.android.navigation.di.supplier.callbacks\nimport android.os.Bundle\n+import android.view.View\nimport androidx.appcompat.app.AppCompatActivity\nimport androidx.fragment.app.Fragment\nimport androidx.fragment.app.FragmentActivity\n@@ -43,7 +44,7 @@ open class FragmentNavigationSupplierCallbacks(\nactiveFragments.add(f)\n}\n- override fun onFragmentActivityCreated(fm: FragmentManager, f: Fragment, savedInstanceState: Bundle?) {\n+ override fun onFragmentViewCreated(fm: FragmentManager, f: Fragment, v: View, savedInstanceState: Bundle?) {\nval id = getFragmentId(f)\nval containerId = getContainerId(f) ?: return\naddHolder(id, containerId, f.childFragmentManager, savedInstanceState)\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-312 Fragment holder creation moved to onViewCreated stage |
652,316 | 16.04.2020 22:51:38 | -10,800 | 05b03c34791839e0161f37341e899e9ca1397237 | Add TabFragmentNavigatorInterface, divide fragment navigators | [
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/di/supplier/holder/FragmentNavigationHolder.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/di/supplier/holder/FragmentNavigationHolder.kt",
"diff": "package ru.surfstudio.android.navigation.di.supplier.holder\nimport ru.surfstudio.android.navigation.navigator.fragment.FragmentNavigatorInterface\n+import ru.surfstudio.android.navigation.navigator.fragment.tab.TabFragmentNavigatorInterface\nopen class FragmentNavigationHolder(\nval fragmentNavigator: FragmentNavigatorInterface,\n- val tabFragmentNavigator: FragmentNavigatorInterface\n+ val tabFragmentNavigator: TabFragmentNavigatorInterface\n)\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/navigator/fragment/FragmentNavigator.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/navigator/fragment/FragmentNavigator.kt",
"diff": "@@ -39,10 +39,6 @@ open class FragmentNavigator(\nsavedState: Bundle? = null\n) : FragmentNavigatorInterface {\n- init {\n- onRestoreState(savedState)\n- }\n-\nprotected val backStack: FragmentBackStack = FragmentBackStack()\noverride val backStackEntryCount: Int\n@@ -52,6 +48,10 @@ open class FragmentNavigator(\nprotected open var animationSupplier = FragmentAnimationSupplier()\n+ init {\n+ onRestoreState(savedState)\n+ }\n+\noverride fun add(route: FragmentRoute, animations: Animations) {\nval fragmentManager = fragmentManager\nfragmentManager.executePendingTransactions()\n@@ -210,7 +210,7 @@ open class FragmentNavigator(\noutState.putSerializable(stackKey, ArrayList(outStack))\n}\n- override fun onRestoreState(savedInstanceState: Bundle?) {\n+ final override fun onRestoreState(savedInstanceState: Bundle?) {\nval stackKey = getBackStackKey()\nval inStack = savedInstanceState?.getSerializable(stackKey) as? ArrayList<FragmentBackStackEntryObj>\n?: return\n@@ -227,14 +227,14 @@ open class FragmentNavigator(\n/**\n* Add listener to observe back stack changes\n*/\n- fun addBackStackChangeListener(listener: BackStackChangedListener) {\n+ override fun addBackStackChangeListener(listener: BackStackChangedListener) {\nbackStackChangedListeners.add(listener)\n}\n/**\n* Remove listener used to observe back stack changes\n*/\n- fun removeBackStackChangeListener(listener: BackStackChangedListener) {\n+ override fun removeBackStackChangeListener(listener: BackStackChangedListener) {\nbackStackChangedListeners.remove(listener)\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/navigator/fragment/FragmentNavigatorInterface.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/navigator/fragment/FragmentNavigatorInterface.kt",
"diff": "@@ -4,6 +4,7 @@ import android.os.Bundle\nimport androidx.fragment.app.FragmentManager\nimport ru.surfstudio.android.navigation.animation.Animations\nimport ru.surfstudio.android.navigation.animation.resource.EmptyResourceAnimations\n+import ru.surfstudio.android.navigation.backstack.fragment.listener.BackStackChangedListener\nimport ru.surfstudio.android.navigation.route.fragment.FragmentRoute\n/**\n@@ -53,4 +54,8 @@ interface FragmentNavigatorInterface {\nfun onSaveState(outState: Bundle?)\nfun onRestoreState(savedInstanceState: Bundle?)\n+\n+ fun addBackStackChangeListener(listener: BackStackChangedListener)\n+\n+ fun removeBackStackChangeListener(listener: BackStackChangedListener)\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/navigator/fragment/tab/TabFragmentNavigator.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/navigator/fragment/tab/TabFragmentNavigator.kt",
"diff": "@@ -29,7 +29,7 @@ open class TabFragmentNavigator(\nprotected val fragmentManager: FragmentManager,\nprotected val containerId: Int,\nsavedState: Bundle? = null\n-) : FragmentNavigatorInterface {\n+) : TabFragmentNavigatorInterface {\nprivate var activeTabTag: String = \"\"\n@@ -43,6 +43,9 @@ open class TabFragmentNavigator(\noverride val backStackEntryCount: Int\nget() = activeNavigator.backStackEntryCount\n+ override val tabCount: Int\n+ get() = hostEntries.size\n+\ninit {\nonRestoreState(savedState)\n}\n@@ -51,7 +54,7 @@ open class TabFragmentNavigator(\nif (route is TabRootRoute) {\nopenTab(route)\n} else {\n- activeNavigator.add(route, animations) // TODO support common navigation algorithm without tabs\n+ activeNavigator.add(route, animations)\n}\n}\n@@ -59,7 +62,7 @@ open class TabFragmentNavigator(\nif (route is TabRootRoute) {\nopenTab(route)\n} else {\n- activeNavigator.replace(route, animations) // TODO support common navigation algorithm without tabs\n+ activeNavigator.replace(route, animations)\n}\n}\n@@ -112,15 +115,15 @@ open class TabFragmentNavigator(\nactiveTabTag = savedInstanceState.getString(EXTRA_ACTIVE_TAG) ?: \"\"\n}\n- fun addBackStackChangeListener(listener: BackStackChangedListener) {\n+ override fun addBackStackChangeListener(listener: BackStackChangedListener) {\nactiveNavigator.addBackStackChangeListener(listener)\n}\n- fun removeBackStackChangeListener(listener: BackStackChangedListener) {\n+ override fun removeBackStackChangeListener(listener: BackStackChangedListener) {\nactiveNavigator.removeBackStackChangeListener(listener)\n}\n- fun setActiveTabReopenedListener(listener: ActiveTabReopenedListener) {\n+ override fun setActiveTabReopenedListener(listener: ActiveTabReopenedListener) {\nactiveTabReopenedListener = listener\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/navigator/fragment/tab/TabFragmentNavigatorInterface.kt",
"diff": "+package ru.surfstudio.android.navigation.navigator.fragment.tab\n+\n+import ru.surfstudio.android.navigation.navigator.fragment.FragmentNavigatorInterface\n+import ru.surfstudio.android.navigation.navigator.fragment.tab.listener.ActiveTabReopenedListener\n+\n+interface TabFragmentNavigatorInterface : FragmentNavigatorInterface {\n+\n+ val tabCount: Int\n+\n+ fun setActiveTabReopenedListener(listener: ActiveTabReopenedListener)\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/MainFragment.kt",
"new_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/MainFragment.kt",
"diff": "@@ -51,9 +51,10 @@ class MainFragment : Fragment(), FragmentContainer {\nprofile_tab_btn.setOnClickListener { navigateToTab(PROFILE) }\n}\n- private fun setActiveTabReopenedListener(listener: () -> Unit) {\n- val tabFragmentNavigator = getFragmentHolder().tabFragmentNavigator as TabFragmentNavigator\n- tabFragmentNavigator.setActiveTabReopenedListener { listener() }\n+ private fun setActiveTabReopenedListener(listener: (String) -> Unit) {\n+ getFragmentHolder()\n+ .tabFragmentNavigator\n+ .setActiveTabReopenedListener(listener)\n}\nprivate fun navigateToTab(type: MainTabType) {\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-312 Add TabFragmentNavigatorInterface, divide fragment navigators |
652,312 | 16.04.2020 22:58:41 | -10,800 | 80c3544ff934c20fb322ba115f2d50c9f78c583c | Final local mirror fix | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/androidSample.gradle",
"new_path": "buildSrc/androidSample.gradle",
"diff": "@@ -38,8 +38,13 @@ android {\n}\nconfigurations.all {\n+ resolutionStrategy {\n+ dependencySubstitution {\nif (GradlePropertiesManager.isCurrentComponentAMirror()) {\n- exclude group: \"ru.surfstudio.android\", module: GradlePropertiesManager.componentMirrorName\n+ def componentMirrorName = GradlePropertiesManager.componentMirrorName\n+ substitute module(\"ru.surfstudio.android:${componentMirrorName}\") with project(\":$componentMirrorName\")\n+ }\n+ }\n}\n}\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-1020 Final local mirror fix |
652,316 | 16.04.2020 23:13:53 | -10,800 | ffe0285af9aacdbb5b511aca4cd208cdbde123d3 | Remove redundant post operator from sample | [
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/fragment/FragmentCommandExecutor.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/fragment/FragmentCommandExecutor.kt",
"diff": "@@ -13,7 +13,7 @@ open class FragmentCommandExecutor(\noverride fun execute(command: FragmentNavigationCommand) {\nval activityHolder = activityNavigationSupplier.obtain()\n- val fragmentNavigationHolder = activityHolder.nestedNavigationSupplier.obtain(command.sourceTag)\n+ val fragmentNavigationHolder = activityHolder.fragmentSupplier.obtain(command.sourceTag)\nval tabFragmentNavigator = fragmentNavigationHolder.tabFragmentNavigator\nval fragmentNavigator = fragmentNavigationHolder.fragmentNavigator\nwhen (command.route) {\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/supplier/callbacks/ActivityNavigationSupplierCallbacks.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/supplier/callbacks/ActivityNavigationSupplierCallbacks.kt",
"diff": "@@ -69,7 +69,7 @@ open class ActivityNavigationSupplierCallbacks(\noverride fun onActivitySaveInstanceState(activity: Activity, outState: Bundle?) {\nsafeRequireActivityId(activity) { id ->\n- val nestedSupplier = navigatorHolders[id]?.nestedNavigationSupplier\n+ val nestedSupplier = navigatorHolders[id]?.fragmentSupplier\nval castedNestedSupplier = nestedSupplier as? FragmentNavigationSupplierCallbacks\ncastedNestedSupplier?.onActivitySaveState(outState)\n}\n@@ -85,13 +85,13 @@ open class ActivityNavigationSupplierCallbacks(\nprivate fun destroyHolder(activity: Activity) {\nsafeRequireActivityId(activity) { id ->\n- val nestedSupplier = navigatorHolders[id]?.nestedNavigationSupplier\n- unregisterNestedNavigationSupplier(activity, nestedSupplier)\n+ val nestedSupplier = navigatorHolders[id]?.fragmentSupplier\n+ unregisterFragmentNavigationSupplier(activity, nestedSupplier)\nnavigatorHolders.remove(id)\n}\n}\n- private fun registerNestedNavigationSupplier(\n+ private fun registerFragmentNavigationSupplier(\nactivity: Activity,\nnestedNavigationSupplier: FragmentNavigationSupplierCallbacks\n) {\n@@ -100,7 +100,7 @@ open class ActivityNavigationSupplierCallbacks(\nfragmentManager.registerFragmentLifecycleCallbacks(nestedNavigationSupplier, true)\n}\n- private fun unregisterNestedNavigationSupplier(\n+ private fun unregisterFragmentNavigationSupplier(\nactivity: Activity,\nnestedNavigationSupplier: FragmentNavigationSupplier?\n) {\n@@ -114,7 +114,7 @@ open class ActivityNavigationSupplierCallbacks(\nrequire(activity is AppCompatActivity) { \"All activities with ActivityNavigationHolders should implement AppCompatActivity!\" }\nval nestedNavigationSupplier = nestedCallbacksCreator(activity, savedInstanceState)\n- registerNestedNavigationSupplier(activity, nestedNavigationSupplier)\n+ registerFragmentNavigationSupplier(activity, nestedNavigationSupplier)\nval activityNavigator = ActivityNavigator(activity)\nval dialogNavigator = DialogNavigator(activity)\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/supplier/holder/ActivityNavigationHolder.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/supplier/holder/ActivityNavigationHolder.kt",
"diff": "package ru.surfstudio.android.navigation.supplier.holder\n-import androidx.appcompat.app.AppCompatActivity\nimport ru.surfstudio.android.navigation.supplier.FragmentNavigationSupplier\nimport ru.surfstudio.android.navigation.navigator.activity.ActivityNavigatorInterface\nimport ru.surfstudio.android.navigation.navigator.dialog.DialogNavigatorInterface\n@@ -8,5 +7,5 @@ import ru.surfstudio.android.navigation.navigator.dialog.DialogNavigatorInterfac\nopen class ActivityNavigationHolder(\nval activityNavigator: ActivityNavigatorInterface,\nval dialogNavigator: DialogNavigatorInterface,\n- val nestedNavigationSupplier: FragmentNavigationSupplier\n+ val fragmentSupplier: FragmentNavigationSupplier\n)\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/MainFragment.kt",
"new_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/MainFragment.kt",
"diff": "@@ -42,7 +42,7 @@ class MainFragment : Fragment(), FragmentContainer {\nsetActiveTabReopenedListener { App.navigator.execute(RemoveAll(sourceTag = tag!!, isTab = true)) }\nif (savedInstanceState == null) {\n- home_tab_btn.post { navigateToTab(HOME) }\n+ navigateToTab(HOME)\n}\nhome_tab_btn.setOnClickListener { navigateToTab(HOME) }\n@@ -73,6 +73,9 @@ class MainFragment : Fragment(), FragmentContainer {\n}\nprivate fun getFragmentHolder(): FragmentNavigationHolder {\n- return App.supplier.obtain().nestedNavigationSupplier.obtain(tag!!)\n+ return App.supplier\n+ .obtain()\n+ .fragmentSupplier\n+ .obtain(tag!!)\n}\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-312 Remove redundant post operator from sample |
652,316 | 16.04.2020 23:23:35 | -10,800 | ae6309f0a33c63ad21844296f93448d3f9ba0e31 | Add animations to sample | [
{
"change_type": "MODIFY",
"old_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/SingleActivity.kt",
"new_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/SingleActivity.kt",
"diff": "@@ -8,6 +8,8 @@ import ru.surfstudio.android.navigation.supplier.id.IdentifiableScreen\nimport ru.surfstudio.android.navigation.sample.R\nimport ru.surfstudio.android.navigation.sample.app.App\nimport ru.surfstudio.android.navigation.sample.app.screen.splash.SplashRoute\n+import ru.surfstudio.android.navigation.sample.app.utils.animations.FadeAnimations\n+import ru.surfstudio.android.navigation.sample.app.utils.animations.SlideAnimations\nclass SingleActivity : AppCompatActivity(), IdentifiableScreen, FragmentContainer {\n@@ -19,7 +21,7 @@ class SingleActivity : AppCompatActivity(), IdentifiableScreen, FragmentContaine\nsuper.onCreate(savedInstanceState)\nsetContentView(R.layout.activity_single)\nif (savedInstanceState == null) { //Adding fragment only on first create\n- App.navigator.execute(Add(SplashRoute()))\n+ App.navigator.execute(Add(SplashRoute(), FadeAnimations()))\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/auth/AuthFragment.kt",
"new_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/auth/AuthFragment.kt",
"diff": "@@ -10,6 +10,7 @@ import ru.surfstudio.android.navigation.command.fragment.ReplaceHard\nimport ru.surfstudio.android.navigation.sample.R\nimport ru.surfstudio.android.navigation.sample.app.App\nimport ru.surfstudio.android.navigation.sample.app.screen.main.MainRoute\n+import ru.surfstudio.android.navigation.sample.app.utils.animations.SlideAnimations\nclass AuthFragment : Fragment() {\n@@ -18,6 +19,6 @@ class AuthFragment : Fragment() {\noverride fun onActivityCreated(savedInstanceState: Bundle?) {\nsuper.onActivityCreated(savedInstanceState)\n- auth_btn.setOnClickListener { App.navigator.execute(ReplaceHard(MainRoute())) }\n+ auth_btn.setOnClickListener { App.navigator.execute(ReplaceHard(MainRoute(), SlideAnimations())) }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/MainFragment.kt",
"new_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/MainFragment.kt",
"diff": "@@ -20,6 +20,7 @@ import ru.surfstudio.android.navigation.sample.app.screen.main.tabs.cart.CartTab\nimport ru.surfstudio.android.navigation.sample.app.screen.main.tabs.home.HomeTabRoute\nimport ru.surfstudio.android.navigation.sample.app.screen.main.tabs.profile.ProfileTabRoute\nimport ru.surfstudio.android.navigation.sample.app.utils.addOnBackPressedListener\n+import ru.surfstudio.android.navigation.sample.app.utils.animations.FadeAnimations\nclass MainFragment : Fragment(), FragmentContainer {\n@@ -62,7 +63,7 @@ class MainFragment : Fragment(), FragmentContainer {\nCART -> CartTabRoute()\nPROFILE -> ProfileTabRoute()\n}\n- App.navigator.execute(Replace(route, sourceTag = tag!!))\n+ App.navigator.execute(Replace(route, FadeAnimations(), tag!!))\n}\nprivate fun hasTabsInStack(): Boolean {\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/splash/SplashFragment.kt",
"new_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/splash/SplashFragment.kt",
"diff": "@@ -10,6 +10,8 @@ import ru.surfstudio.android.navigation.command.fragment.ReplaceHard\nimport ru.surfstudio.android.navigation.sample.R\nimport ru.surfstudio.android.navigation.sample.app.App\nimport ru.surfstudio.android.navigation.sample.app.screen.auth.AuthRoute\n+import ru.surfstudio.android.navigation.sample.app.utils.animations.FadeAnimations\n+import ru.surfstudio.android.navigation.sample.app.utils.animations.SlideAnimations\nclass SplashFragment : Fragment() {\n@@ -19,6 +21,8 @@ class SplashFragment : Fragment() {\noverride fun onActivityCreated(savedInstanceState: Bundle?) {\nsuper.onActivityCreated(savedInstanceState)\n- Handler().postDelayed({ App.navigator.execute(ReplaceHard(AuthRoute())) }, 1500L)\n+ Handler().postDelayed({\n+ App.navigator.execute(ReplaceHard(AuthRoute(), SlideAnimations()))\n+ }, 1500L)\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "navigation/sample/src/main/res/anim/fade_in_fast.xml",
"diff": "+<?xml version=\"1.0\" encoding=\"utf-8\"?>\n+<alpha xmlns:android=\"http://schemas.android.com/apk/res/android\"\n+ android:duration=\"@android:integer/config_shortAnimTime\"\n+ android:fromAlpha=\"0.0\"\n+ android:interpolator=\"@android:anim/accelerate_interpolator\"\n+ android:fillAfter=\"true\"\n+ android:toAlpha=\"1.0\" />\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "navigation/sample/src/main/res/anim/fade_out_fast.xml",
"diff": "+<?xml version=\"1.0\" encoding=\"utf-8\"?>\n+<alpha xmlns:android=\"http://schemas.android.com/apk/res/android\"\n+ android:duration=\"@android:integer/config_shortAnimTime\"\n+ android:fillAfter=\"true\"\n+ android:fromAlpha=\"1.0\"\n+ android:interpolator=\"@android:anim/accelerate_interpolator\"\n+ android:toAlpha=\"0.0\" />\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "navigation/sample/src/main/res/anim/slide_in_left.xml",
"diff": "+<?xml version=\"1.0\" encoding=\"utf-8\"?>\n+<translate xmlns:android=\"http://schemas.android.com/apk/res/android\"\n+ android:duration=\"@android:integer/config_shortAnimTime\"\n+ android:fromXDelta=\"-100%p\"\n+ android:toXDelta=\"0%p\" />\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "navigation/sample/src/main/res/anim/slide_in_right.xml",
"diff": "+<?xml version=\"1.0\" encoding=\"utf-8\"?>\n+<translate xmlns:android=\"http://schemas.android.com/apk/res/android\"\n+ android:duration=\"@android:integer/config_shortAnimTime\"\n+ android:fromXDelta=\"100%p\"\n+ android:toXDelta=\"0%p\" />\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "navigation/sample/src/main/res/anim/slide_out_left.xml",
"diff": "+<?xml version=\"1.0\" encoding=\"utf-8\"?>\n+<translate xmlns:android=\"http://schemas.android.com/apk/res/android\"\n+ android:duration=\"@android:integer/config_shortAnimTime\"\n+ android:fromXDelta=\"0%p\"\n+ android:toXDelta=\"-100%p\" />\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "navigation/sample/src/main/res/anim/slide_out_right.xml",
"diff": "+<?xml version=\"1.0\" encoding=\"utf-8\"?>\n+<translate xmlns:android=\"http://schemas.android.com/apk/res/android\"\n+ android:duration=\"@android:integer/config_shortAnimTime\"\n+ android:fromXDelta=\"0%p\"\n+ android:toXDelta=\"100%p\" />\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-312 Add animations to sample |
652,312 | 17.04.2020 10:07:25 | -10,800 | f5db6edebfdb6ac3e589b508b87828d0f1c30661 | Latest mirror fix | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/androidSample.gradle",
"new_path": "buildSrc/androidSample.gradle",
"diff": "@@ -40,9 +40,17 @@ android {\nconfigurations.all {\nresolutionStrategy {\ndependencySubstitution {\n+ /**\n+ * All modules and transitive dependencies of mirror component\n+ * must have a mirror module as a local dependency\n+ * to avoid errors with dependency conflict\n+ */\nif (GradlePropertiesManager.isCurrentComponentAMirror()) {\n- def componentMirrorName = GradlePropertiesManager.componentMirrorName\n- substitute module(\"ru.surfstudio.android:${componentMirrorName}\") with project(\":$componentMirrorName\")\n+ Components.getComponentLibraries(GradlePropertiesManager.componentMirrorName)\n+ .forEach {\n+ def libraryName = it.name\n+ substitute module(\"ru.surfstudio.android:$libraryName\") with project(\":$libraryName\")\n+ }\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/Components.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/Components.kt",
"diff": "@@ -130,6 +130,16 @@ object Components {\n?: false\n}\n+ /**\n+ * Get component's libraries\n+ */\n+ @JvmStatic\n+ fun getComponentLibraries(componentName: String): List<Library> {\n+ return value.firstOrNull { it.name == componentName }\n+ ?.libraries\n+ ?: throw GradleException(\"Component $componentName not found\")\n+ }\n+\n/**\n* Set components for android standard dependencies\n*/\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-1020 Latest mirror fix |
652,335 | 17.04.2020 10:37:16 | -10,800 | 61a016a917fba3849f7e5f86822ba44ea18de602 | Increase global alpha version counter to 114 [skip ci] [version] | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/projectConfiguration.json",
"new_path": "buildSrc/projectConfiguration.json",
"diff": "{\n\"version\": \"0.5.0\",\n\"stable\": false,\n- \"unstable_version\": 113,\n+ \"unstable_version\": 114,\n\"project_snapshot_name\": \"\",\n\"project_snapshot_version\": 0\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Increase global alpha version counter to 114 [skip ci] [version] |
652,335 | 17.04.2020 10:56:45 | -10,800 | 420a5ba5059085c92777e43393cf290e4dd548bc | Increase global alpha version counter to 115 [skip ci] [version] | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/projectConfiguration.json",
"new_path": "buildSrc/projectConfiguration.json",
"diff": "{\n\"version\": \"0.5.0\",\n\"stable\": false,\n- \"unstable_version\": 114,\n+ \"unstable_version\": 115,\n\"project_snapshot_name\": \"\",\n\"project_snapshot_version\": 0\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Increase global alpha version counter to 115 [skip ci] [version] |
652,300 | 17.04.2020 13:48:14 | -14,400 | 8ceba91c430e5b78611879a7ec304f5837ec8a8f | Refactored sliding package, classes. Added feature: buttons of sliding holder hides when clicks on other items in list | [
{
"change_type": "MODIFY",
"old_path": "recycler-extension/lib-recycler-extension/src/main/java/ru/surfstudio/android/recycler/extension/slide/SlidingHelper.kt",
"new_path": "recycler-extension/lib-recycler-extension/src/main/java/ru/surfstudio/android/recycler/extension/slide/SlidingHelper.kt",
"diff": "@@ -9,16 +9,19 @@ import androidx.recyclerview.widget.RecyclerView\n* */\nclass SlidingHelper {\n- private var itemAttachListener: SlidingItemAttachListener? = null\n- private var itemTouchListener: SlidingItemTouchListener? = null\n- private var itemTouchScrollListener: SlidingItemTouchScrollListener? = null\n+ private var itemAttachStateListener: SlidingItemAttachStateListener? = null\n+ private var itemHorizontalScrollListener: SlidingItemHorizontalScrollListener? = null\n+ private var itemVerticalScrollListener: SlidingItemVerticalScrollListener? = null\n+ private var itemClickListener: SlidingItemClickListener? = null\nprivate var internalRv: RecyclerView? = null\nfun bind(rv: RecyclerView) {\n- internalRv = rv\n- initItemAttachListener(rv)\n- initItemTouchListener(rv)\n- itemItemTouchScrollListener(rv)\n+ internalRv = rv.also {\n+ initItemAttachListener(it)\n+ initItemTouchListener(it)\n+ initItemTouchScrollListener(it)\n+ initItemClickListener(it)\n+ }\n}\nfun unbind() {\n@@ -26,40 +29,52 @@ class SlidingHelper {\nreleaseItemAttachListener(it)\nreleaseItemTouchListener(it)\nreleaseItemTouchScrollListener(it)\n+ releaseItemClickListener(it)\n}\ninternalRv = null\n}\nprivate fun initItemAttachListener(rv: RecyclerView) {\n- val watcher = SlidingItemAttachListener(rv).also { itemAttachListener = it }\n+ val watcher = SlidingItemAttachStateListener(rv).also { itemAttachStateListener = it }\nrv.addOnChildAttachStateChangeListener(watcher)\n}\nprivate fun initItemTouchListener(rv: RecyclerView) {\n- val listener = SlidingItemTouchListener(rv).also { itemTouchListener = it }\n+ val listener = SlidingItemHorizontalScrollListener(rv).also { itemHorizontalScrollListener = it }\n+ rv.addOnItemTouchListener(listener)\n+ }\n+\n+ private fun initItemTouchScrollListener(rv: RecyclerView) {\n+ val listener = SlidingItemVerticalScrollListener(rv).also { itemVerticalScrollListener = it }\nrv.addOnItemTouchListener(listener)\n}\n- private fun itemItemTouchScrollListener(rv: RecyclerView) {\n- val listener = SlidingItemTouchScrollListener(rv).also { itemTouchScrollListener = it }\n+ private fun initItemClickListener(rv: RecyclerView) {\n+ val listener = SlidingItemClickListener(rv).also { itemClickListener = it }\nrv.addOnItemTouchListener(listener)\n}\nprivate fun releaseItemAttachListener(rv: RecyclerView) {\n- val listener = itemAttachListener ?: return\n+ val listener = itemAttachStateListener ?: return\nrv.removeOnChildAttachStateChangeListener(listener)\n- itemAttachListener = null\n+ itemAttachStateListener = null\n}\nprivate fun releaseItemTouchListener(rv: RecyclerView) {\n- val listener = itemTouchListener ?: return\n+ val listener = itemHorizontalScrollListener ?: return\nrv.removeOnItemTouchListener(listener)\n- itemTouchListener = null\n+ itemHorizontalScrollListener = null\n}\nprivate fun releaseItemTouchScrollListener(rv: RecyclerView) {\n- val listener = itemTouchScrollListener ?: return\n+ val listener = itemVerticalScrollListener ?: return\n+ rv.removeOnItemTouchListener(listener)\n+ itemHorizontalScrollListener = null\n+ }\n+\n+ private fun releaseItemClickListener(rv: RecyclerView) {\n+ val listener = itemClickListener ?: return\nrv.removeOnItemTouchListener(listener)\n- itemTouchListener = null\n+ itemClickListener = null\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "recycler-extension/lib-recycler-extension/src/main/java/ru/surfstudio/android/recycler/extension/slide/SlidingHelperExtensions.kt",
"diff": "+package ru.surfstudio.android.recycler.extension.slide\n+\n+import androidx.recyclerview.widget.LinearLayoutManager\n+import androidx.recyclerview.widget.RecyclerView\n+\n+/** Extension-method used to find [BindableSlidingViewHolder] under specified position of screen. */\n+internal fun RecyclerView.findSlidingViewHolderUnder(\n+ x: Float,\n+ y: Float\n+): BindableSlidingViewHolder<*>? {\n+ val view = findChildViewUnder(x, y) ?: return null\n+ val viewHolder = findContainingViewHolder(view) ?: return null\n+ return viewHolder as? BindableSlidingViewHolder<*>\n+}\n+\n+/**\n+ * Extension-method used to hide all of [BindableSlidingViewHolder] visible buttons in list.\n+ *\n+ * @param excludeList list of [BindableSlidingViewHolder],\n+ * that gonna be ignored and their state won't be changed.\n+ * */\n+internal fun RecyclerView.slidingViewHoldersHideButtons(\n+ excludeList: List<BindableSlidingViewHolder<*>?> = emptyList()\n+) {\n+ val lm = layoutManager as? LinearLayoutManager ?: return\n+ val firstVisibleItemPosition = lm.findFirstVisibleItemPosition()\n+ val lastVisibleItemPosition = lm.findLastVisibleItemPosition()\n+ (firstVisibleItemPosition..lastVisibleItemPosition).forEach { position ->\n+ val slidingViewHolder = findViewHolderForLayoutPosition(position) as? BindableSlidingViewHolder<*>\n+ val isExcluded = excludeList.contains(slidingViewHolder)\n+ if (slidingViewHolder == null || isExcluded) return@forEach\n+ else slidingViewHolder.hideButtons()\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "RENAME",
"old_path": "recycler-extension/lib-recycler-extension/src/main/java/ru/surfstudio/android/recycler/extension/slide/SlidingItemAttachListener.kt",
"new_path": "recycler-extension/lib-recycler-extension/src/main/java/ru/surfstudio/android/recycler/extension/slide/SlidingItemAttachStateListener.kt",
"diff": "@@ -4,9 +4,9 @@ import android.view.View\nimport androidx.recyclerview.widget.RecyclerView\n/**\n- * Listener used to reset state of [BindableSlidingViewHolder]'s when they're detached from window.\n+ * Listener used to hide buttons of [BindableSlidingViewHolder] when it detached from window.\n* */\n-class SlidingItemAttachListener(private val rv: RecyclerView) :\n+class SlidingItemAttachStateListener(private val rv: RecyclerView) :\nRecyclerView.OnChildAttachStateChangeListener {\noverride fun onChildViewDetachedFromWindow(view: View) {\n@@ -15,6 +15,6 @@ class SlidingItemAttachListener(private val rv: RecyclerView) :\n}\noverride fun onChildViewAttachedToWindow(view: View) {\n- /* empty body */\n+ /* empty body. */\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "recycler-extension/lib-recycler-extension/src/main/java/ru/surfstudio/android/recycler/extension/slide/SlidingItemClickListener.kt",
"diff": "+package ru.surfstudio.android.recycler.extension.slide\n+\n+import android.view.MotionEvent\n+import androidx.recyclerview.widget.RecyclerView\n+\n+/**\n+ * Listener used to hide buttons of [BindableSlidingViewHolder]\n+ * when user clicked on another item in list.\n+ * */\n+class SlidingItemClickListener(private val rv: RecyclerView) :\n+ RecyclerView.OnItemTouchListener {\n+\n+ private companion object {\n+ const val CLICK_MAX_TOUCH_TIME_MS = 300L\n+ }\n+\n+ private var startTouchTime = 0L\n+\n+ override fun onTouchEvent(rv: RecyclerView, e: MotionEvent) {\n+ /** empty body. */\n+ }\n+\n+ override fun onRequestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {\n+ /** empty body. */\n+ }\n+\n+ override fun onInterceptTouchEvent(rv: RecyclerView, e: MotionEvent): Boolean {\n+ return when (e.action) {\n+ MotionEvent.ACTION_DOWN -> onInterceptTouchStart(e)\n+ MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> onInterceptTouchEnded(e)\n+ else -> false\n+ }\n+ }\n+\n+ private fun onInterceptTouchStart(e: MotionEvent): Boolean {\n+ startTouchTime = System.currentTimeMillis()\n+ return false\n+ }\n+\n+ private fun onInterceptTouchEnded(e: MotionEvent): Boolean {\n+ val endTouchTime = System.currentTimeMillis()\n+ val touchTime = endTouchTime - startTouchTime\n+ if (touchTime <= CLICK_MAX_TOUCH_TIME_MS) rv.slidingViewHoldersHideButtons()\n+ return false\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "RENAME",
"old_path": "recycler-extension/lib-recycler-extension/src/main/java/ru/surfstudio/android/recycler/extension/slide/SlidingItemTouchListener.kt",
"new_path": "recycler-extension/lib-recycler-extension/src/main/java/ru/surfstudio/android/recycler/extension/slide/SlidingItemHorizontalScrollListener.kt",
"diff": "@@ -2,7 +2,6 @@ package ru.surfstudio.android.recycler.extension.slide\nimport android.view.MotionEvent\nimport android.view.VelocityTracker\n-import androidx.recyclerview.widget.LinearLayoutManager\nimport androidx.recyclerview.widget.RecyclerView\nimport ru.surfstudio.android.recycler.extension.util.dpToPx\nimport kotlin.math.abs\n@@ -10,7 +9,8 @@ import kotlin.math.abs\n/**\n* Listener used to intercept slide gesture on [BindableSlidingViewHolder].\n* */\n-class SlidingItemTouchListener(private val rv: RecyclerView) : RecyclerView.OnItemTouchListener {\n+class SlidingItemHorizontalScrollListener(private val rv: RecyclerView) :\n+ RecyclerView.OnItemTouchListener {\nprivate companion object {\nconst val Y_DISTANCE_TO_DISABLE_INTERCEPTION_DP = 20\n@@ -26,7 +26,7 @@ class SlidingItemTouchListener(private val rv: RecyclerView) : RecyclerView.OnIt\nprivate var startTouchY = 0f\noverride fun onRequestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {\n- /** empty body */\n+ /** empty body. */\n}\noverride fun onInterceptTouchEvent(rv: RecyclerView, e: MotionEvent): Boolean {\n@@ -49,7 +49,7 @@ class SlidingItemTouchListener(private val rv: RecyclerView) : RecyclerView.OnIt\nstartTouchX = e.x\nstartTouchY = e.y\nisInterceptionDisabled = false\n- viewHolder = findSlidingViewHolderUnder(startTouchX, startTouchY)\n+ viewHolder = rv.findSlidingViewHolderUnder(startTouchX, startTouchY)\nreturn false\n}\n@@ -73,7 +73,7 @@ class SlidingItemTouchListener(private val rv: RecyclerView) : RecyclerView.OnIt\nvelocityTracker?.addMovement(e)\nviewHolder?.onSlidingStarted()\n- hideVisibleButtons(excludedViewHolder = viewHolder)\n+ rv.slidingViewHoldersHideButtons(excludeList = listOf(viewHolder))\nreturn true\n}\n@@ -107,21 +107,4 @@ class SlidingItemTouchListener(private val rv: RecyclerView) : RecyclerView.OnIt\nprivate fun calculateDistanceBetween(target: Float, current: Float): Float {\nreturn target - current\n}\n-\n- private fun findSlidingViewHolderUnder(x: Float, y: Float): BindableSlidingViewHolder<*>? {\n- val view = rv.findChildViewUnder(x, y) ?: return null\n- val viewHolder = rv.findContainingViewHolder(view) ?: return null\n- return viewHolder as? BindableSlidingViewHolder<*>\n- }\n-\n- private fun hideVisibleButtons(excludedViewHolder: BindableSlidingViewHolder<*>?) {\n- val layoutManager = rv.layoutManager as? LinearLayoutManager ?: return\n- val firstPosition = layoutManager.findFirstVisibleItemPosition()\n- val lastPosition = layoutManager.findLastVisibleItemPosition()\n- (firstPosition..lastPosition).forEach { position ->\n- val candidate = rv.findViewHolderForLayoutPosition(position) as? BindableSlidingViewHolder<*>\n- if (candidate == excludedViewHolder) return@forEach\n- candidate?.hideButtons()\n- }\n- }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "recycler-extension/lib-recycler-extension/src/main/java/ru/surfstudio/android/recycler/extension/slide/SlidingItemTouchScrollListener.kt",
"new_path": null,
"diff": "-package ru.surfstudio.android.recycler.extension.slide\n-\n-import android.view.MotionEvent\n-import androidx.recyclerview.widget.LinearLayoutManager\n-import androidx.recyclerview.widget.RecyclerView\n-import ru.surfstudio.android.recycler.extension.util.dpToPx\n-import kotlin.math.abs\n-\n-/**\n- * Listener used to hide visible buttons of [BindableSlidingViewHolder]'s on scroll.\n- * */\n-class SlidingItemTouchScrollListener(rv: RecyclerView) : RecyclerView.OnItemTouchListener {\n-\n- private companion object {\n- const val RESET_DISTANCE_DP = 40\n- }\n-\n- private var distanceToResetPx = rv.context.dpToPx(RESET_DISTANCE_DP)\n- private var isResetAllowed = false\n-\n- private var startTouchX = 0f\n- private var startTouchY = 0f\n-\n- override fun onTouchEvent(rv: RecyclerView, e: MotionEvent) {\n- /** empty body */\n- }\n-\n- override fun onRequestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {\n- /** empty body */\n- }\n-\n- override fun onInterceptTouchEvent(rv: RecyclerView, e: MotionEvent): Boolean {\n- when (e.action) {\n- MotionEvent.ACTION_DOWN -> onTouchStarted(rv, e.x, e.y)\n- MotionEvent.ACTION_MOVE -> onTouchMoved(rv, e.x, e.y)\n- }\n- return false\n- }\n-\n- private fun onTouchStarted(rv: RecyclerView, x: Float, y: Float) {\n- startTouchX = x\n- startTouchY = y\n- isResetAllowed = true\n- }\n-\n- private fun onTouchMoved(rv: RecyclerView, x: Float, y: Float) {\n- if (!isResetAllowed) return\n- val travelledDistanceY = abs(startTouchY - y)\n- if (travelledDistanceY >= distanceToResetPx) {\n- hideVisibleButtons(rv)\n- isResetAllowed = false\n- }\n- }\n-\n- private fun hideVisibleButtons(rv: RecyclerView) {\n- val layoutManager = rv.layoutManager as? LinearLayoutManager ?: return\n- val firstPosition = layoutManager.findFirstVisibleItemPosition()\n- val lastPosition = layoutManager.findLastVisibleItemPosition()\n- (firstPosition..lastPosition).forEach { position ->\n- val candidate = rv.findViewHolderForLayoutPosition(position) as? BindableSlidingViewHolder<*>\n- candidate?.hideButtons()\n- }\n- }\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "recycler-extension/lib-recycler-extension/src/main/java/ru/surfstudio/android/recycler/extension/slide/SlidingItemVerticalScrollListener.kt",
"diff": "+package ru.surfstudio.android.recycler.extension.slide\n+\n+import android.view.MotionEvent\n+import androidx.recyclerview.widget.RecyclerView\n+import ru.surfstudio.android.recycler.extension.util.dpToPx\n+import kotlin.math.abs\n+\n+/**\n+ * Listener used to hide visible buttons of [BindableSlidingViewHolder]'s on vertical scroll.\n+ * */\n+class SlidingItemVerticalScrollListener(private val rv: RecyclerView) :\n+ RecyclerView.OnItemTouchListener {\n+\n+ private companion object {\n+ const val RESET_DISTANCE_DP = 40\n+ }\n+\n+ private var distanceToResetPx = rv.context.dpToPx(RESET_DISTANCE_DP)\n+ private var isResetAllowed = false\n+\n+ private var startTouchX = 0f\n+ private var startTouchY = 0f\n+\n+ override fun onTouchEvent(rv: RecyclerView, e: MotionEvent) {\n+ /** empty body. */\n+ }\n+\n+ override fun onRequestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {\n+ /** empty body. */\n+ }\n+\n+ override fun onInterceptTouchEvent(rv: RecyclerView, e: MotionEvent): Boolean {\n+ return when (e.action) {\n+ MotionEvent.ACTION_DOWN -> onInterceptionTouchStarted(e)\n+ MotionEvent.ACTION_MOVE -> onInterceptionTouchMoved(e)\n+ else -> false\n+ }\n+ }\n+\n+ private fun onInterceptionTouchStarted(e: MotionEvent): Boolean {\n+ startTouchX = e.x\n+ startTouchY = e.y\n+ isResetAllowed = true\n+ return false\n+ }\n+\n+ private fun onInterceptionTouchMoved(e: MotionEvent): Boolean {\n+ if (!isResetAllowed) return false\n+ val travelledDistanceY = abs(startTouchY - e.y)\n+ if (travelledDistanceY >= distanceToResetPx) {\n+ rv.slidingViewHoldersHideButtons()\n+ isResetAllowed = false\n+ }\n+ return false\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-extension/sample/src/main/res/layout/item_list_sliding_sample.xml",
"new_path": "recycler-extension/sample/src/main/res/layout/item_list_sliding_sample.xml",
"diff": "<TextView xmlns:android=\"http://schemas.android.com/apk/res/android\"\nandroid:id=\"@+id/sliding_item_title_tv\"\nandroid:layout_width=\"match_parent\"\n+ android:layout_height=\"140dp\"\n+ android:background=\"?attr/selectableItemBackground\"\n+ android:clickable=\"true\"\n+ android:focusable=\"true\"\nandroid:gravity=\"center\"\n- android:textSize=\"18sp\"\n- android:layout_height=\"140dp\"/>\n\\ No newline at end of file\n+ android:textSize=\"18sp\" />\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-1022 Refactored sliding package, classes. Added feature: buttons of sliding holder hides when clicks on other items in list |
652,335 | 17.04.2020 14:26:30 | -10,800 | 6bc48efdf07ca04866803ae35f0ff02ba71d1c42 | Increase global alpha version counter to 116 [skip ci] [version] | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/components.json",
"new_path": "buildSrc/components.json",
"diff": "{\n\"id\": \"mvi\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 16,\n+ \"unstable_version\": 17,\n\"stable\": false,\n\"dir\": \"mvi\",\n\"libs\": [\n{\n\"id\": \"easyadapter\",\n\"version\": \"1.1.0\",\n- \"unstable_version\": 11,\n+ \"unstable_version\": 12,\n\"stable\": false,\n\"dir\": \"easyadapter\",\n\"libs\": [\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/projectConfiguration.json",
"new_path": "buildSrc/projectConfiguration.json",
"diff": "{\n\"version\": \"0.5.0\",\n\"stable\": false,\n- \"unstable_version\": 115,\n+ \"unstable_version\": 116,\n\"project_snapshot_name\": \"\",\n\"project_snapshot_version\": 0\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Increase global alpha version counter to 116 [skip ci] [version] |
652,300 | 17.04.2020 16:13:56 | -14,400 | fc89d840d8c50127d18cd7f5633a8c8c4378a440 | BaseViewHolder changes rollback | [
{
"change_type": "MODIFY",
"old_path": "easyadapter/lib-easyadapter/src/main/java/ru/surfstudio/android/easyadapter/holder/BaseViewHolder.java",
"new_path": "easyadapter/lib-easyadapter/src/main/java/ru/surfstudio/android/easyadapter/holder/BaseViewHolder.java",
"diff": "package ru.surfstudio.android.easyadapter.holder;\n-import android.content.Context;\nimport android.view.LayoutInflater;\nimport android.view.View;\nimport android.view.ViewGroup;\n@@ -43,11 +42,6 @@ public class BaseViewHolder extends RecyclerView.ViewHolder {\nsuper(itemView);\n}\n- /**\n- * Context of this ViewHolder.\n- * */\n- final public Context context = itemView.getContext();\n-\n/**\n* Override this method, if you want custom animation \"insert\" appear for this holder\n*\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-extension/lib-recycler-extension/src/main/java/ru/surfstudio/android/recycler/extension/slide/BindableSlidingViewHolder.kt",
"new_path": "recycler-extension/lib-recycler-extension/src/main/java/ru/surfstudio/android/recycler/extension/slide/BindableSlidingViewHolder.kt",
"diff": "@@ -61,6 +61,7 @@ abstract class BindableSlidingViewHolder<T : Any>(parent: ViewGroup, @LayoutRes\nprivate var isAnimatingSlide = false\n// Shortcuts\n+ private val context get() = itemView.context\nprivate val currentSlideTranslation get() = contentContainer.translationX\nprivate val isReachedLeftContainer get() = currentSlideTranslation >= leftContainerTriggerPosition\nprivate val isReachedRightContainer get() = currentSlideTranslation <= rightContainerTriggerPosition\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-1022 BaseViewHolder changes rollback |
652,335 | 17.04.2020 15:36:41 | -10,800 | 2c08e78799fcb4a28e8a1ab0d01bf7fcd31829e2 | Increase global alpha version counter to 117 [skip ci] [version] | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/components.json",
"new_path": "buildSrc/components.json",
"diff": "{\n\"id\": \"android-studio-settings\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 3,\n\"stable\": false,\n\"dir\": \"android-studio-settings\",\n\"libs\": [],\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/projectConfiguration.json",
"new_path": "buildSrc/projectConfiguration.json",
"diff": "{\n\"version\": \"0.5.0\",\n\"stable\": false,\n- \"unstable_version\": 116,\n+ \"unstable_version\": 117,\n\"project_snapshot_name\": \"\",\n\"project_snapshot_version\": 0\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Increase global alpha version counter to 117 [skip ci] [version] |
652,300 | 17.04.2020 16:50:17 | -14,400 | ba0477aafaba9113eaeb1b6955e291635df22f42 | Added more documentation, refactored outdated method names | [
{
"change_type": "MODIFY",
"old_path": "recycler-extension/lib-recycler-extension/src/main/java/ru/surfstudio/android/recycler/extension/slide/SlidingHelper.kt",
"new_path": "recycler-extension/lib-recycler-extension/src/main/java/ru/surfstudio/android/recycler/extension/slide/SlidingHelper.kt",
"diff": "@@ -3,9 +3,10 @@ package ru.surfstudio.android.recycler.extension.slide\nimport androidx.recyclerview.widget.RecyclerView\n/**\n- * Helper used to properly setup [RecyclerView] and [BindableSlidingViewHolder].\n+ * Helper used to setup [RecyclerView] to work with [BindableSlidingViewHolder]'s.\n*\n- * **Note**: you should call `bind()` on creation and `unbind()` on destroy.\n+ * **Note: you should call `bind()` in `onCreate()` and `unbind()` in `onDestroy()` methods\n+ * to avoid memory leaks!**\n* */\nclass SlidingHelper {\n@@ -15,36 +16,44 @@ class SlidingHelper {\nprivate var itemClickListener: SlidingItemClickListener? = null\nprivate var internalRv: RecyclerView? = null\n+ /**\n+ * Setup given [RecyclerView] to work with [BindableSlidingViewHolder]'s.\n+ *\n+ * Adding listeners to [RecyclerView].\n+ *\n+ * **Note: to avoid memory leaks - don't forget to call `unbind()` in `onDestroy()` method!**\n+ * */\nfun bind(rv: RecyclerView) {\ninternalRv = rv.also {\n- initItemAttachListener(it)\n- initItemTouchListener(it)\n- initItemTouchScrollListener(it)\n+ initItemAttachStateListener(it)\n+ initItemHorizontalScrollListener(it)\n+ initItemVerticalScrollListener(it)\ninitItemClickListener(it)\n}\n}\n+ /** Remove listeners from [RecyclerView] and clear references. */\nfun unbind() {\ninternalRv?.let {\n- releaseItemAttachListener(it)\n- releaseItemTouchListener(it)\n- releaseItemTouchScrollListener(it)\n+ releaseItemAttachStateListener(it)\n+ releaseItemHorizontalScrollListener(it)\n+ releaseItemVerticalScrollListener(it)\nreleaseItemClickListener(it)\n}\ninternalRv = null\n}\n- private fun initItemAttachListener(rv: RecyclerView) {\n+ private fun initItemAttachStateListener(rv: RecyclerView) {\nval watcher = SlidingItemAttachStateListener(rv).also { itemAttachStateListener = it }\nrv.addOnChildAttachStateChangeListener(watcher)\n}\n- private fun initItemTouchListener(rv: RecyclerView) {\n+ private fun initItemHorizontalScrollListener(rv: RecyclerView) {\nval listener = SlidingItemHorizontalScrollListener(rv).also { itemHorizontalScrollListener = it }\nrv.addOnItemTouchListener(listener)\n}\n- private fun initItemTouchScrollListener(rv: RecyclerView) {\n+ private fun initItemVerticalScrollListener(rv: RecyclerView) {\nval listener = SlidingItemVerticalScrollListener(rv).also { itemVerticalScrollListener = it }\nrv.addOnItemTouchListener(listener)\n}\n@@ -54,19 +63,19 @@ class SlidingHelper {\nrv.addOnItemTouchListener(listener)\n}\n- private fun releaseItemAttachListener(rv: RecyclerView) {\n+ private fun releaseItemAttachStateListener(rv: RecyclerView) {\nval listener = itemAttachStateListener ?: return\nrv.removeOnChildAttachStateChangeListener(listener)\nitemAttachStateListener = null\n}\n- private fun releaseItemTouchListener(rv: RecyclerView) {\n+ private fun releaseItemHorizontalScrollListener(rv: RecyclerView) {\nval listener = itemHorizontalScrollListener ?: return\nrv.removeOnItemTouchListener(listener)\nitemHorizontalScrollListener = null\n}\n- private fun releaseItemTouchScrollListener(rv: RecyclerView) {\n+ private fun releaseItemVerticalScrollListener(rv: RecyclerView) {\nval listener = itemVerticalScrollListener ?: return\nrv.removeOnItemTouchListener(listener)\nitemHorizontalScrollListener = null\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-1022 Added more documentation, refactored outdated method names |
652,300 | 17.04.2020 17:15:26 | -14,400 | 6f4ff2dd46a70306a3995f44443eb1b7b35e377e | Added more documentation to BindableSlidingViewHolder and rearranged methods | [
{
"change_type": "MODIFY",
"old_path": "recycler-extension/lib-recycler-extension/src/main/java/ru/surfstudio/android/recycler/extension/slide/BindableSlidingViewHolder.kt",
"new_path": "recycler-extension/lib-recycler-extension/src/main/java/ru/surfstudio/android/recycler/extension/slide/BindableSlidingViewHolder.kt",
"diff": "@@ -17,9 +17,35 @@ import kotlin.math.abs\nimport kotlin.math.roundToLong\n/**\n- * [BindableViewHolder] with possibility of horizontal sliding to reveal side-buttons.\n+ * [BindableViewHolder] with possibility of horizontal sliding to reveal and fixate side-buttons.\n*\n- * To properly setup [RecyclerView] for sliding functionality - use [SlidingHelper].\n+ * ## General features:\n+ *\n+ * * You can add buttons to left or/and right side of your `ViewHolder` by\n+ * overriding [leftButtons] and [rightButtons] fields (You can add as many buttons as you like,\n+ * but recommended limit of buttons for single `ViewHolder` is not more than 3 buttons in a row);\n+ *\n+ * * Those side-buttons accessible through swipe-gesture or horizontal scrolling to the edges;\n+ *\n+ * * You can bind data to your side-buttons just as you would bind it to your `ViewHolder`.\n+ * Use [onBindButton] method;\n+ *\n+ * * You can handle side-buttons `onClick` events in [onButtonClicked] method;\n+ *\n+ * * You can use [onSlidingStarted], [onSliding] and [onSlidingEnded] callback-methods to\n+ * override or customize sliding of `ViewHolder`;\n+ *\n+ * * You can override [onInterceptTouchEvent] to decide by yourself\n+ * when and why you want to intercept user's touch events;\n+ *\n+ * * If buttons not yet collapsed - they're gonna collapse in following conditions:\n+ * * `ViewHolder` is detached from window;\n+ * * User scrolling list vertically;\n+ * * User clicked on content of current item;\n+ * * User clicked on other item in list;\n+ *\n+ * **Note: [BindableSlidingViewHolder] won't work by itself!\n+ * To enable sliding functionality, please, use [SlidingHelper].**\n* */\n@Suppress(\"MemberVisibilityCanBePrivate\")\nabstract class BindableSlidingViewHolder<T : Any>(parent: ViewGroup, @LayoutRes layoutRes: Int) :\n@@ -112,29 +138,6 @@ abstract class BindableSlidingViewHolder<T : Any>(parent: ViewGroup, @LayoutRes\ncontentBlockerView.setOnClickListener { onContentBlockerClicked() }\n}\n- /** Callback, used to bind [data] to the particular [buttonView]. */\n- protected open fun onBindButton(data: T, buttonView: View) {\n- /* empty body */\n- }\n-\n- /**\n- * Callback, used to response to user's [buttonView] click.\n- *\n- * Default implementation call's `hideButtons()` method.\n- * */\n- protected open fun onButtonClicked(buttonView: View) {\n- hideButtons()\n- }\n-\n- /**\n- * Callback, used to response to user's click on [contentBlockerView].\n- *\n- * Default implementation call's `hideButtons()` method.\n- * */\n- protected open fun onContentBlockerClicked() {\n- hideButtons()\n- }\n-\n/**\n* Callback, used to bind [data] to this `ViewHolder`.\n*\n@@ -145,9 +148,7 @@ abstract class BindableSlidingViewHolder<T : Any>(parent: ViewGroup, @LayoutRes\nbindButtons(data)\n}\n-\n/** Callback, used to decide: are we intercepting this touch event of [RecyclerView]? */\n- @CallSuper\nopen fun onInterceptTouchEvent(touchTranslationX: Float): Boolean {\nreturn when (interactionState) {\nMAIN_CONTENT -> when {\n@@ -172,13 +173,11 @@ abstract class BindableSlidingViewHolder<T : Any>(parent: ViewGroup, @LayoutRes\n}\n/** Callback, used to handle user sliding gesture. */\n- @CallSuper\nopen fun onSliding(touchTranslationX: Float) {\nrelativeMoveContainersTo(touchTranslationX, shouldAnimate = false)\n}\n/** Callback, used to decide what to do when user ended his sliding gesture. */\n- @CallSuper\nopen fun onSlidingEnded(touchVelocityX: Float) {\nwhen (interactionState) {\nMAIN_CONTENT -> when {\n@@ -201,21 +200,47 @@ abstract class BindableSlidingViewHolder<T : Any>(parent: ViewGroup, @LayoutRes\n}\n}\n+ /** Reveal left buttons container and fixate it. */\nfun showLeftButtons(shouldAnimate: Boolean = true) {\ninteractionState = LEFT_BUTTONS\nmoveContainersTo(leftContainerWidth, shouldAnimate)\n}\n+ /** Reveal right buttons container and fixate it. */\nfun showRightButtons(shouldAnimate: Boolean = true) {\ninteractionState = RIGHT_BUTTONS\nmoveContainersTo(-rightContainerWidth, shouldAnimate)\n}\n+ /** Hide all button containers and focus content. */\nfun hideButtons(shouldAnimate: Boolean = true) {\ninteractionState = MAIN_CONTENT\nmoveContainersTo(0f, shouldAnimate)\n}\n+ /** Callback, used to bind [data] to the particular [buttonView]. */\n+ protected open fun onBindButton(data: T, buttonView: View) {\n+ /* empty body */\n+ }\n+\n+ /**\n+ * Callback, used to response to user's [buttonView] click.\n+ *\n+ * Default implementation call's `hideButtons()` method.\n+ * */\n+ protected open fun onButtonClicked(buttonView: View) {\n+ hideButtons()\n+ }\n+\n+ /**\n+ * Callback, used to response to user's click on [contentBlockerView].\n+ *\n+ * Default implementation call's `hideButtons()` method.\n+ * */\n+ protected open fun onContentBlockerClicked() {\n+ hideButtons()\n+ }\n+\nprotected fun relativeMoveContainersTo(relativeTranslation: Float, shouldAnimate: Boolean) {\nval translationOrigin = when (interactionState) {\nMAIN_CONTENT -> 0f\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-1022 Added more documentation to BindableSlidingViewHolder and rearranged methods |
652,313 | 17.04.2020 17:01:48 | -10,800 | a77941b6c5dd75c1faa7fc4d2fc3c34c62a23ec6 | added license to mvi-mappers module | [
{
"change_type": "MODIFY",
"old_path": "mvi/lib-mvi-mapper/src/main/java/ru/surfstudio/android/core/mvi/ui/mapper/RequestMapper.kt",
"new_path": "mvi/lib-mvi-mapper/src/main/java/ru/surfstudio/android/core/mvi/ui/mapper/RequestMapper.kt",
"diff": "+/*\n+ Copyright (c) 2020, SurfStudio LLC.\n+\n+ Licensed under the Apache License, Version 2.0 (the \"License\");\n+ you may not use this file except in compliance with the License.\n+ You may obtain a copy of the License at\n+\n+ http://www.apache.org/licenses/LICENSE-2.0\n+\n+ Unless required by applicable law or agreed to in writing, software\n+ distributed under the License is distributed on an \"AS IS\" BASIS,\n+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ See the License for the specific language governing permissions and\n+ limitations under the License.\n+*/\npackage ru.surfstudio.android.core.mvi.ui.mapper\nimport ru.surfstudio.android.core.mvp.binding.rx.request.Request\n"
},
{
"change_type": "MODIFY",
"old_path": "mvi/lib-mvi-mapper/src/main/java/ru/surfstudio/android/core/mvi/ui/mapper/RequestMapperLambdas.kt",
"new_path": "mvi/lib-mvi-mapper/src/main/java/ru/surfstudio/android/core/mvi/ui/mapper/RequestMapperLambdas.kt",
"diff": "+/*\n+ Copyright (c) 2020, SurfStudio LLC.\n+\n+ Licensed under the Apache License, Version 2.0 (the \"License\");\n+ you may not use this file except in compliance with the License.\n+ You may obtain a copy of the License at\n+\n+ http://www.apache.org/licenses/LICENSE-2.0\n+\n+ Unless required by applicable law or agreed to in writing, software\n+ distributed under the License is distributed on an \"AS IS\" BASIS,\n+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ See the License for the specific language governing permissions and\n+ limitations under the License.\n+*/\npackage ru.surfstudio.android.core.mvi.ui.mapper\nimport ru.surfstudio.android.core.mvp.binding.rx.request.Request\n"
},
{
"change_type": "MODIFY",
"old_path": "mvi/lib-mvi-mapper/src/test/java/ru/surfstudio/android/core/mvi/ui/mapper/RequestMapperTest.kt",
"new_path": "mvi/lib-mvi-mapper/src/test/java/ru/surfstudio/android/core/mvi/ui/mapper/RequestMapperTest.kt",
"diff": "+/*\n+ Copyright (c) 2020, SurfStudio LLC.\n+\n+ Licensed under the Apache License, Version 2.0 (the \"License\");\n+ you may not use this file except in compliance with the License.\n+ You may obtain a copy of the License at\n+\n+ http://www.apache.org/licenses/LICENSE-2.0\n+\n+ Unless required by applicable law or agreed to in writing, software\n+ distributed under the License is distributed on an \"AS IS\" BASIS,\n+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ See the License for the specific language governing permissions and\n+ limitations under the License.\n+*/\npackage ru.surfstudio.android.core.mvi.ui.mapper\nimport org.junit.Test\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-1008 added license to mvi-mappers module |
652,300 | 17.04.2020 18:21:07 | -14,400 | 70f7c4a4727ba90938febf35b9d86f14e02e5ace | Added CompletableSafeConverter to parse not empty Completable-request response | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "deprecated/converter-gson/lib-converter-gson/src/main/java/ru/surfstudio/android/converter/gson/safe/CompletableSafeConverter.kt",
"diff": "+package ru.surfstudio.android.converter.gson.safe\n+\n+import com.google.gson.Gson\n+import com.google.gson.JsonElement\n+import com.google.gson.TypeAdapterFactory\n+import com.google.gson.reflect.TypeToken\n+import io.reactivex.Completable\n+\n+/**\n+ * SafeConverter for [Completable].\n+ *\n+ * We don't expect from it any data, so just return [Completable.complete].\n+ * */\n+@Deprecated(message = \"empty\")\n+class CompletableSafeConverter(type: TypeToken<Completable>) : SafeConverter<Completable>(type) {\n+ override fun convert(\n+ typeAdapterFactory: TypeAdapterFactory?,\n+ gson: Gson?,\n+ element: JsonElement?\n+ ): Completable {\n+ return Completable.complete()\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "template/i-network/src/main/java/ru/surfstudio/standard/i_network/converter/gson/safe/CompletableSafeConverter.kt",
"diff": "+package ru.surfstudio.standard.i_network.converter.gson.safe\n+\n+import com.google.gson.Gson\n+import com.google.gson.JsonElement\n+import com.google.gson.TypeAdapterFactory\n+import com.google.gson.reflect.TypeToken\n+import io.reactivex.Completable\n+\n+/**\n+ * SafeConverter for [Completable].\n+ *\n+ * We don't expect from it any data, so just return [Completable.complete].\n+ * */\n+class CompletableSafeConverter(type: TypeToken<Completable>) : SafeConverter<Completable>(type) {\n+ override fun convert(\n+ typeAdapterFactory: TypeAdapterFactory?,\n+ gson: Gson?,\n+ element: JsonElement?\n+ ): Completable {\n+ return Completable.complete()\n+ }\n+}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-599 Added CompletableSafeConverter to parse not empty Completable-request response |
652,316 | 17.04.2020 17:49:15 | -10,800 | ec378b02aa52ce774eedd38fef9eb8f0e0955f04 | Add profile buttons to sample | [
{
"change_type": "MODIFY",
"old_path": "navigation/sample/src/main/AndroidManifest.xml",
"new_path": "navigation/sample/src/main/AndroidManifest.xml",
"diff": "android:theme=\"@style/AppTheme\"\ntools:ignore=\"GoogleAppIndexingWarning\">\n- <activity android:name=\"ru.surfstudio.android.navigation.sample.app.screen.SingleActivity\">\n+ <activity android:name=\"ru.surfstudio.android.navigation.sample.app.screen.MainActivity\">\n<intent-filter>\n<action android:name=\"android.intent.action.MAIN\" />\n<category android:name=\"android.intent.category.LAUNCHER\" />\n</intent-filter>\n</activity>\n+ <activity android:name=\".app.screen.main.profile.about.AboutActivity\" />\n</application>\n"
},
{
"change_type": "RENAME",
"old_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/SingleActivity.kt",
"new_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/MainActivity.kt",
"diff": "@@ -10,7 +10,7 @@ import ru.surfstudio.android.navigation.sample.app.App\nimport ru.surfstudio.android.navigation.sample.app.screen.splash.SplashRoute\nimport ru.surfstudio.android.navigation.sample.app.utils.animations.FadeAnimations\n-class SingleActivity : AppCompatActivity(), IdentifiableScreen, FragmentNavigationContainer {\n+class MainActivity : AppCompatActivity(), IdentifiableScreen, FragmentNavigationContainer {\noverride val containerId: Int = R.id.fragment_container\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/MainFragment.kt",
"new_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/MainFragment.kt",
"diff": "@@ -16,9 +16,9 @@ import ru.surfstudio.android.navigation.route.fragment.FragmentRoute\nimport ru.surfstudio.android.navigation.sample.R\nimport ru.surfstudio.android.navigation.sample.app.App\nimport ru.surfstudio.android.navigation.sample.app.screen.main.MainTabType.*\n-import ru.surfstudio.android.navigation.sample.app.screen.main.tabs.cart.CartTabRoute\n-import ru.surfstudio.android.navigation.sample.app.screen.main.tabs.home.HomeTabRoute\n-import ru.surfstudio.android.navigation.sample.app.screen.main.tabs.profile.ProfileTabRoute\n+import ru.surfstudio.android.navigation.sample.app.screen.main.cart.CartTabRoute\n+import ru.surfstudio.android.navigation.sample.app.screen.main.home.HomeTabRoute\n+import ru.surfstudio.android.navigation.sample.app.screen.main.profile.ProfileTabRoute\nimport ru.surfstudio.android.navigation.sample.app.utils.addOnBackPressedListener\nimport ru.surfstudio.android.navigation.sample.app.utils.animations.FadeAnimations\n"
},
{
"change_type": "RENAME",
"old_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/tabs/cart/CartTabFragment.kt",
"new_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/cart/CartTabFragment.kt",
"diff": "-package ru.surfstudio.android.navigation.sample.app.screen.main.tabs.cart\n+package ru.surfstudio.android.navigation.sample.app.screen.main.cart\nimport android.os.Bundle\nimport android.view.LayoutInflater\nimport android.view.View\nimport android.view.ViewGroup\nimport androidx.fragment.app.Fragment\n-import ru.surfstudio.android.navigation.route.tab.TabRootRoute\nimport ru.surfstudio.android.navigation.sample.R\nclass CartTabFragment : Fragment() {\n"
},
{
"change_type": "RENAME",
"old_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/tabs/cart/CartTabRoute.kt",
"new_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/cart/CartTabRoute.kt",
"diff": "-package ru.surfstudio.android.navigation.sample.app.screen.main.tabs.cart\n+package ru.surfstudio.android.navigation.sample.app.screen.main.cart\nimport androidx.fragment.app.Fragment\nimport ru.surfstudio.android.navigation.route.fragment.FragmentRoute\n"
},
{
"change_type": "RENAME",
"old_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/tabs/home/HomeTabFragment.kt",
"new_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/home/HomeTabFragment.kt",
"diff": "-package ru.surfstudio.android.navigation.sample.app.screen.main.tabs.home\n+package ru.surfstudio.android.navigation.sample.app.screen.main.home\nimport android.os.Bundle\nimport android.view.LayoutInflater\n@@ -9,7 +9,7 @@ import kotlinx.android.synthetic.main.fragment_home.*\nimport ru.surfstudio.android.navigation.command.fragment.Replace\nimport ru.surfstudio.android.navigation.sample.R\nimport ru.surfstudio.android.navigation.sample.app.App\n-import ru.surfstudio.android.navigation.sample.app.screen.main.tabs.home.nested.HomeNestedRoute\n+import ru.surfstudio.android.navigation.sample.app.screen.main.home.nested.HomeNestedRoute\nclass HomeTabFragment : Fragment() {\n"
},
{
"change_type": "RENAME",
"old_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/tabs/home/HomeTabRoute.kt",
"new_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/home/HomeTabRoute.kt",
"diff": "-package ru.surfstudio.android.navigation.sample.app.screen.main.tabs.home\n+package ru.surfstudio.android.navigation.sample.app.screen.main.home\nimport androidx.fragment.app.Fragment\nimport ru.surfstudio.android.navigation.route.fragment.FragmentRoute\n"
},
{
"change_type": "RENAME",
"old_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/tabs/home/nested/HomeNestedFragment.kt",
"new_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/home/nested/HomeNestedFragment.kt",
"diff": "-package ru.surfstudio.android.navigation.sample.app.screen.main.tabs.home.nested\n+package ru.surfstudio.android.navigation.sample.app.screen.main.home.nested\nimport android.os.Bundle\nimport android.view.LayoutInflater\n"
},
{
"change_type": "RENAME",
"old_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/tabs/home/nested/HomeNestedRoute.kt",
"new_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/home/nested/HomeNestedRoute.kt",
"diff": "-package ru.surfstudio.android.navigation.sample.app.screen.main.tabs.home.nested\n+package ru.surfstudio.android.navigation.sample.app.screen.main.home.nested\nimport android.os.Bundle\nimport androidx.core.os.bundleOf\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/profile/ProfileTabFragment.kt",
"diff": "+package ru.surfstudio.android.navigation.sample.app.screen.main.profile\n+\n+import android.os.Bundle\n+import android.view.LayoutInflater\n+import android.view.View\n+import android.view.ViewGroup\n+import androidx.fragment.app.Fragment\n+import kotlinx.android.synthetic.main.fragment_profile.*\n+import ru.surfstudio.android.navigation.command.activity.Start\n+import ru.surfstudio.android.navigation.command.fragment.ReplaceHard\n+import ru.surfstudio.android.navigation.sample.R\n+import ru.surfstudio.android.navigation.sample.app.App\n+import ru.surfstudio.android.navigation.sample.app.screen.auth.AuthRoute\n+import ru.surfstudio.android.navigation.sample.app.screen.main.profile.about.AboutRoute\n+import ru.surfstudio.android.navigation.sample.app.screen.main.profile.settings.ApplicationSettingsRoute\n+import ru.surfstudio.android.navigation.sample.app.utils.animations.FadeAnimations\n+\n+class ProfileTabFragment : Fragment() {\n+\n+ override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {\n+ return inflater.inflate(R.layout.fragment_profile, container, false)\n+ }\n+\n+ override fun onActivityCreated(savedInstanceState: Bundle?) {\n+ super.onActivityCreated(savedInstanceState)\n+ profile_settings_btn.setOnClickListener { App.navigator.execute(Start(ApplicationSettingsRoute())) }\n+ profile_about_app_btn.setOnClickListener { App.navigator.execute(Start(AboutRoute())) }\n+ profile_logout_btn.setOnClickListener { App.navigator.execute(ReplaceHard(AuthRoute(), FadeAnimations())) }\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "RENAME",
"old_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/tabs/profile/ProfileTabRoute.kt",
"new_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/profile/ProfileTabRoute.kt",
"diff": "-package ru.surfstudio.android.navigation.sample.app.screen.main.tabs.profile\n+package ru.surfstudio.android.navigation.sample.app.screen.main.profile\nimport androidx.fragment.app.Fragment\nimport ru.surfstudio.android.navigation.route.fragment.FragmentRoute\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/profile/about/AboutActivity.kt",
"diff": "+package ru.surfstudio.android.navigation.sample.app.screen.main.profile.about\n+\n+import android.os.Bundle\n+import androidx.appcompat.app.AppCompatActivity\n+import ru.surfstudio.android.navigation.provider.id.IdentifiableScreen\n+import ru.surfstudio.android.navigation.sample.R\n+\n+class AboutActivity : AppCompatActivity(), IdentifiableScreen {\n+\n+ override val screenId: String = \"AboutApp\"\n+\n+ override fun onCreate(savedInstanceState: Bundle?) {\n+ super.onCreate(savedInstanceState)\n+ setContentView(R.layout.activity_single)\n+ title = \"About App Activity\"\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/profile/about/AboutRoute.kt",
"diff": "+package ru.surfstudio.android.navigation.sample.app.screen.main.profile.about\n+\n+import androidx.appcompat.app.AppCompatActivity\n+import ru.surfstudio.android.navigation.route.activity.ActivityRoute\n+\n+class AboutRoute : ActivityRoute() {\n+\n+ override fun getScreenClass(): Class<out AppCompatActivity>? = AboutActivity::class.java\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/profile/settings/ApplicationSettingsRoute.kt",
"diff": "+package ru.surfstudio.android.navigation.sample.app.screen.main.profile.settings\n+\n+import android.content.Context\n+import android.content.Intent\n+import android.net.Uri\n+import ru.surfstudio.android.navigation.route.activity.ActivityRoute\n+import android.provider.Settings\n+\n+class ApplicationSettingsRoute : ActivityRoute() {\n+\n+ override fun createIntent(context: Context): Intent =\n+ Intent(\n+ Settings.ACTION_APPLICATION_DETAILS_SETTINGS,\n+ Uri.fromParts(\"package\", context.packageName, null)\n+ )\n+}\n"
},
{
"change_type": "DELETE",
"old_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/tabs/profile/ProfileTabFragment.kt",
"new_path": null,
"diff": "-package ru.surfstudio.android.navigation.sample.app.screen.main.tabs.profile\n-\n-import android.os.Bundle\n-import android.view.LayoutInflater\n-import android.view.View\n-import android.view.ViewGroup\n-import androidx.fragment.app.Fragment\n-import ru.surfstudio.android.navigation.sample.R\n-\n-class ProfileTabFragment : Fragment() {\n-\n- override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {\n- return inflater.inflate(R.layout.fragment_profile, container, false)\n- }\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/sample/src/main/res/layout/fragment_profile.xml",
"new_path": "navigation/sample/src/main/res/layout/fragment_profile.xml",
"diff": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n-<TextView xmlns:android=\"http://schemas.android.com/apk/res/android\"\n+<FrameLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"match_parent\"\n+ android:background=\"@android:color/holo_orange_dark\">\n+\n+ <TextView\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"match_parent\"\n- android:background=\"@android:color/holo_orange_dark\"\nandroid:gravity=\"center\"\nandroid:text=\"Profile\\nFragment\"\nandroid:textColor=\"@android:color/white\"\nandroid:textSize=\"24sp\" />\n+\n+ <LinearLayout\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"wrap_content\"\n+ android:layout_gravity=\"bottom\"\n+ android:orientation=\"vertical\">\n+\n+ <Button\n+ android:id=\"@+id/profile_settings_btn\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"56dp\"\n+ android:layout_marginHorizontal=\"16dp\"\n+ android:layout_marginBottom=\"16dp\"\n+ android:text=\"Settings\" />\n+\n+ <Button\n+ android:id=\"@+id/profile_about_app_btn\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"56dp\"\n+ android:layout_marginHorizontal=\"16dp\"\n+ android:layout_marginBottom=\"16dp\"\n+ android:text=\"About app\" />\n+\n+ <Button\n+ android:id=\"@+id/profile_logout_btn\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"56dp\"\n+ android:layout_marginHorizontal=\"16dp\"\n+ android:layout_marginBottom=\"16dp\"\n+ android:text=\"Logout\" />\n+ </LinearLayout>\n+\n+</FrameLayout>\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-312 Add profile buttons to sample |
652,316 | 17.04.2020 18:09:42 | -10,800 | b1010ec30e94a411cdfccd9eb58657aa7b90d9b5 | Add gallery fragment and nested fragments sample | [
{
"change_type": "MODIFY",
"old_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/MainFragment.kt",
"new_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/MainFragment.kt",
"diff": "@@ -16,7 +16,7 @@ import ru.surfstudio.android.navigation.route.fragment.FragmentRoute\nimport ru.surfstudio.android.navigation.sample.R\nimport ru.surfstudio.android.navigation.sample.app.App\nimport ru.surfstudio.android.navigation.sample.app.screen.main.MainTabType.*\n-import ru.surfstudio.android.navigation.sample.app.screen.main.cart.CartTabRoute\n+import ru.surfstudio.android.navigation.sample.app.screen.main.cart.GalleryTabRoute\nimport ru.surfstudio.android.navigation.sample.app.screen.main.home.HomeTabRoute\nimport ru.surfstudio.android.navigation.sample.app.screen.main.profile.ProfileTabRoute\nimport ru.surfstudio.android.navigation.sample.app.utils.addOnBackPressedListener\n@@ -41,7 +41,7 @@ class MainFragment : Fragment(), FragmentNavigationContainer {\n}\nhome_tab_btn.setOnClickListener { navigateToTab(HOME) }\n- cart_tab_btn.setOnClickListener { navigateToTab(CART) }\n+ gallery_tab_btn.setOnClickListener { navigateToTab(CART) }\nprofile_tab_btn.setOnClickListener { navigateToTab(PROFILE) }\n}\n@@ -65,7 +65,7 @@ class MainFragment : Fragment(), FragmentNavigationContainer {\nprivate fun navigateToTab(type: MainTabType) {\nval route: FragmentRoute = when (type) {\nHOME -> HomeTabRoute()\n- CART -> CartTabRoute()\n+ CART -> GalleryTabRoute()\nPROFILE -> ProfileTabRoute()\n}\nApp.navigator.execute(Replace(route, FadeAnimations(), tag!!))\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/cart/GalleryTabFragment.kt",
"diff": "+package ru.surfstudio.android.navigation.sample.app.screen.main.cart\n+\n+import android.os.Bundle\n+import android.view.LayoutInflater\n+import android.view.View\n+import android.view.ViewGroup\n+import androidx.fragment.app.Fragment\n+import kotlinx.android.synthetic.main.fragment_gallery.*\n+import ru.surfstudio.android.navigation.command.fragment.RemoveLast\n+import ru.surfstudio.android.navigation.command.fragment.Replace\n+import ru.surfstudio.android.navigation.provider.container.FragmentNavigationContainer\n+import ru.surfstudio.android.navigation.sample.R\n+import ru.surfstudio.android.navigation.sample.app.App\n+import ru.surfstudio.android.navigation.sample.app.screen.main.cart.image.ImageRoute\n+import ru.surfstudio.android.navigation.sample.app.utils.animations.FadeAnimations\n+\n+class GalleryTabFragment : Fragment(), FragmentNavigationContainer {\n+\n+ override val containerId: Int = R.id.gallery_fragment_container\n+\n+ var currentPicture = 0\n+\n+ override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {\n+ return inflater.inflate(R.layout.fragment_gallery, container, false)\n+ }\n+\n+ override fun onActivityCreated(savedInstanceState: Bundle?) {\n+ super.onActivityCreated(savedInstanceState)\n+\n+ if (savedInstanceState == null)\n+ addPicture()\n+\n+ gallery_next_image_btn.setOnClickListener { addPicture() }\n+ gallery_prev_image_btn.setOnClickListener { removePicture() }\n+ }\n+\n+ private fun addPicture() {\n+ currentPicture++\n+ App.navigator.execute(Replace(ImageRoute(currentPicture), sourceTag = tag!!))\n+ }\n+\n+ private fun removePicture() {\n+ currentPicture--\n+ App.navigator.execute(RemoveLast(sourceTag = tag!!))\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "RENAME",
"old_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/cart/CartTabRoute.kt",
"new_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/cart/GalleryTabRoute.kt",
"diff": "@@ -4,6 +4,6 @@ import androidx.fragment.app.Fragment\nimport ru.surfstudio.android.navigation.route.fragment.FragmentRoute\nimport ru.surfstudio.android.navigation.route.tab.TabRootRoute\n-class CartTabRoute : FragmentRoute(), TabRootRoute {\n- override fun getScreenClass(): Class<out Fragment>? = CartTabFragment::class.java\n+class GalleryTabRoute : FragmentRoute(), TabRootRoute {\n+ override fun getScreenClass(): Class<out Fragment>? = GalleryTabFragment::class.java\n}\n\\ No newline at end of file\n"
},
{
"change_type": "RENAME",
"old_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/cart/CartTabFragment.kt",
"new_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/cart/image/ImageFragment.kt",
"diff": "-package ru.surfstudio.android.navigation.sample.app.screen.main.cart\n+package ru.surfstudio.android.navigation.sample.app.screen.main.cart.image\nimport android.os.Bundle\nimport android.view.LayoutInflater\nimport android.view.View\nimport android.view.ViewGroup\n+import android.widget.TextView\nimport androidx.fragment.app.Fragment\nimport ru.surfstudio.android.navigation.sample.R\n-class CartTabFragment : Fragment() {\n+class ImageFragment : Fragment() {\noverride fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {\n- return inflater.inflate(R.layout.fragment_cart, container, false)\n+ val view = inflater.inflate(R.layout.fragment_image, container, false) as TextView\n+ val route = ImageRoute(arguments)\n+ view.text = \"Image\\nFragment\\n${route.index}\"\n+ return view\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/cart/image/ImageRoute.kt",
"diff": "+package ru.surfstudio.android.navigation.sample.app.screen.main.cart.image\n+\n+import android.os.Bundle\n+import androidx.core.os.bundleOf\n+import androidx.fragment.app.Fragment\n+import ru.surfstudio.android.navigation.route.Route\n+import ru.surfstudio.android.navigation.route.fragment.FragmentRoute\n+\n+class ImageRoute(val index: Int = 1) : FragmentRoute() {\n+\n+ constructor(bundle: Bundle?) : this(bundle?.getInt(Route.EXTRA_FIRST) ?: 0)\n+\n+ override fun getScreenClass(): Class<out Fragment>? = ImageFragment::class.java\n+\n+ override fun prepareData(): Bundle? = bundleOf(Route.EXTRA_FIRST to index)\n+\n+ override fun getTag(): String = super.getTag() + index\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "navigation/sample/src/main/res/layout/fragment_gallery.xml",
"diff": "+<?xml version=\"1.0\" encoding=\"utf-8\"?>\n+<FrameLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"match_parent\"\n+ android:background=\"@android:color/holo_purple\">\n+\n+ <FrameLayout\n+ android:id=\"@+id/gallery_fragment_container\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"160dp\" />\n+\n+ <Button\n+ android:id=\"@+id/gallery_prev_image_btn\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"wrap_content\"\n+ android:layout_gravity=\"bottom\"\n+ android:layout_marginHorizontal=\"16dp\"\n+ android:layout_marginBottom=\"72dp\"\n+ android:text=\"Prev image\" />\n+\n+ <Button\n+ android:id=\"@+id/gallery_next_image_btn\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"wrap_content\"\n+ android:layout_gravity=\"bottom\"\n+ android:layout_margin=\"16dp\"\n+ android:text=\"Next image\" />\n+\n+</FrameLayout>\n"
},
{
"change_type": "RENAME",
"old_path": "navigation/sample/src/main/res/layout/fragment_cart.xml",
"new_path": "navigation/sample/src/main/res/layout/fragment_image.xml",
"diff": "<TextView xmlns:android=\"http://schemas.android.com/apk/res/android\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"match_parent\"\n- android:background=\"@android:color/holo_purple\"\n+ android:background=\"@android:color/holo_orange_light\"\nandroid:gravity=\"center\"\n- android:text=\"Cart\\nFragment\"\n- android:textColor=\"@android:color/white\"\n+ android:text=\"Image\\nFragment\"\nandroid:textSize=\"24sp\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/sample/src/main/res/layout/fragment_main.xml",
"new_path": "navigation/sample/src/main/res/layout/fragment_main.xml",
"diff": "android:text=\"Home\" />\n<Button\n- android:id=\"@+id/cart_tab_btn\"\n+ android:id=\"@+id/gallery_tab_btn\"\nandroid:layout_width=\"0dp\"\nandroid:layout_height=\"match_parent\"\nandroid:layout_marginHorizontal=\"4dp\"\nandroid:layout_weight=\"1\"\n- android:text=\"Cart\" />\n+ android:text=\"Gallery\" />\n<Button\nandroid:id=\"@+id/profile_tab_btn\"\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-312 Add gallery fragment and nested fragments sample |
652,316 | 19.04.2020 15:28:12 | -10,800 | 1f0e715fa944fc1ced34adc606a40c2c684d0e27 | Remove identifiable screen interface, activity screen id is declared based on route tag | [
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/navigator/fragment/FragmentNavigator.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/navigator/fragment/FragmentNavigator.kt",
"diff": "@@ -53,7 +53,7 @@ open class FragmentNavigator(\nval fragmentManager = fragmentManager\nfragmentManager.executePendingTransactions()\n- val backStackTag = route.getTag()\n+ val backStackTag = convertToBackStackTag(route.getTag())\nval fragment = route.createFragment()\nfragmentManager.beginTransaction().apply {\n@@ -75,7 +75,7 @@ open class FragmentNavigator(\nval fragmentManager = fragmentManager\nfragmentManager.executePendingTransactions()\n- val backStackTag = route.getTag()\n+ val backStackTag = convertToBackStackTag(route.getTag())\nval fragment = route.createFragment()\nval lastFragment = backStack.peekFragment()\n@@ -98,7 +98,7 @@ open class FragmentNavigator(\nval fragmentManager = fragmentManager\nfragmentManager.executePendingTransactions()\n- val fragment = findFragment(route.getTag()) ?: return false\n+ val fragment = findFragment(convertToBackStackTag(route.getTag())) ?: return false\nfragmentManager.beginTransaction()\n.supplyWithAnimations(animations)\n@@ -138,7 +138,7 @@ open class FragmentNavigator(\nval fragmentManager = fragmentManager\nfragmentManager.executePendingTransactions()\n- val backStackTag = route.getTag()\n+ val backStackTag = convertToBackStackTag(route.getTag())\nval fragment = route.createFragment()\nfragmentManager.beginTransaction().apply {\n@@ -158,7 +158,7 @@ open class FragmentNavigator(\noverride fun removeUntil(route: FragmentRoute, isInclusive: Boolean): Boolean {\n- val backStackTag = route.getTag()\n+ val backStackTag = convertToBackStackTag(route.getTag())\nval entry = backStack.find(backStackTag) ?: return false\nfragmentManager.executePendingTransactions()\n@@ -235,6 +235,14 @@ open class FragmentNavigator(\nbackStackChangedListeners.remove(listener)\n}\n+ protected open fun convertToBackStackTag(routeTag: String): String {\n+ return \"$containerId$ROUTE_TAG_DELIMITER$routeTag\"\n+ }\n+\n+ protected open fun extractRouteTag(backStackTag: String): String {\n+ return backStackTag.split(ROUTE_TAG_DELIMITER).last()\n+ }\n+\nprotected open fun getBackStackKey(): String {\nreturn BACK_STACK_KEY.format(containerId)\n}\n@@ -297,7 +305,7 @@ open class FragmentNavigator(\nval fragmentManager = fragmentManager\nfragmentManager.executePendingTransactions()\n- val fragment = fragmentManager.findFragmentByTag(route.getTag())\n+ val fragment = fragmentManager.findFragmentByTag(convertToBackStackTag(route.getTag()))\n?: return false\nfragmentManager.beginTransaction()\n@@ -319,5 +327,6 @@ open class FragmentNavigator(\ncompanion object {\nprivate const val BACK_STACK_KEY = \"TabChildFragmentNavigator container %d\"\n+ const val ROUTE_TAG_DELIMITER = \"-\"\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/navigator/fragment/tab/host/TabHostFragmentNavigator.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/navigator/fragment/tab/host/TabHostFragmentNavigator.kt",
"diff": "@@ -4,7 +4,7 @@ import androidx.fragment.app.FragmentManager\nimport ru.surfstudio.android.navigation.navigator.fragment.FragmentNavigator\n/**\n- * Navigator that used in each host tab in [TabFragmentNavigator] mechanism\n+ * Navigator that used in each host tab in [ru.surfstudio.android.navigation.navigator.fragment.tab.TabFragmentNavigator] mechanism\n*/\nclass TabHostFragmentNavigator(\nfragmentManager: FragmentManager,\n@@ -15,4 +15,13 @@ class TabHostFragmentNavigator(\ninternal fun obtainBackStack() = backStack\noverride fun getBackStackKey() = \"${super.getBackStackKey()} $hostRouteTag\"\n+\n+ override fun convertToBackStackTag(routeTag: String): String {\n+ val routeTagWithContainerId = super.convertToBackStackTag(routeTag)\n+ return \"$hostRouteTag$ROUTE_TAG_DELIMITER$routeTagWithContainerId\"\n+ }\n+\n+ override fun extractRouteTag(backStackTag: String): String {\n+ return backStackTag.split(ROUTE_TAG_DELIMITER).last()\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/provider/callbacks/ActivityNavigationProviderCallbacks.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/provider/callbacks/ActivityNavigationProviderCallbacks.kt",
"diff": "@@ -2,22 +2,24 @@ package ru.surfstudio.android.navigation.provider.callbacks\nimport android.app.Activity\nimport android.app.Application\n+import android.content.Intent\nimport android.os.Bundle\nimport androidx.appcompat.app.AppCompatActivity\nimport androidx.fragment.app.FragmentActivity\n-import ru.surfstudio.android.navigation.provider.id.IdentifiableScreen\nimport ru.surfstudio.android.navigation.provider.ActivityNavigationProvider\nimport ru.surfstudio.android.navigation.provider.holder.ActivityNavigationHolder\nimport ru.surfstudio.android.navigation.provider.FragmentNavigationProvider\nimport ru.surfstudio.android.navigation.provider.callbacks.creator.FragmentNavigationProviderCallbacksCreator\nimport ru.surfstudio.android.navigation.navigator.activity.ActivityNavigator\nimport ru.surfstudio.android.navigation.navigator.dialog.DialogNavigator\n+import ru.surfstudio.android.navigation.route.activity.ActivityRoute.Companion.SCREEN_ID\n/**\n* Activity\n*/\n//@PerApp\nopen class ActivityNavigationProviderCallbacks(\n+ private val packageName: String,\nprivate val fragmentCallbacksCreator: FragmentNavigationProviderCallbacksCreator = ::FragmentNavigationProviderCallbacks\n) : Application.ActivityLifecycleCallbacks, ActivityNavigationProvider {\n@@ -131,8 +133,18 @@ open class ActivityNavigationProviderCallbacks(\n}\nprotected open fun safeRequireActivityId(activity: Activity, onActivityReady: (id: String) -> Unit) {\n- if (activity is AppCompatActivity && activity is IdentifiableScreen) {\n- onActivityReady(activity.screenId)\n+ if (activity is AppCompatActivity) {\n+ val intent = activity.intent\n+ val screenId = when {\n+ intent.hasExtra(SCREEN_ID) -> intent.getStringExtra(SCREEN_ID)\n+ activity.packageName == packageName && intent.action == Intent.ACTION_MAIN -> LAUNCHER_ACTIVITY_ID\n+ else -> return\n}\n+ onActivityReady(screenId)\n+ }\n+ }\n+\n+ private companion object {\n+ const val LAUNCHER_ACTIVITY_ID = \"ActivityNavigationProviderCallbacks Launcher activity\"\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/provider/callbacks/FragmentNavigationProviderCallbacks.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/provider/callbacks/FragmentNavigationProviderCallbacks.kt",
"diff": "@@ -128,8 +128,7 @@ open class FragmentNavigationProviderCallbacks(\nprivate fun getFragmentId(fragment: Fragment): String {\n- val screenId = fragment.arguments?.getString(Route.SCREEN_ID)\n- return screenId ?: error(\"Fragment id must always be specified!\")\n+ return fragment.tag ?: error(\"Fragment tag must always be specified!\")\n}\nprivate fun getContainerId(fragment: Fragment): Int? {\n"
},
{
"change_type": "DELETE",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/provider/id/IdentifiableScreen.kt",
"new_path": null,
"diff": "-package ru.surfstudio.android.navigation.provider.id\n-\n-interface IdentifiableScreen {\n- val screenId: String\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/route/Route.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/route/Route.kt",
"diff": "@@ -33,6 +33,5 @@ interface Route {\nval EXTRA_TEN = \"EXTRA_TEN\"\nval EXTRA_ELEVEN = \"EXTRA_ELEVEN\"\nval EXTRA_TWELVE = \"EXTRA_TWELVE\"\n- val SCREEN_ID = \"SCREEN_ID\"\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/dagger/AppNavigationModule.kt",
"new_path": "navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/dagger/AppNavigationModule.kt",
"diff": "@@ -24,8 +24,8 @@ class AppNavigationModule {\n@Provides\n@PerApplication\n- fun provideActivityNavigationProviderCallbacks(): ActivityNavigationProviderCallbacks {\n- return ActivityNavigationProviderCallbacks()\n+ fun provideActivityNavigationProviderCallbacks(context: Context): ActivityNavigationProviderCallbacks {\n+ return ActivityNavigationProviderCallbacks(context.packageName)\n}\n@Provides\n"
},
{
"change_type": "DELETE",
"old_path": "navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/base/BaseSampleActivityView.kt",
"new_path": null,
"diff": "-package ru.surfstudio.android.navigation.sample_standard.screen.base\n-\n-import ru.surfstudio.android.core.mvp.binding.rx.ui.BaseRxActivityView\n-import ru.surfstudio.android.navigation.provider.id.IdentifiableScreen\n-import ru.surfstudio.android.navigation.route.Route\n-\n-abstract class BaseSampleActivityView : BaseRxActivityView(), IdentifiableScreen {\n-\n- override val screenId: String = intent?.getStringExtra(Route.SCREEN_ID) ?: \"\"\n-\n- override fun getScreenName(): String = screenId\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/main/MainActivityView.kt",
"new_path": "navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/main/MainActivityView.kt",
"diff": "package ru.surfstudio.android.navigation.sample_standard.screen.main\nimport ru.surfstudio.android.core.mvp.binding.rx.ui.BaseRxActivityView\n-import ru.surfstudio.android.navigation.provider.id.IdentifiableScreen\nimport ru.surfstudio.android.navigation.sample_standard.R\n-import ru.surfstudio.android.navigation.sample_standard.screen.base.BaseSampleActivityView\n-class MainActivityView : BaseSampleActivityView() {\n+class MainActivityView : BaseRxActivityView() {\noverride fun createConfigurator() = MainConfigurator(intent)\noverride fun getContentView(): Int = R.layout.activity_main\n+\n+ override fun getScreenName(): String = \"Main\"\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/splash/SplashActivityView.kt",
"new_path": "navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/screen/splash/SplashActivityView.kt",
"diff": "package ru.surfstudio.android.navigation.sample_standard.screen.splash\n+import android.os.Bundle\n+import android.os.PersistableBundle\n+import android.util.Log\nimport ru.surfstudio.android.core.mvp.binding.rx.ui.BaseRxActivityView\n-import ru.surfstudio.android.navigation.provider.id.IdentifiableScreen\nimport ru.surfstudio.android.navigation.sample_standard.R\n-import ru.surfstudio.android.navigation.sample_standard.screen.base.BaseSampleActivityView\n-import ru.surfstudio.android.navigation.sample_standard.screen.main.MainConfigurator\n-class SplashActivityView : BaseSampleActivityView() {\n+class SplashActivityView : BaseRxActivityView() {\noverride fun createConfigurator() = SplashConfigurator(intent)\noverride fun getContentView(): Int = R.layout.activity_main\n+\n+ override fun getScreenName(): String = \"Splash\"\n+\n+ override fun onCreate(savedInstanceState: Bundle?, persistentState: PersistableBundle?, viewRecreated: Boolean) {\n+ super.onCreate(savedInstanceState, persistentState, viewRecreated)\n+ Log.d(\"1111\", \"$intent\")\n+ }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/App.kt",
"new_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/App.kt",
"diff": "@@ -21,7 +21,7 @@ class App : Application() {\n}\nprivate fun initExecutor() {\n- val callbacksSupplier = ActivityNavigationProviderCallbacks()\n+ val callbacksSupplier = ActivityNavigationProviderCallbacks(packageName)\nregisterActivityLifecycleCallbacks(callbacksSupplier)\nnavigator = AppCommandExecutor(callbacksSupplier)\nprovider = callbacksSupplier\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/MainActivity.kt",
"new_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/MainActivity.kt",
"diff": "@@ -4,18 +4,15 @@ import android.os.Bundle\nimport androidx.appcompat.app.AppCompatActivity\nimport ru.surfstudio.android.navigation.command.fragment.Add\nimport ru.surfstudio.android.navigation.provider.container.FragmentNavigationContainer\n-import ru.surfstudio.android.navigation.provider.id.IdentifiableScreen\nimport ru.surfstudio.android.navigation.sample.R\nimport ru.surfstudio.android.navigation.sample.app.App\nimport ru.surfstudio.android.navigation.sample.app.screen.splash.SplashRoute\nimport ru.surfstudio.android.navigation.sample.app.utils.animations.FadeAnimations\n-class MainActivity : AppCompatActivity(), IdentifiableScreen, FragmentNavigationContainer {\n+class MainActivity : AppCompatActivity(), FragmentNavigationContainer {\noverride val containerId: Int = R.id.fragment_container\n- override val screenId: String = \"AuthActivity\"\n-\noverride fun onCreate(savedInstanceState: Bundle?) {\nsuper.onCreate(savedInstanceState)\nsetContentView(R.layout.activity_single)\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/profile/about/AboutActivity.kt",
"new_path": "navigation/sample/src/main/java/ru/surfstudio/android/navigation/sample/app/screen/main/profile/about/AboutActivity.kt",
"diff": "@@ -2,12 +2,9 @@ package ru.surfstudio.android.navigation.sample.app.screen.main.profile.about\nimport android.os.Bundle\nimport androidx.appcompat.app.AppCompatActivity\n-import ru.surfstudio.android.navigation.provider.id.IdentifiableScreen\nimport ru.surfstudio.android.navigation.sample.R\n-class AboutActivity : AppCompatActivity(), IdentifiableScreen {\n-\n- override val screenId: String = \"AboutApp\"\n+class AboutActivity : AppCompatActivity() {\noverride fun onCreate(savedInstanceState: Bundle?) {\nsuper.onCreate(savedInstanceState)\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-312 Remove identifiable screen interface, activity screen id is declared based on route tag |
652,316 | 19.04.2020 22:27:05 | -10,800 | 5fecf959849e55682530b5e0d89cb9afca2b3f96 | Add check for activity id to be unique on holder creation | [
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/provider/callbacks/ActivityNavigationProviderCallbacks.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/provider/callbacks/ActivityNavigationProviderCallbacks.kt",
"diff": "@@ -42,7 +42,7 @@ open class ActivityNavigationProviderCallbacks(\noverride fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {\nsafeRequireActivityId(activity) { id ->\n- val newHolder = createHolder(activity, savedInstanceState)\n+ val newHolder = createHolder(id, activity, savedInstanceState)\nnavigatorHolders[id] = newHolder\nif (savedInstanceState != null) {\ncurrentHolder = newHolder\n@@ -116,8 +116,9 @@ open class ActivityNavigationProviderCallbacks(\nfragmentManager.unregisterFragmentLifecycleCallbacks(fragmentNavigationProvider)\n}\n- protected open fun createHolder(activity: Activity, savedInstanceState: Bundle?): ActivityNavigationHolder {\n+ protected open fun createHolder(id: String, activity: Activity, savedInstanceState: Bundle?): ActivityNavigationHolder {\nrequire(activity is AppCompatActivity) { \"All activities with ActivityNavigationHolders should implement AppCompatActivity!\" }\n+ require(!navigatorHolders.containsKey(id)) { \"Activity id must be unique! You should provide unique ActivityRoute.getTag() for each activity in application.\" }\nval fragmentNavigationProvider = fragmentCallbacksCreator(activity, savedInstanceState)\nregisterFragmentNavigationProvider(activity, fragmentNavigationProvider)\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/App.kt",
"new_path": "navigation/sample-standard/src/main/java/ru/surfstudio/android/navigation/sample_standard/App.kt",
"diff": "@@ -42,8 +42,9 @@ class App : Application() {\n}\nprivate fun registerNavigationProviderCallbacks() {\n- val callbacks = appComponent.activityNavigationProvider() as? ActivityNavigationProviderCallbacks\n- registerActivityLifecycleCallbacks(callbacks ?: return)\n+ val provider = appComponent.activityNavigationProvider()\n+ val callbackProvider = provider as? ActivityNavigationProviderCallbacks ?: return\n+ registerActivityLifecycleCallbacks(callbackProvider)\n}\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-312 Add check for activity id to be unique on holder creation |
652,313 | 20.04.2020 10:14:28 | -10,800 | 562060e80af59b35ddd05f9fdc8d7e7a31566de1 | added default BottomBarView implementation | [
{
"change_type": "MODIFY",
"old_path": "template/RELEASE_NOTES.md",
"new_path": "template/RELEASE_NOTES.md",
"diff": "# Template Release Notes\n## 0.5.0-alpha\n##### Template\n+* ANDDEP-46 Added default BottomBarView implementation\n* ANDDEP-687 Added \"androidx.constraintlayout:constraintlayout\" dependency with \"implementation\" type to f-debug\n* ANDDEP-687 Added \"com.google.dagger:dagger\" dependency with \"implementation\" type to f-debug\n* ANDDEP-687 Added \"javax.inject:javax.inject\" and \"com.annimon:stream\" to commonModule.gradle\n"
},
{
"change_type": "MODIFY",
"old_path": "template/f-main/src/main/res/layout/activity_main.xml",
"new_path": "template/f-main/src/main/res/layout/activity_main.xml",
"diff": "-<RelativeLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\n+<LinearLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\nxmlns:tools=\"http://schemas.android.com/tools\"\nandroid:layout_width=\"match_parent\"\n- android:layout_height=\"match_parent\">\n+ android:layout_height=\"match_parent\"\n+ android:orientation=\"vertical\">\n<TextView\n- android:layout_width=\"wrap_content\"\n- android:layout_height=\"wrap_content\"\n- android:layout_centerInParent=\"true\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"0dp\"\n+ android:layout_weight=\"1\"\n+ android:gravity=\"center\"\nandroid:text=\"Main\"\ntools:ignore=\"HardcodedText\" />\n-</RelativeLayout>\n\\ No newline at end of file\n+\n+ <ru.surfstudio.standard.f_main.view.BottomBarView\n+ android:id=\"@+id/main_bottom_bar\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"56dp\" />\n+\n+</LinearLayout>\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "template/f-main/src/main/res/layout/layout_bottom_bar.xml",
"diff": "+<?xml version=\"1.0\" encoding=\"utf-8\"?>\n+<merge xmlns:android=\"http://schemas.android.com/apk/res/android\"\n+ xmlns:app=\"http://schemas.android.com/apk/res-auto\"\n+ xmlns:tools=\"http://schemas.android.com/tools\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"56dp\"\n+ android:orientation=\"horizontal\"\n+ tools:parentTag=\"android.widget.LinearLayout\">\n+\n+ <ru.surfstudio.standard.f_main.view.BottomBarItemView\n+ android:id=\"@+id/bottom_bar_feed_btn\"\n+ android:layout_width=\"0px\"\n+ android:layout_height=\"match_parent\"\n+ android:layout_weight=\"1\"\n+ android:background=\"?selectableItemBackgroundBorderless\"\n+ app:item_icon=\"@drawable/debug_ic_android\"\n+ app:item_labelText=\"@string/app_name\" />\n+\n+ <ru.surfstudio.standard.f_main.view.BottomBarItemView\n+ android:id=\"@+id/bottom_bar_profile_btn\"\n+ android:layout_width=\"0px\"\n+ android:layout_height=\"match_parent\"\n+ android:layout_weight=\"1\"\n+ android:background=\"?selectableItemBackgroundBorderless\"\n+ app:item_icon=\"@drawable/debug_ic_android\"\n+ app:item_labelText=\"@string/app_name\" />\n+\n+</merge>\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "template/f-main/src/main/res/layout/view_bottom_nav_bar.xml",
"diff": "+<?xml version=\"1.0\" encoding=\"utf-8\"?>\n+<merge xmlns:android=\"http://schemas.android.com/apk/res/android\"\n+ xmlns:app=\"http://schemas.android.com/apk/res-auto\"\n+ xmlns:tools=\"http://schemas.android.com/tools\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"56dp\"\n+ tools:parentTag=\"android.widget.LinearLayout\">\n+\n+ <ru.surfstudio.standard.f_main.view.BottomBarItemView\n+ android:id=\"@+id/bottom_bar_my_finance_btn\"\n+ android:layout_width=\"0px\"\n+ android:layout_height=\"match_parent\"\n+ android:layout_weight=\"1\"\n+ android:background=\"?attr/selectableItemBackgroundBorderless\"\n+ app:item_icon=\"@drawable/debug_ic_android\"\n+ app:item_labelText=\"@string/app_name\" />\n+\n+ <ru.surfstudio.standard.f_main.view.BottomBarItemView\n+ android:id=\"@+id/bottom_bar_profile_btn\"\n+ android:layout_width=\"0px\"\n+ android:layout_height=\"match_parent\"\n+ android:layout_weight=\"1\"\n+ android:background=\"?attr/selectableItemBackgroundBorderless\"\n+ app:item_icon=\"@drawable/debug_ic_android\"\n+ app:item_labelText=\"@string/app_name\" />\n+\n+</merge>\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "template/f-main/src/main/res/values/attrs.xml",
"diff": "+<?xml version=\"1.0\" encoding=\"utf-8\"?>\n+<resources>\n+ <declare-styleable name=\"BottomBarItemView\">\n+ <attr name=\"item_icon\" format=\"reference\" />\n+ <attr name=\"item_labelText\" format=\"reference\" />\n+ </declare-styleable>\n+</resources>\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-46 added default BottomBarView implementation |
652,335 | 20.04.2020 10:23:08 | -10,800 | 78ecf5da8626aa3fb3eebfd2c2be5630ad47c2d8 | Increase global alpha version counter to 118 [skip ci] [version] | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/projectConfiguration.json",
"new_path": "buildSrc/projectConfiguration.json",
"diff": "{\n\"version\": \"0.5.0\",\n\"stable\": false,\n- \"unstable_version\": 117,\n+ \"unstable_version\": 118,\n\"project_snapshot_name\": \"\",\n\"project_snapshot_version\": 0\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Increase global alpha version counter to 118 [skip ci] [version] |
652,327 | 21.04.2020 03:19:45 | -10,800 | 052707e2919dba33e3d2790bad14ec045d19f056 | tests and .md files no longer need release notes | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_release_notes/CheckReleaseNotesChangedTask.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_release_notes/CheckReleaseNotesChangedTask.kt",
"diff": "@@ -17,6 +17,11 @@ import ru.surfstudio.android.build.tasks.changed_components.GitCommandRunner\nopen class CheckReleaseNotesChangedTask : DefaultTask() {\n+ companion object{\n+ const val MD_FILE_REGEX = \"/*\\\\.md\"\n+ const val TEST_FILE_REGEX = \"/androidTest/\"\n+ }\n+\nprivate lateinit var revisionToCompare: String\n/**\n@@ -45,8 +50,13 @@ open class CheckReleaseNotesChangedTask : DefaultTask() {\n?: throw ComponentNotFoundException(component.name)\nif (isComponentChanged(resultByConfig.isComponentChanged, resultByFile.isComponentChanged)) {\n- if (isComponentHasDiffs(componentsWithDiffs, component)) {\nval diffs = componentsWithDiffs.getValue(component)\n+\n+ val isChangesNotRequireDescription = diffs.all {\n+ MD_FILE_REGEX.toRegex().containsMatchIn(it) || TEST_FILE_REGEX.toRegex().containsMatchIn(it)\n+ }\n+ if (!isChangesNotRequireDescription) {\n+ if (isComponentHasDiffs(componentsWithDiffs, component)) {\nif (!isReleaseFileIncluded(diffs, component.name)) {\nthrow ReleaseNotesForFilesException(\ncomponent.name,\n@@ -62,6 +72,7 @@ open class CheckReleaseNotesChangedTask : DefaultTask() {\n}\n}\n}\n+ }\nprivate fun isComponentHasDiffs(componentsWithDiffs: Map<Component, List<String>>, component: Component) =\ncomponentsWithDiffs.containsKey(component)\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-960 tests and .md files no longer need release notes |
652,327 | 21.04.2020 03:50:33 | -10,800 | b22abe7a93b537bc7ca437fb1a29c3b91ede1cdc | .gradle files no longer need release notes | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_release_notes/CheckReleaseNotesChangedTask.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_release_notes/CheckReleaseNotesChangedTask.kt",
"diff": "@@ -20,6 +20,7 @@ open class CheckReleaseNotesChangedTask : DefaultTask() {\ncompanion object {\nconst val MD_FILE_REGEX = \"/*\\\\.md\"\nconst val TEST_FILE_REGEX = \"/androidTest/\"\n+ const val GRADLE_FILE_REGEX = \"/*\\\\.gradle\"\n}\nprivate lateinit var revisionToCompare: String\n@@ -53,7 +54,9 @@ open class CheckReleaseNotesChangedTask : DefaultTask() {\nval diffs = componentsWithDiffs.getValue(component)\nval isChangesNotRequireDescription = diffs.all {\n- MD_FILE_REGEX.toRegex().containsMatchIn(it) || TEST_FILE_REGEX.toRegex().containsMatchIn(it)\n+ MD_FILE_REGEX.toRegex().containsMatchIn(it)\n+ || TEST_FILE_REGEX.toRegex().containsMatchIn(it)\n+ || GRADLE_FILE_REGEX.toRegex().containsMatchIn(it)\n}\nif (!isChangesNotRequireDescription) {\nif (isComponentHasDiffs(componentsWithDiffs, component)) {\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-960 .gradle files no longer need release notes |
652,327 | 21.04.2020 04:31:47 | -10,800 | 6a1bbee720b1c77fef1372e13c51a1633c0d26b0 | sample files no longer need release notes | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_release_notes/CheckReleaseNotesChangedTask.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/check_release_notes/CheckReleaseNotesChangedTask.kt",
"diff": "@@ -19,8 +19,8 @@ open class CheckReleaseNotesChangedTask : DefaultTask() {\ncompanion object {\nconst val MD_FILE_REGEX = \"/*\\\\.md\"\n- const val TEST_FILE_REGEX = \"/androidTest/|/test/\"\nconst val GRADLE_FILE_REGEX = \"/*\\\\.gradle\"\n+ const val SAMPLE_FILE_REGEX = \"/sample/\"\n}\nprivate lateinit var revisionToCompare: String\n@@ -55,8 +55,8 @@ open class CheckReleaseNotesChangedTask : DefaultTask() {\nval isChangesNotRequireDescription = diffs.all {\nMD_FILE_REGEX.toRegex().containsMatchIn(it)\n- || TEST_FILE_REGEX.toRegex().containsMatchIn(it)\n|| GRADLE_FILE_REGEX.toRegex().containsMatchIn(it)\n+ || SAMPLE_FILE_REGEX.toRegex().containsMatchIn(it)\n}\nif (!isChangesNotRequireDescription) {\nif (isComponentHasDiffs(componentsWithDiffs, component)) {\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-960 sample files no longer need release notes |
652,312 | 21.04.2020 10:15:38 | -10,800 | 71ec799054642c021231b3e6a67c7f1f42db1628 | Add filter for mirror commits | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/GitTree.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/GitTree.kt",
"diff": "@@ -350,12 +350,7 @@ class GitTree(\n}\n}\n- mirrorNodes.forEach {\n- println(\"NODE ${it.value.shortMessage}\")\n- }\n- println()\n-\n- val mirrorHashes = mirrorNodes.map { it.value.standardHash }\n+ val mirrorHashes = mirrorNodes.map { it.value.mirrorStandardHash }\nstandardRepositoryCommitsForMirror = standardRepositoryCommitsForMirror.filter {\nit.branch.isNotEmpty() && !mirrorHashes.contains(it.commit.standardHash)\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/MirrorManager.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/deploy_to_mirror/MirrorManager.kt",
"diff": "@@ -126,7 +126,7 @@ class MirrorManager(\n*/\nprivate fun applyGitTreeToMirror() {\ngitTree.standardRepositoryCommitsForMirror.forEach { commit ->\n- println(\"${commit.type} ${commit.commit.shortMessage}\")\n+ println(\"${commit.commit.standardHash} ${commit.type} ${commit.commit.shortMessage}\")\n(when (commit.type) {\nCommitType.SIMPLE -> commit(commit)\nCommitType.MERGE -> merge(commit)\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-1034 Add filter for mirror commits |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.