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

Base library #6

Merged
merged 2 commits into from Feb 27, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions app/build.gradle
Expand Up @@ -61,8 +61,7 @@ android {
}

dependencies {
implementation project(':domain')
implementation project(':data')
implementation project(':baselibrary')

rootProject.ext.app_dependencies.each {
item -> implementation item
Expand Down
Expand Up @@ -15,42 +15,10 @@
*/
package com.cashow.modularizationdemo;

import android.app.Application;

import com.alibaba.android.arouter.launcher.ARouter;
import com.cashow.modularizationdemo.common.di.components.ApplicationComponent;
import com.cashow.modularizationdemo.common.di.components.DaggerApplicationComponent;
import com.cashow.modularizationdemo.common.di.modules.ApplicationModule;
import com.cashow.baselibrary.BaseApplication;

/**
* Android Main Application
*/
public class AndroidApplication extends Application {

private ApplicationComponent applicationComponent;

@Override
public void onCreate() {
super.onCreate();
this.initializeInjector();
this.initARouter();
}

private void initializeInjector() {
this.applicationComponent = DaggerApplicationComponent.builder()
.applicationModule(new ApplicationModule(this))
.build();
}

private void initARouter() {
if (BuildConfig.DEBUG) { // 这两行必须写在init之前,否则这些配置在init过程中将无效
ARouter.openLog(); // 打印日志
ARouter.openDebug(); // 开启调试模式(如果在InstantRun模式下运行,必须开启调试模式!线上版本需要关闭,否则有安全风险)
}
ARouter.init(this); // 尽可能早,推荐在Application中初始化
}

public ApplicationComponent getApplicationComponent() {
return this.applicationComponent;
}
public class AndroidApplication extends BaseApplication {
}
Expand Up @@ -13,11 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.cashow.modularizationdemo.common.di.components;
package com.cashow.modularizationdemo;

import com.cashow.modularizationdemo.common.di.modules.ActivityModule;
import com.cashow.modularizationdemo.common.di.modules.UserModule;
import com.cashow.modularizationdemo.common.di.PerActivity;
import com.cashow.baselibrary.di.components.ActivityComponent;
import com.cashow.baselibrary.di.components.ApplicationComponent;
import com.cashow.baselibrary.di.modules.UserModule;
import com.cashow.baselibrary.di.modules.ActivityModule;
import com.cashow.baselibrary.di.PerActivity;
import com.cashow.modularizationdemo.userdetails.UserDetailsFragment;
import com.cashow.modularizationdemo.userlist.UserListFragment;

Expand Down
Expand Up @@ -4,7 +4,7 @@
import android.widget.Button;

import com.cashow.modularizationdemo.R;
import com.cashow.modularizationdemo.common.activity.BaseActivity;
import com.cashow.baselibrary.activity.BaseActivity;

import butterknife.BindView;
import butterknife.ButterKnife;
Expand Down
Expand Up @@ -11,11 +11,11 @@
import com.alibaba.android.arouter.facade.annotation.Autowired;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter;
import com.cashow.baselibrary.activity.BaseActivity;
import com.cashow.baselibrary.di.HasComponent;
import com.cashow.modularizationdemo.DaggerUserComponent;
import com.cashow.modularizationdemo.R;
import com.cashow.modularizationdemo.common.activity.BaseActivity;
import com.cashow.modularizationdemo.common.di.HasComponent;
import com.cashow.modularizationdemo.common.di.components.DaggerUserComponent;
import com.cashow.modularizationdemo.common.di.components.UserComponent;
import com.cashow.modularizationdemo.UserComponent;

/**
* Activity that shows details of a certain user.
Expand Down
Expand Up @@ -15,9 +15,9 @@
import android.widget.TextView;

import com.cashow.modularizationdemo.R;
import com.cashow.modularizationdemo.common.di.components.UserComponent;
import com.cashow.modularizationdemo.common.fragment.BaseFragment;
import com.cashow.modularizationdemo.common.model.UserModel;
import com.cashow.modularizationdemo.UserComponent;
import com.cashow.baselibrary.fragment.BaseFragment;
import com.cashow.baselibrary.model.UserModel;
import com.cashow.modularizationdemo.userdetails.widget.AutoLoadImageView;
import com.fernandocejas.arrow.checks.Preconditions;

Expand Down
Expand Up @@ -23,11 +23,11 @@
import com.cashow.domain.interactor.DefaultObserver;
import com.cashow.domain.interactor.GetUserDetails;
import com.cashow.domain.interactor.GetUserDetails.Params;
import com.cashow.modularizationdemo.common.di.PerActivity;
import com.cashow.modularizationdemo.common.exception.ErrorMessageFactory;
import com.cashow.modularizationdemo.common.mapper.UserModelDataMapper;
import com.cashow.modularizationdemo.common.model.UserModel;
import com.cashow.modularizationdemo.common.presenter.Presenter;
import com.cashow.baselibrary.di.PerActivity;
import com.cashow.baselibrary.exception.ErrorMessageFactory;
import com.cashow.baselibrary.mapper.UserModelDataMapper;
import com.cashow.baselibrary.model.UserModel;
import com.cashow.baselibrary.presenter.Presenter;

import javax.inject.Inject;

Expand Down
Expand Up @@ -5,8 +5,8 @@
*/
package com.cashow.modularizationdemo.userdetails;

import com.cashow.modularizationdemo.common.model.UserModel;
import com.cashow.modularizationdemo.common.view.LoadDataView;
import com.cashow.baselibrary.model.UserModel;
import com.cashow.baselibrary.view.LoadDataView;

/**
* Interface representing a View in a model view presenter (MVP) pattern.
Expand Down
Expand Up @@ -9,12 +9,12 @@
import android.view.Window;

import com.alibaba.android.arouter.facade.annotation.Route;
import com.cashow.baselibrary.activity.BaseActivity;
import com.cashow.baselibrary.di.HasComponent;
import com.cashow.baselibrary.model.UserModel;
import com.cashow.modularizationdemo.DaggerUserComponent;
import com.cashow.modularizationdemo.R;
import com.cashow.modularizationdemo.common.activity.BaseActivity;
import com.cashow.modularizationdemo.common.di.HasComponent;
import com.cashow.modularizationdemo.common.di.components.DaggerUserComponent;
import com.cashow.modularizationdemo.common.di.components.UserComponent;
import com.cashow.modularizationdemo.common.model.UserModel;
import com.cashow.modularizationdemo.UserComponent;

/**
* Activity that shows a list of Users.
Expand Down
Expand Up @@ -18,9 +18,9 @@
import com.cashow.modularizationdemo.R;
import com.cashow.modularizationdemo.userlist.adapter.UsersAdapter;
import com.cashow.modularizationdemo.userlist.adapter.UsersLayoutManager;
import com.cashow.modularizationdemo.common.di.components.UserComponent;
import com.cashow.modularizationdemo.common.fragment.BaseFragment;
import com.cashow.modularizationdemo.common.model.UserModel;
import com.cashow.modularizationdemo.UserComponent;
import com.cashow.baselibrary.fragment.BaseFragment;
import com.cashow.baselibrary.model.UserModel;

import java.util.Collection;

Expand Down
Expand Up @@ -22,11 +22,11 @@
import com.cashow.domain.exception.ErrorBundle;
import com.cashow.domain.interactor.DefaultObserver;
import com.cashow.domain.interactor.GetUserList;
import com.cashow.modularizationdemo.common.di.PerActivity;
import com.cashow.modularizationdemo.common.exception.ErrorMessageFactory;
import com.cashow.modularizationdemo.common.mapper.UserModelDataMapper;
import com.cashow.modularizationdemo.common.model.UserModel;
import com.cashow.modularizationdemo.common.presenter.Presenter;
import com.cashow.baselibrary.di.PerActivity;
import com.cashow.baselibrary.exception.ErrorMessageFactory;
import com.cashow.baselibrary.mapper.UserModelDataMapper;
import com.cashow.baselibrary.model.UserModel;
import com.cashow.baselibrary.presenter.Presenter;

import java.util.Collection;
import java.util.List;
Expand Down
Expand Up @@ -5,8 +5,8 @@
*/
package com.cashow.modularizationdemo.userlist;

import com.cashow.modularizationdemo.common.model.UserModel;
import com.cashow.modularizationdemo.common.view.LoadDataView;
import com.cashow.baselibrary.model.UserModel;
import com.cashow.baselibrary.view.LoadDataView;

import java.util.Collection;

Expand Down
Expand Up @@ -13,7 +13,7 @@
import android.widget.TextView;

import com.cashow.modularizationdemo.R;
import com.cashow.modularizationdemo.common.model.UserModel;
import com.cashow.baselibrary.model.UserModel;

import java.util.Collection;
import java.util.Collections;
Expand Down
16 changes: 0 additions & 16 deletions app/src/main/res/common/values/strings.xml

This file was deleted.

1 change: 1 addition & 0 deletions baselibrary/.gitignore
@@ -0,0 +1 @@
/build
46 changes: 46 additions & 0 deletions baselibrary/build.gradle
@@ -0,0 +1,46 @@
apply plugin: 'com.android.library'

android {
def globalConfiguration = rootProject.extensions.getByName("ext")

compileSdkVersion globalConfiguration.getAt("androidCompileSdkVersion")
buildToolsVersion globalConfiguration.getAt("androidBuildToolsVersion")

defaultConfig {
minSdkVersion globalConfiguration.getAt("androidMinSdkVersion")
targetSdkVersion globalConfiguration.getAt("androidTargetSdkVersion")

versionCode globalConfiguration.getAt("androidVersionCode")
versionName globalConfiguration.getAt("androidVersionName")

javaCompileOptions {
annotationProcessorOptions {
arguments = [ moduleName : project.getName() ]
}
}
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
}

dependencies {
compile project(':domain')
compile project(':data')

rootProject.ext.baselibrary_dependencies.each {
item -> compile item
}
rootProject.ext.baselibrary_annotation_dependencies.each {
item -> annotationProcessor item
}
}
21 changes: 21 additions & 0 deletions baselibrary/proguard-rules.pro
@@ -0,0 +1,21 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html

# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
2 changes: 2 additions & 0 deletions baselibrary/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.cashow.baselibrary" />
@@ -0,0 +1,56 @@
/**
* Copyright (C) 2015 Fernando Cejas Open Source Project
* <p>
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* <p>
* http://www.apache.org/licenses/LICENSE-2.0
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.cashow.baselibrary;

import android.app.Application;

import com.alibaba.android.arouter.launcher.ARouter;
import com.cashow.baselibrary.di.components.ApplicationComponent;
import com.cashow.baselibrary.di.components.DaggerApplicationComponent;
import com.cashow.baselibrary.di.modules.ApplicationModule;

/**
* Android Main Application
*/
public abstract class BaseApplication extends Application {

private ApplicationComponent applicationComponent;

@Override
public void onCreate() {
super.onCreate();
this.initializeInjector();
this.initARouter();
}

private void initializeInjector() {
this.applicationComponent = DaggerApplicationComponent.builder()
.applicationModule(new ApplicationModule(this))
.build();
}

private void initARouter() {
if (BuildConfig.DEBUG) { // 这两行必须写在init之前,否则这些配置在init过程中将无效
ARouter.openLog(); // 打印日志
ARouter.openDebug(); // 开启调试模式(如果在InstantRun模式下运行,必须开启调试模式!线上版本需要关闭,否则有安全风险)
}
ARouter.init(this); // 尽可能早,推荐在Application中初始化
}

public ApplicationComponent getApplicationComponent() {
return this.applicationComponent;
}
}
Expand Up @@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.cashow.modularizationdemo.common;
package com.cashow.baselibrary;

import com.cashow.domain.executor.PostExecutionThread;

Expand Down
@@ -1,14 +1,14 @@
package com.cashow.modularizationdemo.common.activity;
package com.cashow.baselibrary.activity;

import android.app.Activity;
import android.app.Fragment;
import android.app.FragmentTransaction;
import android.os.Bundle;

import com.cashow.modularizationdemo.AndroidApplication;
import com.cashow.modularizationdemo.common.di.components.ApplicationComponent;
import com.cashow.modularizationdemo.common.di.modules.ActivityModule;
import com.cashow.modularizationdemo.common.navigation.Navigator;
import com.cashow.baselibrary.BaseApplication;
import com.cashow.baselibrary.di.components.ApplicationComponent;
import com.cashow.baselibrary.di.modules.ActivityModule;
import com.cashow.baselibrary.navigation.Navigator;

import javax.inject.Inject;

Expand Down Expand Up @@ -44,7 +44,7 @@ protected void addFragment(int containerViewId, Fragment fragment) {
* @return {@link ApplicationComponent}
*/
protected ApplicationComponent getApplicationComponent() {
return ((AndroidApplication) getApplication()).getApplicationComponent();
return ((BaseApplication) getApplication()).getApplicationComponent();
}

/**
Expand Down