From 7d4dc12f53d88b282780f9e6aed42a593b5bc454 Mon Sep 17 00:00:00 2001 From: veyndan Date: Mon, 20 Mar 2017 18:33:47 +0000 Subject: [PATCH] Rename BaseAppCompatActivity to BaseActivity --- app/src/main/java/fr/free/nrw/commons/AboutActivity.java | 4 ++-- app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java | 4 ++-- .../java/fr/free/nrw/commons/auth/AuthenticatedActivity.java | 4 ++-- .../main/java/fr/free/nrw/commons/auth/SignupActivity.java | 4 ++-- .../main/java/fr/free/nrw/commons/nearby/NearbyActivity.java | 4 ++-- .../theme/{BaseAppCompatActivity.java => BaseActivity.java} | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) rename app/src/main/java/fr/free/nrw/commons/theme/{BaseAppCompatActivity.java => BaseActivity.java} (94%) diff --git a/app/src/main/java/fr/free/nrw/commons/AboutActivity.java b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java index 182cc0962..fdb58292e 100644 --- a/app/src/main/java/fr/free/nrw/commons/AboutActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java @@ -5,12 +5,12 @@ import android.text.Html; import android.text.method.LinkMovementMethod; import android.widget.TextView; -import fr.free.nrw.commons.theme.BaseAppCompatActivity; +import fr.free.nrw.commons.theme.BaseActivity; import butterknife.BindView; import butterknife.ButterKnife; -public class AboutActivity extends BaseAppCompatActivity { +public class AboutActivity extends BaseActivity { @BindView(R.id.about_version) TextView versionText; @BindView(R.id.about_license) TextView licenseText; @BindView(R.id.about_improve) TextView improveText; diff --git a/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java b/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java index 7272af715..2345126a0 100644 --- a/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java @@ -9,9 +9,9 @@ import android.widget.Button; import com.viewpagerindicator.CirclePageIndicator; -import fr.free.nrw.commons.theme.BaseAppCompatActivity; +import fr.free.nrw.commons.theme.BaseActivity; -public class WelcomeActivity extends BaseAppCompatActivity { +public class WelcomeActivity extends BaseActivity { static final int PAGE_WIKIPEDIA = 0, PAGE_DO_UPLOAD = 1, PAGE_DONT_UPLOAD = 2, diff --git a/app/src/main/java/fr/free/nrw/commons/auth/AuthenticatedActivity.java b/app/src/main/java/fr/free/nrw/commons/auth/AuthenticatedActivity.java index 6dc138a0f..776202402 100644 --- a/app/src/main/java/fr/free/nrw/commons/auth/AuthenticatedActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/auth/AuthenticatedActivity.java @@ -10,11 +10,11 @@ import android.os.Bundle; import java.io.IOException; -import fr.free.nrw.commons.theme.BaseAppCompatActivity; +import fr.free.nrw.commons.theme.BaseActivity; import fr.free.nrw.commons.CommonsApplication; import fr.free.nrw.commons.Utils; -public abstract class AuthenticatedActivity extends BaseAppCompatActivity { +public abstract class AuthenticatedActivity extends BaseActivity { String accountType; CommonsApplication app; diff --git a/app/src/main/java/fr/free/nrw/commons/auth/SignupActivity.java b/app/src/main/java/fr/free/nrw/commons/auth/SignupActivity.java index 2f56c9bc6..cd65826b0 100644 --- a/app/src/main/java/fr/free/nrw/commons/auth/SignupActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/auth/SignupActivity.java @@ -8,9 +8,9 @@ import android.webkit.WebView; import android.webkit.WebViewClient; import android.widget.Toast; -import fr.free.nrw.commons.theme.BaseAppCompatActivity; +import fr.free.nrw.commons.theme.BaseActivity; -public class SignupActivity extends BaseAppCompatActivity { +public class SignupActivity extends BaseActivity { private WebView webView; diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java index c55ae4b02..32c574f3f 100644 --- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java @@ -12,10 +12,10 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; -import fr.free.nrw.commons.theme.BaseAppCompatActivity; +import fr.free.nrw.commons.theme.BaseActivity; import fr.free.nrw.commons.R; -public class NearbyActivity extends BaseAppCompatActivity { +public class NearbyActivity extends BaseActivity { private MyLocationListener myLocationListener; private LocationManager locationManager; diff --git a/app/src/main/java/fr/free/nrw/commons/theme/BaseAppCompatActivity.java b/app/src/main/java/fr/free/nrw/commons/theme/BaseActivity.java similarity index 94% rename from app/src/main/java/fr/free/nrw/commons/theme/BaseAppCompatActivity.java rename to app/src/main/java/fr/free/nrw/commons/theme/BaseActivity.java index bd25e6296..f52ea84dd 100644 --- a/app/src/main/java/fr/free/nrw/commons/theme/BaseAppCompatActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/theme/BaseActivity.java @@ -7,7 +7,7 @@ import android.support.v7.app.AppCompatActivity; import fr.free.nrw.commons.R; -public class BaseAppCompatActivity extends AppCompatActivity { +public class BaseActivity extends AppCompatActivity { boolean currentTheme; @Override