Add new division and menu icons, refactor most layouts. Save latest data version in shared preferences

Author: G00fY2

app/src/main/java/de/g00fy2/justdoit/app/controllers/ImageLoaderController.java

@@ -15,4 +15,6 @@ public interface ImageLoaderController {
   void loadChampionIcon(String championKey, ImageView imageView, Boolean circleCrop);
 
   void loadSpellIcon(String spellKey, ImageView imageView, Boolean circleCrop);
+
+  void loadDivisionIcon(String tier, int rank, ImageView imageView);
 }

app/src/main/java/de/g00fy2/justdoit/app/controllers/ImageLoaderControllerImpl.java

@@ -1,12 +1,14 @@
 package de.g00fy2.justdoit.app.controllers;
 
+import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.widget.ImageView;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.RequestBuilder;
 import com.bumptech.glide.request.RequestOptions;
 import de.g00fy2.justdoit.app.activities.BaseActivity;
 import de.g00fy2.model.utils.Constants;
+import de.g00fy2.model.utils.LeagueAPIUtils;
 import javax.inject.Inject;
 
 /**
@@ -62,6 +64,13 @@ public void loadChampionIcon(String championKey, ImageView imageView, Boolean ci
     }
   }
 
+  @Override public void loadDivisionIcon(String tier, int rank, ImageView imageView) {
+    int drawableId = getIconRessourceForPosition(tier, rank);
+    if (imageView != null && drawableId != 0) {
+      Glide.with(baseActivity).load(drawableId).into(imageView);
+    }
+  }
+
   private RequestBuilder<Drawable> load(String url) {
     return Glide.with(baseActivity).load(url);
   }
@@ -84,4 +93,17 @@ private String generateSpellImageUrl(String name) {
     String url = BASE_URL + latestVersion + "/img/spell/";
     return url + name + ".png";
   }
+
+  private int getIconRessourceForPosition(String tier, int rank) {
+    tier = tier.toLowerCase();
+    String imagename = tier + "_" + LeagueAPIUtils.transformRankToString(rank).toLowerCase();
+    Resources res = baseActivity.getResources();
+    int resId = res.getIdentifier(imagename, "drawable", baseActivity.getPackageName());
+
+    if (resId != 0) {
+      return resId;
+    } else {
+      return res.getIdentifier(tier, "drawable", baseActivity.getPackageName());
+    }
+  }
 }

app/src/main/java/de/g00fy2/justdoit/app/fragments/league_position/LeaguePositionFragment.java

@@ -77,14 +77,14 @@ public class LeaguePositionFragment extends BaseFragment
 
   @Override public void setSummonerData(Summoner summoner) {
     if (summoner != null) {
-      imageLoaderController.loadProfileIcon(summoner.profileIconId, leaguePositionProfileImageView,
-          true);
       leaguePositionProfileTextView.setText(summoner.name);
     }
   }
 
   @Override public void setLeagueData(LeaguePosition leaguePosition) {
     if (leaguePosition != null) {
+      imageLoaderController.loadDivisionIcon(leaguePosition.tier, leaguePosition.rank,
+          leaguePositionProfileImageView);
       leaguePositionLeagueTextView.setText(
           leaguePosition.tier + " " + LeagueAPIUtils.transformRankToString(leaguePosition.rank));
       leaguePositionNameTextView.setText(leaguePosition.leagueName);

app/src/main/java/de/g00fy2/justdoit/app/fragments/settings/SettingsFragment.java

@@ -34,10 +34,7 @@
 
   @Override protected void initializeViews() {
     regionPreference = findPreference("region");
-    regionPreference.setOnPreferenceClickListener(preference -> {
-      presenter.showNotAvailableNotice();
-      return true;
-    });
+    regionPreference.setEnabled(false);
     apikeyPreference = findPreference("apikey");
     apikeyPreference.setOnPreferenceChangeListener((preference, newValue) -> {
       presenter.changeAPIKey((String) newValue);

app/src/main/java/de/g00fy2/justdoit/app/fragments/settings/SettingsModule.java

@@ -3,8 +3,8 @@
 import dagger.Module;
 import dagger.Provides;
 import de.g00fy2.justdoit.app.di.scopes.PerFragment;
-import de.g00fy2.justdoit.app.fragments.settings.interactors.GetCurrentVersionInteractor;
-import de.g00fy2.justdoit.app.fragments.settings.interactors.GetCurrentVersionInteractorImpl;
+import de.g00fy2.justdoit.app.fragments.settings.interactors.GetDataVersionInteractor;
+import de.g00fy2.justdoit.app.fragments.settings.interactors.GetDataVersionInteractorImpl;
 
 /**
  * Created by Thomas Wirth on 08.12.2017.
@@ -29,8 +29,8 @@ public SettingsModule(SettingsContract.SetingsView view,
     return presenter;
   }
 
-  @Provides @PerFragment public GetCurrentVersionInteractor provideGetCurrentVersionInteractor(
-      GetCurrentVersionInteractorImpl getCurrentVersionInteractorImpl) {
-    return getCurrentVersionInteractorImpl;
+  @Provides @PerFragment public GetDataVersionInteractor provideGetDataVersionInteractor(
+      GetDataVersionInteractorImpl getDataVersionInteractorImpl) {
+    return getDataVersionInteractorImpl;
   }
 }

app/src/main/java/de/g00fy2/justdoit/app/fragments/settings/SettingsPresenterImpl.java

@@ -4,7 +4,7 @@
 import de.g00fy2.justdoit.app.controllers.ErrorController;
 import de.g00fy2.justdoit.app.controllers.SnackbarController;
 import de.g00fy2.justdoit.app.fragments.base.BasePresenterImpl;
-import de.g00fy2.justdoit.app.fragments.settings.interactors.GetCurrentVersionInteractor;
+import de.g00fy2.justdoit.app.fragments.settings.interactors.GetDataVersionInteractor;
 import de.g00fy2.justdoit.app.navigation.NavigationDrawer;
 import de.g00fy2.model.api.APIKeyInterceptor;
 import javax.inject.Inject;
@@ -20,7 +20,7 @@ public class SettingsPresenterImpl extends BasePresenterImpl
 
   @Inject APIKeyInterceptor apiKeyInterceptor;
   @Inject NavigationDrawer navigationDrawer;
-  @Inject GetCurrentVersionInteractor getCurrentVersionInteractor;
+  @Inject GetDataVersionInteractor getDataVersionInteractor;
   @Inject SnackbarController snackbarController;
   @Inject ErrorController errorController;
 
@@ -31,7 +31,7 @@ public class SettingsPresenterImpl extends BasePresenterImpl
   @Override public void onResume() {
     super.onResume();
     navigationDrawer.setCheckedItem(R.id.settings);
-    bind(getCurrentVersionInteractor.execute()
+    bind(getDataVersionInteractor.execute()
         .subscribe(currentVersion -> view.setPatchversionPreference(currentVersion),
             errorController::onError));
   }

app/src/main/java/de/g00fy2/justdoit/app/fragments/settings/interactors/GetCurrentVersionInteractor.java app/src/main/java/de/g00fy2/justdoit/app/fragments/settings/interactors/GetDataVersionInteractor.java

@@ -6,7 +6,7 @@
  * Created by Thomas Wirth on 09.12.2017.
  */
 
