julian/EndlessRoll
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to androidx

Browse Source
This commit is contained in:
Julian Mutter 2024-03-01 16:15:35 +01:00
parent be4cc7c68a
commit b301cb3029
22 changed files with 32 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -39,6 +39,6 @@ android {
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
testImplementation 'junit:junit:4.12'
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation files('libs/simple-xml-2.7.1.jar')
}

2
app/src/main/java/de/frajul/endlessroll/entities/DestroyEffect.java
View File

@ -7,7 +7,7 @@
package de.frajul.endlessroll.entities;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import de.frajul.endlessroll.data.Vector;
import de.frajul.endlessroll.entities.particles.ParticleEffect;

4
app/src/main/java/de/frajul/endlessroll/entities/shapes/PlayerShape.java
View File

@ -7,8 +7,8 @@
package de.frajul.endlessroll.entities.shapes;
import android.support.annotation.DrawableRes;
import android.support.annotation.StringRes;
import androidx.annotation.DrawableRes;
import androidx.annotation.StringRes;
import de.frajul.endlessroll.R;
import de.frajul.endlessroll.entities.textures.Texture;

2
app/src/main/java/de/frajul/endlessroll/entities/textures/TexturePack.java
View File

@ -8,7 +8,7 @@
package de.frajul.endlessroll.entities.textures;
import android.content.Context;
import android.support.annotation.DrawableRes;
import androidx.annotation.DrawableRes;
import de.frajul.endlessroll.R;
import de.frajul.endlessroll.entities.shapes.PlayerShape;

4
app/src/main/java/de/frajul/endlessroll/entities/tools/ToolType.java
View File

@ -7,8 +7,8 @@
package de.frajul.endlessroll.entities.tools;
import android.support.annotation.Nullable;
import android.support.annotation.StringRes;
import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
import java.util.Arrays;
import java.util.List;

2
app/src/main/java/de/frajul/endlessroll/levels/worlds/World.java
View File

@ -7,7 +7,7 @@
package de.frajul.endlessroll.levels.worlds;
import android.support.annotation.DrawableRes;
import androidx.annotation.DrawableRes;
import java.util.ArrayList;
import java.util.Arrays;

2
app/src/main/java/de/frajul/endlessroll/main/physics/Physics.java
View File

@ -7,7 +7,7 @@
package de.frajul.endlessroll.main.physics;
import android.support.annotation.Nullable;
import androidx.annotation.Nullable;
import java.util.ArrayList;
import java.util.List;

2
app/src/main/java/de/frajul/endlessroll/main/screens/GLScreen.java
View File

@ -7,7 +7,7 @@
package de.frajul.endlessroll.main.screens;
import android.support.annotation.LayoutRes;
import androidx.annotation.LayoutRes;
import android.view.ViewGroup;
import de.frajul.endlessroll.main.GameActivity;

4
app/src/main/java/de/frajul/endlessroll/main/screens/Screen.java
View File

@ -8,8 +8,8 @@
package de.frajul.endlessroll.main.screens;
import android.content.Context;
import android.support.annotation.IdRes;
import android.support.annotation.LayoutRes;
import androidx.annotation.IdRes;
import androidx.annotation.LayoutRes;
import android.view.LayoutInflater;
import android.view.ViewGroup;

2
app/src/main/java/de/frajul/endlessroll/main/screens/SettingsScreen.java
View File

@ -7,7 +7,7 @@
package de.frajul.endlessroll.main.screens;
import android.support.annotation.IdRes;
import androidx.annotation.IdRes;
import android.view.View;
import android.widget.Button;
import android.widget.CheckBox;

3
app/src/main/java/de/frajul/endlessroll/main/screens/StartScreen.java
View File

@ -8,7 +8,7 @@
package de.frajul.endlessroll.main.screens;
import android.graphics.Typeface;
import android.support.annotation.IdRes;
import androidx.annotation.IdRes;
import android.view.View;
import android.view.animation.AnimationUtils;
import android.widget.Button;
@ -19,7 +19,6 @@ import de.frajul.endlessroll.R;
import de.frajul.endlessroll.main.GameActivity;
import de.frajul.endlessroll.main.MyGlSurfaceView;
import de.frajul.endlessroll.main.game.StartScene;
import de.frajul.endlessroll.sqlDatabase.MyDatabase;
import de.frajul.endlessroll.views.ConfirmDialog;
import de.frajul.endlessroll.views.DevToolsDialog;

