diff --git a/.gitignore b/.gitignore index 7dd2147..e8b8889 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,5 @@ proguard/ /.idea/libraries .DS_Store /captures +/app/*.apk >>>>>>> 24200e7d908aad159db10e72ab17c55633a5db68 diff --git a/app/app-release.apk b/app/app-release.apk deleted file mode 100644 index ec9c996..0000000 Binary files a/app/app-release.apk and /dev/null differ diff --git a/app/build.gradle b/app/build.gradle index aa36649..89b579f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "de.markhaehnel.rbtv.rocketbeanstv" minSdkVersion 17 targetSdkVersion 23 - versionCode 12 - versionName "2.8" + versionCode 13 + versionName "2.9" } buildTypes { release { diff --git a/app/src/main/java/de/markhaehnel/rbtv/rocketbeanstv/MainActivity.java b/app/src/main/java/de/markhaehnel/rbtv/rocketbeanstv/MainActivity.java index f574392..c8b0128 100644 --- a/app/src/main/java/de/markhaehnel/rbtv/rocketbeanstv/MainActivity.java +++ b/app/src/main/java/de/markhaehnel/rbtv/rocketbeanstv/MainActivity.java @@ -35,7 +35,7 @@ public class MainActivity extends AppCompatActivity implements MediaPlayer.OnPre private EMVideoView videoView; boolean showGetterIsRunning = false; - ChannelInfo channelInfo = new ChannelInfo("Keine Informationen", ""); + ChannelInfo channelInfo = new ChannelInfo("Keine Informationen", "-"); private static MainActivity ins; @@ -276,7 +276,6 @@ public void showSchedule(ArrayList shows) { insertPoint.removeAllViews(); int animMulitplier = 250; - int animVisibility = 10000; for (int i = 0; i < shows.size(); i++) { View v = vi.inflate(R.layout.component_scheduleitem, null);