Skip to content

Commit

Permalink
Switch to progress bar library
Browse files Browse the repository at this point in the history
  • Loading branch information
anthonycr committed Jul 22, 2016
1 parent 2a9b820 commit a0ae42d
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 233 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Expand Up @@ -5,3 +5,6 @@
[submodule "Bonsai"]
path = Bonsai
url = https://github.com/anthonycr/Bonsai.git
[submodule "AnimatedProgressBar"]
path = AnimatedProgressBar
url = git@github.com:anthonycr/AnimatedProgressBar.git
1 change: 1 addition & 0 deletions AnimatedProgressBar
Submodule AnimatedProgressBar added at 2d7f75
2 changes: 2 additions & 0 deletions app/build.gradle
Expand Up @@ -103,6 +103,8 @@ dependencies {

compile project(':bonsai')

compile project(':animated-progress-bar')

// memory leak analysis
debugCompile 'com.squareup.leakcanary:leakcanary-android:1.4-beta2'
releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta2'
Expand Down
Expand Up @@ -84,6 +84,7 @@
import android.widget.VideoView;

import com.anthonycr.grant.PermissionsManager;
import com.anthonycr.progress.AnimatedProgressBar;
import com.squareup.otto.Bus;
import com.squareup.otto.Subscribe;

Expand Down Expand Up @@ -126,7 +127,6 @@
import acr.browser.lightning.utils.UrlUtils;
import acr.browser.lightning.utils.Utils;
import acr.browser.lightning.utils.WebUtils;
import acr.browser.lightning.view.AnimatedProgressBar;
import acr.browser.lightning.view.LightningView;
import acr.browser.lightning.view.SearchView;
import butterknife.Bind;
Expand Down
223 changes: 0 additions & 223 deletions app/src/main/java/acr/browser/lightning/view/AnimatedProgressBar.java

This file was deleted.

6 changes: 3 additions & 3 deletions app/src/main/res/layout/toolbar.xml
Expand Up @@ -5,9 +5,9 @@
xmlns:custom="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fitsSystemWindows="true"
android:background="?attr/colorPrimary"
android:elevation="2dp"
android:fitsSystemWindows="true"
android:orientation="vertical">

<FrameLayout
Expand All @@ -31,11 +31,11 @@
android:layout_height="wrap_content"
android:background="?attr/progressBackgroundColor">

<acr.browser.lightning.view.AnimatedProgressBar
<com.anthonycr.progress.AnimatedProgressBar
android:id="@+id/progress_view"
android:layout_width="match_parent"
android:layout_height="2dp"
custom:backgroundColor="#00000000"
android:background="@android:color/transparent"
custom:bidirectionalAnimate="false"
custom:progressColor="?attr/colorAccent"/>
</LinearLayout>
Expand Down
6 changes: 0 additions & 6 deletions app/src/main/res/values/attr.xml
Expand Up @@ -12,10 +12,4 @@
<attr name="dividerColor" format="reference|color" />
<attr name="selectedBackground" format="reference|color" />

<declare-styleable name="AnimatedProgressBar">
<attr name="progressColor" format="color" />
<attr name="backgroundColor" format="color" />
<attr name="bidirectionalAnimate" format="boolean" />
</declare-styleable>

</resources>
2 changes: 2 additions & 0 deletions settings.gradle
@@ -1,6 +1,8 @@
include ':app'
include ':libnetcipher'
include ':bonsai'
include ':animated-progress-bar'

project(':libnetcipher').projectDir = new File(rootProject.projectDir, 'external/netcipher/libnetcipher')
project(':bonsai').projectDir = new File(rootProject.projectDir, 'Bonsai/library')
project(':animated-progress-bar').projectDir = new File(rootProject.projectDir, 'AnimatedProgressBar/library')

0 comments on commit a0ae42d

Please sign in to comment.