Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rearrange packages to be vertically grouped rather than layered #242

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import android.support.annotation.NonNull;

import com.artemzin.qualitymatters.ui.fragments.DeveloperSettingsFragment;
import com.artemzin.qualitymatters.developer_settings.ui.DeveloperSettingsFragment;

import dagger.Subcomponent;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
import android.app.Application;
import android.support.annotation.NonNull;

import com.artemzin.qualitymatters.models.AnalyticsModel;
import com.artemzin.qualitymatters.ui.other.ViewModifier;
import com.artemzin.qualitymatters.ui.presenters.DeveloperSettingsPresenter;
import com.artemzin.qualitymatters.analytics.AnalyticsModel;
import com.artemzin.qualitymatters.base.ui.ViewModifier;
import com.artemzin.qualitymatters.developer_settings.ui.DeveloperSettingsPresenter;
import com.github.pedrovgs.lynx.LynxConfig;

import javax.inject.Named;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import android.view.View;

import com.artemzin.qualitymatters.R;
import com.artemzin.qualitymatters.ui.other.ViewModifier;
import com.artemzin.qualitymatters.base.ui.ViewModifier;

import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.artemzin.qualitymatters.ui.fragments;
package com.artemzin.qualitymatters.developer_settings.ui;

import android.annotation.SuppressLint;
import android.content.Context;
Expand All @@ -18,9 +18,7 @@
import com.artemzin.qualitymatters.QualityMattersApp;
import com.artemzin.qualitymatters.R;
import com.artemzin.qualitymatters.performance.AnyThread;
import com.artemzin.qualitymatters.ui.adapters.DeveloperSettingsSpinnerAdapter;
import com.artemzin.qualitymatters.ui.presenters.DeveloperSettingsPresenter;
import com.artemzin.qualitymatters.ui.views.DeveloperSettingsView;
import com.artemzin.qualitymatters.base.ui.BaseFragment;
import com.github.pedrovgs.lynx.LynxActivity;
import com.github.pedrovgs.lynx.LynxConfig;
import com.jakewharton.processphoenix.ProcessPhoenix;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.artemzin.qualitymatters.ui.presenters;
package com.artemzin.qualitymatters.developer_settings.ui;

import android.support.annotation.NonNull;

import com.artemzin.qualitymatters.developer_settings.DeveloperSettingsModelImpl;
import com.artemzin.qualitymatters.models.AnalyticsModel;
import com.artemzin.qualitymatters.ui.views.DeveloperSettingsView;
import com.artemzin.qualitymatters.analytics.AnalyticsModel;
import com.artemzin.qualitymatters.base.ui.Presenter;
import okhttp3.logging.HttpLoggingInterceptor;

public class DeveloperSettingsPresenter extends Presenter<DeveloperSettingsView> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.artemzin.qualitymatters.ui.adapters;
package com.artemzin.qualitymatters.developer_settings.ui;

import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.artemzin.qualitymatters.ui.views;
package com.artemzin.qualitymatters.developer_settings.ui;

import android.support.annotation.NonNull;

Expand Down
2 changes: 1 addition & 1 deletion app/src/debug/res/layout/developer_settings_view.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<fragment xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/fragment_developer_setting"
class="com.artemzin.qualitymatters.ui.fragments.DeveloperSettingsFragment"
class="com.artemzin.qualitymatters.developer_settings.ui.DeveloperSettingsFragment"
android:layout_width="match_parent"
android:layout_height="match_parent" />
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@

import com.artemzin.qualitymatters.QualityMattersRobolectricUnitTestRunner;
import com.artemzin.qualitymatters.R;
import com.artemzin.qualitymatters.ui.adapters.DeveloperSettingsSpinnerAdapter.SelectionOption;
import com.artemzin.qualitymatters.developer_settings.ui.DeveloperSettingsSpinnerAdapter;
import com.artemzin.qualitymatters.developer_settings.ui.DeveloperSettingsSpinnerAdapter.SelectionOption;

import org.junit.Before;
import org.junit.Test;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package com.artemzin.qualitymatters.ui.presenters;

import com.artemzin.qualitymatters.developer_settings.DeveloperSettingsModelImpl;
import com.artemzin.qualitymatters.models.AnalyticsModel;
import com.artemzin.qualitymatters.ui.views.DeveloperSettingsView;
import com.artemzin.qualitymatters.analytics.AnalyticsModel;
import com.artemzin.qualitymatters.developer_settings.ui.DeveloperSettingsPresenter;
import com.artemzin.qualitymatters.developer_settings.ui.DeveloperSettingsView;

import org.junit.Before;
import org.junit.Test;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

import com.artemzin.qualitymatters.DaggerApplicationComponent;
import com.artemzin.qualitymatters.QualityMattersApp;
import com.artemzin.qualitymatters.models.AnalyticsModel;
import com.artemzin.qualitymatters.models.ModelsModule;
import com.artemzin.qualitymatters.analytics.AnalyticsModel;
import com.artemzin.qualitymatters.ModelsModule;

import timber.log.Timber;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import com.artemzin.qualitymatters.functional_tests.rules.MockWebServerRule;
import com.artemzin.qualitymatters.functional_tests.rules.NeedsMockWebServer;
import com.artemzin.qualitymatters.functional_tests.screens.ItemsScreen;
import com.artemzin.qualitymatters.ui.activities.MainActivity;
import com.artemzin.qualitymatters.MainActivity;

import org.junit.Before;
import org.junit.Rule;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@

import com.artemzin.qualitymatters.developer_settings.DevMetricsProxy;
import com.artemzin.qualitymatters.developer_settings.DeveloperSettingsModule;
import com.artemzin.qualitymatters.models.AnalyticsModel;
import com.artemzin.qualitymatters.models.ModelsModule;
import com.artemzin.qualitymatters.analytics.AnalyticsModel;

import static org.mockito.Mockito.mock;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.artemzin.qualitymatters.QualityMattersIntegrationRobolectricTestRunner;
import com.artemzin.qualitymatters.api.QualityMattersRestApi;
import com.artemzin.qualitymatters.api.entities.Item;
import com.artemzin.qualitymatters.items.entities.Item;

import org.junit.After;
import org.junit.Before;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.artemzin.qualitymatters.integration_tests.api.entities;

import com.artemzin.qualitymatters.QualityMattersIntegrationRobolectricTestRunner;
import com.artemzin.qualitymatters.api.entities.Item;
import com.artemzin.qualitymatters.items.entities.Item;
import com.google.gson.Gson;

import org.junit.Test;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity
android:name=".ui.activities.MainActivity"
android:name=".MainActivity"
android:label="@string/app_name"
android:theme="@style/AppTheme.NoActionBar">
<intent-filter>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,12 @@
import com.artemzin.qualitymatters.developer_settings.DeveloperSettingsModel;
import com.artemzin.qualitymatters.developer_settings.DeveloperSettingsModule;
import com.artemzin.qualitymatters.developer_settings.LeakCanaryProxy;
import com.artemzin.qualitymatters.models.AnalyticsModel;
import com.artemzin.qualitymatters.models.ModelsModule;
import com.artemzin.qualitymatters.analytics.AnalyticsModel;
import com.artemzin.qualitymatters.network.NetworkModule;
import com.artemzin.qualitymatters.network.OkHttpInterceptorsModule;
import com.artemzin.qualitymatters.performance.AsyncJobsModule;
import com.artemzin.qualitymatters.performance.AsyncJobsObserver;
import com.artemzin.qualitymatters.ui.activities.MainActivity;
import com.artemzin.qualitymatters.ui.fragments.ItemsFragment;
import com.artemzin.qualitymatters.items.ui.ItemsFragment;
import com.google.gson.Gson;

import javax.inject.Singleton;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import android.os.Looper;
import android.support.annotation.NonNull;

import com.artemzin.qualitymatters.models.PicassoImageLoader;
import com.artemzin.qualitymatters.models.QualityMattersImageLoader;
import com.artemzin.qualitymatters.images.PicassoImageLoader;
import com.artemzin.qualitymatters.images.QualityMattersImageLoader;
import com.artemzin.qualitymatters.other.EntityTypeAdapterFactory;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
package com.artemzin.qualitymatters.ui.activities;
package com.artemzin.qualitymatters;

import android.annotation.SuppressLint;
import android.os.Bundle;
import android.support.annotation.Nullable;

import com.artemzin.qualitymatters.QualityMattersApp;
import com.artemzin.qualitymatters.R;
import com.artemzin.qualitymatters.ui.fragments.ItemsFragment;
import com.artemzin.qualitymatters.ui.other.ViewModifier;
import com.artemzin.qualitymatters.base.ui.BaseActivity;
import com.artemzin.qualitymatters.base.ui.ViewModifier;
import com.artemzin.qualitymatters.items.ui.ItemsFragment;

import javax.inject.Inject;
import javax.inject.Named;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
package com.artemzin.qualitymatters.models;
package com.artemzin.qualitymatters;

import android.app.Application;
import android.support.annotation.NonNull;

import com.artemzin.qualitymatters.api.QualityMattersRestApi;
import com.artemzin.qualitymatters.items.ItemsModel;
import com.artemzin.qualitymatters.analytics.AnalyticsModel;
import com.yandex.metrica.YandexMetrica;

import javax.inject.Singleton;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import com.artemzin.qualitymatters.api.ApiModule;
import com.artemzin.qualitymatters.developer_settings.DevMetricsProxy;
import com.artemzin.qualitymatters.developer_settings.DeveloperSettingsModel;
import com.artemzin.qualitymatters.models.AnalyticsModel;
import com.artemzin.qualitymatters.analytics.AnalyticsModel;

import timber.log.Timber;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.artemzin.qualitymatters.models;
package com.artemzin.qualitymatters.analytics;

import android.support.annotation.NonNull;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import android.support.annotation.NonNull;

import com.artemzin.qualitymatters.api.entities.Item;
import com.artemzin.qualitymatters.items.entities.Item;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.artemzin.qualitymatters.ui.activities;
package com.artemzin.qualitymatters.base.ui;

import android.support.annotation.Nullable;
import android.support.v7.app.AppCompatActivity;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.artemzin.qualitymatters.ui.fragments;
package com.artemzin.qualitymatters.base.ui;

import android.os.Handler;
import android.os.Looper;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.artemzin.qualitymatters.ui.presenters;
package com.artemzin.qualitymatters.base.ui;

import android.support.annotation.CallSuper;
import android.support.annotation.NonNull;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.artemzin.qualitymatters.ui.other;
package com.artemzin.qualitymatters.base.ui;

import android.support.annotation.NonNull;
import android.view.View;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.artemzin.qualitymatters.models;
package com.artemzin.qualitymatters.images;

import android.support.annotation.NonNull;
import android.widget.ImageView;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.artemzin.qualitymatters.models;
package com.artemzin.qualitymatters.images;

import android.support.annotation.NonNull;
import android.widget.ImageView;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.artemzin.qualitymatters.models;
package com.artemzin.qualitymatters.items;

import android.support.annotation.NonNull;

import com.artemzin.qualitymatters.api.QualityMattersRestApi;
import com.artemzin.qualitymatters.api.entities.Item;
import com.artemzin.qualitymatters.items.entities.Item;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.artemzin.qualitymatters.api.entities;
package com.artemzin.qualitymatters.items.entities;

import android.support.annotation.NonNull;

Expand All @@ -18,7 +18,7 @@ public abstract class Item {

@NonNull
public static Builder builder() {
return new AutoValue_Item.Builder();
return new $AutoValue_Item.Builder();
}

@NonNull
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package com.artemzin.qualitymatters.ui.adapters;
package com.artemzin.qualitymatters.items.ui;

import android.support.annotation.NonNull;
import android.support.v7.widget.RecyclerView;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
import com.artemzin.qualitymatters.R;
import com.artemzin.qualitymatters.api.entities.Item;
import com.artemzin.qualitymatters.models.QualityMattersImageLoader;
import com.artemzin.qualitymatters.items.entities.Item;
import com.artemzin.qualitymatters.images.QualityMattersImageLoader;

class ItemViewHolder extends RecyclerView.ViewHolder {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package com.artemzin.qualitymatters.ui.adapters;
package com.artemzin.qualitymatters.items.ui;

import android.support.annotation.NonNull;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.ViewGroup;

import com.artemzin.qualitymatters.R;
import com.artemzin.qualitymatters.api.entities.Item;
import com.artemzin.qualitymatters.models.QualityMattersImageLoader;
import com.artemzin.qualitymatters.items.entities.Item;
import com.artemzin.qualitymatters.images.QualityMattersImageLoader;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.artemzin.qualitymatters.ui.fragments;
package com.artemzin.qualitymatters.items.ui;

import android.os.Bundle;
import android.support.annotation.NonNull;
Expand All @@ -11,17 +11,12 @@

import com.artemzin.qualitymatters.QualityMattersApp;
import com.artemzin.qualitymatters.R;
import com.artemzin.qualitymatters.api.entities.Item;
import com.artemzin.qualitymatters.models.AnalyticsModel;
import com.artemzin.qualitymatters.models.ItemsModel;
import com.artemzin.qualitymatters.models.QualityMattersImageLoader;
import com.artemzin.qualitymatters.items.entities.Item;
import com.artemzin.qualitymatters.analytics.AnalyticsModel;
import com.artemzin.qualitymatters.items.ItemsModel;
import com.artemzin.qualitymatters.images.QualityMattersImageLoader;
import com.artemzin.qualitymatters.performance.AnyThread;
import com.artemzin.qualitymatters.performance.AsyncJobsObserver;
import com.artemzin.qualitymatters.ui.adapters.ItemsAdapter;
import com.artemzin.qualitymatters.ui.adapters.VerticalSpaceItemDecoration;
import com.artemzin.qualitymatters.ui.presenters.ItemsPresenter;
import com.artemzin.qualitymatters.ui.presenters.ItemsPresenterConfiguration;
import com.artemzin.qualitymatters.ui.views.ItemsView;

import java.util.List;

Expand All @@ -31,6 +26,7 @@
import butterknife.ButterKnife;
import butterknife.OnClick;
import butterknife.Unbinder;
import com.artemzin.qualitymatters.base.ui.BaseFragment;
import dagger.Module;
import dagger.Provides;
import dagger.Subcomponent;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package com.artemzin.qualitymatters.ui.presenters;
package com.artemzin.qualitymatters.items.ui;

import android.support.annotation.NonNull;

import com.artemzin.qualitymatters.models.AnalyticsModel;
import com.artemzin.qualitymatters.models.ItemsModel;
import com.artemzin.qualitymatters.other.FinishAsyncJobSubscription;
import com.artemzin.qualitymatters.analytics.AnalyticsModel;
import com.artemzin.qualitymatters.items.ItemsModel;
import com.artemzin.qualitymatters.subscription.FinishAsyncJobSubscription;
import com.artemzin.qualitymatters.performance.AsyncJob;
import com.artemzin.qualitymatters.performance.AsyncJobsObserver;
import com.artemzin.qualitymatters.ui.views.ItemsView;

import com.artemzin.qualitymatters.base.ui.Presenter;
import rx.Subscription;

public class ItemsPresenter extends Presenter<ItemsView> {
Expand Down
Loading