Skip to content

Commit

Permalink
Change the package name to reflect the actual url
Browse files Browse the repository at this point in the history
  • Loading branch information
fusion44 committed May 15, 2016
1 parent 8456845 commit c853a99
Show file tree
Hide file tree
Showing 178 changed files with 566 additions and 563 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/app/src/main/java/me/stammberger/galactictavern/Secrets.java
*.iml
.gradle
/local.properties
Expand Down
1 change: 1 addition & 0 deletions app/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/src/main/java/space/galactictavern/app/Secrets.java
/build
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ android {
compileSdkVersion 23
buildToolsVersion "23.0.2"
defaultConfig {
applicationId "me.stammberger.galactictavern"
applicationId "space.galactictavern.app"
minSdkVersion 16
targetSdkVersion 23
versionCode 1
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.stammberger.galactictavern;
package space.galactictavern.app;

import android.app.Application;
import android.test.ApplicationTestCase;
Expand Down
6 changes: 3 additions & 3 deletions app/src/debug/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="me.stammberger.galactictavern">
package="space.galactictavern.app">

<application
android:name=".GtDebugApplication"
android:name="space.galactictavern.app.GtDebugApplication"
android:allowBackup="false"
android:label="@string/app_name"
tools:replace="android:name, android:allowBackup, android:label">

<activity
android:name=".ui.MainActivity"
android:name="space.galactictavern.app.ui.MainActivity"
android:label="@string/app_name"
tools:replace="android:name, android:label" />
</application>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.stammberger.galactictavern;
package space.galactictavern.app;

import com.facebook.stetho.Stetho;

Expand Down
66 changes: 33 additions & 33 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="me.stammberger.galactictavern">
package="space.galactictavern.app">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
Expand All @@ -16,15 +16,15 @@
<uses-permission android:name="com.example.gcm.permission.C2D_MESSAGE" />

<application
android:name=".GtApplication"
android:name="space.galactictavern.app.GtApplication"
android:allowBackup="true"
android:fullBackupOnly="false"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity
android:name=".ui.MainActivity"
android:name="space.galactictavern.app.ui.MainActivity"
android:label="@string/app_name"
android:theme="@style/AppTheme.NoActionBar">
<intent-filter>
Expand All @@ -34,73 +34,73 @@
</intent-filter>
</activity>
<activity
android:name=".ui.commlinks.CommLinkReaderActivity"
android:name="space.galactictavern.app.ui.commlinks.CommLinkReaderActivity"
android:label="@string/title_activity_comm_link_reader"
android:parentActivityName=".ui.MainActivity"
android:parentActivityName="space.galactictavern.app.ui.MainActivity"
android:theme="@style/AppTheme.NoActionBar">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".ui.MainActivity" />
android:value="space.galactictavern.app.ui.MainActivity" />
</activity>
<activity
android:name=".core.chrome.WebviewActivity"
android:name="space.galactictavern.app.core.chrome.WebviewActivity"
android:label="@string/title_activity_comm_link_reader_webview"
android:parentActivityName=".ui.commlinks.CommLinkReaderActivity"
android:parentActivityName="space.galactictavern.app.ui.commlinks.CommLinkReaderActivity"
android:theme="@style/AppTheme.NoActionBar">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".ui.MainActivity" />
android:value="space.galactictavern.app.ui.MainActivity" />
</activity>

<service android:name=".core.chrome.KeepAliveService" />
<service android:name="space.galactictavern.app.core.chrome.KeepAliveService" />

<activity
android:name=".ui.ships.ShipDetailViewerActivity"
android:name="space.galactictavern.app.ui.ships.ShipDetailViewerActivity"
android:label="@string/title_activity_ship_detail_viewer"
android:parentActivityName=".ui.MainActivity"
android:parentActivityName="space.galactictavern.app.ui.MainActivity"
android:theme="@style/AppTheme.NoActionBar">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".ui.MainActivity" />
android:value="space.galactictavern.app.ui.MainActivity" />
</activity>

<activity
android:name=".ui.users.UserDetailSlidingActivity"
android:name="space.galactictavern.app.ui.users.UserDetailSlidingActivity"
android:excludeFromRecents="true"
android:taskAffinity=""
android:theme="@style/Theme.Sliding.Light" />
<activity
android:name=".ui.forums.ForumThreadListActivity"
android:name="space.galactictavern.app.ui.forums.ForumThreadListActivity"
android:label="@string/title_forum_thread_list"
android:parentActivityName=".ui.MainActivity"
android:parentActivityName="space.galactictavern.app.ui.MainActivity"
android:theme="@style/AppTheme.NoActionBar">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".ui.MainActivity" />
android:value="space.galactictavern.app.ui.MainActivity" />
</activity>

<activity
android:name=".ui.forums.ForumThreadReaderActivity"
android:name="space.galactictavern.app.ui.forums.ForumThreadReaderActivity"
android:label="@string/title_forum_thread_reader_detail"
android:parentActivityName=".ui.forums.ForumThreadListActivity"
android:parentActivityName="space.galactictavern.app.ui.forums.ForumThreadListActivity"
android:theme="@style/AppTheme.NoActionBar">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".ui.forums.ForumThreadListActivity" />
android:value="space.galactictavern.app.ui.forums.ForumThreadListActivity" />
</activity>

<activity
android:name=".ui.FullScreenImageGallery"
android:name="space.galactictavern.app.ui.FullScreenImageGallery"
android:label=""
android:theme="@style/AppTheme.NoActionBar" />

<activity
android:name=".ui.maps.SystemDetailSlidingActivity"
android:name="space.galactictavern.app.ui.maps.SystemDetailSlidingActivity"
android:excludeFromRecents="true"
android:taskAffinity=""
android:theme="@style/Theme.Sliding.Light" />

<receiver android:name=".ui.widgets.CommLinkWidget">
<receiver android:name="space.galactictavern.app.ui.widgets.CommLinkWidget">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
</intent-filter>
Expand All @@ -118,54 +118,54 @@
<action android:name="com.google.android.c2dm.intent.RECEIVE" />
<action android:name="com.google.android.c2dm.intent.REGISTRATION" />

<category android:name="me.stammberger.galactictavern.gcm" />
<category android:name="space.galactictavern.app.gcm" />
</intent-filter>
</receiver>

<provider
android:name=".stores.db.GtContentProvider"
android:name="space.galactictavern.app.stores.db.GtContentProvider"
android:authorities=".stores.db.gt_provider"
android:exported="false" />

<service
android:name=".ui.widgets.CommLinkRemoteViewsService"
android:name="space.galactictavern.app.ui.widgets.CommLinkRemoteViewsService"
android:enabled="true"
android:exported="false"
android:permission="android.permission.BIND_REMOTEVIEWS" />

<service
android:name=".core.CommLinkUpdaterService"
android:name="space.galactictavern.app.core.CommLinkUpdaterService"
android:exported="true"
android:permission="com.google.android.gms.permission.BIND_NETWORK_TASK_SERVICE">
<intent-filter>
<action android:name="com.google.android.gms.gcm.ACTION_TASK_READY" />
</intent-filter>
</service>
<service
android:name=".core.gcm.GcmRegistrationIntentService"
android:name="space.galactictavern.app.core.gcm.GcmRegistrationIntentService"
android:exported="false" />
<service
android:name=".core.gcm.GtGcmListenerService"
android:name="space.galactictavern.app.core.gcm.GtGcmListenerService"
android:exported="false">
<intent-filter>
<action android:name="com.google.android.c2dm.intent.RECEIVE" />
</intent-filter>
</service>
<service
android:name=".core.gcm.GtInstanceIDListener"
android:name="space.galactictavern.app.core.gcm.GtInstanceIDListener"
android:exported="false">
<intent-filter>
<action android:name="com.google.android.gms.iid.InstanceID" />
</intent-filter>
</service>

<activity
android:name=".ui.prefs.SettingsActivity"
android:name="space.galactictavern.app.ui.prefs.SettingsActivity"
android:label="@string/navigation_drawer_settings"
android:parentActivityName=".ui.MainActivity">
android:parentActivityName="space.galactictavern.app.ui.MainActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".ui.MainActivity" />
android:value="space.galactictavern.app.ui.MainActivity" />
</activity>
</application>

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package me.stammberger.galactictavern;
package space.galactictavern.app;

import android.app.Application;
import android.content.Context;
Expand All @@ -16,27 +16,27 @@

import net.danlew.android.joda.JodaTimeAndroid;

import me.stammberger.galactictavern.actions.GtActionCreator;
import me.stammberger.galactictavern.core.CommLinkUpdaterService;
import me.stammberger.galactictavern.models.commlink.CommLinkModel;
import me.stammberger.galactictavern.models.commlink.CommLinkModelSQLiteTypeMapping;
import me.stammberger.galactictavern.models.commlink.ContentBlock1;
import me.stammberger.galactictavern.models.commlink.ContentBlock1SQLiteTypeMapping;
import me.stammberger.galactictavern.models.commlink.ContentBlock2;
import me.stammberger.galactictavern.models.commlink.ContentBlock2SQLiteTypeMapping;
import me.stammberger.galactictavern.models.commlink.ContentBlock4;
import me.stammberger.galactictavern.models.commlink.ContentBlock4SQLiteTypeMapping;
import me.stammberger.galactictavern.models.commlink.Wrapper;
import me.stammberger.galactictavern.models.commlink.WrapperStorIOSQLiteDeleteResolver;
import me.stammberger.galactictavern.models.commlink.WrapperStorIOSQLitePutResolver;
import me.stammberger.galactictavern.models.favorites.Favorite;
import me.stammberger.galactictavern.models.favorites.FavoriteSQLiteTypeMapping;
import me.stammberger.galactictavern.models.forums.Forum;
import me.stammberger.galactictavern.models.forums.ForumSQLiteTypeMapping;
import me.stammberger.galactictavern.models.user.UserSearchHistoryEntry;
import me.stammberger.galactictavern.models.user.UserSearchHistoryEntrySQLiteTypeMapping;
import me.stammberger.galactictavern.stores.db.DbOpenHelper;
import me.stammberger.galactictavern.stores.db.resolvers.ContentWrapperGetResolver;
import space.galactictavern.app.actions.GtActionCreator;
import space.galactictavern.app.core.CommLinkUpdaterService;
import space.galactictavern.app.models.commlink.CommLinkModel;
import space.galactictavern.app.models.commlink.CommLinkModelSQLiteTypeMapping;
import space.galactictavern.app.models.commlink.ContentBlock1;
import space.galactictavern.app.models.commlink.ContentBlock1SQLiteTypeMapping;
import space.galactictavern.app.models.commlink.ContentBlock2;
import space.galactictavern.app.models.commlink.ContentBlock2SQLiteTypeMapping;
import space.galactictavern.app.models.commlink.ContentBlock4;
import space.galactictavern.app.models.commlink.ContentBlock4SQLiteTypeMapping;
import space.galactictavern.app.models.commlink.Wrapper;
import space.galactictavern.app.models.commlink.WrapperStorIOSQLiteDeleteResolver;
import space.galactictavern.app.models.commlink.WrapperStorIOSQLitePutResolver;
import space.galactictavern.app.models.favorites.Favorite;
import space.galactictavern.app.models.favorites.FavoriteSQLiteTypeMapping;
import space.galactictavern.app.models.forums.Forum;
import space.galactictavern.app.models.forums.ForumSQLiteTypeMapping;
import space.galactictavern.app.models.user.UserSearchHistoryEntry;
import space.galactictavern.app.models.user.UserSearchHistoryEntrySQLiteTypeMapping;
import space.galactictavern.app.stores.db.DbOpenHelper;
import space.galactictavern.app.stores.db.resolvers.ContentWrapperGetResolver;
import timber.log.Timber;


Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package me.stammberger.galactictavern.actions;
package space.galactictavern.app.actions;

import me.stammberger.galactictavern.models.favorites.Favorite;
import me.stammberger.galactictavern.models.user.UserSearchHistoryEntry;
import space.galactictavern.app.models.favorites.Favorite;
import space.galactictavern.app.models.user.UserSearchHistoryEntry;
import space.galactictavern.app.stores.UserStore;

/**
* Contains all actions used by the application
Expand Down Expand Up @@ -90,7 +91,7 @@ public interface Actions {
void getUserByUserHandle(String userHandle);

/**
* Retrieves search history from DB and puts it into {@link me.stammberger.galactictavern.stores.UserStore}
* Retrieves search history from DB and puts it into {@link UserStore}
*/
void getUserSearchHistory();

Expand Down
Loading

0 comments on commit c853a99

Please sign in to comment.