sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-04-14 19:56:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move activities to /ui/activities package

Browse source
This commit is contained in:
Michal 2015-12-21 20:19:51 +01:00
parent 2bd46a42aa
commit c005c64f39
19 changed files with 43 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Habitica/AndroidManifest.xml
View file

@ -23,7 +23,7 @@
android:label="@string/app_name"
android:theme="@style/AppTheme">
<activity
android:name=".MainActivity"
android:name=".ui.activities.MainActivity"
android:label="@string/app_name"
android:windowSoftInputMode="stateHidden|adjustResize"
android:screenOrientation="portrait">
@ -34,21 +34,21 @@
</intent-filter>
</activity>
<activity
android:name=".prefs.PrefsActivity"
android:name=".ui.activities.PrefsActivity"
android:theme="@style/PreferencesTheme"
android:parentActivityName=".MainActivity"
android:parentActivityName=".ui.activities.MainActivity"
android:label="@string/PS_settings_title"
android:screenOrientation="portrait">
</activity>
<activity
android:name=".LoginActivity"
android:name=".ui.activities.LoginActivity"
android:label="@string/LoginActivityName"
android:theme="@style/AppThemeWithActionBarBlackText"
android:windowSoftInputMode="adjustResize"
android:screenOrientation="portrait">
</activity>
<activity
android:name=".SkillTasksActivity"
android:name=".ui.activities.SkillTasksActivity"
android:label="@string/app_name"
android:screenOrientation="portrait">
</activity>
@ -56,17 +56,17 @@
<meta-data android:name="com.facebook.sdk.ApplicationId" android:value="@string/facebook_app_id"/>
<activity
android:name=".AboutActivity"
android:name=".ui.activities.AboutActivity"
android:theme="@style/AppThemeWithActionBarBlackText"
android:screenOrientation="portrait"/>
<activity
android:name=".TaskFormActivity"
android:name=".ui.activities.TaskFormActivity"
android:theme="@style/AppThemeWithActionBarBlackText"
android:parentActivityName=".MainActivity"
android:parentActivityName=".ui.activities.MainActivity"
android:screenOrientation="portrait">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value=".MainActivity" />
android:value=".ui.activities.MainActivity" />
</activity>
<activity android:name="com.facebook.FacebookActivity"

2
Habitica/res/layout/activity_about.xml
View file

@ -3,7 +3,7 @@
android:id="@+id/main_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".AboutActivity">
tools:context=".ui.activities.AboutActivity">
<android.support.design.widget.TabLayout
android:id="@+id/tab_layout"

4
Habitica/res/layout/activity_main.xml
View file

@ -6,14 +6,14 @@
android:layout_height="match_parent"
android:fitsSystemWindows="true"
android:gravity="center"
tools:context=".MainActivity">
tools:context=".ui.activities.MainActivity">
<android.support.design.widget.CoordinatorLayout
android:id="@+id/main_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:elevation="0dp"
tools:context=".MainActivity">
tools:context=".ui.activities.MainActivity">
<FrameLayout

2
Habitica/res/menu/menu_task_form.xml
View file

@ -1,7 +1,7 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:context="com.habitrpg.android.habitica.TaskFormActivity">
tools:context=".ui.activities.TaskFormActivity">
<item android:id="@+id/action_save_changes" android:title="@string/save_changes"
android:orderInCategory="100" app:showAsAction="always" />
</menu>

1
Habitica/src/com/habitrpg/android/habitica/HabiticaApplication.java
View file

@ -15,6 +15,7 @@ import android.support.annotation.Nullable;
import android.util.Log;
import com.facebook.FacebookSdk;
import com.habitrpg.android.habitica.ui.activities.LoginActivity;
import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
import com.raizlabs.android.dbflow.config.FlowManager;
import com.squareup.leakcanary.LeakCanary;

6
Habitica/src/com/habitrpg/android/habitica/ui/MainDrawerBuilder.java
View file

@ -5,10 +5,10 @@ import android.content.Intent;
import android.support.v7.widget.Toolbar;
import android.view.View;
import com.habitrpg.android.habitica.AboutActivity;
import com.habitrpg.android.habitica.MainActivity;
import com.habitrpg.android.habitica.ui.activities.AboutActivity;
import com.habitrpg.android.habitica.ui.activities.MainActivity;
import com.habitrpg.android.habitica.R;
import com.habitrpg.android.habitica.prefs.PrefsActivity;
import com.habitrpg.android.habitica.ui.activities.PrefsActivity;
import com.habitrpg.android.habitica.ui.fragments.BaseFragment;
import com.habitrpg.android.habitica.ui.fragments.GemsPurchaseFragment;
import com.habitrpg.android.habitica.ui.fragments.PartyFragment;

