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,315 | 14.02.2020 16:56:54 | -10,800 | b6fac1d31176c5884f66c1e6a0c348cfe44e1e5a | Renamed onlyIf method to filter | [
{
"change_type": "MODIFY",
"old_path": "mvi/lib-mvi-impls/src/main/java/ru/surfstudio/android/core/mvi/impls/ui/middleware/dsl/EventTransformerList.kt",
"new_path": "mvi/lib-mvi-impls/src/main/java/ru/surfstudio/android/core/mvi/impls/ui/middleware/dsl/EventTransformerList.kt",
"diff": "@@ -225,8 +225,8 @@ open class EventTransformerList<E : Event>(\neventStream.ofType(this.java).decompose(mw)\n/**\n- * Adds event filtering by a given [filterCondition].\n+ * Filters events by a given [filterCondition].\n*/\n- infix fun <T : Event> KClass<T>.onlyIf(filterCondition: (T) -> Boolean): Observable<T> =\n+ infix fun <T : Event> KClass<T>.filter(filterCondition: (T) -> Boolean): Observable<T> =\neventStream.ofType(this.java).filter(filterCondition)\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Renamed onlyIf method to filter |
652,309 | 16.02.2020 18:45:19 | -10,800 | 3e81a1d202a01b09993d487e7e75f2682485a29f | Added extensions and classes for use decorator with EasyAdapter. | [
{
"change_type": "MODIFY",
"old_path": "easyadapter/RELEASE_NOTES.md",
"new_path": "easyadapter/RELEASE_NOTES.md",
"diff": "* Added support for asynchronous item list updates diff calculation\n* ANDDEP-812 - Fixed crash after enabling infinite scroll, fixed scroll position saving mechanism\n* ANDDEP-829 Fixed synchronous DiffResult dispatching in DefaultDiffer.\n+* ANDDEP-785 Added method getItem(), for get BaseItem by position\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": "@@ -151,6 +151,16 @@ public class EasyAdapter extends RecyclerView.Adapter {\nreturn getItemStringIdInternal(items, position);\n}\n+ /**\n+ * Get BaseItem from items list at certain position\n+ *\n+ * @param position position of item\n+ * @return unique item id\n+ */\n+ public final BaseItem getItem(int position) {\n+ return items.get(getListPosition(position));\n+ }\n+\n/**\n* Get the item's hashcode at certain position\n*\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-decorator/sample/src/main/AndroidManifest.xml",
"new_path": "recycler-decorator/sample/src/main/AndroidManifest.xml",
"diff": "<activity android:name=\".LinearDecoratorActivity\"\nandroid:screenOrientation=\"portrait\"/>\n- <activity android:name=\".CarouselDecoratorActivity\" />\n+ <activity android:name=\".CarouselDecoratorActivity\"\n+ android:screenOrientation=\"portrait\"/>\n+\n+ <activity android:name=\".EasyAdapterDecoratorActivity\"\n+ android:screenOrientation=\"portrait\" />\n</application>\n</manifest>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/CarouselDecoratorActivity.kt",
"new_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/CarouselDecoratorActivity.kt",
"diff": "@@ -36,11 +36,11 @@ class CarouselDecoratorActivity : AppCompatActivity() {\nPagerSnapHelper().attachToRecyclerView(pager_rv)\n}\n- val roundViewHoldersGroupDrawer = RoundViewHoldersGroupDrawer(8.px.toFloat())\n+ val roundViewHoldersGroupDrawer = RoundViewHoldersGroupDrawer(8.toPx.toFloat())\nval simpleOffsetDrawer2 = SimpleOffsetDrawer(\n- left = 16.px,\n- right = 16.px\n+ left = 16.toPx,\n+ right = 16.toPx\n)\nval decorator2 = ru.surfstudio.android.recycler.decorator.Builder()\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/EasyAdapterDecoratorActivity.kt",
"diff": "+package ru.surfstudio.android.recycler.decorator.sample\n+\n+import android.os.Build\n+import android.os.Bundle\n+import androidx.annotation.RequiresApi\n+import androidx.appcompat.app.AppCompatActivity\n+import androidx.recyclerview.widget.LinearLayoutManager\n+import kotlinx.android.synthetic.main.activity_linear_decoration.*\n+import ru.surfstudio.android.easyadapter.EasyAdapter\n+import ru.surfstudio.android.easyadapter.ItemList\n+import ru.surfstudio.android.recycler.decorator.Builder\n+import ru.surfstudio.android.recycler.decorator.sample.controllers.BindableController\n+import ru.surfstudio.android.recycler.decorator.sample.easydecor.offset\n+import ru.surfstudio.android.recycler.decorator.sample.easydecor.overlay\n+import ru.surfstudio.android.recycler.decorator.sample.sample.Gap\n+import ru.surfstudio.android.recycler.decorator.sample.sample.Rules\n+\n+@RequiresApi(Build.VERSION_CODES.LOLLIPOP)\n+class EasyAdapterDecoratorActivity : AppCompatActivity() {\n+\n+ private val easyAdapter = EasyAdapter()\n+\n+ private val bindableController = BindableController(R.layout.item_controller_short_card)\n+\n+ override fun onCreate(savedInstanceState: Bundle?) {\n+ super.onCreate(savedInstanceState)\n+ setContentView(R.layout.activity_linear_decoration)\n+ init()\n+ }\n+\n+ private fun init() {\n+ recycler_view.apply {\n+ layoutManager = LinearLayoutManager(this@EasyAdapterDecoratorActivity)\n+ adapter = easyAdapter\n+ }\n+\n+ val easyDecor = BindableController.BindableDecor(Gap(\n+ resources.getColor(R.color.gray_A150),\n+ 2.toPx,\n+ paddingStart = 16.toPx,\n+ paddingEnd = 16.toPx,\n+ rule = Rules.MIDDLE\n+ ))\n+\n+ val bindableOffset = BindableController.BindableOffset()\n+\n+ val decorator2 = Builder()\n+ .overlay(easyDecor)\n+ .offset(bindableOffset)\n+ .build()\n+\n+ recycler_view.addItemDecoration(decorator2)\n+\n+ val items = ItemList.create()\n+\n+ (0..2).forEach { number ->\n+ items.add(1, bindableController)\n+ }\n+\n+ (0..2).forEach { number ->\n+ items.add(2, bindableController)\n+ }\n+\n+ (0..2).forEach { number ->\n+ items.add(3, bindableController)\n+ }\n+\n+ easyAdapter.setItems(items)\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/LinearDecoratorActivity.kt",
"new_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/LinearDecoratorActivity.kt",
"diff": "@@ -34,28 +34,28 @@ class LinearDecoratorActivity : AppCompatActivity() {\n}\nval simpleOffsetDrawer1 = SimpleOffsetDrawer(\n- left = 16.px,\n- top = 8.px,\n- right = 16.px,\n- bottom = 8.px\n+ left = 16.toPx,\n+ top = 8.toPx,\n+ right = 16.toPx,\n+ bottom = 8.toPx\n)\nval simpleOffsetDrawer2 = SimpleOffsetDrawer(\n- left = 16.px,\n- right = 16.px\n+ left = 16.toPx,\n+ right = 16.toPx\n)\nval dividerDrawer2Px = LinearOverDividerDrawer(\nGap(\nresources.getColor(R.color.gray_A150),\n- 2.px,\n- paddingStart = 16.px,\n- paddingEnd = 16.px,\n+ 2.toPx,\n+ paddingStart = 16.toPx,\n+ paddingEnd = 16.toPx,\nrule = Rules.MIDDLE\n)\n)\n- val roundViewHoldersGroupDrawer = RoundViewHoldersGroupDrawer(12.px.toFloat())\n+ val roundViewHoldersGroupDrawer = RoundViewHoldersGroupDrawer(12.toPx.toFloat())\nval paralaxdecorator = ParallaxHeaderDecoration(this, R.drawable.night_png)\nval decorator2 = Builder()\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/MainActivity.kt",
"new_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/MainActivity.kt",
"diff": "@@ -15,8 +15,12 @@ class MainActivity : AppCompatActivity() {\nstartActivity(Intent(this, LinearDecoratorActivity::class.java))\n}\n- drawable_decor_btn.setOnClickListener {\n+ pager_decor_btn.setOnClickListener {\nstartActivity(Intent(this, CarouselDecoratorActivity::class.java))\n}\n+\n+ easy_adapter_decor_btn.setOnClickListener {\n+ startActivity(Intent(this, EasyAdapterDecoratorActivity::class.java))\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/UiKtx.kt",
"new_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/UiKtx.kt",
"diff": "@@ -2,5 +2,5 @@ package ru.surfstudio.android.recycler.decorator.sample\nimport android.content.res.Resources\n-val Int.px: Int\n+val Int.toPx: Int\nget() = (this * Resources.getSystem().displayMetrics.density).toInt()\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/controllers/BindableController.kt",
"diff": "+package ru.surfstudio.android.recycler.decorator.sample.controllers\n+\n+import android.graphics.Canvas\n+import android.graphics.Paint\n+import android.graphics.Rect\n+import android.view.View\n+import android.view.ViewGroup\n+import androidx.annotation.LayoutRes\n+import androidx.recyclerview.widget.RecyclerView\n+import kotlinx.android.synthetic.main.item_controller_short_card.view.*\n+import ru.surfstudio.android.easyadapter.controller.BindableItemController\n+import ru.surfstudio.android.easyadapter.holder.BindableViewHolder\n+import ru.surfstudio.android.easyadapter.item.BindableItem\n+import ru.surfstudio.android.recycler.decorator.sample.easydecor.BaseViewHolderDecor\n+import ru.surfstudio.android.recycler.decorator.sample.easydecor.BaseViewHolderOffset\n+import ru.surfstudio.android.recycler.decorator.sample.toPx\n+import ru.surfstudio.android.recycler.decorator.sample.sample.Gap\n+\n+class BindableController(@LayoutRes val layoutRes: Int) : BindableItemController<Int, BindableController.Holder>() {\n+\n+ override fun viewType(): Int {\n+ return layoutRes\n+ }\n+\n+ override fun createViewHolder(parent: ViewGroup): Holder =\n+ Holder(parent, layoutRes)\n+\n+ override fun getItemId(data: Int): String {\n+ return \"$data\"\n+ }\n+\n+ class Holder(parent: ViewGroup, layoutRes: Int) : BindableViewHolder<Int>(parent, layoutRes) {\n+ override fun bind(number: Int) {\n+ itemView.number_tv.text = \"$number\"\n+ }\n+ }\n+\n+ class BindableDecor(val gap: Gap) : BaseViewHolderDecor<BindableItem<Int, Holder>> {\n+\n+ private val dividerPaint = Paint(Paint.ANTI_ALIAS_FLAG)\n+ private val alpha = dividerPaint.alpha\n+\n+ init {\n+ dividerPaint.color = gap.color\n+ dividerPaint.strokeWidth = gap.height.toFloat()\n+ }\n+\n+\n+ override fun draw(canvas: Canvas, view: View, recyclerView: RecyclerView, state: RecyclerView.State, baseItem: BindableItem<Int, Holder>) {\n+\n+ val startX = recyclerView.paddingLeft + gap.paddingStart\n+ val startY = view.bottom + view.translationY\n+ val stopX = recyclerView.width - recyclerView.paddingRight - gap.paddingEnd\n+ val stopY = startY\n+\n+ dividerPaint.alpha = (view.alpha * alpha).toInt()\n+\n+ val nextBaseItem = baseItem.nextItem as? BindableItem<Int, Holder>\n+\n+ if(baseItem.data != nextBaseItem?.data ?: -1) {\n+ canvas.drawLine(startX.toFloat(), startY, stopX.toFloat(), stopY, dividerPaint)\n+ }\n+ }\n+ }\n+\n+ class BindableOffset : BaseViewHolderOffset<BindableItem<Int, Holder>> {\n+ override fun getItemOffsets(outRect: Rect, view: View, recyclerView: RecyclerView, state: RecyclerView.State, baseItem: BindableItem<Int, Holder>) {\n+ if(baseItem.data.rem(2) == 0) {\n+ outRect.set(24.toPx, 0, 0, 0)\n+ }\n+ if(baseItem.data.rem(3) == 0) {\n+ outRect.set(48.toPx, 0, 0, 0)\n+ }\n+ }\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/controllers/LinePagerIndicatorDecoration.kt",
"new_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/controllers/LinePagerIndicatorDecoration.kt",
"diff": "@@ -6,7 +6,7 @@ import android.view.animation.AccelerateDecelerateInterpolator\nimport androidx.recyclerview.widget.LinearLayoutManager\nimport androidx.recyclerview.widget.RecyclerView\nimport ru.surfstudio.android.recycler.decorator.base.RecyclerViewDecor\n-import ru.surfstudio.android.recycler.decorator.sample.px\n+import ru.surfstudio.android.recycler.decorator.sample.toPx\nclass LinePagerIndicatorDecoration : RecyclerViewDecor {\n@@ -16,21 +16,21 @@ class LinePagerIndicatorDecoration : RecyclerViewDecor {\n/**\n* Height attachTo the space the indicator takes up at the bottom attachTo the view.\n*/\n- private val indicatorHeight = 16.px\n+ private val indicatorHeight = 16.toPx\n/**\n* Indicator stroke width.\n*/\n- private val indicatorStrokeWidth = 2.px\n+ private val indicatorStrokeWidth = 2.toPx\n/**\n* Indicator width.\n*/\n- private val indicatorItemLength = 16.px\n+ private val indicatorItemLength = 16.toPx\n/**\n* Padding between indicators.\n*/\n- private val indicatorItemPadding = 4.px\n+ private val indicatorItemPadding = 4.toPx\n/**\n* Some more natural animation interpolation\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/easydecor/EasyItemDecor.kt",
"diff": "+package ru.surfstudio.android.recycler.decorator.sample.easydecor\n+\n+import android.graphics.Canvas\n+import android.graphics.Rect\n+import android.view.View\n+import androidx.recyclerview.widget.RecyclerView\n+import ru.surfstudio.android.easyadapter.EasyAdapter\n+import ru.surfstudio.android.easyadapter.item.BaseItem\n+import ru.surfstudio.android.recycler.decorator.Builder\n+import ru.surfstudio.android.recycler.decorator.base.OffsetDecor\n+import ru.surfstudio.android.recycler.decorator.base.ViewHolderDecor\n+\n+@Suppress(\"UNCHECKED_CAST\")\n+class BaseItemControllerDecoration<I : BaseItem<out RecyclerView.ViewHolder>>(\n+ private val baseViewHolderDecor: BaseViewHolderDecor<I>\n+) : ViewHolderDecor {\n+\n+ override fun draw(canvas: Canvas, view: View, recyclerView: RecyclerView, state: RecyclerView.State) {\n+\n+ val itemPosition = recyclerView.getChildAdapterPosition(view)\n+\n+ val adapter = recyclerView.adapter as EasyAdapter\n+\n+ val baseItem = adapter.getItem(itemPosition) as I\n+\n+ baseViewHolderDecor.draw(canvas, view, recyclerView, state, baseItem)\n+ }\n+}\n+\n+@Suppress(\"UNCHECKED_CAST\")\n+class BaseItemControllerOffset<I : BaseItem<out RecyclerView.ViewHolder>>(\n+ private val baseViewHolderOffset: BaseViewHolderOffset<I>\n+) : OffsetDecor {\n+\n+ override fun getItemOffsets(outRect: Rect, view: View, recyclerView: RecyclerView, state: RecyclerView.State) {\n+ val itemPosition = recyclerView.getChildAdapterPosition(view)\n+\n+ val adapter = recyclerView.adapter as EasyAdapter\n+\n+ val baseItem = adapter.getItem(itemPosition) as I\n+\n+ baseViewHolderOffset.getItemOffsets(outRect, view, recyclerView, state, baseItem)\n+ }\n+}\n+\n+interface BaseViewHolderDecor<I : BaseItem<out RecyclerView.ViewHolder>> {\n+ fun draw(canvas: Canvas,\n+ view: View,\n+ recyclerView: RecyclerView,\n+ state: RecyclerView.State,\n+ baseItem: I)\n+}\n+\n+interface BaseViewHolderOffset<I : BaseItem<out RecyclerView.ViewHolder>> {\n+ fun getItemOffsets(outRect: Rect,\n+ view: View,\n+ recyclerView: RecyclerView,\n+ state: RecyclerView.State,\n+ baseItem: I)\n+}\n+\n+\n+fun <D : BaseViewHolderDecor<out BaseItem<out RecyclerView.ViewHolder>>> Builder.overlay(baseItemControllerDecoration: D): Builder {\n+ return this.overlay(BaseItemControllerDecoration(baseItemControllerDecoration))\n+}\n+\n+fun <D : BaseViewHolderDecor<out BaseItem<out RecyclerView.ViewHolder>>> Builder.overlay(pair: Pair<Int, D>): Builder {\n+ return this.overlay(pair.first to BaseItemControllerDecoration(pair.second))\n+}\n+\n+fun <D : BaseViewHolderDecor<out BaseItem<out RecyclerView.ViewHolder>>> Builder.underlay(baseItemControllerDecoration: D): Builder {\n+ return this.underlay(BaseItemControllerDecoration(baseItemControllerDecoration))\n+}\n+\n+fun <D : BaseViewHolderDecor<out BaseItem<out RecyclerView.ViewHolder>>> Builder.underlay(pair: Pair<Int, D>): Builder {\n+ return this.underlay(pair.first to BaseItemControllerDecoration(pair.second))\n+}\n+\n+fun <D : BaseViewHolderOffset<out BaseItem<out RecyclerView.ViewHolder>>> Builder.offset(baseItemControllerOffset: D): Builder {\n+ return this.offset(BaseItemControllerOffset(baseItemControllerOffset))\n+}\n+\n+fun <D : BaseViewHolderOffset<out BaseItem<out RecyclerView.ViewHolder>>> Builder.offset(pair: Pair<Int, D>): Builder {\n+ return this.offset(pair.first to BaseItemControllerOffset(pair.second))\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-decorator/sample/src/main/res/layout/activity_main.xml",
"new_path": "recycler-decorator/sample/src/main/res/layout/activity_main.xml",
"diff": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n-<LinearLayout\n- 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\"\nandroid:layout_height=\"match_parent\"\n<Button\nandroid:id=\"@+id/linear_decor_btn\"\n+ style=\"@style/Widget.AppCompat.Button.Borderless.Colored\"\nandroid:layout_width=\"wrap_content\"\nandroid:layout_height=\"wrap_content\"\n- android:text=\"@string/linear_decoration_btn\"\n- style=\"@style/Widget.AppCompat.Button.Borderless.Colored\"/>\n+ android:text=\"@string/linear_decoration_btn\" />\n<Button\n- android:id=\"@+id/drawable_decor_btn\"\n+ android:id=\"@+id/pager_decor_btn\"\n+ style=\"@style/Widget.AppCompat.Button.Borderless.Colored\"\nandroid:layout_width=\"wrap_content\"\nandroid:layout_height=\"wrap_content\"\n- android:text=\"@string/drawble_decoration_btn\"\n- style=\"@style/Widget.AppCompat.Button.Borderless.Colored\"/>\n+ android:text=\"@string/pager_decoration_btn\" />\n+\n+ <Button\n+ android:id=\"@+id/easy_adapter_decor_btn\"\n+ style=\"@style/Widget.AppCompat.Button.Borderless.Colored\"\n+ android:layout_width=\"wrap_content\"\n+ android:layout_height=\"wrap_content\"\n+ android:text=\"@string/easy_decoration_btn\" />\n</LinearLayout>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-decorator/sample/src/main/res/layout/item_controller_short_card.xml",
"new_path": "recycler-decorator/sample/src/main/res/layout/item_controller_short_card.xml",
"diff": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<LinearLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\n+ xmlns:app=\"http://schemas.android.com/apk/res-auto\"\nxmlns:tools=\"http://schemas.android.com/tools\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"wrap_content\"\n- android:padding=\"8dp\"\n+ android:background=\"@color/gray_A100\"\nandroid:orientation=\"horizontal\"\n- xmlns:app=\"http://schemas.android.com/apk/res-auto\"\n- android:background=\"@color/gray_A100\">\n+ android:padding=\"8dp\">\n+\n+ <FrameLayout\n+ android:layout_width=\"wrap_content\"\n+ android:layout_height=\"wrap_content\">\n<ru.surfstudio.android.recycler.decorator.sample.StubView\nandroid:layout_width=\"56dp\"\napp:isCircle=\"true\"\napp:stubColor=\"@color/gray_A150\" />\n+ <TextView\n+ android:id=\"@+id/number_tv\"\n+ android:layout_width=\"56dp\"\n+ android:layout_height=\"56dp\"\n+ android:gravity=\"center\"\n+ android:textAppearance=\"@style/TextAppearance.AppCompat.Display1\"\n+ tools:text=\"1\" />\n+ </FrameLayout>\n+\n<LinearLayout\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"match_parent\"\n- android:padding=\"8dp\"\nandroid:gravity=\"center_vertical\"\n- android:orientation=\"vertical\">\n+ android:orientation=\"vertical\"\n+ android:padding=\"8dp\">\n<ru.surfstudio.android.recycler.decorator.sample.StubView\nandroid:layout_width=\"match_parent\"\n<ru.surfstudio.android.recycler.decorator.sample.StubView\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"8dp\"\n- android:layout_marginEnd=\"64dp\"\nandroid:layout_marginTop=\"16dp\"\n+ android:layout_marginEnd=\"64dp\"\napp:cornerRadius=\"8dp\"\napp:stubColor=\"@color/gray_A150\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-decorator/sample/src/main/res/values/strings.xml",
"new_path": "recycler-decorator/sample/src/main/res/values/strings.xml",
"diff": "<string name=\"app_name\">Recycler decorator sample</string>\n<string name=\"linear_decoration_btn\">Linear decoration</string>\n<string name=\"round_decoration_btn\">Round decoration</string>\n- <string name=\"drawble_decoration_btn\">Pager decoration</string>\n+ <string name=\"pager_decoration_btn\">Pager decoration</string>\n+ <string name=\"easy_decoration_btn\">Easy adapter decoration</string>\n<string name=\"recycler_view_text\">RecyclerView</string>\n</resources>\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-785 Added extensions and classes for use decorator with EasyAdapter. |
652,309 | 21.02.2020 16:00:28 | -10,800 | 30f7fd1d4bddd211f2e3a9a9555c45cd14fe72fd | fix crash in BaseItemControllerDecoration and BaseItemControllerOffset. Add complex sample for use EasyAdapter Decor extensionssssss | [
{
"change_type": "MODIFY",
"old_path": "easyadapter/RELEASE_NOTES.md",
"new_path": "easyadapter/RELEASE_NOTES.md",
"diff": "* ANDDEP-812 - Fixed crash after enabling infinite scroll, fixed scroll position saving mechanism\n* ANDDEP-829 Fixed synchronous DiffResult dispatching in DefaultDiffer.\n* ANDDEP-785 Added method getItem(), for get BaseItem by position\n+* ANDDEP-785 Added method getter, for *firstInvisibleItemEnabled* property\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": "@@ -213,6 +213,16 @@ public class EasyAdapter extends RecyclerView.Adapter {\nthis.firstInvisibleItemEnabled = enableFirstInvisibleItem;\n}\n+ /**\n+ *\n+ * @see FirstInvisibleItemController\n+ *\n+ * @return state of the property {@link FirstInvisibleItemController} enabled\n+ */\n+ public boolean isFirstInvisibleItemEnabled() {\n+ return firstInvisibleItemEnabled;\n+ }\n+\n/**\n* Set if the infinite scroll enabled.\n*\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-decorator/lib-recycler-decorator/src/main/java/ru/surfstudio/android/recycler/decorator/draw/DecorsBridge.kt",
"new_path": "recycler-decorator/lib-recycler-decorator/src/main/java/ru/surfstudio/android/recycler/decorator/draw/DecorsBridge.kt",
"diff": "@@ -46,8 +46,8 @@ class DecorsBridge(\n*/\nfun onDrawUnderlay(canvas: Canvas, recyclerView: RecyclerView, state: RecyclerView.State) {\nunderlaysRecycler.drawRecyclerViewDecors(canvas, recyclerView, state)\n- groupedUnderlays.drawAttachedDecors(canvas, recyclerView, state)\ngroupedUnderlays.drawNotAttachedDecors(canvas, recyclerView, state)\n+ groupedUnderlays.drawAttachedDecors(canvas, recyclerView, state)\n}\n/**\n@@ -64,9 +64,10 @@ class DecorsBridge(\n*/\nfun getItemOffsets(outRect: Rect, view: View, recyclerView: RecyclerView, state: RecyclerView.State) {\ndrawOffset(EACH_VIEW, outRect, view, recyclerView, state)\n- val itemViewType = recyclerView.findContainingViewHolder(view)?.itemViewType ?: EACH_VIEW\n+ recyclerView.findContainingViewHolder(view)?.itemViewType?.let { itemViewType ->\ndrawOffset(itemViewType, outRect, view, recyclerView, state)\n}\n+ }\nprivate fun Map<Int, List<DecorDrawer<ViewHolderDecor>>>.drawAttachedDecors(\ncanvas: Canvas,\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-decorator/sample/src/main/AndroidManifest.xml",
"new_path": "recycler-decorator/sample/src/main/AndroidManifest.xml",
"diff": "<activity android:name=\".EasyAdapterDecoratorActivity\"\nandroid:screenOrientation=\"portrait\" />\n+\n+ <activity android:name=\".ChatActivity\"\n+ android:screenOrientation=\"portrait\" />\n</application>\n</manifest>\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/ChatActivity.kt",
"diff": "+package ru.surfstudio.android.recycler.decorator.sample\n+\n+import android.graphics.Canvas\n+import android.graphics.Rect\n+import android.os.Build\n+import android.os.Bundle\n+import android.util.Log\n+import android.view.View\n+import androidx.annotation.RequiresApi\n+import androidx.appcompat.app.AppCompatActivity\n+import androidx.core.view.children\n+import androidx.recyclerview.widget.DefaultItemAnimator\n+import androidx.recyclerview.widget.LinearLayoutManager\n+import androidx.recyclerview.widget.RecyclerView\n+import kotlinx.android.synthetic.main.activity_recycler.*\n+import ru.surfstudio.android.easyadapter.EasyAdapter\n+import ru.surfstudio.android.easyadapter.ItemList\n+import ru.surfstudio.android.recycler.decorator.Builder\n+import ru.surfstudio.android.recycler.decorator.sample.controllers.*\n+import ru.surfstudio.android.recycler.decorator.sample.easydecor.offset\n+import ru.surfstudio.android.recycler.decorator.sample.easydecor.underlay\n+\n+@RequiresApi(Build.VERSION_CODES.LOLLIPOP)\n+class ChatActivity : AppCompatActivity() {\n+\n+ private val easyAdapter = EasyAdapter()\n+ .apply {\n+ setFirstInvisibleItemEnabled(true)\n+ }\n+\n+ private val chatController = ChatMessageController()\n+\n+ override fun onCreate(savedInstanceState: Bundle?) {\n+ super.onCreate(savedInstanceState)\n+ setContentView(R.layout.activity_recycler)\n+ init()\n+ }\n+\n+ private fun init() {\n+ recycler_view.apply {\n+ layoutManager = LinearLayoutManager(this@ChatActivity)\n+ adapter = easyAdapter\n+ }\n+\n+ val decorator = Builder()\n+ .underlay(ChatDecor(this))\n+ .offset(ChatDecorOffset())\n+ .build()\n+\n+ recycler_view.addItemDecoration(decorator)\n+\n+ /*recycler_view.addItemDecoration(object: RecyclerView.ItemDecoration() {\n+ override fun onDrawOver(c: Canvas, parent: RecyclerView, state: RecyclerView.State) {\n+ super.onDrawOver(c, parent, state)\n+\n+\n+ }\n+\n+ override fun onDraw(c: Canvas, recyclerView: RecyclerView, state: RecyclerView.State) {\n+ super.onDraw(c, recyclerView, state)\n+ recycler_view.children.forEach { view ->\n+ val itemPosition = recyclerView.getChildAdapterPosition(view)\n+ Log.d(\"ChatDecor\",\"Call draw for position: $itemPosition\")\n+ }\n+\n+ }\n+\n+ override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) {\n+ super.getItemOffsets(outRect, view, parent, state)\n+ }\n+ })*/\n+\n+ val items = ItemList.create()\n+\n+ repeat(150) { number ->\n+ val direction = ChatMessageDirection.values()[(0..1).random()]\n+ items.add(ChatObject(number, direction), chatController)\n+ }\n+\n+ easyAdapter.setItems(items)\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/EasyAdapterDecoratorActivity.kt",
"new_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/EasyAdapterDecoratorActivity.kt",
"diff": "@@ -5,7 +5,7 @@ import android.os.Bundle\nimport androidx.annotation.RequiresApi\nimport androidx.appcompat.app.AppCompatActivity\nimport androidx.recyclerview.widget.LinearLayoutManager\n-import kotlinx.android.synthetic.main.activity_linear_decoration.*\n+import kotlinx.android.synthetic.main.activity_recycler.*\nimport ru.surfstudio.android.easyadapter.EasyAdapter\nimport ru.surfstudio.android.easyadapter.ItemList\nimport ru.surfstudio.android.recycler.decorator.Builder\n@@ -24,7 +24,7 @@ class EasyAdapterDecoratorActivity : AppCompatActivity() {\noverride fun onCreate(savedInstanceState: Bundle?) {\nsuper.onCreate(savedInstanceState)\n- setContentView(R.layout.activity_linear_decoration)\n+ setContentView(R.layout.activity_recycler)\ninit()\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/LinearDecoratorActivity.kt",
"new_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/LinearDecoratorActivity.kt",
"diff": "@@ -6,7 +6,7 @@ import androidx.annotation.RequiresApi\nimport androidx.appcompat.app.AppCompatActivity\nimport androidx.recyclerview.widget.LinearLayoutManager\nimport ru.surfstudio.android.recycler.decorator.sample.controllers.Controller\n-import kotlinx.android.synthetic.main.activity_linear_decoration.*\n+import kotlinx.android.synthetic.main.activity_recycler.*\nimport ru.surfstudio.android.easyadapter.EasyAdapter\nimport ru.surfstudio.android.easyadapter.ItemList\nimport ru.surfstudio.android.recycler.decorator.Builder\n@@ -23,7 +23,7 @@ class LinearDecoratorActivity : AppCompatActivity() {\noverride fun onCreate(savedInstanceState: Bundle?) {\nsuper.onCreate(savedInstanceState)\n- setContentView(R.layout.activity_linear_decoration)\n+ setContentView(R.layout.activity_recycler)\ninit()\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/MainActivity.kt",
"new_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/MainActivity.kt",
"diff": "@@ -22,5 +22,9 @@ class MainActivity : AppCompatActivity() {\neasy_adapter_decor_btn.setOnClickListener {\nstartActivity(Intent(this, EasyAdapterDecoratorActivity::class.java))\n}\n+\n+ chat_btn.setOnClickListener {\n+ startActivity(Intent(this, ChatActivity::class.java))\n+ }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/controllers/BindableController.kt",
"new_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/controllers/BindableController.kt",
"diff": "@@ -30,6 +30,7 @@ class BindableController(@LayoutRes val layoutRes: Int) : BindableItemController\n}\nclass Holder(parent: ViewGroup, layoutRes: Int) : BindableViewHolder<Int>(parent, layoutRes) {\n+\noverride fun bind(number: Int) {\nitemView.number_tv.text = \"$number\"\n}\n@@ -46,7 +47,7 @@ class BindableController(@LayoutRes val layoutRes: Int) : BindableItemController\n}\n- override fun draw(canvas: Canvas, view: View, recyclerView: RecyclerView, state: RecyclerView.State, baseItem: BindableItem<Int, Holder>) {\n+ override fun draw(canvas: Canvas, view: View, recyclerView: RecyclerView, state: RecyclerView.State, baseItem: BindableItem<Int, Holder>?) {\nval startX = recyclerView.paddingLeft + gap.paddingStart\nval startY = view.bottom + view.translationY\n@@ -55,20 +56,21 @@ class BindableController(@LayoutRes val layoutRes: Int) : BindableItemController\ndividerPaint.alpha = (view.alpha * alpha).toInt()\n- val nextBaseItem = baseItem.nextItem as? BindableItem<Int, Holder>\n+ val nextBaseItem = baseItem?.nextItem as? BindableItem<Int, Holder>\n- if(baseItem.data != nextBaseItem?.data ?: -1) {\n+ if(baseItem?.data != nextBaseItem?.data ?: -1) {\ncanvas.drawLine(startX.toFloat(), startY, stopX.toFloat(), stopY, dividerPaint)\n}\n}\n}\nclass BindableOffset : BaseViewHolderOffset<BindableItem<Int, Holder>> {\n- override fun getItemOffsets(outRect: Rect, view: View, recyclerView: RecyclerView, state: RecyclerView.State, baseItem: BindableItem<Int, Holder>) {\n- if(baseItem.data.rem(2) == 0) {\n+\n+ override fun getItemOffsets(outRect: Rect, view: View, recyclerView: RecyclerView, state: RecyclerView.State, baseItem: BindableItem<Int, Holder>?) {\n+ if(baseItem?.data?.rem(2) == 0) {\noutRect.set(24.toPx, 0, 0, 0)\n}\n- if(baseItem.data.rem(3) == 0) {\n+ if(baseItem?.data?.rem(3) == 0) {\noutRect.set(48.toPx, 0, 0, 0)\n}\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/controllers/ChatMessageController.kt",
"diff": "+package ru.surfstudio.android.recycler.decorator.sample.controllers\n+\n+import android.content.Context\n+import android.graphics.*\n+import android.util.Log\n+import android.view.Gravity\n+import android.view.View\n+import android.view.ViewGroup\n+import androidx.core.content.ContextCompat\n+import androidx.recyclerview.widget.RecyclerView\n+import kotlinx.android.synthetic.main.chat_message_layout.view.*\n+import ru.surfstudio.android.easyadapter.controller.BindableItemController\n+import ru.surfstudio.android.easyadapter.holder.BindableViewHolder\n+import ru.surfstudio.android.easyadapter.item.BindableItem\n+import ru.surfstudio.android.logger.Logger\n+import ru.surfstudio.android.recycler.decorator.sample.R\n+import ru.surfstudio.android.recycler.decorator.sample.controllers.ChatMessageDirection.INCOME\n+import ru.surfstudio.android.recycler.decorator.sample.easydecor.BaseViewHolderDecor\n+import ru.surfstudio.android.recycler.decorator.sample.easydecor.BaseViewHolderOffset\n+import ru.surfstudio.android.recycler.decorator.sample.toPx\n+\n+class ChatMessageController : BindableItemController<ChatObject, ChatMessageController.Holder>() {\n+\n+ override fun createViewHolder(parent: ViewGroup): Holder {\n+ return Holder(parent)\n+ }\n+\n+ override fun getItemId(data: ChatObject): String {\n+ return \"${data.messageDirection.name} ${data.id}\"\n+ }\n+\n+ class Holder(parent: ViewGroup) : BindableViewHolder<ChatObject>(parent, R.layout.chat_message_layout) {\n+ override fun bind(data: ChatObject) {\n+\n+ val gravity = if (data.messageDirection == INCOME) {\n+ Gravity.END\n+ } else {\n+ Gravity.START\n+ }\n+\n+ itemView.chat_vh_root.gravity = gravity\n+ itemView.message_area_layout.gravity = gravity\n+ }\n+ }\n+}\n+\n+class ChatDecor(private val context: Context) : BaseViewHolderDecor<BindableItem<ChatObject, ChatMessageController.Holder>> {\n+\n+ private val outcomeColor = ContextCompat.getColor(context, R.color.material_50)\n+ private val incomeColor = ContextCompat.getColor(context, R.color.material_501)\n+\n+ private val paint = Paint(Paint.ANTI_ALIAS_FLAG)\n+\n+ private val outcomeBubbleCorners =\n+ floatArrayOf(\n+ 8.toPx.toFloat(), 8.toPx.toFloat(), // Top left radius in px\n+ 0f, 0f, // Top right radius in px\n+ 8.toPx.toFloat(), 8.toPx.toFloat(), // Bottom right radius in px\n+ 0f, 0f // Bottom left radius in px\n+ )\n+\n+ private val incomeBubbleCorners =\n+ floatArrayOf(\n+ 0f, 0f, // Top left radius in px\n+ 8.toPx.toFloat(), 8.toPx.toFloat(), // Top right radius in px\n+ 0f, 0f, // Bottom right radius in px\n+ 8.toPx.toFloat(), 8.toPx.toFloat() // Bottom left radius in px\n+ )\n+\n+ private val path = Path()\n+\n+ override fun draw(canvas: Canvas,\n+ view: View,\n+ recyclerView: RecyclerView,\n+ state: RecyclerView.State,\n+ baseItem: BindableItem<ChatObject, ChatMessageController.Holder>?) {\n+\n+ //take view of ViewHolder for draw message bubble\n+ val messageAreaView = view.message_area_layout\n+ val messageAreaRect = RectF(\n+ messageAreaView.left.toFloat(),\n+ view.top.toFloat(),\n+ messageAreaView.right.toFloat(),\n+ view.bottom.toFloat()\n+ )\n+\n+ path.reset()\n+\n+ val nextItem =\n+ baseItem?.nextItem as? BindableItem<ChatObject, ChatMessageController.Holder>\n+\n+ val isLastInGroup = baseItem?.data?.messageDirection != nextItem?.data?.messageDirection\n+\n+ if (baseItem?.data?.messageDirection == INCOME) {\n+ paint.color = incomeColor\n+\n+ //draw bubble on message background\n+ path.addRoundRect(messageAreaRect, incomeBubbleCorners, Path.Direction.CW)\n+\n+ //draw triangle for last one message in group\n+ if(isLastInGroup) {\n+ //right bottom corner of bubble\n+ val (x, y) = messageAreaRect.right to messageAreaRect.bottom\n+ path.moveTo(x, y)\n+ path.lineTo(x + 8.toPx, y)\n+ path.lineTo(x, y - 8.toPx)\n+ path.close()\n+ }\n+\n+ } else {\n+ paint.color = outcomeColor\n+ //draw bubble on message background\n+ path.addRoundRect(messageAreaRect, outcomeBubbleCorners, Path.Direction.CW)\n+\n+ //draw triangle for last one message in group\n+ if(isLastInGroup) {\n+ //left bottom corner of bubble\n+ val (x, y) = messageAreaRect.left to messageAreaRect.bottom\n+ path.moveTo(x, y)\n+ path.lineTo(x - 8.toPx, y)\n+ path.lineTo(x, y - 8.toPx)\n+ path.close()\n+ }\n+ }\n+\n+ canvas.drawPath(path, paint)\n+ }\n+}\n+\n+class ChatDecorOffset : BaseViewHolderOffset<BindableItem<ChatObject, ChatMessageController.Holder>> {\n+\n+ override fun getItemOffsets(outRect: Rect,\n+ view: View,\n+ recyclerView: RecyclerView,\n+ state: RecyclerView.State,\n+ baseItem: BindableItem<ChatObject, ChatMessageController.Holder>?) {\n+\n+ val previousItem =\n+ baseItem?.previousItem as? BindableItem<ChatObject, ChatMessageController.Holder>\n+ val topOffset = if (previousItem != null && previousItem.data.messageDirection == baseItem.data?.messageDirection) {\n+ 8.toPx\n+ } else {\n+ 16.toPx\n+ }\n+ outRect.set(0, topOffset, 0, 0)\n+ }\n+\n+}\n+\n+class ChatObject(val id: Int, val messageDirection: ChatMessageDirection)\n+\n+enum class ChatMessageDirection {\n+ INCOME,\n+ OUTCOME\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/easydecor/EasyItemDecor.kt",
"new_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/easydecor/EasyItemDecor.kt",
"diff": "@@ -2,10 +2,12 @@ package ru.surfstudio.android.recycler.decorator.sample.easydecor\nimport android.graphics.Canvas\nimport android.graphics.Rect\n+import android.util.Log\nimport android.view.View\nimport androidx.recyclerview.widget.RecyclerView\nimport ru.surfstudio.android.easyadapter.EasyAdapter\nimport ru.surfstudio.android.easyadapter.item.BaseItem\n+import ru.surfstudio.android.easyadapter.item.NoDataItem\nimport ru.surfstudio.android.recycler.decorator.Builder\nimport ru.surfstudio.android.recycler.decorator.base.OffsetDecor\nimport ru.surfstudio.android.recycler.decorator.base.ViewHolderDecor\n@@ -21,7 +23,11 @@ class BaseItemControllerDecoration<I : BaseItem<out RecyclerView.ViewHolder>>(\nval adapter = recyclerView.adapter as EasyAdapter\n- val baseItem = adapter.getItem(itemPosition) as I\n+ val baseItem = adapter.getItem(itemPosition) as? I\n+\n+ if (adapter.isFirstInvisibleItemEnabled && baseItem is NoDataItem<*> && itemPosition == 0) {\n+ return\n+ }\nbaseViewHolderDecor.draw(canvas, view, recyclerView, state, baseItem)\n}\n@@ -35,9 +41,15 @@ class BaseItemControllerOffset<I : BaseItem<out RecyclerView.ViewHolder>>(\noverride fun getItemOffsets(outRect: Rect, view: View, recyclerView: RecyclerView, state: RecyclerView.State) {\nval itemPosition = recyclerView.getChildAdapterPosition(view)\n+// Log.d(\"BaseItemControllerOffset\",\"Call draw for position: $itemPosition\")\n+\nval adapter = recyclerView.adapter as EasyAdapter\n- val baseItem = adapter.getItem(itemPosition) as I\n+ val baseItem = adapter.getItem(itemPosition) as? I\n+\n+ if (adapter.isFirstInvisibleItemEnabled && baseItem is NoDataItem<*> && itemPosition == 0) {\n+ return\n+ }\nbaseViewHolderOffset.getItemOffsets(outRect, view, recyclerView, state, baseItem)\n}\n@@ -48,7 +60,7 @@ interface BaseViewHolderDecor<I : BaseItem<out RecyclerView.ViewHolder>> {\nview: View,\nrecyclerView: RecyclerView,\nstate: RecyclerView.State,\n- baseItem: I)\n+ baseItem: I?)\n}\ninterface BaseViewHolderOffset<I : BaseItem<out RecyclerView.ViewHolder>> {\n@@ -56,7 +68,7 @@ interface BaseViewHolderOffset<I : BaseItem<out RecyclerView.ViewHolder>> {\nview: View,\nrecyclerView: RecyclerView,\nstate: RecyclerView.State,\n- baseItem: I)\n+ baseItem: I?)\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-decorator/sample/src/main/res/layout/activity_main.xml",
"new_path": "recycler-decorator/sample/src/main/res/layout/activity_main.xml",
"diff": "android:layout_height=\"wrap_content\"\nandroid:text=\"@string/easy_decoration_btn\" />\n+ <Button\n+ android:id=\"@+id/chat_btn\"\n+ style=\"@style/Widget.AppCompat.Button.Borderless.Colored\"\n+ android:layout_width=\"wrap_content\"\n+ android:layout_height=\"wrap_content\"\n+ android:text=\"@string/chat_sample\" />\n+\n</LinearLayout>\n\\ No newline at end of file\n"
},
{
"change_type": "RENAME",
"old_path": "recycler-decorator/sample/src/main/res/layout/activity_linear_decoration.xml",
"new_path": "recycler-decorator/sample/src/main/res/layout/activity_recycler.xml",
"diff": ""
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "recycler-decorator/sample/src/main/res/layout/chat_message_layout.xml",
"diff": "+<?xml version=\"1.0\" encoding=\"utf-8\"?>\n+<LinearLayout 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:id=\"@+id/chat_vh_root\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"wrap_content\"\n+ android:orientation=\"vertical\"\n+ tools:gravity=\"end\"\n+ android:paddingStart=\"16dp\"\n+ android:paddingEnd=\"16dp\">\n+\n+ <LinearLayout\n+ android:id=\"@+id/message_area_layout\"\n+ android:layout_width=\"wrap_content\"\n+ android:layout_height=\"wrap_content\"\n+ android:padding=\"8dp\"\n+ android:orientation=\"vertical\">\n+\n+ <ru.surfstudio.android.recycler.decorator.sample.StubView\n+ android:layout_width=\"150dp\"\n+ android:layout_height=\"16dp\"\n+ app:cornerRadius=\"3dp\"\n+ app:stubColor=\"@color/gray_A150\" />\n+\n+ <ru.surfstudio.android.recycler.decorator.sample.StubView\n+ android:layout_width=\"100dp\"\n+ android:layout_height=\"16dp\"\n+ android:layout_marginTop=\"8dp\"\n+ app:cornerRadius=\"3dp\"\n+ app:stubColor=\"@color/gray_A150\" />\n+\n+ </LinearLayout>\n+\n+</LinearLayout>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-decorator/sample/src/main/res/values/strings.xml",
"new_path": "recycler-decorator/sample/src/main/res/values/strings.xml",
"diff": "<string name=\"pager_decoration_btn\">Pager decoration</string>\n<string name=\"easy_decoration_btn\">Easy adapter decoration</string>\n<string name=\"recycler_view_text\">RecyclerView</string>\n+ <string name=\"chat_sample\">Chat sample</string>\n</resources>\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-785 fix crash in BaseItemControllerDecoration and BaseItemControllerOffset. Add complex sample for use EasyAdapter Decor extensionssssss |
652,309 | 25.02.2020 20:32:21 | -10,800 | 86b0a03feec9a1b57046cf8afbef8a44b07b566a | Added date controller to Chat sample | [
{
"change_type": "MODIFY",
"old_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/ChatActivity.kt",
"new_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/ChatActivity.kt",
"diff": "package ru.surfstudio.android.recycler.decorator.sample\n-import android.graphics.Canvas\n-import android.graphics.Rect\nimport android.os.Build\nimport android.os.Bundle\n-import android.util.Log\n-import android.view.View\n+import android.text.format.DateFormat\nimport androidx.annotation.RequiresApi\nimport androidx.appcompat.app.AppCompatActivity\n-import androidx.core.view.children\n-import androidx.recyclerview.widget.DefaultItemAnimator\nimport androidx.recyclerview.widget.LinearLayoutManager\n-import androidx.recyclerview.widget.RecyclerView\nimport kotlinx.android.synthetic.main.activity_recycler.*\nimport ru.surfstudio.android.easyadapter.EasyAdapter\nimport ru.surfstudio.android.easyadapter.ItemList\n@@ -25,10 +19,11 @@ class ChatActivity : AppCompatActivity() {\nprivate val easyAdapter = EasyAdapter()\n.apply {\n- setFirstInvisibleItemEnabled(true)\n+ isFirstInvisibleItemEnabled = true\n}\nprivate val chatController = ChatMessageController()\n+ private val messageTimeController = MessageTimeController()\noverride fun onCreate(savedInstanceState: Bundle?) {\nsuper.onCreate(savedInstanceState)\n@@ -49,31 +44,15 @@ class ChatActivity : AppCompatActivity() {\nrecycler_view.addItemDecoration(decorator)\n- /*recycler_view.addItemDecoration(object: RecyclerView.ItemDecoration() {\n- override fun onDrawOver(c: Canvas, parent: RecyclerView, state: RecyclerView.State) {\n- super.onDrawOver(c, parent, state)\n-\n-\n- }\n-\n- override fun onDraw(c: Canvas, recyclerView: RecyclerView, state: RecyclerView.State) {\n- super.onDraw(c, recyclerView, state)\n- recycler_view.children.forEach { view ->\n- val itemPosition = recyclerView.getChildAdapterPosition(view)\n- Log.d(\"ChatDecor\",\"Call draw for position: $itemPosition\")\n- }\n-\n- }\n-\n- override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) {\n- super.getItemOffsets(outRect, view, parent, state)\n- }\n- })*/\n-\nval items = ItemList.create()\nrepeat(150) { number ->\nval direction = ChatMessageDirection.values()[(0..1).random()]\n+\n+ if(number.rem(4) == 0) {\n+ val date = DateFormat.format(\"dd:mm:YYYY HH:mm\", System.currentTimeMillis())\n+ items.add(date.toString(), messageTimeController)\n+ }\nitems.add(ChatObject(number, direction), chatController)\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/controllers/ChatMessageController.kt",
"new_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/controllers/ChatMessageController.kt",
"diff": "@@ -2,17 +2,16 @@ package ru.surfstudio.android.recycler.decorator.sample.controllers\nimport android.content.Context\nimport android.graphics.*\n-import android.util.Log\nimport android.view.Gravity\nimport android.view.View\nimport android.view.ViewGroup\nimport androidx.core.content.ContextCompat\nimport androidx.recyclerview.widget.RecyclerView\nimport kotlinx.android.synthetic.main.chat_message_layout.view.*\n+import kotlinx.android.synthetic.main.item_controller_message_time.view.*\nimport ru.surfstudio.android.easyadapter.controller.BindableItemController\nimport ru.surfstudio.android.easyadapter.holder.BindableViewHolder\nimport ru.surfstudio.android.easyadapter.item.BindableItem\n-import ru.surfstudio.android.logger.Logger\nimport ru.surfstudio.android.recycler.decorator.sample.R\nimport ru.surfstudio.android.recycler.decorator.sample.controllers.ChatMessageDirection.INCOME\nimport ru.surfstudio.android.recycler.decorator.sample.easydecor.BaseViewHolderDecor\n@@ -44,6 +43,23 @@ class ChatMessageController : BindableItemController<ChatObject, ChatMessageCont\n}\n}\n+class MessageTimeController : BindableItemController<String, MessageTimeController.Holder>() {\n+\n+ override fun getItemId(data: String): String {\n+ return data\n+ }\n+\n+ override fun createViewHolder(parent: ViewGroup): Holder {\n+ return Holder(parent)\n+ }\n+\n+ class Holder(parent: ViewGroup) : BindableViewHolder<String>(parent, R.layout.item_controller_message_time) {\n+ override fun bind(data: String) {\n+ itemView.time_tv.text = data\n+ }\n+ }\n+}\n+\nclass ChatDecor(private val context: Context) : BaseViewHolderDecor<BindableItem<ChatObject, ChatMessageController.Holder>> {\nprivate val outcomeColor = ContextCompat.getColor(context, R.color.material_50)\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/easydecor/EasyItemDecor.kt",
"new_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/easydecor/EasyItemDecor.kt",
"diff": "@@ -2,15 +2,20 @@ package ru.surfstudio.android.recycler.decorator.sample.easydecor\nimport android.graphics.Canvas\nimport android.graphics.Rect\n-import android.util.Log\nimport android.view.View\nimport androidx.recyclerview.widget.RecyclerView\nimport ru.surfstudio.android.easyadapter.EasyAdapter\nimport ru.surfstudio.android.easyadapter.item.BaseItem\n+import ru.surfstudio.android.easyadapter.item.BindableItem\nimport ru.surfstudio.android.easyadapter.item.NoDataItem\nimport ru.surfstudio.android.recycler.decorator.Builder\nimport ru.surfstudio.android.recycler.decorator.base.OffsetDecor\nimport ru.surfstudio.android.recycler.decorator.base.ViewHolderDecor\n+import ru.surfstudio.android.recycler.decorator.sample.controllers.ChatMessageController\n+import ru.surfstudio.android.recycler.decorator.sample.controllers.ChatObject\n+import java.lang.reflect.ParameterizedType\n+import java.lang.reflect.Type\n+import kotlin.reflect.KClass\n@Suppress(\"UNCHECKED_CAST\")\nclass BaseItemControllerDecoration<I : BaseItem<out RecyclerView.ViewHolder>>(\n@@ -29,7 +34,9 @@ class BaseItemControllerDecoration<I : BaseItem<out RecyclerView.ViewHolder>>(\nreturn\n}\n- baseViewHolderDecor.draw(canvas, view, recyclerView, state, baseItem)\n+ baseItem?.let { item ->\n+ baseViewHolderDecor.draw(canvas, view, recyclerView, state, item)\n+ }\n}\n}\n@@ -41,8 +48,6 @@ class BaseItemControllerOffset<I : BaseItem<out RecyclerView.ViewHolder>>(\noverride fun getItemOffsets(outRect: Rect, view: View, recyclerView: RecyclerView, state: RecyclerView.State) {\nval itemPosition = recyclerView.getChildAdapterPosition(view)\n-// Log.d(\"BaseItemControllerOffset\",\"Call draw for position: $itemPosition\")\n-\nval adapter = recyclerView.adapter as EasyAdapter\nval baseItem = adapter.getItem(itemPosition) as? I\n@@ -51,7 +56,9 @@ class BaseItemControllerOffset<I : BaseItem<out RecyclerView.ViewHolder>>(\nreturn\n}\n- baseViewHolderOffset.getItemOffsets(outRect, view, recyclerView, state, baseItem)\n+ baseItem?.let { item ->\n+ baseViewHolderOffset.getItemOffsets(outRect, view, recyclerView, state, item)\n+ }\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/round/RoundMode.kt",
"new_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/round/RoundMode.kt",
"diff": "* limitations under the License.\n*/\n-package com.ozh.dd.example.round\n+package ru.surfstudio.android.recycler.decorator.sample.round\n/**\n* Enum describes mode round corners\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/round/RoundOutlineProvider.kt",
"new_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/round/RoundOutlineProvider.kt",
"diff": "* limitations under the License.\n*/\n-package com.ozh.dd.example.round\n+package ru.surfstudio.android.recycler.decorator.sample.round\nimport android.graphics.Outline\nimport android.os.Build\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/sample/RoundViewHoldersGroupDrawer.kt",
"new_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/sample/RoundViewHoldersGroupDrawer.kt",
"diff": "@@ -5,8 +5,8 @@ import android.os.Build\nimport android.view.View\nimport androidx.annotation.RequiresApi\nimport androidx.recyclerview.widget.RecyclerView\n-import com.ozh.dd.example.round.RoundMode\n-import com.ozh.dd.example.round.RoundOutlineProvider\n+import ru.surfstudio.android.recycler.decorator.sample.round.RoundMode\n+import ru.surfstudio.android.recycler.decorator.sample.round.RoundOutlineProvider\nimport ru.surfstudio.android.recycler.decorator.base.ViewHolderDecor\n@RequiresApi(Build.VERSION_CODES.LOLLIPOP)\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "recycler-decorator/sample/src/main/res/layout/item_controller_message_time.xml",
"diff": "+<?xml version=\"1.0\" encoding=\"utf-8\"?>\n+<TextView xmlns:android=\"http://schemas.android.com/apk/res/android\"\n+ xmlns:tools=\"http://schemas.android.com/tools\"\n+ android:id=\"@+id/time_tv\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"48dp\"\n+ android:gravity=\"center\"\n+ android:textAppearance=\"@style/TextAppearance.MaterialComponents.Subtitle2\"\n+ tools:text=\"25.02.2020 23.54\" />\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-785 Added date controller to Chat sample |
652,312 | 26.02.2020 11:23:29 | -10,800 | 24021809aea0f6ff018c602e2927470b76fa5e40 | Fix firebase crashlytics initialization in template | [
{
"change_type": "MODIFY",
"old_path": "template/RELEASE_NOTES.md",
"new_path": "template/RELEASE_NOTES.md",
"diff": "* Add color styling to generateDependencyGraph task\n* ANDDEP-392 Add firebase app distribution and firebase crashlytics\n* ANDDEP-927 Add FirebaseCrashlyticsRemoteLoggingStrategy\n+* ANDDEP-392 Fix firebase crashlytics initialization\n## 0.4.0\n##### Template\n"
},
{
"change_type": "MODIFY",
"old_path": "template/base_feature/src/main/java/ru/surfstudio/standard/application/app/App.kt",
"new_path": "template/base_feature/src/main/java/ru/surfstudio/standard/application/app/App.kt",
"diff": "@@ -5,6 +5,7 @@ import android.content.Intent\nimport androidx.multidex.MultiDexApplication\nimport com.akaita.java.rxjava2debug.RxJava2Debug\nimport com.github.anrwatchdog.ANRWatchDog\n+import com.google.firebase.crashlytics.FirebaseCrashlytics\nimport io.reactivex.plugins.RxJavaPlugins\nimport ru.surfstudio.android.activity.holder.ActiveActivityHolder\nimport ru.surfstudio.android.logger.Logger\n@@ -17,7 +18,7 @@ import ru.surfstudio.android.template.base_feature.BuildConfig\nimport ru.surfstudio.android.template.base_feature.R\nimport ru.surfstudio.android.utilktx.ktx.ui.activity.ActivityLifecycleListener\nimport ru.surfstudio.standard.application.app.di.AppInjector\n-import ru.surfstudio.standard.application.logger\n+import ru.surfstudio.standard.application.logger.FirebaseCrashlyticsRemoteLoggingStrategy\nimport ru.surfstudio.standard.f_debug.injector.DebugAppInjector\nclass App : MultiDexApplication() {\n@@ -39,6 +40,7 @@ class App : MultiDexApplication() {\nreturn\n}\n+ initFirebaseCrashlytics()\ninitPushEventListener()\ninitRxJava2Debug()\n@@ -80,6 +82,12 @@ class App : MultiDexApplication() {\n)\n}\n+ private fun initFirebaseCrashlytics() {\n+ FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(isNotDebug())\n+ }\n+\n+ private fun isNotDebug() = !BuildConfig.BUILD_TYPE.contains(\"debug\")\n+\nprivate fun initPushEventListener() {\nPushClickProvider.pushEventListener = object : PushEventListener {\noverride fun pushDismissListener(context: Context, intent: Intent) {\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-392 Fix firebase crashlytics initialization in template |
652,312 | 26.02.2020 12:51:42 | -10,800 | 25727d304cdf3ae4b7ca4c172789d1efa8c7f37c | Add firebase crashlytics migration instruction | [
{
"change_type": "MODIFY",
"old_path": "docs/RELEASE_NOTES.md",
"new_path": "docs/RELEASE_NOTES.md",
"diff": "* Init tracking changes in RELEASE_NOTES\n* Kotlin code style settings configuration.\n* ANDDEP-392 Add firebase app distribution migration instruction\n+* ANDDEP-392 Add firebase crashlytics migration instruction\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-392 Add firebase crashlytics migration instruction |
652,335 | 26.02.2020 13:51:44 | -10,800 | bd69be52fa2d4a00d2dd729f724243385c053ec5 | Increase global alpha version counter to 76 [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\": 8,\n+ \"unstable_version\": 9,\n\"stable\": false,\n\"dir\": \"mvi\",\n\"libs\": [\n{\n\"id\": \"template\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 10,\n+ \"unstable_version\": 11,\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\": 75,\n+ \"unstable_version\": 76,\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 76 [skip ci] [version] |
652,312 | 27.02.2020 11:26:33 | -10,800 | 75ca8397e3666980473d986a1d2b098fb8db3247 | Fix firebase crashlytics migration instruction | [
{
"change_type": "MODIFY",
"old_path": "docs/RELEASE_NOTES.md",
"new_path": "docs/RELEASE_NOTES.md",
"diff": "* Kotlin code style settings configuration.\n* ANDDEP-392 Add firebase app distribution migration instruction\n* ANDDEP-392 Add firebase crashlytics migration instruction\n+* ANDDEP-392 Fix firebase crashlytics migration instruction\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-392 Fix firebase crashlytics migration instruction |
652,335 | 27.02.2020 11:57:26 | -10,800 | 535583e127757630348b76009fcd6e0b3862a50e | Increase global alpha version counter to 77 [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\": 11,\n+ \"unstable_version\": 12,\n\"stable\": false,\n\"dir\": \"template\",\n\"libs\": [],\n{\n\"id\": \"docs\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 8,\n+ \"unstable_version\": 9,\n\"stable\": false,\n\"dir\": \"docs\",\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\": 76,\n+ \"unstable_version\": 77,\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 77 [skip ci] [version] |
652,316 | 27.02.2020 14:57:32 | -10,800 | 60604d07b449161a302501697ee0b08c2f5d6f66 | Fix setting label to app icon | [
{
"change_type": "MODIFY",
"old_path": "template/RELEASE_NOTES.md",
"new_path": "template/RELEASE_NOTES.md",
"diff": "* ANDDEP-927 Add FirebaseCrashlyticsRemoteLoggingStrategy\n* ANDDEP-936 Remove Deprecated annotation from i-network module\n* ANDDEP-392 Fix firebase crashlytics initialization\n+* ANDDEP-937 Fix setting label to app icon\n## 0.4.0\n##### Template\n"
},
{
"change_type": "MODIFY",
"old_path": "template/setLabelToIcon.gradle",
"new_path": "template/setLabelToIcon.gradle",
"diff": "@@ -46,7 +46,7 @@ class IconService {\npublic final static GENERATED_PATH = \"generated/iconlauncher\"\nprivate final static BUILD_GENERATED_PATH = \"build/$GENERATED_PATH\"\n- private final static APP_INJECTOR_DIR_NAME = \"app-injector\"\n+ private final static APP_DIR_NAME = \"app\"\nprivate final static TEMPLATE_DIR_NAME = \"template\"\nprivate final static RES_PATH = \"src/main/res/\"\nprivate final static MANIFEST_PATH = \"src/main/AndroidManifest.xml\"\n@@ -64,7 +64,7 @@ class IconService {\nprivate final static QA_BUILD_VARIANT = \"qa\"\nprivate final static VECTOR_ICON_SUFFIX = \"_ic_lnr\"\n- private File appInjectorDir = null\n+ private File appDir = null\nprivate File overlayImage = null\nprivate File variantDir = null\n@@ -82,9 +82,9 @@ class IconService {\n* Start process to change launcher icon\n*/\nvoid change() {\n- appInjectorDir = getAppInjectorDir()\n- if (appInjectorDir == null) {\n- logger.debug(\"app-injector directory not found\")\n+ appDir = getAppDir()\n+ if (appDir == null) {\n+ logger.debug(\"app directory not found\")\nreturn\n}\n@@ -112,10 +112,10 @@ class IconService {\n* @param iconPath - launcher icon path\n*/\nprivate void processIcon(IconPath iconPath) {\n- File resDir = new File(\"${appInjectorDir.path}/${RES_PATH}\")\n+ File resDir = new File(\"${appDir.path}/${RES_PATH}\")\nif (!resDir.exists()) return\n- variantDir = new File(\"${appInjectorDir.path}/$BUILD_GENERATED_PATH/$buildVariant\")\n+ variantDir = new File(\"${appDir.path}/$BUILD_GENERATED_PATH/$buildVariant\")\nFile variantResDir = new File(\"${variantDir.path}/res\")\noverlayImage = generateOverlayImage(variantResDir)\n@@ -301,14 +301,6 @@ class IconService {\nBufferedImage img = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB)\nGraphics2D g2d = img.createGraphics()\nFont font = new Font(\"Arial\", Font.PLAIN, 28)\n- FontMetrics fm = g2d.getFontMetrics()\n-\n- g2d.setFont(font)\n-\n- g2d.dispose()\n-\n- img = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB)\n- g2d = img.createGraphics()\ng2d.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION, RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY)\ng2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON)\ng2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY)\n@@ -318,7 +310,7 @@ class IconService {\ng2d.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY)\ng2d.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_PURE)\ng2d.setFont(font)\n- fm = g2d.getFontMetrics()\n+ FontMetrics fm = g2d.getFontMetrics()\nint startIndex = 0\nfor (int i = 0; i < versionName.length(); i++) {\n@@ -362,15 +354,15 @@ class IconService {\n}\n/**\n- * Find app-injector directory\n+ * Find app directory\n*\n- * @return app-injector directory\n+ * @return app directory\n*/\n- static File getAppInjectorDir() {\n- File appInjector = new File(\"./${APP_INJECTOR_DIR_NAME}\")\n+ static File getAppDir() {\n+ File appInjector = new File(\"./${APP_DIR_NAME}\")\nif (appInjector.exists()) return appInjector\n- appInjector = new File(\"./${TEMPLATE_DIR_NAME}/${APP_INJECTOR_DIR_NAME}\")\n+ appInjector = new File(\"./${TEMPLATE_DIR_NAME}/${APP_DIR_NAME}\")\nif (appInjector.exists()) return appInjector\nreturn null\n@@ -382,7 +374,7 @@ class IconService {\n* @return icon\n*/\nprivate Icon getIcon() {\n- File manifestFile = new File(\"${appInjectorDir.path}/$MANIFEST_PATH\")\n+ File manifestFile = new File(\"${appDir.path}/$MANIFEST_PATH\")\nif (!manifestFile.exists()) return null\nGPathResult manifestXml = new XmlSlurper().parse(manifestFile)\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-937 Fix setting label to app icon |
652,335 | 27.02.2020 18:19:43 | -10,800 | d42ab07c8647220e5a29fd08d21e562f88ad0114 | Increase global alpha version counter to 78 [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\": 9,\n+ \"unstable_version\": 10,\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\": 77,\n+ \"unstable_version\": 78,\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 78 [skip ci] [version] |
652,316 | 01.03.2020 19:30:27 | -10,800 | 5bb0e2fb61af6c20d3d0e7590d86fad263f01309 | Add animation suppliers, add activityNavigator | [
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/command/activity/Replace.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/command/activity/Replace.kt",
"diff": "@@ -9,5 +9,5 @@ import ru.surfstudio.android.navigation.route.activity.ActivityRoute\ndata class Replace(\noverride val route: ActivityRoute,\noverride val animations: Animations = EmptyResourceAnimations,\n- val options: Bundle\n+ val options: Bundle? = null\n) : ActivityNavigationCommand\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/Start.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/command/activity/Start.kt",
"diff": "@@ -9,5 +9,5 @@ import ru.surfstudio.android.navigation.route.activity.ActivityRoute\ndata class Start(\noverride val route: ActivityRoute,\noverride val animations: Animations = EmptyResourceAnimations,\n- val options: Bundle\n+ val options: Bundle? = null\n) : ActivityNavigationCommand\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/navigator/activity/ActivityNavigator.kt",
"diff": "+package ru.surfstudio.android.navigation.navigator.activity\n+\n+import android.os.Bundle\n+import androidx.appcompat.app.AppCompatActivity\n+import ru.surfstudio.android.navigation.animation.Animations\n+import ru.surfstudio.android.navigation.route.activity.ActivityRoute\n+\n+open class ActivityNavigator(open val activity: AppCompatActivity) : ActivityNavigatorInterface {\n+\n+ override fun start(route: ActivityRoute, animations: Animations, optionsCompat: Bundle?) {\n+ activity.startActivity(route.createIntent(activity), optionsCompat)\n+ }\n+\n+ override fun replace(route: ActivityRoute, animations: Animations, optionsCompat: Bundle?) {\n+ finish()\n+ start(route, animations, optionsCompat)\n+ }\n+\n+ override fun finish() {\n+ activity.finish()\n+ }\n+\n+ override fun finishAffinity() {\n+ activity.finishAffinity()\n+ }\n+\n+ protected open fun Bundle?.supplyWithAnimations() = this?.apply {\n+\n+ }\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/navigator/activity/ActivityNavigatorInterface.kt",
"diff": "+package ru.surfstudio.android.navigation.navigator.activity\n+\n+import android.os.Bundle\n+import ru.surfstudio.android.navigation.animation.Animations\n+import ru.surfstudio.android.navigation.route.activity.ActivityRoute\n+\n+/**\n+ * Base interface for an activity navigator.\n+\n+ */\n+interface ActivityNavigatorInterface {\n+\n+ fun start(route: ActivityRoute, animations: Animations, optionsCompat: Bundle?)\n+\n+ fun replace(route: ActivityRoute, animations: Animations, optionsCompat: Bundle?)\n+\n+ fun finish()\n+\n+ fun finishAffinity()\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": "@@ -13,14 +13,13 @@ import ru.surfstudio.android.navigation.animation.shared.SharedElementAnimations\nimport ru.surfstudio.android.navigation.command.fragment.Add\nimport ru.surfstudio.android.navigation.command.NavigationCommand\nimport ru.surfstudio.android.navigation.command.fragment.Replace\n-import ru.surfstudio.android.navigation.utils.setResourceAnimations\n-import ru.surfstudio.android.navigation.utils.setSharedElementAnimations\nimport ru.surfstudio.android.navigation.navigator.backstack.fragment.FragmentBackStack\nimport ru.surfstudio.android.navigation.navigator.backstack.fragment.entry.FragmentBackStackEntry\nimport ru.surfstudio.android.navigation.navigator.backstack.fragment.entry.FragmentBackStackEntryObj\nimport ru.surfstudio.android.navigation.navigator.backstack.fragment.listener.BackStackChangedListener\nimport ru.surfstudio.android.navigation.navigator.backstack.fragment.BackStackFragmentRoute\nimport ru.surfstudio.android.navigation.route.fragment.FragmentRoute\n+import ru.surfstudio.android.navigation.utils.FragmentAnimationSupplier\n/**\n* Fragment navigator.\n@@ -46,6 +45,8 @@ open class FragmentNavigator(\nprivate val backStackChangedListeners = arrayListOf<BackStackChangedListener>()\n+ var animationSupplier = FragmentAnimationSupplier()\n+\noverride fun add(route: FragmentRoute, animations: Animations) {\nval fragmentManager = fragmentManager\nfragmentManager.executePendingTransactions()\n@@ -248,9 +249,12 @@ open class FragmentNavigator(\nanimations: Animations\n): FragmentTransaction = apply {\nwhen (animations) {\n- is SetAnimations -> animations.set.forEach { supplyWithAnimations(it) }\n- is BaseResourceAnimations -> setResourceAnimations(animations, false)\n- is SharedElementAnimations -> setSharedElementAnimations(animations)\n+ is SetAnimations ->\n+ animations.set.forEach { supplyWithAnimations(it) }\n+ is BaseResourceAnimations ->\n+ animationSupplier.setResourceAnimations(this, animations, false)\n+ is SharedElementAnimations ->\n+ animationSupplier.setSharedElementAnimations(this, animations)\n}\n}\n@@ -275,7 +279,7 @@ open class FragmentNavigator(\n} else {\nlastAnimations\n}\n- transaction.setResourceAnimations(transactionAnimations, true)\n+ animationSupplier.setResourceAnimations(transaction, transactionAnimations, true)\n}\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/utils/ActivityAnimationSupplier.kt",
"diff": "+package ru.surfstudio.android.navigation.utils\n+\n+import android.app.Activity\n+import android.content.Context\n+import android.os.Bundle\n+import android.view.View\n+import androidx.core.app.ActivityOptionsCompat\n+import ru.surfstudio.android.navigation.animation.resource.BaseResourceAnimations\n+import ru.surfstudio.android.navigation.animation.shared.SharedElementAnimations\n+\n+class ActivityAnimationSupplier() {\n+\n+ fun setResourceAnimations(\n+ context: Context,\n+ optionsCompat: Bundle?,\n+ animationBundle: BaseResourceAnimations\n+ ): Bundle? {\n+ val resourceAnimations = ActivityOptionsCompat.makeCustomAnimation(\n+ context,\n+ animationBundle.enterAnimation,\n+ animationBundle.exitAnimation\n+ )\n+ return resourceAnimations.toBundle()?.apply { optionsCompat?.let(::putAll) }\n+ }\n+\n+ fun setSharedElementAnimations(\n+ activity: Activity,\n+ optionsCompat: Bundle?,\n+ animationBundle: SharedElementAnimations\n+ ): Bundle? {\n+ val sharedElements = animationBundle.sharedElements\n+ .map { androidx.core.util.Pair(it.sharedView, it.transitionName) }\n+ val resourceAnimations =\n+ ActivityOptionsCompat.makeSceneTransitionAnimation(activity, *sharedElements.toTypedArray())\n+ return resourceAnimations.toBundle()?.apply { optionsCompat?.let(::putAll) }\n+\n+ }\n+}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-312 Add animation suppliers, add activityNavigator |
652,316 | 01.03.2020 20:57:04 | -10,800 | fb6c30397b4526d26af4967ca67b1e5e95518dfa | Add activity animation processing | [
{
"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": "@@ -4,11 +4,16 @@ import android.os.Bundle\nimport androidx.appcompat.app.AppCompatActivity\nimport ru.surfstudio.android.navigation.animation.Animations\nimport ru.surfstudio.android.navigation.route.activity.ActivityRoute\n+import ru.surfstudio.android.navigation.utils.ActivityAnimationSupplier\nopen class ActivityNavigator(open val activity: AppCompatActivity) : ActivityNavigatorInterface {\n+ protected open val animationSupplier = ActivityAnimationSupplier()\n+\noverride fun start(route: ActivityRoute, animations: Animations, optionsCompat: Bundle?) {\n- activity.startActivity(route.createIntent(activity), optionsCompat)\n+ val optionsWithAnimations =\n+ animationSupplier.supplyWithAnimations(activity, optionsCompat, animations)\n+ activity.startActivity(route.createIntent(activity), optionsWithAnimations)\n}\noverride fun replace(route: ActivityRoute, animations: Animations, optionsCompat: Bundle?) {\n@@ -23,8 +28,4 @@ open class ActivityNavigator(open val activity: AppCompatActivity) : ActivityNav\noverride fun finishAffinity() {\nactivity.finishAffinity()\n}\n-\n- protected open fun Bundle?.supplyWithAnimations() = this?.apply {\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/navigator/fragment/FragmentNavigator.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/navigator/fragment/FragmentNavigator.kt",
"diff": "@@ -34,8 +34,8 @@ import ru.surfstudio.android.navigation.utils.FragmentAnimationSupplier\n* [onSaveState] and [onRestoreState] methods in corresponding lifecycle callbacks of parent screen.\n*/\nopen class FragmentNavigator(\n- override val fragmentManager: FragmentManager,\n- override val containerId: Int = View.NO_ID\n+ val fragmentManager: FragmentManager,\n+ val containerId: Int = View.NO_ID\n) : FragmentNavigatorInterface {\nprotected val backStack: FragmentBackStack = FragmentBackStack()\n@@ -45,7 +45,7 @@ open class FragmentNavigator(\nprivate val backStackChangedListeners = arrayListOf<BackStackChangedListener>()\n- var animationSupplier = FragmentAnimationSupplier()\n+ protected open var animationSupplier = FragmentAnimationSupplier()\noverride fun add(route: FragmentRoute, animations: Animations) {\nval fragmentManager = fragmentManager\n@@ -245,19 +245,6 @@ open class FragmentNavigator(\nreturn BACK_STACK_KEY.format(containerId)\n}\n- protected open fun FragmentTransaction.supplyWithAnimations(\n- animations: Animations\n- ): FragmentTransaction = apply {\n- when (animations) {\n- is SetAnimations ->\n- animations.set.forEach { supplyWithAnimations(it) }\n- is BaseResourceAnimations ->\n- animationSupplier.setResourceAnimations(this, animations, false)\n- is SharedElementAnimations ->\n- animationSupplier.setSharedElementAnimations(this, animations)\n- }\n- }\n-\n/**\n* Add animations to a reverse operations.\n*/\n@@ -283,7 +270,6 @@ open class FragmentNavigator(\n}\n}\n-\n/**\n* Perform operation opposite to ordinary [replace]\n*/\n@@ -294,6 +280,7 @@ open class FragmentNavigator(\nnotifyBackStackListeners()\n}\n+\n/**\n* Perform operation opposite to ordinary [add].\n*/\n@@ -302,6 +289,12 @@ open class FragmentNavigator(\nnotifyBackStackListeners()\n}\n+ private fun FragmentTransaction.supplyWithAnimations(\n+ animations: Animations\n+ ): FragmentTransaction {\n+ return animationSupplier.supplyWithAnimations(this, animations)\n+ }\n+\nprivate fun toggleVisibility(\nroute: FragmentRoute,\nshouldShow: Boolean,\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": "@@ -18,15 +18,11 @@ import ru.surfstudio.android.navigation.route.fragment.FragmentRoute\n*/\ninterface FragmentNavigatorInterface {\n- val containerId: Int\n-\nval isBackStackEmpty: Boolean\nget() = backStackEntryCount == 0\nval backStackEntryCount: Int\n- val fragmentManager: FragmentManager\n-\nfun add(route: FragmentRoute, animations: Animations = EmptyResourceAnimations)\nfun replace(route: FragmentRoute, animations: Animations = EmptyResourceAnimations)\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": "@@ -27,8 +27,8 @@ import ru.surfstudio.android.navigation.route.fragment.FragmentRoute\n* Delegates all the methods of a [FragmentNavigatorInterface] to an active stack.\n*/\nopen class TabFragmentNavigator(\n- override val fragmentManager: FragmentManager,\n- override val containerId: Int = View.NO_ID\n+ val fragmentManager: FragmentManager,\n+ val containerId: Int = View.NO_ID\n) : FragmentNavigatorInterface {\nprivate var activeTabTag: String = \"\"\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/utils/ActivityAnimationSupplier.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/utils/ActivityAnimationSupplier.kt",
"diff": "@@ -3,12 +3,13 @@ package ru.surfstudio.android.navigation.utils\nimport android.app.Activity\nimport android.content.Context\nimport android.os.Bundle\n-import android.view.View\nimport androidx.core.app.ActivityOptionsCompat\n+import ru.surfstudio.android.navigation.animation.Animations\nimport ru.surfstudio.android.navigation.animation.resource.BaseResourceAnimations\n+import ru.surfstudio.android.navigation.animation.set.SetAnimations\nimport ru.surfstudio.android.navigation.animation.shared.SharedElementAnimations\n-class ActivityAnimationSupplier() {\n+open class ActivityAnimationSupplier {\nfun setResourceAnimations(\ncontext: Context,\n@@ -33,6 +34,24 @@ class ActivityAnimationSupplier() {\nval resourceAnimations =\nActivityOptionsCompat.makeSceneTransitionAnimation(activity, *sharedElements.toTypedArray())\nreturn resourceAnimations.toBundle()?.apply { optionsCompat?.let(::putAll) }\n+ }\n+ open fun supplyWithAnimations(\n+ activity: Activity,\n+ options: Bundle?,\n+ animations: Animations\n+ ): Bundle? {\n+ return when (animations) {\n+ is SetAnimations -> {\n+ val unwrappedBundles = animations.set.map { supplyWithAnimations(activity, options, it) }\n+ val setBundle = Bundle().apply { unwrappedBundles.forEach { it?.let(::putAll) } }\n+ if (setBundle.isEmpty) null else setBundle\n+ }\n+ is SharedElementAnimations ->\n+ setSharedElementAnimations(activity, options, animations)\n+ is BaseResourceAnimations ->\n+ setResourceAnimations(activity, options, animations)\n+ else -> null\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/utils/FragmentAnimationSupplier.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/utils/FragmentAnimationSupplier.kt",
"diff": "package ru.surfstudio.android.navigation.utils\nimport androidx.fragment.app.FragmentTransaction\n+import ru.surfstudio.android.navigation.animation.Animations\nimport ru.surfstudio.android.navigation.animation.resource.BaseResourceAnimations\n+import ru.surfstudio.android.navigation.animation.set.SetAnimations\nimport ru.surfstudio.android.navigation.animation.shared.SharedElementAnimations\nopen class FragmentAnimationSupplier {\n@@ -66,4 +68,19 @@ open class FragmentAnimationSupplier {\nanimations.sharedElements.clear()\nreturn transaction\n}\n+\n+ open fun supplyWithAnimations(\n+ transaction: FragmentTransaction,\n+ animations: Animations\n+ ): FragmentTransaction {\n+ when (animations) {\n+ is SetAnimations ->\n+ animations.set.forEach { supplyWithAnimations(transaction, it) }\n+ is BaseResourceAnimations ->\n+ setResourceAnimations(transaction, animations, false)\n+ is SharedElementAnimations ->\n+ setSharedElementAnimations(transaction, animations)\n+ }\n+ return transaction\n+ }\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-312 Add activity animation processing |
652,316 | 01.03.2020 22:04:37 | -10,800 | d443bd6dbf6f5936a1993ed467ca6eb3546e5f06 | Add custom DI on lifecycle callbacks | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/di/FragmentContainer.kt",
"diff": "+package ru.surfstudio.android.navigation.di\n+\n+import androidx.annotation.IdRes\n+\n+interface FragmentContainer {\n+ val containerId: Int @IdRes get\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/di/FragmentNavigatorHolder.kt",
"diff": "+package ru.surfstudio.android.navigation.di\n+\n+import android.app.Activity\n+import android.app.Application\n+import android.os.Bundle\n+import androidx.fragment.app.FragmentActivity\n+import ru.surfstudio.android.navigation.navigator.fragment.FragmentNavigatorInterface\n+\n+class FragmentNavigatorHolder(\n+ val navigatorCreator: FragmentNavigatorCreator\n+) : Application.ActivityLifecycleCallbacks, NavigatorHolder<FragmentNavigatorInterface> {\n+\n+ private val navigators = hashMapOf<String, FragmentNavigatorInterface?>()\n+\n+ private var currentNavigator: FragmentNavigatorInterface? = null\n+\n+ override val navigator: FragmentNavigatorInterface\n+ get() = currentNavigator!!\n+\n+ override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {\n+ val fragmentManager = (activity as? FragmentActivity)?.supportFragmentManager ?: return\n+ val containerId = (activity as? FragmentContainer)?.containerId ?: return\n+ val newNavigator = navigatorCreator(fragmentManager, containerId, savedInstanceState)\n+ navigators[getActivityId(activity)] = newNavigator\n+ if (savedInstanceState != null) {\n+ currentNavigator = newNavigator\n+ }\n+ }\n+\n+ override fun onActivityStarted(activity: Activity) {\n+ }\n+\n+ override fun onActivityResumed(activity: Activity) {\n+ val currentActivityNavigator = navigators[getActivityId(activity)]\n+ currentNavigator = currentActivityNavigator\n+ }\n+\n+ override fun onActivityPaused(activity: Activity) {\n+ val currentActivityNavigator = navigators[getActivityId(activity)]\n+ if (currentNavigator == currentActivityNavigator) {\n+ currentNavigator = null\n+ }\n+ }\n+\n+ override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle?) {\n+ navigators[getActivityId(activity)]?.onSaveState(outState)\n+ }\n+\n+ override fun onActivityStopped(activity: Activity) {\n+ }\n+\n+ override fun onActivityDestroyed(activity: Activity) {\n+ navigators[getActivityId(activity)] = null\n+ }\n+\n+ private fun getActivityId(activity: Activity): String = \"${activity.hashCode()}\"\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/di/NavigatorCreator.kt",
"diff": "+package ru.surfstudio.android.navigation.di\n+\n+import android.os.Bundle\n+import androidx.fragment.app.FragmentManager\n+import ru.surfstudio.android.navigation.navigator.fragment.FragmentNavigatorInterface\n+\n+typealias FragmentNavigatorCreator =\n+ (fm: FragmentManager, containerId: Int, savedState: Bundle?) -> FragmentNavigatorInterface\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/di/NavigatorHolder.kt",
"diff": "+package ru.surfstudio.android.navigation.di\n+\n+interface NavigatorHolder<T> {\n+ val navigator: T\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": "@@ -2,7 +2,7 @@ package ru.surfstudio.android.navigation.executor\nimport ru.surfstudio.android.navigation.command.NavigationCommand\n-interface CommandExecutor<T: NavigationCommand> {\n+interface CommandExecutor<C: NavigationCommand> {\n- fun execute(command: T)\n+ fun execute(command: 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/fragment/FragmentCommandExecutor.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/executor/fragment/FragmentCommandExecutor.kt",
"diff": "@@ -4,20 +4,27 @@ import ru.surfstudio.android.navigation.command.fragment.*\nimport ru.surfstudio.android.navigation.command.fragment.base.FragmentNavigationCommand\nimport ru.surfstudio.android.navigation.executor.CommandExecutor\nimport ru.surfstudio.android.navigation.navigator.fragment.FragmentNavigator\n+import ru.surfstudio.android.navigation.navigator.fragment.FragmentNavigatorInterface\n+import ru.surfstudio.android.navigation.navigator.fragment.tab.TabFragmentNavigator\nopen class FragmentCommandExecutor(\n- private val fragmentNavigator: FragmentNavigator\n+ private val fragmentNavigator: FragmentNavigator,\n+ private val tabFragmentNavigator: TabFragmentNavigator\n): CommandExecutor<FragmentNavigationCommand> {\nopen override fun execute(command: FragmentNavigationCommand) {\n+ when (command.route) { }\n+ }\n+\n+ fun execute(command: FragmentNavigationCommand, navigator: FragmentNavigatorInterface) {\nwhen (command) {\n- is Add -> fragmentNavigator.add(command.route, command.animations)\n- is Replace -> fragmentNavigator.replace(command.route, command.animations)\n- is ReplaceHard -> fragmentNavigator.replaceHard(command.route, command.animations)\n- is Remove -> fragmentNavigator.remove(command.route, command.animations)\n- is RemoveLast -> fragmentNavigator.removeLast(command.animations)\n- is RemoveUntil -> fragmentNavigator.removeUntil(command.route, command.isInclusive)\n- is RemoveAll -> fragmentNavigator.removeAll()\n+ is Add -> navigator.add(command.route, command.animations)\n+ is Replace -> navigator.replace(command.route, command.animations)\n+ is ReplaceHard -> navigator.replaceHard(command.route, command.animations)\n+ is Remove -> navigator.remove(command.route, command.animations)\n+ is RemoveLast -> navigator.removeLast(command.animations)\n+ is RemoveUntil -> navigator.removeUntil(command.route, command.isInclusive)\n+ is RemoveAll -> navigator.removeAll()\n}\n}\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-312 Add custom DI on lifecycle callbacks |
652,312 | 02.03.2020 12:06:42 | -10,800 | f29ce24d1af29191c057e46172f3aab06f64c23e | Add link of instruction of project initialization | [
{
"change_type": "MODIFY",
"old_path": "docs/RELEASE_NOTES.md",
"new_path": "docs/RELEASE_NOTES.md",
"diff": "##### Docs\n* Init tracking changes in RELEASE_NOTES\n* Kotlin code style settings configuration.\n\\ No newline at end of file\n-* ANDDEP-392 Add firebase app distribution migration instruction\n-* ANDDEP-392 Add firebase crashlytics migration instruction\n-* ANDDEP-392 Fix firebase crashlytics migration instruction\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "template/RELEASE_NOTES.md",
"new_path": "template/RELEASE_NOTES.md",
"diff": "* ANDDEP-927 Add FirebaseCrashlyticsRemoteLoggingStrategy\n* ANDDEP-936 Remove Deprecated annotation from i-network module\n* ANDDEP-392 Fix firebase crashlytics initialization\n+* ANDDEP-938 Add link of instruction of project initialization\n## 0.4.0\n##### Template\n"
},
{
"change_type": "DELETE",
"old_path": "template/ci/JenkinsfileTagJob.groovy",
"new_path": null,
"diff": "-@Library('surf-lib@version-2.0.0-SNAPSHOT')\n-// https://bitbucket.org/surfstudio/jenkins-pipeline-lib/\n-import ru.surfstudio.ci.pipeline.tag.TagPipelineAndroid\n-import ru.surfstudio.ci.stage.StageStrategy\n-\n-//init\n-def pipeline = new TagPipelineAndroid(this)\n-pipeline.init()\n-\n-//configuration\n-pipeline.keystoreCredentials = null\n-pipeline.keystorePropertiesCredentials = null\n-\n-pipeline.useFirebaseDistribution = true\n-\n-//customization\n-pipeline.getStage(pipeline.INSTRUMENTATION_TEST).strategy = StageStrategy.SKIP_STAGE\n-pipeline.getStage(pipeline.STATIC_CODE_ANALYSIS).strategy = StageStrategy.SKIP_STAGE\n-\n-//run\n-pipeline.run()\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-938 Add link of instruction of project initialization |
652,335 | 02.03.2020 13:07:24 | -10,800 | aef86338cb30754447a056b73716b7c34c3b8a06 | Increase global alpha version counter to 79 [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\": 12,\n+ \"unstable_version\": 13,\n\"stable\": false,\n\"dir\": \"template\",\n\"libs\": [],\n{\n\"id\": \"docs\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 9,\n+ \"unstable_version\": 10,\n\"stable\": false,\n\"dir\": \"docs\",\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\": 78,\n+ \"unstable_version\": 79,\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 79 [skip ci] [version] |
652,309 | 02.03.2020 21:01:22 | -10,800 | 4926cbee1e3af6642da1de3e8b5855f652d2fe34 | finalized easy adapter extensions implements | [
{
"change_type": "MODIFY",
"old_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/easyadapter/chat/ChatActivity.kt",
"new_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/easyadapter/chat/ChatActivity.kt",
"diff": "@@ -9,9 +9,14 @@ import ru.surfstudio.android.easyadapter.EasyAdapter\nimport ru.surfstudio.android.easyadapter.ItemList\nimport ru.surfstudio.android.recycler.decorator.Decorator\nimport ru.surfstudio.android.recycler.decorator.sample.R\n-import ru.surfstudio.android.recycler.decorator.sample.easyadapter.chat.controller.*\n-import ru.surfstudio.android.recycler.decorator.sample.easyadapter.chat.decor.ChatDecor\n+import ru.surfstudio.android.recycler.decorator.sample.easyadapter.chat.controller.ChatMessageController\n+import ru.surfstudio.android.recycler.decorator.sample.easyadapter.chat.controller.MessageTimeController\nimport ru.surfstudio.android.recycler.decorator.sample.easyadapter.chat.decor.ChatDecorOffset\n+import ru.surfstudio.android.recycler.decorator.sample.easyadapter.chat.decor.ChatMessageDecor\n+import ru.surfstudio.android.recycler.decorator.sample.easyadapter.chat.decor.MessageTimeDecor\n+import ru.surfstudio.android.recycler.decorator.sample.easydecor.offset\n+import ru.surfstudio.android.recycler.decorator.sample.easydecor.overlay\n+import ru.surfstudio.android.recycler.decorator.sample.easydecor.underlay\nclass ChatActivity : AppCompatActivity() {\n@@ -36,7 +41,8 @@ class ChatActivity : AppCompatActivity() {\n}\nval decorator = Decorator.Builder()\n- .underlay(ChatDecor(this))\n+ .underlay(messageTimeController.viewType() to MessageTimeDecor(this))\n+ .underlay(chatController.viewType() to ChatMessageDecor(this))\n.offset(chatController.viewType() to ChatDecorOffset())\n.build()\n@@ -44,7 +50,7 @@ class ChatActivity : AppCompatActivity() {\nval items = ItemList.create()\n- repeat(150) { number ->\n+ repeat(1500) { number ->\nif(number.rem(4) == 0) {\nval date = DateFormat.format(\"dd MMMM yyyy HH:mm:ss\", System.currentTimeMillis())\nitems.add(date.toString(), messageTimeController)\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/easyadapter/chat/decor/ChatDecorOffset.kt",
"new_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/easyadapter/chat/decor/ChatDecorOffset.kt",
"diff": "@@ -3,16 +3,21 @@ package ru.surfstudio.android.recycler.decorator.sample.easyadapter.chat.decor\nimport android.graphics.Rect\nimport android.view.View\nimport androidx.recyclerview.widget.RecyclerView\n-import ru.surfstudio.android.recycler.decorator.Decorator\n+import ru.surfstudio.android.easyadapter.item.BindableItem\n+import ru.surfstudio.android.recycler.decorator.sample.easyadapter.chat.ChatObject\nimport ru.surfstudio.android.recycler.decorator.sample.easyadapter.chat.controller.ChatMessageController\n+import ru.surfstudio.android.recycler.decorator.sample.easydecor.BaseViewHolderOffset\nimport ru.surfstudio.android.recycler.decorator.sample.toPx\n-class ChatDecorOffset : Decorator.OffsetDecor {\n+class ChatDecorOffset : BaseViewHolderOffset<BindableItem<ChatObject, ChatMessageController.Holder>> {\n- override fun getItemOffsets(outRect: Rect,\n+ override fun getItemOffsets(\n+ outRect: Rect,\nview: View,\nrecyclerView: RecyclerView,\n- state: RecyclerView.State) {\n+ state: RecyclerView.State,\n+ baseItem: BindableItem<ChatObject, ChatMessageController.Holder>?\n+ ) {\nval vh = recyclerView.getChildViewHolder(view)\nif(vh !is ChatMessageController.Holder) {\n"
},
{
"change_type": "RENAME",
"old_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/easyadapter/chat/decor/ChatDecor.kt",
"new_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/easyadapter/chat/decor/ChatMessageDecor.kt",
"diff": "package ru.surfstudio.android.recycler.decorator.sample.easyadapter.chat.decor\nimport android.content.Context\n-import android.graphics.*\n+import android.graphics.Canvas\n+import android.graphics.Paint\n+import android.graphics.Path\n+import android.graphics.RectF\nimport android.view.View\nimport androidx.core.content.ContextCompat\nimport androidx.recyclerview.widget.RecyclerView\nimport kotlinx.android.synthetic.main.chat_message_layout.view.*\n-import kotlinx.android.synthetic.main.item_controller_message_time.view.*\n-import ru.surfstudio.android.easyadapter.EasyAdapter\nimport ru.surfstudio.android.easyadapter.item.BindableItem\n-import ru.surfstudio.android.recycler.decorator.Decorator\nimport ru.surfstudio.android.recycler.decorator.sample.R\nimport ru.surfstudio.android.recycler.decorator.sample.easyadapter.chat.ChatMessageDirection\nimport ru.surfstudio.android.recycler.decorator.sample.easyadapter.chat.ChatObject\nimport ru.surfstudio.android.recycler.decorator.sample.easyadapter.chat.controller.ChatMessageController\n-import ru.surfstudio.android.recycler.decorator.sample.easyadapter.chat.controller.MessageTimeController\n+import ru.surfstudio.android.recycler.decorator.sample.easydecor.BaseViewHolderDecor\nimport ru.surfstudio.android.recycler.decorator.sample.toPx\n-class ChatDecor(private val context: Context) : Decorator.ViewHolderDecor {\n+class ChatMessageDecor(private val context: Context) : BaseViewHolderDecor<BindableItem<ChatObject, ChatMessageController.Holder>> {\nprivate val outcomeBubbleColor = ContextCompat.getColor(context, R.color.material_50)\nprivate val incomeBubbleColor = ContextCompat.getColor(context, R.color.material_501)\n- private val timeBubbleColor = ContextCompat.getColor(context, R.color.gray_A150)\nprivate val paint = Paint(Paint.ANTI_ALIAS_FLAG)\n@@ -43,52 +42,8 @@ class ChatDecor(private val context: Context) : Decorator.ViewHolderDecor {\nprivate val path = Path()\n- override fun draw(canvas: Canvas,\n- view: View,\n- recyclerView: RecyclerView,\n- state: RecyclerView.State) {\n+ override fun draw(canvas: Canvas, view: View, recyclerView: RecyclerView, state: RecyclerView.State, baseItem: BindableItem<ChatObject, ChatMessageController.Holder>?) {\n- val vh = recyclerView.getChildViewHolder(view)\n- val adapter = recyclerView.adapter as EasyAdapter\n- val baseItem = adapter.getItem(vh.adapterPosition)\n-\n- when (vh) {\n- is ChatMessageController.Holder -> decorMessageView(canvas, vh, recyclerView, view, baseItem as BindableItem<ChatObject, ChatMessageController.Holder>)\n- is MessageTimeController.Holder -> decorTimeView(canvas, view)\n- }\n- }\n-\n- private fun decorTimeView(canvas: Canvas, view: View) {\n- paint.color = timeBubbleColor\n-\n- val timeView = view.time_tv\n-\n- val textRectAreaOrigin = Rect()\n-\n- timeView.paint.getTextBounds(timeView.text.toString(), 0, timeView.text.length, textRectAreaOrigin)\n-\n- val textWith = textRectAreaOrigin.width()\n- val textHeight = textRectAreaOrigin.height()\n-\n- val viewCy = (timeView.y + timeView.measuredHeight / 2).toInt()\n- val viewCx = timeView.measuredWidth / 2\n-\n- //map text coordinates to canvas area\n- val textRectAreaMapped = RectF(\n- (viewCx - textWith / 2).toFloat(),\n- (viewCy - textHeight / 2).toFloat(),\n- (viewCx + textWith / 2).toFloat(),\n- (viewCy + textHeight / 2).toFloat()\n- )\n-\n- val scaleValue = textHeight * 0.45F\n-\n- textRectAreaMapped.inset(-scaleValue, -scaleValue)\n-\n- canvas.drawRoundRect(textRectAreaMapped, 10.toPx.toFloat(), 10.toPx.toFloat(), paint)\n- }\n-\n- private fun decorMessageView(canvas: Canvas, vh: RecyclerView.ViewHolder, recyclerView: RecyclerView, view: View, baseItem: BindableItem<ChatObject, ChatMessageController.Holder>) {\n//take view of ViewHolder for draw message bubble\nval messageAreaView = view.message_area_layout\nval messageAreaRect = RectF(\n@@ -99,18 +54,19 @@ class ChatDecor(private val context: Context) : Decorator.ViewHolderDecor {\n)\npath.reset()\n+ val vh = recyclerView.getChildViewHolder(view)\nval nextVh = recyclerView.findViewHolderForAdapterPosition(vh.adapterPosition + 1)\nval nextItem =\n- baseItem.nextItem as? BindableItem<ChatObject, ChatMessageController.Holder>\n+ baseItem?.nextItem as? BindableItem<ChatObject, ChatMessageController.Holder>\n//(!) Frigile code, nextItem could not be not BindableItem<ChatObject, ChatMessageController.Holder>\n//You should check nextVh first of all\nval isLastInGroup = nextVh !is ChatMessageController.Holder ||\n- baseItem.data?.messageDirection != nextItem?.data?.messageDirection\n+ baseItem?.data?.messageDirection != nextItem?.data?.messageDirection\n- if (baseItem.data?.messageDirection == ChatMessageDirection.INCOME) {\n+ if (baseItem?.data?.messageDirection == ChatMessageDirection.INCOME) {\npaint.color = incomeBubbleColor\n//draw bubble on message background\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/easyadapter/chat/decor/MessageTimeDecor.kt",
"diff": "+package ru.surfstudio.android.recycler.decorator.sample.easyadapter.chat.decor\n+\n+import android.content.Context\n+import android.graphics.*\n+import android.util.Log\n+import android.view.View\n+import androidx.core.content.ContextCompat\n+import androidx.recyclerview.widget.RecyclerView\n+import kotlinx.android.synthetic.main.chat_message_layout.view.*\n+import kotlinx.android.synthetic.main.item_controller_message_time.view.*\n+import ru.surfstudio.android.easyadapter.EasyAdapter\n+import ru.surfstudio.android.easyadapter.item.BindableItem\n+import ru.surfstudio.android.logger.Logger\n+import ru.surfstudio.android.recycler.decorator.Decorator\n+import ru.surfstudio.android.recycler.decorator.sample.R\n+import ru.surfstudio.android.recycler.decorator.sample.easyadapter.chat.ChatMessageDirection\n+import ru.surfstudio.android.recycler.decorator.sample.easyadapter.chat.ChatObject\n+import ru.surfstudio.android.recycler.decorator.sample.easyadapter.chat.controller.ChatMessageController\n+import ru.surfstudio.android.recycler.decorator.sample.easyadapter.chat.controller.MessageTimeController\n+import ru.surfstudio.android.recycler.decorator.sample.easydecor.BaseViewHolderDecor\n+import ru.surfstudio.android.recycler.decorator.sample.toPx\n+\n+class MessageTimeDecor(private val context: Context) : BaseViewHolderDecor<BindableItem<String, MessageTimeController.Holder>> {\n+\n+ private val paint = Paint(Paint.ANTI_ALIAS_FLAG)\n+ .apply {\n+ color = ContextCompat.getColor(context, R.color.gray_A150)\n+ }\n+\n+ override fun draw(canvas: Canvas, view: View, recyclerView: RecyclerView, state: RecyclerView.State, baseItem: BindableItem<String, MessageTimeController.Holder>?) {\n+\n+ val timeView = view.time_tv\n+\n+ val textRectAreaOrigin = Rect()\n+\n+ timeView.paint.getTextBounds(timeView.text.toString(), 0, timeView.text.length, textRectAreaOrigin)\n+\n+ val textWith = textRectAreaOrigin.width()\n+ val textHeight = textRectAreaOrigin.height()\n+\n+ val viewCy = (timeView.y + timeView.measuredHeight / 2).toInt()\n+ val viewCx = timeView.measuredWidth / 2\n+\n+ //map text coordinates to canvas area\n+ val textRectAreaMapped = RectF(\n+ (viewCx - textWith / 2).toFloat(),\n+ (viewCy - textHeight / 2).toFloat(),\n+ (viewCx + textWith / 2).toFloat(),\n+ (viewCy + textHeight / 2).toFloat()\n+ )\n+\n+ val scaleValue = textHeight * 0.45F\n+\n+ textRectAreaMapped.inset(-scaleValue, -scaleValue)\n+\n+ canvas.drawRoundRect(textRectAreaMapped, 10.toPx.toFloat(), 10.toPx.toFloat(), paint)\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/easydecor/BaseItemControllerDecoration.kt",
"diff": "+package ru.surfstudio.android.recycler.decorator.sample.easydecor\n+\n+import android.graphics.Canvas\n+import android.view.View\n+import androidx.recyclerview.widget.RecyclerView\n+import ru.surfstudio.android.easyadapter.EasyAdapter\n+import ru.surfstudio.android.easyadapter.item.BaseItem\n+import ru.surfstudio.android.easyadapter.item.NoDataItem\n+import ru.surfstudio.android.recycler.decorator.Decorator\n+\n+@Suppress(\"UNCHECKED_CAST\")\n+class BaseItemControllerDecoration<I : BaseItem<out RecyclerView.ViewHolder>>(\n+ private val baseViewHolderDecor: BaseViewHolderDecor<I>\n+) : Decorator.ViewHolderDecor {\n+\n+ override fun draw(canvas: Canvas, view: View, recyclerView: RecyclerView, state: RecyclerView.State) {\n+\n+ val adapterPosition = recyclerView.getChildAdapterPosition(view)\n+\n+ val adapter = recyclerView.adapter as EasyAdapter\n+\n+ val baseItem = adapter.getItem(adapterPosition) as I\n+\n+ if (adapter.isFirstInvisibleItemEnabled && baseItem is NoDataItem<*> && adapterPosition == 0) {\n+ return\n+ }\n+\n+ baseViewHolderDecor.draw(canvas, view, recyclerView, state, baseItem as? I)\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/easydecor/BaseItemControllerOffset.kt",
"diff": "+package ru.surfstudio.android.recycler.decorator.sample.easydecor\n+\n+import android.graphics.Rect\n+import android.view.View\n+import androidx.recyclerview.widget.RecyclerView\n+import ru.surfstudio.android.easyadapter.EasyAdapter\n+import ru.surfstudio.android.easyadapter.item.BaseItem\n+import ru.surfstudio.android.easyadapter.item.NoDataItem\n+import ru.surfstudio.android.recycler.decorator.Decorator\n+\n+@Suppress(\"UNCHECKED_CAST\")\n+class BaseItemControllerOffset<I : BaseItem<out RecyclerView.ViewHolder>>(\n+ private val baseViewHolderOffset: BaseViewHolderOffset<I>\n+) : Decorator.OffsetDecor {\n+\n+ override fun getItemOffsets(outRect: Rect, view: View, recyclerView: RecyclerView, state: RecyclerView.State) {\n+ val itemPosition = recyclerView.getChildAdapterPosition(view)\n+\n+ val adapter = recyclerView.adapter as EasyAdapter\n+\n+ val baseItem = adapter.getItem(itemPosition) as? I\n+\n+ if (adapter.isFirstInvisibleItemEnabled && baseItem is NoDataItem<*> && itemPosition == 0) {\n+ return\n+ }\n+\n+ baseItem?.let { item ->\n+ baseViewHolderOffset.getItemOffsets(outRect, view, recyclerView, state, item)\n+ }\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/easydecor/BaseViewHolderDecor.kt",
"diff": "+package ru.surfstudio.android.recycler.decorator.sample.easydecor\n+\n+import android.graphics.Canvas\n+import android.view.View\n+import androidx.recyclerview.widget.RecyclerView\n+import ru.surfstudio.android.easyadapter.item.BaseItem\n+\n+interface BaseViewHolderDecor<I: BaseItem<out RecyclerView.ViewHolder>> {\n+\n+ fun draw(canvas: Canvas,\n+ view: View,\n+ recyclerView: RecyclerView,\n+ state: RecyclerView.State,\n+ baseItem: I?)\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/easydecor/BaseViewHolderOffset.kt",
"diff": "+package ru.surfstudio.android.recycler.decorator.sample.easydecor\n+\n+import android.graphics.Rect\n+import android.view.View\n+import androidx.recyclerview.widget.RecyclerView\n+import ru.surfstudio.android.easyadapter.item.BaseItem\n+\n+interface BaseViewHolderOffset<I : BaseItem<out RecyclerView.ViewHolder>> {\n+ fun getItemOffsets(outRect: Rect,\n+ view: View,\n+ recyclerView: RecyclerView,\n+ state: RecyclerView.State,\n+ baseItem: I?)\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/easydecor/DecoratorKtx.kt",
"diff": "+package ru.surfstudio.android.recycler.decorator.sample.easydecor\n+\n+import androidx.recyclerview.widget.RecyclerView\n+import ru.surfstudio.android.easyadapter.item.BaseItem\n+import ru.surfstudio.android.recycler.decorator.Decorator\n+\n+fun <D : BaseViewHolderDecor<out BaseItem<out RecyclerView.ViewHolder>>> Decorator.Builder.overlay(pair: Pair<Int, D>): Decorator.Builder {\n+ return this.overlay(pair.first to BaseItemControllerDecoration(pair.second))\n+}\n+\n+fun <D : BaseViewHolderDecor<out BaseItem<out RecyclerView.ViewHolder>>> Decorator.Builder.underlay(pair: Pair<Int, D>): Decorator.Builder {\n+ return this.underlay(pair.first to BaseItemControllerDecoration(pair.second))\n+}\n+\n+fun <D : BaseViewHolderOffset<out BaseItem<out RecyclerView.ViewHolder>>> Decorator.Builder.offset(pair: Pair<Int, D>): Decorator.Builder {\n+ return this.offset(pair.first to BaseItemControllerOffset(pair.second))\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/easydecor/EasyItemDecor.kt",
"new_path": null,
"diff": "-package ru.surfstudio.android.recycler.decorator.sample.easydecor\n-\n-import android.graphics.Canvas\n-import android.graphics.Rect\n-import android.view.View\n-import androidx.recyclerview.widget.RecyclerView\n-import ru.surfstudio.android.easyadapter.EasyAdapter\n-import ru.surfstudio.android.easyadapter.holder.BaseViewHolder\n-import ru.surfstudio.android.easyadapter.item.BaseItem\n-import ru.surfstudio.android.easyadapter.item.NoDataItem\n-import ru.surfstudio.android.recycler.decorator.Decorator\n-\n-@Suppress(\"UNCHECKED_CAST\")\n-class BaseItemControllerDecoration<I : BaseItem<out RecyclerView.ViewHolder>>(\n- private val baseViewHolderDecor: BaseViewHolderDecor<I>\n-) : Decorator.ViewHolderDecor {\n-\n- override fun draw(canvas: Canvas, view: View, recyclerView: RecyclerView, state: RecyclerView.State) {\n-\n- val adapterPosition = recyclerView.getChildAdapterPosition(view)\n-\n- val adapter = recyclerView.adapter as EasyAdapter\n-\n- val baseItem = adapter.getItem(adapterPosition) as I\n-\n- if (adapter.isFirstInvisibleItemEnabled && baseItem is NoDataItem<*> && adapterPosition == 0) {\n- return\n- }\n-\n- baseViewHolderDecor.draw(canvas, view, recyclerView, state, baseItem as? I)\n- }\n-}\n-\n-class BaseItemControllerDecoration2<VH : BaseViewHolder>(\n- private val baseViewHolderDecor: BaseViewHolderDecor2<VH>\n-) : Decorator.ViewHolderDecor {\n-\n- override fun draw(canvas: Canvas, view: View, recyclerView: RecyclerView, state: RecyclerView.State) {\n-\n- val adapterPosition = recyclerView.getChildAdapterPosition(view)\n-\n- val adapter = recyclerView.adapter as EasyAdapter\n-\n- val vh = recyclerView.getChildViewHolder(view)\n-\n-\n- val baseItem = adapter.getItem(adapterPosition) as BaseItem<VH>\n-\n- if (adapter.isFirstInvisibleItemEnabled && baseItem is NoDataItem<*> && adapterPosition == 0) {\n- return\n- }\n-\n- baseViewHolderDecor.draw(canvas, view, recyclerView, state, baseItem)\n- }\n-}\n-\n-@Suppress(\"UNCHECKED_CAST\")\n-class BaseItemControllerOffset<I : BaseItem<out RecyclerView.ViewHolder>>(\n- private val baseViewHolderOffset: BaseViewHolderOffset<I>\n-) : Decorator.OffsetDecor {\n-\n- override fun getItemOffsets(outRect: Rect, view: View, recyclerView: RecyclerView, state: RecyclerView.State) {\n- val itemPosition = recyclerView.getChildAdapterPosition(view)\n-\n- val adapter = recyclerView.adapter as EasyAdapter\n-\n- val baseItem = adapter.getItem(itemPosition) as? I\n-\n- if (adapter.isFirstInvisibleItemEnabled && baseItem is NoDataItem<*> && itemPosition == 0) {\n- return\n- }\n-\n- baseItem?.let { item ->\n- baseViewHolderOffset.getItemOffsets(outRect, view, recyclerView, state, item)\n- }\n- }\n-}\n-\n-interface BaseViewHolderDecor<I: BaseItem<out RecyclerView.ViewHolder>> {\n-\n- fun draw(canvas: Canvas,\n- view: View,\n- recyclerView: RecyclerView,\n- state: RecyclerView.State,\n- baseItem: I?)\n-}\n-\n-interface BaseViewHolderDecor2<VH: BaseViewHolder> {\n-\n- fun draw(canvas: Canvas,\n- view: View,\n- recyclerView: RecyclerView,\n- state: RecyclerView.State,\n- baseItem: BaseItem<VH>)\n-}\n-\n-interface BaseViewHolderOffset<I : BaseItem<out RecyclerView.ViewHolder>> {\n- fun getItemOffsets(outRect: Rect,\n- view: View,\n- recyclerView: RecyclerView,\n- state: RecyclerView.State,\n- baseItem: I?)\n-}\n-\n-//fun <D : BaseViewHolderDecor<out BaseItem<out RecyclerView.ViewHolder>>> Builder.overlay(baseItemControllerDecoration: D): Builder {\n-// return this.overlay(BaseItemControllerDecoration(baseItemControllerDecoration))\n-//}\n-//\n-//fun <D : BaseViewHolderDecor<out BaseItem<out RecyclerView.ViewHolder>>> Builder.overlay(pair: Pair<Int, D>): Builder {\n-// return this.overlay(pair.first to BaseItemControllerDecoration(pair.second))\n-//}\n-\n-//fun <D : BaseViewHolderDecor<out BaseItem<out RecyclerView.ViewHolder>>> Builder.underlay(baseItemControllerDecoration: D): Builder {\n-// return this.underlay(BaseItemControllerDecoration(baseItemControllerDecoration))\n-//}\n-\n-fun <I : BaseItem<out RecyclerView.ViewHolder>> Decorator.Builder.underlay(baseItemControllerDecoration: BaseViewHolderDecor<I>): Decorator.Builder {\n- return this.underlay(BaseItemControllerDecoration(baseItemControllerDecoration))\n-}\n-\n-//fun <D : BaseViewHolderDecor<out BaseItem<out RecyclerView.ViewHolder>>> Builder.underlay(pair: Pair<Int, D>): Builder {\n-// return this.underlay(pair.first to BaseItemControllerDecoration(pair.second))\n-//}\n-\n-fun <D : BaseViewHolderOffset<out BaseItem<out RecyclerView.ViewHolder>>> Decorator.Builder.offset(baseItemControllerOffset: D): Decorator.Builder {\n- return this.offset(BaseItemControllerOffset(baseItemControllerOffset))\n-}\n-\n-fun <D : BaseViewHolderOffset<out BaseItem<out RecyclerView.ViewHolder>>> Decorator.Builder.offset(pair: Pair<Int, D>): Decorator.Builder {\n- return this.offset(pair.first to BaseItemControllerOffset(pair.second))\n-}\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-785 finalized easy adapter extensions implements |
652,312 | 03.03.2020 11:57:40 | -10,800 | 8d990002078e17ddc638be4750a81e3f18015bc7 | Remove unused defaultVersionName | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/config.gradle",
"new_path": "buildSrc/config.gradle",
"diff": "@@ -18,7 +18,6 @@ ext {\napplicationName = \"AndroidStandard\"\napplicationId = \"ru.surfstudio.android.template\"\n- defaultVersionName = '0.4.0-SNAPSHOT'\nmoduleVersionCode = 20\nprojectPostfix = \"\"\nprojectVersion = -1\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Remove unused defaultVersionName |
652,309 | 03.03.2020 12:14:13 | -10,800 | 0358937b3ba1655572b32956ad93d84b04b33706 | added release note for docs module | [
{
"change_type": "MODIFY",
"old_path": "docs/RELEASE_NOTES.md",
"new_path": "docs/RELEASE_NOTES.md",
"diff": "* Init tracking changes in RELEASE_NOTES\n* Kotlin code style settings configuration.\n* Init tracking changes in RELEASE_NOTES\n-* ANDDEP-785 added link to recycler-decorator\n\\ No newline at end of file\n+* ANDDEP-785 added link to recycler-decorator lib\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-785 added release note for docs module |
652,335 | 03.03.2020 13:22:14 | -10,800 | c4e91c9c5f1fc6e81b17fc1ed6f547fe27c8739d | Increase global alpha version counter to 80 [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\": 79,\n+ \"unstable_version\": 80,\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 80 [skip ci] [version] |
652,309 | 03.03.2020 14:00:45 | -10,800 | 3c3d4f82dc8dde6ba1802748bd26e493578aec69 | added ui test, PR fixes | [
{
"change_type": "MODIFY",
"old_path": "recycler-decorator/lib-recycler-decorator-easyadapter/src/main/AndroidManifest.xml",
"new_path": "recycler-decorator/lib-recycler-decorator-easyadapter/src/main/AndroidManifest.xml",
"diff": "-<manifest xmlns:android=\"http://schemas.android.com/apk/res/android\"\n- package=\"ru.surfstudio.android.recycler.decorator.easyadapter\" />\n+<manifest package=\"ru.surfstudio.android.recycler.decorator.easyadapter\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-decorator/lib-recycler-decorator/src/main/AndroidManifest.xml",
"new_path": "recycler-decorator/lib-recycler-decorator/src/main/AndroidManifest.xml",
"diff": "-<manifest xmlns:android=\"http://schemas.android.com/apk/res/android\"\n- package=\"ru.surfstudio.android.recycler.decorator\" />\n+<manifest package=\"ru.surfstudio.android.recycler.decorator\" />\n"
},
{
"change_type": "DELETE",
"old_path": "recycler-decorator/lib-recycler-decorator/src/main/res/values/strings.xml",
"new_path": null,
"diff": "-<resources>\n- <string name=\"app_name\">lib-recycler-decorator</string>\n-</resources>\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "recycler-decorator/sample/src/androidTest/java/ru/surfstudio/android/recycler/decorator/sample/DecoratorSampleTest.kt",
"diff": "+package ru.surfstudio.android.recycler.decorator.sample\n+\n+import org.junit.Test\n+import ru.surfstudio.android.sample.common.test.base.BaseSampleTest\n+import ru.surfstudio.android.sample.common.test.utils.RecyclerViewUtils\n+import ru.surfstudio.android.sample.common.test.utils.ViewUtils.performClick\n+\n+class DecoratorSampleTest : BaseSampleTest<MainActivityView>(MainActivityView::class.java) {\n+\n+ @Test\n+ fun testChatSample() {\n+ performClick(R.id.chat_btn)\n+ RecyclerViewUtils.scrollToBottom(R.id.recycler_view)\n+ }\n+\n+ @Test\n+ fun testEasySimpleSample() {\n+ performClick(R.id.easy_adapter_decor_btn)\n+ RecyclerViewUtils.scrollToBottom(R.id.recycler_view)\n+ }\n+\n+ @Test\n+ fun testLinearSample() {\n+ performClick(R.id.linear_decor_btn)\n+ RecyclerViewUtils.scrollToBottom(R.id.recycler_view)\n+ }\n+\n+ @Test\n+ fun testPagerSample() {\n+ performClick(R.id.pager_decor_btn)\n+ RecyclerViewUtils.scrollToBottom(R.id.pager_rv)\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-decorator/sample/src/main/AndroidManifest.xml",
"new_path": "recycler-decorator/sample/src/main/AndroidManifest.xml",
"diff": "android:roundIcon=\"@mipmap/ic_launcher_round\"\nandroid:supportsRtl=\"true\"\nandroid:theme=\"@style/AppTheme\">\n- <activity android:name=\"ru.surfstudio.android.recycler.decorator.sample.MainActivity\"\n+ <activity android:name=\"ru.surfstudio.android.recycler.decorator.sample.MainActivityView\"\nandroid:screenOrientation=\"portrait\">\n<intent-filter>\n<action android:name=\"android.intent.action.MAIN\" />\n</intent-filter>\n</activity>\n- <activity android:name=\".list.LinearDecoratorActivity\"\n+ <activity android:name=\".list.LinearDecoratorActivityView\"\nandroid:screenOrientation=\"portrait\"/>\n- <activity android:name=\".pager.CarouselDecoratorActivity\"\n+ <activity android:name=\".pager.CarouselDecoratorActivityView\"\nandroid:screenOrientation=\"portrait\"/>\n- <activity android:name=\".easyadapter.simple.EasyAdapterDecoratorActivity\"\n+ <activity android:name=\".easyadapter.simple.EasyAdapterDecoratorActivityView\"\nandroid:screenOrientation=\"portrait\" />\n- <activity android:name=\"ru.surfstudio.android.recycler.decorator.sample.easyadapter.chat.ChatActivity\"\n+ <activity android:name=\"ru.surfstudio.android.recycler.decorator.sample.easyadapter.chat.ChatActivityView\"\nandroid:screenOrientation=\"portrait\" />\n</application>\n"
},
{
"change_type": "RENAME",
"old_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/MainActivity.kt",
"new_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/MainActivityView.kt",
"diff": "@@ -4,31 +4,31 @@ import android.content.Intent\nimport android.os.Bundle\nimport androidx.appcompat.app.AppCompatActivity\nimport kotlinx.android.synthetic.main.activity_main.*\n-import ru.surfstudio.android.recycler.decorator.sample.easyadapter.chat.ChatActivity\n-import ru.surfstudio.android.recycler.decorator.sample.easyadapter.simple.EasyAdapterDecoratorActivity\n-import ru.surfstudio.android.recycler.decorator.sample.list.LinearDecoratorActivity\n-import ru.surfstudio.android.recycler.decorator.sample.pager.CarouselDecoratorActivity\n+import ru.surfstudio.android.recycler.decorator.sample.easyadapter.chat.ChatActivityView\n+import ru.surfstudio.android.recycler.decorator.sample.easyadapter.simple.EasyAdapterDecoratorActivityView\n+import ru.surfstudio.android.recycler.decorator.sample.list.LinearDecoratorActivityView\n+import ru.surfstudio.android.recycler.decorator.sample.pager.CarouselDecoratorActivityView\n-class MainActivity : AppCompatActivity() {\n+class MainActivityView : AppCompatActivity() {\noverride fun onCreate(savedInstanceState: Bundle?) {\nsuper.onCreate(savedInstanceState)\nsetContentView(R.layout.activity_main)\nlinear_decor_btn.setOnClickListener {\n- startActivity(Intent(this, LinearDecoratorActivity::class.java))\n+ startActivity(Intent(this, LinearDecoratorActivityView::class.java))\n}\npager_decor_btn.setOnClickListener {\n- startActivity(Intent(this, CarouselDecoratorActivity::class.java))\n+ startActivity(Intent(this, CarouselDecoratorActivityView::class.java))\n}\neasy_adapter_decor_btn.setOnClickListener {\n- startActivity(Intent(this, EasyAdapterDecoratorActivity::class.java))\n+ startActivity(Intent(this, EasyAdapterDecoratorActivityView::class.java))\n}\nchat_btn.setOnClickListener {\n- startActivity(Intent(this, ChatActivity::class.java))\n+ startActivity(Intent(this, ChatActivityView::class.java))\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "RENAME",
"old_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/easyadapter/chat/ChatActivity.kt",
"new_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/easyadapter/chat/ChatActivityView.kt",
"diff": "@@ -17,7 +17,7 @@ import ru.surfstudio.android.recycler.decorator.sample.easyadapter.chat.decor.Me\nimport ru.surfstudio.android.recycler.decorator.easyadapter.offset\nimport ru.surfstudio.android.recycler.decorator.easyadapter.underlay\n-class ChatActivity : AppCompatActivity() {\n+class ChatActivityView : AppCompatActivity() {\nprivate val easyAdapter = EasyAdapter()\n.apply {\n@@ -35,7 +35,7 @@ class ChatActivity : AppCompatActivity() {\nprivate fun init() {\nrecycler_view.apply {\n- layoutManager = LinearLayoutManager(this@ChatActivity)\n+ layoutManager = LinearLayoutManager(this@ChatActivityView)\nadapter = easyAdapter\n}\n"
},
{
"change_type": "RENAME",
"old_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/easyadapter/simple/EasyAdapterDecoratorActivity.kt",
"new_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/easyadapter/simple/EasyAdapterDecoratorActivityView.kt",
"diff": "@@ -18,7 +18,7 @@ import ru.surfstudio.android.recycler.decorator.sample.list.decor.Rules\nimport ru.surfstudio.android.recycler.decorator.sample.toPx\n@RequiresApi(Build.VERSION_CODES.LOLLIPOP)\n-class EasyAdapterDecoratorActivity : AppCompatActivity() {\n+class EasyAdapterDecoratorActivityView : AppCompatActivity() {\nprivate val easyAdapter = EasyAdapter()\n@@ -32,7 +32,7 @@ class EasyAdapterDecoratorActivity : AppCompatActivity() {\nprivate fun init() {\nrecycler_view.apply {\n- layoutManager = LinearLayoutManager(this@EasyAdapterDecoratorActivity)\n+ layoutManager = LinearLayoutManager(this@EasyAdapterDecoratorActivityView)\nadapter = easyAdapter\n}\n"
},
{
"change_type": "RENAME",
"old_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/list/LinearDecoratorActivity.kt",
"new_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/list/LinearDecoratorActivityView.kt",
"diff": "@@ -15,7 +15,7 @@ import ru.surfstudio.android.recycler.decorator.sample.list.decor.*\nimport ru.surfstudio.android.recycler.decorator.sample.toPx\n@RequiresApi(Build.VERSION_CODES.LOLLIPOP)\n-class LinearDecoratorActivity : AppCompatActivity() {\n+class LinearDecoratorActivityView : AppCompatActivity() {\nprivate val easyAdapter = EasyAdapter()\n@@ -31,7 +31,7 @@ class LinearDecoratorActivity : AppCompatActivity() {\nprivate fun init() {\nrecycler_view.apply {\n- layoutManager = LinearLayoutManager(this@LinearDecoratorActivity)\n+ layoutManager = LinearLayoutManager(this@LinearDecoratorActivityView)\nadapter = easyAdapter\n}\n"
},
{
"change_type": "RENAME",
"old_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/pager/CarouselDecoratorActivity.kt",
"new_path": "recycler-decorator/sample/src/main/java/ru/surfstudio/android/recycler/decorator/sample/pager/CarouselDecoratorActivityView.kt",
"diff": "@@ -19,7 +19,7 @@ import ru.surfstudio.android.recycler.decorator.sample.pager.controllers.LinePag\nimport ru.surfstudio.android.recycler.decorator.sample.toPx\n@RequiresApi(Build.VERSION_CODES.LOLLIPOP)\n-class CarouselDecoratorActivity : AppCompatActivity() {\n+class CarouselDecoratorActivityView : AppCompatActivity() {\nprivate val easyAdapter = EasyAdapter()\n@@ -34,7 +34,7 @@ class CarouselDecoratorActivity : AppCompatActivity() {\nprivate fun init() {\npager_rv.apply {\n- layoutManager = LinearLayoutManager(this@CarouselDecoratorActivity, RecyclerView.HORIZONTAL, false)\n+ layoutManager = LinearLayoutManager(this@CarouselDecoratorActivityView, RecyclerView.HORIZONTAL, false)\nadapter = easyAdapter.apply { isFirstInvisibleItemEnabled = false }\nPagerSnapHelper().attachToRecyclerView(pager_rv)\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-decorator/sample/src/main/res/layout/activity_main.xml",
"new_path": "recycler-decorator/sample/src/main/res/layout/activity_main.xml",
"diff": "android:layout_height=\"match_parent\"\nandroid:gravity=\"center\"\nandroid:orientation=\"vertical\"\n- tools:context=\".MainActivity\">\n+ tools:context=\".MainActivityView\">\n<Button\nandroid:id=\"@+id/linear_decor_btn\"\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-decorator/sample/src/main/res/layout/activity_recycler.xml",
"new_path": "recycler-decorator/sample/src/main/res/layout/activity_recycler.xml",
"diff": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<LinearLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\n- xmlns:tools=\"http://schemas.android.com/tools\"\nandroid:id=\"@+id/root\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"match_parent\"\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-785 added ui test, PR fixes |
652,337 | 03.03.2020 22:32:14 | -18,000 | ebeca0bd00a712684b6dc66a0803630035497ecd | Added support for custom actions in notifications and fixed error with not canceling summary notifications. Fixed data publishing in PushInteractor. | [
{
"change_type": "MODIFY",
"old_path": "push/RELEASE_NOTES.md",
"new_path": "push/RELEASE_NOTES.md",
"diff": "# Push Release Notes\n## 0.5.0-alpha\n##### Push\n-* TODO\n+* ANDDEP-930 Added support to custom actions in the notification. Added corresponding listener to the `PushEventListener`.\n+* Now in the `PushInteractor` you must register your listener to the object type which is used in the `BaseNotificationTypeData<T>` or its inherit classes.\n## 0.4.0\n##### Push\n* NotificationCenter removed - use `PushHandler`\n"
},
{
"change_type": "MODIFY",
"old_path": "push/lib-push/src/main/AndroidManifest.xml",
"new_path": "push/lib-push/src/main/AndroidManifest.xml",
"diff": "-<manifest package=\"ru.surfstudio.android.notification\"\n- xmlns:android=\"http://schemas.android.com/apk/res/android\">\n+<manifest xmlns:android=\"http://schemas.android.com/apk/res/android\"\n+ package=\"ru.surfstudio.android.notification\">\n<application>\n<receiver\nandroid:name=\".ui.notification.NotificationClickEventReceiver\"\n- android:exported=\"false\" >\n- </receiver>\n+ android:exported=\"false\" />\n</application>\n</manifest>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "push/lib-push/src/main/java/ru/surfstudio/android/notification/ui/notification/NotificationClickEventReceiver.kt",
"new_path": "push/lib-push/src/main/java/ru/surfstudio/android/notification/ui/notification/NotificationClickEventReceiver.kt",
"diff": "@@ -18,12 +18,15 @@ package ru.surfstudio.android.notification.ui.notification\nimport android.content.BroadcastReceiver\nimport android.content.Context\nimport android.content.Intent\n+import androidx.core.app.NotificationManagerCompat\nimport ru.surfstudio.android.logger.Logger\nimport ru.surfstudio.android.notification.ui.PushClickProvider\nconst val NOTIFICATION_DATA = \"notification_data\"\n-internal const val NOTIFICATION_GROUP_ID = \"notification_group_id\"\n-internal const val EVENT_TYPE = \"event_type\"\n+const val NOTIFICATION_GROUP_ID = \"notification_group_id\"\n+const val EVENT_TYPE = \"event_type\"\n+const val NOTIFICATION_ID = \"notification_id\"\n+const val SHOULD_AUTO_CANCEL = \"should_auto_cancel_on_action\"\ninternal enum class Event {\nOPEN, DISMISS\n@@ -36,14 +39,17 @@ internal enum class Event {\nclass NotificationClickEventReceiver : BroadcastReceiver() {\noverride fun onReceive(context: Context, intent: Intent) {\n- val event = intent.getSerializableExtra(EVENT_TYPE) as Event\n- when(event) {\n+ when (intent.getSerializableExtra(EVENT_TYPE) as? Event) {\nEvent.OPEN -> handleNotificationOpen(context, intent)\nEvent.DISMISS -> handleNotificationDismiss(context, intent)\n+ else -> {\n+ handleNotificationActionClick(context, intent)\n+ return\n+ }\n}\n- val groupId = intent.getIntExtra(NOTIFICATION_GROUP_ID, 0)\n+ val groupId = getGroupId(intent)\nNotificationGroupHelper.clearSavedNotificationsForGroup(context, groupId)\n}\n@@ -56,4 +62,18 @@ class NotificationClickEventReceiver : BroadcastReceiver() {\nLogger.i(\"Notification dismissed: $intent\")\nPushClickProvider.pushEventListener?.pushDismissListener(context, intent)\n}\n+\n+ private fun handleNotificationActionClick(context: Context, intent: Intent) {\n+ Logger.i(\"Notification action clicked: ${intent.action}\")\n+ if (intent.getBooleanExtra(SHOULD_AUTO_CANCEL, true)) {\n+ val groupId = getGroupId(intent)\n+ val notificationId = intent.getIntExtra(NOTIFICATION_ID, -1)\n+ NotificationManagerHelper.cancel(context, groupId, notificationId)\n+ }\n+ PushClickProvider.pushEventListener?.customActionListener(context, intent)\n+ }\n+\n+ private fun getGroupId(intent: Intent): Int {\n+ return intent.getIntExtra(NOTIFICATION_GROUP_ID, 0)\n+ }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "push/lib-push/src/main/java/ru/surfstudio/android/notification/ui/notification/NotificationCreateHelper.kt",
"new_path": "push/lib-push/src/main/java/ru/surfstudio/android/notification/ui/notification/NotificationCreateHelper.kt",
"diff": "@@ -22,6 +22,7 @@ import android.content.Context\nimport android.os.Build\nimport androidx.core.app.NotificationCompat\nimport androidx.core.content.ContextCompat\n+import ru.surfstudio.android.logger.Logger\nimport ru.surfstudio.android.notification.ui.notification.strategies.PushHandleStrategy\nimport ru.surfstudio.android.utilktx.util.SdkUtils\n@@ -40,7 +41,7 @@ object NotificationCreateHelper {\nval notificationBuilder = pushHandleStrategy.notificationBuilder\n?: buildNotification(pushHandleStrategy, title, body, context)\n- if (android.os.Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) {\n+ if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) {\npushHandleStrategy.group?.id?.let {\nmakeGroupNotificationM(context, notificationBuilder, pushHandleStrategy, it, body, title)\n@@ -58,6 +59,8 @@ object NotificationCreateHelper {\npushHandleStrategy.group?.let {\ngetNotificationManager(context)\n.notify(it.id, pushHandleStrategy.groupSummaryNotificationBuilder?.build())\n+\n+ Logger.i(\"active notifications: \" + getNotificationManager(context).activeNotifications.map { it.id }.toList())\n}\n}\n@@ -95,7 +98,6 @@ object NotificationCreateHelper {\n.setSmallIcon(pushHandleStrategy.icon)\n.setContentTitle(title)\n.setContentText(body)\n- .setGroupSummary(true)\n.setColor(ContextCompat.getColor(context, pushHandleStrategy.color))\n.setContent(pushHandleStrategy.contentView)\n.setAutoCancel(pushHandleStrategy.autoCancelable)\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-930 Added support for custom actions in notifications and fixed error with not canceling summary notifications. Fixed data publishing in PushInteractor. |
652,337 | 03.03.2020 22:41:38 | -18,000 | bccb60c0a9b4438aff8b255f6cb4755daf2c2886 | Added example to using custom actions | [
{
"change_type": "MODIFY",
"old_path": "analytics/RELEASE_NOTES.md",
"new_path": "analytics/RELEASE_NOTES.md",
"diff": "# Analytics Release Notes\n## 0.5.0-alpha\n##### Analytics\n-* TODO\n+* ANDDEP-930 Added example to creating notifications in the `BaseSimplePushStrategy` and example to creating notification with custom action in it.\n## 0.4.0\n##### Analytics\n* ANDDEP-294 Improved analytics module\n"
},
{
"change_type": "MODIFY",
"old_path": "analytics/sample/src/main/java/ru/surfstudio/android/firebase/sample/app/CustomApp.kt",
"new_path": "analytics/sample/src/main/java/ru/surfstudio/android/firebase/sample/app/CustomApp.kt",
"diff": "@@ -76,6 +76,11 @@ class CustomApp : MultiDexApplication() {\noverride fun pushOpenListener(context: Context, intent: Intent) {\nLogger.i(\"Push notification open\")\n}\n+\n+ override fun customActionListener(context: Context, intent: Intent) {\n+ Logger.i(\"Push notification custom action clicked\")\n+\n+ }\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "analytics/sample/src/main/res/values/strings.xml",
"new_path": "analytics/sample/src/main/res/values/strings.xml",
"diff": "<string name=\"no_data_push_channel_name\">No data push channel</string>\n<string name=\"data_push_channel_name\">Data push channel</string>\n<string name=\"push_notification_received_text\">Push notification received!</string>\n+ <string name=\"notification_custom_action\">Make some action</string>\n</resources>\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-930 Added example to using custom actions |
652,335 | 03.03.2020 22:30:02 | -10,800 | 34b1f0aa3a3991423a4e79df58a2465de0c425da | Increase global alpha version counter to 81 [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\": 0,\n+ \"unstable_version\": 1,\n\"stable\": false,\n\"dir\": \"common\",\n\"libs\": [\n{\n\"id\": \"easyadapter\",\n\"version\": \"1.1.0\",\n- \"unstable_version\": 6,\n+ \"unstable_version\": 7,\n\"stable\": false,\n\"dir\": \"easyadapter\",\n\"libs\": [\n{\n\"id\": \"recycler-decorator\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 0,\n+ \"unstable_version\": 1,\n\"stable\": false,\n\"dir\": \"recycler-decorator\",\n\"libs\": [\n\"name\": \"androidx.core:core-ktx\",\n\"type\": \"api\"\n}\n- ]\n+ ],\n+ \"android_standard_dependencies\": []\n},\n{\n\"name\": \"recycler-decorator-easyadapter\",\n{\n\"id\": \"docs\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 10,\n+ \"unstable_version\": 11,\n\"stable\": false,\n\"dir\": \"docs\",\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\": 80,\n+ \"unstable_version\": 81,\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 81 [skip ci] [version] |
652,337 | 04.03.2020 12:20:52 | -18,000 | a86ec090dfc8b5d86f7d2e168deaa16ec32a3789 | Fixed template module | [
{
"change_type": "MODIFY",
"old_path": "template/base_feature/src/main/java/ru/surfstudio/standard/application/app/App.kt",
"new_path": "template/base_feature/src/main/java/ru/surfstudio/standard/application/app/App.kt",
"diff": "@@ -97,6 +97,10 @@ class App : MultiDexApplication() {\noverride fun pushOpenListener(context: Context, intent: Intent) {\n//todo\n}\n+\n+ override fun customActionListener(context: Context, intent: Intent) {\n+ //todo\n+ }\n}\n}\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-930 Fixed template module |
652,337 | 05.03.2020 13:00:32 | -18,000 | 66a1a7a56b382d183c8c6d8cb91e216d601a7f70 | Removed setHasStableIds from EasyAdapter | [
{
"change_type": "MODIFY",
"old_path": "easyadapter/RELEASE_NOTES.md",
"new_path": "easyadapter/RELEASE_NOTES.md",
"diff": "* ANDDEP-829 Fixed synchronous DiffResult dispatching in DefaultDiffer.\n* ANDDEP-785 Added method getItem() in EasyAdapter, to get BaseItem by position\n* ANDDEP-785 Added getter in EasyAdapter, for *firstInvisibleItemEnabled* property\n+* ANDDEP-909 Removed `setHasStableIds(true)` in EasyAdapter.\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": "@@ -73,10 +73,6 @@ 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- public EasyAdapter() {\n- setHasStableIds(true);\n- }\n-\n/**\n* @see RecyclerView.Adapter#onAttachedToRecyclerView(RecyclerView)\n*/\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-909 Removed setHasStableIds from EasyAdapter |
652,312 | 03.03.2020 14:56:44 | -10,800 | 2b64b670de3fb11788c27e075ed3f640e128b434 | Add bintrayDeploy for project snapshot job | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/deploy.gradle",
"new_path": "buildSrc/deploy.gradle",
"diff": "@@ -56,6 +56,8 @@ ext.configureDeploy = { context ->\ndef artifactName = Components.getArtifactName(project.name)\ndef artifactVersion = Components.getModuleVersion(project.name)\n+ println \"uploadAcrhives $artifactGroupId $artifactName $artifactVersion\"\n+\npom.groupId = artifactGroupId\npom.artifactId = artifactName\npom.version = artifactVersion\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/artifactory/Artifactory.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/artifactory/Artifactory.kt",
"diff": "@@ -24,6 +24,7 @@ object Artifactory {\nvar packagesRepoPaths = \"\"\nartifacts.forEachIndexed { index, artifactInfo ->\n+ println(\"distributeArtifactToBintray ${artifactInfo.libraryName}\")\npackagesRepoPaths += artifactInfo.getPath()\nif (index != artifacts.size - 1) packagesRepoPaths += \", \"\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/DistributeArtifactsToBintrayTask.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/DistributeArtifactsToBintrayTask.kt",
"diff": "@@ -2,10 +2,13 @@ package ru.surfstudio.android.build.tasks\nimport org.gradle.api.DefaultTask\nimport org.gradle.api.tasks.TaskAction\n+import ru.surfstudio.android.build.Components\nimport ru.surfstudio.android.build.GradleProperties.OVERRIDE_EXISTED\nimport ru.surfstudio.android.build.artifactory.Artifactory\n+import ru.surfstudio.android.build.model.Component\nimport ru.surfstudio.android.build.model.module.Library\nimport ru.surfstudio.android.build.utils.getPropertyComponent\n+import ru.surfstudio.android.build.utils.getPropertyComponentName\nimport ru.surfstudio.android.build.utils.readProperty\n/**\n@@ -15,8 +18,25 @@ open class DistributeArtifactsToBintrayTask : DefaultTask() {\n@TaskAction\nfun distribute() {\n- val component = project.getPropertyComponent()\n+ val componentName = project.getPropertyComponentName()\nval overrideExisted = project.readProperty(OVERRIDE_EXISTED, \"false\").toBoolean()\n+ if (componentName != \"all\") {\n+ deployComponent(project.getPropertyComponent(componentName), overrideExisted)\n+ } else {\n+ Components.value.forEach {\n+ if (it.name != \"mvp\" && it.name != \"security\" && it.name != \"template\" && it.name != \"docs\" &&\n+ it.name != \"android-standard-version-plugin\" && it.name != \"android-studio-settings\"\n+ ) {\n+ deployComponent(it, overrideExisted)\n+ } else {\n+ println(\"skip ${it.name} deploy\")\n+ }\n+ }\n+ }\n+ }\n+\n+ private fun deployComponent(component: Component, overrideExisted: Boolean) {\n+ println(\"deployComponent ${component.name}\")\nArtifactory.distributeArtifactToBintray(overrideExisted, component.libraries.map(Library::name))\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/utils/ProjectExtensions.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/utils/ProjectExtensions.kt",
"diff": "@@ -10,12 +10,27 @@ import ru.surfstudio.android.build.exceptions.ComponentPropertyNotFoundException\nimport ru.surfstudio.android.build.exceptions.PropertyNotDefineException\nimport ru.surfstudio.android.build.model.Component\n+/**\n+ * Component name that provided by gradle property\n+ */\n+fun Project.getPropertyComponentName(): String {\n+ return project.property(GradleProperties.COMPONENT) as? String\n+ ?: throw ComponentPropertyNotFoundException()\n+}\n+\n/**\n* Component that provided by gradle property\n*/\nfun Project.getPropertyComponent(): Component {\n- val componentName = project.property(GradleProperties.COMPONENT) as? String\n- ?: throw ComponentPropertyNotFoundException()\n+ val componentName = getPropertyComponentName()\n+ return Components.value.find { it.name == componentName }\n+ ?: throw ComponentNotFoundException(componentName)\n+}\n+\n+/**\n+ * Component that provided by component name\n+ */\n+fun Project.getPropertyComponent(componentName: String): Component {\nreturn Components.value.find { it.name == componentName }\n?: throw ComponentNotFoundException(componentName)\n}\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-950 Add bintrayDeploy for project snapshot job |
652,312 | 05.03.2020 12:50:57 | -10,800 | 6f140d2fa2ae7e205df2a18d6294933c5b670372 | Add distributeArtifactsToBintray task | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/components.json",
"new_path": "buildSrc/components.json",
"diff": "{\n\"name\": \"security\",\n\"dir\": \"lib-security\",\n- \"artifact_name\": \"\",\n+ \"artifact_name\": \"security\",\n\"third_party_dependencies\": [\n{\n\"name\": \"com.squareup.okhttp3:logging-interceptor\",\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/artifactory/Artifactory.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/artifactory/Artifactory.kt",
"diff": "@@ -21,21 +21,31 @@ object Artifactory {\n*/\nfun distributeArtifactToBintray(overrideExisting: Boolean, libraryNames: List<String>) {\nval artifacts: List<ArtifactInfo> = libraryNames.map { ArtifactInfo(it) }\n-\nvar packagesRepoPaths = \"\"\nartifacts.forEachIndexed { index, artifactInfo ->\nprintln(\"distributeArtifactToBintray ${artifactInfo.libraryName}\")\npackagesRepoPaths += artifactInfo.getPath()\nif (index != artifacts.size - 1) packagesRepoPaths += \", \"\n}\n+ distribute(packagesRepoPaths, overrideExisting)\n+ }\n- val response = repository.distribute(packagesRepoPaths, overrideExisting)\n+ /**\n+ * Deploy artifact to bintray\n+ */\n+ @JvmStatic\n+ fun distributeArtifactToBintray(overrideExisting: Boolean, libraryName: String) {\n+ println(\"distributeArtifactToBintray $libraryName\")\n+ distribute(ArtifactInfo(libraryName).getPath(), overrideExisting)\n+ }\n+ private fun distribute(packagesRepoPath: String, overrideExisting: Boolean) {\n+ val response = repository.distribute(packagesRepoPath, overrideExisting)\nif (response.statusCode != 200) throw GradleException(response.toString())\n}\n/**\n- * Check libraries's android standard dependencies exist in artifactory\n+ * Check if libraries's android standard dependencies exist in artifactory\n*/\nfun checkLibrariesStandardDependenciesExisting(component: Component) {\ncomponent.libraries.forEach { checkLibraryStandardDependenciesExisting(it, component) }\n@@ -52,7 +62,7 @@ object Artifactory {\n}\n/**\n- * Check library android standard dependencies exist in artifactory\n+ * Check if library android standard dependencies exist in artifactory\n*/\nprivate fun checkLibraryStandardDependenciesExisting(library: Library, component: Component) {\nlibrary.androidStandardDependencies\n@@ -68,7 +78,7 @@ object Artifactory {\n}\n/**\n- * Check artifact exist in artifactory\n+ * Check if artifact exists in artifactory\n*/\nfun isArtifactExists(artifactName: String, version: String): Boolean {\nval folderPath = \"$artifactName/$version\"\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/artifactory/ArtifactoryRepository.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/artifactory/ArtifactoryRepository.kt",
"diff": "@@ -52,7 +52,6 @@ internal class ArtifactoryRepository {\n\"packagesRepoPaths\" : [$packagesRepoPaths]\n}\n\"\"\"\n- println(\"distribute $packagesRepoPaths\")\nreturn Fuel.post(DISTRIBUTE_URL)\n.header(\"Content-Type\" to \"application/json\")\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/DistributeArtifactsToBintrayTask.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/DistributeArtifactsToBintrayTask.kt",
"diff": "@@ -2,13 +2,10 @@ package ru.surfstudio.android.build.tasks\nimport org.gradle.api.DefaultTask\nimport org.gradle.api.tasks.TaskAction\n-import ru.surfstudio.android.build.Components\nimport ru.surfstudio.android.build.GradleProperties.OVERRIDE_EXISTED\nimport ru.surfstudio.android.build.artifactory.Artifactory\n-import ru.surfstudio.android.build.model.Component\nimport ru.surfstudio.android.build.model.module.Library\nimport ru.surfstudio.android.build.utils.getPropertyComponent\n-import ru.surfstudio.android.build.utils.getPropertyComponentName\nimport ru.surfstudio.android.build.utils.readProperty\n/**\n@@ -18,25 +15,8 @@ open class DistributeArtifactsToBintrayTask : DefaultTask() {\n@TaskAction\nfun distribute() {\n- val componentName = project.getPropertyComponentName()\n+ val component = project.getPropertyComponent()\nval overrideExisted = project.readProperty(OVERRIDE_EXISTED, \"false\").toBoolean()\n- if (componentName != \"all\") {\n- deployComponent(project.getPropertyComponent(componentName), overrideExisted)\n- } else {\n- Components.value.forEach {\n- if (it.name != \"mvp\" && it.name != \"security\" && it.name != \"template\" && it.name != \"docs\" &&\n- it.name != \"android-standard-version-plugin\" && it.name != \"android-studio-settings\"\n- ) {\n- deployComponent(it, overrideExisted)\n- } else {\n- println(\"skip ${it.name} deploy\")\n- }\n- }\n- }\n- }\n-\n- private fun deployComponent(component: Component, overrideExisted: Boolean) {\n- println(\"deployComponent ${component.name}\")\nArtifactory.distributeArtifactToBintray(overrideExisted, component.libraries.map(Library::name))\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/utils/ProjectExtensions.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/utils/ProjectExtensions.kt",
"diff": "@@ -10,27 +10,12 @@ import ru.surfstudio.android.build.exceptions.ComponentPropertyNotFoundException\nimport ru.surfstudio.android.build.exceptions.PropertyNotDefineException\nimport ru.surfstudio.android.build.model.Component\n-/**\n- * Component name that provided by gradle property\n- */\n-fun Project.getPropertyComponentName(): String {\n- return project.property(GradleProperties.COMPONENT) as? String\n- ?: throw ComponentPropertyNotFoundException()\n-}\n-\n/**\n* Component that provided by gradle property\n*/\nfun Project.getPropertyComponent(): Component {\n- val componentName = getPropertyComponentName()\n- return Components.value.find { it.name == componentName }\n- ?: throw ComponentNotFoundException(componentName)\n-}\n-\n-/**\n- * Component that provided by component name\n- */\n-fun Project.getPropertyComponent(componentName: String): Component {\n+ val componentName = project.property(GradleProperties.COMPONENT) as? String\n+ ?: throw ComponentPropertyNotFoundException()\nreturn Components.value.find { it.name == componentName }\n?: throw ComponentNotFoundException(componentName)\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "ci-internal/ProjectSnapshotDeployJobJenkinsfile.groovy",
"new_path": "ci-internal/ProjectSnapshotDeployJobJenkinsfile.groovy",
"diff": "@@ -160,7 +160,7 @@ pipeline.stages = [\nscript.sh \"./gradlew clean uploadArchives -PonlyUnstable=true -PdeployOnlyIfNotExist=true\"\n} else {\nscript.sh \"./gradlew clean uploadArchives\"\n- script.sh \"./gradlew distributeArtifactsToBintrayTask -Pcomponent=all -PoverrideExisted=true\"\n+ script.sh \"./gradlew distributeArtifactsToBintray -PoverrideExisted=true\"\n}\n}\n}\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-950 Add distributeArtifactsToBintray task |
652,312 | 05.03.2020 15:32:52 | -10,800 | cb0f1cd69551553b6670a1b52a9d95203f61d0a3 | Add doLast for deploy tasks | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/deploy.gradle",
"new_path": "buildSrc/deploy.gradle",
"diff": "@@ -24,6 +24,10 @@ ext.configureDeploy = { context ->\n}\nuploadArchives {\n+ // WARNING! This is very important to use doLast here,\n+ // otherwise the task will be executed for every module configuration\n+ // https://stackoverflow.com/questions/20737494/why-is-my-gradle-task-always-running\n+ doLast {\n// If -Pcomponent set, deploy only its artifacts\nif (project.hasProperty(GradleProperties.COMPONENT)) {\ndef componentName = project.property(GradleProperties.COMPONENT)\n@@ -85,9 +89,14 @@ ext.configureDeploy = { context ->\n}\n}\n} // repositories.mavenDeployer\n+ }\n} // uploadArchives\ntask distributeArtifactsToBintray {\n+ // WARNING! This is very important to use doLast here,\n+ // otherwise the task will be executed for every module configuration\n+ // https://stackoverflow.com/questions/20737494/why-is-my-gradle-task-always-running\n+ doLast {\n// If -Pcomponent set, deploy only its artifacts\nif (project.hasProperty(GradleProperties.COMPONENT)) {\ndef componentName = project.property(GradleProperties.COMPONENT)\n@@ -105,6 +114,7 @@ ext.configureDeploy = { context ->\nthrow new GradleException(\"distributeArtifactsToBintray: artifactName for ${project.name} can not be blank for deploy\")\n}\nArtifactory.distributeArtifactToBintray(overrideExisted, artifactName)\n+ }\n} // distributeArtifactsToBintray\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/DistributeArtifactsToBintrayTask.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/DistributeArtifactsToBintrayTask.kt",
"diff": "@@ -9,7 +9,10 @@ import ru.surfstudio.android.build.utils.getPropertyComponent\nimport ru.surfstudio.android.build.utils.readProperty\n/**\n- * Distribute artifacts to Bintray\n+ * Distribute artifacts to Bintray.\n+ *\n+ * This task can only be used for deploy of a single artifact via the name.\n+ * For deploy of multiple artifacts to bintray, see [distributeArtifactsToBintray] gradle task\n*/\nopen class DistributeArtifactsToBintrayTask : DefaultTask() {\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-950 Add doLast for deploy tasks |
652,312 | 05.03.2020 16:44:09 | -10,800 | 96d461319634ebf61ce40040314d223afb7aa3a8 | Add DistributeArtifactsToBintrayComponentsTask | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/buildTasks.gradle",
"new_path": "buildSrc/buildTasks.gradle",
"diff": "import ru.surfstudio.android.build.Components\n-import ru.surfstudio.android.build.tasks.*\n-import ru.surfstudio.android.build.tasks.check_stable_artifacts_exist_in_repositories.*\n-import ru.surfstudio.android.build.tasks.check_dependencies_stable.*\n-import ru.surfstudio.android.build.tasks.deploy_to_mirror.*\n-import ru.surfstudio.android.build.tasks.generate_release_notes_diff.*\ntask checkStandardDependenciesStableTask(type: CheckStandardDependenciesStableTask) //release\n@@ -83,10 +78,18 @@ task generateReleaseNotesDiff(type: GenerateReleaseNotesDiffTask) // helper\ntask writeToFileReleaseNotesDiff(type: WriteToFileReleaseNotesDiff)\n-task uploadArchiveComponentsTask(type: UploadArchiveComponentsTask){\n+task uploadArchivesComponentsTask(type: UploadArchivesComponentsTask) {\nComponents.libraries.each {\n- if(it.artifactName != \"\") {\n+ if (!it.artifactName.trim()) {\ndependsOn \":${it.name}:uploadArchives\"\n}\n}\n}\n+\n+task distributeArtifactsToBintrayComponentsTask(type: DistributeArtifactsToBintrayComponentsTask) {\n+ Components.libraries.each {\n+ if (!it.artifactName.trim()) {\n+ dependsOn \":${it.name}:distributeArtifactsToBintray\"\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/DistributeArtifactsToBintrayComponentsTask.kt",
"diff": "+package ru.surfstudio.android.build.tasks\n+\n+import org.gradle.api.DefaultTask\n+import org.gradle.api.tasks.TaskAction\n+\n+/**\n+ * Distribute artifacts for component's libraries to bintray\n+ *\n+ * It's need to start dependent task :[libname]:distributeArtifactsToBintray\n+ */\n+open class DistributeArtifactsToBintrayComponentsTask : DefaultTask() {\n+\n+ @TaskAction\n+ fun upload() {\n+\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "RENAME",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/UploadArchiveComponentsTask.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/UploadArchivesComponentsTask.kt",
"diff": "@@ -8,7 +8,7 @@ import org.gradle.api.tasks.TaskAction\n*\n* It's need to start dependent task :[libname]:uploadArchives\n*/\n-open class UploadArchiveComponentsTask : DefaultTask() {\n+open class UploadArchivesComponentsTask : DefaultTask() {\n@TaskAction\nfun upload() {\n"
},
{
"change_type": "MODIFY",
"old_path": "ci-internal/DevDeployJobJenkinsfile.groovy",
"new_path": "ci-internal/DevDeployJobJenkinsfile.groovy",
"diff": "@@ -164,7 +164,7 @@ pipeline.stages = [\npipeline.stage(DEPLOY_MODULES) {\nwithArtifactoryCredentials(script) {\nAndroidUtil.withGradleBuildCacheCredentials(script) {\n- script.sh \"./gradlew clean uploadArchiveComponentsTask -PonlyUnstable=true -PdeployOnlyIfNotExist=true\"\n+ script.sh \"./gradlew clean uploadArchivesComponentsTask -PonlyUnstable=true -PdeployOnlyIfNotExist=true\"\n}\n}\n},\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-950 Add DistributeArtifactsToBintrayComponentsTask |
652,312 | 05.03.2020 16:46:10 | -10,800 | 4b28a717cb7a7988ca85678e9c100a74d41d3c86 | Add uploadArchivesComponentsTask and distributeArtifactsToBintrayComponentsTask usage everywhere | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/buildTasks.gradle",
"new_path": "buildSrc/buildTasks.gradle",
"diff": "import ru.surfstudio.android.build.Components\n+import ru.surfstudio.android.build.tasks.*\n+import ru.surfstudio.android.build.tasks.check_stable_artifacts_exist_in_repositories.*\n+import ru.surfstudio.android.build.tasks.check_dependencies_stable.*\n+import ru.surfstudio.android.build.tasks.deploy_to_mirror.*\n+import ru.surfstudio.android.build.tasks.generate_release_notes_diff.*\ntask checkStandardDependenciesStableTask(type: CheckStandardDependenciesStableTask) //release\n"
},
{
"change_type": "MODIFY",
"old_path": "ci-internal/ProjectSnapshotDeployJobJenkinsfile.groovy",
"new_path": "ci-internal/ProjectSnapshotDeployJobJenkinsfile.groovy",
"diff": "@@ -157,10 +157,10 @@ pipeline.stages = [\nwithArtifactoryCredentials(script) {\nAndroidUtil.withGradleBuildCacheCredentials(script) {\nif (!useBintrayDeploy) {\n- script.sh \"./gradlew clean uploadArchives -PonlyUnstable=true -PdeployOnlyIfNotExist=true\"\n+ script.sh \"./gradlew clean uploadArchivesComponentsTask -PonlyUnstable=true -PdeployOnlyIfNotExist=true\"\n} else {\n- script.sh \"./gradlew clean uploadArchives\"\n- script.sh \"./gradlew distributeArtifactsToBintray -PoverrideExisted=true\"\n+ script.sh \"./gradlew clean uploadArchivesComponentsTask\"\n+ script.sh \"./gradlew distributeArtifactsToBintrayComponentsTask -PoverrideExisted=true\"\n}\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "ci-internal/ReleaseDeployJobJenkinsfile.groovy",
"new_path": "ci-internal/ReleaseDeployJobJenkinsfile.groovy",
"diff": "@@ -201,8 +201,8 @@ pipeline.stages = [\npipeline.stage(DEPLOY_MODULES) {\nwithArtifactoryCredentials(script) {\nAndroidUtil.withGradleBuildCacheCredentials(script) {\n- script.sh \"./gradlew clean uploadArchives -Pcomponent=${componentName}\"\n- script.sh \"./gradlew distributeArtifactsToBintrayTask -Pcomponent=${componentName} -PoverrideExisted=false\"\n+ script.sh \"./gradlew clean uploadArchivesComponentsTask -Pcomponent=${componentName}\"\n+ script.sh \"./gradlew distributeArtifactsToBintrayComponentsTask -Pcomponent=${componentName} -PoverrideExisted=false\"\n}\n}\n},\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-950 Add uploadArchivesComponentsTask and distributeArtifactsToBintrayComponentsTask usage everywhere |
652,312 | 06.03.2020 11:14:33 | -10,800 | 833226ab98256889250a93d8587cff262cbe6a8d | Add doFirst for deploy tasks | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/deploy.gradle",
"new_path": "buildSrc/deploy.gradle",
"diff": "@@ -24,10 +24,6 @@ ext.configureDeploy = { context ->\n}\nuploadArchives {\n- // WARNING! This is very important to use doLast here,\n- // otherwise the task will be executed for every module configuration\n- // https://stackoverflow.com/questions/20737494/why-is-my-gradle-task-always-running\n- doLast {\n// If -Pcomponent set, deploy only its artifacts\nif (project.hasProperty(GradleProperties.COMPONENT)) {\ndef componentName = project.property(GradleProperties.COMPONENT)\n@@ -89,14 +85,15 @@ ext.configureDeploy = { context ->\n}\n}\n} // repositories.mavenDeployer\n- }\n} // uploadArchives\ntask distributeArtifactsToBintray {\n- // WARNING! This is very important to use doLast here,\n- // otherwise the task will be executed for every module configuration\n- // https://stackoverflow.com/questions/20737494/why-is-my-gradle-task-always-running\n- doLast {\n+ // WARNING! This is very important to use doFirst here\n+ // in order to avoid calling this task during configuration of modules.\n+ // uploadArchives could be called during configuration with no errors\n+ // and without actual deploy, but we need to add doFirst for custom tasks.\n+ // See http://bit.ly/39vFtMj and http://bit.ly/3avuzq0\n+ doFirst {\n// If -Pcomponent set, deploy only its artifacts\nif (project.hasProperty(GradleProperties.COMPONENT)) {\ndef componentName = project.property(GradleProperties.COMPONENT)\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-950 Add doFirst for deploy tasks |
652,312 | 06.03.2020 11:54:27 | -10,800 | 085a37422aa96f3902c5ba0226efa090bb2f31e4 | Fix deploy tasks | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/deploy.gradle",
"new_path": "buildSrc/deploy.gradle",
"diff": "@@ -24,6 +24,12 @@ ext.configureDeploy = { context ->\n}\nuploadArchives {\n+ // WARNING! It is normal for uploadArchives to be called during configuration of modules\n+ // without actual deploy. But if the task contains additional logic which throws exception,\n+ // the task will fail during any other gradle task.\n+ // To avoid this, add doFirst, so uploadArchives will not be called during configuration of modules.\n+ // See http://bit.ly/39vFtMj and http://bit.ly/3avuzq0\n+ doFirst {\n// If -Pcomponent set, deploy only its artifacts\nif (project.hasProperty(GradleProperties.COMPONENT)) {\ndef componentName = project.property(GradleProperties.COMPONENT)\n@@ -85,13 +91,15 @@ ext.configureDeploy = { context ->\n}\n}\n} // repositories.mavenDeployer\n+ }\n} // uploadArchives\ntask distributeArtifactsToBintray {\n// WARNING! This is very important to use doFirst here\n// in order to avoid calling this task during configuration of modules.\n// uploadArchives could be called during configuration with no errors\n- // and without actual deploy, but we need to add doFirst for custom tasks.\n+ // and without actual deploy, but we need to add doFirst for custom tasks,\n+ // because the custom task also deploys during configuration, which is incorrect\n// See http://bit.ly/39vFtMj and http://bit.ly/3avuzq0\ndoFirst {\n// If -Pcomponent set, deploy only its artifacts\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-950 Fix deploy tasks |
652,312 | 06.03.2020 13:32:14 | -10,800 | 1b3b6304d535f9b32bdc19e58f38e47ac5c9817c | Fix for new modules | [
{
"change_type": "MODIFY",
"old_path": "recycler-decorator/RELEASE_NOTES.md",
"new_path": "recycler-decorator/RELEASE_NOTES.md",
"diff": "##### Recycler-decorator\n* ANDDEP-785 added Builder for RecyclerView.ItemDecoration and sample\n* ANDDEP-785 added ktx for Decorator.Builder to use with EasyAdapter\n+* ANDDEP-950 Add different gradle script for modules without deploy\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-decorator/lib-recycler-decorator/build.gradle",
"new_path": "recycler-decorator/lib-recycler-decorator/build.gradle",
"diff": "-apply from: \"$rootDir/buildSrc/baseBuild.gradle\"\n\\ No newline at end of file\n+apply from: \"$rootDir/buildSrc/baseDeployBuild.gradle\"\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-950 Fix for new modules |
652,300 | 10.03.2020 10:52:18 | -14,400 | 8737e6ac115a0b1f327876997a448bd98b808cf9 | Fixed issue in setLabelToIcon.gradle for Windows-users | [
{
"change_type": "MODIFY",
"old_path": "template/setLabelToIcon.gradle",
"new_path": "template/setLabelToIcon.gradle",
"diff": "@@ -451,8 +451,10 @@ class IconService {\n}\nprivate void copyFile(File fileFrom, File fileTo) {\n- createFile(fileTo)\n- Files.copy(fileFrom.toPath(), fileTo.toPath(), StandardCopyOption.REPLACE_EXISTING)\n+ File absFileFrom = fileFrom.absoluteFile\n+ File absFileTo = fileTo.absoluteFile\n+ createFile(absFileTo)\n+ Files.copy(absFileFrom.toPath(), absFileTo.toPath(), StandardCopyOption.REPLACE_EXISTING)\n}\nprivate String createVectorIconName(File icon) {\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-937 Fixed issue in setLabelToIcon.gradle for Windows-users |
652,316 | 10.03.2020 12:13:01 | -10,800 | fab2f249b7aa8e623adf5380aa474038bc9db714 | Try to implement NavigatorStore | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/di/NavigatorStorage.kt",
"diff": "+package ru.surfstudio.android.navigation.di\n+\n+import android.os.Bundle\n+import android.view.View\n+import androidx.appcompat.app.AppCompatActivity\n+import androidx.fragment.app.Fragment\n+import androidx.fragment.app.FragmentManager\n+import ru.surfstudio.android.navigation.navigator.fragment.FragmentNavigatorInterface\n+import ru.surfstudio.android.navigation.navigator.fragment.tab.route.TabRootRoute\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.route.fragment.FragmentRoute\n+\n+interface NavigatorStorage {\n+\n+ fun <R> requireNavigator(route: R): FragmentNavigatorInterface?\n+ where R : FragmentContainer, R : FragmentRoute\n+}\n+\n+interface ActivityProvider {\n+\n+ fun get(): AppCompatActivity?\n+}\n+\n+\n+interface FragmentProvider {\n+\n+ fun get(): Fragment?\n+}\n+\n+class NavigatorStorageImpl(\n+ private val activityProvider: ActivityProvider,\n+ private val fragmentProvider: FragmentProvider\n+) : NavigatorStorage {\n+\n+ private val navigators = hashMapOf<Int, FragmentNavigatorInterface>()\n+\n+ override fun <R> requireNavigator(route: R): FragmentNavigatorInterface?\n+ where R : FragmentRoute, R : FragmentContainer {\n+ val containerId = route.containerId\n+\n+ val existingNavigator = navigators[containerId]\n+ if (existingNavigator != null)\n+ return existingNavigator\n+\n+ val currentFragment = fragmentProvider.get()\n+ val currentActivity = activityProvider.get()\n+\n+ val newNavigator = when {\n+ currentFragment?.view?.findViewById<View>(containerId) != null ->\n+ createFragmentNavigator(currentFragment.childFragmentManager, route)\n+ currentActivity?.findViewById<View>(containerId) != null ->\n+ createFragmentNavigator(currentActivity.supportFragmentManager, route)\n+ else -> null\n+ }\n+ newNavigator?.let { navigators.put(containerId, it) }\n+ return newNavigator\n+ }\n+\n+ private fun <R> createFragmentNavigator(\n+ fragmentManager: FragmentManager,\n+ route: R\n+ ): FragmentNavigatorInterface\n+ where R : FragmentRoute, R : FragmentContainer {\n+ return if (route is TabRootRoute) {\n+ ViewTabFragmentNavigator(fragmentManager, route.containerId)\n+ } else {\n+ ViewFragmentNavigator(fragmentManager, route.containerId)\n+ }\n+ }\n+}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-312 Try to implement NavigatorStore |
652,312 | 10.03.2020 14:03:13 | -10,800 | 9d36563dc7e36396280c55dc527287ddc9a43ed5 | Add skipIncrementVersion parameter | [
{
"change_type": "MODIFY",
"old_path": "recycler-decorator/RELEASE_NOTES.md",
"new_path": "recycler-decorator/RELEASE_NOTES.md",
"diff": "* ANDDEP-785 added Builder for RecyclerView.ItemDecoration and sample\n* ANDDEP-785 added ktx for Decorator.Builder to use with EasyAdapter\n* ANDDEP-950 Add different gradle script for modules without deploy\n+* Add .gitignore\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "recycler-decorator/sample/.gitignore",
"diff": "+/build\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-950 Add skipIncrementVersion parameter |
652,335 | 10.03.2020 14:25:27 | -10,800 | b7261c9be01f08195af579a0f2480823d4d342ca | Increase global alpha version counter to 82 [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\": 13,\n+ \"unstable_version\": 14,\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\": 81,\n+ \"unstable_version\": 82,\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 82 [skip ci] [version] |
652,318 | 10.03.2020 01:54:22 | -18,000 | 25537428799ff6976d2509f139aa3bcda965e20f | Fix dependency substitution for debug mode | [
{
"change_type": "MODIFY",
"old_path": "template/android-standard/androidStandardSettings.gradle",
"new_path": "template/android-standard/androidStandardSettings.gradle",
"diff": "@@ -10,9 +10,12 @@ if (gradle.ext.androidStandard.debugEnabled) {\nincludeBuild(\"$androidStandardDebugDir\") {\ndependencySubstitution {\ncomponents.each { component ->\n- if (component.libraries != null && !component.libraries.isEmpty()) {\n- component.libraries.each { library ->\n- substitute module(\"ru.surfstudio.android:${library.artifactName}\") with project(\":${library.artifactName}\")\n+ if (component.libs != null && !component.libs.isEmpty()) {\n+ component.libs.each { library ->\n+ def artifactName = library.artifact_name\n+ if (artifactName != null && !artifactName.isEmpty()) {\n+ substitute module(\"ru.surfstudio.android:${artifactName}\") with project(\":${artifactName}\")\n+ }\n}\n}\n}\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Fix dependency substitution for debug mode
(cherry picked from commit 612cef46dda62cd6007b336b66b1c00e67596dad) |
652,318 | 10.03.2020 18:38:06 | -18,000 | da90c28e37ce263fb8bb349a417b86f7e8a8ce10 | Fix Android Standard debug mode in template | [
{
"change_type": "MODIFY",
"old_path": "template/base/build.gradle",
"new_path": "template/base/build.gradle",
"diff": "+if (!gradle.ext.androidStandard.debugEnabled) {\napply plugin: 'ru.surfstudio.android'\n+}\napply from: '../commonModule.gradle'\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-732 Fix Android Standard debug mode in template
(cherry picked from commit dfe80c50aea348039fb35b93cf40ae14ba5e09bd) |
652,318 | 10.03.2020 19:19:29 | -18,000 | f85be9a9f76d27f629175534b89f060cdc6c47b9 | Fix version plugin configuration for debug mode | [
{
"change_type": "MODIFY",
"old_path": "template/f-debug-no-op/build.gradle",
"new_path": "template/f-debug-no-op/build.gradle",
"diff": "apply from: '../commonModule.gradle'\n+if (!gradle.ext.androidStandard.debugEnabled) {\napply plugin: 'ru.surfstudio.android'\n+}\ndependencies {\ngradle.ext.androidStandard.api(\n"
},
{
"change_type": "MODIFY",
"old_path": "template/f-debug/build.gradle",
"new_path": "template/f-debug/build.gradle",
"diff": "apply from: '../commonModule.gradle'\napply plugin: 'kotlin-kapt'\n+if (!gradle.ext.androidStandard.debugEnabled) {\napply plugin: 'ru.surfstudio.android'\n+}\ndependencies {\nimplementation project(\":base\")\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-732 Fix version plugin configuration for debug mode |
652,318 | 10.03.2020 19:19:46 | -18,000 | 5e3cf7074baf77cc258dce39d81cf8ffa14af754 | Update documentation for debug mode | [
{
"change_type": "MODIFY",
"old_path": "android-standard-version-plugin/README.md",
"new_path": "android-standard-version-plugin/README.md",
"diff": "@@ -25,7 +25,9 @@ buildscript {\nbuild.gradle(app)\n```groovy\n+if (!gradle.ext.androidStandard.debugEnabled) {\napply plugin: 'ru.surfstudio.android'\n+}\ndependencies {\nimplementation \"ru.surfstudio.android:%ARTIFACT-ID-HERE%:${androidStandard.version(\"%ARTIFACT-ID-HERE%\")}\"\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-732 Update documentation for debug mode |
652,306 | 10.03.2020 19:37:51 | -18,000 | d8eda2b0a5b3ee7ca74dd4438aeac40229bc508a | Callbacks in imageloader's into method presently can handle gif animation | [
{
"change_type": "MODIFY",
"old_path": "imageloader/RELEASE_NOTES.md",
"new_path": "imageloader/RELEASE_NOTES.md",
"diff": "* ANDDEP-781 Added headers to ImageLoader when specifying URL\n* Cross fading with placeholders and transparent images fixed, the ability to hide background image is added to crossfade() method,\nmore about this problem - https://clck.ru/FVpbQ\n+* Added ability to work with Animatable drawable (GIF) in callbacks of into method\n## 0.4.0\n##### Imageloader\n* ANDDEP-317 Optimization [`ImageLoader`](lib-imageloader/src/main/java/ru/surfstudio/android/imageloader/ImageLoader.kt):\n"
},
{
"change_type": "MODIFY",
"old_path": "imageloader/sample/src/main/java/ru/surfstudio/android/imageloader_sample/MainActivity.kt",
"new_path": "imageloader/sample/src/main/java/ru/surfstudio/android/imageloader_sample/MainActivity.kt",
"diff": "@@ -5,6 +5,7 @@ import android.os.Bundle\nimport android.widget.Button\nimport android.widget.ImageView\nimport androidx.appcompat.app.AppCompatActivity\n+import com.bumptech.glide.load.resource.gif.GifDrawable\nimport org.jetbrains.anko.find\nimport ru.surfstudio.android.imageloader.ImageLoader\n@@ -17,6 +18,9 @@ class MainActivity : AppCompatActivity() {\nprivate lateinit var svgIv: ImageView\n+ private lateinit var gifImageView: ImageView\n+ private lateinit var gifButton: Button\n+\noverride fun onCreate(savedInstanceState: Bundle?) {\nsuper.onCreate(savedInstanceState)\nsetContentView(R.layout.activity_main)\n@@ -36,6 +40,10 @@ class MainActivity : AppCompatActivity() {\nsvgIv = find(R.id.imageloader_sample_svg_iv)\nval svgImageUrl = \"https://card2card.zenit.ru/assets/images/banks/yandex.svg\"\nloadSvgImage(svgImageUrl)\n+\n+ gifImageView = find(R.id.imageloader_sample_gif_iv)\n+ gifButton = find(R.id.image_loader_sample_gif_btn)\n+ loadGifImage()\n}\nprivate fun loadOriginalImage() {\n@@ -65,6 +73,24 @@ class MainActivity : AppCompatActivity() {\n.into(imageView)\n}\n+ private fun loadGifImage() {\n+ ImageLoader\n+ .with(this)\n+ .url(R.drawable.splash_g)\n+ .into(gifImageView, onCompleteLambda = { res, _, _ ->\n+ if (res is GifDrawable) {\n+ res.setLoopCount(10)\n+ gifButton.setOnClickListener {\n+ if (res.isRunning) {\n+ res.stop()\n+ } else {\n+ res.start()\n+ }\n+ }\n+ }\n+ })\n+ }\n+\nprivate fun loadSvgImage(svgImageUrl: String) {\nImageLoader\n.with(this)\n"
},
{
"change_type": "ADD",
"old_path": "imageloader/sample/src/main/res/drawable/splash_g.gif",
"new_path": "imageloader/sample/src/main/res/drawable/splash_g.gif",
"diff": "Binary files /dev/null and b/imageloader/sample/src/main/res/drawable/splash_g.gif differ\n"
},
{
"change_type": "MODIFY",
"old_path": "imageloader/sample/src/main/res/layout/activity_main.xml",
"new_path": "imageloader/sample/src/main/res/layout/activity_main.xml",
"diff": "android:text=\"@string/app_name\" />\n</FrameLayout>\n+ <FrameLayout\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"0dp\"\n+ android:layout_weight=\"0.5\">\n+\n+ <ImageView\n+ android:id=\"@+id/imageloader_sample_gif_iv\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"match_parent\"\n+ android:layout_gravity=\"center\"\n+ android:background=\"@color/colorPrimary\"\n+ android:contentDescription=\"@string/content_description\"\n+ android:padding=\"16dp\"\n+ tools:src=\"@drawable/a123321\" />\n+\n+ <Button\n+ android:id=\"@+id/image_loader_sample_gif_btn\"\n+ android:layout_width=\"100dp\"\n+ android:layout_height=\"100dp\"\n+ android:layout_gravity=\"bottom|start\"\n+ android:layout_margin=\"32dp\"\n+ android:text=\"@string/gif_button\" />\n+ </FrameLayout>\n</LinearLayout>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "imageloader/sample/src/main/res/values/strings.xml",
"new_path": "imageloader/sample/src/main/res/values/strings.xml",
"diff": "<resources>\n- <string name=\"app_name\">imageloader-sample</string>\n+ <string name=\"app_name\" translatable=\"false\">imageloader-sample</string>\n+ <string name=\"gif_button\" translatable=\"false\">start/stop</string>\n</resources>\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-959 Callbacks in imageloader's into method presently can handle gif animation |
652,318 | 10.03.2020 19:59:33 | -18,000 | f8fdc028668569a7e07641b83971cc8cd1014d79 | Delete double dependency. Update documentation | [
{
"change_type": "MODIFY",
"old_path": "android-standard-version-plugin/README.md",
"new_path": "android-standard-version-plugin/README.md",
"diff": "@@ -25,9 +25,7 @@ buildscript {\nbuild.gradle(app)\n```groovy\n-if (!gradle.ext.androidStandard.debugEnabled) {\napply plugin: 'ru.surfstudio.android'\n-}\ndependencies {\nimplementation \"ru.surfstudio.android:%ARTIFACT-ID-HERE%:${androidStandard.version(\"%ARTIFACT-ID-HERE%\")}\"\n"
},
{
"change_type": "MODIFY",
"old_path": "template/base_feature/build.gradle",
"new_path": "template/base_feature/build.gradle",
"diff": "@@ -27,7 +27,6 @@ dependencies {\n}\nimplementation \"com.github.anrwatchdog:anrwatchdog:$anrWatchDogVersion\"\n- implementation \"androidx.multidex:multidex:$multidexVersion\"\nimplementation \"com.akaita.java:rxjava2-debug:$rxJava2DebugVersion\"\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-732 Delete double dependency. Update documentation |
652,306 | 11.03.2020 08:45:24 | -18,000 | dc1825bbfc992d04ecd4a2ba85de024f181629fb | gif changed | [
{
"change_type": "MODIFY",
"old_path": "imageloader/sample/src/main/java/ru/surfstudio/android/imageloader_sample/MainActivity.kt",
"new_path": "imageloader/sample/src/main/java/ru/surfstudio/android/imageloader_sample/MainActivity.kt",
"diff": "@@ -76,7 +76,7 @@ class MainActivity : AppCompatActivity() {\nprivate fun loadGifImage() {\nImageLoader\n.with(this)\n- .url(R.drawable.splash_g)\n+ .url(R.drawable.android_gif)\n.into(gifImageView, onCompleteLambda = { res, _, _ ->\nif (res is GifDrawable) {\nres.setLoopCount(10)\n"
},
{
"change_type": "ADD",
"old_path": "imageloader/sample/src/main/res/drawable/android_gif.gif",
"new_path": "imageloader/sample/src/main/res/drawable/android_gif.gif",
"diff": "Binary files /dev/null and b/imageloader/sample/src/main/res/drawable/android_gif.gif differ\n"
},
{
"change_type": "DELETE",
"old_path": "imageloader/sample/src/main/res/drawable/splash_g.gif",
"new_path": "imageloader/sample/src/main/res/drawable/splash_g.gif",
"diff": "Binary files a/imageloader/sample/src/main/res/drawable/splash_g.gif and /dev/null differ\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-959 gif changed |
652,312 | 11.03.2020 12:32:36 | -10,800 | 8f49951eac96981d9f9a18f28fb218ef3c546092 | Remove generateModulesNamesFile | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/buildTasks.gradle",
"new_path": "buildSrc/buildTasks.gradle",
"diff": "@@ -71,8 +71,6 @@ task checkReleaseNotesChanged(type: CheckReleaseNotesChangedTask) //pr\ntask deployToMirror(type: DeployToMirrorTask)\n-task generateModulesNamesFile(type: GenerateModuleNameFileTask)\n-\ntask checkConfigurationIsProjectSnapshotTask(type: CheckConfigurationIsProjectSnapshotTask) // project-snapshot\ntask checkConfigurationIsNotProjectSnapshotTask(type: CheckConfigurationIsNotProjectSnapshotTask) // dev, release, pr\n"
},
{
"change_type": "DELETE",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/GenerateModuleNameFileTask.kt",
"new_path": null,
"diff": "-package ru.surfstudio.android.build.tasks\n-\n-import com.google.gson.GsonBuilder\n-import org.gradle.api.DefaultTask\n-import org.gradle.api.tasks.TaskAction\n-import ru.surfstudio.android.build.Components\n-import java.io.File\n-\n-/**\n- * Task for generating data about versions to JSON file for version plugin\n- * Do this task before deploy Android-Standard version plugin\n- */\n-open class GenerateModuleNameFileTask : DefaultTask() {\n-\n- companion object {\n- private const val OUTPUT_DIR = \"buildSrc/\"\n- private const val FILE_NAME = \"modules.json\"\n- }\n-\n- @TaskAction\n- fun generate() {\n- val moduleNames = (Components.value.flatMap { it.libraries }.map { it.name })\n- File(\"$OUTPUT_DIR/$FILE_NAME\").writeText(GsonBuilder().create().toJson(moduleNames))\n- }\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "ci-internal/JenkinsfilePullRequestJob.groovy",
"new_path": "ci-internal/JenkinsfilePullRequestJob.groovy",
"diff": "@@ -236,7 +236,6 @@ pipeline.stages = [\nAndroidPipelineHelper.buildStageBodyAndroid(script, \"clean assemble\")\n},\npipeline.stage(BUILD_TEMPLATE, StageStrategy.UNSTABLE_WHEN_STAGE_ERROR) {\n- script.sh(\"./gradlew generateModulesNamesFile\")\nscript.sh(\"echo \\\"androidStandardDebugDir=$workspace\\n\" +\n\"androidStandardDebugMode=true\\\" > template/android-standard/androidStandard.properties\")\nscript.sh(\"./gradlew -p template clean build assembleQa --stacktrace\")\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-957 Remove generateModulesNamesFile |
652,312 | 11.03.2020 13:03:53 | -10,800 | a9b3c34b99053d331ffba9c1c01072fb5c6aac03 | Fix android standard local connection in template | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "template/androidStandardPlugin.gradle",
"diff": "+if (!gradle.ext.androidStandard.debugEnabled) {\n+ apply plugin: 'ru.surfstudio.android'\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "template/base/build.gradle",
"new_path": "template/base/build.gradle",
"diff": "-if (!gradle.ext.androidStandard.debugEnabled) {\n- apply plugin: 'ru.surfstudio.android'\n-}\n-\n+apply from: '../androidStandardPlugin.gradle'\napply from: '../commonModule.gradle'\ndependencies {\n"
},
{
"change_type": "MODIFY",
"old_path": "template/f-debug-no-op/build.gradle",
"new_path": "template/f-debug-no-op/build.gradle",
"diff": "apply from: '../commonModule.gradle'\n-\n-if (!gradle.ext.androidStandard.debugEnabled) {\n- apply plugin: 'ru.surfstudio.android'\n-}\n+apply from: '../androidStandardPlugin.gradle'\ndependencies {\ngradle.ext.androidStandard.api(\n"
},
{
"change_type": "MODIFY",
"old_path": "template/f-debug/build.gradle",
"new_path": "template/f-debug/build.gradle",
"diff": "apply from: '../commonModule.gradle'\napply plugin: 'kotlin-kapt'\n-if (!gradle.ext.androidStandard.debugEnabled) {\n- apply plugin: 'ru.surfstudio.android'\n-}\ndependencies {\nimplementation project(\":base\")\n@@ -37,39 +34,4 @@ dependencies {\napi project(\":domain\")\nimplementation project(\":i-push-notification\")\n-\n- gradle.ext.androidStandard.api(\n- this,\n- [\n- \"activity-holder\",\n- \"core-ui\",\n- \"core-mvp\",\n- \"core-mvp-binding\",\n- \"mvp-dialog\",\n- \"mvp-widget\",\n- \"easyadapter\",\n- \"analytics\",\n- \"firebase-analytics\",\n- \"push\",\n- \"dagger-scope\",\n- \"logger\",\n- \"filestorage\",\n- \"imageloader\",\n- \"animations\",\n- \"picture-provider\",\n- \"app-migration\",\n- \"connection\",\n- \"custom-view\",\n- \"datalist-limit-offset\",\n- \"datalist-page-count\",\n- \"recycler-extension\",\n- \"rx-extension\",\n- \"shared-pref\",\n- \"util-ktx\",\n- \"standard-dialog\",\n- \"message-controller\",\n- \"broadcast-extension\",\n- \"rxbus\"\n- ]\n- )\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-732 Fix android standard local connection in template |
652,312 | 11.03.2020 13:58:01 | -10,800 | a1e7bd7405616055d47dbb9c4b3cfc3630e0ee04 | Fix androidStandardPlugin.gradle usage | [
{
"change_type": "MODIFY",
"old_path": "template/base/build.gradle",
"new_path": "template/base/build.gradle",
"diff": "-apply from: '../androidStandardPlugin.gradle'\napply from: '../commonModule.gradle'\ndependencies {\n"
},
{
"change_type": "MODIFY",
"old_path": "template/build.gradle",
"new_path": "template/build.gradle",
"diff": "@@ -38,3 +38,4 @@ task clean(type: Delete) {\napply from: \"scripts/dependenciesModules.gradle\"\napply from: \"scripts/ktFormatter.gradle\"\n+apply from: \"androidStandardPlugin.gradle\"\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "template/f-debug-no-op/build.gradle",
"new_path": "template/f-debug-no-op/build.gradle",
"diff": "apply from: '../commonModule.gradle'\n-apply from: '../androidStandardPlugin.gradle'\ndependencies {\ngradle.ext.androidStandard.api(\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-732 Fix androidStandardPlugin.gradle usage |
652,335 | 11.03.2020 14:42:47 | -10,800 | 751c65727bbd1c4982c8a42cd65482c4dadbef1d | Increase global alpha version counter to 83 [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\": 14,\n+ \"unstable_version\": 15,\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\": 82,\n+ \"unstable_version\": 83,\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 83 [skip ci] [version] |
652,304 | 11.03.2020 14:18:42 | -10,800 | 84083e6afbdbfaca297bc342056bdb939100ba12 | mirroring fix. | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/exceptions/deploy_to_mirror/ManyBranchesFoundException.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/exceptions/deploy_to_mirror/ManyBranchesFoundException.kt",
"diff": "@@ -3,5 +3,5 @@ package ru.surfstudio.android.build.exceptions.deploy_to_mirror\nimport org.gradle.api.GradleException\nclass ManyBranchesFoundException(commitId: String, list: List<String>) : GradleException(\n- \"Too many branches found for commit : $commitId \\nBranches : $list\"\n+ \"Too many branches found for commit : $commitId \\nBranches : $list\\nTry merge or delete side branches.\"\n)\n\\ No newline at end of file\n"
},
{
"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": "@@ -2,6 +2,8 @@ package ru.surfstudio.android.build.tasks.deploy_to_mirror\nimport org.eclipse.jgit.lib.Ref\nimport org.eclipse.jgit.revwalk.RevCommit\n+import org.eclipse.jgit.revwalk.RevWalk\n+import org.eclipse.jgit.storage.file.FileRepositoryBuilder\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@@ -15,6 +17,7 @@ import ru.surfstudio.android.build.utils.BranchCreator\nimport ru.surfstudio.android.build.utils.extractBranchNames\nimport ru.surfstudio.android.build.utils.mirrorStandardHash\nimport ru.surfstudio.android.build.utils.standardHash\n+import java.io.File\n/**\n* Data structure based on tree\n@@ -240,15 +243,46 @@ class GitTree(\nmirrorStandardHashes.contains(it.value.mirrorStandardHash)\n}\n.map {\n- val branchNameNames = mirrorRepository.getBranchesByContainsId(it.value.name)\n+ it.value\n+ val branchNameNames =\n+ mirrorRepository.getBranchesByContainsId(it.value.name)\n.map(Ref::getName)\n.extractBranchNames()\n+ .let(::tryResolveBranchConflict)\nif (branchNameNames.size != 1) {\nthrow ManyBranchesFoundException(it.value.name, branchNameNames)\n}\nCommitWithBranch(it.value, branch = branchNameNames[0])\n- }.toSet()\n+ }\n+ .toSet()\n+ }\n+\n+ /**\n+ * Try to resolve target branch for push.\n+ *\n+ * @param branchNames all branches name with commit\n+ * @return list contains single item if successfully conflict resolved.\n+ */\n+ private fun tryResolveBranchConflict(branchNames: List<String>): List<String> {\n+ if (branchNames.size < 2) return branchNames\n+\n+ val repo = FileRepositoryBuilder.create(File(mirrorRepository.repositoryPath, \".git\"))\n+ val revWalk = RevWalk(repo)\n+\n+ return branchNames.filter { one ->\n+ branchNames\n+ .map { other ->\n+ if (one != other) {\n+ val a = revWalk.parseCommit(repo.resolve(\"refs/remotes/origin/$one\"))\n+ val b = revWalk.parseCommit(repo.resolve(\"refs/remotes/origin/$other\"))\n+ revWalk.isMergedInto(a, b).not()\n+ } else {\n+ true\n+ }\n+ }\n+ .all { it }\n+ }\n}\n/**\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-800 mirroring fix. |
652,335 | 13.03.2020 14:47:27 | -10,800 | 73ff7aba62fca08a3c2a96427fb87a5955d4b231 | Increase global alpha version counter to 84 [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\": 15,\n+ \"unstable_version\": 16,\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\": 83,\n+ \"unstable_version\": 84,\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 84 [skip ci] [version] |
652,312 | 13.03.2020 17:37:07 | -10,800 | 26f45b45fb0399606e92af1f48e61a3c31d35170 | Remove redundant paramater for distributeArtifactsToBintray | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/deploy.gradle",
"new_path": "buildSrc/deploy.gradle",
"diff": "@@ -87,7 +87,7 @@ ext.configureDeploy = { context ->\n}\n}\n}\n- //This code delete \"implementation project(\"...\") dependencies from pom file\"\n+ //This code deletes \"implementation project(\"...\") dependencies from pom file\"\npom.whenConfigured {\np ->\np.dependencies = p.dependencies.findAll {\n@@ -119,13 +119,6 @@ ext.configureDeploy = { context ->\n) return\n}\n- // If -PdeployOnlyIfNotExist=true deploy only artifacts that don't exist in artifactory\n- if (project.hasProperty(GradleProperties.DEPLOY_ONLY_IF_NOT_EXIST)) {\n- if (project.property(GradleProperties.DEPLOY_ONLY_IF_NOT_EXIST) == trueValue\n- && Artifactory.isLibraryAlreadyDeployed(project.name)\n- ) return\n- }\n-\ndef overrideExisted = false\n// Read -PoverrideExisted property\nif (project.hasProperty(GradleProperties.OVERRIDE_EXISTED)) {\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/artifactory/ArtifactoryRepository.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/artifactory/ArtifactoryRepository.kt",
"diff": "@@ -43,6 +43,7 @@ internal class ArtifactoryRepository {\n/**\n* Deploy artifact to bintray\n+ * https://www.jfrog.com/confluence/display/RTF4X/Artifactory+REST+API\n*/\nfun distribute(packagesRepoPaths: String, overrideExisting: Boolean): Response {\nval bodyJson = \"\"\"\n"
},
{
"change_type": "MODIFY",
"old_path": "ci-internal/ProjectSnapshotDeployJobJenkinsfile.groovy",
"new_path": "ci-internal/ProjectSnapshotDeployJobJenkinsfile.groovy",
"diff": "@@ -158,7 +158,13 @@ pipeline.stages = [\nAndroidUtil.withGradleBuildCacheCredentials(script) {\nscript.sh \"./gradlew clean uploadArchives -PonlyUnstable=true -PdeployOnlyIfNotExist=true\"\nif (useBintrayDeploy) {\n- script.sh \"./gradlew distributeArtifactsToBintray -PonlyUnstable=true -PdeployOnlyIfNotExist=true\"\n+ /**\n+ * We can not use parameter -PdeployOnlyIfNotExist\n+ * for distributeArtifactsToBintray after uploadArchives,\n+ * otherwise deploy to Bintray will never be executed\n+ * after successful deploy to artifactory\n+ */\n+ script.sh \"./gradlew distributeArtifactsToBintray -PonlyUnstable=true\"\n}\n}\n}\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-950 Remove redundant paramater for distributeArtifactsToBintray |
652,335 | 16.03.2020 13:21:09 | -10,800 | 4da918a98ddfa97e5a0d796233309c5fc51b6ad0 | Increase global alpha version counter to 85 [skip ci] [version] | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/components.json",
"new_path": "buildSrc/components.json",
"diff": "{\n\"id\": \"activity-holder\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 0,\n+ \"unstable_version\": 1,\n\"stable\": false,\n\"dir\": \"activity-holder\",\n\"libs\": [\n{\n\"id\": \"analytics\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 3,\n\"stable\": false,\n\"dir\": \"analytics\",\n\"libs\": [\n{\n\"id\": \"animations\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 1,\n+ \"unstable_version\": 2,\n\"stable\": false,\n\"dir\": \"animations\",\n\"libs\": [\n{\n\"id\": \"app-migration\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 3,\n\"stable\": false,\n\"dir\": \"app-migration\",\n\"libs\": [\n{\n\"id\": \"broadcast-extension\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 1,\n+ \"unstable_version\": 2,\n\"stable\": false,\n\"dir\": \"broadcast-extension\",\n\"libs\": [\n{\n\"id\": \"connection\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 0,\n+ \"unstable_version\": 1,\n\"stable\": false,\n\"dir\": \"connection\",\n\"libs\": [\n{\n\"id\": \"converter-gson\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 0,\n+ \"unstable_version\": 1,\n\"stable\": false,\n\"dir\": \"deprecated/converter-gson\",\n\"libs\": [\n{\n\"id\": \"core-app\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 3,\n\"stable\": false,\n\"dir\": \"deprecated/core-app\",\n\"libs\": [\n{\n\"id\": \"mvi\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 10,\n+ \"unstable_version\": 11,\n\"stable\": false,\n\"dir\": \"mvi\",\n\"libs\": [\n{\n\"id\": \"core-mvp-binding\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 8,\n+ \"unstable_version\": 9,\n\"stable\": false,\n\"dir\": \"core-mvp-binding\",\n\"libs\": [\n{\n\"id\": \"core-ui\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 4,\n+ \"unstable_version\": 5,\n\"stable\": false,\n\"dir\": \"core-ui\",\n\"libs\": [\n{\n\"id\": \"custom-view\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 1,\n+ \"unstable_version\": 2,\n\"stable\": false,\n\"dir\": \"custom-view\",\n\"libs\": [\n{\n\"id\": \"dagger-scope\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 0,\n+ \"unstable_version\": 1,\n\"stable\": false,\n\"dir\": \"dagger-scope\",\n\"libs\": [\n{\n\"id\": \"datalist\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 1,\n+ \"unstable_version\": 2,\n\"stable\": false,\n\"dir\": \"datalist\",\n\"libs\": [\n{\n\"id\": \"easyadapter\",\n\"version\": \"1.1.0\",\n- \"unstable_version\": 7,\n+ \"unstable_version\": 8,\n\"stable\": false,\n\"dir\": \"easyadapter\",\n\"libs\": [\n{\n\"id\": \"filestorage\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 1,\n+ \"unstable_version\": 2,\n\"stable\": false,\n\"dir\": \"filestorage\",\n\"libs\": [\n{\n\"id\": \"imageloader\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 4,\n+ \"unstable_version\": 5,\n\"stable\": false,\n\"dir\": \"imageloader\",\n\"libs\": [\n{\n\"id\": \"location\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 1,\n+ \"unstable_version\": 2,\n\"stable\": false,\n\"dir\": \"location\",\n\"libs\": [\n{\n\"id\": \"logger\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 1,\n+ \"unstable_version\": 2,\n\"stable\": false,\n\"dir\": \"logger\",\n\"libs\": [\n{\n\"id\": \"message-controller\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 3,\n+ \"unstable_version\": 4,\n\"stable\": false,\n\"dir\": \"message-controller\",\n\"libs\": [\n{\n\"id\": \"mvp\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 4,\n+ \"unstable_version\": 5,\n\"stable\": false,\n\"dir\": \"mvp\",\n\"libs\": [\n{\n\"id\": \"network\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 1,\n+ \"unstable_version\": 2,\n\"stable\": false,\n\"dir\": \"deprecated/network\",\n\"libs\": [\n{\n\"id\": \"picture-provider\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 1,\n+ \"unstable_version\": 2,\n\"stable\": false,\n\"dir\": \"picture-provider\",\n\"libs\": [\n{\n\"id\": \"push\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 0,\n+ \"unstable_version\": 1,\n\"stable\": false,\n\"dir\": \"push\",\n\"libs\": [\n{\n\"id\": \"recycler-extension\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 0,\n+ \"unstable_version\": 1,\n\"stable\": false,\n\"dir\": \"recycler-extension\",\n\"libs\": [\n{\n\"id\": \"recycler-decorator\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 1,\n+ \"unstable_version\": 2,\n\"stable\": false,\n\"dir\": \"recycler-decorator\",\n\"libs\": [\n{\n\"id\": \"rx-extension\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 5,\n+ \"unstable_version\": 6,\n\"stable\": false,\n\"dir\": \"rx-extension\",\n\"libs\": [\n{\n\"id\": \"rxbus\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 1,\n+ \"unstable_version\": 2,\n\"stable\": false,\n\"dir\": \"rxbus\",\n\"libs\": [\n{\n\"id\": \"shared-pref\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 3,\n\"stable\": false,\n\"dir\": \"shared-pref\",\n\"libs\": [\n{\n\"id\": \"standard-dialog\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 3,\n\"stable\": false,\n\"dir\": \"standard-dialog\",\n\"libs\": [\n{\n\"id\": \"util-ktx\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 3,\n\"stable\": false,\n\"dir\": \"util-ktx\",\n\"libs\": [\n{\n\"id\": \"docs\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 11,\n+ \"unstable_version\": 12,\n\"stable\": false,\n\"dir\": \"docs\",\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\": 84,\n+ \"unstable_version\": 85,\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 85 [skip ci] [version] |
652,335 | 16.03.2020 14:06:12 | -10,800 | cb2127f60233853e60e26023cebcf0aa079c385f | Increase global alpha version counter to 86 [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\": 85,\n+ \"unstable_version\": 86,\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 86 [skip ci] [version] |
652,335 | 17.03.2020 11:25:23 | -10,800 | e6f6bea373f7a577cb8c71feafc21b2f4db74e94 | Increase global alpha version counter to 87 [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\": 16,\n+ \"unstable_version\": 17,\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\": 86,\n+ \"unstable_version\": 87,\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 87 [skip ci] [version] |
652,312 | 17.03.2020 12:55:57 | -10,800 | cb31b31f33a428497c3cb2c62eb70e46bf87017d | Add CheckBintrayStableVersionsTask | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/buildTasks.gradle",
"new_path": "buildSrc/buildTasks.gradle",
"diff": "@@ -86,3 +86,5 @@ task distributeArtifactsToBintrayTask(type: DistributeArtifactsToBintrayTask) //\ntask generateReleaseNotesDiff(type: GenerateReleaseNotesDiffTask) // helper\ntask writeToFileReleaseNotesDiff(type: WriteToFileReleaseNotesDiff)\n+\n+task checkBintrayStableVersionsTask(type: CheckBintrayStableVersionsTask)\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/deploy.gradle",
"new_path": "buildSrc/deploy.gradle",
"diff": "@@ -128,5 +128,13 @@ ext.configureDeploy = { context ->\nArtifactory.distributeArtifactToBintray(overrideExisted, artifactName)\n}\n} // distributeArtifactsToBintray\n+\n+ task checkIfDeployAvailable {\n+ doFirst {\n+ /**\n+ * This is an empty stub task for simple check if the current module supports deploy.\n+ */\n+ }\n+ } // checkIfDeployAvailable\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/bintray/Bintray.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/bintray/Bintray.kt",
"diff": "@@ -2,6 +2,7 @@ package ru.surfstudio.android.build.bintray\nimport ru.surfstudio.android.build.Components\nimport ru.surfstudio.android.build.exceptions.ArtifactNotExistInBintrayException\n+import ru.surfstudio.android.build.model.BintrayRepoLatestVersion\nimport ru.surfstudio.android.build.model.Component\nimport ru.surfstudio.android.build.model.module.Library\n@@ -13,14 +14,14 @@ object Bintray {\nprivate val repository = BintrayRepository()\n/**\n- * Check libraries's android standard dependencies exist in bintray\n+ * Check if libraries's android standard dependencies exist in bintray\n*/\nfun checkLibrariesStandardDependenciesExisting(component: Component) {\ncomponent.libraries.forEach { this.checkLibraryStandardDependenciesExisting(it, component) }\n}\n/**\n- * Check library's android standard dependencies exist in bintray\n+ * Check if library's android standard dependencies exist in bintray\n*/\nprivate fun checkLibraryStandardDependenciesExisting(library: Library, component: Component) {\nlibrary.androidStandardDependencies\n@@ -41,9 +42,14 @@ object Bintray {\n}\n/**\n- * Check artifact exist in bintray\n+ * Check if artifact exists in bintray\n*/\n- fun isArtifactExists(dependencyName: String, version: String): Boolean {\n- return repository.isArtifactVersionExist(dependencyName, version)\n- }\n+ fun isArtifactExists(dependencyName: String, version: String): Boolean =\n+ repository.isArtifactVersionExist(dependencyName, version)\n+\n+ fun getAllPackages(): List<String> =\n+ repository.getAllPackages()\n+\n+ fun getArtifactLatestVersion(artifactName: String): BintrayRepoLatestVersion =\n+ repository.getArtifactLatestVersion(artifactName)\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/bintray/BintrayConfig.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/bintray/BintrayConfig.kt",
"diff": "@@ -10,7 +10,9 @@ object BintrayConfig {\nprivate const val BINTRAY_URL = \"https://api.bintray.com\"\nprivate const val PACKAGES_URL = \"$BINTRAY_URL/packages\"\n- const val GET_VERSION_URL = \"$PACKAGES_URL/surf/maven\"\n+ private const val SURF_BINTRAY_URL = \"surf/maven\"\n+ const val GET_VERSION_URL = \"$PACKAGES_URL/$SURF_BINTRAY_URL\"\n+ const val GET_ALL_PACKAGES_URL = \"$BINTRAY_URL/repos/$SURF_BINTRAY_URL/packages\"\nval USER_NAME: String = System.getenv(\"surf_bintray_username\") ?: EMPTY_STRING\nval PASSWORD: String = System.getenv(\"surf_bintray_api_key\") ?: EMPTY_STRING\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/bintray/BintrayRepository.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/bintray/BintrayRepository.kt",
"diff": "@@ -3,23 +3,26 @@ package ru.surfstudio.android.build.bintray\nimport com.github.kittinunf.fuel.Fuel\nimport com.github.kittinunf.fuel.core.extensions.authentication\nimport com.github.kittinunf.fuel.core.isSuccessful\n+import com.google.gson.GsonBuilder\nimport org.gradle.internal.impldep.com.google.api.client.http.HttpStatusCodes\n+import ru.surfstudio.android.build.exceptions.UnableGetBintrayPackagesException\nimport ru.surfstudio.android.build.exceptions.UnauthorizedException\n+import ru.surfstudio.android.build.model.BintrayRepoLatestVersion\n+import ru.surfstudio.android.build.model.json.bintray.BintrayPackageInfoJson\n+import ru.surfstudio.android.build.model.json.bintray.BintrayRepoLatestVersionJson\n/**\n* Class to use bintray api\n*/\ninternal class BintrayRepository {\n+ private val gson = GsonBuilder().create()\n+\n/**\n* Get artifact version\n*/\nfun isArtifactVersionExist(artifactName: String, artifactVersion: String): Boolean {\n- val response = Fuel.get(\"${BintrayConfig.GET_VERSION_URL}/$artifactName/versions/$artifactVersion\")\n- .authentication()\n- .basic(BintrayConfig.USER_NAME, BintrayConfig.PASSWORD)\n- .response()\n- .second\n+ val response = getResponse(\"${BintrayConfig.GET_VERSION_URL}/$artifactName/versions/$artifactVersion\")\nif (response.statusCode == HttpStatusCodes.STATUS_CODE_UNAUTHORIZED) {\nthrow UnauthorizedException(response.toString())\n@@ -27,4 +30,43 @@ internal class BintrayRepository {\nreturn response.isSuccessful\n}\n+\n+ fun getAllPackages(): List<String> {\n+ val response = getResponse(BintrayConfig.GET_ALL_PACKAGES_URL)\n+\n+ if (response.isSuccessful) {\n+ val data = String(response.data)\n+ return gson.fromJson(data, Array<BintrayPackageInfoJson>::class.java)\n+ .toList()\n+ .map {\n+ it.transform()\n+ }\n+ } else {\n+ if (response.statusCode == HttpStatusCodes.STATUS_CODE_UNAUTHORIZED) {\n+ throw UnauthorizedException(response.toString())\n+ }\n+ throw UnableGetBintrayPackagesException(response.toString())\n+ }\n+ }\n+\n+ fun getArtifactLatestVersion(artifactName: String): BintrayRepoLatestVersion {\n+ val response = getResponse(\"${BintrayConfig.GET_VERSION_URL}/$artifactName/versions/_latest\")\n+\n+ if (response.isSuccessful) {\n+ val data = String(response.data)\n+ return gson.fromJson(data, BintrayRepoLatestVersionJson::class.java).transform()\n+ } else {\n+ if (response.statusCode == HttpStatusCodes.STATUS_CODE_UNAUTHORIZED) {\n+ throw UnauthorizedException(response.toString())\n+ }\n+ throw UnableGetBintrayPackagesException(response.toString())\n+ }\n+ }\n+\n+ private fun getResponse(url: String) =\n+ Fuel.get(url)\n+ .authentication()\n+ .basic(BintrayConfig.USER_NAME, BintrayConfig.PASSWORD)\n+ .response()\n+ .second\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/exceptions/UnableGetBintrayPackagesException.kt",
"diff": "+package ru.surfstudio.android.build.exceptions\n+\n+import org.gradle.api.GradleException\n+\n+class UnableGetBintrayPackagesException(message: String) : GradleException(message)\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/model/BintrayRepoLatestVersion.kt",
"diff": "+package ru.surfstudio.android.build.model\n+\n+data class BintrayRepoLatestVersion(\n+ val name: String,\n+ val desc: String?,\n+ val packageName: String,\n+ val repo: String,\n+ val owner: String,\n+ val published: Boolean,\n+ val created: String,\n+ val updated: String,\n+ val released: String,\n+ val ordinal: Double,\n+ val githubReleaseNotesFile: String?,\n+ val githubUseTagReleaseNotes: Boolean,\n+ val vcsTag: String?,\n+ val ratingCount: Int\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/model/json/bintray/BintrayPackageInfoJson.kt",
"diff": "+package ru.surfstudio.android.build.model.json.bintray\n+\n+import com.google.gson.annotations.SerializedName\n+import ru.surfstudio.android.build.utils.Transformable\n+\n+data class BintrayPackageInfoJson(\n+ @SerializedName(\"name\") val name: String\n+) : Transformable<String> {\n+\n+ override fun transform() = name\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/model/json/bintray/BintrayRepoLatestVersionJson.kt",
"diff": "+package ru.surfstudio.android.build.model.json.bintray\n+\n+import com.google.gson.annotations.SerializedName\n+import ru.surfstudio.android.build.model.BintrayRepoLatestVersion\n+import ru.surfstudio.android.build.utils.Transformable\n+\n+data class BintrayRepoLatestVersionJson(\n+ @SerializedName(\"name\") val name: String,\n+ @SerializedName(\"desc\") val desc: String?,\n+ @SerializedName(\"package\") val packageName: String,\n+ @SerializedName(\"repo\") val repo: String,\n+ @SerializedName(\"owner\") val owner: String,\n+ @SerializedName(\"published\") val published: Boolean,\n+ @SerializedName(\"created\") val created: String,\n+ @SerializedName(\"updated\") val updated: String,\n+ @SerializedName(\"released\") val released: String,\n+ @SerializedName(\"ordinal\") val ordinal: Double,\n+ @SerializedName(\"github_release_notes_file\") val githubReleaseNotesFile: String?,\n+ @SerializedName(\"github_use_tag_release_notes\") val githubUseTagReleaseNotes: Boolean,\n+ @SerializedName(\"vcs_tag\") val vcsTag: String?,\n+ @SerializedName(\"rating_count\") val ratingCount: Int\n+) : Transformable<BintrayRepoLatestVersion> {\n+\n+ override fun transform() = BintrayRepoLatestVersion(\n+ name = name,\n+ desc = desc,\n+ packageName = packageName,\n+ repo = repo,\n+ owner = owner,\n+ published = published,\n+ created = created,\n+ updated = updated,\n+ released = released,\n+ ordinal = ordinal,\n+ githubReleaseNotesFile = githubReleaseNotesFile,\n+ githubUseTagReleaseNotes = githubUseTagReleaseNotes,\n+ vcsTag = vcsTag,\n+ ratingCount = ratingCount\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/bintray_tasks/CheckBintrayStableVersionsTask.kt",
"diff": "+package ru.surfstudio.android.build.tasks.bintray_tasks\n+\n+import org.gradle.api.DefaultTask\n+import org.gradle.api.GradleException\n+import org.gradle.api.tasks.TaskAction\n+import ru.surfstudio.android.build.Components\n+import ru.surfstudio.android.build.bintray.Bintray\n+import ru.surfstudio.android.build.tasks.changed_components.CommandLineRunner\n+import ru.surfstudio.android.build.utils.COMPONENTS_JSON_FILE_PATH\n+import ru.surfstudio.android.build.utils.JsonHelper\n+import java.io.File\n+import java.lang.StringBuilder\n+\n+private val currentDirectory: String = System.getProperty(\"user.dir\")\n+\n+//region commands\n+private const val GET_LATEST_TAG_COMMAND = \"git describe --tags\" //http://bit.ly/2QlsLbo\n+private const val GET_LATEST_TAG_HASH_COMMAND = \"git rev-list --tags --max-count=1\"\n+private const val CHECKOUT_COMMAND = \"git checkout\"\n+private const val CHECKOUT_TAG_COMMAND = \"$CHECKOUT_COMMAND tags\"\n+private const val GET_CURRENT_BRANCH_NAME_COMMAND = \"git rev-parse --abbrev-ref HEAD\"\n+//endregion\n+\n+/**\n+ * Check if all artifacts in bintray have stable version as latest.\n+ *\n+ * WARNING! The task overrides [Components.value] using old components versions from git history.\n+ * Components must be initialized with actual values after this task, if needed.\n+ */\n+open class CheckBintrayStableVersionsTask : DefaultTask() {\n+\n+ @TaskAction\n+ fun check() {\n+ val workingDir = File(currentDirectory)\n+ val latestTagHash = CommandLineRunner.runCommandWithResult(GET_LATEST_TAG_HASH_COMMAND, workingDir)\n+ val latestTag = CommandLineRunner.runCommandWithResult(\"$GET_LATEST_TAG_COMMAND $latestTagHash\", workingDir)\n+ val currentBranch = CommandLineRunner.runCommandWithResult(GET_CURRENT_BRANCH_NAME_COMMAND, workingDir)\n+ println(\"latest release version = $latestTag\")\n+\n+ // Get stable versions of components for latest tag.\n+ CommandLineRunner.runCommandWithResult(\"$CHECKOUT_TAG_COMMAND/$latestTag\", workingDir)\n+ val jsonComponents = JsonHelper.parseComponentsJson(\"$currentDirectory/$COMPONENTS_JSON_FILE_PATH\")\n+ Components.init(jsonComponents)\n+ CommandLineRunner.runCommandWithResult(\"$CHECKOUT_COMMAND $currentBranch\", workingDir)\n+\n+ val allBintrayPackages = Bintray.getAllPackages()\n+ val sb = StringBuilder()\n+\n+ // Check if deploy is available for the current component and bintray contains the component\n+ Components.value.forEach { component ->\n+ val name = component.name\n+ val stableVersion = component.baseVersion\n+\n+ if (CommandLineRunner.isCommandSucceed(\"./gradlew :$name:checkIfDeployAvailable\", workingDir)) {\n+ if (allBintrayPackages.contains(name)) {\n+ println(\"checking latest bintray version for $name\")\n+ val bintrayVersion = Bintray.getArtifactLatestVersion(name).name\n+ if (stableVersion != bintrayVersion) {\n+ sb.append(\"latest bintray version=$bintrayVersion for $name is not stable=$stableVersion\\n\")\n+ }\n+ } else {\n+ println(\"CheckBintrayStableVersions warning: $name has stable version $stableVersion, \" +\n+ \"but haven't deployed to bintray.\"\n+ )\n+ }\n+ }\n+ }\n+ with(sb.toString()) {\n+ if (isNotEmpty()) {\n+ throw GradleException(this)\n+ }\n+ }\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/changed_components/CommandLineRunner.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/changed_components/CommandLineRunner.kt",
"diff": "@@ -4,6 +4,8 @@ import org.gradle.api.GradleException\nimport java.io.File\nimport java.util.concurrent.TimeUnit\n+private const val COMMAND_RUN_TIMEOUT_SEC = 300L\n+\n/**\n* Runs command in command line\n*/\n@@ -18,18 +20,27 @@ object CommandLineRunner {\n* @return result of command\n*/\nfun runCommandWithResult(command: String, workingDir: File): String? {\n- val parts = command.split(SPLIT_STRING.toRegex())\n- val process = ProcessBuilder(*parts.toTypedArray())\n- .directory(workingDir)\n- .redirectOutput(ProcessBuilder.Redirect.PIPE)\n- .redirectError(ProcessBuilder.Redirect.PIPE)\n- .start()\n-\n- process.waitFor(300, TimeUnit.SECONDS)\n+ val process = runCommandProcess(command, workingDir)\n+ process.waitFor(COMMAND_RUN_TIMEOUT_SEC, TimeUnit.SECONDS)\nif (process.exitValue() != 0) {\nthrow GradleException(process.errorStream.bufferedReader().readText())\n}\nreturn process.inputStream.bufferedReader().readText()\n}\n+\n+ fun isCommandSucceed(command: String, workingDir: File): Boolean {\n+ val process = runCommandProcess(command, workingDir)\n+ process.waitFor(COMMAND_RUN_TIMEOUT_SEC, TimeUnit.SECONDS)\n+ return process.exitValue() == 0\n+ }\n+\n+ private fun runCommandProcess(command: String, workingDir: File): Process {\n+ val parts = command.split(SPLIT_STRING.toRegex()).filter { it.isNotBlank() }\n+ return ProcessBuilder(*parts.toTypedArray())\n+ .directory(workingDir)\n+ .redirectOutput(ProcessBuilder.Redirect.PIPE)\n+ .redirectError(ProcessBuilder.Redirect.PIPE)\n+ .start()\n+ }\n}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "check-bintray.sh",
"diff": "+./gradlew checkBintrayStableVersionsTask\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-966 Add CheckBintrayStableVersionsTask |
652,312 | 18.03.2020 13:16:14 | -10,800 | c0d5d7724f087d534e510539d2e75ddaec9c13a0 | Add CheckBintrayStableVersionsJenkinsfile | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/bintray_tasks/CheckBintrayStableVersionsTask.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/bintray_tasks/CheckBintrayStableVersionsTask.kt",
"diff": "@@ -57,6 +57,8 @@ open class CheckBintrayStableVersionsTask : DefaultTask() {\nval bintrayVersion = Bintray.getArtifactLatestVersion(name).name\nif (stableVersion != bintrayVersion) {\nsb.append(\"latest bintray version=$bintrayVersion for $name is not stable=$stableVersion\\n\")\n+ } else {\n+ println(\"latest bintray version=$bintrayVersion for $name is stable\")\n}\n} else {\nprintln(\"CheckBintrayStableVersions warning: $name has stable version $stableVersion, \" +\n"
},
{
"change_type": "MODIFY",
"old_path": "ci-internal/ComponentMirroringJobJenkinsfile.groovy",
"new_path": "ci-internal/ComponentMirroringJobJenkinsfile.groovy",
"diff": "@@ -71,9 +71,6 @@ pipeline.stages = [\ncredentialsId: pipeline.repoCredentialsId\n)\nscript.sh \"git checkout -B $branchName origin/$branchName\"\n-\n- script.echo \"Checking $RepositoryUtil.SKIP_CI_LABEL1 label in last commit message for automatic builds\"\n-\nRepositoryUtil.saveCurrentGitCommitHash(script)\n},\npipeline.stage(PREPARE_MIRRORING) {\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-966 Add CheckBintrayStableVersionsJenkinsfile |
652,312 | 18.03.2020 14:42:51 | -10,800 | 7e8429172f837942ce238a337cb2ac97a1f9c859 | Unstable instrumental tests stage | [
{
"change_type": "MODIFY",
"old_path": "ci-internal/DevDeployJobJenkinsfile.groovy",
"new_path": "ci-internal/DevDeployJobJenkinsfile.groovy",
"diff": "@@ -143,7 +143,7 @@ pipeline.stages = [\n\"**/test-results/testReleaseUnitTest/*.xml\",\n\"app/build/reports/tests/testReleaseUnitTest/\")\n},\n- pipeline.stage(INSTRUMENTATION_TEST) {\n+ pipeline.stage(INSTRUMENTATION_TEST, StageStrategy.UNSTABLE_WHEN_STAGE_ERROR) {\nAndroidPipelineHelper.instrumentationTestStageBodyAndroid(\nscript,\nnew AvdConfig(),\n"
},
{
"change_type": "MODIFY",
"old_path": "ci-internal/JenkinsfilePullRequestJob.groovy",
"new_path": "ci-internal/JenkinsfilePullRequestJob.groovy",
"diff": "@@ -264,7 +264,7 @@ pipeline.stages = [\n)\n}\n},\n- pipeline.stage(INSTRUMENTATION_TEST) {\n+ pipeline.stage(INSTRUMENTATION_TEST, StageStrategy.UNSTABLE_WHEN_STAGE_ERROR) {\nAndroidPipelineHelper.instrumentationTestStageBodyAndroid(\nscript,\nnew AvdConfig(),\n"
},
{
"change_type": "MODIFY",
"old_path": "ci-internal/ReleaseDeployJobJenkinsfile.groovy",
"new_path": "ci-internal/ReleaseDeployJobJenkinsfile.groovy",
"diff": "-@Library('surf-lib@version-2.0.0-SNAPSHOT') // https://bitbucket.org/surfstudio/jenkins-pipeline-lib/\n+@Library('surf-lib@version-2.0.0-SNAPSHOT')\n+// https://bitbucket.org/surfstudio/jenkins-pipeline-lib/\nimport ru.surfstudio.ci.pipeline.empty.EmptyScmPipeline\nimport ru.surfstudio.ci.stage.StageStrategy\n@@ -224,7 +225,6 @@ pipeline.stages = [\n]\n-\npipeline.finalizeBody = {\ndef jenkinsLink = CommonUtil.getBuildUrlSlackLink(script)\ndef message\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Unstable instrumental tests stage |
652,335 | 18.03.2020 14:55:40 | -10,800 | 263a8da4c9cc09fb154330b3d4f45c5d6df2c764 | Increase global alpha version counter to 88 [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\": 17,\n+ \"unstable_version\": 18,\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\": 87,\n+ \"unstable_version\": 88,\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 88 [skip ci] [version] |
652,335 | 18.03.2020 15:26:01 | -10,800 | 4292760b025803cebd9fe9c146bb88315ded7783 | Increase global alpha version counter to 89 [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\": 88,\n+ \"unstable_version\": 89,\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 89 [skip ci] [version] |
652,306 | 18.03.2020 20:32:44 | -18,000 | 601f117cd25561cf7bab4e9b4929599af7e71b63 | updated readme and release notes. DrawableImageViewTarget no longer call parent methods in overriden | [
{
"change_type": "MODIFY",
"old_path": "imageloader/RELEASE_NOTES.md",
"new_path": "imageloader/RELEASE_NOTES.md",
"diff": "* ANDDEP-781 Added headers to ImageLoader when specifying URL\n* Cross fading with placeholders and transparent images fixed, the ability to hide background image is added to crossfade() method,\nmore about this problem - https://clck.ru/FVpbQ\n-* Added ability to work with Animatable drawable (GIF) in callbacks of into method\n+* ANDDEP-959 Added ability to work with Animatable drawable (GIF) in callbacks of into method\n## 0.4.0\n##### Imageloader\n* ANDDEP-317 Optimization [`ImageLoader`](lib-imageloader/src/main/java/ru/surfstudio/android/imageloader/ImageLoader.kt):\n"
},
{
"change_type": "MODIFY",
"old_path": "imageloader/lib-imageloader/src/main/java/ru/surfstudio/android/imageloader/ImageLoader.kt",
"new_path": "imageloader/lib-imageloader/src/main/java/ru/surfstudio/android/imageloader/ImageLoader.kt",
"diff": "@@ -499,12 +499,10 @@ class ImageLoader(private val context: Context) : ImageLoaderInterface {\noverride fun onLoadFailed(errorDrawable: Drawable?) {\nonErrorLambda?.invoke(errorDrawable)\n- super.onLoadFailed(errorDrawable)\n}\noverride fun onResourceReady(resource: Drawable, transition: Transition<in Drawable>?) {\nonCompleteLambda?.invoke(resource, transition, imageCacheManager.imageSource)\n- super.onResourceReady(resource, transition)\n}\noverride fun onLoadCleared(placeholder: Drawable?) {\n"
},
{
"change_type": "MODIFY",
"old_path": "imageloader/sample/src/main/java/ru/surfstudio/android/imageloader_sample/MainActivity.kt",
"new_path": "imageloader/sample/src/main/java/ru/surfstudio/android/imageloader_sample/MainActivity.kt",
"diff": "@@ -78,6 +78,7 @@ class MainActivity : AppCompatActivity() {\n.with(this)\n.url(R.drawable.android_gif)\n.into(gifImageView, onCompleteLambda = { res, _, _ ->\n+ gifImageView.setImageDrawable(res)\nif (res is GifDrawable) {\nres.setLoopCount(10)\ngifButton.setOnClickListener {\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-959 updated readme and release notes. DrawableImageViewTarget no longer call parent methods in overriden |
652,312 | 18.03.2020 19:49:42 | -10,800 | 2514627cec386ced000d8ca55fbdd6f53f69af7d | Add logic for handle -1 bintray error code | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/bintray/BintrayRepository.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/bintray/BintrayRepository.kt",
"diff": "@@ -11,6 +11,12 @@ import ru.surfstudio.android.build.model.BintrayRepoLatestVersion\nimport ru.surfstudio.android.build.model.json.bintray.BintrayPackageInfoJson\nimport ru.surfstudio.android.build.model.json.bintray.BintrayRepoLatestVersionJson\n+/**\n+ * Any Bintray response can suddenly return -1 error code with empty response.\n+ * These requests need to be repeated\n+ */\n+private const val EMPTY_ERROR_CODE = -1\n+\n/**\n* Class to use bintray api\n*/\n@@ -34,7 +40,7 @@ internal class BintrayRepository {\n/**\n* Function for getting all packages from bintray\n*/\n- fun getAllPackages(): List<String> {\n+ fun getAllPackages(needRetry: Boolean = true): List<String> {\nval response = getResponse(BintrayConfig.GET_ALL_PACKAGES_URL)\nif (response.isSuccessful) {\n@@ -45,27 +51,49 @@ internal class BintrayRepository {\nit.transform()\n}\n} else {\n- if (response.statusCode == HttpStatusCodes.STATUS_CODE_UNAUTHORIZED) {\n- throw UnauthorizedException(response.toString())\n+ val stringResponse = response.toString()\n+ when (response.statusCode) {\n+ HttpStatusCodes.STATUS_CODE_UNAUTHORIZED -> throw UnauthorizedException(stringResponse)\n+ EMPTY_ERROR_CODE -> {\n+ if (needRetry) {\n+ println(\"$stringResponse\\n RETRY ${BintrayConfig.GET_ALL_PACKAGES_URL}\")\n+ return getAllPackages(false)\n+ } else {\n+ throw GradleException(stringResponse)\n+ }\n+ }\n+ else -> throw GradleException(stringResponse)\n}\n- throw GradleException(response.toString())\n}\n}\n/**\n* Function for getting the latest version of artifact in bintray\n*/\n- fun getArtifactLatestVersion(artifactName: String): BintrayRepoLatestVersion {\n- val response = getResponse(\"${BintrayConfig.GET_VERSION_URL}/$artifactName/versions/_latest\")\n+ fun getArtifactLatestVersion(\n+ artifactName: String,\n+ needRetry: Boolean = true\n+ ): BintrayRepoLatestVersion {\n+ val url = \"${BintrayConfig.GET_VERSION_URL}/$artifactName/versions/_latest\"\n+ val response = getResponse(url)\nif (response.isSuccessful) {\nval data = String(response.data)\nreturn gson.fromJson(data, BintrayRepoLatestVersionJson::class.java).transform()\n} else {\n- if (response.statusCode == HttpStatusCodes.STATUS_CODE_UNAUTHORIZED) {\n- throw UnauthorizedException(response.toString())\n+ val stringResponse = response.toString()\n+ when (response.statusCode) {\n+ HttpStatusCodes.STATUS_CODE_UNAUTHORIZED -> throw UnauthorizedException(stringResponse)\n+ EMPTY_ERROR_CODE -> {\n+ if (needRetry) {\n+ println(\"$stringResponse\\n RETRY $url\")\n+ return getArtifactLatestVersion(artifactName, false)\n+ } else {\n+ throw GradleException(stringResponse)\n+ }\n+ }\n+ else -> throw GradleException(stringResponse)\n}\n- throw GradleException(response.toString())\n}\n}\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-966 Add logic for handle -1 bintray error code |
652,335 | 19.03.2020 10:47:33 | -10,800 | d1e99bf625eb3246d8dcb2ac8adee9415071adc4 | Increase global alpha version counter to 90 [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\": 89,\n+ \"unstable_version\": 90,\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 90 [skip ci] [version] |
652,335 | 19.03.2020 14:23:12 | -10,800 | aaa3e0847e927c661305b8be561bb4e177a31482 | Increase global alpha version counter to 91 [skip ci] [version] | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/components.json",
"new_path": "buildSrc/components.json",
"diff": "{\n\"id\": \"imageloader\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 5,\n+ \"unstable_version\": 6,\n\"stable\": false,\n\"dir\": \"imageloader\",\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\": 90,\n+ \"unstable_version\": 91,\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 91 [skip ci] [version] |
652,312 | 19.03.2020 15:50:35 | -10,800 | 3a7a94d1c8e2dc8d1f1b90357ebd03a9ce00be1e | Update logic for CheckBintrayStableVersionsTask | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/deploy.gradle",
"new_path": "buildSrc/deploy.gradle",
"diff": "@@ -128,13 +128,5 @@ ext.configureDeploy = { context ->\nArtifactory.distributeArtifactToBintray(overrideExisted, artifactName)\n}\n} // distributeArtifactsToBintray\n-\n- task checkIfDeployAvailable {\n- doFirst {\n- /**\n- * This is an empty stub task for simple check if the current module supports deploy.\n- */\n- }\n- } // checkIfDeployAvailable\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/bintray_tasks/CheckBintrayStableVersionsTask.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/bintray_tasks/CheckBintrayStableVersionsTask.kt",
"diff": "@@ -12,8 +12,10 @@ import java.io.File\nimport java.lang.StringBuilder\nprivate val currentDirectory: String = System.getProperty(\"user.dir\")\n+private const val LINE = \"________________________________________________________________\"\n//region commands\n+private const val GET_ALL_TAGS_COMMAND = \"git tag --list\"\nprivate const val GET_LATEST_TAG_COMMAND = \"git describe --tags\" //http://bit.ly/2QlsLbo\nprivate const val GET_LATEST_TAG_HASH_COMMAND = \"git rev-list --tags --max-count=1\"\nprivate const val CHECKOUT_COMMAND = \"git checkout\"\n@@ -33,43 +35,83 @@ open class CheckBintrayStableVersionsTask : DefaultTask() {\nfun check() {\nval workingDir = File(currentDirectory)\nval latestTagHash = CommandLineRunner.runCommandWithResult(GET_LATEST_TAG_HASH_COMMAND, workingDir)\n- val latestTag = CommandLineRunner.runCommandWithResult(\"$GET_LATEST_TAG_COMMAND $latestTagHash\", workingDir)\n+ val latestTag = CommandLineRunner.runCommandWithResult(\n+ \"$GET_LATEST_TAG_COMMAND $latestTagHash\",\n+ workingDir\n+ )?.trim()\nval currentBranch = CommandLineRunner.runCommandWithResult(GET_CURRENT_BRANCH_NAME_COMMAND, workingDir)\n- println(\"latest release version = $latestTag\")\n+ println(\"latest release version = $latestTag\\n\")\n- // Get stable versions of components for latest tag.\n- CommandLineRunner.runCommandWithResult(\"$CHECKOUT_TAG_COMMAND/$latestTag\", workingDir)\n+ val allTags = CommandLineRunner.runCommandWithResult(GET_ALL_TAGS_COMMAND, workingDir)\n+ ?.split(\"\\n\")\n+\n+ val errorSb = StringBuilder()\n+ val tagWarningSb = StringBuilder()\n+\n+ allTags?.also { safeAllTags ->\n+ Bintray.getAllPackages().forEach { packageName ->\n+ // find release tag for artifact\n+ val checkoutTag = safeAllTags.firstOrNull { it.startsWith(packageName) } ?: latestTag\n+ if (checkoutTag != null) {\n+ val isCheckoutTagForArtifact = checkoutTag.startsWith(packageName)\n+ println(\"for $packageName checkoutTag = $checkoutTag\")\n+\n+ val stableVersion = if (isCheckoutTagForArtifact) {\n+ // get stable version from the artifact's release tag\n+ checkoutTag.split(\"/\").last()\n+ } else {\n+ // get stable version of the artifact for common tag\n+ CommandLineRunner.runCommandWithResult(\"$CHECKOUT_TAG_COMMAND/$checkoutTag\", workingDir)\nval jsonComponents = JsonHelper.parseComponentsJson(\"$currentDirectory/$COMPONENTS_JSON_FILE_PATH\")\nComponents.init(jsonComponents)\nCommandLineRunner.runCommandWithResult(\"$CHECKOUT_COMMAND $currentBranch\", workingDir)\n+ Components.value\n+ .firstOrNull { it.name == packageName }\n+ ?.baseVersion\n+ }\n- val allBintrayPackages = Bintray.getAllPackages()\n- val sb = StringBuilder()\n+ val bintrayVersion = Bintray.getArtifactLatestVersion(packageName).name\n- // Check if deploy is available for the current component and bintray contains the component\n- Components.value.forEach { component ->\n- val name = component.name\n- val stableVersion = component.baseVersion\n+ if (stableVersion != null) {\n+ // fail to parse the artifact's release tag\n+ if (stableVersion.isEmpty()) {\n+ throw GradleException(\"Invalid release tag format for $checkoutTag, \" +\n+ \"must be \\\"$packageName/STABLE-VERSION\\\"\"\n+ )\n+ }\n+\n+ // the artifact's release tag is not found, the common tag will be used\n+ if (!isCheckoutTagForArtifact) {\n+ tagWarningSb.append(\n+ \"WARNING! Released artifact $packageName must have \" +\n+ \"a release tag \\\"$packageName/$stableVersion\\\"\\n\"\n+ )\n+ }\n- if (CommandLineRunner.isCommandSucceed(\"./gradlew :$name:checkIfDeployAvailable\", workingDir)) {\n- if (allBintrayPackages.contains(name)) {\n- println(\"checking latest bintray version for $name\")\n- val bintrayVersion = Bintray.getArtifactLatestVersion(name).name\nif (stableVersion != bintrayVersion) {\n- val errorMessage = \"latest bintray version=$bintrayVersion for $name is not stable=$stableVersion\"\n- sb.append(\"$errorMessage\\n\")\n- println(\"ERROR: $errorMessage\")\n+ val errorMessage = \"latest bintray version=$bintrayVersion for $packageName \" +\n+ \"is not stable=$stableVersion\"\n+ errorSb.append(\"$errorMessage\\n\")\n+ println(\"ERROR: $errorMessage\\n\")\n} else {\n- println(\"latest bintray version=$bintrayVersion for $name is stable\")\n+ println(\"SUCCESS: latest bintray version=$bintrayVersion for $packageName is stable\\n\")\n}\n} else {\n- println(\"CheckBintrayStableVersions warning: $name has stable version $stableVersion, \" +\n- \"but haven't deployed to bintray.\"\n- )\n+ println(\"NOT FOUND: Bintray contains a new artifact $packageName \" +\n+ \"which is not found for tag $checkoutTag\\n\")\n}\n+ println(LINE)\n+ }\n+ } // Bintray.getAllPackages().forEach\n+ } // safeAllTags\n+\n+ with(tagWarningSb.toString()) {\n+ if (isNotEmpty()) {\n+ println(this)\n}\n}\n- with(sb.toString()) {\n+\n+ with(errorSb.toString()) {\nif (isNotEmpty()) {\nthrow GradleException(this)\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "check-bintray.sh",
"diff": "+./gradlew checkBintrayStableVersionsTask\n"
},
{
"change_type": "MODIFY",
"old_path": "ci-internal/ReleaseDeployJobJenkinsfile.groovy",
"new_path": "ci-internal/ReleaseDeployJobJenkinsfile.groovy",
"diff": "@@ -210,7 +210,7 @@ pipeline.stages = [\npipeline.stage(COMPONENT_ALPHA_COUNTER_PUSH, StageStrategy.UNSTABLE_WHEN_STAGE_ERROR) {\nRepositoryUtil.setDefaultJenkinsGitUser(script)\ndef labels = \"$RepositoryUtil.SKIP_CI_LABEL1 $RepositoryUtil.VERSION_LABEL1\"\n- def tag = \"$componentName-$componentVersion\"\n+ def tag = \"$componentName/$componentVersion\"\nscript.sh \"git commit -a -m \" +\n\"\\\"Set component $componentName alpha counter to zero $labels\\\" || true\"\nscript.sh \"git tag -a $tag -m \\\"Set tag $tag $labels\\\"\"\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-976 Update logic for CheckBintrayStableVersionsTask |
652,312 | 19.03.2020 16:59:51 | -10,800 | ccab3869e8535150a45e4bd3159a1b3187c9644b | Add function for parsing components optimization | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "bintray-check",
"diff": "+> Task :buildSrc:compileKotlin UP-TO-DATE\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 UP-TO-DATE\n+> Task :buildSrc:jar UP-TO-DATE\n+> Task :buildSrc:assemble UP-TO-DATE\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 UP-TO-DATE\n+Remote build cache DISABLED. Need specify 'GRADLE_BUILD_CACHE_USER' and 'GRADLE_BUILD_CACHE_PASS' global variables\n+\n+> Configure project :analytics-sample\n+WARNING: API 'variant.getAssemble()' is obsolete and has been replaced with 'variant.getAssembleProvider()'.\n+It will be removed at the end of 2019.\n+For more information, see https://d.android.com/r/tools/task-configuration-avoidance.\n+To determine what is calling variant.getAssemble(), use -Pandroid.debug.obsoleteApi=true on the command line to display more information.\n+WARNING: API 'variantOutput.getProcessResources()' is obsolete and has been replaced with 'variantOutput.getProcessResourcesProvider()'.\n+It will be removed at the end of 2019.\n+For more information, see https://d.android.com/r/tools/task-configuration-avoidance.\n+To determine what is calling variantOutput.getProcessResources(), use -Pandroid.debug.obsoleteApi=true on the command line to display more information.\n+WARNING: API 'variantOutput.getProcessManifest()' is obsolete and has been replaced with 'variantOutput.getProcessManifestProvider()'.\n+It will be removed at the end of 2019.\n+For more information, see https://d.android.com/r/tools/task-configuration-avoidance.\n+To determine what is calling variantOutput.getProcessManifest(), use -Pandroid.debug.obsoleteApi=true on the command line to display more information.\n+WARNING: API 'variant.getMergeResources()' is obsolete and has been replaced with 'variant.getMergeResourcesProvider()'.\n+It will be removed at the end of 2019.\n+For more information, see https://d.android.com/r/tools/task-configuration-avoidance.\n+To determine what is calling variant.getMergeResources(), use -Pandroid.debug.obsoleteApi=true on the command line to display more information.\n+WARNING: API 'variant.getMergeAssets()' is obsolete and has been replaced with 'variant.getMergeAssetsProvider()'.\n+It will be removed at the end of 2019.\n+For more information, see https://d.android.com/r/tools/task-configuration-avoidance.\n+To determine what is calling variant.getMergeAssets(), use -Pandroid.debug.obsoleteApi=true on the command line to display more information.\n+WARNING: API 'variant.getPackageApplication()' is obsolete and has been replaced with 'variant.getPackageApplicationProvider()'.\n+It will be removed at the end of 2019.\n+For more information, see https://d.android.com/r/tools/task-configuration-avoidance.\n+To determine what is calling variant.getPackageApplication(), use -Pandroid.debug.obsoleteApi=true on the command line to display more information.\n+WARNING: API 'variant.getExternalNativeBuildTasks()' is obsolete and has been replaced with 'variant.getExternalNativeBuildProviders()'.\n+It will be removed at the end of 2019.\n+For more information, see https://d.android.com/r/tools/task-configuration-avoidance.\n+To determine what is calling variant.getExternalNativeBuildTasks(), use -Pandroid.debug.obsoleteApi=true on the command line to display more information.\n+\n+> Task :checkBintrayStableVersionsTask\n+latest release version = 0.4.0\n+\n+for easyadapter checkoutTag = 0.4.0\n+SUCCESS: latest bintray version=1.0.0 for easyadapter is stable\n+\n+________________________________________________________________\n+for rx-extension checkoutTag = 0.4.0\n+SUCCESS: latest bintray version=0.4.0 for rx-extension is stable\n+\n+________________________________________________________________\n+for activity-holder checkoutTag = activity-holder/0.4.0\n+SUCCESS: latest bintray version=0.4.0 for activity-holder is stable\n+\n+________________________________________________________________\n+for logger checkoutTag = 0.4.0\n+SUCCESS: latest bintray version=0.4.0 for logger is stable\n+\n+________________________________________________________________\n+for animations checkoutTag = 0.4.0\n+SUCCESS: latest bintray version=0.4.0 for animations is stable\n+\n+________________________________________________________________\n+for util-ktx checkoutTag = 0.4.0\n+SUCCESS: latest bintray version=0.4.0 for util-ktx is stable\n+\n+________________________________________________________________\n+for core-ui checkoutTag = 0.4.0\n+SUCCESS: latest bintray version=0.4.0 for core-ui is stable\n+\n+________________________________________________________________\n+for broadcast-extension checkoutTag = 0.4.0\n+SUCCESS: latest bintray version=0.4.0 for broadcast-extension is stable\n+\n+________________________________________________________________\n+for connection checkoutTag = 0.4.0\n+SUCCESS: latest bintray version=0.4.0 for connection is stable\n+\n+________________________________________________________________\n+for filestorage checkoutTag = 0.4.0\n+SUCCESS: latest bintray version=0.4.0 for filestorage is stable\n+\n+________________________________________________________________\n+for core-app checkoutTag = 0.4.0\n+SUCCESS: latest bintray version=0.4.0 for core-app is stable\n+\n+________________________________________________________________\n+for datalist-page-count checkoutTag = 0.4.0\n+NOT FOUND: Bintray contains a new artifact datalist-page-count which is not found for tag 0.4.0\n+\n+________________________________________________________________\n+for datalist-limit-offset checkoutTag = 0.4.0\n+NOT FOUND: Bintray contains a new artifact datalist-limit-offset which is not found for tag 0.4.0\n+\n+________________________________________________________________\n+for dagger-scope checkoutTag = 0.4.0\n+SUCCESS: latest bintray version=0.4.0 for dagger-scope is stable\n+\n+________________________________________________________________\n+for shared-pref checkoutTag = 0.4.0\n+SUCCESS: latest bintray version=0.4.0 for shared-pref is stable\n+\n+________________________________________________________________\n+for network checkoutTag = 0.4.0\n+SUCCESS: latest bintray version=0.4.0 for network is stable\n+\n+________________________________________________________________\n+for converter-gson checkoutTag = 0.4.0\n+SUCCESS: latest bintray version=0.4.0 for converter-gson is stable\n+\n+________________________________________________________________\n+for core-mvp checkoutTag = 0.4.0\n+NOT FOUND: Bintray contains a new artifact core-mvp which is not found for tag 0.4.0\n+\n+________________________________________________________________\n+for mvp-widget checkoutTag = 0.4.0\n+NOT FOUND: Bintray contains a new artifact mvp-widget which is not found for tag 0.4.0\n+\n+________________________________________________________________\n+for mvp-dialog checkoutTag = 0.4.0\n+NOT FOUND: Bintray contains a new artifact mvp-dialog which is not found for tag 0.4.0\n+\n+________________________________________________________________\n+for core-mvp-binding checkoutTag = 0.4.0\n+SUCCESS: latest bintray version=0.4.0 for core-mvp-binding is stable\n+\n+________________________________________________________________\n+for core-mvi checkoutTag = 0.4.0\n+SUCCESS: latest bintray version=0.4.0 for core-mvi is stable\n+\n+________________________________________________________________\n+for custom-view checkoutTag = 0.4.0\n+SUCCESS: latest bintray version=0.4.0 for custom-view is stable\n+\n+________________________________________________________________\n+for imageloader checkoutTag = 0.4.0\n+SUCCESS: latest bintray version=0.4.0 for imageloader is stable\n+\n+________________________________________________________________\n+for location checkoutTag = 0.4.0\n+SUCCESS: latest bintray version=0.4.0 for location is stable\n+\n+________________________________________________________________\n+for message-controller checkoutTag = 0.4.0\n+SUCCESS: latest bintray version=0.4.0 for message-controller is stable\n+\n+________________________________________________________________\n+for picture-provider checkoutTag = 0.4.0\n+SUCCESS: latest bintray version=0.4.0 for picture-provider is stable\n+\n+________________________________________________________________\n+for push checkoutTag = 0.4.0\n+SUCCESS: latest bintray version=0.4.0 for push is stable\n+\n+________________________________________________________________\n+for recycler-extension checkoutTag = 0.4.0\n+SUCCESS: latest bintray version=0.4.0 for recycler-extension is stable\n+\n+________________________________________________________________\n+for standard-dialog checkoutTag = 0.4.0\n+SUCCESS: latest bintray version=0.4.0 for standard-dialog is stable\n+\n+________________________________________________________________\n+for analytics checkoutTag = 0.4.0\n+SUCCESS: latest bintray version=0.4.0 for analytics is stable\n+\n+________________________________________________________________\n+for firebase-analytics checkoutTag = 0.4.0\n+NOT FOUND: Bintray contains a new artifact firebase-analytics which is not found for tag 0.4.0\n+\n+________________________________________________________________\n+for app-migration checkoutTag = 0.4.0\n+SUCCESS: latest bintray version=0.4.0 for app-migration is stable\n+\n+________________________________________________________________\n+for mvi-core checkoutTag = 0.4.0\n+NOT FOUND: Bintray contains a new artifact mvi-core which is not found for tag 0.4.0\n+\n+________________________________________________________________\n+for mvi-impls checkoutTag = 0.4.0\n+NOT FOUND: Bintray contains a new artifact mvi-impls which is not found for tag 0.4.0\n+\n+________________________________________________________________\n+for rxbus checkoutTag = 0.4.0\n+SUCCESS: latest bintray version=0.4.0 for rxbus is stable\n+\n+________________________________________________________________\n+WARNING! Released artifact easyadapter must have a release tag \"easyadapter/1.0.0\"\n+WARNING! Released artifact rx-extension must have a release tag \"rx-extension/0.4.0\"\n+WARNING! Released artifact logger must have a release tag \"logger/0.4.0\"\n+WARNING! Released artifact animations must have a release tag \"animations/0.4.0\"\n+WARNING! Released artifact util-ktx must have a release tag \"util-ktx/0.4.0\"\n+WARNING! Released artifact core-ui must have a release tag \"core-ui/0.4.0\"\n+WARNING! Released artifact broadcast-extension must have a release tag \"broadcast-extension/0.4.0\"\n+WARNING! Released artifact connection must have a release tag \"connection/0.4.0\"\n+WARNING! Released artifact filestorage must have a release tag \"filestorage/0.4.0\"\n+WARNING! Released artifact core-app must have a release tag \"core-app/0.4.0\"\n+WARNING! Released artifact dagger-scope must have a release tag \"dagger-scope/0.4.0\"\n+WARNING! Released artifact shared-pref must have a release tag \"shared-pref/0.4.0\"\n+WARNING! Released artifact network must have a release tag \"network/0.4.0\"\n+WARNING! Released artifact converter-gson must have a release tag \"converter-gson/0.4.0\"\n+WARNING! Released artifact core-mvp-binding must have a release tag \"core-mvp-binding/0.4.0\"\n+WARNING! Released artifact core-mvi must have a release tag \"core-mvi/0.4.0\"\n+WARNING! Released artifact custom-view must have a release tag \"custom-view/0.4.0\"\n+WARNING! Released artifact imageloader must have a release tag \"imageloader/0.4.0\"\n+WARNING! Released artifact location must have a release tag \"location/0.4.0\"\n+WARNING! Released artifact message-controller must have a release tag \"message-controller/0.4.0\"\n+WARNING! Released artifact picture-provider must have a release tag \"picture-provider/0.4.0\"\n+WARNING! Released artifact push must have a release tag \"push/0.4.0\"\n+WARNING! Released artifact recycler-extension must have a release tag \"recycler-extension/0.4.0\"\n+WARNING! Released artifact standard-dialog must have a release tag \"standard-dialog/0.4.0\"\n+WARNING! Released artifact analytics must have a release tag \"analytics/0.4.0\"\n+WARNING! Released artifact app-migration must have a release tag \"app-migration/0.4.0\"\n+WARNING! Released artifact rxbus must have a release tag \"rxbus/0.4.0\"\n+\n+\n+BUILD SUCCESSFUL in 1m 19s\n+1 actionable task: 1 executed\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": "@@ -32,6 +32,12 @@ object Components {\nvalue = componentJsons.map(ComponentJson::transform)\n}\n+ /**\n+ * Function for parsing a single component from list\n+ */\n+ fun parseComponent(componentJsons: List<ComponentJson>, componentName: String): Component? =\n+ componentJsons.firstOrNull { it.id == componentName }?.transform()\n+\n/**\n* Get project's module\n*/\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/bintray_tasks/CheckBintrayStableVersionsTask.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/bintray_tasks/CheckBintrayStableVersionsTask.kt",
"diff": "@@ -25,9 +25,6 @@ private const val GET_CURRENT_BRANCH_NAME_COMMAND = \"git rev-parse --abbrev-ref\n/**\n* Check if all artifacts in bintray have stable version as latest.\n- *\n- * WARNING! The task overrides [Components.value] using old components versions from git history.\n- * Components must be initialized with actual values after this task, if needed.\n*/\nopen class CheckBintrayStableVersionsTask : DefaultTask() {\n@@ -63,11 +60,9 @@ open class CheckBintrayStableVersionsTask : DefaultTask() {\n// get stable version of the artifact for common tag\nCommandLineRunner.runCommandWithResult(\"$CHECKOUT_TAG_COMMAND/$checkoutTag\", workingDir)\nval jsonComponents = JsonHelper.parseComponentsJson(\"$currentDirectory/$COMPONENTS_JSON_FILE_PATH\")\n- Components.init(jsonComponents)\n+ val component = Components.parseComponent(jsonComponents, packageName)\nCommandLineRunner.runCommandWithResult(\"$CHECKOUT_COMMAND $currentBranch\", workingDir)\n- Components.value\n- .firstOrNull { it.name == packageName }\n- ?.baseVersion\n+ component?.baseVersion\n}\nval bintrayVersion = Bintray.getArtifactLatestVersion(packageName).name\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-976 Add function for parsing components optimization |
652,312 | 19.03.2020 17:11:28 | -10,800 | f9831608c80f173d624687afb1cbb8bd02231f8f | Add CheckTagsForReleaseArtifactsTask | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/buildTasks.gradle",
"new_path": "buildSrc/buildTasks.gradle",
"diff": "@@ -2,6 +2,7 @@ import ru.surfstudio.android.build.Components\nimport ru.surfstudio.android.build.tasks.*\nimport ru.surfstudio.android.build.tasks.artifactory_tasks.*\nimport ru.surfstudio.android.build.tasks.bintray_tasks.*\n+import ru.surfstudio.android.build.tasks.bintray_tasks.release.*\nimport ru.surfstudio.android.build.tasks.check_stable_artifacts_exist_in_repositories.*\nimport ru.surfstudio.android.build.tasks.check_dependencies_stable.*\nimport ru.surfstudio.android.build.tasks.check_release_notes.*\n@@ -88,3 +89,5 @@ task generateReleaseNotesDiff(type: GenerateReleaseNotesDiffTask) // helper\ntask writeToFileReleaseNotesDiff(type: WriteToFileReleaseNotesDiff)\ntask checkBintrayStableVersionsTask(type: CheckBintrayStableVersionsTask)\n+\n+task checkTagsForReleaseArtifactsTask(type: CheckTagsForReleaseArtifactsTask)\n\\ No newline at end of file\n"
},
{
"change_type": "RENAME",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/bintray_tasks/CheckBintrayStableVersionsTask.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/bintray_tasks/release/CheckBintrayStableVersionsTask.kt",
"diff": "-package ru.surfstudio.android.build.tasks.bintray_tasks\n+package ru.surfstudio.android.build.tasks.bintray_tasks.release\nimport org.gradle.api.DefaultTask\nimport org.gradle.api.GradleException\n@@ -42,8 +42,7 @@ open class CheckBintrayStableVersionsTask : DefaultTask() {\nval allTags = CommandLineRunner.runCommandWithResult(GET_ALL_TAGS_COMMAND, workingDir)\n?.split(\"\\n\")\n- val errorSb = StringBuilder()\n- val tagWarningSb = StringBuilder()\n+ val sb = StringBuilder()\nallTags?.also { safeAllTags ->\nBintray.getAllPackages().forEach { packageName ->\n@@ -65,8 +64,6 @@ open class CheckBintrayStableVersionsTask : DefaultTask() {\ncomponent?.baseVersion\n}\n- val bintrayVersion = Bintray.getArtifactLatestVersion(packageName).name\n-\nif (stableVersion != null) {\n// fail to parse the artifact's release tag\nif (stableVersion.isEmpty()) {\n@@ -75,18 +72,11 @@ open class CheckBintrayStableVersionsTask : DefaultTask() {\n)\n}\n- // the artifact's release tag is not found, the common tag will be used\n- if (!isCheckoutTagForArtifact) {\n- tagWarningSb.append(\n- \"WARNING! Released artifact $packageName must have \" +\n- \"a release tag \\\"$packageName/$stableVersion\\\"\\n\"\n- )\n- }\n-\n+ val bintrayVersion = Bintray.getArtifactLatestVersion(packageName).name\nif (stableVersion != bintrayVersion) {\nval errorMessage = \"latest bintray version=$bintrayVersion for $packageName \" +\n\"is not stable=$stableVersion\"\n- errorSb.append(\"$errorMessage\\n\")\n+ sb.append(\"$errorMessage\\n\")\nprintln(\"ERROR: $errorMessage\\n\")\n} else {\nprintln(\"SUCCESS: latest bintray version=$bintrayVersion for $packageName is stable\\n\")\n@@ -100,13 +90,7 @@ open class CheckBintrayStableVersionsTask : DefaultTask() {\n} // Bintray.getAllPackages().forEach\n} // safeAllTags\n- with(tagWarningSb.toString()) {\n- if (isNotEmpty()) {\n- println(this)\n- }\n- }\n-\n- with(errorSb.toString()) {\n+ with(sb.toString()) {\nif (isNotEmpty()) {\nthrow GradleException(this)\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/bintray_tasks/release/CheckTagsForReleaseArtifactsTask.kt",
"diff": "+package ru.surfstudio.android.build.tasks.bintray_tasks.release\n+\n+import org.gradle.api.DefaultTask\n+import org.gradle.api.GradleException\n+import org.gradle.api.tasks.TaskAction\n+import ru.surfstudio.android.build.Components\n+import ru.surfstudio.android.build.bintray.Bintray\n+import ru.surfstudio.android.build.tasks.changed_components.CommandLineRunner\n+import ru.surfstudio.android.build.utils.COMPONENTS_JSON_FILE_PATH\n+import ru.surfstudio.android.build.utils.JsonHelper\n+import java.io.File\n+\n+private val currentDirectory: String = System.getProperty(\"user.dir\")\n+private const val LINE = \"________________________________________________________________\"\n+\n+//region commands\n+private const val GET_ALL_TAGS_COMMAND = \"git tag --list\"\n+private const val GET_LATEST_TAG_COMMAND = \"git describe --tags\" //http://bit.ly/2QlsLbo\n+private const val GET_LATEST_TAG_HASH_COMMAND = \"git rev-list --tags --max-count=1\"\n+private const val CHECKOUT_COMMAND = \"git checkout\"\n+private const val CHECKOUT_TAG_COMMAND = \"$CHECKOUT_COMMAND tags\"\n+private const val GET_CURRENT_BRANCH_NAME_COMMAND = \"git rev-parse --abbrev-ref HEAD\"\n+//endregion\n+\n+/**\n+ * Check if all release artifacts have a tag with format ARTIFACT-NAME/STABLE-VERSION\n+ */\n+open class CheckTagsForReleaseArtifactsTask : DefaultTask() {\n+\n+ @TaskAction\n+ fun check() {\n+ val workingDir = File(currentDirectory)\n+ val latestTagHash = CommandLineRunner.runCommandWithResult(GET_LATEST_TAG_HASH_COMMAND, workingDir)\n+ val latestTag = CommandLineRunner.runCommandWithResult(\n+ \"$GET_LATEST_TAG_COMMAND $latestTagHash\",\n+ workingDir\n+ )?.trim()\n+ val currentBranch = CommandLineRunner.runCommandWithResult(GET_CURRENT_BRANCH_NAME_COMMAND, workingDir)\n+ println(\"latest release version = $latestTag\\n\")\n+\n+ val allTags = CommandLineRunner.runCommandWithResult(GET_ALL_TAGS_COMMAND, workingDir)\n+ ?.split(\"\\n\")\n+\n+ val sb = StringBuilder()\n+\n+ allTags?.also { safeAllTags ->\n+ Bintray.getAllPackages().forEach { packageName ->\n+ // find release tag for artifact\n+ val checkoutTag = safeAllTags.firstOrNull { it.startsWith(packageName) } ?: latestTag\n+ if (checkoutTag != null) {\n+ val isCheckoutTagForArtifact = checkoutTag.startsWith(packageName)\n+ println(\"for $packageName checkoutTag = $checkoutTag\")\n+\n+ val stableVersion = if (isCheckoutTagForArtifact) {\n+ // get stable version from the artifact's release tag\n+ checkoutTag.split(\"/\").last()\n+ } else {\n+ // get stable version of the artifact for common tag\n+ CommandLineRunner.runCommandWithResult(\"$CHECKOUT_TAG_COMMAND/$checkoutTag\", workingDir)\n+ val jsonComponents = JsonHelper.parseComponentsJson(\"$currentDirectory/$COMPONENTS_JSON_FILE_PATH\")\n+ val component = Components.parseComponent(jsonComponents, packageName)\n+ CommandLineRunner.runCommandWithResult(\"$CHECKOUT_COMMAND $currentBranch\", workingDir)\n+ component?.baseVersion\n+ }\n+\n+ if (stableVersion != null) {\n+ // fail to parse the artifact's release tag\n+ if (stableVersion.isEmpty()) {\n+ throw GradleException(\"Invalid release tag format for $checkoutTag, \" +\n+ \"must be \\\"$packageName/STABLE-VERSION\\\"\"\n+ )\n+ }\n+\n+ // the artifact's release tag is not found, the common tag will be used\n+ if (!isCheckoutTagForArtifact) {\n+ sb.append(\n+ \"WARNING! Released artifact $packageName must have \" +\n+ \"a release tag \\\"$packageName/$stableVersion\\\"\\n\"\n+ )\n+ }\n+ } else {\n+ println(\"NOT FOUND: Bintray contains a new artifact $packageName \" +\n+ \"which is not found for tag $checkoutTag\\n\")\n+ }\n+ println(LINE)\n+ }\n+ } // Bintray.getAllPackages().forEach\n+ } // safeAllTags\n+\n+ with(sb.toString()) {\n+ if (isNotEmpty()) {\n+ throw GradleException(this)\n+ }\n+ }\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "release-tags-check.sh",
"diff": "+./gradlew checkTagsForReleaseArtifactsTask\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-976 Add CheckTagsForReleaseArtifactsTask |
652,312 | 19.03.2020 17:32:41 | -10,800 | 14fdad9c004e86a4df3fd12feb1176de24b3483f | Refactoring tasks for release bintray checks | [
{
"change_type": "DELETE",
"old_path": "bintray-check",
"new_path": null,
"diff": "-> Task :buildSrc:compileKotlin UP-TO-DATE\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 UP-TO-DATE\n-> Task :buildSrc:jar UP-TO-DATE\n-> Task :buildSrc:assemble UP-TO-DATE\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 UP-TO-DATE\n-Remote build cache DISABLED. Need specify 'GRADLE_BUILD_CACHE_USER' and 'GRADLE_BUILD_CACHE_PASS' global variables\n-\n-> Configure project :analytics-sample\n-WARNING: API 'variant.getAssemble()' is obsolete and has been replaced with 'variant.getAssembleProvider()'.\n-It will be removed at the end of 2019.\n-For more information, see https://d.android.com/r/tools/task-configuration-avoidance.\n-To determine what is calling variant.getAssemble(), use -Pandroid.debug.obsoleteApi=true on the command line to display more information.\n-WARNING: API 'variantOutput.getProcessResources()' is obsolete and has been replaced with 'variantOutput.getProcessResourcesProvider()'.\n-It will be removed at the end of 2019.\n-For more information, see https://d.android.com/r/tools/task-configuration-avoidance.\n-To determine what is calling variantOutput.getProcessResources(), use -Pandroid.debug.obsoleteApi=true on the command line to display more information.\n-WARNING: API 'variantOutput.getProcessManifest()' is obsolete and has been replaced with 'variantOutput.getProcessManifestProvider()'.\n-It will be removed at the end of 2019.\n-For more information, see https://d.android.com/r/tools/task-configuration-avoidance.\n-To determine what is calling variantOutput.getProcessManifest(), use -Pandroid.debug.obsoleteApi=true on the command line to display more information.\n-WARNING: API 'variant.getMergeResources()' is obsolete and has been replaced with 'variant.getMergeResourcesProvider()'.\n-It will be removed at the end of 2019.\n-For more information, see https://d.android.com/r/tools/task-configuration-avoidance.\n-To determine what is calling variant.getMergeResources(), use -Pandroid.debug.obsoleteApi=true on the command line to display more information.\n-WARNING: API 'variant.getMergeAssets()' is obsolete and has been replaced with 'variant.getMergeAssetsProvider()'.\n-It will be removed at the end of 2019.\n-For more information, see https://d.android.com/r/tools/task-configuration-avoidance.\n-To determine what is calling variant.getMergeAssets(), use -Pandroid.debug.obsoleteApi=true on the command line to display more information.\n-WARNING: API 'variant.getPackageApplication()' is obsolete and has been replaced with 'variant.getPackageApplicationProvider()'.\n-It will be removed at the end of 2019.\n-For more information, see https://d.android.com/r/tools/task-configuration-avoidance.\n-To determine what is calling variant.getPackageApplication(), use -Pandroid.debug.obsoleteApi=true on the command line to display more information.\n-WARNING: API 'variant.getExternalNativeBuildTasks()' is obsolete and has been replaced with 'variant.getExternalNativeBuildProviders()'.\n-It will be removed at the end of 2019.\n-For more information, see https://d.android.com/r/tools/task-configuration-avoidance.\n-To determine what is calling variant.getExternalNativeBuildTasks(), use -Pandroid.debug.obsoleteApi=true on the command line to display more information.\n-\n-> Task :checkBintrayStableVersionsTask\n-latest release version = 0.4.0\n-\n-for easyadapter checkoutTag = 0.4.0\n-SUCCESS: latest bintray version=1.0.0 for easyadapter is stable\n-\n-________________________________________________________________\n-for rx-extension checkoutTag = 0.4.0\n-SUCCESS: latest bintray version=0.4.0 for rx-extension is stable\n-\n-________________________________________________________________\n-for activity-holder checkoutTag = activity-holder/0.4.0\n-SUCCESS: latest bintray version=0.4.0 for activity-holder is stable\n-\n-________________________________________________________________\n-for logger checkoutTag = 0.4.0\n-SUCCESS: latest bintray version=0.4.0 for logger is stable\n-\n-________________________________________________________________\n-for animations checkoutTag = 0.4.0\n-SUCCESS: latest bintray version=0.4.0 for animations is stable\n-\n-________________________________________________________________\n-for util-ktx checkoutTag = 0.4.0\n-SUCCESS: latest bintray version=0.4.0 for util-ktx is stable\n-\n-________________________________________________________________\n-for core-ui checkoutTag = 0.4.0\n-SUCCESS: latest bintray version=0.4.0 for core-ui is stable\n-\n-________________________________________________________________\n-for broadcast-extension checkoutTag = 0.4.0\n-SUCCESS: latest bintray version=0.4.0 for broadcast-extension is stable\n-\n-________________________________________________________________\n-for connection checkoutTag = 0.4.0\n-SUCCESS: latest bintray version=0.4.0 for connection is stable\n-\n-________________________________________________________________\n-for filestorage checkoutTag = 0.4.0\n-SUCCESS: latest bintray version=0.4.0 for filestorage is stable\n-\n-________________________________________________________________\n-for core-app checkoutTag = 0.4.0\n-SUCCESS: latest bintray version=0.4.0 for core-app is stable\n-\n-________________________________________________________________\n-for datalist-page-count checkoutTag = 0.4.0\n-NOT FOUND: Bintray contains a new artifact datalist-page-count which is not found for tag 0.4.0\n-\n-________________________________________________________________\n-for datalist-limit-offset checkoutTag = 0.4.0\n-NOT FOUND: Bintray contains a new artifact datalist-limit-offset which is not found for tag 0.4.0\n-\n-________________________________________________________________\n-for dagger-scope checkoutTag = 0.4.0\n-SUCCESS: latest bintray version=0.4.0 for dagger-scope is stable\n-\n-________________________________________________________________\n-for shared-pref checkoutTag = 0.4.0\n-SUCCESS: latest bintray version=0.4.0 for shared-pref is stable\n-\n-________________________________________________________________\n-for network checkoutTag = 0.4.0\n-SUCCESS: latest bintray version=0.4.0 for network is stable\n-\n-________________________________________________________________\n-for converter-gson checkoutTag = 0.4.0\n-SUCCESS: latest bintray version=0.4.0 for converter-gson is stable\n-\n-________________________________________________________________\n-for core-mvp checkoutTag = 0.4.0\n-NOT FOUND: Bintray contains a new artifact core-mvp which is not found for tag 0.4.0\n-\n-________________________________________________________________\n-for mvp-widget checkoutTag = 0.4.0\n-NOT FOUND: Bintray contains a new artifact mvp-widget which is not found for tag 0.4.0\n-\n-________________________________________________________________\n-for mvp-dialog checkoutTag = 0.4.0\n-NOT FOUND: Bintray contains a new artifact mvp-dialog which is not found for tag 0.4.0\n-\n-________________________________________________________________\n-for core-mvp-binding checkoutTag = 0.4.0\n-SUCCESS: latest bintray version=0.4.0 for core-mvp-binding is stable\n-\n-________________________________________________________________\n-for core-mvi checkoutTag = 0.4.0\n-SUCCESS: latest bintray version=0.4.0 for core-mvi is stable\n-\n-________________________________________________________________\n-for custom-view checkoutTag = 0.4.0\n-SUCCESS: latest bintray version=0.4.0 for custom-view is stable\n-\n-________________________________________________________________\n-for imageloader checkoutTag = 0.4.0\n-SUCCESS: latest bintray version=0.4.0 for imageloader is stable\n-\n-________________________________________________________________\n-for location checkoutTag = 0.4.0\n-SUCCESS: latest bintray version=0.4.0 for location is stable\n-\n-________________________________________________________________\n-for message-controller checkoutTag = 0.4.0\n-SUCCESS: latest bintray version=0.4.0 for message-controller is stable\n-\n-________________________________________________________________\n-for picture-provider checkoutTag = 0.4.0\n-SUCCESS: latest bintray version=0.4.0 for picture-provider is stable\n-\n-________________________________________________________________\n-for push checkoutTag = 0.4.0\n-SUCCESS: latest bintray version=0.4.0 for push is stable\n-\n-________________________________________________________________\n-for recycler-extension checkoutTag = 0.4.0\n-SUCCESS: latest bintray version=0.4.0 for recycler-extension is stable\n-\n-________________________________________________________________\n-for standard-dialog checkoutTag = 0.4.0\n-SUCCESS: latest bintray version=0.4.0 for standard-dialog is stable\n-\n-________________________________________________________________\n-for analytics checkoutTag = 0.4.0\n-SUCCESS: latest bintray version=0.4.0 for analytics is stable\n-\n-________________________________________________________________\n-for firebase-analytics checkoutTag = 0.4.0\n-NOT FOUND: Bintray contains a new artifact firebase-analytics which is not found for tag 0.4.0\n-\n-________________________________________________________________\n-for app-migration checkoutTag = 0.4.0\n-SUCCESS: latest bintray version=0.4.0 for app-migration is stable\n-\n-________________________________________________________________\n-for mvi-core checkoutTag = 0.4.0\n-NOT FOUND: Bintray contains a new artifact mvi-core which is not found for tag 0.4.0\n-\n-________________________________________________________________\n-for mvi-impls checkoutTag = 0.4.0\n-NOT FOUND: Bintray contains a new artifact mvi-impls which is not found for tag 0.4.0\n-\n-________________________________________________________________\n-for rxbus checkoutTag = 0.4.0\n-SUCCESS: latest bintray version=0.4.0 for rxbus is stable\n-\n-________________________________________________________________\n-WARNING! Released artifact easyadapter must have a release tag \"easyadapter/1.0.0\"\n-WARNING! Released artifact rx-extension must have a release tag \"rx-extension/0.4.0\"\n-WARNING! Released artifact logger must have a release tag \"logger/0.4.0\"\n-WARNING! Released artifact animations must have a release tag \"animations/0.4.0\"\n-WARNING! Released artifact util-ktx must have a release tag \"util-ktx/0.4.0\"\n-WARNING! Released artifact core-ui must have a release tag \"core-ui/0.4.0\"\n-WARNING! Released artifact broadcast-extension must have a release tag \"broadcast-extension/0.4.0\"\n-WARNING! Released artifact connection must have a release tag \"connection/0.4.0\"\n-WARNING! Released artifact filestorage must have a release tag \"filestorage/0.4.0\"\n-WARNING! Released artifact core-app must have a release tag \"core-app/0.4.0\"\n-WARNING! Released artifact dagger-scope must have a release tag \"dagger-scope/0.4.0\"\n-WARNING! Released artifact shared-pref must have a release tag \"shared-pref/0.4.0\"\n-WARNING! Released artifact network must have a release tag \"network/0.4.0\"\n-WARNING! Released artifact converter-gson must have a release tag \"converter-gson/0.4.0\"\n-WARNING! Released artifact core-mvp-binding must have a release tag \"core-mvp-binding/0.4.0\"\n-WARNING! Released artifact core-mvi must have a release tag \"core-mvi/0.4.0\"\n-WARNING! Released artifact custom-view must have a release tag \"custom-view/0.4.0\"\n-WARNING! Released artifact imageloader must have a release tag \"imageloader/0.4.0\"\n-WARNING! Released artifact location must have a release tag \"location/0.4.0\"\n-WARNING! Released artifact message-controller must have a release tag \"message-controller/0.4.0\"\n-WARNING! Released artifact picture-provider must have a release tag \"picture-provider/0.4.0\"\n-WARNING! Released artifact push must have a release tag \"push/0.4.0\"\n-WARNING! Released artifact recycler-extension must have a release tag \"recycler-extension/0.4.0\"\n-WARNING! Released artifact standard-dialog must have a release tag \"standard-dialog/0.4.0\"\n-WARNING! Released artifact analytics must have a release tag \"analytics/0.4.0\"\n-WARNING! Released artifact app-migration must have a release tag \"app-migration/0.4.0\"\n-WARNING! Released artifact rxbus must have a release tag \"rxbus/0.4.0\"\n-\n-\n-BUILD SUCCESSFUL in 1m 19s\n-1 actionable task: 1 executed\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/bintray_tasks/release/BaseCheckBintrayForReleaseTask.kt",
"diff": "+package ru.surfstudio.android.build.tasks.bintray_tasks.release\n+\n+import org.gradle.api.DefaultTask\n+import org.gradle.api.GradleException\n+import org.gradle.api.tasks.TaskAction\n+import ru.surfstudio.android.build.Components\n+import ru.surfstudio.android.build.bintray.Bintray\n+import ru.surfstudio.android.build.tasks.changed_components.CommandLineRunner\n+import ru.surfstudio.android.build.utils.COMPONENTS_JSON_FILE_PATH\n+import ru.surfstudio.android.build.utils.JsonHelper\n+import java.io.File\n+\n+private val currentDirectory: String = System.getProperty(\"user.dir\")\n+private const val LINE = \"________________________________________________________________\"\n+\n+//region commands\n+private const val GET_ALL_TAGS_COMMAND = \"git tag --list\"\n+private const val GET_LATEST_TAG_COMMAND = \"git describe --tags\" //http://bit.ly/2QlsLbo\n+private const val GET_LATEST_TAG_HASH_COMMAND = \"git rev-list --tags --max-count=1\"\n+private const val CHECKOUT_COMMAND = \"git checkout\"\n+private const val CHECKOUT_TAG_COMMAND = \"$CHECKOUT_COMMAND tags\"\n+private const val GET_CURRENT_BRANCH_NAME_COMMAND = \"git rev-parse --abbrev-ref HEAD\"\n+//endregion\n+\n+/**\n+ * Base class for tasks of checking Bintray for release artifacts\n+ */\n+abstract class BaseCheckBintrayForReleaseTask : DefaultTask() {\n+\n+ protected val sb = StringBuilder()\n+\n+ @TaskAction\n+ fun check() {\n+ val workingDir = File(currentDirectory)\n+ val latestTagHash = CommandLineRunner.runCommandWithResult(GET_LATEST_TAG_HASH_COMMAND, workingDir)\n+ val latestTag = CommandLineRunner.runCommandWithResult(\n+ \"$GET_LATEST_TAG_COMMAND $latestTagHash\",\n+ workingDir\n+ )?.trim()\n+ val currentBranch = CommandLineRunner.runCommandWithResult(GET_CURRENT_BRANCH_NAME_COMMAND, workingDir)\n+ println(\"latest release version = $latestTag\\n\")\n+\n+ val allTags = CommandLineRunner.runCommandWithResult(GET_ALL_TAGS_COMMAND, workingDir)\n+ ?.split(\"\\n\")\n+\n+ allTags?.also { safeAllTags ->\n+ Bintray.getAllPackages().forEach { packageName ->\n+ // find release tag for artifact\n+ val checkoutTag = safeAllTags.firstOrNull { it.startsWith(packageName) } ?: latestTag\n+ if (checkoutTag != null) {\n+ val isCheckoutTagForArtifact = checkoutTag.startsWith(packageName)\n+ println(\"for $packageName checkoutTag = $checkoutTag\")\n+\n+ val stableVersion = if (isCheckoutTagForArtifact) {\n+ // get stable version from the artifact's release tag\n+ checkoutTag.split(\"/\").last()\n+ } else {\n+ // get stable version of the artifact for common tag\n+ CommandLineRunner.runCommandWithResult(\"$CHECKOUT_TAG_COMMAND/$checkoutTag\", workingDir)\n+ val jsonComponents = JsonHelper.parseComponentsJson(\"$currentDirectory/$COMPONENTS_JSON_FILE_PATH\")\n+ val component = Components.parseComponent(jsonComponents, packageName)\n+ CommandLineRunner.runCommandWithResult(\"$CHECKOUT_COMMAND $currentBranch\", workingDir)\n+ component?.baseVersion\n+ }\n+\n+ if (stableVersion != null) {\n+ // fail to parse the artifact's release tag\n+ if (stableVersion.isEmpty()) {\n+ throw GradleException(\"Invalid release tag format for $checkoutTag, \" +\n+ \"must be \\\"$packageName/STABLE-VERSION\\\"\"\n+ )\n+ }\n+\n+ performCheck(packageName, stableVersion, isCheckoutTagForArtifact)\n+ } else {\n+ println(\"NOT FOUND: Bintray contains a new artifact $packageName \" +\n+ \"which is not found for tag $checkoutTag\\n\")\n+ }\n+ println(LINE)\n+ }\n+ } // Bintray.getAllPackages().forEach\n+ } // safeAllTags\n+\n+ with(sb.toString()) {\n+ if (isNotEmpty()) {\n+ throw GradleException(this)\n+ }\n+ }\n+ }\n+\n+ /**\n+ * Custom check\n+ *\n+ * @param packageName packageName from Bintray, which equals to component name\n+ * @param stableVersion stableVersion of artifact\n+ * @param isCheckoutTagForArtifact true if for current release artifact was used unique tag\n+ */\n+ abstract fun performCheck(\n+ packageName: String,\n+ stableVersion: String,\n+ isCheckoutTagForArtifact: Boolean\n+ )\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/bintray_tasks/release/CheckBintrayStableVersionsTask.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/bintray_tasks/release/CheckBintrayStableVersionsTask.kt",
"diff": "package ru.surfstudio.android.build.tasks.bintray_tasks.release\n-import org.gradle.api.DefaultTask\n-import org.gradle.api.GradleException\n-import org.gradle.api.tasks.TaskAction\n-import ru.surfstudio.android.build.Components\nimport ru.surfstudio.android.build.bintray.Bintray\n-import ru.surfstudio.android.build.tasks.changed_components.CommandLineRunner\n-import ru.surfstudio.android.build.utils.COMPONENTS_JSON_FILE_PATH\n-import ru.surfstudio.android.build.utils.JsonHelper\n-import java.io.File\n-import java.lang.StringBuilder\n-\n-private val currentDirectory: String = System.getProperty(\"user.dir\")\n-private const val LINE = \"________________________________________________________________\"\n-\n-//region commands\n-private const val GET_ALL_TAGS_COMMAND = \"git tag --list\"\n-private const val GET_LATEST_TAG_COMMAND = \"git describe --tags\" //http://bit.ly/2QlsLbo\n-private const val GET_LATEST_TAG_HASH_COMMAND = \"git rev-list --tags --max-count=1\"\n-private const val CHECKOUT_COMMAND = \"git checkout\"\n-private const val CHECKOUT_TAG_COMMAND = \"$CHECKOUT_COMMAND tags\"\n-private const val GET_CURRENT_BRANCH_NAME_COMMAND = \"git rev-parse --abbrev-ref HEAD\"\n-//endregion\n/**\n* Check if all artifacts in bintray have stable version as latest.\n*/\n-open class CheckBintrayStableVersionsTask : DefaultTask() {\n-\n- @TaskAction\n- fun check() {\n- val workingDir = File(currentDirectory)\n- val latestTagHash = CommandLineRunner.runCommandWithResult(GET_LATEST_TAG_HASH_COMMAND, workingDir)\n- val latestTag = CommandLineRunner.runCommandWithResult(\n- \"$GET_LATEST_TAG_COMMAND $latestTagHash\",\n- workingDir\n- )?.trim()\n- val currentBranch = CommandLineRunner.runCommandWithResult(GET_CURRENT_BRANCH_NAME_COMMAND, workingDir)\n- println(\"latest release version = $latestTag\\n\")\n-\n- val allTags = CommandLineRunner.runCommandWithResult(GET_ALL_TAGS_COMMAND, workingDir)\n- ?.split(\"\\n\")\n-\n- val sb = StringBuilder()\n-\n- allTags?.also { safeAllTags ->\n- Bintray.getAllPackages().forEach { packageName ->\n- // find release tag for artifact\n- val checkoutTag = safeAllTags.firstOrNull { it.startsWith(packageName) } ?: latestTag\n- if (checkoutTag != null) {\n- val isCheckoutTagForArtifact = checkoutTag.startsWith(packageName)\n- println(\"for $packageName checkoutTag = $checkoutTag\")\n-\n- val stableVersion = if (isCheckoutTagForArtifact) {\n- // get stable version from the artifact's release tag\n- checkoutTag.split(\"/\").last()\n- } else {\n- // get stable version of the artifact for common tag\n- CommandLineRunner.runCommandWithResult(\"$CHECKOUT_TAG_COMMAND/$checkoutTag\", workingDir)\n- val jsonComponents = JsonHelper.parseComponentsJson(\"$currentDirectory/$COMPONENTS_JSON_FILE_PATH\")\n- val component = Components.parseComponent(jsonComponents, packageName)\n- CommandLineRunner.runCommandWithResult(\"$CHECKOUT_COMMAND $currentBranch\", workingDir)\n- component?.baseVersion\n- }\n-\n- if (stableVersion != null) {\n- // fail to parse the artifact's release tag\n- if (stableVersion.isEmpty()) {\n- throw GradleException(\"Invalid release tag format for $checkoutTag, \" +\n- \"must be \\\"$packageName/STABLE-VERSION\\\"\"\n- )\n- }\n+open class CheckBintrayStableVersionsTask : BaseCheckBintrayForReleaseTask() {\n+ override fun performCheck(\n+ packageName: String,\n+ stableVersion: String,\n+ isCheckoutTagForArtifact: Boolean\n+ ) {\nval bintrayVersion = Bintray.getArtifactLatestVersion(packageName).name\nif (stableVersion != bintrayVersion) {\nval errorMessage = \"latest bintray version=$bintrayVersion for $packageName \" +\n@@ -81,19 +21,5 @@ open class CheckBintrayStableVersionsTask : DefaultTask() {\n} else {\nprintln(\"SUCCESS: latest bintray version=$bintrayVersion for $packageName is stable\\n\")\n}\n- } else {\n- println(\"NOT FOUND: Bintray contains a new artifact $packageName \" +\n- \"which is not found for tag $checkoutTag\\n\")\n- }\n- println(LINE)\n- }\n- } // Bintray.getAllPackages().forEach\n- } // safeAllTags\n-\n- with(sb.toString()) {\n- if (isNotEmpty()) {\n- throw GradleException(this)\n- }\n- }\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/bintray_tasks/release/CheckTagsForReleaseArtifactsTask.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/bintray_tasks/release/CheckTagsForReleaseArtifactsTask.kt",
"diff": "package ru.surfstudio.android.build.tasks.bintray_tasks.release\n-import org.gradle.api.DefaultTask\n-import org.gradle.api.GradleException\n-import org.gradle.api.tasks.TaskAction\n-import ru.surfstudio.android.build.Components\n-import ru.surfstudio.android.build.bintray.Bintray\n-import ru.surfstudio.android.build.tasks.changed_components.CommandLineRunner\n-import ru.surfstudio.android.build.utils.COMPONENTS_JSON_FILE_PATH\n-import ru.surfstudio.android.build.utils.JsonHelper\n-import java.io.File\n-\n-private val currentDirectory: String = System.getProperty(\"user.dir\")\n-private const val LINE = \"________________________________________________________________\"\n-\n-//region commands\n-private const val GET_ALL_TAGS_COMMAND = \"git tag --list\"\n-private const val GET_LATEST_TAG_COMMAND = \"git describe --tags\" //http://bit.ly/2QlsLbo\n-private const val GET_LATEST_TAG_HASH_COMMAND = \"git rev-list --tags --max-count=1\"\n-private const val CHECKOUT_COMMAND = \"git checkout\"\n-private const val CHECKOUT_TAG_COMMAND = \"$CHECKOUT_COMMAND tags\"\n-private const val GET_CURRENT_BRANCH_NAME_COMMAND = \"git rev-parse --abbrev-ref HEAD\"\n-//endregion\n-\n/**\n* Check if all release artifacts have a tag with format ARTIFACT-NAME/STABLE-VERSION\n*/\n-open class CheckTagsForReleaseArtifactsTask : DefaultTask() {\n-\n- @TaskAction\n- fun check() {\n- val workingDir = File(currentDirectory)\n- val latestTagHash = CommandLineRunner.runCommandWithResult(GET_LATEST_TAG_HASH_COMMAND, workingDir)\n- val latestTag = CommandLineRunner.runCommandWithResult(\n- \"$GET_LATEST_TAG_COMMAND $latestTagHash\",\n- workingDir\n- )?.trim()\n- val currentBranch = CommandLineRunner.runCommandWithResult(GET_CURRENT_BRANCH_NAME_COMMAND, workingDir)\n- println(\"latest release version = $latestTag\\n\")\n-\n- val allTags = CommandLineRunner.runCommandWithResult(GET_ALL_TAGS_COMMAND, workingDir)\n- ?.split(\"\\n\")\n-\n- val sb = StringBuilder()\n-\n- allTags?.also { safeAllTags ->\n- Bintray.getAllPackages().forEach { packageName ->\n- // find release tag for artifact\n- val checkoutTag = safeAllTags.firstOrNull { it.startsWith(packageName) } ?: latestTag\n- if (checkoutTag != null) {\n- val isCheckoutTagForArtifact = checkoutTag.startsWith(packageName)\n- println(\"for $packageName checkoutTag = $checkoutTag\")\n-\n- val stableVersion = if (isCheckoutTagForArtifact) {\n- // get stable version from the artifact's release tag\n- checkoutTag.split(\"/\").last()\n- } else {\n- // get stable version of the artifact for common tag\n- CommandLineRunner.runCommandWithResult(\"$CHECKOUT_TAG_COMMAND/$checkoutTag\", workingDir)\n- val jsonComponents = JsonHelper.parseComponentsJson(\"$currentDirectory/$COMPONENTS_JSON_FILE_PATH\")\n- val component = Components.parseComponent(jsonComponents, packageName)\n- CommandLineRunner.runCommandWithResult(\"$CHECKOUT_COMMAND $currentBranch\", workingDir)\n- component?.baseVersion\n- }\n-\n- if (stableVersion != null) {\n- // fail to parse the artifact's release tag\n- if (stableVersion.isEmpty()) {\n- throw GradleException(\"Invalid release tag format for $checkoutTag, \" +\n- \"must be \\\"$packageName/STABLE-VERSION\\\"\"\n- )\n- }\n+open class CheckTagsForReleaseArtifactsTask : BaseCheckBintrayForReleaseTask() {\n+ override fun performCheck(\n+ packageName: String,\n+ stableVersion: String,\n+ isCheckoutTagForArtifact: Boolean\n+ ) {\n// the artifact's release tag is not found, the common tag will be used\nif (!isCheckoutTagForArtifact) {\nsb.append(\n@@ -78,19 +17,5 @@ open class CheckTagsForReleaseArtifactsTask : DefaultTask() {\n\"a release tag \\\"$packageName/$stableVersion\\\"\\n\"\n)\n}\n- } else {\n- println(\"NOT FOUND: Bintray contains a new artifact $packageName \" +\n- \"which is not found for tag $checkoutTag\\n\")\n- }\n- println(LINE)\n- }\n- } // Bintray.getAllPackages().forEach\n- } // safeAllTags\n-\n- with(sb.toString()) {\n- if (isNotEmpty()) {\n- throw GradleException(this)\n- }\n- }\n}\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-976 Refactoring tasks for release bintray checks |
652,312 | 19.03.2020 17:53:46 | -10,800 | 95b7aa45d253d874ada26cee2dbfdb736f81dbde | Add logic for search a component using its library name | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/bintray_tasks/release/BaseCheckBintrayForReleaseTask.kt",
"new_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/bintray_tasks/release/BaseCheckBintrayForReleaseTask.kt",
"diff": "@@ -5,6 +5,7 @@ import org.gradle.api.GradleException\nimport org.gradle.api.tasks.TaskAction\nimport ru.surfstudio.android.build.Components\nimport ru.surfstudio.android.build.bintray.Bintray\n+import ru.surfstudio.android.build.model.json.ComponentJson\nimport ru.surfstudio.android.build.tasks.changed_components.CommandLineRunner\nimport ru.surfstudio.android.build.utils.COMPONENTS_JSON_FILE_PATH\nimport ru.surfstudio.android.build.utils.JsonHelper\n@@ -45,11 +46,22 @@ abstract class BaseCheckBintrayForReleaseTask : DefaultTask() {\nallTags?.also { safeAllTags ->\nBintray.getAllPackages().forEach { packageName ->\n- // find release tag for artifact\n- val checkoutTag = safeAllTags.firstOrNull { it.startsWith(packageName) } ?: latestTag\n+ // packageName from Bintray is equal to library name of a component.\n+ // find a component for current packageName\n+ val componentName = Components.value\n+ .firstOrNull { component ->\n+ component.libraries\n+ .map { it.artifactName }\n+ .contains(packageName)\n+ }?.name\n+\n+ if (componentName != null) {\n+ // find a release tag for artifact\n+ val checkoutTag = safeAllTags.firstOrNull { it.startsWith(componentName) }\n+ ?: latestTag\nif (checkoutTag != null) {\n- val isCheckoutTagForArtifact = checkoutTag.startsWith(packageName)\n- println(\"for $packageName checkoutTag = $checkoutTag\")\n+ val isCheckoutTagForArtifact = checkoutTag.startsWith(componentName)\n+ println(\"for $packageName componentName = $componentName checkoutTag = $checkoutTag\")\nval stableVersion = if (isCheckoutTagForArtifact) {\n// get stable version from the artifact's release tag\n@@ -76,8 +88,12 @@ abstract class BaseCheckBintrayForReleaseTask : DefaultTask() {\nprintln(\"NOT FOUND: Bintray contains a new artifact $packageName \" +\n\"which is not found for tag $checkoutTag\\n\")\n}\n+ } // if (checkoutTag != null)\n+ } else {\n+ println(\"\\nNOT FOUND: Bintray contains an old artifact $packageName \" +\n+ \"which is not found for branch $currentBranch\")\n+ } // if (componentName != null)\nprintln(LINE)\n- }\n} // Bintray.getAllPackages().forEach\n} // safeAllTags\n@@ -91,7 +107,7 @@ abstract class BaseCheckBintrayForReleaseTask : DefaultTask() {\n/**\n* Custom check\n*\n- * @param packageName packageName from Bintray, which equals to component name\n+ * @param packageName packageName from Bintray, which is equal to library name\n* @param stableVersion stableVersion of artifact\n* @param isCheckoutTagForArtifact true if for current release artifact was used unique tag\n*/\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-976 Add logic for search a component using its library name |
652,312 | 20.03.2020 14:44:55 | -10,800 | 0841ef7e0966b3cf1cd38bf25318dc8444e27ea7 | Remove old script for deploy to Bintray | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/buildTasks.gradle",
"new_path": "buildSrc/buildTasks.gradle",
"diff": "@@ -82,8 +82,6 @@ task checkConfigurationIsProjectSnapshotTask(type: CheckConfigurationIsProjectSn\ntask checkConfigurationIsNotProjectSnapshotTask(type: CheckConfigurationIsNotProjectSnapshotTask) // dev, release, pr\n-task distributeArtifactsToBintrayTask(type: DistributeArtifactsToBintrayTask) // release\n-\ntask generateReleaseNotesDiff(type: GenerateReleaseNotesDiffTask) // helper\ntask writeToFileReleaseNotesDiff(type: WriteToFileReleaseNotesDiff)\n"
},
{
"change_type": "DELETE",
"old_path": "buildSrc/src/main/kotlin/ru/surfstudio/android/build/tasks/bintray_tasks/DistributeArtifactsToBintrayTask.kt",
"new_path": null,
"diff": "-package ru.surfstudio.android.build.tasks.bintray_tasks\n-\n-import org.gradle.api.DefaultTask\n-import org.gradle.api.tasks.TaskAction\n-import ru.surfstudio.android.build.GradleProperties.OVERRIDE_EXISTED\n-import ru.surfstudio.android.build.artifactory.Artifactory\n-import ru.surfstudio.android.build.model.module.Library\n-import ru.surfstudio.android.build.utils.getPropertyComponent\n-import ru.surfstudio.android.build.utils.readProperty\n-\n-/**\n- * Distribute artifacts to Bintray.\n- *\n- * This task can only be used for deploy of a single artifact via the name.\n- * For deploy of multiple artifacts to bintray, see [distributeArtifactsToBintray] gradle task\n- */\n-open class DistributeArtifactsToBintrayTask : DefaultTask() {\n-\n- @TaskAction\n- fun distribute() {\n- val component = project.getPropertyComponent()\n- val overrideExisted = project.readProperty(OVERRIDE_EXISTED, \"false\").toBoolean()\n- Artifactory.distributeArtifactToBintray(overrideExisted, component.libraries.map(Library::name))\n- }\n-}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-976 Remove old script for deploy to Bintray |
652,312 | 20.03.2020 15:30:32 | -10,800 | 408582366a6c7f7b1dd8eac5bfbeafe2dddbf70c | Remove crashlytics dependencies | [
{
"change_type": "MODIFY",
"old_path": "analytics/sample/build.gradle",
"new_path": "analytics/sample/build.gradle",
"diff": "import ru.surfstudio.android.build.DependencyConfigurator\napply from: \"$rootDir/buildSrc/androidSample.gradle\"\n-apply plugin: 'io.fabric'\nandroid {\n- ext.enableCrashlytics = false\ndefaultConfig {\napplicationId \"ru.surfstudio.android.firebase.sample\"\n@@ -20,7 +18,6 @@ dependencies {\nDependencyConfigurator.implementation(project, \"com.android.support:multidex\")\nDependencyConfigurator.implementation(project, \"com.google.firebase:firebase-messaging\")\n- DependencyConfigurator.implementation(project, \"com.crashlytics.sdk.android:crashlytics\")\nDependencyConfigurator.kapt(project, \"com.google.dagger:dagger-compiler\")\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "analytics/sample/src/main/java/ru/surfstudio/android/firebase/sample/app/CustomApp.kt",
"new_path": "analytics/sample/src/main/java/ru/surfstudio/android/firebase/sample/app/CustomApp.kt",
"diff": "@@ -4,9 +4,6 @@ import android.app.Activity\nimport android.content.Context\nimport android.content.Intent\nimport androidx.multidex.MultiDexApplication\n-import com.crashlytics.android.Crashlytics\n-import com.crashlytics.android.core.CrashlyticsCore\n-import io.fabric.sdk.android.Fabric\nimport ru.surfstudio.android.activity.holder.ActiveActivityHolder\nimport ru.surfstudio.android.firebase.sample.BuildConfig\nimport ru.surfstudio.android.logger.Logger\n@@ -23,23 +20,12 @@ class CustomApp : MultiDexApplication() {\noverride fun onCreate() {\nsuper.onCreate()\n- initFabric()\ninitInjector()\ninitNotificationCenter()\nregisterActiveActivityListener()\ninitPushEventListener()\n}\n- private fun initFabric() {\n- Fabric.with(this, *getFabricKits())\n- }\n-\n- private fun getFabricKits() = arrayOf(Crashlytics.Builder()\n- .core(CrashlyticsCore.Builder()\n- .disabled(BuildConfig.DEBUG)\n- .build())\n- .build())\n-\nprivate fun initInjector() {\nAppConfigurator.initInjector(this)\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "build.gradle",
"new_path": "build.gradle",
"diff": "@@ -9,7 +9,6 @@ allprojects {\njcenter()\nmavenCentral()\nmaven { url \"https://jitpack.io\" }\n- maven { url 'https://maven.fabric.io/public' }\nmaven { url 'https://artifactory.surfstudio.ru/artifactory/libs-release-local' }\n}\n}\n@@ -23,7 +22,6 @@ buildscript {\nrepositories {\ngoogle()\njcenter()\n- maven { url 'https://maven.fabric.io/public' }\nmaven { url 'https://maven.google.com' }\nmaven { url 'https://plugins.gradle.org/m2/' }\nmaven { url 'https://artifactory.surfstudio.ru/artifactory/libs-release-local' }\n@@ -33,7 +31,6 @@ buildscript {\nclasspath \"com.android.tools.build:gradle:$gradlePluginVersion\"\nDependencyConfigurator.classpath(project, \"org.jetbrains.kotlin:kotlin-gradle-plugin\")\nclasspath \"com.google.gms:google-services:$googleServicesVersion\"\n- classpath \"io.fabric.tools:gradle:$fabricVersion\"\nclasspath \"com.gradle:build-scan-plugin:$buildScanPluginVersion\"\n//classpath \"ru.surfstudio.android:version-plugin:${ConfigInfoProvider.getVersion()}\"\n//todo use this for get as dependencies for mirror\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/components.json",
"new_path": "buildSrc/components.json",
"diff": "\"name\": \"com.jakewharton.timber:timber\",\n\"type\": \"implementation\"\n},\n- {\n- \"name\": \"com.crashlytics.sdk.android:crashlytics\",\n- \"type\": \"implementation\"\n- },\n{\n\"name\": \"androidx.annotation:annotation\",\n\"type\": \"implementation\"\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/config.gradle",
"new_path": "buildSrc/config.gradle",
"diff": "@@ -33,7 +33,6 @@ ext {\nbuildToolsVersion = \"29.0.0\" //https://bit.ly/2DNmq3Y\ngoogleServicesVersion = '4.3.3' //https://bit.ly/2Q5FCge\nbuildScanPluginVersion = '2.0.2' //https://goo.gl/coZHFo\n- fabricVersion = \"1.26.1\" //https://bit.ly/2OOly00\nlibraryVersions = [\n\"org.jetbrains.kotlin:kotlin-stdlib-jdk7\" : \"1.3.61\", //https://goo.gl/2Epeje\n@@ -42,7 +41,6 @@ ext {\n\"androidx.annotation:annotation\" : \"1.0.1\", //http://bit.ly/2P3QBVO\n\"com.annimon:stream\" : \"1.2.1\", //https://bit.ly/2Ke0nlQ\n\"com.jakewharton.timber:timber\" : \"4.7.1\", //http://bit.ly/2LWbLaY\n- \"com.crashlytics.sdk.android:crashlytics\" : \"2.9.6\", //http://bit.ly/2v5mXbp\n\"com.google.firebase:firebase-analytics\" : \"17.2.2\", //http://bit.ly/2Q81pGJ\n\"io.reactivex.rxjava2:rxjava\" : \"2.2.3\", //https://goo.gl/uzna2x\n\"io.reactivex.rxjava2:rxandroid\" : \"2.1.0\", //https://goo.gl/3Kd3iP\n"
},
{
"change_type": "MODIFY",
"old_path": "deprecated/core-app/RELEASE_NOTES.md",
"new_path": "deprecated/core-app/RELEASE_NOTES.md",
"diff": "# Core-app Release Notes\n## 0.5.0-alpha\n##### Core-app\n-* TODO\n-* TODO\n+* ANDDEP-928 Remove Crashlytics dependencies\n## 0.4.0\n##### Core-app\n* Module - ** deprecated **\n"
},
{
"change_type": "MODIFY",
"old_path": "logger/RELEASE_NOTES.md",
"new_path": "logger/RELEASE_NOTES.md",
"diff": "# Logger Release Notes\n## 0.5.0-alpha\n##### Logger\n-* TODO\n-## 0.3.0\n-##### Logger\n-* ANDDEP-222 - added the ability to select a strategy for logging\n* ANDDEP-392 - Add FirebaseCrashlyticsRemoteLoggingStrategy\n* ANDDEP-927 - Remove Firebase dependencies\n+* ANDDEP-928 - Remove Crashlytics dependencies## 0.3.0\n+##### Logger\n+* ANDDEP-222 - added the ability to select a strategy for logging\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "logger/lib-logger/src/main/java/ru/surfstudio/android/logger/remote_logging_strategies/impl/crashlytics/CrashlyticsRemoteLoggingStrategy.kt",
"new_path": null,
"diff": "-/*\n- Copyright (c) 2020-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.logger.remote_logging_strategies.impl.crashlytics\n-\n-import com.crashlytics.android.Crashlytics\n-\n-import ru.surfstudio.android.logger.remote_logging_strategies.RemoteLoggingStrategy\n-\n-/**\n- * Logging strategy for Fabric Crashlytics\n- */\n-@Deprecated(\"Use FirebaseCrashlyticsRemoteLoggingStrategy and firebase crashlytics instead\")\n-class CrashlyticsRemoteLoggingStrategy : RemoteLoggingStrategy {\n-\n- override fun setUser(id: String?, username: String?, email: String?) {\n- try {\n- Crashlytics.getInstance().core.setUserName(username)\n- Crashlytics.getInstance().core.setUserEmail(email)\n- Crashlytics.getInstance().core.setUserIdentifier(id)\n- } catch (e: Exception) {\n- //ignored\n- }\n- }\n-\n- override fun clearUser() {\n- try {\n- Crashlytics.getInstance().core.setUserName(\"\")\n- Crashlytics.getInstance().core.setUserEmail(\"\")\n- Crashlytics.getInstance().core.setUserIdentifier(\"\")\n- } catch (e: Exception) {\n- //ignored\n- }\n- }\n-\n- override fun logKeyValue(key: String?, value: String?) {\n- try {\n- Crashlytics.getInstance().core.setString(key, value)\n- } catch (e: Exception) {\n- //ignored\n- }\n- }\n-\n- override fun logError(e: Throwable?) {\n- try {\n- Crashlytics.getInstance().core.logException(e)\n- } catch (err: Exception) {\n- //ignored\n- }\n- }\n-\n- override fun logMessage(message: String?) {\n- try {\n- Crashlytics.getInstance().core.log(message)\n- } catch (e: Exception) {\n- //ignored\n- }\n- }\n-}\n"
},
{
"change_type": "MODIFY",
"old_path": "security/RELEASE_NOTES.md",
"new_path": "security/RELEASE_NOTES.md",
"diff": "* [ReleaseAppChecker](lib-security/src/main/java/ru/surfstudio/android/security/app/ReleaseAppChecker.kt) - a class with different checks for release application.\n* [ReleaseSignatureChecker](lib-security/src/main/java/ru/surfstudio/android/security/app/ReleaseSignatureChecker.kt) - a class for checking release signature.\n* [SecurityUtils](lib-security/src/main/java/ru/surfstudio/android/security/crypto/security/SecurityUtils.kt) - added different utils for encoding and decoding.\n+* ANDDEP-928 Remove clearCrashlyticsLogs function\n## 0.4.0\n##### Security\n* ANDDEP-82 Security Module\n"
},
{
"change_type": "MODIFY",
"old_path": "security/lib-security/src/main/java/ru/surfstudio/android/security/app/ReleaseAppChecker.kt",
"new_path": "security/lib-security/src/main/java/ru/surfstudio/android/security/app/ReleaseAppChecker.kt",
"diff": "@@ -18,11 +18,8 @@ package ru.surfstudio.android.security.app\nimport android.content.Context\nimport android.content.pm.ApplicationInfo\nimport android.os.Handler\n-import ru.surfstudio.android.filestorage.utils.AppDirectoriesProvider\n-import java.io.File\nprivate const val CRASH_DELAY_MS = 1000L\n-private const val CRASHLYTICS_LOGS_DIR = \".Fabric/com.crashlytics.sdk.android.crashlytics-core\"\n/**\n* Object with different checks for release application.\n@@ -44,13 +41,6 @@ object ReleaseAppChecker {\n}\n}\n- /**\n- * Function for removing Crashlitycs logs\n- */\n- fun clearCrashlyticsLogs(context: Context) {\n- File(AppDirectoriesProvider.provideBackupStorageDir(context), CRASHLYTICS_LOGS_DIR).deleteRecursively()\n- }\n-\nprivate fun hasDebuggableFlags(context: Context): Boolean =\ncontext.applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE != 0\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-928 Remove crashlytics dependencies |
652,335 | 20.03.2020 15:58:42 | -10,800 | d94b2eb2adad6dfefbc3f4c13beb166f76733701 | Increase global alpha version counter to 92 [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\": 91,\n+ \"unstable_version\": 92,\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 92 [skip ci] [version] |
652,312 | 20.03.2020 20:55:43 | -10,800 | 1d1245cc8774f95aefe247a06c9691c61d8e137f | Fix RemoteLogger in template | [
{
"change_type": "RENAME",
"old_path": "template/base_feature/src/main/java/ru/surfstudio/standard/application/logger/RemoteLogger.kt",
"new_path": "template/base/src/main/java/ru/surfstudio/standard/base/logger/RemoteLogger.kt",
"diff": "-package ru.surfstudio.standard.application.logger\n+package ru.surfstudio.standard.base.logger\n-import ru.surfstudio.android.logger.remote_logging_strategies.RemoteLoggingStrategy\nimport kotlin.reflect.KClass\n/**\n"
},
{
"change_type": "RENAME",
"old_path": "template/base_feature/src/main/java/ru/surfstudio/standard/application/logger/strategies/remote/RemoteLoggingStrategy.kt",
"new_path": "template/base/src/main/java/ru/surfstudio/standard/base/logger/RemoteLoggingStrategy.kt",
"diff": "-package ru.surfstudio.standard.application.logger.strategies.remote\n+package ru.surfstudio.standard.base.logger\n/**\n* Interface of logging strategies for remote server\n"
},
{
"change_type": "MODIFY",
"old_path": "template/base_feature/src/main/java/ru/surfstudio/standard/application/app/App.kt",
"new_path": "template/base_feature/src/main/java/ru/surfstudio/standard/application/app/App.kt",
"diff": "@@ -15,7 +15,7 @@ import ru.surfstudio.android.template.base_feature.BuildConfig\nimport ru.surfstudio.android.template.base_feature.R\nimport ru.surfstudio.android.utilktx.ktx.ui.activity.ActivityLifecycleListener\nimport ru.surfstudio.standard.application.app.di.AppInjector\n-import ru.surfstudio.standard.application.logger.RemoteLogger\n+import ru.surfstudio.standard.base.logger.RemoteLogger\nimport ru.surfstudio.standard.application.logger.strategies.remote.RemoteLoggerLoggingStrategy\nimport ru.surfstudio.standard.application.logger.strategies.remote.FirebaseCrashlyticsRemoteLoggingStrategy\nimport ru.surfstudio.standard.application.logger.strategies.remote.timber.TimberLoggingStrategy\n"
},
{
"change_type": "MODIFY",
"old_path": "template/base_feature/src/main/java/ru/surfstudio/standard/application/logger/strategies/remote/FirebaseCrashlyticsRemoteLoggingStrategy.kt",
"new_path": "template/base_feature/src/main/java/ru/surfstudio/standard/application/logger/strategies/remote/FirebaseCrashlyticsRemoteLoggingStrategy.kt",
"diff": "package ru.surfstudio.standard.application.logger.strategies.remote\nimport com.google.firebase.crashlytics.FirebaseCrashlytics\n-import ru.surfstudio.android.logger.remote_logging_strategies.RemoteLoggingStrategy\n+import ru.surfstudio.standard.base.logger.RemoteLoggingStrategy\nprivate const val DEFAULT_STRING_VALUE = \"null\"\n"
},
{
"change_type": "MODIFY",
"old_path": "template/base_feature/src/main/java/ru/surfstudio/standard/application/logger/strategies/remote/RemoteLoggerLoggingStrategy.kt",
"new_path": "template/base_feature/src/main/java/ru/surfstudio/standard/application/logger/strategies/remote/RemoteLoggerLoggingStrategy.kt",
"diff": "@@ -2,7 +2,7 @@ package ru.surfstudio.standard.application.logger.strategies.remote\nimport android.util.Log\n-import ru.surfstudio.standard.application.logger.RemoteLogger\n+import ru.surfstudio.standard.base.logger.RemoteLogger\nimport ru.surfstudio.android.logger.logging_strategies.LoggingStrategy\n/**\n"
},
{
"change_type": "MODIFY",
"old_path": "template/i-session/src/main/java/ru/surfstudio/standard/i_session/SessionChangedInteractor.kt",
"new_path": "template/i-session/src/main/java/ru/surfstudio/standard/i_session/SessionChangedInteractor.kt",
"diff": "@@ -5,7 +5,7 @@ import ru.surfstudio.standard.i_token.TokenStorage\nimport io.reactivex.Observable\nimport io.reactivex.subjects.PublishSubject\nimport ru.surfstudio.android.dagger.scope.PerApplication\n-import ru.surfstudio.android.logger.RemoteLogger\n+import ru.surfstudio.standard.base.logger.RemoteLogger\nimport ru.surfstudio.android.utilktx.ktx.text.EMPTY_STRING\nimport javax.inject.Inject\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-928 Fix RemoteLogger in template |
652,316 | 23.03.2020 09:55:29 | -10,800 | aa472e8c5cd9ba921c89b69b8b6cef4a19198182 | Custom DI based on fragment lifecycle callbacks | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/di/ActivityNavigationSupplier.kt",
"diff": "+package ru.surfstudio.android.navigation.di\n+\n+import android.app.Activity\n+import android.app.Application\n+import android.os.Bundle\n+import androidx.appcompat.app.AppCompatActivity\n+import androidx.fragment.app.FragmentActivity\n+import androidx.fragment.app.FragmentManager\n+import ru.surfstudio.android.navigation.navigator.activity.view.ViewActivityNavigator\n+import java.lang.IllegalStateException\n+\n+//@PerApp\n+class ActivityNavigationSupplier(\n+ private val nestedCallbacks: FragmentManager.FragmentLifecycleCallbacks\n+) : Application.ActivityLifecycleCallbacks {\n+\n+ private val navigators = hashMapOf<String, ActivityNavigatorHolder?>()\n+\n+ private var currentNavigator: ActivityNavigatorHolder? = null\n+\n+ override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {\n+ val newHolder = createHolder(activity as AppCompatActivity)\n+ navigators[getActivityId(activity)] = newHolder\n+ if (savedInstanceState != null) {\n+ currentNavigator = newHolder\n+ }\n+ }\n+\n+ fun setupNestedNavigationHolder(activity: Activity) {\n+ if (activity !is FragmentActivity) return\n+ if (activity !is FragmentContainer) return\n+\n+ val containerId = activity.containerId\n+ val fragmentManager = activity.supportFragmentManager\n+\n+ fragmentManager.registerFragmentLifecycleCallbacks(nestedCallbacks, true)\n+ }\n+\n+ override fun onActivityStarted(activity: Activity) {\n+ }\n+\n+ override fun onActivityResumed(activity: Activity) {\n+ val currentHolder = navigators[getActivityId(activity)]\n+ currentNavigator = currentHolder\n+ }\n+\n+ override fun onActivityPaused(activity: Activity) {\n+ val currentHolder = navigators[getActivityId(activity)]\n+ if (currentNavigator == currentHolder) {\n+ currentNavigator = null\n+ }\n+ }\n+\n+ override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle?) {\n+// navigators[getActivityId(activity)]?.onSaveState(outState)\n+ }\n+\n+ override fun onActivityStopped(activity: Activity) {\n+ }\n+\n+ override fun onActivityDestroyed(activity: Activity) {\n+ destroyHolders(activity)\n+ }\n+\n+ private fun destroyHolders(activity: Activity) {\n+ navigators[getActivityId(activity)] = null\n+\n+ if (activity !is FragmentActivity) return\n+ val fragmentManager = activity.supportFragmentManager\n+\n+ fragmentManager.unregisterFragmentLifecycleCallbacks(nestedCallbacks)\n+ }\n+\n+ private fun getActivityId(activity: Activity): String = (activity as? IdentifiableScreen)?.screenId\n+ ?: throw IllegalStateException(\"Activity must implement from HasId.id method \")\n+\n+ private fun createHolder(activity: AppCompatActivity): ActivityNavigatorHolder {\n+ val activityNavigator = ViewActivityNavigator(activity)\n+// val dialogNavigator = ...\n+ return ActivityNavigatorHolder(activityNavigator)\n+ }\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/di/ActivityNavigatorHolder.kt",
"diff": "+package ru.surfstudio.android.navigation.di\n+\n+import ru.surfstudio.android.navigation.navigator.activity.ActivityNavigatorInterface\n+\n+open class ActivityNavigatorHolder(\n+ val activityNavigator: ActivityNavigatorInterface\n+ //todo dialog navigator\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/di/FragmentNavigationSupplier.kt",
"diff": "+package ru.surfstudio.android.navigation.di\n+\n+import android.os.Bundle\n+import android.view.View\n+import androidx.fragment.app.Fragment\n+import androidx.fragment.app.FragmentManager\n+import ru.surfstudio.android.navigation.navigator.fragment.tab.view.ViewTabFragmentNavigator\n+import ru.surfstudio.android.navigation.navigator.fragment.view.ViewFragmentNavigator\n+\n+class FragmentNavigationSupplier : FragmentManager.FragmentLifecycleCallbacks() {\n+\n+ val holders = hashMapOf<Int, MutableList<FragmentNavigatorHolder>>()\n+ var currentLevel = 1\n+ var currentId: String? = null\n+\n+ val currentLevelHolders: List<FragmentNavigatorHolder>?\n+ get() = holders[currentLevel]\n+\n+ override fun onFragmentSaveInstanceState(fm: FragmentManager, f: Fragment, outState: Bundle) {\n+ val id = getFragmentId(f)\n+\n+ holders.forEach { entry ->\n+ val currentHolder = entry.value.find { it.id == id }\n+ currentHolder?.run {\n+ fragmentNavigator.onSaveState(outState)\n+ tabFragmentNavigator.onSaveState(outState)\n+ }\n+ }\n+ }\n+\n+ override fun onFragmentActivityCreated(fm: FragmentManager, f: Fragment, savedInstanceState: Bundle?) {\n+ val level = getLevel(f)\n+ val id = getFragmentId(f)\n+ val containerId = getContainerId(f) ?: return\n+ addHolder(level, containerId, id, fm, savedInstanceState)\n+ }\n+\n+ private fun addHolder(\n+ level: Int,\n+ containerId: Int,\n+ id: String,\n+ fm: FragmentManager,\n+ savedInstanceState: Bundle?\n+ ) {\n+ val fragmentNavigator = ViewFragmentNavigator(fm, containerId, savedInstanceState)\n+ val tabFragmentNavigator = ViewTabFragmentNavigator(fm, containerId, savedInstanceState)\n+ val newHolder = FragmentNavigatorHolder(id, fragmentNavigator, tabFragmentNavigator)\n+ val levelHolders = holders[level] ?: mutableListOf()\n+ levelHolders.add(newHolder)\n+ holders[level] = levelHolders\n+ }\n+\n+ override fun onFragmentPaused(fm: FragmentManager, f: Fragment) {\n+ val id = getFragmentId(f)\n+ if (id == currentId) {\n+ currentId = null\n+ }\n+ }\n+\n+ override fun onFragmentResumed(fm: FragmentManager, f: Fragment) {\n+ val id = getFragmentId(f)\n+ val currentLevelHolders = holders[currentLevel]\n+ val existsOnCurrentLevel = currentLevelHolders?.find { it.id == id } != null\n+ if (existsOnCurrentLevel) {\n+ currentId = id\n+ }\n+ }\n+\n+ override fun onFragmentViewDestroyed(fm: FragmentManager, f: Fragment) {\n+ removeHolder(f)\n+ }\n+\n+ private fun removeHolder(fragment: Fragment) {\n+ val id = getFragmentId(fragment)\n+ holders.forEach { entry ->\n+ val holder = entry.value.find { it.id == id }\n+ entry.value.remove(holder)\n+ }\n+ }\n+\n+ private fun getLevel(fragment: Fragment): Int {\n+ var level = 0\n+ var currentFragment: Fragment? = fragment\n+ do {\n+ level++\n+ currentFragment = currentFragment?.parentFragment\n+ } while (currentFragment?.parentFragment != null)\n+ return level\n+ }\n+\n+ private fun getFragmentId(fragment: Fragment): String {\n+ return if (fragment is IdentifiableScreen) fragment.screenId else fragment.id.toString()\n+ }\n+\n+ private fun getContainerId(fragment: Fragment): Int? {\n+ return if (fragment is FragmentContainer) fragment.containerId else null\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/FragmentNavigatorHolder.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/di/FragmentNavigatorHolder.kt",
"diff": "package ru.surfstudio.android.navigation.di\n-import android.app.Activity\n-import android.app.Application\n-import android.os.Bundle\n-import androidx.fragment.app.FragmentActivity\nimport ru.surfstudio.android.navigation.navigator.fragment.FragmentNavigatorInterface\nclass FragmentNavigatorHolder(\n- val navigatorCreator: FragmentNavigatorCreator\n-) : Application.ActivityLifecycleCallbacks, NavigatorHolder<FragmentNavigatorInterface> {\n-\n- private val navigators = hashMapOf<String, FragmentNavigatorInterface?>()\n-\n- private var currentNavigator: FragmentNavigatorInterface? = null\n-\n- override val navigator: FragmentNavigatorInterface\n- get() = currentNavigator!!\n-\n- override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {\n- val fragmentManager = (activity as? FragmentActivity)?.supportFragmentManager ?: return\n- val containerId = (activity as? FragmentContainer)?.containerId ?: return\n- val newNavigator = navigatorCreator(fragmentManager, containerId, savedInstanceState)\n- navigators[getActivityId(activity)] = newNavigator\n- if (savedInstanceState != null) {\n- currentNavigator = newNavigator\n- }\n- }\n-\n- override fun onActivityStarted(activity: Activity) {\n- }\n-\n- override fun onActivityResumed(activity: Activity) {\n- val currentActivityNavigator = navigators[getActivityId(activity)]\n- currentNavigator = currentActivityNavigator\n- }\n-\n- override fun onActivityPaused(activity: Activity) {\n- val currentActivityNavigator = navigators[getActivityId(activity)]\n- if (currentNavigator == currentActivityNavigator) {\n- currentNavigator = null\n- }\n- }\n-\n- override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle?) {\n- navigators[getActivityId(activity)]?.onSaveState(outState)\n- }\n-\n- override fun onActivityStopped(activity: Activity) {\n- }\n-\n- override fun onActivityDestroyed(activity: Activity) {\n- navigators[getActivityId(activity)] = null\n- }\n-\n- private fun getActivityId(activity: Activity): String = \"${activity.hashCode()}\"\n+ val id: String,\n+ val fragmentNavigator: FragmentNavigatorInterface,\n+ val tabFragmentNavigator: FragmentNavigatorInterface\n+) {\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/di/IdentifiableScreen.kt",
"diff": "+package ru.surfstudio.android.navigation.di\n+\n+interface IdentifiableScreen {\n+ val screenId: String\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/di/NavigatorCreator.kt",
"new_path": null,
"diff": "-package ru.surfstudio.android.navigation.di\n-\n-import android.os.Bundle\n-import androidx.fragment.app.FragmentManager\n-import ru.surfstudio.android.navigation.navigator.fragment.FragmentNavigatorInterface\n-\n-typealias FragmentNavigatorCreator =\n- (fm: FragmentManager, containerId: Int, savedState: Bundle?) -> FragmentNavigatorInterface\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/navigator/activity/view/ViewActivityNavigator.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/navigator/activity/view/ViewActivityNavigator.kt",
"diff": "@@ -3,4 +3,4 @@ package ru.surfstudio.android.navigation.navigator.activity.view\nimport androidx.appcompat.app.AppCompatActivity\nimport ru.surfstudio.android.navigation.navigator.activity.ActivityNavigator\n-class ViewActivityNavigator(override val activity: AppCompatActivity) : ActivityNavigator()\n\\ No newline at end of file\n+data class ViewActivityNavigator(override val activity: AppCompatActivity) : ActivityNavigator()\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-312 Custom DI based on fragment lifecycle callbacks |
652,337 | 23.03.2020 14:02:32 | -18,000 | b58e17149550d51a9dac654c85dd3ebb97b21e48 | Removed overridden methods for stable ids | [
{
"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": "@@ -129,24 +129,6 @@ public class EasyAdapter extends RecyclerView.Adapter {\nreturn infiniteScroll ? INFINITE_SCROLL_LOOPS_COUNT * items.size() : items.size();\n}\n- /**\n- * @see RecyclerView.Adapter#getItemId(int)\n- */\n- @Override\n- public final long getItemId(int position) {\n- return getItemStringId(position).hashCode();\n- }\n-\n- /**\n- * Get the unique id from item at certain position\n- *\n- * @param position position of item\n- * @return unique item id\n- */\n- public final String getItemStringId(int position) {\n- return getItemStringIdInternal(items, position);\n- }\n-\n/**\n* Get BaseItem from items list at certain position\n*\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-909 Removed overridden methods for stable ids |
652,309 | 23.03.2020 12:23:03 | -10,800 | 6e50307e0cf613857049c36c74de7eb4b534b291 | fixed deploy gradle config for recycler-decorator-easyadapter | [
{
"change_type": "MODIFY",
"old_path": "recycler-decorator/lib-recycler-decorator-easyadapter/build.gradle",
"new_path": "recycler-decorator/lib-recycler-decorator-easyadapter/build.gradle",
"diff": "-apply from: \"$rootDir/buildSrc/baseBuild.gradle\"\n\\ No newline at end of file\n+apply from: \"$rootDir/buildSrc/baseDeployBuild.gradle\"\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | fixed deploy gradle config for recycler-decorator-easyadapter |
652,309 | 23.03.2020 12:26:27 | -10,800 | d1d79caec0e269aa97fcd324832ad1dce5940939 | add release notes for lib-recycler-decorator | [
{
"change_type": "MODIFY",
"old_path": "recycler-decorator/RELEASE_NOTES.md",
"new_path": "recycler-decorator/RELEASE_NOTES.md",
"diff": "* ANDDEP-785 added Builder for RecyclerView.ItemDecoration and sample\n* ANDDEP-785 added ktx for Decorator.Builder to use with EasyAdapter\n* Add .gitignore\n+* fix gradle config for recycler-decorator-easyadapter\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | add release notes for lib-recycler-decorator |
652,335 | 23.03.2020 13:18:29 | -10,800 | b4591ae0a0a228627f8911235d6d791c20cc822d | Increase global alpha version counter to 93 [skip ci] [version] | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/components.json",
"new_path": "buildSrc/components.json",
"diff": "{\n\"id\": \"recycler-decorator\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 3,\n\"stable\": false,\n\"dir\": \"recycler-decorator\",\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\": 92,\n+ \"unstable_version\": 93,\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 93 [skip ci] [version] |
652,335 | 23.03.2020 15:15:37 | -10,800 | 75666d061acd9ae57a4f2c2e2c4026116651804c | Increase global alpha version counter to 94 [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\": 93,\n+ \"unstable_version\": 94,\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 94 [skip ci] [version] |
652,312 | 24.03.2020 13:33:03 | -10,800 | 6e350bee0ae8c2a696ac62eb0b69b1063564d7d8 | Add **NO BACKWARD COMPATIBILITY** label for release notes | [
{
"change_type": "MODIFY",
"old_path": "deprecated/core-app/RELEASE_NOTES.md",
"new_path": "deprecated/core-app/RELEASE_NOTES.md",
"diff": "# Core-app Release Notes\n## 0.5.0-alpha\n##### Core-app\n-* ANDDEP-928 Remove Crashlytics dependencies\n+* **NO BACKWARD COMPATIBILITY** ANDDEP-928 Remove Crashlytics\n+ dependencies\n+\n## 0.4.0\n##### Core-app\n* Module - ** deprecated **\n"
},
{
"change_type": "MODIFY",
"old_path": "logger/RELEASE_NOTES.md",
"new_path": "logger/RELEASE_NOTES.md",
"diff": "##### Logger\n* ANDDEP-392 - Add FirebaseCrashlyticsRemoteLoggingStrategy\n* ANDDEP-927 - Remove Firebase dependencies\n-* ANDDEP-928 - Remove Crashlytics dependencies\n+* **NO BACKWARD COMPATIBILITY** ANDDEP-928 - Remove Crashlytics\n+ dependencies\n## 0.3.0\n##### Logger\n* ANDDEP-222 - added the ability to select a strategy for logging\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "mvp/RELEASE_NOTES.md",
"new_path": "mvp/RELEASE_NOTES.md",
"diff": "* ANDDEP-687 Changed \"javax.inject:javax.inject\" dependency from \"api\" to \"implementation\" type\n* Fix logging screen names\n* ANDDEP-922 Fix crash on dismiss simple dialog in child fragment\n-* ANDDEP-922 Fix inconsistent dialog navigator behavior: CoreSimpleDialog now showing with it's route tag. Methods `DialogNavigator.showSimpleDialog`, `CoreSimpleDialogInterface.show`, `CoreSimpleBottomSheetDialogFragment.show`, `CoreSimpleDialogFragment.show` and `SimpleDialogDelegate.show` are changed **without backward compatibility support**.\n+* **NO BACKWARD COMPATIBILITY** ANDDEP-922 Fix inconsistent dialog\n+ navigator behavior: CoreSimpleDialog now showing with it's route tag.\n+ Methods `DialogNavigator.showSimpleDialog`,\n+ `CoreSimpleDialogInterface.show`,\n+ `CoreSimpleBottomSheetDialogFragment.show`,\n+ `CoreSimpleDialogFragment.show` and `SimpleDialogDelegate.show` are\n+ changed **without backward compatibility support**.\n+\n* ANDDEP-928 Fix SimpleDialogDelegate logs\n## 0.4.0\n##### Core-mvp\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-928 Add **NO BACKWARD COMPATIBILITY** label for release notes |
652,335 | 24.03.2020 14:31:38 | -10,800 | 69f2547180c1713d91b08d7e708928a6240e7eae | Increase global alpha version counter to 95 [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\": 94,\n+ \"unstable_version\": 95,\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 95 [skip ci] [version] |
652,312 | 24.03.2020 17:20:54 | -10,800 | 1aee3849c5e3319cd1dc3bdca26f79545889829c | Fix recycler-decorator-easyadapter link | [
{
"change_type": "MODIFY",
"old_path": "recycler-decorator/RELEASE_NOTES.md",
"new_path": "recycler-decorator/RELEASE_NOTES.md",
"diff": "* ANDDEP-785 added ktx for Decorator.Builder to use with EasyAdapter\n* Add .gitignore\n* fix gradle config for recycler-decorator-easyadapter\n+* Fix readme\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Fix recycler-decorator-easyadapter link |
652,335 | 25.03.2020 11:07:24 | -10,800 | 00ed7d9e8509f9c5cd3ee89e24f035757ccff2fc | Increase global alpha version counter to 96 [skip ci] [version] | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/components.json",
"new_path": "buildSrc/components.json",
"diff": "{\n\"id\": \"core-ui\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 5,\n+ \"unstable_version\": 6,\n\"stable\": false,\n\"dir\": \"core-ui\",\n\"libs\": [\n{\n\"id\": \"mvp\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 5,\n+ \"unstable_version\": 6,\n\"stable\": false,\n\"dir\": \"mvp\",\n\"libs\": [\n{\n\"id\": \"recycler-decorator\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 3,\n+ \"unstable_version\": 4,\n\"stable\": false,\n\"dir\": \"recycler-decorator\",\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\": 95,\n+ \"unstable_version\": 96,\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 96 [skip ci] [version] |
652,312 | 25.03.2020 12:46:45 | -10,800 | 626ceaa794af914cc04dc0d4e5492cc345cb671d | Add NO BACKWARD COMPATIBILITY label for release notes | [
{
"change_type": "MODIFY",
"old_path": "easyadapter/RELEASE_NOTES.md",
"new_path": "easyadapter/RELEASE_NOTES.md",
"diff": "* ANDDEP-829 Fixed synchronous DiffResult dispatching in DefaultDiffer.\n* ANDDEP-785 Added method getItem() in EasyAdapter, to get BaseItem by position\n* ANDDEP-785 Added getter in EasyAdapter, for *firstInvisibleItemEnabled* property\n-* ANDDEP-909 Removed `setHasStableIds(true)` in EasyAdapter.\n+* **NO BACKWARD COMPATIBILITY** ANDDEP-909 Removed\n+ `setHasStableIds(true)` in EasyAdapter.\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-909 Add NO BACKWARD COMPATIBILITY label for release notes |
652,335 | 25.03.2020 15:58:30 | -10,800 | 37ba684c6d08171f246c145b2afb3641f1673e2b | Increase global alpha version counter to 97 [skip ci] [version] | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/components.json",
"new_path": "buildSrc/components.json",
"diff": "{\n\"id\": \"analytics\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 3,\n+ \"unstable_version\": 4,\n\"stable\": false,\n\"dir\": \"analytics\",\n\"libs\": [\n{\n\"id\": \"animations\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 3,\n\"stable\": false,\n\"dir\": \"animations\",\n\"libs\": [\n{\n\"id\": \"core-app\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 3,\n+ \"unstable_version\": 4,\n\"stable\": false,\n\"dir\": \"deprecated/core-app\",\n\"libs\": [\n{\n\"id\": \"mvi\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 11,\n+ \"unstable_version\": 12,\n\"stable\": false,\n\"dir\": \"mvi\",\n\"libs\": [\n{\n\"id\": \"logger\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 2,\n+ \"unstable_version\": 3,\n\"stable\": false,\n\"dir\": \"logger\",\n\"libs\": [\n{\n\"id\": \"mvp\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 6,\n+ \"unstable_version\": 7,\n\"stable\": false,\n\"dir\": \"mvp\",\n\"libs\": [\n{\n\"id\": \"security\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 5,\n+ \"unstable_version\": 6,\n\"stable\": false,\n\"dir\": \"security\",\n\"libs\": [\n{\n\"id\": \"template\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 18,\n+ \"unstable_version\": 19,\n\"stable\": false,\n\"dir\": \"template\",\n\"libs\": [],\n{\n\"id\": \"docs\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 12,\n+ \"unstable_version\": 13,\n\"stable\": false,\n\"dir\": \"docs\",\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\": 96,\n+ \"unstable_version\": 97,\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 97 [skip ci] [version] |
652,312 | 26.03.2020 16:08:52 | -10,800 | 36d488b3bcdc54888d2511bd9a0f9f8dca486d92 | Fix template settings | [
{
"change_type": "MODIFY",
"old_path": "ci-internal/JenkinsfilePullRequestJob.groovy",
"new_path": "ci-internal/JenkinsfilePullRequestJob.groovy",
"diff": "@@ -233,14 +233,14 @@ pipeline.stages = [\n}\n},\n- pipeline.stage(BUILD) {\n+ pipeline.stage(BUILD, StageStrategy.SKIP_STAGE) {\nAndroidPipelineHelper.buildStageBodyAndroid(script, \"clean assembleDebug\")\n},\n- pipeline.stage(BUILD_TEMPLATE, StageStrategy.SKIP_STAGE) {\n+ pipeline.stage(BUILD_TEMPLATE) {\nscript.sh(\"echo \\\"androidStandardDebugDir=$workspace\\n\" +\n\"androidStandardDebugMode=true\\n\" +\n\"skipSamplesBuild=true\\\" > template/android-standard/androidStandard.properties\")\n- script.sh(\"./gradlew -p template clean build assembleQa --stacktrace\")\n+ script.sh(\"./gradlew -p template clean build assembleQa assembleDebug --stacktrace\")\n},\npipeline.stage(UNIT_TEST, StageStrategy.SKIP_STAGE) {\nAndroidPipelineHelper.unitTestStageBodyAndroid(script,\n@@ -248,7 +248,7 @@ pipeline.stages = [\n\"**/test-results/testReleaseUnitTest/*.xml\",\n\"app/build/reports/tests/testReleaseUnitTest/\")\n},\n- pipeline.stage(INSTRUMENTATION_TEST_TEMPLATE, StageStrategy.SKIP_STAGE) {\n+ pipeline.stage(INSTRUMENTATION_TEST_TEMPLATE) {\nscript.dir(\"template\") {\nAndroidPipelineHelper.instrumentationTestStageBodyAndroid(\nscript,\n@@ -265,14 +265,14 @@ pipeline.stages = [\n)\n}\n},\n- pipeline.stage(INSTRUMENTATION_TEST) {\n+ pipeline.stage(INSTRUMENTATION_TEST, StageStrategy.SKIP_STAGE) {\nAndroidPipelineHelper.instrumentationTestStageBodyAndroid(\nscript,\nnew AvdConfig(),\n\"debug\",\ngetTestInstrumentationRunnerName,\nnew AndroidTestConfig(\n- \"assembleDebugAndroidTest\",\n+ \"assembleAndroidTest\",\n\"build/outputs/androidTest-results/instrumental\",\n\"build/reports/androidTests/instrumental\",\ntrue,\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-980 Fix template settings |
652,316 | 27.03.2020 07:29:17 | -10,800 | 2faa0e19153ef8aed0ceb852e0998a0b9850cb3b | MVI Reducer init | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/components.json",
"new_path": "buildSrc/components.json",
"diff": "{\n\"name\": \"rx-extension\",\n\"type\": \"implementation\"\n+ }\n+ ]\n},\n{\n- \"name\": \"easyadapter\",\n+ \"name\": \"mvi-reducer\",\n+ \"dir\": \"lib-mvi-reducer\",\n+ \"artifact_name\": \"mvi-reducer\",\n+ \"third_party_dependencies\": [\n+ {\n+ \"name\": \"junit:junit\",\n+ \"type\": \"testImplementation\"\n+ },\n+ {\n+ \"name\": \"org.mockito:mockito-core\",\n+ \"type\": \"testImplementation\"\n+ }\n+ ],\n+ \"android_standard_dependencies\": [\n+ {\n+ \"name\": \"mvi-core\",\n+ \"type\": \"api\"\n+ },\n+ {\n+ \"name\": \"core-ui\",\n+ \"type\": \"implementation\"\n+ },\n+ {\n+ \"name\": \"core-mvp\",\n+ \"type\": \"implementation\"\n+ },\n+ {\n+ \"name\": \"core-mvp-binding\",\n+ \"type\": \"implementation\"\n+ },\n+ {\n+ \"name\": \"rx-extension\",\n\"type\": \"implementation\"\n}\n]\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "mvi/lib-mvi-reducer/.gitignore",
"diff": "+/build\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "mvi/lib-mvi-reducer/build.gradle",
"diff": "+apply from: \"$rootDir/buildSrc/baseDeployBuild.gradle\"\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "mvi/lib-mvi-reducer/src/main/AndroidManifest.xml",
"diff": "+<manifest package=\"ru.surfstudio.android.core.mvi.ui.reducer\" />\n"
},
{
"change_type": "RENAME",
"old_path": "mvi/lib-mvi-core/src/main/java/ru/surfstudio/android/core/mvi/ui/reducer/Reducer.kt",
"new_path": "mvi/lib-mvi-reducer/src/main/java/ru/surfstudio/android/core/mvi/ui/reducer/Reducer.kt",
"diff": ""
},
{
"change_type": "MODIFY",
"old_path": "mvi/sample/build.gradle",
"new_path": "mvi/sample/build.gradle",
"diff": "@@ -27,6 +27,7 @@ dependencies {\nDependencyConfigurator.projectImplementation(project, \"core-mvp-binding\")\nDependencyConfigurator.projectImplementation(project, \"easyadapter\")\nDependencyConfigurator.projectImplementation(project, \"mvi-core\")\n+ DependencyConfigurator.projectImplementation(project, \"mvi-reducer\")\nDependencyConfigurator.projectImplementation(project, \"mvi-impls\")\nDependencyConfigurator.projectImplementation(project, \"mvp-dialog\")\nDependencyConfigurator.projectImplementation(project, \"rxbus\")\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-968 MVI Reducer init |
652,312 | 26.03.2020 20:02:45 | -10,800 | ab1065672e39ef6ce0c123437d98344e6e71186f | Fix template launch | [
{
"change_type": "MODIFY",
"old_path": "ci-internal/JenkinsfilePullRequestJob.groovy",
"new_path": "ci-internal/JenkinsfilePullRequestJob.groovy",
"diff": "@@ -233,8 +233,8 @@ pipeline.stages = [\n}\n},\n- pipeline.stage(BUILD, StageStrategy.SKIP_STAGE) {\n- AndroidPipelineHelper.buildStageBodyAndroid(script, \"clean assembleDebug\")\n+ pipeline.stage(BUILD) {\n+ AndroidPipelineHelper.buildStageBodyAndroid(script, \"clean :mvi-sample:assembleDebug\")\n},\npipeline.stage(BUILD_TEMPLATE) {\nscript.sh(\"echo \\\"androidStandardDebugDir=$workspace\\n\" +\n@@ -265,14 +265,14 @@ pipeline.stages = [\n)\n}\n},\n- pipeline.stage(INSTRUMENTATION_TEST, StageStrategy.SKIP_STAGE) {\n+ pipeline.stage(INSTRUMENTATION_TEST) {\nAndroidPipelineHelper.instrumentationTestStageBodyAndroid(\nscript,\nnew AvdConfig(),\n\"debug\",\ngetTestInstrumentationRunnerName,\nnew AndroidTestConfig(\n- \"assembleAndroidTest\",\n+ \":mvi-sample:assembleAndroidTest\",\n\"build/outputs/androidTest-results/instrumental\",\n\"build/reports/androidTests/instrumental\",\ntrue,\n"
},
{
"change_type": "MODIFY",
"old_path": "template/base_feature/src/main/java/ru/surfstudio/standard/application/app/App.kt",
"new_path": "template/base_feature/src/main/java/ru/surfstudio/standard/application/app/App.kt",
"diff": "@@ -40,7 +40,7 @@ class App : MultiDexApplication() {\nreturn\n}\n- initFirebaseCrashlytics()\n+ //initFirebaseCrashlytics() todo uncoment for a real app\ninitPushEventListener()\ninitRxJava2Debug()\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-980 Fix template launch |
652,300 | 27.03.2020 17:48:22 | -14,400 | fbc2cab569009ebdc5c954317d4c6de0cdb6e38c | Kotlin version raised | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/build.gradle",
"new_path": "buildSrc/build.gradle",
"diff": "plugins {\n- id 'org.jetbrains.kotlin.jvm' version \"1.3.61\"\n+ id 'org.jetbrains.kotlin.jvm' version \"1.3.71\"\n}\nrepositories {\nmavenCentral()\njcenter()\n}\ndependencies {\n- implementation \"org.jetbrains.kotlin:kotlin-stdlib:1.3.61\"\n+ implementation \"org.jetbrains.kotlin:kotlin-stdlib:1.3.71\"\nimplementation 'com.github.kittinunf.fuel:fuel:2.1.0'\nimplementation 'com.google.code.gson:gson:2.8.5'\nimplementation 'org.eclipse.jgit:org.eclipse.jgit:5.4.0.201906121030-r'\n"
},
{
"change_type": "MODIFY",
"old_path": "buildSrc/config.gradle",
"new_path": "buildSrc/config.gradle",
"diff": "@@ -35,8 +35,8 @@ ext {\nbuildScanPluginVersion = '2.0.2' //https://goo.gl/coZHFo\nlibraryVersions = [\n- \"org.jetbrains.kotlin:kotlin-stdlib-jdk7\" : \"1.3.61\", //https://goo.gl/2Epeje\n- \"org.jetbrains.kotlin:kotlin-gradle-plugin\" : \"1.3.61\", //https://goo.gl/2Epeje\n+ \"org.jetbrains.kotlin:kotlin-stdlib-jdk7\" : \"1.3.71\", //https://goo.gl/2Epeje\n+ \"org.jetbrains.kotlin:kotlin-gradle-plugin\" : \"1.3.71\", //https://goo.gl/2Epeje\n\"org.jetbrains.anko:anko-common\" : \"0.10.8\", //https://goo.gl/XGJGR7\n\"androidx.annotation:annotation\" : \"1.0.1\", //http://bit.ly/2P3QBVO\n\"com.annimon:stream\" : \"1.2.1\", //https://bit.ly/2Ke0nlQ\n"
},
{
"change_type": "MODIFY",
"old_path": "template/config.gradle",
"new_path": "template/config.gradle",
"diff": "@@ -17,7 +17,7 @@ ext {\nbuildScanPluginVersion = '1.16' //https://goo.gl/coZHFo\n//lang\n- kotlinVersion = '1.3.61' //https://goo.gl/2Epeje\n+ kotlinVersion = '1.3.71' //https://goo.gl/2Epeje\nankoVersion = '0.10.8' //https://goo.gl/XGJGR7\nannimonStreamVersion = '1.2.1' //https://bit.ly/2Ke0nlQ\njetbrainsAnnotationsVersion = '16.0.3' //http://bit.ly/2NYf6Dt\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Kotlin version raised |
652,300 | 27.03.2020 19:08:11 | -14,400 | 24e1548e82cb8c093a9ba929350fa89e7f7aa31b | Raised all versions of template | [
{
"change_type": "MODIFY",
"old_path": "buildSrc/config.gradle",
"new_path": "buildSrc/config.gradle",
"diff": "@@ -30,9 +30,9 @@ ext {\nqaVersionNameSuffix = \".qa\"\ngradlePluginVersion = '3.6.1' //https://bit.ly/2NXD4Pe\n- buildToolsVersion = \"29.0.2\" //https://bit.ly/2DNmq3Y\n+ buildToolsVersion = \"29.0.3\" //https://bit.ly/2DNmq3Y\ngoogleServicesVersion = '4.3.3' //https://bit.ly/2Q5FCge\n- buildScanPluginVersion = '2.0.2' //https://goo.gl/coZHFo\n+ buildScanPluginVersion = '2.4.2' //https://goo.gl/coZHFo\nlibraryVersions = [\n\"org.jetbrains.kotlin:kotlin-stdlib-jdk7\" : \"1.3.71\", //https://goo.gl/2Epeje\n@@ -70,7 +70,7 @@ ext {\n\"com.squareup.retrofit2:converter-gson\" : \"2.8.1\", //https://vk.cc/7UFxk3\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- \"androidx.multidex:multidex\" : \"2.0.1\", //https://vk.cc/7UFwTd\n+ \"androidx.multidex:multidex\" : \"2.0.1\", //http://bit.ly/2r6uX9G\n\"com.github.anrwatchdog:anrwatchdog\" : \"1.4.0\", //http://bit.ly/2NZvjZc\n\"com.jakewharton.rxrelay2:rxrelay\" : \"2.1.1\", //https://goo.gl/E643M0\n\"com.jakewharton.rxbinding2:rxbinding-appcompat-v7\" : \"2.2.0\", //https://goo.gl/KQ5Vga\n@@ -81,7 +81,7 @@ ext {\n\"com.wang.avi:library\" : \"2.1.3\", //http://bit.ly/2NVrDaI\n\"com.github.bumptech.glide:glide\" : \"4.11.0\", //http://bit.ly/2Q7Fa41\n\"com.google.android.gms:play-services-location\" : \"17.0.0\", //http://bit.ly/2CulYrn\n- \"androidx.exifinterface:exifinterface\" : \"1.0.0\", //http://bit.ly/2DPqlw6\n+ \"androidx.exifinterface:exifinterface\" : \"1.1.0\", //http://bit.ly/2DPqlw6\n\"io.reactivex.rxjava2:rxkotlin\" : \"2.4.0\", //https://bit.ly/2yaZ7zn\n\"com.google.firebase:firebase-messaging\" : \"20.1.3\", //http://bit.ly/2Q81pGJ\n\"androidx.core:core\" : \"1.2.0\", //https://bit.ly/2yYY82h\n"
},
{
"change_type": "MODIFY",
"old_path": "template/f-debug/build.gradle",
"new_path": "template/f-debug/build.gradle",
"diff": "@@ -16,7 +16,6 @@ dependencies {\n// leak canary\nimplementation \"com.squareup.leakcanary:leakcanary-android:$leakCanaryVersion\"\n- implementation \"com.squareup.leakcanary:leakcanary-support-fragment:$leakCanaryVersion\"\n//chunk\nimplementation \"com.readystatesoftware.chuck:library:$chuckVersion\"\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 \"com.annimon:stream:$annimonStreamVersion\"\nimplementation \"org.robolectric:robolectric:$robolectricVersion\"\nimplementation \"org.robolectric:shadows-multidex:$robolectricVersion\"\n- implementation \"com.squareup.leakcanary:leakcanary-android-no-op:$leakCanaryVersion\"\nimplementation \"com.google.dagger:dagger:$daggerVersion\"\nkapt \"com.google.dagger:dagger-compiler:$daggerVersion\"\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "template/unitTestConfiguration.gradle",
"new_path": "template/unitTestConfiguration.gradle",
"diff": "@@ -16,7 +16,6 @@ dependencies {\ntestImplementation \"com.annimon:stream:$annimonStreamVersion\"\ntestImplementation \"org.robolectric:robolectric:$robolectricVersion\"\ntestImplementation \"org.robolectric:shadows-multidex:$robolectricVersion\"\n- testImplementation \"com.squareup.leakcanary:leakcanary-android-no-op:$leakCanaryVersion\"\ntestImplementation \"com.google.dagger:dagger:$daggerVersion\"\nkaptTest \"com.google.dagger:dagger-compiler:$daggerVersion\"\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | Raised all versions of template |
652,335 | 30.03.2020 16:56:55 | -10,800 | 7ceba6838e62bc8c6547482658f9e0866d0c2c01 | Increase global alpha version counter to 98 [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\": 8,\n+ \"unstable_version\": 9,\n\"stable\": false,\n\"dir\": \"easyadapter\",\n\"libs\": [\n{\n\"id\": \"template\",\n\"version\": \"0.5.0\",\n- \"unstable_version\": 19,\n+ \"unstable_version\": 20,\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\": 97,\n+ \"unstable_version\": 98,\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 98 [skip ci] [version] |
652,312 | 27.03.2020 17:16:07 | -10,800 | b221dc5469e01708cd1ac8dd2f9b98be26e86b8d | Refactoring recycler-extension-sample | [
{
"change_type": "MODIFY",
"old_path": "recycler-extension/sample/src/main/java/ru/surfstudio/android/recycler/extension/sample/MainActivity.kt",
"new_path": "recycler-extension/sample/src/main/java/ru/surfstudio/android/recycler/extension/sample/MainActivity.kt",
"diff": "@@ -31,41 +31,25 @@ class MainActivity : AppCompatActivity() {\nsetContentView(R.layout.activity_main)\nstickyEasyAdapter = StickyEasyAdapter(activity_main_recycler, isVisibleFirstFooterAtLaunch = true)\n- stickyEasyAdapter.stickyLayoutManager.setStickyHeaderListener(object : StickyHeaderListener {\n+ stickyEasyAdapter.stickyLayoutManager.setStickyHeaderListener(\n+ object : StickyHeaderListener {\noverride fun headerAttached(headerView: View, adapterPosition: Int) = log(\"headerAttached\")\noverride fun headerDetached(headerView: View, adapterPosition: Int) = log(\"headerDetached\")\n- })\n+ }\n+ )\n- stickyEasyAdapter.stickyLayoutManager.setStickyFooterListener(object : StickyFooterListener {\n+ stickyEasyAdapter.stickyLayoutManager.setStickyFooterListener(\n+ object : StickyFooterListener {\noverride fun footerAttached(footerView: View, adapterPosition: Int) = log(\"footerAttached\")\noverride fun footerDetached(footerView: View, adapterPosition: Int) = log(\"footerDetached\")\n- })\n- activity_main_recycler.adapter = stickyEasyAdapter\n-\n- val itemList = generateData()\n- /*itemList.addStickyHeaderIf({ prev, next ->\n- val prv = prev as? Data\n- val nxt = next as? Data\n- if (prv?.rank != nxt?.rank) {\n- nxt?.rank\n- } else {\n- null\n}\n- }, stickyHeaderItemController)*/\n- /*itemList.addStickyFooterIf({ prev, next ->\n- val prv = prev as? Data\n- val nxt = next as? Data\n- if (prv?.rank != nxt?.rank) {\n- nxt?.rank\n- } else {\n- null\n- }\n- }, stickyFooterItemController)*/\n- stickyEasyAdapter.setItems(itemList)\n+ )\n+ activity_main_recycler.adapter = stickyEasyAdapter\n+ stickyEasyAdapter.setItems(generateData())\n}\nprivate fun generateData() = ItemList().apply {\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-958 Refactoring recycler-extension-sample |
652,312 | 30.03.2020 15:16:57 | -10,800 | 95c264e55d18b35edec26e6ce657fecb4625c445 | Add StickyRecyclerActivity | [
{
"change_type": "MODIFY",
"old_path": "easyadapter/sample/src/androidTest/java/ru/surfstudio/android/easyadapter/sample/EasyAdapterSampleTest.kt",
"new_path": "easyadapter/sample/src/androidTest/java/ru/surfstudio/android/easyadapter/sample/EasyAdapterSampleTest.kt",
"diff": "@@ -26,9 +26,9 @@ class EasyAdapterSampleTest : BaseSampleTest<MainActivityView>(MainActivityView:\ncheckIfToastIsVisible(\"Value = 0\")\n}\n)\n- test(R.id.show_paginationable_list, PaginationListActivityView::class.java)\n- test(R.id.show_async_inflate_list, AsyncInflateListActivityView::class.java)\n- test(R.id.show_async_diff_list, AsyncDiffActivityView::class.java)\n+ test(R.id.show_paginationable_list_btn, PaginationListActivityView::class.java)\n+ test(R.id.show_async_inflate_list_btn, AsyncInflateListActivityView::class.java)\n+ test(R.id.show_async_diff_list_btn, AsyncDiffActivityView::class.java)\n}\nprivate fun <T> test(\n"
},
{
"change_type": "MODIFY",
"old_path": "easyadapter/sample/src/main/java/ru/surfstudio/android/easyadapter/sample/ui/screen/main/MainActivityView.kt",
"new_path": "easyadapter/sample/src/main/java/ru/surfstudio/android/easyadapter/sample/ui/screen/main/MainActivityView.kt",
"diff": "@@ -27,9 +27,9 @@ class MainActivityView : BaseRenderableActivityView<MainScreenModel>() {\nviewRecreated: Boolean) {\nsuper.onCreate(savedInstanceState, persistentState, viewRecreated)\nshow_multitype_list_btn.setOnClickListener { presenter.showMultitypeList() }\n- show_paginationable_list.setOnClickListener { presenter.showPagintationList() }\n- show_async_inflate_list.setOnClickListener { presenter.showAsyncInflateList() }\n- show_async_diff_list.setOnClickListener { presenter.showAsyncDiffList() }\n+ show_paginationable_list_btn.setOnClickListener { presenter.showPagintationList() }\n+ show_async_inflate_list_btn.setOnClickListener { presenter.showAsyncInflateList() }\n+ show_async_diff_list_btn.setOnClickListener { presenter.showAsyncDiffList() }\n}\noverride fun renderInternal(sm: MainScreenModel) {}\n"
},
{
"change_type": "MODIFY",
"old_path": "easyadapter/sample/src/main/res/layout/activity_main.xml",
"new_path": "easyadapter/sample/src/main/res/layout/activity_main.xml",
"diff": "android:text=\"@string/show_multitype_list_btn_text\" />\n<Button\n- android:id=\"@+id/show_paginationable_list\"\n+ android:id=\"@+id/show_paginationable_list_btn\"\nandroid:layout_width=\"wrap_content\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_marginTop=\"@dimen/default_margin\"\nandroid:text=\"@string/show_paginationable_list_btn_text\" />\n<Button\n- android:id=\"@+id/show_async_inflate_list\"\n+ android:id=\"@+id/show_async_inflate_list_btn\"\nandroid:layout_width=\"wrap_content\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_marginTop=\"@dimen/default_margin\"\nandroid:text=\"@string/show_async_inflate_list_btn_text\" />\n<Button\n- android:id=\"@+id/show_async_diff_list\"\n+ android:id=\"@+id/show_async_diff_list_btn\"\nandroid:layout_width=\"wrap_content\"\nandroid:layout_height=\"wrap_content\"\nandroid:layout_marginTop=\"@dimen/default_margin\"\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-extension/sample/src/androidTest/java/ru/surfstudio/android/recycler/extension/sample/RecyclerExtensionSampleTest.kt",
"new_path": "recycler-extension/sample/src/androidTest/java/ru/surfstudio/android/recycler/extension/sample/RecyclerExtensionSampleTest.kt",
"diff": "@@ -14,7 +14,7 @@ class RecyclerExtensionSampleTest : BaseSampleTest<MainActivity>(MainActivity::c\n@Test\nfun testRecyclerExtensionSample() {\ncheckText(STICKY_HEADER_TITLE, STICKY_FOOTER_TITLE)\n- RecyclerViewUtils.scrollTo(R.id.activity_main_recycler, LAST_ITEM_TITLE)\n+ RecyclerViewUtils.scrollTo(R.id.activity_sticky_recycler, LAST_ITEM_TITLE)\ncheckText(LAST_ITEM_TITLE)\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-extension/sample/src/main/AndroidManifest.xml",
"new_path": "recycler-extension/sample/src/main/AndroidManifest.xml",
"diff": "<category android:name=\"android.intent.category.LAUNCHER\" />\n</intent-filter>\n</activity>\n+ <activity android:name=\".screen.StickyRecyclerActivity\" />\n</application>\n</manifest>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-extension/sample/src/main/java/ru/surfstudio/android/recycler/extension/sample/screen/MainActivity.kt",
"new_path": "recycler-extension/sample/src/main/java/ru/surfstudio/android/recycler/extension/sample/screen/MainActivity.kt",
"diff": "package ru.surfstudio.android.recycler.extension.sample.screen\n+import android.content.Intent\nimport android.os.Bundle\n-import android.view.View\n+import android.widget.Button\nimport androidx.appcompat.app.AppCompatActivity\nimport kotlinx.android.synthetic.main.activity_main.*\n-import ru.surfstudio.android.easyadapter.ItemList\n-import ru.surfstudio.android.recycler.extension.sticky.addStickyFooter\n-import ru.surfstudio.android.recycler.extension.sticky.addStickyHeader\n-import ru.surfstudio.android.logger.Logger\nimport ru.surfstudio.android.recycler.extension.sample.R\n-import ru.surfstudio.android.recycler.extension.sample.controller.SampleItemController\n-import ru.surfstudio.android.recycler.extension.sample.controller.SampleStickyFooterItemController\n-import ru.surfstudio.android.recycler.extension.sample.controller.SampleStickyHeaderItemController\n-import ru.surfstudio.android.recycler.extension.sample.domain.Data\n-import ru.surfstudio.android.recycler.extension.sticky.*\n-import ru.surfstudio.android.recycler.extension.sticky.layoutmanager.StickyFooterListener\n-import ru.surfstudio.android.recycler.extension.sticky.layoutmanager.StickyHeaderListener\n-\n-const val STICKY_HEADER_TITLE = \"Sticky header title\"\n-const val STICKY_FOOTER_TITLE = \"Sticky footer title\"\n-const val LAST_ITEM_TITLE = \"Last item title\"\nclass MainActivity : AppCompatActivity() {\n- private lateinit var stickyEasyAdapter: StickyEasyAdapter\n- private val itemController = SampleItemController()\n- private val stickyHeaderItemController = SampleStickyHeaderItemController()\n- private val stickyFooterItemController = SampleStickyFooterItemController()\n-\noverride fun onCreate(savedInstanceState: Bundle?) {\nsuper.onCreate(savedInstanceState)\nsetContentView(R.layout.activity_main)\n-\n- stickyEasyAdapter = StickyEasyAdapter(activity_main_recycler, isVisibleFirstFooterAtLaunch = true)\n- stickyEasyAdapter.stickyLayoutManager.setStickyHeaderListener(\n- object : StickyHeaderListener {\n-\n- override fun headerAttached(headerView: View, adapterPosition: Int) = log(\"headerAttached\")\n-\n- override fun headerDetached(headerView: View, adapterPosition: Int) = log(\"headerDetached\")\n+ setOnClickListener(show_sticky_recycler_btn, StickyRecyclerActivity::class.java)\n+ //setOnClickListener(show_carousel_btn, StickyRecyclerActivity::class.java)\n}\n- )\n- stickyEasyAdapter.stickyLayoutManager.setStickyFooterListener(\n- object : StickyFooterListener {\n-\n- override fun footerAttached(footerView: View, adapterPosition: Int) = log(\"footerAttached\")\n-\n- override fun footerDetached(footerView: View, adapterPosition: Int) = log(\"footerDetached\")\n+ private fun setOnClickListener(btn: Button, activityClass: Class<*>) {\n+ btn.setOnClickListener {\n+ startActivity(Intent(this, activityClass))\n}\n- )\n- activity_main_recycler.adapter = stickyEasyAdapter\n- stickyEasyAdapter.setItems(generateData())\n}\n-\n- private fun generateData() = ItemList().apply {\n- add(Data(\"Scooby-Doo\", \"Main characters\"), itemController)\n- add(Data(\"Shaggy Rogers\", \"Main characters\"), itemController)\n- add(Data(\"Fred Jones\", \"Main characters\"), itemController)\n- add(Data(\"Daphne Blake\", \"Main characters\"), itemController)\n- add(Data(\"Velma Dinkley\", \"Main characters\"), itemController)\n- add(Data(\"Scrappy-Doo\", \"Secondary characters\"), itemController)\n- add(Data(\"Scooby-Dum\", \"Secondary characters\"), itemController)\n- add(Data(\"Yabba-Doo\", \"Secondary characters\"), itemController)\n- add(Data(\"Yabba-Doo\", \"Secondary characters\"), itemController)\n- add(Data(\"Yabba-Doo\", \"Secondary characters\"), itemController)\n- add(Data(\"Yabba-Doo\", \"Secondary characters\"), itemController)\n- addStickyHeader(STICKY_HEADER_TITLE, stickyHeaderItemController)\n- add(Data(\"Yabba-Doo\", \"Secondary characters\"), itemController)\n- add(Data(\"Yabba-Doo\", \"Secondary characters\"), itemController)\n- add(Data(\"Yabba-Doo\", \"Secondary characters\"), itemController)\n- add(Data(\"Yabba-Doo\", \"Secondary characters\"), itemController)\n- add(Data(\"Yabba-Doo\", \"Secondary characters\"), itemController)\n- add(Data(\"Yabba-Doo\", \"Secondary characters\"), itemController)\n- add(Data(\"Yabba-Doo\", \"Secondary characters\"), itemController)\n- add(Data(\"Scooby-Dee\", \"Secondary characters\"), itemController)\n- add(Data(\"Vincent Van Ghoul\", \"Introduced in The 13 Ghosts of Scooby-Doo\"), itemController)\n- add(Data(\"Flim Flam\", \"Introduced in The 13 Ghosts of Scooby-Doo\"), itemController)\n- add(Data(\"Weerd and Bogel\", \"Introduced in The 13 Ghosts of Scooby-Doo\"), itemController)\n- add(Data(\"The Hex Girls\", \"Introduced in Scooby-Doo and the Witch\\'s Ghost\"), itemController)\n- add(Data(\"Thorn\", \"Introduced in Scooby-Doo and the Witch\\'s Ghost\"), itemController)\n- add(Data(\"Dusk\", \"Introduced in Scooby-Doo and the Witch\\'s Ghost\"), itemController)\n- add(Data(\"Luna\", \"Introduced in Scooby-Doo and the Witch\\'s Ghost\"), itemController)\n- add(Data(\"Red Herring\", \"Introduced in A Pup Named Scooby-Doo\"), itemController)\n- add(Data(\"Sheriff Bronson Stone\", \"Introduced in Scooby-Doo! Mystery Incorporated\"), itemController)\n- add(Data(\"Hot Dog Water\", \"Introduced in Scooby-Doo! Mystery Incorporated\"), itemController)\n- addStickyFooter(STICKY_FOOTER_TITLE, stickyFooterItemController)\n- add(Data(\"Mayor Fred Jones, Sr.\", \"Introduced in Scooby-Doo! Mystery Incorporated\"), itemController)\n- add(Data(\"Mayor Janet Nettles\", \"Introduced in Scooby-Doo! Mystery Incorporated\"), itemController)\n- add(Data(\"Mr. E (Ricky Owens)\", \"Introduced in Scooby-Doo! Mystery Incorporated\"), itemController)\n- add(Data(\"Angel Dynamite (Cassidy Williams)\", \"Introduced in Scooby-Doo! Mystery Incorporated\"), itemController)\n- add(Data(\"Professor Pericles\", \"Introduced in Scooby-Doo! Mystery Incorporated\"), itemController)\n- add(Data(\"Brad Chiles and Judy Reeves\", \"Introduced in Scooby-Doo! Mystery Incorporated\"), itemController)\n- add(Data(\"Nova\", \"Introduced in Scooby-Doo! Mystery Incorporated\"), itemController)\n- add(Data(\"Alice May\", \"Introduced in Scooby-Doo! Mystery Incorporated\"), itemController)\n- add(Data(\"The Evil Entity\", \"Introduced in Scooby-Doo! Mystery Incorporated\"), itemController)\n- add(Data(LAST_ITEM_TITLE, \"\"), itemController)\n- }\n-\n- private fun log(message: String) = Logger.d(\"RecyclerExtension $message\")\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "recycler-extension/sample/src/main/java/ru/surfstudio/android/recycler/extension/sample/screen/StickyRecyclerActivity.kt",
"diff": "+package ru.surfstudio.android.recycler.extension.sample.screen\n+\n+import android.os.Bundle\n+import android.view.View\n+import androidx.appcompat.app.AppCompatActivity\n+import kotlinx.android.synthetic.main.activity_sticly_recycler.*\n+import ru.surfstudio.android.easyadapter.ItemList\n+import ru.surfstudio.android.logger.Logger\n+import ru.surfstudio.android.recycler.extension.sample.R\n+import ru.surfstudio.android.recycler.extension.sample.controller.SampleItemController\n+import ru.surfstudio.android.recycler.extension.sample.controller.SampleStickyFooterItemController\n+import ru.surfstudio.android.recycler.extension.sample.controller.SampleStickyHeaderItemController\n+import ru.surfstudio.android.recycler.extension.sample.domain.Data\n+import ru.surfstudio.android.recycler.extension.sticky.StickyEasyAdapter\n+import ru.surfstudio.android.recycler.extension.sticky.addStickyFooter\n+import ru.surfstudio.android.recycler.extension.sticky.addStickyHeader\n+import ru.surfstudio.android.recycler.extension.sticky.layoutmanager.StickyFooterListener\n+import ru.surfstudio.android.recycler.extension.sticky.layoutmanager.StickyHeaderListener\n+\n+const val STICKY_HEADER_TITLE = \"Sticky header title\"\n+const val STICKY_FOOTER_TITLE = \"Sticky footer title\"\n+const val LAST_ITEM_TITLE = \"Last item title\"\n+\n+/**\n+ * Sample of using [StickyEasyAdapter]\n+ */\n+class StickyRecyclerActivity : AppCompatActivity() {\n+\n+ private lateinit var stickyEasyAdapter: StickyEasyAdapter\n+ private val itemController = SampleItemController()\n+ private val stickyHeaderItemController = SampleStickyHeaderItemController()\n+ private val stickyFooterItemController = SampleStickyFooterItemController()\n+\n+ override fun onCreate(savedInstanceState: Bundle?) {\n+ super.onCreate(savedInstanceState)\n+ setContentView(R.layout.activity_sticly_recycler)\n+\n+ stickyEasyAdapter = StickyEasyAdapter(activity_sticky_recycler, isVisibleFirstFooterAtLaunch = true)\n+ stickyEasyAdapter.stickyLayoutManager.setStickyHeaderListener(\n+ object : StickyHeaderListener {\n+\n+ override fun headerAttached(headerView: View, adapterPosition: Int) = log(\"headerAttached\")\n+\n+ override fun headerDetached(headerView: View, adapterPosition: Int) = log(\"headerDetached\")\n+ }\n+ )\n+\n+ stickyEasyAdapter.stickyLayoutManager.setStickyFooterListener(\n+ object : StickyFooterListener {\n+\n+ override fun footerAttached(footerView: View, adapterPosition: Int) = log(\"footerAttached\")\n+\n+ override fun footerDetached(footerView: View, adapterPosition: Int) = log(\"footerDetached\")\n+ }\n+ )\n+ activity_sticky_recycler.adapter = stickyEasyAdapter\n+ stickyEasyAdapter.setItems(generateData())\n+ }\n+\n+ private fun generateData() = ItemList().apply {\n+ add(Data(\"Scooby-Doo\", \"Main characters\"), itemController)\n+ add(Data(\"Shaggy Rogers\", \"Main characters\"), itemController)\n+ add(Data(\"Fred Jones\", \"Main characters\"), itemController)\n+ add(Data(\"Daphne Blake\", \"Main characters\"), itemController)\n+ add(Data(\"Velma Dinkley\", \"Main characters\"), itemController)\n+ add(Data(\"Scrappy-Doo\", \"Secondary characters\"), itemController)\n+ add(Data(\"Scooby-Dum\", \"Secondary characters\"), itemController)\n+ add(Data(\"Yabba-Doo\", \"Secondary characters\"), itemController)\n+ add(Data(\"Yabba-Doo\", \"Secondary characters\"), itemController)\n+ add(Data(\"Yabba-Doo\", \"Secondary characters\"), itemController)\n+ add(Data(\"Yabba-Doo\", \"Secondary characters\"), itemController)\n+ addStickyHeader(STICKY_HEADER_TITLE, stickyHeaderItemController)\n+ add(Data(\"Yabba-Doo\", \"Secondary characters\"), itemController)\n+ add(Data(\"Yabba-Doo\", \"Secondary characters\"), itemController)\n+ add(Data(\"Yabba-Doo\", \"Secondary characters\"), itemController)\n+ add(Data(\"Yabba-Doo\", \"Secondary characters\"), itemController)\n+ add(Data(\"Yabba-Doo\", \"Secondary characters\"), itemController)\n+ add(Data(\"Yabba-Doo\", \"Secondary characters\"), itemController)\n+ add(Data(\"Yabba-Doo\", \"Secondary characters\"), itemController)\n+ add(Data(\"Scooby-Dee\", \"Secondary characters\"), itemController)\n+ add(Data(\"Vincent Van Ghoul\", \"Introduced in The 13 Ghosts of Scooby-Doo\"), itemController)\n+ add(Data(\"Flim Flam\", \"Introduced in The 13 Ghosts of Scooby-Doo\"), itemController)\n+ add(Data(\"Weerd and Bogel\", \"Introduced in The 13 Ghosts of Scooby-Doo\"), itemController)\n+ add(Data(\"The Hex Girls\", \"Introduced in Scooby-Doo and the Witch\\'s Ghost\"), itemController)\n+ add(Data(\"Thorn\", \"Introduced in Scooby-Doo and the Witch\\'s Ghost\"), itemController)\n+ add(Data(\"Dusk\", \"Introduced in Scooby-Doo and the Witch\\'s Ghost\"), itemController)\n+ add(Data(\"Luna\", \"Introduced in Scooby-Doo and the Witch\\'s Ghost\"), itemController)\n+ add(Data(\"Red Herring\", \"Introduced in A Pup Named Scooby-Doo\"), itemController)\n+ add(Data(\"Sheriff Bronson Stone\", \"Introduced in Scooby-Doo! Mystery Incorporated\"), itemController)\n+ add(Data(\"Hot Dog Water\", \"Introduced in Scooby-Doo! Mystery Incorporated\"), itemController)\n+ addStickyFooter(STICKY_FOOTER_TITLE, stickyFooterItemController)\n+ add(Data(\"Mayor Fred Jones, Sr.\", \"Introduced in Scooby-Doo! Mystery Incorporated\"), itemController)\n+ add(Data(\"Mayor Janet Nettles\", \"Introduced in Scooby-Doo! Mystery Incorporated\"), itemController)\n+ add(Data(\"Mr. E (Ricky Owens)\", \"Introduced in Scooby-Doo! Mystery Incorporated\"), itemController)\n+ add(Data(\"Angel Dynamite (Cassidy Williams)\", \"Introduced in Scooby-Doo! Mystery Incorporated\"), itemController)\n+ add(Data(\"Professor Pericles\", \"Introduced in Scooby-Doo! Mystery Incorporated\"), itemController)\n+ add(Data(\"Brad Chiles and Judy Reeves\", \"Introduced in Scooby-Doo! Mystery Incorporated\"), itemController)\n+ add(Data(\"Nova\", \"Introduced in Scooby-Doo! Mystery Incorporated\"), itemController)\n+ add(Data(\"Alice May\", \"Introduced in Scooby-Doo! Mystery Incorporated\"), itemController)\n+ add(Data(\"The Evil Entity\", \"Introduced in Scooby-Doo! Mystery Incorporated\"), itemController)\n+ add(Data(LAST_ITEM_TITLE, \"\"), itemController)\n+ }\n+\n+ private fun log(message: String) = Logger.d(\"RecyclerExtension $message\")\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-extension/sample/src/main/res/layout/activity_main.xml",
"new_path": "recycler-extension/sample/src/main/res/layout/activity_main.xml",
"diff": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\n- xmlns:tools=\"http://schemas.android.com/tools\"\n+<LinearLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"match_parent\"\n- tools:context=\"ru.surfstudio.android.recycler.extension.sample.screen.MainActivity\">\n+ android:orientation=\"vertical\"\n+ android:padding=\"@dimen/default_margin\">\n- <androidx.recyclerview.widget.RecyclerView\n- android:id=\"@+id/activity_main_recycler\"\n- android:layout_width=\"match_parent\"\n- android:layout_height=\"match_parent\" />\n+ <Button\n+ android:id=\"@+id/show_sticky_recycler_btn\"\n+ android:layout_width=\"wrap_content\"\n+ android:layout_height=\"wrap_content\"\n+ android:layout_marginTop=\"@dimen/default_margin\"\n+ android:text=\"@string/show_sticky_recycler_btn_text\" />\n+\n+ <Button\n+ android:id=\"@+id/show_carousel_btn\"\n+ android:layout_width=\"wrap_content\"\n+ android:layout_height=\"wrap_content\"\n+ android:layout_marginTop=\"@dimen/default_margin\"\n+ android:text=\"@string/show_carousel_btn_text\" />\n-</androidx.coordinatorlayout.widget.CoordinatorLayout>\n+</LinearLayout>\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "recycler-extension/sample/src/main/res/layout/activity_sticly_recycler.xml",
"diff": "+<?xml version=\"1.0\" encoding=\"utf-8\"?>\n+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\n+ xmlns:tools=\"http://schemas.android.com/tools\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"match_parent\"\n+ tools:context=\"ru.surfstudio.android.recycler.extension.sample.screen.MainActivity\">\n+\n+ <androidx.recyclerview.widget.RecyclerView\n+ android:id=\"@+id/activity_sticky_recycler\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"match_parent\" />\n+\n+</androidx.coordinatorlayout.widget.CoordinatorLayout>\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-extension/sample/src/main/res/values/strings.xml",
"new_path": "recycler-extension/sample/src/main/res/values/strings.xml",
"diff": "<resources>\n<string name=\"app_name\">Recycler extension sample</string>\n+\n+ <string name=\"show_sticky_recycler_btn_text\">Show sticky recycler view</string>\n+ <string name=\"show_carousel_btn_text\">Show carousel sample</string>\n</resources>\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-958 Add StickyRecyclerActivity |
652,312 | 30.03.2020 15:46:44 | -10,800 | 13d9afb0a0ca5cf6af1a525ef06ea4de77328a8b | Add CarouselActivity | [
{
"change_type": "MODIFY",
"old_path": "recycler-extension/sample/src/androidTest/java/ru/surfstudio/android/recycler/extension/sample/RecyclerExtensionSampleTest.kt",
"new_path": "recycler-extension/sample/src/androidTest/java/ru/surfstudio/android/recycler/extension/sample/RecyclerExtensionSampleTest.kt",
"diff": "@@ -14,7 +14,7 @@ class RecyclerExtensionSampleTest : BaseSampleTest<MainActivity>(MainActivity::c\n@Test\nfun testRecyclerExtensionSample() {\ncheckText(STICKY_HEADER_TITLE, STICKY_FOOTER_TITLE)\n- RecyclerViewUtils.scrollTo(R.id.activity_sticky_recycler, LAST_ITEM_TITLE)\n+ RecyclerViewUtils.scrollTo(R.id.sticky_rv, LAST_ITEM_TITLE)\ncheckText(LAST_ITEM_TITLE)\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-extension/sample/src/main/AndroidManifest.xml",
"new_path": "recycler-extension/sample/src/main/AndroidManifest.xml",
"diff": "</intent-filter>\n</activity>\n<activity android:name=\".screen.StickyRecyclerActivity\" />\n+ <activity android:name=\".screen.CarouselActivity\" />\n</application>\n</manifest>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-extension/sample/src/main/java/ru/surfstudio/android/recycler/extension/sample/controller/SampleItemController.kt",
"new_path": "recycler-extension/sample/src/main/java/ru/surfstudio/android/recycler/extension/sample/controller/SampleItemController.kt",
"diff": "package ru.surfstudio.android.recycler.extension.sample.controller\nimport android.view.ViewGroup\n+import android.widget.LinearLayout\nimport android.widget.TextView\nimport ru.surfstudio.android.easyadapter.controller.BindableItemController\nimport ru.surfstudio.android.easyadapter.holder.BindableViewHolder\nimport ru.surfstudio.android.recycler.extension.sample.domain.Data\nimport ru.surfstudio.android.recycler.extension.sample.R\n-class SampleItemController : BindableItemController<Data, SampleItemController.Holder>() {\n+class SampleItemController(\n+ private val isFullScreen: Boolean = false\n+) : BindableItemController<Data, SampleItemController.Holder>() {\n+\noverride fun getItemId(data: Data): String = data.hashCode().toString()\noverride fun createViewHolder(parent: ViewGroup?): Holder = Holder(parent)\ninner class Holder(parent: ViewGroup?) : BindableViewHolder<Data>(parent, R.layout.item_list_sample) {\n+\nprivate var textView: TextView = itemView.findViewById(R.id.item_list_sample_tv)\n+ private var container: LinearLayout = itemView.findViewById(R.id.container)\n+\noverride fun bind(data: Data?) {\ntextView.text = data?.name\n+\n+ (container.layoutParams as LinearLayout.LayoutParams).apply {\n+ height = if (isFullScreen)\n+ LinearLayout.LayoutParams.MATCH_PARENT\n+ else\n+ LinearLayout.LayoutParams.WRAP_CONTENT\n+ }\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "recycler-extension/sample/src/main/java/ru/surfstudio/android/recycler/extension/sample/screen/CarouselActivity.kt",
"diff": "+package ru.surfstudio.android.recycler.extension.sample.screen\n+\n+import android.os.Bundle\n+import androidx.appcompat.app.AppCompatActivity\n+import kotlinx.android.synthetic.main.activity_carousel.*\n+import ru.surfstudio.android.easyadapter.ItemList\n+import ru.surfstudio.android.recycler.extension.CarouselView\n+import ru.surfstudio.android.recycler.extension.sample.R\n+import ru.surfstudio.android.recycler.extension.sample.controller.SampleItemController\n+import ru.surfstudio.android.recycler.extension.sample.domain.Data\n+import ru.surfstudio.android.recycler.extension.snaphelper.PagerSnapHelper\n+\n+/**\n+ * Sample using of [CarouselView]\n+ */\n+class CarouselActivity : AppCompatActivity() {\n+\n+ private val itemController = SampleItemController(true)\n+\n+ override fun onCreate(savedInstanceState: Bundle?) {\n+ super.onCreate(savedInstanceState)\n+ setContentView(R.layout.activity_carousel)\n+ with(sample_carousel_view) {\n+ setSnapHelper(PagerSnapHelper(context))\n+ render(generateData())\n+ }\n+ }\n+\n+ private fun generateData() = ItemList().apply {\n+ add(Data(\"Scooby-Doo\", \"Main characters\"), itemController)\n+ add(Data(\"Shaggy Rogers\", \"Main characters\"), itemController)\n+ add(Data(\"Fred Jones\", \"Main characters\"), itemController)\n+ add(Data(\"Daphne Blake\", \"Main characters\"), itemController)\n+ add(Data(\"Velma Dinkley\", \"Main characters\"), itemController)\n+ add(Data(\"Scrappy-Doo\", \"Secondary characters\"), itemController)\n+ add(Data(LAST_ITEM_TITLE, \"\"), itemController)\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-extension/sample/src/main/java/ru/surfstudio/android/recycler/extension/sample/screen/MainActivity.kt",
"new_path": "recycler-extension/sample/src/main/java/ru/surfstudio/android/recycler/extension/sample/screen/MainActivity.kt",
"diff": "@@ -13,7 +13,7 @@ class MainActivity : AppCompatActivity() {\nsuper.onCreate(savedInstanceState)\nsetContentView(R.layout.activity_main)\nsetOnClickListener(show_sticky_recycler_btn, StickyRecyclerActivity::class.java)\n- //setOnClickListener(show_carousel_btn, StickyRecyclerActivity::class.java)\n+ setOnClickListener(show_carousel_btn, CarouselActivity::class.java)\n}\nprivate fun setOnClickListener(btn: Button, activityClass: Class<*>) {\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-extension/sample/src/main/java/ru/surfstudio/android/recycler/extension/sample/screen/StickyRecyclerActivity.kt",
"new_path": "recycler-extension/sample/src/main/java/ru/surfstudio/android/recycler/extension/sample/screen/StickyRecyclerActivity.kt",
"diff": "@@ -17,12 +17,12 @@ import ru.surfstudio.android.recycler.extension.sticky.addStickyHeader\nimport ru.surfstudio.android.recycler.extension.sticky.layoutmanager.StickyFooterListener\nimport ru.surfstudio.android.recycler.extension.sticky.layoutmanager.StickyHeaderListener\n-const val STICKY_HEADER_TITLE = \"Sticky header title\"\n-const val STICKY_FOOTER_TITLE = \"Sticky footer title\"\n+private const val STICKY_HEADER_TITLE = \"Sticky header title\"\n+private const val STICKY_FOOTER_TITLE = \"Sticky footer title\"\nconst val LAST_ITEM_TITLE = \"Last item title\"\n/**\n- * Sample of using [StickyEasyAdapter]\n+ * Sample using of [StickyEasyAdapter]\n*/\nclass StickyRecyclerActivity : AppCompatActivity() {\n@@ -35,7 +35,7 @@ class StickyRecyclerActivity : AppCompatActivity() {\nsuper.onCreate(savedInstanceState)\nsetContentView(R.layout.activity_sticly_recycler)\n- stickyEasyAdapter = StickyEasyAdapter(activity_sticky_recycler, isVisibleFirstFooterAtLaunch = true)\n+ stickyEasyAdapter = StickyEasyAdapter(sticky_rv, isVisibleFirstFooterAtLaunch = true)\nstickyEasyAdapter.stickyLayoutManager.setStickyHeaderListener(\nobject : StickyHeaderListener {\n@@ -53,7 +53,7 @@ class StickyRecyclerActivity : AppCompatActivity() {\noverride fun footerDetached(footerView: View, adapterPosition: Int) = log(\"footerDetached\")\n}\n)\n- activity_sticky_recycler.adapter = stickyEasyAdapter\n+ sticky_rv.adapter = stickyEasyAdapter\nstickyEasyAdapter.setItems(generateData())\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "recycler-extension/sample/src/main/java/ru/surfstudio/android/recycler/extension/sample/view/SampleCarouselView.kt",
"diff": "+package ru.surfstudio.android.recycler.extension.sample.view\n+\n+import android.content.Context\n+import android.util.AttributeSet\n+import ru.surfstudio.android.recycler.extension.CarouselView\n+import ru.surfstudio.android.recycler.extension.sample.domain.Data\n+\n+class SampleCarouselView @JvmOverloads constructor(\n+ context: Context,\n+ attributeSet: AttributeSet? = null\n+) : CarouselView<Data>(context, attributeSet)\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "recycler-extension/sample/src/main/res/layout/activity_carousel.xml",
"diff": "+<?xml version=\"1.0\" encoding=\"utf-8\"?>\n+<LinearLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\n+ xmlns:app=\"http://schemas.android.com/apk/res-auto\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"match_parent\"\n+ android:orientation=\"vertical\">\n+\n+ <ru.surfstudio.android.recycler.extension.sample.view.SampleCarouselView\n+ android:id=\"@+id/sample_carousel_view\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"wrap_content\"\n+ app:isInfinite=\"true\" />\n+\n+</LinearLayout>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-extension/sample/src/main/res/layout/activity_sticly_recycler.xml",
"new_path": "recycler-extension/sample/src/main/res/layout/activity_sticly_recycler.xml",
"diff": "tools:context=\"ru.surfstudio.android.recycler.extension.sample.screen.MainActivity\">\n<androidx.recyclerview.widget.RecyclerView\n- android:id=\"@+id/activity_sticky_recycler\"\n+ android:id=\"@+id/sticky_rv\"\nandroid:layout_width=\"match_parent\"\nandroid:layout_height=\"match_parent\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-extension/sample/src/main/res/layout/item_list_sample.xml",
"new_path": "recycler-extension/sample/src/main/res/layout/item_list_sample.xml",
"diff": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\n+<LinearLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\n+ android:id=\"@+id/container\"\nandroid:layout_width=\"match_parent\"\n- android:layout_height=\"wrap_content\">\n+ android:layout_height=\"match_parent\"\n+ android:orientation=\"vertical\">\n<TextView\nandroid:id=\"@+id/item_list_sample_tv\"\nandroid:layout_width=\"wrap_content\"\nandroid:layout_height=\"24dp\"\n+ android:layout_gravity=\"center\"\n+ android:gravity=\"center\"\nandroid:paddingStart=\"16dp\"\nandroid:paddingEnd=\"16dp\" />\n-</androidx.coordinatorlayout.widget.CoordinatorLayout>\n\\ No newline at end of file\n+</LinearLayout>\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-958 Add CarouselActivity |
652,312 | 30.03.2020 17:34:33 | -10,800 | 1ada14aaa1367c9f97efbaf726ce8d5ac9627e68 | Update recycler-extension-sample | [
{
"change_type": "MODIFY",
"old_path": "recycler-extension/sample/src/main/java/ru/surfstudio/android/recycler/extension/sample/controller/SampleItemController.kt",
"new_path": "recycler-extension/sample/src/main/java/ru/surfstudio/android/recycler/extension/sample/controller/SampleItemController.kt",
"diff": "package ru.surfstudio.android.recycler.extension.sample.controller\nimport android.view.ViewGroup\n-import android.widget.LinearLayout\nimport android.widget.TextView\nimport ru.surfstudio.android.easyadapter.controller.BindableItemController\nimport ru.surfstudio.android.easyadapter.holder.BindableViewHolder\n@@ -16,20 +15,20 @@ class SampleItemController(\noverride fun createViewHolder(parent: ViewGroup?): Holder = Holder(parent)\n- inner class Holder(parent: ViewGroup?) : BindableViewHolder<Data>(parent, R.layout.item_list_sample) {\n+ inner class Holder(\n+ parent: ViewGroup?\n+ ) : BindableViewHolder<Data>(parent, R.layout.item_list_sample) {\nprivate var textView: TextView = itemView.findViewById(R.id.item_list_sample_tv)\n- private var container: LinearLayout = itemView.findViewById(R.id.container)\n+\n+ init {\n+ if (isFullScreen) {\n+ textView.layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT\n+ }\n+ }\noverride fun bind(data: Data?) {\ntextView.text = data?.name\n-\n- (container.layoutParams as LinearLayout.LayoutParams).apply {\n- height = if (isFullScreen)\n- LinearLayout.LayoutParams.MATCH_PARENT\n- else\n- LinearLayout.LayoutParams.WRAP_CONTENT\n- }\n}\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-extension/sample/src/main/java/ru/surfstudio/android/recycler/extension/sample/screen/CarouselActivity.kt",
"new_path": "recycler-extension/sample/src/main/java/ru/surfstudio/android/recycler/extension/sample/screen/CarouselActivity.kt",
"diff": "@@ -2,13 +2,13 @@ package ru.surfstudio.android.recycler.extension.sample.screen\nimport android.os.Bundle\nimport androidx.appcompat.app.AppCompatActivity\n+import androidx.recyclerview.widget.PagerSnapHelper\nimport kotlinx.android.synthetic.main.activity_carousel.*\nimport ru.surfstudio.android.easyadapter.ItemList\nimport ru.surfstudio.android.recycler.extension.CarouselView\nimport ru.surfstudio.android.recycler.extension.sample.R\nimport ru.surfstudio.android.recycler.extension.sample.controller.SampleItemController\nimport ru.surfstudio.android.recycler.extension.sample.domain.Data\n-import ru.surfstudio.android.recycler.extension.snaphelper.PagerSnapHelper\n/**\n* Sample using of [CarouselView]\n@@ -21,7 +21,7 @@ class CarouselActivity : AppCompatActivity() {\nsuper.onCreate(savedInstanceState)\nsetContentView(R.layout.activity_carousel)\nwith(sample_carousel_view) {\n- setSnapHelper(PagerSnapHelper(context))\n+ setSnapHelper(PagerSnapHelper())\nrender(generateData())\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-extension/sample/src/main/res/layout/activity_carousel.xml",
"new_path": "recycler-extension/sample/src/main/res/layout/activity_carousel.xml",
"diff": "<ru.surfstudio.android.recycler.extension.sample.view.SampleCarouselView\nandroid:id=\"@+id/sample_carousel_view\"\nandroid:layout_width=\"match_parent\"\n- android:layout_height=\"wrap_content\"\n+ android:layout_height=\"match_parent\"\napp:isInfinite=\"true\" />\n</LinearLayout>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-extension/sample/src/main/res/layout/item_list_sample.xml",
"new_path": "recycler-extension/sample/src/main/res/layout/item_list_sample.xml",
"diff": "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n-<LinearLayout xmlns:android=\"http://schemas.android.com/apk/res/android\"\n- android:id=\"@+id/container\"\n- android:layout_width=\"match_parent\"\n- android:layout_height=\"match_parent\"\n- android:orientation=\"vertical\">\n-\n- <TextView\n+<TextView xmlns:android=\"http://schemas.android.com/apk/res/android\"\n+ xmlns:tools=\"http://schemas.android.com/tools\"\nandroid:id=\"@+id/item_list_sample_tv\"\n- android:layout_width=\"wrap_content\"\n- android:layout_height=\"24dp\"\n- android:layout_gravity=\"center\"\n+ android:layout_width=\"match_parent\"\n+ android:layout_height=\"wrap_content\"\nandroid:gravity=\"center\"\n- android:paddingStart=\"16dp\"\n- android:paddingEnd=\"16dp\" />\n-\n-</LinearLayout>\n\\ No newline at end of file\n+ android:padding=\"8dp\"\n+ tools:text=\"Text\" />\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-958 Update recycler-extension-sample |
652,316 | 31.03.2020 19:27:58 | -10,800 | 47ffb3fb7132eaf35370aed4b8bd4f49a1cfb8c7 | Fragment Navigation DI improvement: added nested navigator supplier | [
{
"change_type": "MODIFY",
"old_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/di/ActivityNavigationSupplier.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/di/ActivityNavigationSupplier.kt",
"diff": "@@ -5,78 +5,93 @@ import android.app.Application\nimport android.os.Bundle\nimport androidx.appcompat.app.AppCompatActivity\nimport androidx.fragment.app.FragmentActivity\n-import androidx.fragment.app.FragmentManager\nimport ru.surfstudio.android.navigation.navigator.activity.view.ViewActivityNavigator\nimport java.lang.IllegalStateException\n//@PerApp\nclass ActivityNavigationSupplier(\n- private val nestedCallbacks: FragmentManager.FragmentLifecycleCallbacks\n+ private val nestedCallbacksCreator: () -> FragmentNavigationSupplier\n) : Application.ActivityLifecycleCallbacks {\n- private val navigators = hashMapOf<String, ActivityNavigatorHolder?>()\n+ private val navigatorHolders = hashMapOf<String, ActivityNavigatorHolder?>()\n+\n+ var currentHolder: ActivityNavigatorHolder? = null\n+ private set\n- private var currentNavigator: ActivityNavigatorHolder? = null\noverride fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {\nval newHolder = createHolder(activity as AppCompatActivity)\n- navigators[getActivityId(activity)] = newHolder\n+ navigatorHolders[getActivityId(activity)] = newHolder\nif (savedInstanceState != null) {\n- currentNavigator = newHolder\n- }\n+ currentHolder = newHolder\n}\n-\n- fun setupNestedNavigationHolder(activity: Activity) {\n- if (activity !is FragmentActivity) return\n- if (activity !is FragmentContainer) return\n-\n- val containerId = activity.containerId\n- val fragmentManager = activity.supportFragmentManager\n-\n- fragmentManager.registerFragmentLifecycleCallbacks(nestedCallbacks, true)\n}\noverride fun onActivityStarted(activity: Activity) {\n+ //empty\n}\noverride fun onActivityResumed(activity: Activity) {\n- val currentHolder = navigators[getActivityId(activity)]\n- currentNavigator = currentHolder\n+ val currentHolder = navigatorHolders[getActivityId(activity)]\n+ this.currentHolder = currentHolder\n}\noverride fun onActivityPaused(activity: Activity) {\n- val currentHolder = navigators[getActivityId(activity)]\n- if (currentNavigator == currentHolder) {\n- currentNavigator = null\n+ val currentHolder = navigatorHolders[getActivityId(activity)]\n+ if (this.currentHolder == currentHolder) {\n+ this.currentHolder = null\n}\n}\noverride fun onActivitySaveInstanceState(activity: Activity, outState: Bundle?) {\n-// navigators[getActivityId(activity)]?.onSaveState(outState)\n+ //empty\n}\noverride fun onActivityStopped(activity: Activity) {\n+ //empty\n}\noverride fun onActivityDestroyed(activity: Activity) {\n- destroyHolders(activity)\n+ destroyHolder(activity)\n}\n- private fun destroyHolders(activity: Activity) {\n- navigators[getActivityId(activity)] = null\n+ private fun destroyHolder(activity: Activity) {\n+ val id = getActivityId(activity)\n+ unregisterNestedNavigationSupplier(activity, navigatorHolders[id]?.nestedNavigationSupplier)\n+ navigatorHolders[id] = null\n+ }\n+ private fun unregisterNestedNavigationSupplier(\n+ activity: Activity,\n+ nestedNavigationSupplier: FragmentNavigationSupplier?\n+ ) {\n+ nestedNavigationSupplier ?: return\nif (activity !is FragmentActivity) return\nval fragmentManager = activity.supportFragmentManager\n+ fragmentManager.unregisterFragmentLifecycleCallbacks(nestedNavigationSupplier)\n+ }\n- fragmentManager.unregisterFragmentLifecycleCallbacks(nestedCallbacks)\n+ private fun registerNestedNavigationSupplier(\n+ activity: Activity,\n+ nestedNavigationSupplier: FragmentNavigationSupplier\n+ ) {\n+ if (activity !is FragmentActivity) return\n+ val fragmentManager = activity.supportFragmentManager\n+ fragmentManager.registerFragmentLifecycleCallbacks(nestedNavigationSupplier, true)\n}\n- private fun getActivityId(activity: Activity): String = (activity as? IdentifiableScreen)?.screenId\n+ private fun getActivityId(activity: Activity): String =\n+ (activity as? IdentifiableScreen)?.screenId\n?: throw IllegalStateException(\"Activity must implement from HasId.id method \")\n- private fun createHolder(activity: AppCompatActivity): ActivityNavigatorHolder {\n+ private fun createHolder(activity: Activity): ActivityNavigatorHolder? {\n+ if (activity !is AppCompatActivity) return null\n+\n+ val nestedNavigationSupplier = nestedCallbacksCreator()\n+ registerNestedNavigationSupplier(activity, nestedNavigationSupplier)\n+\nval activityNavigator = ViewActivityNavigator(activity)\n// val dialogNavigator = ...\n- return ActivityNavigatorHolder(activityNavigator)\n+ return ActivityNavigatorHolder(activityNavigator, nestedNavigationSupplier)\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/ActivityNavigatorHolder.kt",
"new_path": "navigation/lib-navigation/src/main/java/ru/surfstudio/android/navigation/di/ActivityNavigatorHolder.kt",
"diff": "@@ -3,6 +3,7 @@ package ru.surfstudio.android.navigation.di\nimport ru.surfstudio.android.navigation.navigator.activity.ActivityNavigatorInterface\nopen class ActivityNavigatorHolder(\n- val activityNavigator: ActivityNavigatorInterface\n+ val activityNavigator: ActivityNavigatorInterface,\n+ val nestedNavigationSupplier: FragmentNavigationSupplier\n//todo dialog navigator\n)\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-312 Fragment Navigation DI improvement: added nested navigator supplier |
652,335 | 01.04.2020 13:11:03 | -10,800 | 5bf9efc0e7e0fa63c092abbb3058ba55ef0cb5ac | Increase global alpha version counter to 99 [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\": 1,\n+ \"unstable_version\": 2,\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\": 98,\n+ \"unstable_version\": 99,\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 99 [skip ci] [version] |
652,327 | 01.04.2020 15:22:51 | -10,800 | bc4960233c16da3ee2efd6ed579778704c238ba9 | added instrumental tests for mvi/sample | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "mvi/sample/src/androidTest/java/ru/surfstudio/android/core/mvi/sample/ui/MainActivityViewTest.kt",
"diff": "+package ru.surfstudio.android.core.mvi.sample.ui\n+\n+import androidx.test.espresso.Espresso.onView\n+import androidx.test.espresso.Espresso.pressBack\n+import androidx.test.espresso.action.ViewActions.closeSoftKeyboard\n+import androidx.test.espresso.action.ViewActions.typeText\n+import androidx.test.espresso.matcher.ViewMatchers.withId\n+import org.junit.Test\n+import ru.surfstudio.android.core.mvi.sample.R\n+import ru.surfstudio.android.core.mvi.sample.ui.screen.input.InputFormActivityView\n+import ru.surfstudio.android.core.mvi.sample.ui.screen.list.ComplexListActivityView\n+import ru.surfstudio.android.core.mvi.sample.ui.screen.main.MainActivityView\n+import ru.surfstudio.android.core.mvi.sample.ui.screen.simple_list.SimpleListActivityView\n+import ru.surfstudio.android.sample.common.test.base.BaseSampleTest\n+import ru.surfstudio.android.sample.common.test.utils.ActivityUtils.checkIfActivityIsVisible\n+import ru.surfstudio.android.sample.common.test.utils.RecyclerViewUtils.performItemClick\n+import ru.surfstudio.android.sample.common.test.utils.RecyclerViewUtils.scrollTo\n+import ru.surfstudio.android.sample.common.test.utils.RecyclerViewUtils.scrollToBottom\n+import ru.surfstudio.android.sample.common.test.utils.ViewUtils.performClick\n+import ru.surfstudio.android.sample.common.test.utils.VisibilityUtils.checkIfSnackbarIsVisible\n+\n+\n+class MainActivityViewTest : BaseSampleTest<MainActivityView>(MainActivityView::class.java) {\n+\n+ @Test\n+ fun testMviSample() {\n+ performClick(R.id.main_open_input_form_btn)\n+ checkIfActivityIsVisible(InputFormActivityView::class.java)\n+ onView(withId(R.id.input_et)).perform(typeText(\"message\"), closeSoftKeyboard())\n+ performClick(R.id.submit_btn)\n+ checkIfSnackbarIsVisible(R.string.message)\n+\n+ performClick(R.id.main_open_simple_list_btn)\n+ checkIfActivityIsVisible(SimpleListActivityView::class.java)\n+ performItemClick(R.id.simple_list_rv, 0)\n+ performItemClick(R.id.simple_list_rv, 1)\n+ performItemClick(R.id.simple_list_rv, 2)\n+ pressBack()\n+\n+ performClick(R.id.main_open_complex_list_btn)\n+ checkIfActivityIsVisible(ComplexListActivityView::class.java)\n+ scrollTo(R.id.reactive_rv, 20)\n+ onView(withId(R.id.reactive_query_tv)).perform(typeText(\"3\"), closeSoftKeyboard())\n+ performClick(R.id.reactive_reload_btn)\n+ scrollToBottom(R.id.reactive_rv)\n+ pressBack()\n+ }\n+}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-991 added instrumental tests for mvi/sample |
652,327 | 01.04.2020 18:50:52 | -10,800 | f426e5c6be6e41c14cd13907bda4ebef96be6521 | added method checkIfSnackbarIsVisible(String) | [
{
"change_type": "MODIFY",
"old_path": "common/RELEASE_NOTES.md",
"new_path": "common/RELEASE_NOTES.md",
"diff": "## 0.5.0-alpha\n##### Sample-common\n* ANDDEP-785 added method scrollToBottom() in RecyclerViewUtils\n+* ANDDEP-991 added method checkIfSnackbarIsVisible(String)\n"
},
{
"change_type": "MODIFY",
"old_path": "mvi/sample/src/androidTest/java/ru/surfstudio/android/core/mvi/sample/ui/MainActivityViewTest.kt",
"new_path": "mvi/sample/src/androidTest/java/ru/surfstudio/android/core/mvi/sample/ui/MainActivityViewTest.kt",
"diff": "@@ -14,8 +14,6 @@ import ru.surfstudio.android.core.mvi.sample.ui.screen.simple_list.SimpleListAct\nimport ru.surfstudio.android.sample.common.test.base.BaseSampleTest\nimport ru.surfstudio.android.sample.common.test.utils.ActivityUtils.checkIfActivityIsVisible\nimport ru.surfstudio.android.sample.common.test.utils.RecyclerViewUtils.performItemClick\n-import ru.surfstudio.android.sample.common.test.utils.RecyclerViewUtils.scrollTo\n-import ru.surfstudio.android.sample.common.test.utils.RecyclerViewUtils.scrollToBottom\nimport ru.surfstudio.android.sample.common.test.utils.ViewUtils.performClick\nimport ru.surfstudio.android.sample.common.test.utils.VisibilityUtils.checkIfSnackbarIsVisible\n@@ -26,9 +24,10 @@ class MainActivityViewTest : BaseSampleTest<MainActivityView>(MainActivityView::\nfun testMviSample() {\nperformClick(R.id.main_open_input_form_btn)\ncheckIfActivityIsVisible(InputFormActivityView::class.java)\n- onView(withId(R.id.input_et)).perform(typeText(\"message\"), closeSoftKeyboard())\n+ val testStr = \"testStr\"\n+ onView(withId(R.id.input_et)).perform(typeText(testStr), closeSoftKeyboard())\nperformClick(R.id.submit_btn)\n- checkIfSnackbarIsVisible(R.string.message)\n+ checkIfSnackbarIsVisible(testStr)\nperformClick(R.id.main_open_simple_list_btn)\ncheckIfActivityIsVisible(SimpleListActivityView::class.java)\n@@ -39,10 +38,8 @@ class MainActivityViewTest : BaseSampleTest<MainActivityView>(MainActivityView::\nperformClick(R.id.main_open_complex_list_btn)\ncheckIfActivityIsVisible(ComplexListActivityView::class.java)\n- scrollTo(R.id.reactive_rv, 20)\nonView(withId(R.id.reactive_query_tv)).perform(typeText(\"3\"), closeSoftKeyboard())\nperformClick(R.id.reactive_reload_btn)\n- scrollToBottom(R.id.reactive_rv)\npressBack()\n}\n}\n\\ No newline at end of file\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-991 added method checkIfSnackbarIsVisible(String) |
652,312 | 30.03.2020 18:16:09 | -10,800 | 9e288e430dc09459e072ad971214a02f0e4eff92 | Fix testRecyclerExtensionSample | [
{
"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-* ANDDEP-999 Update instrumental tests\n## 1.0.0\n##### Easyadapter\n* ANDDEP-270 Added support for asynchronous view inflate in ViewHolder\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-extension/RELEASE_NOTES.md",
"new_path": "recycler-extension/RELEASE_NOTES.md",
"diff": "## 0.5.0-alpha\n##### Recycler-extension\n* ANDDEP-687 Changed \"com.google.android.material:material\" dependency from \"api\" to \"implementation\" type\n-* ANDDEP-999 Update instrumental tests\n## 0.4.0\n##### Recycler-extension\n* ANDDEP-266 DividerItemDecorator Update\n"
},
{
"change_type": "MODIFY",
"old_path": "recycler-extension/sample/src/androidTest/java/ru/surfstudio/android/recycler/extension/sample/RecyclerExtensionSampleTest.kt",
"new_path": "recycler-extension/sample/src/androidTest/java/ru/surfstudio/android/recycler/extension/sample/RecyclerExtensionSampleTest.kt",
"diff": "@@ -19,7 +19,7 @@ class RecyclerExtensionSampleTest : BaseSampleTest<MainActivity>(MainActivity::c\nactivityClass = StickyRecyclerActivity::class.java,\nlambda = {\ncheckText(STICKY_HEADER_TITLE, STICKY_FOOTER_TITLE)\n- RecyclerViewUtils.scrollTo(R.id.sticky_rv, LAST_ITEM_TITLE)\n+ RecyclerViewUtils.scrollToBottom(R.id.sticky_rv)\ncheckText(LAST_ITEM_TITLE)\n}\n)\n"
}
] | Kotlin | Apache License 2.0 | surfstudio/surfandroidstandard | ANDDEP-999 Fix testRecyclerExtensionSample |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.