Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
68 changes: 35 additions & 33 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,38 +1,40 @@
# Gradle and Android Studio ignores
.gradle
/local.properties
/.idea
.DS_Store
/build

# IDEA/Android Studio project files, because
# the project can be imported from settings.gradle
.idea
*.iml

# Built application files
*.apk
*.ap_

# Files for the Dalvik VM
*.dex

# Java class files
*.class
# Custom
_site

# Ant
MANIFEST.MF
./*.jar
build.num
build

# ADT
.classpath
.project
.settings
local.properties
bin
gen
_layouts
proguard.cfg

# Generated files
bin/
gen/
# OSX
.DS_Store

# Gradle files
.gradle/
build/
# Github
gh-pages

# Local configuration file (sdk path, etc)
local.properties
# Gradle
.gradle
build

# Proguard folder generated by Eclipse
proguard/
# IDEA
*.iml
*.ipr
*.iws
out
.idea

# Log Files
*.log
# Maven
target
release.properties
pom.xml.*
7 changes: 0 additions & 7 deletions app/.gitignore

This file was deleted.

32 changes: 13 additions & 19 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,28 +1,22 @@
apply plugin: 'com.android.application'

dependencies {
compile project(':library')
compile 'com.android.support:appcompat-v7:23.0.1'
compile 'com.android.support:recyclerview-v7:+'
compile 'com.jakewharton:butterknife:7.0.1'
}

android {
compileSdkVersion 23
buildToolsVersion "23.0.1"

compileSdkVersion Integer.parseInt(project.ANDROID_COMPILE_SDK_VERSION)
buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION

defaultConfig {
applicationId "co.mobiwise.progresslayout"
minSdkVersion 14
targetSdkVersion 23
minSdkVersion Integer.parseInt(project.ANDROID_MIN_SDK)
targetSdkVersion Integer.parseInt(project.ANDROID_TARGET_SDK_VERSION)
versionCode 1
versionName "1.0"
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:23.0.1'
compile 'com.android.support:recyclerview-v7:+'
compile 'com.jakewharton:butterknife:7.0.1'
compile project(':library')
}
}
17 changes: 0 additions & 17 deletions app/proguard-rules.pro

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
android:label="@string/app_name" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,26 @@
/*
* Copyright (C) 2015 Mert Şimşek
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package co.mobiwise.progresslayout;

import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;

import co.mobiwise.library.ProgressLayout;
import co.mobiwise.library.ProgressLayoutListener;

/**
* Created by mertsimsek on 16/09/15.
*/
public class BasicUsageActivity extends AppCompatActivity{

@Override
Expand All @@ -16,7 +29,7 @@ protected void onCreate(Bundle savedInstanceState) {
setContentView(R.layout.usage);

ProgressLayout progressLayout = (ProgressLayout) findViewById(R.id.progressLayout);
progressLayout.setProgressLayoutListener(new ProgressLayout.ProgressLayoutListener() {
progressLayout.setProgressLayoutListener(new ProgressLayoutListener() {
@Override
public void onProgressCompleted() {
//TODO completed
Expand Down
15 changes: 15 additions & 0 deletions app/src/main/java/co/mobiwise/progresslayout/MainActivity.java
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/*
* Copyright (C) 2015 Mert Şimşek
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package co.mobiwise.progresslayout;

import android.support.v7.app.AppCompatActivity;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/*
* Copyright (C) 2015 Mert Şimşek
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package co.mobiwise.progresslayout;

import android.os.Handler;
Expand All @@ -8,6 +23,7 @@
import android.widget.ImageView;
import android.widget.TextView;

import co.mobiwise.library.ProgressLayoutListener;
import java.util.List;
import butterknife.Bind;
import butterknife.ButterKnife;
Expand Down Expand Up @@ -145,7 +161,7 @@ public void onClick(View v) {
}
}
});
viewHolder.progressLayout.setProgressLayoutListener(new ProgressLayout.ProgressLayoutListener() {
viewHolder.progressLayout.setProgressLayoutListener(new ProgressLayoutListener() {
@Override
public void onProgressCompleted() {
viewHolder.imageViewAction.setBackgroundResource(R.drawable.play);
Expand Down Expand Up @@ -201,7 +217,7 @@ static class ViewHolder extends RecyclerView.ViewHolder{

public ViewHolder(View itemView) {
super(itemView);
ButterKnife.bind(this,itemView);
ButterKnife.bind(this, itemView);
}
}
}
18 changes: 15 additions & 3 deletions app/src/main/java/co/mobiwise/progresslayout/Track.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@
/*
* Copyright (C) 2015 Mert Şimşek
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package co.mobiwise.progresslayout;

/**
* Created by mertsimsek on 16/09/15.
*/
public class Track {

private int trackId;
Expand Down
13 changes: 10 additions & 3 deletions app/src/main/res/layout/list_item.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,20 @@
<co.mobiwise.library.ProgressLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/progressLayout"
android:layout_width="match_parent"
app:maxProgress="100"
app:autoProgress="true"
app:emptyColor="#152430"
android:layout_height="80dp">

<co.mobiwise.library.ProgressLayout
android:id="@+id/progressLayout"
android:layout_width="match_parent"
android:layout_height="80dp"
app:maxProgress="100"
app:autoProgress="true"
app:emptyColor="#152430"/>

<ImageView
android:id="@+id/imageviewAction"
android:layout_width="20dp"
Expand Down Expand Up @@ -53,4 +60,4 @@
android:layout_centerVertical="true"
android:layout_marginRight="24dp"/>

</co.mobiwise.library.ProgressLayout>
</RelativeLayout>
5 changes: 0 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
repositories {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.3.0'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}

Expand Down
22 changes: 4 additions & 18 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,18 +1,4 @@
# Project-wide Gradle settings.

# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.

# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html

# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx10248m -XX:MaxPermSize=256m
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8

# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
ANDROID_BUILD_TOOLS_VERSION=23.0.1
ANDROID_COMPILE_SDK_VERSION=23
ANDROID_TARGET_SDK_VERSION=23
ANDROID_MIN_SDK=10
7 changes: 0 additions & 7 deletions library/.gitignore

This file was deleted.

Loading