4
app/src/main/java/de/frajul/endlessroll/main/tutorial/BreakPoint.java
View File

@ -7,8 +7,8 @@
package de.frajul.endlessroll.main.tutorial;
import android.support.annotation.DrawableRes;
import android.support.annotation.StringRes;
import androidx.annotation.DrawableRes;
import androidx.annotation.StringRes;
/**
* Created by Julian on 14.03.2017.

2
app/src/main/java/de/frajul/endlessroll/sounds/SoundManager.java
View File

@ -10,7 +10,7 @@ package de.frajul.endlessroll.sounds;
import android.content.Context;
import android.media.AudioManager;
import android.media.SoundPool;
import android.support.annotation.RawRes;
import androidx.annotation.RawRes;
import java.util.ArrayList;
import java.util.Collections;

6
app/src/main/java/de/frajul/endlessroll/views/BountyMessage.java
View File

@ -8,9 +8,9 @@
package de.frajul.endlessroll.views;
import android.content.Context;
import android.support.annotation.DrawableRes;
import android.support.annotation.Nullable;
import android.support.annotation.StringRes;
import androidx.annotation.DrawableRes;
import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.ImageView;

2
app/src/main/java/de/frajul/endlessroll/views/ConfirmDialog.java
View File

@ -9,7 +9,7 @@ package de.frajul.endlessroll.views;
import android.app.Dialog;
import android.os.Bundle;
import android.support.annotation.StringRes;
import androidx.annotation.StringRes;
import android.view.View;
import android.view.Window;
import android.widget.Button;

2
app/src/main/java/de/frajul/endlessroll/views/CreditsDialog.java
View File

@ -10,7 +10,7 @@ package de.frajul.endlessroll.views;
import android.animation.ObjectAnimator;
import android.app.Dialog;
import android.os.Bundle;
import android.support.annotation.IdRes;
import androidx.annotation.IdRes;
import android.view.MotionEvent;
import android.view.View;
import android.view.Window;

13
app/src/main/java/de/frajul/endlessroll/views/DevToolsDialog.java
View File

@ -7,22 +7,13 @@
package de.frajul.endlessroll.views;
import android.animation.ObjectAnimator;
import android.app.Dialog;
import android.os.Bundle;
import android.support.annotation.IdRes;
import android.view.MotionEvent;
import androidx.annotation.IdRes;
import android.view.View;
import android.view.Window;
import android.view.animation.Animation;
import android.view.animation.AnimationUtils;
import android.view.animation.LinearInterpolator;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.ScrollView;
import android.widget.TextView;
import java.util.concurrent.locks.ReentrantLock;
import de.frajul.endlessroll.R;
import de.frajul.endlessroll.main.GameActivity;

2
app/src/main/java/de/frajul/endlessroll/views/GoalMessageLevelButton.java
View File

@ -7,7 +7,7 @@
package de.frajul.endlessroll.views;
import android.support.annotation.StringRes;
import androidx.annotation.StringRes;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;

2
app/src/main/java/de/frajul/endlessroll/views/LevelButton.java
View File

@ -7,7 +7,7 @@
package de.frajul.endlessroll.views;
import android.support.annotation.LayoutRes;
import androidx.annotation.LayoutRes;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.ImageView;

4
app/src/main/java/de/frajul/endlessroll/views/PriceButton.java
View File

@ -9,8 +9,8 @@ package de.frajul.endlessroll.views;
import android.content.Context;
import android.graphics.Typeface;
import android.support.annotation.DrawableRes;
import android.support.annotation.StringRes;
import androidx.annotation.DrawableRes;
import androidx.annotation.StringRes;
import android.view.View;
import android.view.animation.Animation;
import android.widget.ImageView;

4
gradle.properties
View File

@ -18,5 +18,7 @@
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
android.enableJetifier=true
android.nonFinalResIds=false
android.nonTransitiveRClass=false
android.nonTransitiveRClass=false
android.useAndroidX=true

2
particlelab/build.gradle
View File

@ -30,5 +30,5 @@ android {
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
testImplementation 'junit:junit:4.12'
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
}