Skip to content
This repository was archived by the owner on Jan 16, 2019. It is now read-only.

Commit 1f0528c

Browse files
ov3rk1llov3rk1ll
committed
fixed style issue on cast player
1 parent 2c4595b commit 1f0528c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+83
-675
lines changed

‎.idea/modules.xml

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/app.iml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="kinocast" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="KinoCast" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -10,7 +10,7 @@
1010
<configuration>
1111
<option name="SELECTED_BUILD_VARIANT" value="debug" />
1212
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
13-
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
13+
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
1414
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
1515
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
1616
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
@@ -77,6 +77,7 @@
7777
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
7878
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
7979
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
80+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8081
</content>
8182
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
8283
<orderEntry type="sourceFolder" forTests="false" />

‎app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ dependencies {
3838
compile project(':libs:CastCompanionLibrary-android')
3939
compile project(':libs:paralloid')
4040
compile project(':libs:RateThisApp')
41-
compile 'com.android.support:appcompat-v7:21.0.0'
42-
compile 'com.google.android.gms:play-services:6.1.11'
41+
compile 'com.android.support:appcompat-v7:21.0.2'
42+
compile 'com.google.android.gms:play-services:6.1.71'
4343
compile 'com.android.support:recyclerview-v7:21.0.0'
4444
compile 'com.android.support:palette-v7:21.0.0'
4545
compile 'org.jsoup:jsoup:1.7.3'

‎app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
88
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
99

10-
<uses-sdk tools:node="replace" />
10+
<!--<uses-sdk tools:node="replace" />-->
1111

1212
<application
1313
android:name=".TrackingApplication"
@@ -52,7 +52,7 @@
5252
android:launchMode="singleTask"
5353
android:parentActivityName=".ui.MainActivity"
5454
android:screenOrientation="portrait"
55-
android:theme="@style/Theme.AppCompat.Light.NoActionBar" >
55+
android:theme="@style/AppTheme" >
5656
<meta-data
5757
android:name="android.support.PARENT_ACTIVITY"
5858
android:value="com.ov3rk1ll.kinocast.ui.DetailActivity" />

‎build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:0.12.+'
8+
classpath 'com.android.tools.build:gradle:0.13.3'
99

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

‎gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
ANDROID_BUILD_MIN_SDK_VERSION=10
2121
ANDROID_BUILD_TARGET_SDK_VERSION=21
2222
ANDROID_BUILD_SDK_VERSION=21
23-
ANDROID_BUILD_TOOLS_VERSION=21.0.1
23+
ANDROID_BUILD_TOOLS_VERSION=21.1.1
2424
VERSION_NAME=1.2.1
2525
VERSION_CODE=1201

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Apr 10 15:27:10 PDT 2013
1+
#Thu Dec 04 18:35:59 CET 2014
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
6+
distributionUrl=http\://services.gradle.org/distributions/gradle-2.1-all.zip

‎libs/RateThisApp/RateThisApp.iml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="kinocast.libs" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="KinoCast.libs" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -10,7 +10,7 @@
1010
<configuration>
1111
<option name="SELECTED_BUILD_VARIANT" value="release" />
1212
<option name="ASSEMBLE_TASK_NAME" value="assembleRelease" />
13-
<option name="COMPILE_JAVA_TASK_NAME" value="compileReleaseJava" />
13+
<option name="COMPILE_JAVA_TASK_NAME" value="compileReleaseSources" />
1414
<option name="SOURCE_GEN_TASK_NAME" value="generateReleaseSources" />
1515
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1616
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/res" />

‎libs/RateThisApp/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
mavenCentral()
66
}
77
dependencies {
8-
classpath "com.android.tools.build:gradle:0.12.2"
8+
classpath "com.android.tools.build:gradle:0.13.3"
99
}
1010
}
1111

‎libs/ShowcaseView/ShowcaseView.iml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="kinocast.libs" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
2+
<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="KinoCast.libs" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
33
<component name="FacetManager">
44
<facet type="android-gradle" name="Android-Gradle">
55
<configuration>
@@ -10,7 +10,7 @@
1010
<configuration>
1111
<option name="SELECTED_BUILD_VARIANT" value="release" />
1212
<option name="ASSEMBLE_TASK_NAME" value="assembleRelease" />
13-
<option name="COMPILE_JAVA_TASK_NAME" value="compileReleaseJava" />
13+
<option name="COMPILE_JAVA_TASK_NAME" value="compileReleaseSources" />
1414
<option name="SOURCE_GEN_TASK_NAME" value="generateReleaseSources" />
1515
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1616
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />

‎libs/ShowcaseView/build.gradle

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,10 @@
1-
/*
2-
* Copyright 2014 Alex Curran
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
15-
*/
16-
171
buildscript {
182
repositories {
193
mavenCentral()
204
}
215

226
dependencies {
23-
classpath 'com.android.tools.build:gradle:0.13.2'
7+
classpath 'com.android.tools.build:gradle:0.13.3'
248
}
259
}
2610