-public interface GetCurrentVersionInteractor {
+public interface GetDataVersionInteractor {
 
   Single<String> execute();
 }

app/src/main/java/de/g00fy2/justdoit/app/fragments/settings/interactors/GetCurrentVersionInteractorImpl.java app/src/main/java/de/g00fy2/justdoit/app/fragments/settings/interactors/GetDataVersionInteractorImpl.java

@@ -2,27 +2,23 @@
 
 import de.g00fy2.justdoit.app.fragments.base.BaseInteractor;
 import de.g00fy2.model.datastores.StaticDataDataStore;
-import io.reactivex.Observable;
 import io.reactivex.Single;
 import javax.inject.Inject;
 
 /**
  * Created by Thomas Wirth on 09.12.2017.
  */
 
-public class GetCurrentVersionInteractorImpl extends BaseInteractor
-    implements GetCurrentVersionInteractor {
+public class GetDataVersionInteractorImpl extends BaseInteractor
+    implements GetDataVersionInteractor {
 
   @Inject public StaticDataDataStore staticDataDataStore;
 
-  @Inject GetCurrentVersionInteractorImpl() {
+  @Inject GetDataVersionInteractorImpl() {
 
   }
 
   @Override public Single<String> execute() {
-    return staticDataDataStore.getVersions()
-        .flatMapObservable(Observable::fromIterable)
-        .firstOrError()
-        .compose(single());
+    return staticDataDataStore.getDataVersion().compose(single());
   }
 }

app/src/main/java/de/g00fy2/justdoit/app/fragments/start/StartPresenterImpl.java

@@ -43,15 +43,14 @@ public class StartPresenterImpl extends BasePresenterImpl implements StartContra
     navigationDrawer.setCheckedItem(R.id.home);
 
     loadStoredSummoners();
-    showLatestDataVersion();
+    getLatestDataVersion();
   }
 
   @Override public void searchSummoner(String summonerName) {
     bind(getSummonerByNameInteractor.execute(summonerName).subscribe(summoner -> {
-      favouriteSummoners.add(summoner);
       view.setDefaultSummoner(summoner);
-      view.notifyDataChanged();
       snackbarController.showSuccess(summoner.name + " was found!");
+      loadStoredSummoners();
     }, throwable -> errorController.onError(throwable)));
   }
 
@@ -84,7 +83,7 @@ private void loadStoredSummoners() {
     }, errorController::onError));
   }
 
