Skip to content

Commit

Permalink
Apply code styles from grandcentrix code style settings
Browse files Browse the repository at this point in the history
  • Loading branch information
1951FDG committed Sep 25, 2019
1 parent b1af01f commit 89cab12
Show file tree
Hide file tree
Showing 4 changed files with 118 additions and 107 deletions.
197 changes: 104 additions & 93 deletions .idea/codeStyles/Project.xml

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

Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.content.Context;
import androidx.interpolator.view.animation.FastOutLinearInInterpolator;
import androidx.interpolator.view.animation.LinearOutSlowInInterpolator;
import androidx.appcompat.widget.Toolbar;
import android.util.AttributeSet;
import android.view.Gravity;
import android.view.ViewPropertyAnimator;
import android.view.animation.Interpolator;

import androidx.appcompat.widget.Toolbar;
import androidx.interpolator.view.animation.FastOutLinearInInterpolator;
import androidx.interpolator.view.animation.LinearOutSlowInInterpolator;

import me.zhanghai.android.materialprogressbar.MaterialProgressBar;

public class AnimatedProgressBar extends MaterialProgressBar {
Expand Down Expand Up @@ -84,5 +85,4 @@ void setVisibilityAnimated(int v) {
}
animator.start();
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,16 @@
import android.content.Context;
import android.content.res.ColorStateList;
import android.content.res.TypedArray;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.view.GravityCompat;
import androidx.appcompat.widget.Toolbar;
import android.util.AttributeSet;
import android.view.Gravity;
import android.view.View;
import android.widget.ProgressBar;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.widget.Toolbar;
import androidx.core.view.GravityCompat;

/**
* A subclass of {@link Toolbar} which allows a {@link ProgressBar} to be displayed
* inside of it, either at the top or the bottom. It automatically uses a
Expand All @@ -39,10 +40,10 @@
*/
public class ProgressToolbar extends Toolbar {

private int mGravity = GravityCompat.START | Gravity.CENTER_VERTICAL;

private final AnimatedProgressBar mProgressBar;

private int mGravity = GravityCompat.START | Gravity.CENTER_VERTICAL;

public ProgressToolbar(Context context) {
this(context, null);
}
Expand Down Expand Up @@ -296,5 +297,4 @@ private void measureChildCollapseMargins(View child, int parentWidthMeasureSpec,
getPaddingTop() + getPaddingBottom() + lp.topMargin + lp.bottomMargin, lp.height);
child.measure(childWidthMeasureSpec, childHeightMeasureSpec);
}

}
Loading

0 comments on commit 89cab12

Please sign in to comment.