Skip to content

Y
YDL-Component-Medical
Commit bafecd11 by konghaorui
Options

升级动态模块

parent db858acd
Showing with 118 additions and 4 deletions
config.gradle
......@@ -53,7 +53,7 @@ ext {
"m-tests" : "0.0.15.3",
"m-course" : "0.0.34.4",
"m-im" : "0.0.3.7",
"m-dynamic" : "0.0.1.3",
"m-dynamic" : "0.0.1.5",
//-------------- 业务模块 API 层 --------------
......
m-dynamic/build.gradle
......@@ -88,7 +88,6 @@ dependencies {
implementation 'com.github.ksoichiro:android-observablescrollview:1.6.0'
implementation 'com.pnikosis:materialish-progress:1.7'
implementation 'com.daimajia.numberprogressbar:library:1.4@aar'
implementation 'me.relex:circleindicator:1.2.2@aar'
implementation 'com.github.faruktoptas:FancyShowCaseView:0.1.1'
kapt rootProject.ext.dependencies["butterknife-compiler"]
api rootProject.ext.dependencies["butterknife"]
......
m-dynamic/src/main/java/com/yidianling/dynamic/trendsDetail/SnackbarBehavior.java 0 → 100644
package com.yidianling.dynamic.trendsDetail;
import android.content.Context;
import android.support.design.widget.CoordinatorLayout;
import android.support.design.widget.Snackbar;
import android.support.v4.view.ViewCompat;
import android.util.AttributeSet;
import android.view.View;
import java.util.List;
/**
* Created by haorui on 2019-12-23.
* Des:
*/
public class SnackbarBehavior extends CoordinatorLayout.Behavior<CircleIndicator> {
public SnackbarBehavior() {
}
public SnackbarBehavior(Context context, AttributeSet attributeSet) {
super(context, attributeSet);
}
@Override public boolean layoutDependsOn(CoordinatorLayout parent, CircleIndicator child,
View dependency) {
return dependency instanceof Snackbar.SnackbarLayout;
}
@Override public boolean onDependentViewChanged(CoordinatorLayout parent, CircleIndicator child,
View dependency) {
float translationY = getTranslationYForSnackbar(parent, child);
child.setTranslationY(translationY);
return true;
}
private float getTranslationYForSnackbar(CoordinatorLayout parent, CircleIndicator ci) {
float minOffset = 0;
final List<View> dependencies = parent.getDependencies(ci);
for (int i = 0, z = dependencies.size(); i < z; i++) {
final View view = dependencies.get(i);
if (view instanceof Snackbar.SnackbarLayout && parent.doViewsOverlap(ci, view)) {
minOffset =
Math.min(minOffset, ViewCompat.getTranslationY(view) - view.getHeight());
}
}
return minOffset;
}
}
\ No newline at end of file
m-dynamic/src/main/java/com/yidianling/dynamic/trendsDetail/TrendsDetailActivity.java
......@@ -100,7 +100,6 @@ import butterknife.OnClick;
import io.reactivex.Observable;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import me.relex.circleindicator.CircleIndicator;
import static android.view.View.GONE;
import static android.view.View.VISIBLE;
......
m-dynamic/src/main/res/animator/scale_with_alpha.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="@android:integer/config_shortAnimTime">
<objectAnimator
android:propertyName="alpha"
android:valueType="floatType"
android:valueFrom="0.5"
android:valueTo="1.0"/>
<objectAnimator
android:propertyName="scaleX"
android:valueType="floatType"
android:valueFrom="1.0"
android:valueTo="1.8"/>
<objectAnimator
android:propertyName="scaleY"
android:valueType="floatType"
android:valueFrom="1.0"
android:valueTo="1.8"/>
</set>
\ No newline at end of file
m-dynamic/src/main/res/drawable/white_radius.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid
android:color="@android:color/white"/>
</shape>
\ No newline at end of file
m-dynamic/src/main/res/layout/dynamic_activity_trend_details.xml
......@@ -387,7 +387,7 @@
android:layout_height="wrap_content"
android:background="@color/dynamic_white" />
<me.relex.circleindicator.CircleIndicator
<com.yidianling.dynamic.trendsDetail.CircleIndicator
android:id="@+id/circle_indicator"
android:layout_width="match_parent"
android:layout_height="28dp"
......
m-dynamic/src/main/res/values/styles.xml
......@@ -64,5 +64,40 @@
<item name="android:backgroundDimEnabled">true</item>
</style>
<declare-styleable name="CircleIndicator"><attr format="dimension" name="ci_width"/><attr format="dimension" name="ci_height"/><attr format="dimension" name="ci_margin"/><attr format="reference" name="ci_animator"/><attr format="reference" name="ci_animator_reverse"/><attr format="reference" name="ci_drawable"/><attr format="reference" name="ci_drawable_unselected"/><attr format="enum" name="ci_orientation">
<enum name="horizontal" value="0"/>
<enum name="vertical" value="1"/>
</attr><attr name="ci_gravity">
<flag name="top" value="0x30"/>
<flag name="bottom" value="0x50"/>
<flag name="left" value="0x03"/>
<flag name="right" value="0x05"/>
<flag name="center_vertical" value="0x10"/>
<flag name="fill_vertical" value="0x70"/>
<flag name="center_horizontal" value="0x01"/>
<flag name="fill_horizontal" value="0x07"/>
<flag name="center" value="0x11"/>
<flag name="fill" value="0x77"/>
<flag name="clip_vertical" value="0x80"/>
<flag name="clip_horizontal" value="0x08"/>
<flag name="start" value="0x00800003"/>
<flag name="end" value="0x00800005"/>
</attr></declare-styleable>
</resources>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment