From e26f0bb51f339902c4d5e730b80a0d35573c630f Mon Sep 17 00:00:00 2001
From: "jonghen.han" <jonghen.han@lge.com>
Date: Tue, 26 Apr 2022 13:58:56 +0900
Subject: [PATCH] Upgrade SDK version and fix build error

---
 AndroidManifest.xml                           |  6 ++++--
 build.gradle                                  | 16 ++++++++++------
 gradle.properties                             |  2 ++
 res/layout/activity_main.xml                  |  3 ++-
 settings.gradle                               |  0
 src/com/connectsdk/sampler/MainActivity.java  | 19 ++++++++++---------
 .../sampler/SectionsPagerAdapter.java         |  7 ++++---
 .../sampler/fragments/BaseFragment.java       |  2 +-
 .../sampler/fragments/WebAppFragment.java     |  2 +-
 9 files changed, 34 insertions(+), 23 deletions(-)
 create mode 100644 gradle.properties
 create mode 100644 settings.gradle

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ba217d9..4fe7a4c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,13 +16,15 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/AppTheme"
+        android:usesCleartextTraffic="true" >
         
         <activity
             android:name="com.connectsdk.sampler.MainActivity"
             android:windowSoftInputMode="stateHidden"
             android:label="@string/app_name"
-            android:screenOrientation="portrait" >
+            android:screenOrientation="portrait"
+            android:exported="true" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/build.gradle b/build.gradle
index 81de79e..1fd8da7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:7.0.2'
     }
 }
 
@@ -20,12 +20,12 @@ allprojects {
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 22
+    compileSdkVersion 31
 
     defaultConfig {
         applicationId "com.connectsdk.sampler"
-        minSdkVersion 10
-        targetSdkVersion 22
+        minSdkVersion 24
+        targetSdkVersion 31
     }
 
     sourceSets {
@@ -49,10 +49,14 @@ android {
         }
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
     implementation 'com.github.ConnectSDK:Connect-SDK-Android-Lite:master-SNAPSHOT'
-    implementation 'com.android.support:support-v4:22.2.1'
-    implementation 'com.android.support:appcompat-v7:22.+'
+    implementation 'androidx.appcompat:appcompat:1.4.0'
+    implementation "androidx.viewpager2:viewpager2:1.0.0"
 }
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..5465fec
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml
index a67ef45..a9f4917 100644
--- a/res/layout/activity_main.xml
+++ b/res/layout/activity_main.xml
@@ -1,4 +1,5 @@
-<android.support.v4.view.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.viewpager.widget.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/pager"
     android:layout_width="match_parent"
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..e69de29
diff --git a/src/com/connectsdk/sampler/MainActivity.java b/src/com/connectsdk/sampler/MainActivity.java
index 20b102b..a5526df 100644
--- a/src/com/connectsdk/sampler/MainActivity.java
+++ b/src/com/connectsdk/sampler/MainActivity.java
@@ -16,10 +16,6 @@
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBarActivity;
 import android.text.InputType;
 import android.util.Log;
 import android.view.Menu;
@@ -30,6 +26,11 @@
 import android.widget.EditText;
 import android.widget.Toast;
 
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.viewpager.widget.ViewPager;
+
 import com.connectsdk.device.ConnectableDevice;
 import com.connectsdk.device.ConnectableDeviceListener;
 import com.connectsdk.device.DevicePicker;
@@ -45,7 +46,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class MainActivity extends ActionBarActivity implements ActionBar.TabListener {
+public class MainActivity extends AppCompatActivity implements ActionBar.TabListener {
 
     ConnectableDevice mTV;
     AlertDialog dialog;
@@ -355,15 +356,15 @@ public boolean onOptionsItemSelected(MenuItem item) {
         return super.onOptionsItemSelected(item);
     }
 
+    @Override public void onTabUnselected(ActionBar.Tab tab, FragmentTransaction fragmentTransaction) { }
+    @Override public void onTabReselected(ActionBar.Tab tab, FragmentTransaction fragmentTransaction) { }
+
     @Override
     public void onTabSelected(ActionBar.Tab tab, FragmentTransaction fragmentTransaction) {
         mViewPager.setCurrentItem(tab.getPosition());
-        getSupportActionBar().setTitle(mSectionsPagerAdapter.getTitle(tab.getPosition()));
+        setTitle(mSectionsPagerAdapter.getTitle(tab.getPosition()));
         BaseFragment frag = mSectionsPagerAdapter.getFragment(tab.getPosition());
         if (frag != null)
             frag.setTv(mTV);
     }
-
-    @Override public void onTabUnselected(ActionBar.Tab tab, FragmentTransaction fragmentTransaction) { }
-    @Override public void onTabReselected(ActionBar.Tab tab, FragmentTransaction fragmentTransaction) { }
 }
diff --git a/src/com/connectsdk/sampler/SectionsPagerAdapter.java b/src/com/connectsdk/sampler/SectionsPagerAdapter.java
index 3fc0519..5f7b27a 100644
--- a/src/com/connectsdk/sampler/SectionsPagerAdapter.java
+++ b/src/com/connectsdk/sampler/SectionsPagerAdapter.java
@@ -13,9 +13,10 @@
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
+
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
 
 import com.connectsdk.sampler.fragments.AppsFragment;
 import com.connectsdk.sampler.fragments.BaseFragment;
diff --git a/src/com/connectsdk/sampler/fragments/BaseFragment.java b/src/com/connectsdk/sampler/fragments/BaseFragment.java
index bf79de1..7c4d7fd 100644
--- a/src/com/connectsdk/sampler/fragments/BaseFragment.java
+++ b/src/com/connectsdk/sampler/fragments/BaseFragment.java
@@ -13,7 +13,7 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.KeyEvent;
 import android.widget.Button;
 
diff --git a/src/com/connectsdk/sampler/fragments/WebAppFragment.java b/src/com/connectsdk/sampler/fragments/WebAppFragment.java
index 0a5766c..bf20a34 100644
--- a/src/com/connectsdk/sampler/fragments/WebAppFragment.java
+++ b/src/com/connectsdk/sampler/fragments/WebAppFragment.java
@@ -145,7 +145,7 @@ public void enableButtons() {
         }
 
         if (getTv().getServiceByName(WEBOSID) != null)
-            webAppId = "WebAppTester";
+            webAppId = "SampleWebApp";
         else if (getTv().getServiceByName(CASTID) != null)
             webAppId = "DDCEDE96";
         else if (getTv().getServiceByName(MULTISCREENID) != null)