From d657e4271759402f8f77e878eeaa1736ea75ed7b Mon Sep 17 00:00:00 2001 From: Burak Oezhan Date: Wed, 18 Jan 2023 14:33:50 +0100 Subject: [PATCH 1/7] Modernize Project Setup jCenter is now deprecated. Recommended replacement is MavenCentral --- build.gradle | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index a03f48b..425544e 100644 --- a/build.gradle +++ b/build.gradle @@ -2,15 +2,11 @@ buildscript { repositories { - - jcenter() mavenCentral() - google() - } dependencies { - classpath 'com.android.tools.build:gradle:4.1.1' + classpath 'com.android.tools.build:gradle:4.2.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -23,8 +19,7 @@ plugins { } allprojects { repositories { - jcenter() - + mavenCentral() google() maven { url "https://jitpack.io" } } From 99c0a495ed05ecc750dd8e2409a699e454b758cd Mon Sep 17 00:00:00 2001 From: Burak Oezhan Date: Wed, 18 Jan 2023 14:40:41 +0100 Subject: [PATCH 2/7] Modernize Project Setup - Proguard is now deprecated - Update Gradle Wrapper --- app/build.gradle | 2 -- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 43f8195..0512a06 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,13 +15,11 @@ android { release { shrinkResources false minifyEnabled false - useProguard false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } debug { minifyEnabled false - useProguard false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 49af9c6..bd46805 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip From 6b720ed9cd43fa85901f48469e102f6e2d34eb71 Mon Sep 17 00:00:00 2001 From: Burak Oezhan Date: Wed, 18 Jan 2023 16:19:34 +0100 Subject: [PATCH 3/7] Modernize Project Setup - Upgrade Android Gradle Plugin --- app/build.gradle | 1 - build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0512a06..174837d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,6 @@ apply plugin: 'com.android.application' android { compileSdkVersion 30 - buildToolsVersion '30.0.2' defaultConfig { applicationId "de.hampager.dapnetmobile" minSdkVersion 15 diff --git a/build.gradle b/build.gradle index 425544e..9956b83 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.2' + classpath 'com.android.tools.build:gradle:7.3.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bd46805..e3ce3df 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip From 3dd35f46036d86d284e31519c93be69b2aa159a3 Mon Sep 17 00:00:00 2001 From: Burak Oezhan Date: Wed, 18 Jan 2023 16:32:14 +0100 Subject: [PATCH 4/7] Modernize Project Setup - Migrate to AndroidX --- app/build.gradle | 14 +++++++------- .../dapnetmobile/activites/LoginActivity.java | 6 +++--- .../dapnetmobile/activites/MainActivity.java | 18 +++++++++--------- .../activites/PostCallActivity.java | 10 ++++------ .../activites/PrivacyActivity.java | 4 ++-- .../dapnetmobile/activites/SplashActivity.java | 4 +--- .../dapnetmobile/adapters/CallAdapter.java | 4 ++-- .../dapnetmobile/adapters/NodeAdapter.java | 4 ++-- .../dapnetmobile/adapters/RubricAdapter.java | 4 ++-- .../adapters/RubricContentAdapter.java | 4 ++-- .../dapnetmobile/adapters/StatsAdapter.java | 4 ++-- .../adapters/SubscriberAdapter.java | 4 ++-- .../adapters/TransmitterAdapter.java | 4 ++-- .../adapters/TransmitterGroupAdapter.java | 4 ++-- .../dapnetmobile/adapters/UserAdapter.java | 4 ++-- .../dapnetmobile/fragments/CallFragment.java | 14 +++++++------- .../dapnetmobile/fragments/HelpFragment.java | 4 ++-- .../dapnetmobile/fragments/MapFragment.java | 8 ++++---- .../fragments/PrivacyFragment.java | 4 ++-- .../dapnetmobile/fragments/TableFragment.java | 12 ++++++------ .../fragments/WelcomeFragment.java | 13 ++++++------- .../CustomOnItemSelectedListener.java | 2 +- .../tokenautocomplete/TokenTextView.java | 2 +- .../main/res/layout-sw720dp/activity_main.xml | 6 +++--- app/src/main/res/layout/activity_login.xml | 18 +++++++++--------- app/src/main/res/layout/activity_main.xml | 6 +++--- app/src/main/res/layout/activity_post_call.xml | 10 +++++----- app/src/main/res/layout/activity_splash.xml | 4 ++-- app/src/main/res/layout/app_bar_main.xml | 10 +++++----- app/src/main/res/layout/fragment_call.xml | 6 +++--- .../main/res/layout/fragment_call_item_row.xml | 4 ++-- app/src/main/res/layout/fragment_table.xml | 6 +++--- .../res/layout/fragment_table_item_row.xml | 4 ++-- app/src/main/res/layout/fragment_welcome.xml | 6 +++--- .../main/res/layout/fragment_welcome_item.xml | 4 ++-- app/src/main/res/layout/stats_item.xml | 4 ++-- app/src/main/res/menu/main_menu.xml | 2 +- gradle.properties | 2 ++ 38 files changed, 120 insertions(+), 123 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 174837d..95e43b4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,7 +8,7 @@ android { targetSdkVersion 27 versionCode 25 versionName "1.2.1" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' } buildTypes { release { @@ -34,17 +34,17 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation 'org.osmdroid:osmdroid-android:6.0.2' implementation 'com.github.MKergall:osmbonuspack:6.5.2' - implementation 'com.android.support:appcompat-v7:27.1.1' - implementation 'com.android.support:recyclerview-v7:27.1.1' - implementation 'com.android.support:design:27.1.1' - implementation 'com.android.support:cardview-v7:27.1.1' + implementation 'androidx.appcompat:appcompat:1.0.0' + implementation 'androidx.recyclerview:recyclerview:1.0.0' + implementation 'com.google.android.material:material:1.0.0' + implementation 'androidx.cardview:cardview:1.0.0' implementation 'com.squareup.picasso:picasso:2.5.2' implementation 'com.splitwise:tokenautocomplete:2.0.8@aar' //implementation "com.splitwise:tokenautocomplete:3.0.1@aar" - implementation 'com.android.support:support-v4:27.1.1' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'com.google.code.gson:gson:2.8.2' implementation 'com.github.DecentralizedAmateurPagingNetwork:DAP4J:1.1.0' - implementation 'com.android.support.constraint:constraint-layout:1.1.3' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' debugImplementation 'com.squareup.leakcanary:leakcanary-android:1.5.4' releaseImplementation 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4' } \ No newline at end of file diff --git a/app/src/main/java/de/hampager/dapnetmobile/activites/LoginActivity.java b/app/src/main/java/de/hampager/dapnetmobile/activites/LoginActivity.java index 7c70d91..4fc6ed6 100644 --- a/app/src/main/java/de/hampager/dapnetmobile/activites/LoginActivity.java +++ b/app/src/main/java/de/hampager/dapnetmobile/activites/LoginActivity.java @@ -8,9 +8,9 @@ import android.content.res.Resources; import android.net.Uri; import android.os.Bundle; -import android.support.design.widget.Snackbar; -import android.support.design.widget.TextInputEditText; -import android.support.v7.app.AppCompatActivity; +import com.google.android.material.snackbar.Snackbar; +import com.google.android.material.textfield.TextInputEditText; +import androidx.appcompat.app.AppCompatActivity; import android.text.TextUtils; import android.util.Log; import android.util.Patterns; diff --git a/app/src/main/java/de/hampager/dapnetmobile/activites/MainActivity.java b/app/src/main/java/de/hampager/dapnetmobile/activites/MainActivity.java index 52fc8da..516e77c 100644 --- a/app/src/main/java/de/hampager/dapnetmobile/activites/MainActivity.java +++ b/app/src/main/java/de/hampager/dapnetmobile/activites/MainActivity.java @@ -6,15 +6,15 @@ import android.graphics.Color; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.design.widget.NavigationView; -import android.support.design.widget.Snackbar; -import android.support.v4.app.Fragment; -import android.support.v4.view.GravityCompat; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.ActionBarDrawerToggle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import com.google.android.material.navigation.NavigationView; +import com.google.android.material.snackbar.Snackbar; +import androidx.fragment.app.Fragment; +import androidx.core.view.GravityCompat; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.appcompat.app.ActionBarDrawerToggle; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.util.Log; import android.view.Menu; import android.view.MenuItem; diff --git a/app/src/main/java/de/hampager/dapnetmobile/activites/PostCallActivity.java b/app/src/main/java/de/hampager/dapnetmobile/activites/PostCallActivity.java index c9446f5..8c26fb0 100644 --- a/app/src/main/java/de/hampager/dapnetmobile/activites/PostCallActivity.java +++ b/app/src/main/java/de/hampager/dapnetmobile/activites/PostCallActivity.java @@ -4,20 +4,18 @@ import android.content.Context; import android.content.SharedPreferences; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.design.widget.Snackbar; -import android.support.design.widget.TextInputEditText; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.NonNull; +import com.google.android.material.snackbar.Snackbar; +import com.google.android.material.textfield.TextInputEditText; +import androidx.appcompat.app.AppCompatActivity; import android.text.InputType; import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; -import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.view.inputmethod.InputMethodManager; -import android.widget.CompoundButton; import android.widget.Switch; import android.widget.TextView; import android.widget.Toast; diff --git a/app/src/main/java/de/hampager/dapnetmobile/activites/PrivacyActivity.java b/app/src/main/java/de/hampager/dapnetmobile/activites/PrivacyActivity.java index 5070bb7..a99e1ff 100644 --- a/app/src/main/java/de/hampager/dapnetmobile/activites/PrivacyActivity.java +++ b/app/src/main/java/de/hampager/dapnetmobile/activites/PrivacyActivity.java @@ -4,8 +4,8 @@ import android.content.Intent; import android.content.SharedPreferences; import android.os.Build; -import android.support.annotation.RequiresApi; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.RequiresApi; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import android.text.Html; import android.text.method.LinkMovementMethod; diff --git a/app/src/main/java/de/hampager/dapnetmobile/activites/SplashActivity.java b/app/src/main/java/de/hampager/dapnetmobile/activites/SplashActivity.java index 388d876..24d181b 100644 --- a/app/src/main/java/de/hampager/dapnetmobile/activites/SplashActivity.java +++ b/app/src/main/java/de/hampager/dapnetmobile/activites/SplashActivity.java @@ -3,15 +3,13 @@ import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.os.Bundle; import java.util.Timer; import java.util.TimerTask; import de.hampager.dapnetmobile.R; -import de.hampager.dapnetmobile.fragments.PrivacyFragment; -import de.hampager.dapnetmobile.fragments.WelcomeFragment; /** * SplashActivity : displays app logo upon startup. diff --git a/app/src/main/java/de/hampager/dapnetmobile/adapters/CallAdapter.java b/app/src/main/java/de/hampager/dapnetmobile/adapters/CallAdapter.java index 33ae072..6fb6c17 100644 --- a/app/src/main/java/de/hampager/dapnetmobile/adapters/CallAdapter.java +++ b/app/src/main/java/de/hampager/dapnetmobile/adapters/CallAdapter.java @@ -1,8 +1,8 @@ package de.hampager.dapnetmobile.adapters; import android.os.Build; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/de/hampager/dapnetmobile/adapters/NodeAdapter.java b/app/src/main/java/de/hampager/dapnetmobile/adapters/NodeAdapter.java index 20adcf8..1c1c6a4 100644 --- a/app/src/main/java/de/hampager/dapnetmobile/adapters/NodeAdapter.java +++ b/app/src/main/java/de/hampager/dapnetmobile/adapters/NodeAdapter.java @@ -1,7 +1,7 @@ package de.hampager.dapnetmobile.adapters; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/de/hampager/dapnetmobile/adapters/RubricAdapter.java b/app/src/main/java/de/hampager/dapnetmobile/adapters/RubricAdapter.java index b34228e..e447006 100644 --- a/app/src/main/java/de/hampager/dapnetmobile/adapters/RubricAdapter.java +++ b/app/src/main/java/de/hampager/dapnetmobile/adapters/RubricAdapter.java @@ -1,7 +1,7 @@ package de.hampager.dapnetmobile.adapters; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/de/hampager/dapnetmobile/adapters/RubricContentAdapter.java b/app/src/main/java/de/hampager/dapnetmobile/adapters/RubricContentAdapter.java index a87b801..51c6acc 100644 --- a/app/src/main/java/de/hampager/dapnetmobile/adapters/RubricContentAdapter.java +++ b/app/src/main/java/de/hampager/dapnetmobile/adapters/RubricContentAdapter.java @@ -1,7 +1,7 @@ package de.hampager.dapnetmobile.adapters; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/de/hampager/dapnetmobile/adapters/StatsAdapter.java b/app/src/main/java/de/hampager/dapnetmobile/adapters/StatsAdapter.java index 26f83c6..490597c 100644 --- a/app/src/main/java/de/hampager/dapnetmobile/adapters/StatsAdapter.java +++ b/app/src/main/java/de/hampager/dapnetmobile/adapters/StatsAdapter.java @@ -1,7 +1,7 @@ package de.hampager.dapnetmobile.adapters; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/de/hampager/dapnetmobile/adapters/SubscriberAdapter.java b/app/src/main/java/de/hampager/dapnetmobile/adapters/SubscriberAdapter.java index 81451b3..44dbbae 100644 --- a/app/src/main/java/de/hampager/dapnetmobile/adapters/SubscriberAdapter.java +++ b/app/src/main/java/de/hampager/dapnetmobile/adapters/SubscriberAdapter.java @@ -1,7 +1,7 @@ package de.hampager.dapnetmobile.adapters; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/de/hampager/dapnetmobile/adapters/TransmitterAdapter.java b/app/src/main/java/de/hampager/dapnetmobile/adapters/TransmitterAdapter.java index 6658db1..8ea2231 100644 --- a/app/src/main/java/de/hampager/dapnetmobile/adapters/TransmitterAdapter.java +++ b/app/src/main/java/de/hampager/dapnetmobile/adapters/TransmitterAdapter.java @@ -1,7 +1,7 @@ package de.hampager.dapnetmobile.adapters; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/de/hampager/dapnetmobile/adapters/TransmitterGroupAdapter.java b/app/src/main/java/de/hampager/dapnetmobile/adapters/TransmitterGroupAdapter.java index af3ea21..816238c 100644 --- a/app/src/main/java/de/hampager/dapnetmobile/adapters/TransmitterGroupAdapter.java +++ b/app/src/main/java/de/hampager/dapnetmobile/adapters/TransmitterGroupAdapter.java @@ -1,7 +1,7 @@ package de.hampager.dapnetmobile.adapters; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/de/hampager/dapnetmobile/adapters/UserAdapter.java b/app/src/main/java/de/hampager/dapnetmobile/adapters/UserAdapter.java index 47de468..87a4593 100644 --- a/app/src/main/java/de/hampager/dapnetmobile/adapters/UserAdapter.java +++ b/app/src/main/java/de/hampager/dapnetmobile/adapters/UserAdapter.java @@ -1,7 +1,7 @@ package de.hampager.dapnetmobile.adapters; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/de/hampager/dapnetmobile/fragments/CallFragment.java b/app/src/main/java/de/hampager/dapnetmobile/fragments/CallFragment.java index 4969e9e..8ab1dec 100644 --- a/app/src/main/java/de/hampager/dapnetmobile/fragments/CallFragment.java +++ b/app/src/main/java/de/hampager/dapnetmobile/fragments/CallFragment.java @@ -3,13 +3,13 @@ import android.content.Context; import android.content.SharedPreferences; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; -import android.support.v4.view.MenuItemCompat; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.SearchView; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; +import androidx.core.view.MenuItemCompat; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.SearchView; import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; diff --git a/app/src/main/java/de/hampager/dapnetmobile/fragments/HelpFragment.java b/app/src/main/java/de/hampager/dapnetmobile/fragments/HelpFragment.java index 260ad94..1ade009 100644 --- a/app/src/main/java/de/hampager/dapnetmobile/fragments/HelpFragment.java +++ b/app/src/main/java/de/hampager/dapnetmobile/fragments/HelpFragment.java @@ -2,8 +2,8 @@ import android.content.Context; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; import android.text.Html; import android.util.Log; import android.view.LayoutInflater; diff --git a/app/src/main/java/de/hampager/dapnetmobile/fragments/MapFragment.java b/app/src/main/java/de/hampager/dapnetmobile/fragments/MapFragment.java index 2b131a1..7038ad6 100644 --- a/app/src/main/java/de/hampager/dapnetmobile/fragments/MapFragment.java +++ b/app/src/main/java/de/hampager/dapnetmobile/fragments/MapFragment.java @@ -7,10 +7,10 @@ import android.net.Uri; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.v4.app.ActivityCompat; -import android.support.v4.app.Fragment; -import android.support.v4.content.ContextCompat; +import androidx.annotation.NonNull; +import androidx.core.app.ActivityCompat; +import androidx.fragment.app.Fragment; +import androidx.core.content.ContextCompat; import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; diff --git a/app/src/main/java/de/hampager/dapnetmobile/fragments/PrivacyFragment.java b/app/src/main/java/de/hampager/dapnetmobile/fragments/PrivacyFragment.java index 3a64e8e..6dc48bd 100644 --- a/app/src/main/java/de/hampager/dapnetmobile/fragments/PrivacyFragment.java +++ b/app/src/main/java/de/hampager/dapnetmobile/fragments/PrivacyFragment.java @@ -3,8 +3,8 @@ import android.content.Context; import android.content.SharedPreferences; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentTransaction; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentTransaction; import android.text.Html; import android.text.method.LinkMovementMethod; import android.util.Log; diff --git a/app/src/main/java/de/hampager/dapnetmobile/fragments/TableFragment.java b/app/src/main/java/de/hampager/dapnetmobile/fragments/TableFragment.java index 42494b1..4c68596 100644 --- a/app/src/main/java/de/hampager/dapnetmobile/fragments/TableFragment.java +++ b/app/src/main/java/de/hampager/dapnetmobile/fragments/TableFragment.java @@ -2,13 +2,13 @@ import android.content.Context; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.SearchView; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.SearchView; import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; diff --git a/app/src/main/java/de/hampager/dapnetmobile/fragments/WelcomeFragment.java b/app/src/main/java/de/hampager/dapnetmobile/fragments/WelcomeFragment.java index a3d8d34..fea891e 100644 --- a/app/src/main/java/de/hampager/dapnetmobile/fragments/WelcomeFragment.java +++ b/app/src/main/java/de/hampager/dapnetmobile/fragments/WelcomeFragment.java @@ -3,15 +3,14 @@ import android.content.Context; import android.content.SharedPreferences; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.design.widget.Snackbar; -import android.support.v4.app.Fragment; -import android.support.v7.widget.CardView; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import com.google.android.material.snackbar.Snackbar; +import androidx.fragment.app.Fragment; +import androidx.cardview.widget.CardView; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.view.LayoutInflater; -import android.view.Menu; import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; diff --git a/app/src/main/java/de/hampager/dapnetmobile/listeners/CustomOnItemSelectedListener.java b/app/src/main/java/de/hampager/dapnetmobile/listeners/CustomOnItemSelectedListener.java index a90c7b9..1a06b77 100644 --- a/app/src/main/java/de/hampager/dapnetmobile/listeners/CustomOnItemSelectedListener.java +++ b/app/src/main/java/de/hampager/dapnetmobile/listeners/CustomOnItemSelectedListener.java @@ -1,6 +1,6 @@ package de.hampager.dapnetmobile.listeners; -import android.support.design.widget.TextInputLayout; +import com.google.android.material.textfield.TextInputLayout; import android.view.View; import android.widget.AdapterView; diff --git a/app/src/main/java/de/hampager/dapnetmobile/tokenautocomplete/TokenTextView.java b/app/src/main/java/de/hampager/dapnetmobile/tokenautocomplete/TokenTextView.java index a7f57e0..f556c13 100644 --- a/app/src/main/java/de/hampager/dapnetmobile/tokenautocomplete/TokenTextView.java +++ b/app/src/main/java/de/hampager/dapnetmobile/tokenautocomplete/TokenTextView.java @@ -1,7 +1,7 @@ package de.hampager.dapnetmobile.tokenautocomplete; import android.content.Context; -import android.support.v7.widget.AppCompatTextView; +import androidx.appcompat.widget.AppCompatTextView; import android.util.AttributeSet; public class TokenTextView extends AppCompatTextView { diff --git a/app/src/main/res/layout-sw720dp/activity_main.xml b/app/src/main/res/layout-sw720dp/activity_main.xml index 79568d9..166309c 100644 --- a/app/src/main/res/layout-sw720dp/activity_main.xml +++ b/app/src/main/res/layout-sw720dp/activity_main.xml @@ -3,7 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent"> - - - + - - - + - - - + - - - +