-  private void showLatestDataVersion() {
+  private void getLatestDataVersion() {
     bind(getVersionInteractor.execute().subscribe(latestVersion -> {
       view.showCurrentVersion(latestVersion);
       imageLoaderController.setLatestVersion(latestVersion);

app/src/main/java/de/g00fy2/justdoit/app/fragments/start/interactors/GetVersionInteractorImpl.java

@@ -2,7 +2,6 @@
 
 import de.g00fy2.justdoit.app.fragments.base.BaseInteractor;
 import de.g00fy2.model.datastores.StaticDataDataStore;
-import io.reactivex.Observable;
 import io.reactivex.Single;
 import javax.inject.Inject;
 
@@ -18,9 +17,6 @@ public class GetVersionInteractorImpl extends BaseInteractor implements GetVersi
   }
 
   @Override public Single<String> execute() {
-    return staticDataDataStore.getVersions()
-        .flatMapObservable(Observable::fromIterable)
-        .firstOrError()
-        .compose(single());
+    return staticDataDataStore.getLatestDataVersionFromWeb().compose(single());
   }
 }

app/src/main/res/drawable-hdpi/bronze_i.png

@@ -0,0 +1,8 @@
+<!-- drawable/account_multiple.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#FFF" android:pathData="M16,13C15.71,13 15.38,13 15.03,13.05C16.19,13.89 17,15 17,16.5V19H23V16.5C23,14.17 18.33,13 16,13M8,13C5.67,13 1,14.17 1,16.5V19H15V16.5C15,14.17 10.33,13 8,13M8,11A3,3 0 0,0 11,8A3,3 0 0,0 8,5A3,3 0 0,0 5,8A3,3 0 0,0 8,11M16,11A3,3 0 0,0 19,8A3,3 0 0,0 16,5A3,3 0 0,0 13,8A3,3 0 0,0 16,11Z" />
+</vector>

app/src/main/res/drawable-hdpi/bronze_ii.png

@@ -0,0 +1,8 @@
+<!-- drawable/finance.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#FFF" android:pathData="M3,13H7V23H3V13M10,14H14V23H10V14M17,9H21V23H17V9M17,1H21V5H20V3.06L11.97,11.09L8,7.12L3.4,11.72L2.34,10.66L8,5L11.97,8.97L18.94,2H17V1Z" />
+</vector>

app/src/main/res/drawable-hdpi/bronze_iii.png

@@ -0,0 +1,8 @@
+<!-- drawable/trophy.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#FFF" android:pathData="M20.2,2H19.5H18C17.1,2 16,3 16,4H8C8,3 6.9,2 6,2H4.5H3.8H2V11C2,12 3,13 4,13H6.2C6.6,15 7.9,16.7 11,17V19.1C8.8,19.3 8,20.4 8,21.7V22H16V21.7C16,20.4 15.2,19.3 13,19.1V17C16.1,16.7 17.4,15 17.8,13H20C21,13 22,12 22,11V2H20.2M4,11V4H6V6V11C5.1,11 4.3,11 4,11M20,11C19.7,11 18.9,11 18,11V6V4H20V11Z" />
+</vector>

app/src/main/res/drawable-hdpi/bronze_iv.png

@@ -0,0 +1,8 @@
+<!-- drawable/settings.xml -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#FFF" android:pathData="M12,15.5A3.5,3.5 0 0,1 8.5,12A3.5,3.5 0 0,1 12,8.5A3.5,3.5 0 0,1 15.5,12A3.5,3.5 0 0,1 12,15.5M19.43,12.97C19.47,12.65 19.5,12.33 19.5,12C19.5,11.67 19.47,11.34 19.43,11L21.54,9.37C21.73,9.22 21.78,8.95 21.66,8.73L19.66,5.27C19.54,5.05 19.27,4.96 19.05,5.05L16.56,6.05C16.04,5.66 15.5,5.32 14.87,5.07L14.5,2.42C14.46,2.18 14.25,2 14,2H10C9.75,2 9.54,2.18 9.5,2.42L9.13,5.07C8.5,5.32 7.96,5.66 7.44,6.05L4.95,5.05C4.73,4.96 4.46,5.05 4.34,5.27L2.34,8.73C2.21,8.95 2.27,9.22 2.46,9.37L4.57,11C4.53,11.34 4.5,11.67 4.5,12C4.5,12.33 4.53,12.65 4.57,12.97L2.46,14.63C2.27,14.78 2.21,15.05 2.34,15.27L4.34,18.73C4.46,18.95 4.73,19.03 4.95,18.95L7.44,17.94C7.96,18.34 8.5,18.68 9.13,18.93L9.5,21.58C9.54,21.82 9.75,22 10,22H14C14.25,22 14.46,21.82 14.5,21.58L14.87,18.93C15.5,18.67 16.04,18.34 16.56,17.94L19.05,18.95C19.27,19.03 19.54,18.95 19.66,18.73L21.66,15.27C21.78,15.05 21.73,14.78 21.54,14.63L19.43,12.97Z" />
+</vector>

app/src/main/res/drawable-hdpi/bronze_v.png

@@ -9,57 +9,48 @@
     >
 
   <LinearLayout
-      android:layout_width="wrap_content"
+      android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:layout_marginBottom="8dp"
-      android:layout_marginStart="16dp"
-      android:layout_marginTop="16dp"
+      android:layout_margin="8dp"
       android:orientation="horizontal"
       >
     <ImageView
         android:id="@+id/league_position_profile_imageview"
-        android:layout_width="56dp"
-        android:layout_height="56dp"
+        android:layout_width="112dp"
+        android:layout_height="112dp"
         />
     <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="8dp"
+        android:orientation="vertical"
         >
       <TextView
           android:id="@+id/league_position_profile_textview"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
-          android:layout_marginStart="8dp"
+          android:layout_marginBottom="8dp"
           android:text="Summoner"
           android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
           />
-    </LinearLayout>
-  </LinearLayout>
-
-  <LinearLayout
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_marginBottom="4dp"
-      android:layout_marginStart="16dp"
-      android:orientation="vertical"
-      >
-
-    <TextView
-        android:id="@+id/league_position_league_textview"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
-        tools:text="Gold"
-        />
-    <TextView
-        android:id="@+id/league_position_league_name_textview"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        tools:text="Vis Orakel"
-        />
+      <TextView
+          android:id="@+id/league_position_league_textview"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginBottom="8dp"
+          android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
+          tools:text="Gold"
+          />
+      <TextView
+          android:id="@+id/league_position_league_name_textview"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          tools:text="Vis Orakel"
+          />
 
+    </LinearLayout>
   </LinearLayout>
 
   <LinearLayout