mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 12:53:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix #2593: Migrate to androidX (#2594)

Browse source 
* Update dependencies and migrate to androidX
* Make gradle properties tidy
This commit is contained in:
Vivek Maskara 2019-03-16 16:52:37 +05:30 • committed by Adam Jones
parent 5b1b0037c3
commit 57e685cf6c
173 changed files with 518 additions and 506 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/fr/free/nrw/commons/quiz/QuizActivity.java
View file

@ -2,10 +2,10 @@ package fr.free.nrw.commons.quiz;
import android.content.Intent;
import android.os.Bundle;
import android.support.graphics.drawable.VectorDrawableCompat;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import android.widget.RadioButton;
import android.widget.TextView;

4
app/src/main/java/fr/free/nrw/commons/quiz/QuizChecker.java
View file

@ -2,7 +2,7 @@ package fr.free.nrw.commons.quiz;
import android.content.Context;
import android.content.Intent;
import android.support.v7.app.AlertDialog.Builder;
import androidx.appcompat.app.AlertDialog.Builder;
import fr.free.nrw.commons.R;
import fr.free.nrw.commons.WelcomeActivity;
@ -151,7 +151,7 @@ public class QuizChecker {
context.startActivity(i);
});
alert.setNegativeButton(android.R.string.cancel, (dialogInterface, i) -> dialogInterface.cancel());
android.support.v7.app.AlertDialog dialog = alert.create();
androidx.appcompat.app.AlertDialog dialog = alert.create();
dialog.show();
}
}

6
app/src/main/java/fr/free/nrw/commons/quiz/QuizResultActivity.java
View file

@ -5,8 +5,8 @@ import android.content.Intent;
import android.graphics.Bitmap;
import android.net.Uri;
import android.os.Bundle;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
import com.dinuscxj.progressbar.CircleProgressBar;
@ -16,7 +16,7 @@ import butterknife.OnClick;
import fr.free.nrw.commons.R;
import fr.free.nrw.commons.contributions.MainActivity;
import android.support.v7.widget.Toolbar;
import androidx.appcompat.widget.Toolbar;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuItem;