From 31c702b89b828a31c0c3835d10e2d077c207889a Mon Sep 17 00:00:00 2001 From: FearlessTobi Date: Sun, 29 Mar 2020 18:17:20 +0200 Subject: [PATCH] Migrate to AndroidX Support Libraries are outdated and AndroidX is recommended instead. Read more here: developer.android.com/jetpack/androidx. Original commit by Simonx22 for Dolphin-emu. --- src/android/app/build.gradle | 14 ++++++------ src/android/app/src/main/AndroidManifest.xml | 2 +- .../activities/CustomFilePickerActivity.java | 2 +- .../activities/EmulationActivity.java | 16 ++++++-------- .../citra/citra_emu/adapters/GameAdapter.java | 6 ++--- .../citra_emu/adapters/GameRowPresenter.java | 6 ++--- .../adapters/SettingsRowPresenter.java | 4 ++-- .../fragments/CustomFilePickerFragment.java | 6 ++--- .../fragments/EmulationFragment.java | 4 ++-- .../citra_emu/fragments/MenuFragment.java | 4 ++-- .../citra/citra_emu/model/GameProvider.java | 2 +- .../citra_emu/ui/DividerItemDecoration.java | 4 ++-- .../citra_emu/ui/main/CustomTitleView.java | 2 +- .../citra/citra_emu/ui/main/MainActivity.java | 6 ++--- .../citra_emu/ui/main/TvMainActivity.java | 22 +++++++++---------- .../ui/platform/PlatformGamesFragment.java | 10 ++++----- .../ui/settings/SettingsActivity.java | 6 ++--- .../ui/settings/SettingsAdapter.java | 4 ++-- .../ui/settings/SettingsFragment.java | 8 +++---- .../ui/settings/SettingsFragmentView.java | 2 +- .../viewholder/SettingViewHolder.java | 2 +- .../utils/DirectoryInitialization.java | 2 +- .../citra_emu/utils/FileBrowserHelper.java | 4 ++-- .../citra_emu/utils/PermissionsHandler.java | 4 ++-- .../citra/citra_emu/utils/SettingsFile.java | 3 +-- .../citra/citra_emu/utils/StartupHandler.java | 2 +- .../citra_emu/viewholders/GameViewHolder.java | 2 +- .../viewholders/TvGameViewHolder.java | 4 ++-- .../viewholders/TvSettingsViewHolder.java | 4 ++-- .../res/layout/activity_add_directory.xml | 4 ++-- .../app/src/main/res/layout/activity_main.xml | 10 ++++----- .../app/src/main/res/layout/card_game.xml | 8 +++---- .../main/res/layout/filepicker_toolbar.xml | 4 ++-- .../app/src/main/res/layout/fragment_grid.xml | 6 ++--- .../src/main/res/layout/fragment_settings.xml | 2 +- .../app/src/main/res/layout/tv_title.xml | 4 ++-- src/android/gradle.properties | 2 ++ 37 files changed, 98 insertions(+), 99 deletions(-) diff --git a/src/android/app/build.gradle b/src/android/app/build.gradle index f90a7a9ee..e75c89f88 100644 --- a/src/android/app/build.gradle +++ b/src/android/app/build.gradle @@ -105,14 +105,14 @@ ext { } dependencies { - implementation "com.android.support:support-v13:$androidSupportVersion" - implementation "com.android.support:exifinterface:$androidSupportVersion" - implementation "com.android.support:cardview-v7:$androidSupportVersion" - implementation "com.android.support:recyclerview-v7:$androidSupportVersion" - implementation "com.android.support:design:$androidSupportVersion" + implementation 'androidx.legacy:legacy-support-v13:1.0.0' + implementation 'androidx.exifinterface:exifinterface:1.0.0' + implementation 'androidx.cardview:cardview:1.0.0' + implementation 'androidx.recyclerview:recyclerview:1.0.0' + implementation 'com.google.android.material:material:1.0.0' // Android TV UI libraries. - implementation "com.android.support:leanback-v17:$androidSupportVersion" + implementation 'androidx.leanback:leanback:1.0.0' // For loading huge screenshots from the disk. implementation 'com.squareup.picasso:picasso:2.71828' @@ -121,5 +121,5 @@ dependencies { implementation 'io.reactivex:rxandroid:1.2.1' implementation 'com.nononsenseapps:filepicker:4.1.0' implementation 'org.ini4j:ini4j:0.5.4' - implementation 'com.android.support.constraint:constraint-layout:1.1.3' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' } diff --git a/src/android/app/src/main/AndroidManifest.xml b/src/android/app/src/main/AndroidManifest.xml index 7ba90f807..7909377b8 100644 --- a/src/android/app/src/main/AndroidManifest.xml +++ b/src/android/app/src/main/AndroidManifest.xml @@ -84,7 +84,7 @@ diff --git a/src/android/app/src/main/java/org/citra/citra_emu/activities/CustomFilePickerActivity.java b/src/android/app/src/main/java/org/citra/citra_emu/activities/CustomFilePickerActivity.java index 16de36413..c94cefbc4 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/activities/CustomFilePickerActivity.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/activities/CustomFilePickerActivity.java @@ -2,7 +2,7 @@ package org.citra.citra_emu.activities; import android.content.Intent; import android.os.Environment; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.nononsenseapps.filepicker.AbstractFilePickerFragment; import com.nononsenseapps.filepicker.FilePickerActivity; diff --git a/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java b/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java index 90c201405..ec59ff8dc 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java @@ -5,17 +5,16 @@ import android.app.AlertDialog; import android.app.PendingIntent; import android.content.Intent; import android.content.SharedPreferences; -import android.content.res.Configuration; import android.os.Bundle; import android.os.Handler; import android.preference.PreferenceManager; -import android.support.annotation.IntDef; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.NotificationCompat; -import android.support.v4.app.NotificationManagerCompat; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.IntDef; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.FragmentManager; +import androidx.core.app.NotificationCompat; +import androidx.core.app.NotificationManagerCompat; +import androidx.appcompat.app.AppCompatActivity; import android.util.SparseIntArray; import android.view.InputDevice; import android.view.KeyEvent; @@ -32,7 +31,6 @@ import org.citra.citra_emu.R; import org.citra.citra_emu.fragments.EmulationFragment; import org.citra.citra_emu.fragments.MenuFragment; import org.citra.citra_emu.model.settings.view.InputBindingSetting; -import org.citra.citra_emu.ui.main.MainPresenter; import org.citra.citra_emu.ui.settings.SettingsActivity; import org.citra.citra_emu.utils.ControllerMappingHelper; import org.citra.citra_emu.utils.EmulationMenuSettings; diff --git a/src/android/app/src/main/java/org/citra/citra_emu/adapters/GameAdapter.java b/src/android/app/src/main/java/org/citra/citra_emu/adapters/GameAdapter.java index 87b8c7341..412884bcd 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/adapters/GameAdapter.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/adapters/GameAdapter.java @@ -5,9 +5,9 @@ import android.database.DataSetObserver; import android.graphics.Rect; import android.os.Build; import android.os.SystemClock; -import android.support.annotation.RequiresApi; -import android.support.v4.app.FragmentActivity; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.RequiresApi; +import androidx.fragment.app.FragmentActivity; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/android/app/src/main/java/org/citra/citra_emu/adapters/GameRowPresenter.java b/src/android/app/src/main/java/org/citra/citra_emu/adapters/GameRowPresenter.java index 11f0e095a..ca79b0233 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/adapters/GameRowPresenter.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/adapters/GameRowPresenter.java @@ -2,9 +2,9 @@ package org.citra.citra_emu.adapters; import android.content.Context; import android.graphics.drawable.Drawable; -import android.support.v17.leanback.widget.ImageCardView; -import android.support.v17.leanback.widget.Presenter; -import android.support.v4.content.ContextCompat; +import androidx.leanback.widget.ImageCardView; +import androidx.leanback.widget.Presenter; +import androidx.core.content.ContextCompat; import android.view.ViewGroup; import android.widget.ImageView; diff --git a/src/android/app/src/main/java/org/citra/citra_emu/adapters/SettingsRowPresenter.java b/src/android/app/src/main/java/org/citra/citra_emu/adapters/SettingsRowPresenter.java index 4978065c9..3769b422f 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/adapters/SettingsRowPresenter.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/adapters/SettingsRowPresenter.java @@ -1,8 +1,8 @@ package org.citra.citra_emu.adapters; import android.content.res.Resources; -import android.support.v17.leanback.widget.ImageCardView; -import android.support.v17.leanback.widget.Presenter; +import androidx.leanback.widget.ImageCardView; +import androidx.leanback.widget.Presenter; import android.view.ViewGroup; import org.citra.citra_emu.model.TvSettingsItem; diff --git a/src/android/app/src/main/java/org/citra/citra_emu/fragments/CustomFilePickerFragment.java b/src/android/app/src/main/java/org/citra/citra_emu/fragments/CustomFilePickerFragment.java index f8594155c..389dd9c0e 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/fragments/CustomFilePickerFragment.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/fragments/CustomFilePickerFragment.java @@ -2,9 +2,9 @@ package org.citra.citra_emu.fragments; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.content.FileProvider; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import androidx.core.content.FileProvider; +import androidx.appcompat.widget.Toolbar; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/android/app/src/main/java/org/citra/citra_emu/fragments/EmulationFragment.java b/src/android/app/src/main/java/org/citra/citra_emu/fragments/EmulationFragment.java index efe479918..222dc0ef9 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/fragments/EmulationFragment.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/fragments/EmulationFragment.java @@ -6,8 +6,8 @@ import android.content.SharedPreferences; import android.os.Bundle; import android.os.Handler; import android.preference.PreferenceManager; -import android.support.v4.app.Fragment; -import android.support.v4.content.LocalBroadcastManager; +import androidx.fragment.app.Fragment; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; import android.view.LayoutInflater; import android.view.Surface; import android.view.SurfaceHolder; diff --git a/src/android/app/src/main/java/org/citra/citra_emu/fragments/MenuFragment.java b/src/android/app/src/main/java/org/citra/citra_emu/fragments/MenuFragment.java index ce7577abf..fa760da3c 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/fragments/MenuFragment.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/fragments/MenuFragment.java @@ -1,8 +1,8 @@ package org.citra.citra_emu.fragments; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import android.util.SparseIntArray; import android.view.LayoutInflater; import android.view.View; diff --git a/src/android/app/src/main/java/org/citra/citra_emu/model/GameProvider.java b/src/android/app/src/main/java/org/citra/citra_emu/model/GameProvider.java index 55d94ddb0..b75bb1e64 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/model/GameProvider.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/model/GameProvider.java @@ -5,7 +5,7 @@ import android.content.ContentValues; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; import android.net.Uri; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.citra.citra_emu.BuildConfig; import org.citra.citra_emu.utils.Log; diff --git a/src/android/app/src/main/java/org/citra/citra_emu/ui/DividerItemDecoration.java b/src/android/app/src/main/java/org/citra/citra_emu/ui/DividerItemDecoration.java index ceb65f196..6c8326241 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/ui/DividerItemDecoration.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/ui/DividerItemDecoration.java @@ -5,8 +5,8 @@ import android.content.res.TypedArray; import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.util.AttributeSet; import android.view.View; diff --git a/src/android/app/src/main/java/org/citra/citra_emu/ui/main/CustomTitleView.java b/src/android/app/src/main/java/org/citra/citra_emu/ui/main/CustomTitleView.java index 83f36ce95..1f3f9bb4c 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/ui/main/CustomTitleView.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/ui/main/CustomTitleView.java @@ -2,7 +2,7 @@ package org.citra.citra_emu.ui.main; import android.content.Context; import android.graphics.drawable.Drawable; -import android.support.v17.leanback.widget.TitleViewAdapter; +import androidx.leanback.widget.TitleViewAdapter; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; diff --git a/src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainActivity.java b/src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainActivity.java index fb4221769..5e3e66971 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainActivity.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainActivity.java @@ -4,9 +4,9 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.database.Cursor; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; diff --git a/src/android/app/src/main/java/org/citra/citra_emu/ui/main/TvMainActivity.java b/src/android/app/src/main/java/org/citra/citra_emu/ui/main/TvMainActivity.java index 5aca437bc..c1bcf207d 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/ui/main/TvMainActivity.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/ui/main/TvMainActivity.java @@ -4,17 +4,17 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.database.Cursor; import android.os.Bundle; -import android.support.v17.leanback.app.BrowseFragment; -import android.support.v17.leanback.app.BrowseSupportFragment; -import android.support.v17.leanback.database.CursorMapper; -import android.support.v17.leanback.widget.ArrayObjectAdapter; -import android.support.v17.leanback.widget.CursorObjectAdapter; -import android.support.v17.leanback.widget.HeaderItem; -import android.support.v17.leanback.widget.ListRow; -import android.support.v17.leanback.widget.ListRowPresenter; -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentManager; -import android.support.v4.content.ContextCompat; +import androidx.leanback.app.BrowseFragment; +import androidx.leanback.app.BrowseSupportFragment; +import androidx.leanback.database.CursorMapper; +import androidx.leanback.widget.ArrayObjectAdapter; +import androidx.leanback.widget.CursorObjectAdapter; +import androidx.leanback.widget.HeaderItem; +import androidx.leanback.widget.ListRow; +import androidx.leanback.widget.ListRowPresenter; +import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.FragmentManager; +import androidx.core.content.ContextCompat; import android.widget.Toast; import org.citra.citra_emu.R; diff --git a/src/android/app/src/main/java/org/citra/citra_emu/ui/platform/PlatformGamesFragment.java b/src/android/app/src/main/java/org/citra/citra_emu/ui/platform/PlatformGamesFragment.java index c5db3538a..b4a59a893 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/ui/platform/PlatformGamesFragment.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/ui/platform/PlatformGamesFragment.java @@ -2,11 +2,11 @@ package org.citra.citra_emu.ui.platform; import android.database.Cursor; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/android/app/src/main/java/org/citra/citra_emu/ui/settings/SettingsActivity.java b/src/android/app/src/main/java/org/citra/citra_emu/ui/settings/SettingsActivity.java index e01d0b4d5..c9a475955 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/ui/settings/SettingsActivity.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/ui/settings/SettingsActivity.java @@ -6,9 +6,9 @@ import android.content.Intent; import android.content.IntentFilter; import android.os.Bundle; import android.provider.Settings; -import android.support.v4.app.FragmentTransaction; -import android.support.v4.content.LocalBroadcastManager; -import android.support.v7.app.AppCompatActivity; +import androidx.fragment.app.FragmentTransaction; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import androidx.appcompat.app.AppCompatActivity; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; diff --git a/src/android/app/src/main/java/org/citra/citra_emu/ui/settings/SettingsAdapter.java b/src/android/app/src/main/java/org/citra/citra_emu/ui/settings/SettingsAdapter.java index 75ee826ce..828336674 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/ui/settings/SettingsAdapter.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/ui/settings/SettingsAdapter.java @@ -2,8 +2,8 @@ package org.citra.citra_emu.ui.settings; import android.content.Context; import android.content.DialogInterface; -import android.support.v7.app.AlertDialog; -import android.support.v7.widget.RecyclerView; +import androidx.appcompat.app.AlertDialog; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/android/app/src/main/java/org/citra/citra_emu/ui/settings/SettingsFragment.java b/src/android/app/src/main/java/org/citra/citra_emu/ui/settings/SettingsFragment.java index 08ff1588d..249af7b0b 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/ui/settings/SettingsFragment.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/ui/settings/SettingsFragment.java @@ -3,10 +3,10 @@ package org.citra.citra_emu.ui.settings; import android.app.Activity; import android.content.Context; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/src/android/app/src/main/java/org/citra/citra_emu/ui/settings/SettingsFragmentView.java b/src/android/app/src/main/java/org/citra/citra_emu/ui/settings/SettingsFragmentView.java index 8edb6c784..47043ff68 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/ui/settings/SettingsFragmentView.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/ui/settings/SettingsFragmentView.java @@ -1,6 +1,6 @@ package org.citra.citra_emu.ui.settings; -import android.support.v4.app.FragmentActivity; +import androidx.fragment.app.FragmentActivity; import org.citra.citra_emu.model.settings.Setting; import org.citra.citra_emu.model.settings.SettingSection; diff --git a/src/android/app/src/main/java/org/citra/citra_emu/ui/settings/viewholder/SettingViewHolder.java b/src/android/app/src/main/java/org/citra/citra_emu/ui/settings/viewholder/SettingViewHolder.java index a6151110a..0bcf351e2 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/ui/settings/viewholder/SettingViewHolder.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/ui/settings/viewholder/SettingViewHolder.java @@ -1,6 +1,6 @@ package org.citra.citra_emu.ui.settings.viewholder; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import org.citra.citra_emu.model.settings.view.SettingsItem; diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/DirectoryInitialization.java b/src/android/app/src/main/java/org/citra/citra_emu/utils/DirectoryInitialization.java index e47d1f4b6..5a5846215 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/utils/DirectoryInitialization.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/utils/DirectoryInitialization.java @@ -11,7 +11,7 @@ import android.content.Intent; import android.content.SharedPreferences; import android.os.Environment; import android.preference.PreferenceManager; -import android.support.v4.content.LocalBroadcastManager; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; import org.citra.citra_emu.NativeLibrary; diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/FileBrowserHelper.java b/src/android/app/src/main/java/org/citra/citra_emu/utils/FileBrowserHelper.java index 7a7a60d17..802f90308 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/utils/FileBrowserHelper.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/utils/FileBrowserHelper.java @@ -3,8 +3,8 @@ package org.citra.citra_emu.utils; import android.content.Intent; import android.net.Uri; import android.os.Environment; -import android.support.annotation.Nullable; -import android.support.v4.app.FragmentActivity; +import androidx.annotation.Nullable; +import androidx.fragment.app.FragmentActivity; import com.nononsenseapps.filepicker.FilePickerActivity; import com.nononsenseapps.filepicker.Utils; diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/PermissionsHandler.java b/src/android/app/src/main/java/org/citra/citra_emu/utils/PermissionsHandler.java index bd37998c0..0a86280fa 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/utils/PermissionsHandler.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/utils/PermissionsHandler.java @@ -4,8 +4,8 @@ import android.annotation.TargetApi; import android.content.Context; import android.content.pm.PackageManager; import android.os.Build; -import android.support.v4.app.FragmentActivity; -import android.support.v4.content.ContextCompat; +import androidx.fragment.app.FragmentActivity; +import androidx.core.content.ContextCompat; import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE; diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/SettingsFile.java b/src/android/app/src/main/java/org/citra/citra_emu/utils/SettingsFile.java index 1e64b477e..e0222b88b 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/utils/SettingsFile.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/utils/SettingsFile.java @@ -1,13 +1,12 @@ package org.citra.citra_emu.utils; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.citra.citra_emu.model.settings.FloatSetting; import org.citra.citra_emu.model.settings.IntSetting; import org.citra.citra_emu.model.settings.Setting; import org.citra.citra_emu.model.settings.SettingSection; import org.citra.citra_emu.model.settings.StringSetting; -import org.citra.citra_emu.utils.DirectoryInitialization; import org.citra.citra_emu.ui.settings.SettingsActivityView; import org.ini4j.Wini; diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/StartupHandler.java b/src/android/app/src/main/java/org/citra/citra_emu/utils/StartupHandler.java index fa16981e8..4f4457dfc 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/utils/StartupHandler.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/utils/StartupHandler.java @@ -3,7 +3,7 @@ package org.citra.citra_emu.utils; import android.app.AlertDialog; import android.content.Intent; import android.os.Bundle; -import android.support.v4.app.FragmentActivity; +import androidx.fragment.app.FragmentActivity; import android.text.TextUtils; import org.citra.citra_emu.R; diff --git a/src/android/app/src/main/java/org/citra/citra_emu/viewholders/GameViewHolder.java b/src/android/app/src/main/java/org/citra/citra_emu/viewholders/GameViewHolder.java index 2a05ae5b6..c4731a9a4 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/viewholders/GameViewHolder.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/viewholders/GameViewHolder.java @@ -1,6 +1,6 @@ package org.citra.citra_emu.viewholders; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.ImageView; import android.widget.TextView; diff --git a/src/android/app/src/main/java/org/citra/citra_emu/viewholders/TvGameViewHolder.java b/src/android/app/src/main/java/org/citra/citra_emu/viewholders/TvGameViewHolder.java index cce329961..4dc6ac119 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/viewholders/TvGameViewHolder.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/viewholders/TvGameViewHolder.java @@ -1,7 +1,7 @@ package org.citra.citra_emu.viewholders; -import android.support.v17.leanback.widget.ImageCardView; -import android.support.v17.leanback.widget.Presenter; +import androidx.leanback.widget.ImageCardView; +import androidx.leanback.widget.Presenter; import android.view.View; import android.widget.ImageView; diff --git a/src/android/app/src/main/java/org/citra/citra_emu/viewholders/TvSettingsViewHolder.java b/src/android/app/src/main/java/org/citra/citra_emu/viewholders/TvSettingsViewHolder.java index 184717e2a..3bb03963a 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/viewholders/TvSettingsViewHolder.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/viewholders/TvSettingsViewHolder.java @@ -1,7 +1,7 @@ package org.citra.citra_emu.viewholders; -import android.support.v17.leanback.widget.ImageCardView; -import android.support.v17.leanback.widget.Presenter; +import androidx.leanback.widget.ImageCardView; +import androidx.leanback.widget.Presenter; import android.view.View; public final class TvSettingsViewHolder extends Presenter.ViewHolder { diff --git a/src/android/app/src/main/res/layout/activity_add_directory.xml b/src/android/app/src/main/res/layout/activity_add_directory.xml index 9762c5255..6b98b5ce8 100644 --- a/src/android/app/src/main/res/layout/activity_add_directory.xml +++ b/src/android/app/src/main/res/layout/activity_add_directory.xml @@ -5,7 +5,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - - - - - - + - + diff --git a/src/android/app/src/main/res/layout/card_game.xml b/src/android/app/src/main/res/layout/card_game.xml index fb0109e7b..81bcb31b4 100644 --- a/src/android/app/src/main/res/layout/card_game.xml +++ b/src/android/app/src/main/res/layout/card_game.xml @@ -1,5 +1,5 @@ - - - + - + diff --git a/src/android/app/src/main/res/layout/filepicker_toolbar.xml b/src/android/app/src/main/res/layout/filepicker_toolbar.xml index 36660cc7e..9d87570bc 100644 --- a/src/android/app/src/main/res/layout/filepicker_toolbar.xml +++ b/src/android/app/src/main/res/layout/filepicker_toolbar.xml @@ -1,5 +1,5 @@ - - + diff --git a/src/android/app/src/main/res/layout/fragment_grid.xml b/src/android/app/src/main/res/layout/fragment_grid.xml index a14df9ea6..7b5d1c5df 100644 --- a/src/android/app/src/main/res/layout/fragment_grid.xml +++ b/src/android/app/src/main/res/layout/fragment_grid.xml @@ -4,12 +4,12 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - + \ No newline at end of file diff --git a/src/android/app/src/main/res/layout/fragment_settings.xml b/src/android/app/src/main/res/layout/fragment_settings.xml index a285d0cda..fdcbf5427 100644 --- a/src/android/app/src/main/res/layout/fragment_settings.xml +++ b/src/android/app/src/main/res/layout/fragment_settings.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - @@ -28,4 +28,4 @@ android:src="@mipmap/ic_launcher"/> - \ No newline at end of file + \ No newline at end of file diff --git a/src/android/gradle.properties b/src/android/gradle.properties index 743d692ce..8de505811 100644 --- a/src/android/gradle.properties +++ b/src/android/gradle.properties @@ -6,6 +6,8 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. +android.enableJetifier=true +android.useAndroidX=true org.gradle.jvmargs=-Xmx1536m # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit