diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/DetailsActivity.java b/app/src/main/java/com/github/yeriomin/yalpstore/DetailsActivity.java index 68963164b..6644a06b1 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/DetailsActivity.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/DetailsActivity.java @@ -11,6 +11,15 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; +import com.github.yeriomin.yalpstore.fragment.details.AppLists; +import com.github.yeriomin.yalpstore.fragment.details.BackToPlayStore; +import com.github.yeriomin.yalpstore.fragment.details.DownloadOptions; +import com.github.yeriomin.yalpstore.fragment.details.DownloadOrInstall; +import com.github.yeriomin.yalpstore.fragment.details.GeneralDetails; +import com.github.yeriomin.yalpstore.fragment.details.IgnoreOption; +import com.github.yeriomin.yalpstore.fragment.details.Review; +import com.github.yeriomin.yalpstore.fragment.details.Screenshot; +import com.github.yeriomin.yalpstore.fragment.details.SystemAppPage; import com.github.yeriomin.yalpstore.model.App; public class DetailsActivity extends YalpStoreActivity { @@ -19,9 +28,9 @@ public class DetailsActivity extends YalpStoreActivity { static private final String INTENT_PACKAGE_NAME = "INTENT_PACKAGE_NAME"; - protected DownloadOrInstallFragment downloadOrInstallFragment; - private IgnoreOptionFragment ignoreOptionFragment; - private DownloadOptionsFragment downloadOptionsFragment; + protected DownloadOrInstall downloadOrInstallFragment; + private IgnoreOption ignoreOptionFragment; + private DownloadOptions downloadOptionsFragment; static public void start(Context context, String packageName) { Intent intent = new Intent(context, DetailsActivity.class); @@ -60,7 +69,7 @@ public class DetailsActivity extends YalpStoreActivity { return; } Log.i(getClass().getName(), "Getting info about " + packageName); - ignoreOptionFragment = new IgnoreOptionFragment(this, new App()); + ignoreOptionFragment = new IgnoreOption(this, new App()); if (null != DetailsDependentActivity.app) { drawDetails(DetailsDependentActivity.app); @@ -132,21 +141,21 @@ public class DetailsActivity extends YalpStoreActivity { private void drawDetails(App app) { setTitle(app.getDisplayName()); setContentView(R.layout.details_activity_layout); - new GeneralDetailsFragment(this, app).draw(); - new ScreenshotFragment(this, app).draw(); - new ReviewFragment(this, app).draw(); - new AppListsFragment(this, app).draw(); - new BackToPlayStoreFragment(this, app).draw(); - new SystemAppPageFragment(this, app).draw(); + new GeneralDetails(this, app).draw(); + new Screenshot(this, app).draw(); + new Review(this, app).draw(); + new AppLists(this, app).draw(); + new BackToPlayStore(this, app).draw(); + new SystemAppPage(this, app).draw(); ignoreOptionFragment.setApp(app); ignoreOptionFragment.draw(); if (null != downloadOrInstallFragment) { downloadOrInstallFragment.unregisterReceivers(); } - downloadOrInstallFragment = new DownloadOrInstallFragment(this, app); + downloadOrInstallFragment = new DownloadOrInstall(this, app); downloadOrInstallFragment.registerReceivers(); downloadOrInstallFragment.draw(); - downloadOptionsFragment = new DownloadOptionsFragment(this, app); + downloadOptionsFragment = new DownloadOptions(this, app); downloadOptionsFragment.draw(); } diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/ImageAdapter.java b/app/src/main/java/com/github/yeriomin/yalpstore/ImageAdapter.java index 66550b2f8..297f32c73 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/ImageAdapter.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/ImageAdapter.java @@ -11,13 +11,13 @@ import android.widget.ImageView; import java.util.List; -class ImageAdapter extends BaseAdapter { +public class ImageAdapter extends BaseAdapter { protected Context context; protected List screenshotUrls; protected int screenWidth; - ImageAdapter(Context context, List screenshotUrls, int screenWidth) { + public ImageAdapter(Context context, List screenshotUrls, int screenWidth) { this.context = context; this.screenshotUrls = screenshotUrls; this.screenWidth = screenWidth; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/ImageDownloadTask.java b/app/src/main/java/com/github/yeriomin/yalpstore/ImageDownloadTask.java index c27f4d384..17a1a09fe 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/ImageDownloadTask.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/ImageDownloadTask.java @@ -7,7 +7,7 @@ import android.graphics.drawable.Drawable; import android.os.AsyncTask; import android.widget.ImageView; -class ImageDownloadTask extends AsyncTask { +public class ImageDownloadTask extends AsyncTask { protected ImageView view; private boolean fullSize; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/InstallerAbstract.java b/app/src/main/java/com/github/yeriomin/yalpstore/InstallerAbstract.java index a801f957d..8ff15bdbd 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/InstallerAbstract.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/InstallerAbstract.java @@ -34,7 +34,7 @@ public abstract class InstallerAbstract { return intent; } - abstract protected void install(App app); + abstract public void install(App app); public InstallerAbstract(Context context) { Log.i(getClass().getName(), "Installer chosen"); diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/InstallerDefault.java b/app/src/main/java/com/github/yeriomin/yalpstore/InstallerDefault.java index 9156bfff7..9c7f61df5 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/InstallerDefault.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/InstallerDefault.java @@ -12,7 +12,7 @@ public class InstallerDefault extends InstallerAbstract { } @Override - protected void install(App app) { + public void install(App app) { if (background) { Log.i(getClass().getName(), "Background installation is not supported by default installer"); return; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/InstallerPrivileged.java b/app/src/main/java/com/github/yeriomin/yalpstore/InstallerPrivileged.java index a170c8f27..223345949 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/InstallerPrivileged.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/InstallerPrivileged.java @@ -69,7 +69,7 @@ public class InstallerPrivileged extends InstallerAbstract { } @Override - protected void install(App app) { + public void install(App app) { File apkFile = Downloader.getApkPath(app.getPackageName(), app.getVersionCode()); if (!apkFile.exists()) throw new IllegalArgumentException(); PackageManager pm = context.getPackageManager(); diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/InstallerRoot.java b/app/src/main/java/com/github/yeriomin/yalpstore/InstallerRoot.java index 58ea42708..ae8096562 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/InstallerRoot.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/InstallerRoot.java @@ -11,7 +11,7 @@ public class InstallerRoot extends InstallerAbstract { } @Override - protected void install(App app) { + public void install(App app) { new InstallTask(context, app.getDisplayName()) .execute(Downloader.getApkPath(app.getPackageName(), app.getVersionCode()).toString()); } diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/ManualDownloadActivity.java b/app/src/main/java/com/github/yeriomin/yalpstore/ManualDownloadActivity.java index e6bce7020..360fe03d6 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/ManualDownloadActivity.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/ManualDownloadActivity.java @@ -9,6 +9,7 @@ import android.widget.EditText; import android.widget.TextView; import com.github.yeriomin.playstoreapi.AndroidAppDeliveryData; +import com.github.yeriomin.yalpstore.fragment.details.DownloadOrInstall; import com.github.yeriomin.yalpstore.model.App; import java.util.Timer; @@ -38,7 +39,7 @@ public class ManualDownloadActivity extends DetailsActivity { if (app.getVersionCode() > 0) { ((EditText) findViewById(R.id.version_code)).setHint(String.valueOf(app.getVersionCode())); } - downloadOrInstallFragment = new DownloadOrInstallFragment(this, app); + downloadOrInstallFragment = new DownloadOrInstall(this, app); ManualDownloadTextWatcher textWatcher = new ManualDownloadTextWatcher( app, (Button) findViewById(R.id.download), @@ -57,10 +58,10 @@ public class ManualDownloadActivity extends DetailsActivity { private final App app; private final Button downloadButton; - private DownloadOrInstallFragment downloadOrInstallManager; + private DownloadOrInstall downloadOrInstallManager; private Timer timer; - public ManualDownloadTextWatcher(App app, Button downloadButton, DownloadOrInstallFragment downloadOrInstallManager) { + public ManualDownloadTextWatcher(App app, Button downloadButton, DownloadOrInstall downloadOrInstallManager) { this.app = app; this.downloadButton = downloadButton; this.downloadOrInstallManager = downloadOrInstallManager; diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/PreferenceActivity.java b/app/src/main/java/com/github/yeriomin/yalpstore/PreferenceActivity.java index 30458b719..81620e9cc 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/PreferenceActivity.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/PreferenceActivity.java @@ -7,6 +7,13 @@ import android.preference.ListPreference; import android.preference.Preference; import android.preference.PreferenceManager; +import com.github.yeriomin.yalpstore.fragment.preference.InstallationMethod; +import com.github.yeriomin.yalpstore.fragment.preference.Blacklist; +import com.github.yeriomin.yalpstore.fragment.preference.CheckUpdates; +import com.github.yeriomin.yalpstore.fragment.preference.Device; +import com.github.yeriomin.yalpstore.fragment.preference.Language; +import com.github.yeriomin.yalpstore.fragment.preference.Theme; + public class PreferenceActivity extends android.preference.PreferenceActivity { public static final String PREFERENCE_EMAIL = "PREFERENCE_EMAIL"; @@ -77,20 +84,20 @@ public class PreferenceActivity extends android.preference.PreferenceActivity { } private void drawBlackList() { - PreferenceBlacklistFragment blacklistFragment = new PreferenceBlacklistFragment(this); + Blacklist blacklistFragment = new Blacklist(this); blacklistFragment.setBlackOrWhite((ListPreference) findPreference(PREFERENCE_UPDATE_LIST_WHITE_OR_BLACK)); blacklistFragment.setAppList((MultiSelectListPreference) findPreference(PREFERENCE_UPDATE_LIST)); blacklistFragment.draw(); } private void drawTheme() { - PreferenceThemeFragment themeFragment = new PreferenceThemeFragment(this); + Theme themeFragment = new Theme(this); themeFragment.setThemePreference((ListPreference) findPreference(PREFERENCE_UI_THEME)); themeFragment.draw(); } private void drawUpdatesCheck() { - PreferenceCheckUpdatesFragment checkUpdatesFragment = new PreferenceCheckUpdatesFragment(this); + CheckUpdates checkUpdatesFragment = new CheckUpdates(this); checkUpdatesFragment.setCheckForUpdates((ListPreference) findPreference(PREFERENCE_BACKGROUND_UPDATE_INTERVAL)); checkUpdatesFragment.setAlsoInstall((CheckBoxPreference) findPreference(PREFERENCE_BACKGROUND_UPDATE_INSTALL)); checkUpdatesFragment.setAlsoDownload((CheckBoxPreference) findPreference(PREFERENCE_BACKGROUND_UPDATE_DOWNLOAD)); @@ -98,19 +105,19 @@ public class PreferenceActivity extends android.preference.PreferenceActivity { } private void drawLanguages() { - PreferenceLanguageFragment languageFragment = new PreferenceLanguageFragment(this); + Language languageFragment = new Language(this); languageFragment.setListPreference((ListPreference) findPreference(PREFERENCE_REQUESTED_LANGUAGE)); languageFragment.draw(); } private void drawDevices() { - PreferenceDeviceFragment languageFragment = new PreferenceDeviceFragment(this); + Device languageFragment = new Device(this); languageFragment.setListPreference((ListPreference) findPreference(PREFERENCE_DEVICE_TO_PRETEND_TO_BE)); languageFragment.draw(); } private void drawInstallationMethod() { - PreferenceInstallationMethodFragment installationMethodFragment = new PreferenceInstallationMethodFragment(this); + InstallationMethod installationMethodFragment = new InstallationMethod(this); installationMethodFragment.setInstallationMethodPreference((ListPreference) findPreference(PREFERENCE_INSTALLATION_METHOD)); installationMethodFragment.draw(); } diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/PreferenceFragment.java b/app/src/main/java/com/github/yeriomin/yalpstore/PreferenceFragment.java deleted file mode 100644 index abeadc5dc..000000000 --- a/app/src/main/java/com/github/yeriomin/yalpstore/PreferenceFragment.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.github.yeriomin.yalpstore; - -public abstract class PreferenceFragment { - - protected PreferenceActivity activity; - - abstract public void draw(); - - public PreferenceFragment(PreferenceActivity activity) { - this.activity = activity; - } -} diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/PurchaseCheckTask.java b/app/src/main/java/com/github/yeriomin/yalpstore/PurchaseCheckTask.java index e3ab72e1c..f2c3385e1 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/PurchaseCheckTask.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/PurchaseCheckTask.java @@ -6,6 +6,7 @@ import android.util.Log; import android.widget.Button; import com.github.yeriomin.playstoreapi.AndroidAppDeliveryData; +import com.github.yeriomin.yalpstore.fragment.details.DownloadOrInstall; import com.github.yeriomin.yalpstore.model.App; import java.io.IOException; @@ -14,10 +15,10 @@ public class PurchaseCheckTask extends AsyncTask { +class ReviewAddTask extends AsyncTask { private Context context; - private ReviewFragment manager; - private Review review; + private Review manager; + private com.github.yeriomin.yalpstore.model.Review review; private String packageName; public void setPackageName(String packageName) { this.packageName = packageName; } - ReviewAddTask(Context context, ReviewFragment manager) { + ReviewAddTask(Context context, Review manager) { this.context = context; this.manager = manager; } @Override - protected Throwable doInBackground(Review... params) { + protected Throwable doInBackground(com.github.yeriomin.yalpstore.model.Review... params) { PlayStoreApiWrapper wrapper = new PlayStoreApiWrapper(context); try { review = wrapper.addOrEditReview(packageName, params[0]); diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/ReviewDeleteTask.java b/app/src/main/java/com/github/yeriomin/yalpstore/ReviewDeleteTask.java index 671d99c07..8a6858a3d 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/ReviewDeleteTask.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/ReviewDeleteTask.java @@ -4,14 +4,16 @@ import android.content.Context; import android.os.AsyncTask; import android.util.Log; +import com.github.yeriomin.yalpstore.fragment.details.Review; + import java.io.IOException; -class ReviewDeleteTask extends AsyncTask { +public class ReviewDeleteTask extends AsyncTask { private Context context; - private ReviewFragment manager; + private Review manager; - ReviewDeleteTask(Context context, ReviewFragment manager) { + public ReviewDeleteTask(Context context, Review manager) { this.context = context; this.manager = manager; } diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/ReviewLoadTask.java b/app/src/main/java/com/github/yeriomin/yalpstore/ReviewLoadTask.java index 6cd3e75fc..81f12a8e4 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/ReviewLoadTask.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/ReviewLoadTask.java @@ -2,24 +2,24 @@ package com.github.yeriomin.yalpstore; import android.util.Log; -import com.github.yeriomin.yalpstore.model.Review; +import com.github.yeriomin.yalpstore.fragment.details.Review; import java.util.List; public class ReviewLoadTask extends GoogleApiAsyncTask { - private List list; + private List list; private ReviewStorageIterator iterator; - private ReviewFragment manager; + private Review manager; private boolean next; - public ReviewLoadTask(ReviewStorageIterator iterator, ReviewFragment manager, boolean next) { + public ReviewLoadTask(ReviewStorageIterator iterator, Review manager, boolean next) { this.iterator = iterator; this.manager = manager; this.next = next; } - public List getList() { + public List getList() { return list; } diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/UpdatableAppsTask.java b/app/src/main/java/com/github/yeriomin/yalpstore/UpdatableAppsTask.java index 80dabc3a1..ebe875917 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/UpdatableAppsTask.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/UpdatableAppsTask.java @@ -17,7 +17,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -class UpdatableAppsTask extends GoogleApiAsyncTask { +public class UpdatableAppsTask extends GoogleApiAsyncTask { protected List updatableApps = new ArrayList<>(); protected List otherInstalledApps = new ArrayList<>(); diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/UserReviewDialogBuilder.java b/app/src/main/java/com/github/yeriomin/yalpstore/UserReviewDialogBuilder.java index 7fc8229c9..be53e1d58 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/UserReviewDialogBuilder.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/UserReviewDialogBuilder.java @@ -5,23 +5,23 @@ import android.content.Context; import android.view.View; import android.widget.EditText; -import com.github.yeriomin.yalpstore.model.Review; +import com.github.yeriomin.yalpstore.fragment.details.Review; public class UserReviewDialogBuilder { private Context context; - private ReviewFragment manager; + private Review manager; private String packageName; private Dialog dialog; - public UserReviewDialogBuilder(Context context, ReviewFragment manager, String packageName) { + public UserReviewDialogBuilder(Context context, Review manager, String packageName) { this.context = context; this.manager = manager; this.packageName = packageName; } - public Dialog show(final Review review) { + public Dialog show(final com.github.yeriomin.yalpstore.model.Review review) { dialog = new Dialog(context); dialog.setContentView(R.layout.review_dialog_layout); @@ -52,9 +52,9 @@ public class UserReviewDialogBuilder { private class DoneOnClickListener implements View.OnClickListener { - private final Review review; + private final com.github.yeriomin.yalpstore.model.Review review; - public DoneOnClickListener(Review review) { + public DoneOnClickListener(com.github.yeriomin.yalpstore.model.Review review) { this.review = review; } diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/DetailsFragment.java b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/Abstract.java similarity index 88% rename from app/src/main/java/com/github/yeriomin/yalpstore/DetailsFragment.java rename to app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/Abstract.java index a61e0cc4c..e5da46dba 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/DetailsFragment.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/Abstract.java @@ -1,19 +1,21 @@ -package com.github.yeriomin.yalpstore; +package com.github.yeriomin.yalpstore.fragment.details; import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; +import com.github.yeriomin.yalpstore.DetailsActivity; +import com.github.yeriomin.yalpstore.R; import com.github.yeriomin.yalpstore.model.App; -public abstract class DetailsFragment { +public abstract class Abstract { protected DetailsActivity activity; protected App app; abstract public void draw(); - public DetailsFragment(DetailsActivity activity, App app) { + public Abstract(DetailsActivity activity, App app) { this.activity = activity; this.app = app; } diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/AppListsFragment.java b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/AppLists.java similarity index 83% rename from app/src/main/java/com/github/yeriomin/yalpstore/AppListsFragment.java rename to app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/AppLists.java index 1a12c1c0a..ba0dde4b7 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/AppListsFragment.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/AppLists.java @@ -1,16 +1,22 @@ -package com.github.yeriomin.yalpstore; +package com.github.yeriomin.yalpstore.fragment.details; import android.app.SearchManager; import android.content.Intent; import android.text.TextUtils; import android.view.View; +import com.github.yeriomin.yalpstore.DetailsActivity; +import com.github.yeriomin.yalpstore.DetailsDependentActivity; +import com.github.yeriomin.yalpstore.R; +import com.github.yeriomin.yalpstore.SearchResultActivity; +import com.github.yeriomin.yalpstore.SimilarAppsActivity; +import com.github.yeriomin.yalpstore.UsersAlsoInstalledActivity; import com.github.yeriomin.yalpstore.model.App; -public class AppListsFragment extends DetailsFragment { +public class AppLists extends Abstract { - public AppListsFragment(DetailsActivity activity, App app) { + public AppLists(DetailsActivity activity, App app) { super(activity, app); } diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/BackToPlayStoreFragment.java b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/BackToPlayStore.java similarity index 79% rename from app/src/main/java/com/github/yeriomin/yalpstore/BackToPlayStoreFragment.java rename to app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/BackToPlayStore.java index cb1055c42..6d02ccf33 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/BackToPlayStoreFragment.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/BackToPlayStore.java @@ -1,4 +1,4 @@ -package com.github.yeriomin.yalpstore; +package com.github.yeriomin.yalpstore.fragment.details; import android.content.Intent; import android.content.pm.PackageManager; @@ -6,13 +6,16 @@ import android.net.Uri; import android.view.View; import android.widget.TextView; +import com.github.yeriomin.yalpstore.DetailsActivity; +import com.github.yeriomin.yalpstore.PurchaseTask; +import com.github.yeriomin.yalpstore.R; import com.github.yeriomin.yalpstore.model.App; -public class BackToPlayStoreFragment extends DetailsFragment { +public class BackToPlayStore extends Abstract { static private final String PLAY_STORE_PACKAGE_NAME = "com.android.vending"; - public BackToPlayStoreFragment(DetailsActivity activity, App app) { + public BackToPlayStore(DetailsActivity activity, App app) { super(activity, app); } diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/DetailsButtonFragment.java b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/Button.java similarity index 77% rename from app/src/main/java/com/github/yeriomin/yalpstore/DetailsButtonFragment.java rename to app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/Button.java index 9ebf99d65..0da36232b 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/DetailsButtonFragment.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/Button.java @@ -1,16 +1,16 @@ -package com.github.yeriomin.yalpstore; +package com.github.yeriomin.yalpstore.fragment.details; import android.content.pm.PackageManager; import android.view.View; -import android.widget.Button; +import com.github.yeriomin.yalpstore.DetailsActivity; import com.github.yeriomin.yalpstore.model.App; -public abstract class DetailsButtonFragment extends DetailsFragment { +public abstract class Button extends Abstract { protected View button; - public DetailsButtonFragment(DetailsActivity activity, App app) { + public Button(DetailsActivity activity, App app) { super(activity, app); this.button = getButton(); } @@ -32,7 +32,7 @@ public abstract class DetailsButtonFragment extends DetailsFragment { } protected void disableButton(int buttonId, int stringId) { - Button button = (Button) activity.findViewById(buttonId); + android.widget.Button button = (android.widget.Button) activity.findViewById(buttonId); button.setText(stringId); button.setEnabled(false); } diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/DetailsButtonDownloadFragment.java b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/ButtonDownload.java similarity index 85% rename from app/src/main/java/com/github/yeriomin/yalpstore/DetailsButtonDownloadFragment.java rename to app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/ButtonDownload.java index 39db7b082..37718951d 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/DetailsButtonDownloadFragment.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/ButtonDownload.java @@ -1,26 +1,30 @@ -package com.github.yeriomin.yalpstore; +package com.github.yeriomin.yalpstore.fragment.details; import android.Manifest; import android.content.Intent; import android.content.pm.PackageManager; import android.os.Build; import android.view.View; -import android.widget.Button; import android.widget.Toast; +import com.github.yeriomin.yalpstore.DetailsActivity; +import com.github.yeriomin.yalpstore.Downloader; +import com.github.yeriomin.yalpstore.ManualDownloadActivity; +import com.github.yeriomin.yalpstore.PurchaseTask; +import com.github.yeriomin.yalpstore.R; import com.github.yeriomin.yalpstore.model.App; import java.io.File; -public class DetailsButtonDownloadFragment extends DetailsButtonFragment { +public class ButtonDownload extends Button { - public DetailsButtonDownloadFragment(DetailsActivity activity, App app) { + public ButtonDownload(DetailsActivity activity, App app) { super(activity, app); } @Override - protected Button getButton() { - return (Button) activity.findViewById(R.id.download); + protected android.widget.Button getButton() { + return (android.widget.Button) activity.findViewById(R.id.download); } @Override diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/DetailsButtonInstallFragment.java b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/ButtonInstall.java similarity index 57% rename from app/src/main/java/com/github/yeriomin/yalpstore/DetailsButtonInstallFragment.java rename to app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/ButtonInstall.java index e4d2d9aa1..30be4e541 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/DetailsButtonInstallFragment.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/ButtonInstall.java @@ -1,27 +1,31 @@ -package com.github.yeriomin.yalpstore; +package com.github.yeriomin.yalpstore.fragment.details; import android.app.NotificationManager; import android.content.Context; import android.view.View; -import android.widget.Button; +import com.github.yeriomin.yalpstore.DetailsActivity; +import com.github.yeriomin.yalpstore.Downloader; +import com.github.yeriomin.yalpstore.InstallerDefault; +import com.github.yeriomin.yalpstore.InstallerFactory; +import com.github.yeriomin.yalpstore.R; import com.github.yeriomin.yalpstore.model.App; -public class DetailsButtonInstallFragment extends DetailsButtonFragment { +public class ButtonInstall extends Button { - public DetailsButtonInstallFragment(DetailsActivity activity, App app) { + public ButtonInstall(DetailsActivity activity, App app) { super(activity, app); } @Override public void draw() { super.draw(); - ((Button) button).setText(R.string.details_install); + ((android.widget.Button) button).setText(R.string.details_install); } @Override - protected Button getButton() { - return (Button) activity.findViewById(R.id.install); + protected android.widget.Button getButton() { + return (android.widget.Button) activity.findViewById(R.id.install); } @Override @@ -37,7 +41,7 @@ public class DetailsButtonInstallFragment extends DetailsButtonFragment { disableButton(R.id.install, R.string.details_installing); NotificationManager manager = (NotificationManager) activity.getSystemService(Context.NOTIFICATION_SERVICE); manager.cancel(app.getDisplayName().hashCode()); - InstallerFactory.get(activity).install(app); + new InstallerDefault(activity).install(app); } }; } diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/DetailsButtonRunFragment.java b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/ButtonRun.java similarity index 69% rename from app/src/main/java/com/github/yeriomin/yalpstore/DetailsButtonRunFragment.java rename to app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/ButtonRun.java index db39ca915..39e0e60c8 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/DetailsButtonRunFragment.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/ButtonRun.java @@ -1,20 +1,21 @@ -package com.github.yeriomin.yalpstore; +package com.github.yeriomin.yalpstore.fragment.details; import android.content.Intent; import android.view.View; -import android.widget.Button; +import com.github.yeriomin.yalpstore.DetailsActivity; +import com.github.yeriomin.yalpstore.R; import com.github.yeriomin.yalpstore.model.App; -public class DetailsButtonRunFragment extends DetailsButtonFragment { +public class ButtonRun extends Button { - public DetailsButtonRunFragment(DetailsActivity activity, App app) { + public ButtonRun(DetailsActivity activity, App app) { super(activity, app); } @Override - protected Button getButton() { - return (Button) activity.findViewById(R.id.run); + protected android.widget.Button getButton() { + return (android.widget.Button) activity.findViewById(R.id.run); } @Override diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/DetailsButtonUninstallFragment.java b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/ButtonUninstall.java similarity index 79% rename from app/src/main/java/com/github/yeriomin/yalpstore/DetailsButtonUninstallFragment.java rename to app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/ButtonUninstall.java index dab9a7716..cad4a170f 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/DetailsButtonUninstallFragment.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/ButtonUninstall.java @@ -1,14 +1,18 @@ -package com.github.yeriomin.yalpstore; +package com.github.yeriomin.yalpstore.fragment.details; import android.content.Intent; import android.net.Uri; import android.view.View; +import com.github.yeriomin.yalpstore.CheckShellTask; +import com.github.yeriomin.yalpstore.DetailsActivity; +import com.github.yeriomin.yalpstore.R; +import com.github.yeriomin.yalpstore.UninstallSystemAppTask; import com.github.yeriomin.yalpstore.model.App; -public class DetailsButtonUninstallFragment extends DetailsButtonFragment { +public class ButtonUninstall extends Button { - public DetailsButtonUninstallFragment(DetailsActivity activity, App app) { + public ButtonUninstall(DetailsActivity activity, App app) { super(activity, app); } diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/DownloadOptionsFragment.java b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/DownloadOptions.java similarity index 84% rename from app/src/main/java/com/github/yeriomin/yalpstore/DownloadOptionsFragment.java rename to app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/DownloadOptions.java index 63292ad91..29c7f61a3 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/DownloadOptionsFragment.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/DownloadOptions.java @@ -1,4 +1,4 @@ -package com.github.yeriomin.yalpstore; +package com.github.yeriomin.yalpstore.fragment.details; import android.content.Intent; import android.content.pm.PackageManager; @@ -10,11 +10,20 @@ import android.view.View; import android.widget.ImageButton; import android.widget.Toast; +import com.github.yeriomin.yalpstore.BuildConfig; +import com.github.yeriomin.yalpstore.CheckShellTask; +import com.github.yeriomin.yalpstore.ConvertToNormalTask; +import com.github.yeriomin.yalpstore.ConvertToSystemTask; +import com.github.yeriomin.yalpstore.DetailsActivity; +import com.github.yeriomin.yalpstore.InstalledApkCopier; +import com.github.yeriomin.yalpstore.ManualDownloadActivity; +import com.github.yeriomin.yalpstore.R; +import com.github.yeriomin.yalpstore.SystemRemountTask; import com.github.yeriomin.yalpstore.model.App; -public class DownloadOptionsFragment extends DetailsFragment { +public class DownloadOptions extends Abstract { - public DownloadOptionsFragment(DetailsActivity activity, App app) { + public DownloadOptions(DetailsActivity activity, App app) { super(activity, app); } diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/DownloadOrInstallFragment.java b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/DownloadOrInstall.java similarity index 59% rename from app/src/main/java/com/github/yeriomin/yalpstore/DownloadOrInstallFragment.java rename to app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/DownloadOrInstall.java index 6fdf19f86..2067637d6 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/DownloadOrInstallFragment.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/DownloadOrInstall.java @@ -1,26 +1,29 @@ -package com.github.yeriomin.yalpstore; +package com.github.yeriomin.yalpstore.fragment.details; +import com.github.yeriomin.yalpstore.DetailsActivity; +import com.github.yeriomin.yalpstore.DetailsDownloadReceiver; +import com.github.yeriomin.yalpstore.DetailsInstallReceiver; import com.github.yeriomin.yalpstore.model.App; -public class DownloadOrInstallFragment extends DetailsFragment { +public class DownloadOrInstall extends Abstract { private DetailsDownloadReceiver downloadReceiver; private DetailsInstallReceiver installReceiver; - public DownloadOrInstallFragment(DetailsActivity activity, App app) { + public DownloadOrInstall(DetailsActivity activity, App app) { super(activity, app); } @Override public void draw() { - new DetailsButtonUninstallFragment(activity, app).draw(); - new DetailsButtonDownloadFragment(activity, app).draw(); - new DetailsButtonInstallFragment(activity, app).draw(); - new DetailsButtonRunFragment(activity, app).draw(); + new ButtonUninstall(activity, app).draw(); + new ButtonDownload(activity, app).draw(); + new ButtonInstall(activity, app).draw(); + new ButtonRun(activity, app).draw(); } public void download() { - new DetailsButtonDownloadFragment(activity, app).download(); + new ButtonDownload(activity, app).download(); } public void unregisterReceivers() { diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/GeneralDetailsFragment.java b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/GeneralDetails.java similarity index 92% rename from app/src/main/java/com/github/yeriomin/yalpstore/GeneralDetailsFragment.java rename to app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/GeneralDetails.java index 96f67879d..66cd42e8b 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/GeneralDetailsFragment.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/GeneralDetails.java @@ -1,4 +1,4 @@ -package com.github.yeriomin.yalpstore; +package com.github.yeriomin.yalpstore.fragment.details; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; @@ -12,15 +12,19 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; +import com.github.yeriomin.yalpstore.CategoryManager; +import com.github.yeriomin.yalpstore.DetailsActivity; +import com.github.yeriomin.yalpstore.LoadIconTask; +import com.github.yeriomin.yalpstore.R; import com.github.yeriomin.yalpstore.model.App; import java.util.ArrayList; import java.util.Collections; import java.util.List; -public class GeneralDetailsFragment extends DetailsFragment { +public class GeneralDetails extends Abstract { - public GeneralDetailsFragment(DetailsActivity activity, App app) { + public GeneralDetails(DetailsActivity activity, App app) { super(activity, app); } @@ -32,7 +36,7 @@ public class GeneralDetailsFragment extends DetailsFragment { } drawDescription(app); drawPermissions(app); - new GoogleDependencyFragment(activity, app).draw(); + new GoogleDependency(activity, app).draw(); } private void drawAppBadge(App app) { diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/GoogleDependencyFragment.java b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/GoogleDependency.java similarity index 84% rename from app/src/main/java/com/github/yeriomin/yalpstore/GoogleDependencyFragment.java rename to app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/GoogleDependency.java index 3d07257fd..d9826d84c 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/GoogleDependencyFragment.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/GoogleDependency.java @@ -1,19 +1,23 @@ -package com.github.yeriomin.yalpstore; +package com.github.yeriomin.yalpstore.fragment.details; import android.preference.PreferenceManager; import android.text.TextUtils; import android.widget.TextView; +import com.github.yeriomin.yalpstore.DependencyTranslationTask; +import com.github.yeriomin.yalpstore.DetailsActivity; +import com.github.yeriomin.yalpstore.R; +import com.github.yeriomin.yalpstore.SharedPreferencesTranslator; import com.github.yeriomin.yalpstore.model.App; import java.util.HashSet; import java.util.Set; -public class GoogleDependencyFragment extends DetailsFragment { +public class GoogleDependency extends Abstract { private SharedPreferencesTranslator translator; - public GoogleDependencyFragment(DetailsActivity activity, App app) { + public GoogleDependency(DetailsActivity activity, App app) { super(activity, app); translator = new SharedPreferencesTranslator(PreferenceManager.getDefaultSharedPreferences(activity)); } diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/IgnoreOptionFragment.java b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/IgnoreOption.java similarity index 85% rename from app/src/main/java/com/github/yeriomin/yalpstore/IgnoreOptionFragment.java rename to app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/IgnoreOption.java index 5798178eb..97558f39a 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/IgnoreOptionFragment.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/IgnoreOption.java @@ -1,13 +1,17 @@ -package com.github.yeriomin.yalpstore; +package com.github.yeriomin.yalpstore.fragment.details; import android.content.SharedPreferences; import android.preference.PreferenceManager; import android.view.Menu; import android.view.MenuItem; +import com.github.yeriomin.yalpstore.BlackWhiteListManager; +import com.github.yeriomin.yalpstore.DetailsActivity; +import com.github.yeriomin.yalpstore.PreferenceActivity; +import com.github.yeriomin.yalpstore.R; import com.github.yeriomin.yalpstore.model.App; -public class IgnoreOptionFragment extends DetailsFragment { +public class IgnoreOption extends Abstract { private Menu menu; @@ -28,7 +32,7 @@ public class IgnoreOptionFragment extends DetailsFragment { this.menu = menu; } - public IgnoreOptionFragment(DetailsActivity activity, App app) { + public IgnoreOption(DetailsActivity activity, App app) { super(activity, app); } diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/ReviewFragment.java b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/Review.java similarity index 80% rename from app/src/main/java/com/github/yeriomin/yalpstore/ReviewFragment.java rename to app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/Review.java index 34faf7f35..1c73b5b47 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/ReviewFragment.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/Review.java @@ -1,4 +1,4 @@ -package com.github.yeriomin.yalpstore; +package com.github.yeriomin.yalpstore.fragment.details; import android.preference.PreferenceManager; import android.text.TextUtils; @@ -9,18 +9,26 @@ import android.widget.LinearLayout; import android.widget.RatingBar; import android.widget.TextView; +import com.github.yeriomin.yalpstore.AccountTypeDialogBuilder; +import com.github.yeriomin.yalpstore.DetailsActivity; +import com.github.yeriomin.yalpstore.ImageDownloadTask; +import com.github.yeriomin.yalpstore.PreferenceActivity; +import com.github.yeriomin.yalpstore.R; +import com.github.yeriomin.yalpstore.ReviewDeleteTask; +import com.github.yeriomin.yalpstore.ReviewLoadTask; +import com.github.yeriomin.yalpstore.ReviewStorageIterator; +import com.github.yeriomin.yalpstore.UserReviewDialogBuilder; import com.github.yeriomin.yalpstore.model.App; -import com.github.yeriomin.yalpstore.model.Review; import java.util.List; -public class ReviewFragment extends DetailsFragment { +public class Review extends Abstract { static private int[] averageStarIds = new int[] { R.id.average_stars1, R.id.average_stars2, R.id.average_stars3, R.id.average_stars4, R.id.average_stars5 }; private ReviewStorageIterator iterator; - public ReviewFragment(DetailsActivity activity, App app) { + public Review(DetailsActivity activity, App app) { super(activity, app); iterator = new ReviewStorageIterator(); iterator.setPackageName(app.getPackageName()); @@ -47,7 +55,7 @@ public class ReviewFragment extends DetailsFragment { } activity.findViewById(R.id.user_review_container).setVisibility(isReviewable(app) ? View.VISIBLE : View.GONE); - Review review = app.getUserReview(); + com.github.yeriomin.yalpstore.model.Review review = app.getUserReview(); initUserReviewControls(app); if (null != review) { fillUserReview(review); @@ -61,7 +69,7 @@ public class ReviewFragment extends DetailsFragment { ; } - public void fillUserReview(Review review) { + public void fillUserReview(com.github.yeriomin.yalpstore.model.Review review) { clearUserReview(); app.setUserReview(review); ((RatingBar) activity.findViewById(R.id.user_stars)).setRating(review.getRating()); @@ -81,8 +89,8 @@ public class ReviewFragment extends DetailsFragment { activity.findViewById(R.id.user_review).setVisibility(View.GONE); } - private Review getUpdatedUserReview(Review oldReview, int stars) { - Review review = new Review(); + private com.github.yeriomin.yalpstore.model.Review getUpdatedUserReview(com.github.yeriomin.yalpstore.model.Review oldReview, int stars) { + com.github.yeriomin.yalpstore.model.Review review = new com.github.yeriomin.yalpstore.model.Review(); review.setRating(stars); if (null != oldReview) { review.setComment(oldReview.getComment()); @@ -91,12 +99,12 @@ public class ReviewFragment extends DetailsFragment { return review; } - public void showReviews(List reviews) { + public void showReviews(List reviews) { activity.findViewById(R.id.reviews_previous).setVisibility(iterator.hasPrevious() ? View.VISIBLE : View.INVISIBLE); activity.findViewById(R.id.reviews_next).setVisibility(iterator.hasNext() ? View.VISIBLE : View.INVISIBLE); LinearLayout listView = (LinearLayout) activity.findViewById(R.id.reviews_list); listView.removeAllViews(); - for (Review review: reviews) { + for (com.github.yeriomin.yalpstore.model.Review review: reviews) { addReviewToList(review, listView); } } @@ -108,7 +116,7 @@ public class ReviewFragment extends DetailsFragment { return task; } - private void addReviewToList(Review review, ViewGroup parent) { + private void addReviewToList(com.github.yeriomin.yalpstore.model.Review review, ViewGroup parent) { LinearLayout reviewLayout = (LinearLayout) activity.getLayoutInflater().inflate(R.layout.review_list_item, parent, false); ((TextView) reviewLayout.findViewById(R.id.author)).setText(review.getUserName()); ((TextView) reviewLayout.findViewById(R.id.title)).setText(activity.getString( @@ -141,21 +149,21 @@ public class ReviewFragment extends DetailsFragment { if (!fromUser) { return; } - new UserReviewDialogBuilder(activity, ReviewFragment.this, app.getPackageName()) + new UserReviewDialogBuilder(activity, Review.this, app.getPackageName()) .show(getUpdatedUserReview(app.getUserReview(), (int) rating)); } }); activity.findViewById(R.id.user_review_edit).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - new UserReviewDialogBuilder(activity, ReviewFragment.this, app.getPackageName()) + new UserReviewDialogBuilder(activity, Review.this, app.getPackageName()) .show(app.getUserReview()); } }); activity.findViewById(R.id.user_review_delete).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - ReviewDeleteTask task = new ReviewDeleteTask(v.getContext(), ReviewFragment.this); + ReviewDeleteTask task = new ReviewDeleteTask(v.getContext(), Review.this); task.execute(app.getPackageName()); } }); diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/ScreenshotFragment.java b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/Screenshot.java similarity index 79% rename from app/src/main/java/com/github/yeriomin/yalpstore/ScreenshotFragment.java rename to app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/Screenshot.java index 07abf6cce..ba7b37087 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/ScreenshotFragment.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/Screenshot.java @@ -1,15 +1,19 @@ -package com.github.yeriomin.yalpstore; +package com.github.yeriomin.yalpstore.fragment.details; import android.content.Intent; import android.view.View; import android.widget.AdapterView; import android.widget.Gallery; +import com.github.yeriomin.yalpstore.DetailsActivity; +import com.github.yeriomin.yalpstore.FullscreenImageActivity; +import com.github.yeriomin.yalpstore.ImageAdapter; +import com.github.yeriomin.yalpstore.R; import com.github.yeriomin.yalpstore.model.App; -public class ScreenshotFragment extends DetailsFragment { +public class Screenshot extends Abstract { - public ScreenshotFragment(DetailsActivity activity, App app) { + public Screenshot(DetailsActivity activity, App app) { super(activity, app); } diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/SystemAppPageFragment.java b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/SystemAppPage.java similarity index 86% rename from app/src/main/java/com/github/yeriomin/yalpstore/SystemAppPageFragment.java rename to app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/SystemAppPage.java index 2c14f94ec..0c57ec582 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/SystemAppPageFragment.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/details/SystemAppPage.java @@ -1,4 +1,4 @@ -package com.github.yeriomin.yalpstore; +package com.github.yeriomin.yalpstore.fragment.details; import android.content.ActivityNotFoundException; import android.content.Intent; @@ -8,11 +8,13 @@ import android.util.Log; import android.view.View; import android.widget.TextView; +import com.github.yeriomin.yalpstore.DetailsActivity; +import com.github.yeriomin.yalpstore.R; import com.github.yeriomin.yalpstore.model.App; -public class SystemAppPageFragment extends DetailsFragment { +public class SystemAppPage extends Abstract { - public SystemAppPageFragment(DetailsActivity activity, App app) { + public SystemAppPage(DetailsActivity activity, App app) { super(activity, app); } diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/fragment/preference/Abstract.java b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/preference/Abstract.java new file mode 100644 index 000000000..c35b94742 --- /dev/null +++ b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/preference/Abstract.java @@ -0,0 +1,14 @@ +package com.github.yeriomin.yalpstore.fragment.preference; + +import com.github.yeriomin.yalpstore.PreferenceActivity; + +public abstract class Abstract { + + protected PreferenceActivity activity; + + abstract public void draw(); + + public Abstract(PreferenceActivity activity) { + this.activity = activity; + } +} diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/PreferenceBlacklistFragment.java b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/preference/Blacklist.java similarity index 84% rename from app/src/main/java/com/github/yeriomin/yalpstore/PreferenceBlacklistFragment.java rename to app/src/main/java/com/github/yeriomin/yalpstore/fragment/preference/Blacklist.java index 6357a6505..4692477ff 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/PreferenceBlacklistFragment.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/preference/Blacklist.java @@ -1,19 +1,25 @@ -package com.github.yeriomin.yalpstore; +package com.github.yeriomin.yalpstore.fragment.preference; import android.preference.ListPreference; import android.preference.Preference; +import com.github.yeriomin.yalpstore.MultiSelectListPreference; +import com.github.yeriomin.yalpstore.PreferenceActivity; +import com.github.yeriomin.yalpstore.R; +import com.github.yeriomin.yalpstore.UpdatableAppsActivity; +import com.github.yeriomin.yalpstore.UpdatableAppsTask; +import com.github.yeriomin.yalpstore.Util; import com.github.yeriomin.yalpstore.model.App; import java.util.HashMap; import java.util.Map; -public class PreferenceBlacklistFragment extends PreferenceFragment { +public class Blacklist extends Abstract { private ListPreference blackOrWhite; private MultiSelectListPreference appList; - public PreferenceBlacklistFragment(PreferenceActivity activity) { + public Blacklist(PreferenceActivity activity) { super(activity); } diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/PreferenceCheckUpdatesFragment.java b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/preference/CheckUpdates.java similarity index 89% rename from app/src/main/java/com/github/yeriomin/yalpstore/PreferenceCheckUpdatesFragment.java rename to app/src/main/java/com/github/yeriomin/yalpstore/fragment/preference/CheckUpdates.java index 6907db5fa..40ecb774f 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/PreferenceCheckUpdatesFragment.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/preference/CheckUpdates.java @@ -1,4 +1,4 @@ -package com.github.yeriomin.yalpstore; +package com.github.yeriomin.yalpstore.fragment.preference; import android.Manifest; import android.content.pm.PackageManager; @@ -6,13 +6,19 @@ import android.preference.CheckBoxPreference; import android.preference.ListPreference; import android.preference.Preference; -public class PreferenceCheckUpdatesFragment extends PreferenceFragment { +import com.github.yeriomin.yalpstore.BuildConfig; +import com.github.yeriomin.yalpstore.CheckSuTask; +import com.github.yeriomin.yalpstore.PreferenceActivity; +import com.github.yeriomin.yalpstore.R; +import com.github.yeriomin.yalpstore.UpdateChecker; + +public class CheckUpdates extends Abstract { private ListPreference checkForUpdates; private CheckBoxPreference alsoInstall; private CheckBoxPreference alsoDownload; - public PreferenceCheckUpdatesFragment(PreferenceActivity activity) { + public CheckUpdates(PreferenceActivity activity) { super(activity); } diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/PreferenceDeviceFragment.java b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/preference/Device.java similarity index 75% rename from app/src/main/java/com/github/yeriomin/yalpstore/PreferenceDeviceFragment.java rename to app/src/main/java/com/github/yeriomin/yalpstore/fragment/preference/Device.java index 0c8ba6c3a..74be5ebdc 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/PreferenceDeviceFragment.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/preference/Device.java @@ -1,14 +1,20 @@ -package com.github.yeriomin.yalpstore; +package com.github.yeriomin.yalpstore.fragment.preference; import android.preference.Preference; import android.widget.Toast; +import com.github.yeriomin.yalpstore.OnListPreferenceChangeListener; +import com.github.yeriomin.yalpstore.PreferenceActivity; +import com.github.yeriomin.yalpstore.R; +import com.github.yeriomin.yalpstore.SpoofDeviceManager; +import com.github.yeriomin.yalpstore.Util; + import java.util.LinkedHashMap; import java.util.Map; -public class PreferenceDeviceFragment extends PreferenceListFragment { +public class Device extends List { - public PreferenceDeviceFragment(PreferenceActivity activity) { + public Device(PreferenceActivity activity) { super(activity); } diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/PreferenceInstallationMethodFragment.java b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/preference/InstallationMethod.java similarity index 72% rename from app/src/main/java/com/github/yeriomin/yalpstore/PreferenceInstallationMethodFragment.java rename to app/src/main/java/com/github/yeriomin/yalpstore/fragment/preference/InstallationMethod.java index 2fa8297d9..986883fcd 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/PreferenceInstallationMethodFragment.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/preference/InstallationMethod.java @@ -1,13 +1,15 @@ -package com.github.yeriomin.yalpstore; +package com.github.yeriomin.yalpstore.fragment.preference; import android.preference.ListPreference; import android.preference.Preference; -public class PreferenceInstallationMethodFragment extends PreferenceFragment { +import com.github.yeriomin.yalpstore.PreferenceActivity; + +public class InstallationMethod extends Abstract { private ListPreference installationMethod; - public PreferenceInstallationMethodFragment(PreferenceActivity activity) { + public InstallationMethod(PreferenceActivity activity) { super(activity); } diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/PreferenceLanguageFragment.java b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/preference/Language.java similarity index 80% rename from app/src/main/java/com/github/yeriomin/yalpstore/PreferenceLanguageFragment.java rename to app/src/main/java/com/github/yeriomin/yalpstore/fragment/preference/Language.java index 08e69cc7b..b4d1f0e00 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/PreferenceLanguageFragment.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/preference/Language.java @@ -1,16 +1,22 @@ -package com.github.yeriomin.yalpstore; +package com.github.yeriomin.yalpstore.fragment.preference; import android.preference.Preference; +import com.github.yeriomin.yalpstore.OnListPreferenceChangeListener; +import com.github.yeriomin.yalpstore.PlayStoreApiAuthenticator; +import com.github.yeriomin.yalpstore.PreferenceActivity; +import com.github.yeriomin.yalpstore.R; +import com.github.yeriomin.yalpstore.Util; + import java.io.IOException; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Locale; import java.util.Map; -public class PreferenceLanguageFragment extends PreferenceListFragment { +public class Language extends List { - public PreferenceLanguageFragment(PreferenceActivity activity) { + public Language(PreferenceActivity activity) { super(activity); } diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/PreferenceListFragment.java b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/preference/List.java similarity index 78% rename from app/src/main/java/com/github/yeriomin/yalpstore/PreferenceListFragment.java rename to app/src/main/java/com/github/yeriomin/yalpstore/fragment/preference/List.java index fff703ea7..968b89f5a 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/PreferenceListFragment.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/preference/List.java @@ -1,17 +1,20 @@ -package com.github.yeriomin.yalpstore; +package com.github.yeriomin.yalpstore.fragment.preference; import android.preference.ListPreference; +import com.github.yeriomin.yalpstore.OnListPreferenceChangeListener; +import com.github.yeriomin.yalpstore.PreferenceActivity; + import java.util.Map; -public abstract class PreferenceListFragment extends PreferenceFragment { +public abstract class List extends Abstract { protected ListPreference listPreference; abstract protected Map getKeyValueMap(); abstract protected OnListPreferenceChangeListener getOnListPreferenceChangeListener(); - public PreferenceListFragment(PreferenceActivity activity) { + public List(PreferenceActivity activity) { super(activity); } diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/OnInstallationMethodChangeListener.java b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/preference/OnInstallationMethodChangeListener.java similarity index 89% rename from app/src/main/java/com/github/yeriomin/yalpstore/OnInstallationMethodChangeListener.java rename to app/src/main/java/com/github/yeriomin/yalpstore/fragment/preference/OnInstallationMethodChangeListener.java index 8f7371306..d4e00fb84 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/OnInstallationMethodChangeListener.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/preference/OnInstallationMethodChangeListener.java @@ -1,4 +1,4 @@ -package com.github.yeriomin.yalpstore; +package com.github.yeriomin.yalpstore.fragment.preference; import android.Manifest; import android.content.pm.PackageInfo; @@ -7,6 +7,12 @@ import android.preference.ListPreference; import android.preference.Preference; import android.widget.Toast; +import com.github.yeriomin.yalpstore.BuildConfig; +import com.github.yeriomin.yalpstore.CheckShellTask; +import com.github.yeriomin.yalpstore.CheckSuTask; +import com.github.yeriomin.yalpstore.ConvertToSystemTask; +import com.github.yeriomin.yalpstore.PreferenceActivity; +import com.github.yeriomin.yalpstore.R; import com.github.yeriomin.yalpstore.model.App; class OnInstallationMethodChangeListener implements Preference.OnPreferenceChangeListener { diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/PreferenceThemeFragment.java b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/preference/Theme.java similarity index 86% rename from app/src/main/java/com/github/yeriomin/yalpstore/PreferenceThemeFragment.java rename to app/src/main/java/com/github/yeriomin/yalpstore/fragment/preference/Theme.java index 43754033f..73916f06b 100644 --- a/app/src/main/java/com/github/yeriomin/yalpstore/PreferenceThemeFragment.java +++ b/app/src/main/java/com/github/yeriomin/yalpstore/fragment/preference/Theme.java @@ -1,13 +1,16 @@ -package com.github.yeriomin.yalpstore; +package com.github.yeriomin.yalpstore.fragment.preference; import android.preference.ListPreference; import android.preference.Preference; -public class PreferenceThemeFragment extends PreferenceFragment { +import com.github.yeriomin.yalpstore.PreferenceActivity; +import com.github.yeriomin.yalpstore.R; + +public class Theme extends Abstract { private ListPreference themePreference; - public PreferenceThemeFragment(PreferenceActivity activity) { + public Theme(PreferenceActivity activity) { super(activity); }