From 2552d13382922a121cf6e6d3f5ead23bfb1a43a6 Mon Sep 17 00:00:00 2001 From: Stefan Schueller Date: Sat, 10 Nov 2018 17:48:09 +0100 Subject: [PATCH] - Update to SDK 28 --- app/build.gradle | 22 +++++++++++-------- .../peertube/activity/VideoListActivity.java | 2 +- .../helper/BottomNavigationViewHelper.java | 2 +- .../main/res/layout/activity_video_list.xml | 2 +- app/src/main/res/values/strings.xml | 1 + app/src/main/res/xml/pref_general.xml | 4 ++++ 6 files changed, 21 insertions(+), 12 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 104ad1f..dc4d622 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { applicationId "net.schueller.peertube" minSdkVersion 23 - targetSdkVersion 27 - versionCode 100 - versionName "1.0.0" + targetSdkVersion 28 + versionCode 101 + versionName "1.0.1" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { @@ -20,14 +20,18 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + + applicationVariants.all { variant -> + variant.resValue "string", "versionName", variant.versionName + } } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'com.android.support.constraint:constraint-layout:1.1.3' - implementation 'com.android.support:appcompat-v7:27.1.1' - implementation 'com.android.support:cardview-v7:27.1.1' - implementation 'com.android.support:recyclerview-v7:27.1.1' + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.android.support:cardview-v7:28.0.0' + implementation 'com.android.support:recyclerview-v7:28.0.0' implementation 'com.google.android.gms:play-services-auth:16.0.1' @@ -39,7 +43,7 @@ dependencies { implementation 'com.google.code.gson:gson:2.8.2' // implementation 'org.webrtc:google-webrtc:1.0.+' - implementation 'com.android.support:design:27.1.1' + implementation 'com.android.support:design:28.0.0' implementation 'com.blackboardtheory:android-iconify-fontawesome:3.0.1-SNAPSHOT' @@ -50,7 +54,7 @@ dependencies { implementation 'de.hdodenhof:circleimageview:2.2.0' - implementation 'com.android.support:support-v4:27.1.1' + implementation 'com.android.support:support-v4:28.0.0' testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' diff --git a/app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java b/app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java index 983fa23..2ac5625 100644 --- a/app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java +++ b/app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java @@ -248,7 +248,7 @@ public class VideoListActivity extends AppCompatActivity { /*Log the URL called*/ Log.d("URL Called", call.request().url() + ""); - Toast.makeText(VideoListActivity.this, "URL Called: " + call.request().url(), Toast.LENGTH_SHORT).show(); +// Toast.makeText(VideoListActivity.this, "URL Called: " + call.request().url(), Toast.LENGTH_SHORT).show(); call.enqueue(new Callback() { @Override diff --git a/app/src/main/java/net/schueller/peertube/helper/BottomNavigationViewHelper.java b/app/src/main/java/net/schueller/peertube/helper/BottomNavigationViewHelper.java index 7e012b1..7e9642b 100644 --- a/app/src/main/java/net/schueller/peertube/helper/BottomNavigationViewHelper.java +++ b/app/src/main/java/net/schueller/peertube/helper/BottomNavigationViewHelper.java @@ -20,7 +20,7 @@ public class BottomNavigationViewHelper { for (int i = 0; i < menuView.getChildCount(); i++) { BottomNavigationItemView item = (BottomNavigationItemView) menuView.getChildAt(i); //noinspection RestrictedApi - item.setShiftingMode(false); + //item.setShiftingMode(false); // set once again checked value, so view will be updated //noinspection RestrictedApi item.setChecked(item.getItemData().isChecked()); diff --git a/app/src/main/res/layout/activity_video_list.xml b/app/src/main/res/layout/activity_video_list.xml index ec9d8ad..1380f10 100644 --- a/app/src/main/res/layout/activity_video_list.xml +++ b/app/src/main/res/layout/activity_video_list.xml @@ -39,7 +39,7 @@ Videos playback via a torrent stream License \nGNU Affero General Public License v3.0\n\nPermissions of this strongest copyleft license are conditioned on making available complete source code of licensed works and modifications, which include larger works using a licensed work, under the same license. Copyright and license notices must be preserved. Contributors provide an express grant of patent rights. When a modified version is used to provide a service over a network, the complete source code of the modified version must be made available. + Version diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml index fae66a8..4da93e5 100644 --- a/app/src/main/res/xml/pref_general.xml +++ b/app/src/main/res/xml/pref_general.xml @@ -22,6 +22,10 @@ android:summary="@string/pref_description_torrent_player" android:defaultValue="false" /> + +