sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-20 20:59:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #704 from AlbRoehm/fix_#700_titleAlwaysChallenge

Browse source 
Fix #700 title always challenge
This commit is contained in:
Phillip Thelen 2017-01-23 13:15:12 +01:00 committed by GitHub
commit 4c65e79356
21 changed files with 85 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/res/values/strings.xml
View file

@ -471,4 +471,6 @@ To start, which parts of your life do you want to improve?</string>
<string name="warning">Warning</string>
<string name="open_settings">Open Settings</string>
<string name="dont_keep_activities_warning">It seems like you have the Developer option \"Don\'t keep Activities\" active. Currently this option causes issues with the habitica app, so we suggest disabling it.</string>
<string name="inbox">Inbox</string>
<string name="FAQ">Frequently Asked Questions</string>
</resources>

28
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
View file

@ -1,6 +1,5 @@
package com.habitrpg.android.habitica.ui.activities;
import com.facebook.drawee.generic.RootDrawable;
import com.facebook.drawee.view.SimpleDraweeView;
import com.habitrpg.android.habitica.APIHelper;
import com.habitrpg.android.habitica.HabiticaApplication;
@ -119,9 +118,6 @@ import android.databinding.DataBindingUtil;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Paint;
import android.graphics.Rect;
import android.graphics.drawable.BitmapDrawable;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
@ -133,7 +129,6 @@ import android.support.v4.content.FileProvider;
import android.support.v4.view.GravityCompat;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.util.Log;
import android.view.Gravity;
@ -806,7 +801,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
private void updateHeader() {
updateUserAvatars();
setUserTitle();
setTranslatedFragmentTitle(activeFragment);
android.support.v7.app.ActionBarDrawerToggle actionBarDrawerToggle = drawer.getActionBarDrawerToggle();
@ -878,22 +873,17 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
public void setActiveFragment(BaseMainFragment fragment) {
this.activeFragment = fragment;
if(fragment.customTitle() != null){
getSupportActionBar().setTitle(fragment.customTitle());
// BUG: setTitle not changed the title, just switched the length of "username"
//setTitle(fragment.customTitle());
} else {
setUserTitle();
}
setTranslatedFragmentTitle(fragment);
this.drawer.setSelectionAtPosition(this.activeFragment.fragmentSidebarPosition, false);
}
private void setUserTitle(){
if(user != null && user.getProfile() != null){
setTitle(user.getProfile().getName());
}
private void setTranslatedFragmentTitle(BaseMainFragment fragment){
if(fragment!= null && fragment.customTitle() != null){
getSupportActionBar().setTitle(fragment.customTitle());
}
else if(user != null && user.getProfile() != null){
getSupportActionBar().setTitle(user.getProfile().getName());
}
}
public void onBackPressed() {

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

@ -38,4 +38,8 @@ public class NewsFragment extends BaseMainFragment {
component.inject(this);
}
@Override
public String customTitle() { return getString(R.string.sidebar_news); }
}

5
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.java
View file

@ -58,4 +58,9 @@ public class FAQOverviewFragment extends BaseMainFragment {
adapter.setArticles(articles);
}
@Override
public String customTitle() {
return getString(R.string.FAQ);
}
}

4
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragment.java
View file

@ -152,4 +152,8 @@ public class AvatarOverviewFragment extends BaseMainFragment implements AdapterV
@Override
public void onNothingSelected(AdapterView<?> parent) {
}
@Override
public String customTitle() { return getString(R.string.sidebar_avatar); }
}

4
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragment.java
View file

@ -165,4 +165,8 @@ public class EquipmentOverviewFragment extends BaseMainFragment implements Trans
public boolean hasResult(BaseTransaction<List<ItemData>> transaction, List<ItemData> result) {
return true;
}
@Override
public String customTitle() { return getString(R.string.sidebar_equipment); }
}

4
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragment.java
View file

