diff --git a/app/src/main/java/org/ole/planet/myplanet/ui/userprofile/AchievementFragment.java b/app/src/main/java/org/ole/planet/myplanet/ui/userprofile/AchievementFragment.java index 0181915cf5..39d05ffbe6 100644 --- a/app/src/main/java/org/ole/planet/myplanet/ui/userprofile/AchievementFragment.java +++ b/app/src/main/java/org/ole/planet/myplanet/ui/userprofile/AchievementFragment.java @@ -20,6 +20,7 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; +import org.ole.planet.myplanet.MainApplication; import org.ole.planet.myplanet.R; import org.ole.planet.myplanet.base.BaseContainerFragment; import org.ole.planet.myplanet.base.BaseResourceFragment; @@ -50,6 +51,7 @@ public class AchievementFragment extends BaseContainerFragment { RealmUserModel user; OnHomeItemClickListener listener; RealmAchievement achievement; + @Override public void onAttach(Context context) { super.onAttach(context); @@ -65,8 +67,8 @@ public AchievementFragment() { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View v = inflater.inflate(R.layout.fragment_achievement, container, false); - mRealm = new DatabaseService(getActivity()).getRealmInstance(); - user = new UserProfileDbHandler(getActivity()).getUserModel(); + mRealm = new DatabaseService(MainApplication.context).getRealmInstance(); + user = new UserProfileDbHandler(MainApplication.context).getUserModel(); rvOther = v.findViewById(R.id.rv_other_info); tvGoal = v.findViewById(R.id.tv_goals); tvName = v.findViewById(R.id.tv_name); @@ -86,7 +88,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, @Override public void onActivityCreated(@Nullable Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - achievement = mRealm.where(RealmAchievement.class).equalTo("_id", user.getId() + "@" + user.getPlanetCode()).findFirst(); + achievement = mRealm.where(RealmAchievement.class).equalTo("_id", user.getId() + "@" + user.getPlanetCode()).findFirst(); tvFirstName.setText(user.getFirstName()); tvName.setText(String.format("%s %s %s", user.getFirstName(), user.getMiddleName(), user.getLastName())); if (achievement != null) { @@ -95,12 +97,12 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) { tvAchievement.setText(achievement.getAchievementsHeader()); llAchievement.removeAllViews(); for (String s : achievement.getAchievements()) { - View v = LayoutInflater.from(getActivity()).inflate(R.layout.row_achievement, null); + View v = LayoutInflater.from(MainApplication.context).inflate(R.layout.row_achievement, null); createView(v, s); llAchievement.addView(v); } - rvOther.setLayoutManager(new LinearLayoutManager(getActivity())); - rvOther.setAdapter(new AdapterOtherInfo(getActivity(), achievement.getreferences())); + rvOther.setLayoutManager(new LinearLayoutManager(MainApplication.context)); + rvOther.setAdapter(new AdapterOtherInfo(MainApplication.context, achievement.getreferences())); } } @@ -130,15 +132,15 @@ private void populateAchievementList(JsonElement ob, View v) { title.setCompoundDrawablesWithIntrinsicBounds(0, 0, (llDesc.getVisibility() == View.GONE ? R.drawable.ic_down : R.drawable.ic_up), 0); }); showResourceButtons(flexboxLayout, libraries); - }else{ + } else { title.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0); createAchievementList(); - rvOther.setLayoutManager(new LinearLayoutManager(getActivity())); - rvOther.setAdapter(new AdapterOtherInfo(getActivity(), achievement.getreferences())); + rvOther.setLayoutManager(new LinearLayoutManager(MainApplication.context)); + rvOther.setAdapter(new AdapterOtherInfo(MainApplication.context, achievement.getreferences())); } mRealm.addChangeListener(realm -> { - if (llAchievement!=null) - llAchievement.removeAllViews(); + if (llAchievement != null) + llAchievement.removeAllViews(); createAchievementList(); }); } @@ -146,7 +148,7 @@ private void populateAchievementList(JsonElement ob, View v) { private void createAchievementList() { for (String s : achievement.getAchievements()) { - View v = LayoutInflater.from(getActivity()).inflate(R.layout.row_achievement, null); + View v = LayoutInflater.from(MainApplication.context).inflate(R.layout.row_achievement, null); TextView title = v.findViewById(R.id.tv_title); TextView date = v.findViewById(R.id.tv_date); TextView description = v.findViewById(R.id.tv_description); @@ -175,7 +177,7 @@ private void createAchievementList() { private void showResourceButtons(FlexboxLayout flexboxLayout, ArrayList libraries) { for (RealmMyLibrary lib : libraries ) { - Button b = (Button) LayoutInflater.from(getActivity()).inflate(R.layout.layout_button_primary, null); + Button b = (Button) LayoutInflater.from(MainApplication.context).inflate(R.layout.layout_button_primary, null); b.setText(lib.getTitle()); b.setCompoundDrawablesWithIntrinsicBounds(0, 0, (lib.isResourceOffline() ? R.drawable.ic_eye : R.drawable.ic_download), 0); b.setOnClickListener(view -> { diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 9f9f568d92..b012cfaf83 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -53,7 +53,7 @@ Question Bug Your Feedback * - 0.3.44 + 0.3.49 Update Level Male diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 4c113245c5..a2d7518f4a 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -53,7 +53,7 @@ Question Bug Your Feedback * - 0.3.44 + 0.3.49 Update Level Male diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 9f9f568d92..b012cfaf83 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -53,7 +53,7 @@ Question Bug Your Feedback * - 0.3.44 + 0.3.49 Update Level Male diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml index 8256e16b84..beddde9c85 100644 --- a/app/src/main/res/values-ne/strings.xml +++ b/app/src/main/res/values-ne/strings.xml @@ -53,7 +53,7 @@ Question Bug Your Feedback * - 0.3.44 + 0.3.49 Update Level Male diff --git a/app/src/main/res/values-so/strings.xml b/app/src/main/res/values-so/strings.xml index 9f9f568d92..b012cfaf83 100644 --- a/app/src/main/res/values-so/strings.xml +++ b/app/src/main/res/values-so/strings.xml @@ -53,7 +53,7 @@ Question Bug Your Feedback * - 0.3.44 + 0.3.49 Update Level Male diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3f5c9403cb..c3e1f95489 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -52,7 +52,7 @@ Question Bug Your Feedback * - 0.3.48 + 0.3.49 Update Level Male