@@ -41,3 +25,4 @@ android {
4125
targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION)
4226
}
4327
}
28+

‎libs/ShowcaseView/gradle.properties

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
#
2-
# Copyright 2014 Alex Curran
3-
#
4-
# Licensed under the Apache License, Version 2.0 (the "License");
5-
# you may not use this file except in compliance with the License.
6-
# You may obtain a copy of the License at
7-
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
9-
#
10-
# Unless required by applicable law or agreed to in writing, software
11-
# distributed under the License is distributed on an "AS IS" BASIS,
12-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
# See the License for the specific language governing permissions and
14-
# limitations under the License.
15-
#
16-
171
POM_NAME=ShowcaseView library
182
POM_ARTIFACT_ID=library
193
POM_PACKAGING=aar

‎libs/ShowcaseView/project.properties

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
#
2-
# Copyright 2014 Alex Curran
3-
#
4-
# Licensed under the Apache License, Version 2.0 (the "License");
5-
# you may not use this file except in compliance with the License.
6-
# You may obtain a copy of the License at
7-
#
8-
# http://www.apache.org/licenses/LICENSE-2.0
9-
#
10-
# Unless required by applicable law or agreed to in writing, software
11-
# distributed under the License is distributed on an "AS IS" BASIS,
12-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
# See the License for the specific language governing permissions and
14-
# limitations under the License.
15-
#
16-
171
# This file is automatically generated by Android Tools.
182
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
193
#

‎libs/ShowcaseView/src/main/AndroidManifest.xml

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<!--
3-
~ Copyright 2014 Alex Curran
4-
~
5-
~ Licensed under the Apache License, Version 2.0 (the "License");
6-
~ you may not use this file except in compliance with the License.
7-
~ You may obtain a copy of the License at
8-
~
9-
~ http://www.apache.org/licenses/LICENSE-2.0
10-
~
11-
~ Unless required by applicable law or agreed to in writing, software
12-
~ distributed under the License is distributed on an "AS IS" BASIS,
13-
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
~ See the License for the specific language governing permissions and
15-
~ limitations under the License.
16-
-->
17-
18-
<manifest package="com.github.amlcurran.showcaseview">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
package="com.github.amlcurran.showcaseview">
194

205
</manifest>

‎libs/ShowcaseView/src/main/java/com/github/amlcurran/showcaseview/AnimationFactory.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
/*
2-
* Copyright 2014 Alex Curran
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
15-
*/
16-
171
package com.github.amlcurran.showcaseview;
182

193
import android.graphics.Point;

‎libs/ShowcaseView/src/main/java/com/github/amlcurran/showcaseview/AnimatorAnimationFactory.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
/*
2-
* Copyright 2014 Alex Curran
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
15-
*/
16-
171
package com.github.amlcurran.showcaseview;
182

193
import android.animation.Animator;

‎libs/ShowcaseView/src/main/java/com/github/amlcurran/showcaseview/ApiUtils.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
/*
2-
* Copyright 2014 Alex Curran
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
15-
*/
16-
171
package com.github.amlcurran.showcaseview;
182

193
import android.annotation.TargetApi;

‎libs/ShowcaseView/src/main/java/com/github/amlcurran/showcaseview/Calculator.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
/*
2-
* Copyright 2014 Alex Curran
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
15-
*/
16-
171
package com.github.amlcurran.showcaseview;
182

193
import android.graphics.Point;

‎libs/ShowcaseView/src/main/java/com/github/amlcurran/showcaseview/NewShowcaseDrawer.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
/*
2-
* Copyright 2014 Alex Curran
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
15-
*/
16-
171
package com.github.amlcurran.showcaseview;
182

193
import android.content.res.Resources;

‎libs/ShowcaseView/src/main/java/com/github/amlcurran/showcaseview/OnShowcaseEventListener.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
/*
2-
* Copyright 2014 Alex Curran
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
15-
*/
16-
171
package com.github.amlcurran.showcaseview;
182

193
/**

‎libs/ShowcaseView/src/main/java/com/github/amlcurran/showcaseview/ShotStateStore.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
/*
2-
* Copyright 2014 Alex Curran
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
15-
*/
16-
171
package com.github.amlcurran.showcaseview;
182

193
import android.content.Context;

‎libs/ShowcaseView/src/main/java/com/github/amlcurran/showcaseview/ShowcaseAreaCalculator.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
/*
2-
* Copyright 2014 Alex Curran
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
15-
*/
16-
171
package com.github.amlcurran.showcaseview;
182

193
import android.graphics.Rect;

0 commit comments

Comments
 (0)