Merge pull request #18 from konifar/change_package

Changed package

app/app.iml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="conference-sched" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="droidkaigi2016" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -21,7 +21,7 @@
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/src/debug/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
       </configuration>
     </facet>
@@ -144,8 +144,8 @@
     <orderEntry type="library" exported="" name="converter-gson-2.0.0-beta3" level="project" />
     <orderEntry type="library" exported="" name="picasso-2.5.2" level="project" />
     <orderEntry type="library" exported="" name="rxandroid-1.1.0" level="project" />
-    <orderEntry type="library" exported="" name="rxjava-1.1.0" level="project" />
     <orderEntry type="library" exported="" name="stetho-1.2.0" level="project" />
+    <orderEntry type="library" exported="" name="rxjava-1.1.0" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="exposed-instrumentation-api-publish-0.4.1" level="project" />
     <orderEntry type="library" exported="" name="threetenabp-1.0.2" level="project" />
     <orderEntry type="library" exported="" name="jsr250-api-1.0" level="project" />
@@ -165,8 +165,8 @@
     <orderEntry type="library" exported="" name="CircularReveal-1.3.1" level="project" />
     <orderEntry type="library" exported="" name="customtabs-23.1.1" level="project" />
     <orderEntry type="library" exported="" name="orma-annotations-1.0.1" level="project" />
-    <orderEntry type="library" exported="" name="dagger-2.0.2" level="project" />
     <orderEntry type="library" exported="" name="retrofit-2.0.0-beta3" level="project" />
+    <orderEntry type="library" exported="" name="dagger-2.0.2" level="project" />
     <orderEntry type="library" exported="" name="adapters-1.0-rc3" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="rules-0.4.1" level="project" />
@@ -183,8 +183,8 @@
     <orderEntry type="library" exported="" name="recyclerview-v7-23.1.1" level="project" />
     <orderEntry type="library" exported="" name="compiler-1.0-rc5" level="project" />
     <orderEntry type="library" exported="" name="antlr4-runtime-4.5.1" level="project" />
-    <orderEntry type="library" exported="" name="javax.inject-1" level="project" />
     <orderEntry type="library" exported="" name="parceler-api-1.0.4" level="project" />
+    <orderEntry type="library" exported="" name="javax.inject-1" level="project" />
     <orderEntry type="library" exported="" name="commons-cli-1.2" level="project" />
   </component>
 </module>

app/build.gradle

@@ -11,7 +11,7 @@ def versionPatch = 0
 def isCi = "true".equals(System.getenv("CI"))
 def preDexEnabled = "true".equals(System.getProperty("pre-dex", "true"))
 
-def packageName = "com.konifar.confsched"
+def packageName = "io.github.droidkaigi.confsched"
 
 android {
     compileSdkVersion 23

app/src/androidTest/java/com/konifar/confsched/ApplicationTest.java → app/src/androidTest/java/io/github/droidkaigi/ApplicationTest.java

@@ -1,4 +1,4 @@
-package com.konifar.confsched;
+package io.github.droidkaigi;
 
 import android.app.Application;
 import android.test.ApplicationTestCase;

app/src/androidTest/java/com/konifar/confsched/util/AppUtilsTest.java → app/src/androidTest/java/io/github/droidkaigi/confsched/util/AppUtilsTest.java

@@ -1,4 +1,4 @@
-package com.konifar.confsched.util;
+package io.github.droidkaigi.confsched.util;
 
 import android.support.test.runner.AndroidJUnit4;
 

app/src/debug/java/com/konifar/confsched/StethoWrapper.java → app/src/debug/java/io/github/droidkaigi/StethoWrapper.java

@@ -1,11 +1,13 @@
-package com.konifar.confsched;
+package io.github.droidkaigi;
 
 import android.content.Context;
 
 import com.facebook.stetho.Stetho;
 
 import javax.inject.Inject;
 
+import io.github.droidkaigi.confsched.MainApplication;
+
 public class StethoWrapper {
 
     @Inject

app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.konifar.confsched">
+    package="io.github.droidkaigi.confsched">
 
     <application
         android:name=".MainApplication"

app/src/main/java/com/konifar/confsched/MainApplication.java → app/src/main/java/io/github/droidkaigi/confsched/MainApplication.java

@@ -1,18 +1,20 @@
-package com.konifar.confsched;
+package io.github.droidkaigi.confsched;
 
 import android.app.Application;
 import android.support.annotation.NonNull;
 import android.support.v4.app.Fragment;
 import android.support.v7.app.AppCompatActivity;
 
 import com.jakewharton.threetenabp.AndroidThreeTen;
-import com.konifar.confsched.di.ActivityComponent;
-import com.konifar.confsched.di.ActivityModule;
-import com.konifar.confsched.di.AppComponent;
-import com.konifar.confsched.di.AppModule;
-import com.konifar.confsched.di.DaggerAppComponent;
-import com.konifar.confsched.di.FragmentComponent;
-import com.konifar.confsched.di.FragmentModule;
+
+import io.github.droidkaigi.StethoWrapper;
+import io.github.droidkaigi.confsched.di.ActivityComponent;
+import io.github.droidkaigi.confsched.di.ActivityModule;
+import io.github.droidkaigi.confsched.di.AppComponent;
+import io.github.droidkaigi.confsched.di.AppModule;
+import io.github.droidkaigi.confsched.di.DaggerAppComponent;
+import io.github.droidkaigi.confsched.di.FragmentComponent;
+import io.github.droidkaigi.confsched.di.FragmentModule;
 
 public class MainApplication extends Application {
 

app/src/main/java/com/konifar/confsched/activity/ActivityNavigator.java → app/src/main/java/io/github/droidkaigi/confsched/activity/ActivityNavigator.java

@@ -1,13 +1,13 @@
-package com.konifar.confsched.activity;
+package io.github.droidkaigi.confsched.activity;
 
 import android.app.Activity;
 import android.content.Context;
 import android.support.annotation.NonNull;
 
-import com.konifar.confsched.model.Session;
-
 import javax.inject.Singleton;
 
+import io.github.droidkaigi.confsched.model.Session;
+
 @Singleton
 public class ActivityNavigator {
 

app/src/main/java/com/konifar/confsched/activity/MainActivity.java → app/src/main/java/io/github/droidkaigi/confsched/activity/MainActivity.java

@@ -1,4 +1,4 @@
-package com.konifar.confsched.activity;
+package io.github.droidkaigi.confsched.activity;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -16,20 +16,20 @@
 import android.support.v7.app.AppCompatActivity;
 import android.view.MenuItem;
 
-import com.konifar.confsched.MainApplication;
-import com.konifar.confsched.R;
-import com.konifar.confsched.databinding.ActivityMainBinding;
-import com.konifar.confsched.fragment.AboutFragment;
-import com.konifar.confsched.fragment.MapFragment;
-import com.konifar.confsched.fragment.MyScheduleFragment;
-import com.konifar.confsched.fragment.SessionsFragment;
-import com.konifar.confsched.fragment.SettingsFragment;
-import com.konifar.confsched.fragment.SponsorsFragment;
-import com.konifar.confsched.util.AnalyticsUtil;
-import com.konifar.confsched.util.AppUtil;
-
 import javax.inject.Inject;
 
+import io.github.droidkaigi.confsched.MainApplication;
+import io.github.droidkaigi.confsched.R;
+import io.github.droidkaigi.confsched.databinding.ActivityMainBinding;
+import io.github.droidkaigi.confsched.fragment.AboutFragment;
+import io.github.droidkaigi.confsched.fragment.MapFragment;
+import io.github.droidkaigi.confsched.fragment.MyScheduleFragment;
+import io.github.droidkaigi.confsched.fragment.SessionsFragment;
+import io.github.droidkaigi.confsched.fragment.SettingsFragment;
+import io.github.droidkaigi.confsched.fragment.SponsorsFragment;
+import io.github.droidkaigi.confsched.util.AnalyticsUtil;
+import io.github.droidkaigi.confsched.util.AppUtil;
+
 public class MainActivity extends AppCompatActivity
         implements NavigationView.OnNavigationItemSelectedListener {
 

app/src/main/java/com/konifar/confsched/activity/SessionDetailActivity.java → app/src/main/java/io/github/droidkaigi/confsched/activity/SessionDetailActivity.java

@@ -1,4 +1,4 @@
-package com.konifar.confsched.activity;
+package io.github.droidkaigi.confsched.activity;
 
 import android.app.Activity;
 import android.content.Context;
@@ -11,17 +11,17 @@
 import android.support.v7.app.AppCompatActivity;
 import android.view.MenuItem;
 
-import com.konifar.confsched.MainApplication;
-import com.konifar.confsched.R;
-import com.konifar.confsched.databinding.ActivitySessionDetailBinding;
-import com.konifar.confsched.fragment.SessionDetailFragment;
-import com.konifar.confsched.model.Session;
-import com.konifar.confsched.util.AnalyticsUtil;
-
 import org.parceler.Parcels;
 
 import javax.inject.Inject;
 
+import io.github.droidkaigi.confsched.MainApplication;
+import io.github.droidkaigi.confsched.R;
+import io.github.droidkaigi.confsched.databinding.ActivitySessionDetailBinding;
+import io.github.droidkaigi.confsched.fragment.SessionDetailFragment;
+import io.github.droidkaigi.confsched.model.Session;
+import io.github.droidkaigi.confsched.util.AnalyticsUtil;
+
 public class SessionDetailActivity extends AppCompatActivity {
 
     private static final String TAG = SessionDetailActivity.class.getSimpleName();

app/src/main/java/com/konifar/confsched/activity/WebViewActivity.java → app/src/main/java/io/github/droidkaigi/confsched/activity/WebViewActivity.java

@@ -1,4 +1,4 @@
-package com.konifar.confsched.activity;
+package io.github.droidkaigi.confsched.activity;
 
 import android.content.Context;
 import android.content.Intent;
@@ -12,8 +12,8 @@
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
-import com.konifar.confsched.R;
-import com.konifar.confsched.databinding.ActivityWebViewBinding;
+import io.github.droidkaigi.confsched.R;
+import io.github.droidkaigi.confsched.databinding.ActivityWebViewBinding;
 
 public class WebViewActivity extends AppCompatActivity {
 

app/src/main/java/com/konifar/confsched/api/DroidKaigiClient.java → app/src/main/java/io/github/droidkaigi/confsched/api/DroidKaigiClient.java

@@ -1,14 +1,14 @@
-package com.konifar.confsched.api;
+package io.github.droidkaigi.confsched.api;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.konifar.confsched.model.Session;
 
 import java.util.List;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import io.github.droidkaigi.confsched.model.Session;
 import okhttp3.OkHttpClient;
 import retrofit2.GsonConverterFactory;
 import retrofit2.Retrofit;

app/src/main/java/com/konifar/confsched/api/RequestInterceptor.java → app/src/main/java/io/github/droidkaigi/confsched/api/RequestInterceptor.java

@@ -1,4 +1,4 @@
-package com.konifar.confsched.api;
+package io.github.droidkaigi.confsched.api;
 
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;

app/src/main/java/com/konifar/confsched/dao/SessionDao.java → app/src/main/java/io/github/droidkaigi/confsched/dao/SessionDao.java

@@ -1,24 +1,24 @@
-package com.konifar.confsched.dao;
+package io.github.droidkaigi.confsched.dao;
 
 import android.support.annotation.NonNull;
 
 import com.github.gfx.android.orma.TransactionTask;
-import com.konifar.confsched.model.Category;
-import com.konifar.confsched.model.Category_Relation;
-import com.konifar.confsched.model.OrmaDatabase;
-import com.konifar.confsched.model.Place;
-import com.konifar.confsched.model.Place_Relation;
-import com.konifar.confsched.model.Session;
-import com.konifar.confsched.model.Session_Relation;
-import com.konifar.confsched.model.Session_Updater;
-import com.konifar.confsched.model.Speaker;
-import com.konifar.confsched.model.Speaker_Relation;
 
 import java.util.List;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import io.github.droidkaigi.confsched.model.Category;
+import io.github.droidkaigi.confsched.model.Category_Relation;
+import io.github.droidkaigi.confsched.model.OrmaDatabase;
+import io.github.droidkaigi.confsched.model.Place;
+import io.github.droidkaigi.confsched.model.Place_Relation;
+import io.github.droidkaigi.confsched.model.Session;
+import io.github.droidkaigi.confsched.model.Session_Relation;
+import io.github.droidkaigi.confsched.model.Session_Updater;
+import io.github.droidkaigi.confsched.model.Speaker;
+import io.github.droidkaigi.confsched.model.Speaker_Relation;
 import rx.Observable;
 
 @Singleton

app/src/main/java/com/konifar/confsched/di/ActivityComponent.java → app/src/main/java/io/github/droidkaigi/confsched/di/ActivityComponent.java

@@ -1,10 +1,9 @@
-package com.konifar.confsched.di;
-
-import com.konifar.confsched.activity.MainActivity;
-import com.konifar.confsched.activity.SessionDetailActivity;
-import com.konifar.confsched.di.scope.ActivityScope;
+package io.github.droidkaigi.confsched.di;
 
 import dagger.Subcomponent;
+import io.github.droidkaigi.confsched.activity.MainActivity;
+import io.github.droidkaigi.confsched.activity.SessionDetailActivity;
+import io.github.droidkaigi.confsched.di.scope.ActivityScope;
 
 @ActivityScope
 @Subcomponent(modules = {ActivityModule.class})

app/src/main/java/com/konifar/confsched/di/ActivityModule.java → app/src/main/java/io/github/droidkaigi/confsched/di/ActivityModule.java

@@ -1,4 +1,4 @@
-package com.konifar.confsched.di;
+package io.github.droidkaigi.confsched.di;
 
 import android.app.Activity;
 import android.content.Context;

app/src/main/java/com/konifar/confsched/di/AppComponent.java → app/src/main/java/io/github/droidkaigi/confsched/di/AppComponent.java

@@ -1,6 +1,6 @@
-package com.konifar.confsched.di;
+package io.github.droidkaigi.confsched.di;
 
-import com.konifar.confsched.StethoWrapper;
+import io.github.droidkaigi.StethoWrapper;
 
 import javax.inject.Singleton;
 

app/src/main/java/com/konifar/confsched/di/AppModule.java → app/src/main/java/io/github/droidkaigi/confsched/di/AppModule.java

@@ -1,4 +1,4 @@
-package com.konifar.confsched.di;
+package io.github.droidkaigi.confsched.di;
 
 import android.app.Application;
 import android.content.Context;
@@ -7,17 +7,17 @@
 
 import com.google.android.gms.analytics.GoogleAnalytics;
 import com.google.android.gms.analytics.Tracker;
-import com.konifar.confsched.BuildConfig;
-import com.konifar.confsched.activity.ActivityNavigator;
-import com.konifar.confsched.api.RequestInterceptor;
-import com.konifar.confsched.model.OrmaDatabase;
 
 import java.io.File;
 
 import javax.inject.Singleton;
 
 import dagger.Module;
 import dagger.Provides;
+import io.github.droidkaigi.confsched.BuildConfig;
+import io.github.droidkaigi.confsched.activity.ActivityNavigator;
+import io.github.droidkaigi.confsched.api.RequestInterceptor;
+import io.github.droidkaigi.confsched.model.OrmaDatabase;
 import okhttp3.Cache;
 import okhttp3.Interceptor;
 import okhttp3.OkHttpClient;

app/src/main/java/io/github/droidkaigi/confsched/di/FragmentComponent.java

@@ -0,0 +1,26 @@
+package io.github.droidkaigi.confsched.di;
+
+import io.github.droidkaigi.confsched.di.scope.FragmentScope;
+import io.github.droidkaigi.confsched.fragment.AboutFragment;
+import io.github.droidkaigi.confsched.fragment.SessionDetailFragment;
+import io.github.droidkaigi.confsched.fragment.SessionsFragment;
+import io.github.droidkaigi.confsched.fragment.SessionsTabFragment;
+import io.github.droidkaigi.confsched.fragment.SettingsFragment;
+
+import dagger.Subcomponent;
+
+@FragmentScope
+@Subcomponent(modules = {FragmentModule.class})
+public interface FragmentComponent {
+
+    void inject(SettingsFragment fragment);
+
+    void inject(AboutFragment fragment);
+
+    void inject(SessionsTabFragment fragment);
+
+    void inject(SessionsFragment fragment);
+
+    void inject(SessionDetailFragment fragment);
+
+}