@ -133,4 +133,8 @@ public class ItemsFragment extends BaseMainFragment {
fragment.show(getFragmentManager(), "hatchingDialog");
}
}
@Override
public String customTitle() { return getString(R.string.sidebar_items); }
}

5
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/shops/ShopsFragment.java
View file

@ -96,4 +96,9 @@ public class ShopsFragment extends BaseMainFragment {
tabLayout.setupWithViewPager(viewPager);
}
}
@Override
public String customTitle() { return getString(R.string.sidebar_shops); }
}

3
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.java
View file

@ -106,4 +106,7 @@ public class MountDetailRecyclerFragment extends BaseMainFragment {
itemsRunnable.run();
}
@Override
public String customTitle() { return getString(R.string.mounts); }
}

3
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.java
View file

@ -130,4 +130,7 @@ public class PetDetailRecyclerFragment extends BaseMainFragment {
adapter.setOwnedMapping(user.getItems().getPets());
adapter.setOwnedMountsMapping(user.getItems().getMounts());
}
@Override
public String customTitle() { return getString(R.string.pets); }
}

4
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableFragment.java
View file

@ -84,4 +84,8 @@ public class StableFragment extends BaseMainFragment {
tabLayout.setupWithViewPager(viewPager);
}
}
@Override
public String customTitle() { return getString(R.string.sidebar_stable); }
}

4
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.java
View file

@ -235,4 +235,8 @@ public class SkillsFragment extends BaseMainFragment {
return (Math.round(value * Math.pow(10, n))) / (Math.pow(10, n));
}
@Override
public String customTitle() { return getString(R.string.sidebar_skills); }
}

5
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.java
View file

@ -252,4 +252,9 @@ public class GuildFragment extends BaseMainFragment implements Action1<Group> {
}
this.activity.supportInvalidateOptionsMenu();
}
@Override
public String customTitle() {
return getString(R.string.guild);
}
}

4
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildsOverviewFragment.java
View file

@ -112,4 +112,8 @@ public class GuildsOverviewFragment extends BaseMainFragment implements View.OnC
this.activity.displayFragment(guildFragment);
}
}
@Override
public String customTitle() { return getString(R.string.sidebar_guilds); }
}

5
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxFragment.java
View file

@ -205,4 +205,9 @@ public class InboxFragment extends BaseMainFragment
}
}
}
@Override
public String customTitle() {
return getString(R.string.sidebar_inbox);
}
}

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.java
View file

@ -134,4 +134,6 @@ public class InboxMessageListFragment extends BaseMainFragment
UiUtils.dismissKeyboard(HabiticaApplication.currentActivity);
}
}

3
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragment.java
View file

@ -109,4 +109,7 @@ public class PublicGuildsFragment extends BaseMainFragment implements SearchView
viewAdapter.getFilter().filter(s);
return true;
}
@Override
public String customTitle() { return getString(R.string.public_guilds); }
}

3
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragment.java
View file

@ -133,4 +133,7 @@ public class TavernFragment extends BaseMainFragment {
tabLayout.setupWithViewPager(viewPager);
}
}
@Override
public String customTitle() { return getString(R.string.sidebar_tavern); }
}

3
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/challenges/ChallengeListFragment.java
View file

@ -175,4 +175,7 @@ public class ChallengeListFragment extends BaseMainFragment implements SwipeRefr
public void updateItem(Challenge challenge) {
challengeAdapter.replaceChallenge(challenge);
}
@Override
public String customTitle() { return getString(R.string.sidebar_challenges); }
}

5
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragment.java
View file

@ -356,4 +356,9 @@ public class PartyFragment extends BaseMainFragment {
tabLayout.setupWithViewPager(viewPager);
}
}
@Override
public String customTitle() { return getString(R.string.sidebar_party); }
}

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

@ -658,4 +658,8 @@ public class TasksFragment extends BaseMainFragment implements OnCheckedChangeLi
.create();
confirmDeleteAlert.show();
}
@Override
public String customTitle() { return getString(R.string.sidebar_tasks); }
}