Skip to content

Commit

Permalink
Merge pull request #7 from R12rus/develop
Browse files Browse the repository at this point in the history
percent frame layout support was added
  • Loading branch information
RomanTcv authored Feb 4, 2018
2 parents 34c32c0 + f05b587 commit f971100
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 71 deletions.
3 changes: 0 additions & 3 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ dependencies {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile "com.android.support:appcompat-v7:$supportVersion"
compile 'com.android.support.constraint:constraint-layout:1.0.2'
compile project(':shadowframelayout')
testCompile 'junit:junit:4.12'
}
8 changes: 2 additions & 6 deletions shadowframelayout/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ android {
defaultConfig {
minSdkVersion 14
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 2
versionCode 1
versionName "1.0"

testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
Expand All @@ -24,9 +24,5 @@ android {

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
implementation 'com.android.support:appcompat-v7:27.0.2'
testCompile 'junit:junit:4.12'
compileOnly "com.android.support:percent:$supportVersion"
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,19 @@
import android.content.res.TypedArray;
import android.graphics.Canvas;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.support.annotation.AttrRes;
import android.support.annotation.DimenRes;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.RequiresApi;
import android.support.annotation.StyleRes;
import android.support.percent.PercentFrameLayout;
import android.support.v4.content.ContextCompat;
import android.util.AttributeSet;
import android.util.DisplayMetrics;
import android.widget.FrameLayout;

/**
* Created by R12 on 17.06.2017.
*/

public class ShadowFrameLayout extends FrameLayout {
public class ShadowFrameLayout extends PercentFrameLayout {

private static final int DEFAULT_SHADOW_HEIGHT = 0;

Expand All @@ -40,27 +36,21 @@ public class ShadowFrameLayout extends FrameLayout {
private Resources mResources;
private DisplayMetrics mDisplayMetrics;

public ShadowFrameLayout(@NonNull Context context) {
public ShadowFrameLayout(Context context) {
super(context);
init(context, null);
}

public ShadowFrameLayout(@NonNull Context context, @Nullable AttributeSet attrs) {
public ShadowFrameLayout(Context context, AttributeSet attrs) {
super(context, attrs);
init(context, attrs);
}

public ShadowFrameLayout(@NonNull Context context, @Nullable AttributeSet attrs, @AttrRes int defStyleAttr) {
public ShadowFrameLayout(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
init(context, attrs);
}

@RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
public ShadowFrameLayout(@NonNull Context context, @Nullable AttributeSet attrs, @AttrRes int defStyleAttr, @StyleRes int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
init(context, attrs);
}

private void init(@NonNull Context context, @Nullable AttributeSet attrs) {
if (attrs != null) {
TypedArray styledAttrs = context.obtainStyledAttributes(attrs, R.styleable.ShadowFrameLayout);
Expand Down

This file was deleted.

0 comments on commit f971100

Please sign in to comment.