Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added the functionality of using a TextView instead of a ImageView #16

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added the functionality of using a TextView instead of a ImageView #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a34de0
sddvsdv
AnshulBansal May 10, 2014
a3e02b9
Merge branch 'master' of https://github.com/AnshulBansal/android-squa…
AnshulBansal May 10, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions android-square-progressbar-example/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<<<<<<< HEAD
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="src" path="/android-square-progressbar"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry exported="true" kind="lib" path="libs/android-support-v4.jar"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
=======
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry kind="src" path="/android-square-progressbar"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry exported="true" kind="lib" path="libs/android-support-v4.jar"/>
>>>>>>> 9182c74c5ec5f9c53a7e7410d1ffd2062846b721
<classpathentry kind="output" path="bin/classes"/>
</classpath>
4 changes: 4 additions & 0 deletions android-square-progressbar-example/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@

<uses-sdk
android:minSdkVersion="14"
<<<<<<< HEAD
android:targetSdkVersion="16" />
=======
android:targetSdkVersion="17" />
>>>>>>> 9182c74c5ec5f9c53a7e7410d1ffd2062846b721

<application
android:allowBackup="true"
Expand Down
4 changes: 4 additions & 0 deletions android-square-progressbar-example/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,9 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt

# Project target.
<<<<<<< HEAD
target=android-14
=======
target=android-17
>>>>>>> 9182c74c5ec5f9c53a7e7410d1ffd2062846b721
android.library.reference.1=../android-square-progressbar
8 changes: 8 additions & 0 deletions android-square-progressbar/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<<<<<<< HEAD
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
=======
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
>>>>>>> 9182c74c5ec5f9c53a7e7410d1ffd2062846b721
<classpathentry kind="output" path="bin/classes"/>
</classpath>
4 changes: 4 additions & 0 deletions android-square-progressbar/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,9 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt

# Project target.
<<<<<<< HEAD
target=Google Inc.:Google APIs:18
=======
target=android-17
>>>>>>> 9182c74c5ec5f9c53a7e7410d1ffd2062846b721
android.library=true
25 changes: 25 additions & 0 deletions android-square-progressbar/res/layout/progressbarviewwithtext.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content" >

<net.yscs.android.square_progressbar.SquareProgressView
android:id="@+id/squareProgressBarwithtext1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/TextView1"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:layout_alignRight="@+id/TextView1" />

<TextView
android:id="@+id/TextView1"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"

android:padding="10dp"
android:text="Text" />

</RelativeLayout>
Loading