3
Habitica/src/com/habitrpg/android/habitica/AboutActivity.java → Habitica/src/com/habitrpg/android/habitica/ui/activities/AboutActivity.java
View file

@ -1,4 +1,4 @@
package com.habitrpg.android.habitica;
package com.habitrpg.android.habitica.ui.activities;
import android.os.Bundle;
import android.support.design.widget.TabLayout;
@ -13,6 +13,7 @@ import android.view.MenuItem;
import com.github.porokoro.paperboy.ItemTypeBuilder;
import com.github.porokoro.paperboy.PaperboyBuilder;
import com.github.porokoro.paperboy.ViewTypes;
import com.habitrpg.android.habitica.R;
import com.habitrpg.android.habitica.ui.fragments.AboutFragment;
import com.mikepenz.aboutlibraries.Libs;
import com.mikepenz.aboutlibraries.LibsBuilder;

6
Habitica/src/com/habitrpg/android/habitica/LoginActivity.java → Habitica/src/com/habitrpg/android/habitica/ui/activities/LoginActivity.java
View file

@ -1,4 +1,4 @@
package com.habitrpg.android.habitica;
package com.habitrpg.android.habitica.ui.activities;
import android.content.DialogInterface;
import android.content.Intent;
@ -28,8 +28,10 @@ import com.facebook.FacebookCallback;
import com.facebook.FacebookException;
import com.facebook.login.LoginResult;
import com.facebook.login.widget.LoginButton;
import com.habitrpg.android.habitica.APIHelper;
import com.habitrpg.android.habitica.HostConfig;
import com.habitrpg.android.habitica.R;
import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
import com.habitrpg.android.habitica.prefs.PrefsActivity;
import com.habitrpg.android.habitica.prefs.scanner.IntentIntegrator;
import com.habitrpg.android.habitica.prefs.scanner.IntentResult;
import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;

8
Habitica/src/com/habitrpg/android/habitica/MainActivity.java → Habitica/src/com/habitrpg/android/habitica/ui/activities/MainActivity.java
View file

@ -1,4 +1,4 @@
package com.habitrpg.android.habitica;
package com.habitrpg.android.habitica.ui.activities;
import android.content.DialogInterface;
import android.content.Intent;
@ -25,6 +25,11 @@ import android.widget.TextView;
import com.afollestad.materialdialogs.MaterialDialog;
import com.crashlytics.android.Crashlytics;
import com.crashlytics.android.core.CrashlyticsCore;
import com.habitrpg.android.habitica.APIHelper;
import com.habitrpg.android.habitica.BuildConfig;
import com.habitrpg.android.habitica.HabiticaApplication;
import com.habitrpg.android.habitica.HostConfig;
import com.habitrpg.android.habitica.R;
import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
import com.habitrpg.android.habitica.callbacks.TaskScoringCallback;
import com.habitrpg.android.habitica.databinding.ValueBarBinding;
@ -33,7 +38,6 @@ import com.habitrpg.android.habitica.events.ToggledInnStateEvent;
import com.habitrpg.android.habitica.events.commands.BuyRewardCommand;
import com.habitrpg.android.habitica.events.commands.DeleteTaskCommand;
import com.habitrpg.android.habitica.events.commands.OpenGemPurchaseFragmentCommand;
import com.habitrpg.android.habitica.prefs.PrefsActivity;
import com.habitrpg.android.habitica.ui.AvatarWithBarsViewModel;
import com.habitrpg.android.habitica.ui.MainDrawerBuilder;
import com.habitrpg.android.habitica.ui.fragments.BaseFragment;

2
Habitica/src/com/habitrpg/android/habitica/prefs/PrefsActivity.java → Habitica/src/com/habitrpg/android/habitica/ui/activities/PrefsActivity.java
View file

@ -1,4 +1,4 @@
package com.habitrpg.android.habitica.prefs;
package com.habitrpg.android.habitica.ui.activities;
import android.content.Context;
import android.content.SharedPreferences;

3
Habitica/src/com/habitrpg/android/habitica/SkillTasksActivity.java → Habitica/src/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.java
View file

@ -1,4 +1,4 @@
package com.habitrpg.android.habitica;
package com.habitrpg.android.habitica.ui.activities;
import android.app.Activity;
import android.content.Intent;
@ -9,6 +9,7 @@ import android.support.v4.app.FragmentPagerAdapter;
import android.support.v4.view.ViewPager;
import android.support.v7.app.AppCompatActivity;
import com.habitrpg.android.habitica.R;
import com.habitrpg.android.habitica.ui.adapter.SkillTasksRecyclerViewAdapter;
import com.habitrpg.android.habitica.ui.fragments.SkillTasksRecyclerViewFragment;
import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;

3
Habitica/src/com/habitrpg/android/habitica/TaskFormActivity.java → Habitica/src/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
View file

