Fix crash when no events available, fix Polish typo

Vieja · Jun 27, 2021 · 9870183 · 9870183
1 parent 11b17fc
commit 9870183
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 19 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,7 +9,7 @@ android {
         minSdkVersion 17
         targetSdkVersion 30
         versionCode 3
-        versionName "1.2"
+        versionName "1.2.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/release/app-release.aab b/app/release/app-release.aab
diff --git a/app/src/main/java/com/vieja/crownhunter/activity/HomeFragment.java b/app/src/main/java/com/vieja/crownhunter/activity/HomeFragment.java
@@ -83,22 +83,23 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
         ice_giant_1.setText(String.valueOf(giant_ice));
 
         populateEventCardList();
-        EventCard event = eventCardsList.get(0);
-        TextView name = view.findViewById(R.id.name);
-        ImageView img1 = view.findViewById(R.id.monster_icon1);
-        ImageView img2 = view.findViewById(R.id.monster_icon2);
-        ImageView img3 = view.findViewById(R.id.monster_icon3);
-        ImageView img4 = view.findViewById(R.id.monster_icon4);
-        ImageView img5 = view.findViewById(R.id.monster_icon5);
-        TextView chances = view.findViewById(R.id.chances);
-        name.setText(event.getName());
-        img1.setImageResource(event.getMonsterIcon1());
-        if (event.getMonsterIcon2() != 0) img2.setImageResource(event.getMonsterIcon2());
-        if (event.getMonsterIcon3() != 0) img3.setImageResource(event.getMonsterIcon3());
-        if (event.getMonsterIcon4() != 0) img4.setImageResource(event.getMonsterIcon4());
-        if (event.getMonsterIcon5() != 0) img5.setImageResource(event.getMonsterIcon5());
-        chances.setText(getContext().getResources().getString(R.string.chances)+' '+event.getChances()+'%');
-
+        if (eventCardsList.size() != 0) {
+            EventCard event = eventCardsList.get(0);
+            TextView name = view.findViewById(R.id.name);
+            ImageView img1 = view.findViewById(R.id.monster_icon1);
+            ImageView img2 = view.findViewById(R.id.monster_icon2);
+            ImageView img3 = view.findViewById(R.id.monster_icon3);
+            ImageView img4 = view.findViewById(R.id.monster_icon4);
+            ImageView img5 = view.findViewById(R.id.monster_icon5);
+            TextView chances = view.findViewById(R.id.chances);
+            name.setText(event.getName());
+            img1.setImageResource(event.getMonsterIcon1());
+            if (event.getMonsterIcon2() != 0) img2.setImageResource(event.getMonsterIcon2());
+            if (event.getMonsterIcon3() != 0) img3.setImageResource(event.getMonsterIcon3());
+            if (event.getMonsterIcon4() != 0) img4.setImageResource(event.getMonsterIcon4());
+            if (event.getMonsterIcon5() != 0) img5.setImageResource(event.getMonsterIcon5());
+            chances.setText(getContext().getResources().getString(R.string.chances) + ' ' + event.getChances() + '%');
+        }
         return view;
 
     }

diff --git a/app/src/main/java/com/vieja/crownhunter/activity/SettingsFragment.java b/app/src/main/java/com/vieja/crownhunter/activity/SettingsFragment.java
@@ -2,14 +2,25 @@
 
 
 import android.os.Bundle;
+import android.util.Log;
 
+import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 
 import com.vieja.crownhunter.R;
 
+import java.util.Locale;
+
 public class SettingsFragment extends PreferenceFragmentCompat {
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         setPreferencesFromResource(R.xml.preferences, rootKey);
+
+        Preference customPref = (Preference) findPreference("non_english");
+        Locale current = getResources().getConfiguration().locale;
+        if (current.getLanguage().equals("pl"))
+            customPref.setVisible(true);
     }
+
+
 }
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
@@ -15,7 +15,7 @@
     <string name="s_q3_summ_on">Na starcie ukrywaj ukończone potwory</string>
     <string name="s_q3_summ_off">Na starcie pokazuj pełną listę potworów</string>
     <string name="s_head2">Właściwości aplikacji</string>
-    <string name="s_q4">Pokaż nazwy potworówi misji po angielsku</string>
+    <string name="s_q4">Pokaż nazwy potworów i misji po angielsku</string>
     <string name="s_q4_summ">Apka po polsku, potwory i misje po angielsku</string>
     <string name="home_nav1">Brakujące korony</string>
     <string name="home_nav2">Polecane wydarzenie</string>

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
@@ -27,7 +27,9 @@
             android:title="@string/s_q3" />
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/s_head2"
-        app:iconSpaceReserved="false">
+        app:iconSpaceReserved="false"
+        app:isPreferenceVisible="false"
+        android:key="non_english">
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="names_english"