@ -1,4 +1,4 @@
package com.habitrpg.android.habitica;
package com.habitrpg.android.habitica.ui.activities;
import android.content.Context;
import android.content.DialogInterface;
@ -25,6 +25,7 @@ import android.widget.NumberPicker;
import android.widget.Spinner;
import android.widget.TextView;
import com.habitrpg.android.habitica.R;
import com.habitrpg.android.habitica.events.TaskSaveEvent;
import com.habitrpg.android.habitica.events.commands.DeleteTaskCommand;
import com.habitrpg.android.habitica.ui.WrapContentRecyclerViewLayoutManager;

2
Habitica/src/com/habitrpg/android/habitica/ui/adapter/SkillTasksRecyclerViewAdapter.java
View file

@ -10,7 +10,7 @@ import android.widget.LinearLayout;
import android.widget.TextView;
import com.habitrpg.android.habitica.R;
import com.habitrpg.android.habitica.SkillTasksActivity;
import com.habitrpg.android.habitica.ui.activities.SkillTasksActivity;
import com.habitrpg.android.habitica.databinding.SkillTaskItemCardBinding;
import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
import com.raizlabs.android.dbflow.sql.builder.Condition;

2
Habitica/src/com/habitrpg/android/habitica/ui/fragments/BaseFragment.java
View file

@ -12,7 +12,7 @@ import android.view.ViewGroup;
import android.widget.FrameLayout;
import com.habitrpg.android.habitica.APIHelper;
import com.habitrpg.android.habitica.MainActivity;
import com.habitrpg.android.habitica.ui.activities.MainActivity;
import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
import de.greenrobot.event.EventBus;

2
Habitica/src/com/habitrpg/android/habitica/ui/fragments/ChatListFragment.java
View file

@ -15,7 +15,7 @@ import android.view.ViewGroup;
import com.habitrpg.android.habitica.APIHelper;
import com.habitrpg.android.habitica.HabiticaApplication;
import com.habitrpg.android.habitica.MainActivity;
import com.habitrpg.android.habitica.ui.activities.MainActivity;
import com.habitrpg.android.habitica.R;
import com.habitrpg.android.habitica.events.ToggledInnStateEvent;
import com.habitrpg.android.habitica.events.commands.DeleteChatMessageCommand;

2
Habitica/src/com/habitrpg/android/habitica/ui/fragments/PreferencesFragment.java
View file

@ -14,7 +14,7 @@ import android.preference.PreferenceFragment;
import android.preference.PreferenceScreen;
import com.habitrpg.android.habitica.HabiticaApplication;
import com.habitrpg.android.habitica.MainActivity;
import com.habitrpg.android.habitica.ui.activities.MainActivity;
import com.habitrpg.android.habitica.NotificationPublisher;
import com.habitrpg.android.habitica.R;
import com.habitrpg.android.habitica.prefs.TimePreference;

2
Habitica/src/com/habitrpg/android/habitica/ui/fragments/SkillsFragment.java
View file

@ -12,7 +12,7 @@ import android.view.View;
import android.view.ViewGroup;
import com.habitrpg.android.habitica.R;
import com.habitrpg.android.habitica.SkillTasksActivity;
import com.habitrpg.android.habitica.ui.activities.SkillTasksActivity;
import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
import com.habitrpg.android.habitica.callbacks.SkillCallback;
import com.habitrpg.android.habitica.events.SkillUsedEvent;

4
Habitica/src/com/habitrpg/android/habitica/ui/fragments/TasksFragment.java
View file

@ -25,9 +25,9 @@ import android.widget.ImageView;
import com.github.clans.fab.FloatingActionButton;
import com.github.clans.fab.FloatingActionMenu;
import com.habitrpg.android.habitica.ContentCache;
import com.habitrpg.android.habitica.MainActivity;
import com.habitrpg.android.habitica.ui.activities.MainActivity;
import com.habitrpg.android.habitica.R;
import com.habitrpg.android.habitica.TaskFormActivity;
import com.habitrpg.android.habitica.ui.activities.TaskFormActivity;
import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
import com.habitrpg.android.habitica.callbacks.TaskCreationCallback;
import com.habitrpg.android.habitica.callbacks.TaskScoringCallback;

4
Habitica/src/com/habitrpg/android/habitica/widget/UpdateWidgetService.java
View file

@ -11,10 +11,10 @@ import android.widget.RemoteViews;
import com.habitrpg.android.habitica.APIHelper;
import com.habitrpg.android.habitica.HostConfig;
import com.habitrpg.android.habitica.MainActivity;
import com.habitrpg.android.habitica.ui.activities.MainActivity;
import com.habitrpg.android.habitica.R;
import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
import com.habitrpg.android.habitica.prefs.PrefsActivity;
import com.habitrpg.android.habitica.ui.activities.PrefsActivity;
import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
/**