commit cc5ec22932d080d63ef35f65444ee21eb96fe7f4
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Tue Feb 11 17:46:13 2020 +0000

    Downloading High Scores: actually downloading scores!

diff --git a/src/main/java/org/distorted/magic/RubikScores.java b/src/main/java/org/distorted/magic/RubikScores.java
index 8d695e6f..0c69ade6 100644
--- a/src/main/java/org/distorted/magic/RubikScores.java
+++ b/src/main/java/org/distorted/magic/RubikScores.java
@@ -24,7 +24,6 @@ import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v4.app.FragmentActivity;
-import android.support.v4.view.ViewPager;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatDialogFragment;
 import android.support.design.widget.TabLayout;
@@ -37,7 +36,8 @@ import android.widget.TextView;
 
 public class RubikScores extends AppCompatDialogFragment
   {
-  RubikScoresViewPager mViewPager;
+  RubikScoresPagerAdapter mPagerAdapter;
+  RubikScoresViewPager    mViewPager;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -67,10 +67,14 @@ public class RubikScores extends AppCompatDialogFragment
     final View view = inflater.inflate(R.layout.scores, null);
     builder.setView(view);
 
-    ViewPager viewPager = view.findViewById(R.id.viewpager);
+    mViewPager = view.findViewById(R.id.viewpager);
+    mViewPager.startDownload(act);
+
     TabLayout tabLayout = view.findViewById(R.id.sliding_tabs);
-    mViewPager = new RubikScoresViewPager(act,viewPager);
-    tabLayout.setupWithViewPager(viewPager);
+    mPagerAdapter = new RubikScoresPagerAdapter(act,mViewPager);
+    tabLayout.setupWithViewPager(mViewPager);
+
+    mViewPager.setCurrentItem(0);
 
     for (int i = 0; i< RubikSize.LENGTH; i++)
       {
diff --git a/src/main/java/org/distorted/magic/RubikScoresDownloader.java b/src/main/java/org/distorted/magic/RubikScoresDownloader.java
index c43cd58f..3687ef4b 100644
--- a/src/main/java/org/distorted/magic/RubikScoresDownloader.java
+++ b/src/main/java/org/distorted/magic/RubikScoresDownloader.java
@@ -19,9 +19,12 @@
 
 package org.distorted.magic;
 
+import android.content.res.Resources;
+
 import java.io.InputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.net.UnknownHostException;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -29,7 +32,7 @@ class RubikScoresDownloader implements Runnable
   {
   interface Receiver
     {
-    void receive(String[][][][] scores);
+    void receive(int[][][] country, String[][][] name, String[][][] time);
     void exception(String exception);
     }
 
@@ -79,9 +82,13 @@ class RubikScoresDownloader implements Runnable
   private static boolean mRunning = false;
   private static int mMode = IDLE;
   private static Receiver mReceiver;
+  private static Resources mResources;
+  private static String mPackageName;
 
   private static String mScores = "";
-  private static String[][][][] mValues = new String[RubikSize.LENGTH][RubikActivity.MAX_SCRAMBLE][MAX_PLACES][3];
+  private static int[][][] mCountry = new int   [RubikSize.LENGTH][RubikActivity.MAX_SCRAMBLE][MAX_PLACES];
+  private static String[][][] mName = new String[RubikSize.LENGTH][RubikActivity.MAX_SCRAMBLE][MAX_PLACES];
+  private static String[][][] mTime = new String[RubikSize.LENGTH][RubikActivity.MAX_SCRAMBLE][MAX_PLACES];
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -124,9 +131,10 @@ class RubikScoresDownloader implements Runnable
 
         if(level>=0 && level<RubikActivity.MAX_SCRAMBLE && place>=0 && place<MAX_PLACES)
           {
-          mValues[size][level][place][0] = country;
-          mValues[size][level][place][1] = name;
-          mValues[size][level][place][2] = realTime;
+          int resID = mResources.getIdentifier( country, "drawable", mPackageName);
+          mCountry[size][level][place] = resID!=0 ? resID:R.drawable.unk;
+          mName[size][level][place]    = name;
+          mTime[size][level][place]    = realTime;
           }
         }
       }
@@ -201,13 +209,23 @@ class RubikScoresDownloader implements Runnable
           }
         mScores = sb.toString();
         }
-      catch(Exception e)
+      catch( final Exception e)
         {
         mReceiver.exception("biffed it getting HTTPResponse");
         return false;
         }
       }
-    catch( Exception e )
+    catch( final UnknownHostException e )
+      {
+      mReceiver.exception("No access to Internet");
+      return false;
+      }
+    catch( final SecurityException e )
+      {
+      mReceiver.exception("Application not authorized to connect to the Internet");
+      return false;
+      }
+    catch( final Exception e )
       {
       mReceiver.exception(e.getMessage());
       return false;
@@ -228,15 +246,17 @@ class RubikScoresDownloader implements Runnable
   static void onPause()
     {
     mRunning = false;
-    mScores = "";
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  void download(Receiver receiver)
+  void download(Receiver receiver, Resources resources, String packageName)
     {
     mReceiver = receiver;
+    mResources= resources;
+    mPackageName = packageName;
     mMode = DOWNLOAD;
+
     Thread networkThrd = new Thread(this);
     networkThrd.start();
     }
@@ -258,14 +278,14 @@ class RubikScoresDownloader implements Runnable
       }
     catch( Exception e )
       {
-      android.util.Log.e("downloader", "Exception downloading records: "+e.getMessage() );
+      mReceiver.exception("Exception downloading records: "+e.getMessage() );
       }
 
     mRunning = false;
 
     if( success )
       {
-      mReceiver.receive(mValues);
+      mReceiver.receive(mCountry, mName, mTime);
       }
     }
 }
\ No newline at end of file
diff --git a/src/main/java/org/distorted/magic/RubikScoresPagerAdapter.java b/src/main/java/org/distorted/magic/RubikScoresPagerAdapter.java
new file mode 100644
index 00000000..43d8d1a4
--- /dev/null
+++ b/src/main/java/org/distorted/magic/RubikScoresPagerAdapter.java
@@ -0,0 +1,82 @@
+///////////////////////////////////////////////////////////////////////////////////////////////////
+// Copyright 2020 Leszek Koltunski                                                               //
+//                                                                                               //
+// This file is part of Magic Cube.                                                              //
+//                                                                                               //
+// Magic Cube is free software: you can redistribute it and/or modify                            //
+// it under the terms of the GNU General Public License as published by                          //
+// the Free Software Foundation, either version 2 of the License, or                             //
+// (at your option) any later version.                                                           //
+//                                                                                               //
+// Magic Cube is distributed in the hope that it will be useful,                                 //
+// but WITHOUT ANY WARRANTY; without even the implied warranty of                                //
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                                 //
+// GNU General Public License for more details.                                                  //
+//                                                                                               //
+// You should have received a copy of the GNU General Public License                             //
+// along with Magic Cube.  If not, see <http://www.gnu.org/licenses/>.                           //
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+package org.distorted.magic;
+
+import android.support.annotation.NonNull;
+import android.support.v4.app.FragmentActivity;
+import android.support.v4.view.PagerAdapter;
+import android.view.View;
+import android.view.ViewGroup;
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+class RubikScoresPagerAdapter extends PagerAdapter
+  {
+  private FragmentActivity mAct;
+  private RubikScoresViewPager mPager;
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  RubikScoresPagerAdapter(FragmentActivity act, RubikScoresViewPager viewPager)
+    {
+    mAct = act;
+    mPager = viewPager;
+
+    viewPager.setAdapter(this);
+    viewPager.setOffscreenPageLimit( RubikSize.LENGTH-1 );
+    }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  @Override
+  @NonNull
+  public Object instantiateItem(@NonNull ViewGroup collection, int position)
+    {
+    RubikScoresView view = new RubikScoresView(mAct);
+    mPager.setView(position,view);
+    collection.addView(view);
+
+    return view;
+    }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  @Override
+  public void destroyItem(ViewGroup collection, int position, @NonNull Object view)
+    {
+    collection.removeView((View) view);
+    }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  @Override
+  public int getCount()
+    {
+    return RubikSize.LENGTH;
+    }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  @Override
+  public boolean isViewFromObject(@NonNull View view, @NonNull Object object)
+    {
+    return view == object;
+    }
+  }
diff --git a/src/main/java/org/distorted/magic/RubikScoresView.java b/src/main/java/org/distorted/magic/RubikScoresView.java
index c2d9c0c5..55dfa2a8 100644
--- a/src/main/java/org/distorted/magic/RubikScoresView.java
+++ b/src/main/java/org/distorted/magic/RubikScoresView.java
@@ -20,10 +20,13 @@
 package org.distorted.magic;
 
 import android.content.Context;
+import android.content.res.Resources;
+import android.graphics.BitmapFactory;
 import android.support.v4.app.FragmentActivity;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.FrameLayout;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -31,13 +34,15 @@ import android.widget.TextView;
 
 public class RubikScoresView extends FrameLayout
   {
-  int mPosition;
+  private boolean mCreated;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   public RubikScoresView(Context context, AttributeSet attrs, int defStyle)
     {
     super(context, attrs, defStyle);
+
+    mCreated = false;
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -52,15 +57,7 @@ public class RubikScoresView extends FrameLayout
   public RubikScoresView(Context context)
     {
     super(context);
-    }
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-  public RubikScoresView(Context context, int position)
-    {
-    super(context);
 
-    mPosition = position;
     View view = inflate(context, R.layout.scores_downloading, null);
     addView(view);
     }
@@ -75,8 +72,10 @@ public class RubikScoresView extends FrameLayout
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  void prepareView(FragmentActivity act, final String[][][] values)
+  void prepareView(FragmentActivity act, final int[][] country, final String[][] name, final String[][] time)
     {
+    if( mCreated ) return;
+
     removeAllViews();
 
     View tab = inflate(act, R.layout.scores_tab, null);
@@ -91,21 +90,17 @@ public class RubikScoresView extends FrameLayout
 
       for(int j=0; j<RubikScoresDownloader.MAX_PLACES; j++)
         {
-        String coun = values[i][j][0];
-        String name = values[i][j][1];
-        String time = values[i][j][2];
-
-        if( name!=null && name.length()>0 )
+        if( name[i][j] != null )
           {
           View row = inflate(act, R.layout.level_row, null);
 
-          TextView textCoun = row.findViewById(R.id.level_row_country);
+          ImageView imgCoun = row.findViewById(R.id.level_row_country);
           TextView textName = row.findViewById(R.id.level_row_name);
           TextView textTime = row.findViewById(R.id.level_row_time);
 
-          textCoun.setText(coun);
-          textName.setText(name);
-          textTime.setText(time);
+          imgCoun.setImageResource(country[i][j]);
+          textName.setText(name[i][j]);
+          textTime.setText(time[i][j]);
 
           level.addView(row);
           }
@@ -113,5 +108,7 @@ public class RubikScoresView extends FrameLayout
 
       layout.addView(level);
       }
+
+    mCreated = true;
     }
   }
diff --git a/src/main/java/org/distorted/magic/RubikScoresViewPager.java b/src/main/java/org/distorted/magic/RubikScoresViewPager.java
index cb22d11e..11866404 100644
--- a/src/main/java/org/distorted/magic/RubikScoresViewPager.java
+++ b/src/main/java/org/distorted/magic/RubikScoresViewPager.java
@@ -19,43 +19,85 @@
 
 package org.distorted.magic;
 
-import android.support.annotation.NonNull;
+import android.content.Context;
 import android.support.v4.app.FragmentActivity;
-import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
-import android.view.View;
-import android.view.ViewGroup;
+import android.util.AttributeSet;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-class RubikScoresViewPager extends PagerAdapter implements RubikScoresDownloader.Receiver
+class RubikScoresViewPager extends ViewPager implements RubikScoresDownloader.Receiver
   {
-  private FragmentActivity mAct;
+  FragmentActivity mAct;
   private RubikScoresView[] mViews;
+  private int mSelected;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  RubikScoresViewPager(FragmentActivity act, ViewPager viewPager)
+  public RubikScoresViewPager(Context context, AttributeSet attrs)
+    {
+    super(context,attrs);
+
+    mViews = new RubikScoresView[RubikSize.LENGTH];
+    mSelected = 0;
+
+    addOnPageChangeListener(new ViewPager.OnPageChangeListener()
+      {
+      @Override
+      public void onPageSelected(int position)
+        {
+        mSelected = position;
+        }
+
+      @Override
+      public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels)
+        { }
+
+      @Override
+      public void onPageScrollStateChanged(int state)
+        { }
+      });
+    }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  void startDownload(FragmentActivity act)
     {
     mAct = act;
-    mViews = new RubikScoresView[getCount()];
-    viewPager.setAdapter(this);
-    viewPager.setOffscreenPageLimit( RubikSize.LENGTH-1 );
+
+    RubikScoresDownloader downloader = new RubikScoresDownloader();
+    downloader.download(this, mAct.getResources(), mAct.getPackageName());
+    }
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  void setView(int position, RubikScoresView view)
+    {
+    if( position>=0 && position<RubikSize.LENGTH )
+      {
+      mViews[position] = view;
+      }
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
-  public void receive(final String[][][][] scores)
+  public void receive(final int[][][] country, final String[][][] name, final String[][][] time)
     {
     mAct.runOnUiThread(new Runnable()
       {
       @Override
       public void run()
         {
+        long time1 = System.currentTimeMillis();
+
         for(int i=0; i<RubikSize.LENGTH; i++)
           {
-          mViews[i].prepareView(mAct,scores[i]);
+          mViews[i].prepareView(mAct, country[i], name[i], time[i]);
           }
+
+        long time2 = System.currentTimeMillis();
+
+        android.util.Log.e("dd", "time="+(time2-time1));
         }
       });
     }
@@ -76,57 +118,4 @@ class RubikScoresViewPager extends PagerAdapter implements RubikScoresDownloader
         }
       });
     }
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-  @Override
-  @NonNull
-  public Object instantiateItem(@NonNull ViewGroup collection, int position)
-    {
-    mViews[position] = new RubikScoresView(mAct,position);
-    collection.addView(mViews[position]);
-
-    boolean allCreated = true;
-
-    for(int i=0; i<RubikSize.LENGTH; i++)
-      {
-      if( mViews[i]==null )
-        {
-        allCreated = false;
-        break;
-        }
-      }
-
-    if( allCreated )
-      {
-      RubikScoresDownloader downloader = new RubikScoresDownloader();
-      downloader.download(this);
-      }
-
-    return mViews[position];
-    }
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-  @Override
-  public void destroyItem(ViewGroup collection, int position, @NonNull Object view)
-    {
-    collection.removeView((View) view);
-    }
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-  @Override
-  public int getCount()
-    {
-    return RubikSize.LENGTH;
-    }
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-  @Override
-  public boolean isViewFromObject(@NonNull View view, @NonNull Object object)
-    {
-    return view == object;
-    }
   }
diff --git a/src/main/res/drawable-nodpi/afg.png b/src/main/res/drawable-nodpi/afg.png
new file mode 100644
index 00000000..2a8baba1
Binary files /dev/null and b/src/main/res/drawable-nodpi/afg.png differ
diff --git a/src/main/res/drawable-nodpi/alb.png b/src/main/res/drawable-nodpi/alb.png
new file mode 100644
index 00000000..3d17887f
Binary files /dev/null and b/src/main/res/drawable-nodpi/alb.png differ
diff --git a/src/main/res/drawable-nodpi/alg.png b/src/main/res/drawable-nodpi/alg.png
new file mode 100644
index 00000000..a1514239
Binary files /dev/null and b/src/main/res/drawable-nodpi/alg.png differ
diff --git a/src/main/res/drawable-nodpi/and.png b/src/main/res/drawable-nodpi/and.png
new file mode 100644
index 00000000..1f6463c3
Binary files /dev/null and b/src/main/res/drawable-nodpi/and.png differ
diff --git a/src/main/res/drawable-nodpi/arg.png b/src/main/res/drawable-nodpi/arg.png
new file mode 100644
index 00000000..797d30b3
Binary files /dev/null and b/src/main/res/drawable-nodpi/arg.png differ
diff --git a/src/main/res/drawable-nodpi/arm.png b/src/main/res/drawable-nodpi/arm.png
new file mode 100644
index 00000000..aa86ab3f
Binary files /dev/null and b/src/main/res/drawable-nodpi/arm.png differ
diff --git a/src/main/res/drawable-nodpi/aus.png b/src/main/res/drawable-nodpi/aus.png
new file mode 100644
index 00000000..da9079fa
Binary files /dev/null and b/src/main/res/drawable-nodpi/aus.png differ
diff --git a/src/main/res/drawable-nodpi/aut.png b/src/main/res/drawable-nodpi/aut.png
new file mode 100644
index 00000000..d94ee28e
Binary files /dev/null and b/src/main/res/drawable-nodpi/aut.png differ
diff --git a/src/main/res/drawable-nodpi/aze.png b/src/main/res/drawable-nodpi/aze.png
new file mode 100644
index 00000000..b87be4d0
Binary files /dev/null and b/src/main/res/drawable-nodpi/aze.png differ
diff --git a/src/main/res/drawable-nodpi/bah.png b/src/main/res/drawable-nodpi/bah.png
new file mode 100644
index 00000000..1e204044
Binary files /dev/null and b/src/main/res/drawable-nodpi/bah.png differ
diff --git a/src/main/res/drawable-nodpi/ban.png b/src/main/res/drawable-nodpi/ban.png
new file mode 100644
index 00000000..ce0b179f
Binary files /dev/null and b/src/main/res/drawable-nodpi/ban.png differ
diff --git a/src/main/res/drawable-nodpi/bel.png b/src/main/res/drawable-nodpi/bel.png
new file mode 100644
index 00000000..9484119e
Binary files /dev/null and b/src/main/res/drawable-nodpi/bel.png differ
diff --git a/src/main/res/drawable-nodpi/bhu.png b/src/main/res/drawable-nodpi/bhu.png
new file mode 100644
index 00000000..7b432111
Binary files /dev/null and b/src/main/res/drawable-nodpi/bhu.png differ
diff --git a/src/main/res/drawable-nodpi/bir.png b/src/main/res/drawable-nodpi/bir.png
new file mode 100644
index 00000000..09ccebdc
Binary files /dev/null and b/src/main/res/drawable-nodpi/bir.png differ
diff --git a/src/main/res/drawable-nodpi/blr.png b/src/main/res/drawable-nodpi/blr.png
new file mode 100644
index 00000000..0d9dae23
Binary files /dev/null and b/src/main/res/drawable-nodpi/blr.png differ
diff --git a/src/main/res/drawable-nodpi/blz.png b/src/main/res/drawable-nodpi/blz.png
new file mode 100644
index 00000000..62bdaf2b
Binary files /dev/null and b/src/main/res/drawable-nodpi/blz.png differ
diff --git a/src/main/res/drawable-nodpi/bol.png b/src/main/res/drawable-nodpi/bol.png
new file mode 100644
index 00000000..66bccdc1
Binary files /dev/null and b/src/main/res/drawable-nodpi/bol.png differ
diff --git a/src/main/res/drawable-nodpi/bos.png b/src/main/res/drawable-nodpi/bos.png
new file mode 100644
index 00000000..30fd3c56
Binary files /dev/null and b/src/main/res/drawable-nodpi/bos.png differ
diff --git a/src/main/res/drawable-nodpi/bra.png b/src/main/res/drawable-nodpi/bra.png
new file mode 100644
index 00000000..1c40f764
Binary files /dev/null and b/src/main/res/drawable-nodpi/bra.png differ
diff --git a/src/main/res/drawable-nodpi/bru.png b/src/main/res/drawable-nodpi/bru.png
new file mode 100644
index 00000000..df98ac83
Binary files /dev/null and b/src/main/res/drawable-nodpi/bru.png differ
diff --git a/src/main/res/drawable-nodpi/bul.png b/src/main/res/drawable-nodpi/bul.png
new file mode 100644
index 00000000..fa002343
Binary files /dev/null and b/src/main/res/drawable-nodpi/bul.png differ
diff --git a/src/main/res/drawable-nodpi/can.png b/src/main/res/drawable-nodpi/can.png
new file mode 100644
index 00000000..e06aca5c
Binary files /dev/null and b/src/main/res/drawable-nodpi/can.png differ
diff --git a/src/main/res/drawable-nodpi/cey.png b/src/main/res/drawable-nodpi/cey.png
new file mode 100644
index 00000000..950d4a42
Binary files /dev/null and b/src/main/res/drawable-nodpi/cey.png differ
diff --git a/src/main/res/drawable-nodpi/chi.png b/src/main/res/drawable-nodpi/chi.png
new file mode 100644
index 00000000..dd76a082
Binary files /dev/null and b/src/main/res/drawable-nodpi/chi.png differ
diff --git a/src/main/res/drawable-nodpi/chn.png b/src/main/res/drawable-nodpi/chn.png
new file mode 100644
index 00000000..6dc25fa7
Binary files /dev/null and b/src/main/res/drawable-nodpi/chn.png differ
diff --git a/src/main/res/drawable-nodpi/col.png b/src/main/res/drawable-nodpi/col.png
new file mode 100644
index 00000000..2ad162e1
Binary files /dev/null and b/src/main/res/drawable-nodpi/col.png differ
diff --git a/src/main/res/drawable-nodpi/cos.png b/src/main/res/drawable-nodpi/cos.png
new file mode 100644
index 00000000..944e22f8
Binary files /dev/null and b/src/main/res/drawable-nodpi/cos.png differ
diff --git a/src/main/res/drawable-nodpi/cro.png b/src/main/res/drawable-nodpi/cro.png
new file mode 100644
index 00000000..9b2065bf
Binary files /dev/null and b/src/main/res/drawable-nodpi/cro.png differ
diff --git a/src/main/res/drawable-nodpi/cub.png b/src/main/res/drawable-nodpi/cub.png
new file mode 100644
index 00000000..a9035f4e
Binary files /dev/null and b/src/main/res/drawable-nodpi/cub.png differ
diff --git a/src/main/res/drawable-nodpi/cyp.png b/src/main/res/drawable-nodpi/cyp.png
new file mode 100644
index 00000000..f72b7989
Binary files /dev/null and b/src/main/res/drawable-nodpi/cyp.png differ
diff --git a/src/main/res/drawable-nodpi/cze.png b/src/main/res/drawable-nodpi/cze.png
new file mode 100644
index 00000000..035dc851
Binary files /dev/null and b/src/main/res/drawable-nodpi/cze.png differ
diff --git a/src/main/res/drawable-nodpi/den.png b/src/main/res/drawable-nodpi/den.png
new file mode 100644
index 00000000..62e4d3fb
Binary files /dev/null and b/src/main/res/drawable-nodpi/den.png differ
diff --git a/src/main/res/drawable-nodpi/dom.png b/src/main/res/drawable-nodpi/dom.png
new file mode 100644
index 00000000..df178b58
Binary files /dev/null and b/src/main/res/drawable-nodpi/dom.png differ
diff --git a/src/main/res/drawable-nodpi/ecu.png b/src/main/res/drawable-nodpi/ecu.png
new file mode 100644
index 00000000..2b4b2303
Binary files /dev/null and b/src/main/res/drawable-nodpi/ecu.png differ
diff --git a/src/main/res/drawable-nodpi/egy.png b/src/main/res/drawable-nodpi/egy.png
new file mode 100644
index 00000000..242af4ec
Binary files /dev/null and b/src/main/res/drawable-nodpi/egy.png differ
diff --git a/src/main/res/drawable-nodpi/esp.png b/src/main/res/drawable-nodpi/esp.png
new file mode 100644
index 00000000..fbb3f38d
Binary files /dev/null and b/src/main/res/drawable-nodpi/esp.png differ
diff --git a/src/main/res/drawable-nodpi/est.png b/src/main/res/drawable-nodpi/est.png
new file mode 100644
index 00000000..0c41b6e7
Binary files /dev/null and b/src/main/res/drawable-nodpi/est.png differ
diff --git a/src/main/res/drawable-nodpi/fin.png b/src/main/res/drawable-nodpi/fin.png
new file mode 100644
index 00000000..0368022e
Binary files /dev/null and b/src/main/res/drawable-nodpi/fin.png differ
diff --git a/src/main/res/drawable-nodpi/fra.png b/src/main/res/drawable-nodpi/fra.png
new file mode 100644
index 00000000..006ef26b
Binary files /dev/null and b/src/main/res/drawable-nodpi/fra.png differ
diff --git a/src/main/res/drawable-nodpi/geo.png b/src/main/res/drawable-nodpi/geo.png
new file mode 100644
index 00000000..04f6441b
Binary files /dev/null and b/src/main/res/drawable-nodpi/geo.png differ
diff --git a/src/main/res/drawable-nodpi/ger.png b/src/main/res/drawable-nodpi/ger.png
new file mode 100644
index 00000000..9306c0f3
Binary files /dev/null and b/src/main/res/drawable-nodpi/ger.png differ
diff --git a/src/main/res/drawable-nodpi/gre.png b/src/main/res/drawable-nodpi/gre.png
new file mode 100644
index 00000000..71983801
Binary files /dev/null and b/src/main/res/drawable-nodpi/gre.png differ
diff --git a/src/main/res/drawable-nodpi/gua.png b/src/main/res/drawable-nodpi/gua.png
new file mode 100644
index 00000000..3f72544c
Binary files /dev/null and b/src/main/res/drawable-nodpi/gua.png differ
diff --git a/src/main/res/drawable-nodpi/gum.png b/src/main/res/drawable-nodpi/gum.png
new file mode 100644
index 00000000..416c2fae
Binary files /dev/null and b/src/main/res/drawable-nodpi/gum.png differ
diff --git a/src/main/res/drawable-nodpi/guy.png b/src/main/res/drawable-nodpi/guy.png
new file mode 100644
index 00000000..4d6eb645
Binary files /dev/null and b/src/main/res/drawable-nodpi/guy.png differ
diff --git a/src/main/res/drawable-nodpi/hai.png b/src/main/res/drawable-nodpi/hai.png
new file mode 100644
index 00000000..1784c898
Binary files /dev/null and b/src/main/res/drawable-nodpi/hai.png differ
diff --git a/src/main/res/drawable-nodpi/hk.png b/src/main/res/drawable-nodpi/hk.png
new file mode 100644
index 00000000..5129c360
Binary files /dev/null and b/src/main/res/drawable-nodpi/hk.png differ
diff --git a/src/main/res/drawable-nodpi/hon.png b/src/main/res/drawable-nodpi/hon.png
new file mode 100644
index 00000000..27340013
Binary files /dev/null and b/src/main/res/drawable-nodpi/hon.png differ
diff --git a/src/main/res/drawable-nodpi/hun.png b/src/main/res/drawable-nodpi/hun.png
new file mode 100644
index 00000000..9e4c8e5c
Binary files /dev/null and b/src/main/res/drawable-nodpi/hun.png differ
diff --git a/src/main/res/drawable-nodpi/ina.png b/src/main/res/drawable-nodpi/ina.png
new file mode 100644
index 00000000..c473b55d
Binary files /dev/null and b/src/main/res/drawable-nodpi/ina.png differ
diff --git a/src/main/res/drawable-nodpi/ind.png b/src/main/res/drawable-nodpi/ind.png
new file mode 100644
index 00000000..2e85fb7a
Binary files /dev/null and b/src/main/res/drawable-nodpi/ind.png differ
diff --git a/src/main/res/drawable-nodpi/irl.png b/src/main/res/drawable-nodpi/irl.png
new file mode 100644
index 00000000..1cdb87d4
Binary files /dev/null and b/src/main/res/drawable-nodpi/irl.png differ
diff --git a/src/main/res/drawable-nodpi/irn.png b/src/main/res/drawable-nodpi/irn.png
new file mode 100644
index 00000000..7b918e45
Binary files /dev/null and b/src/main/res/drawable-nodpi/irn.png differ
diff --git a/src/main/res/drawable-nodpi/irq.png b/src/main/res/drawable-nodpi/irq.png
new file mode 100644
index 00000000..143e7090
Binary files /dev/null and b/src/main/res/drawable-nodpi/irq.png differ
diff --git a/src/main/res/drawable-nodpi/isl.png b/src/main/res/drawable-nodpi/isl.png
new file mode 100644
index 00000000..bc49665e
Binary files /dev/null and b/src/main/res/drawable-nodpi/isl.png differ
diff --git a/src/main/res/drawable-nodpi/isr.png b/src/main/res/drawable-nodpi/isr.png
new file mode 100644
index 00000000..efb60f33
Binary files /dev/null and b/src/main/res/drawable-nodpi/isr.png differ
diff --git a/src/main/res/drawable-nodpi/ita.png b/src/main/res/drawable-nodpi/ita.png
new file mode 100644
index 00000000..242cfa07
Binary files /dev/null and b/src/main/res/drawable-nodpi/ita.png differ
diff --git a/src/main/res/drawable-nodpi/jam.png b/src/main/res/drawable-nodpi/jam.png
new file mode 100644
index 00000000..a2150ebb
Binary files /dev/null and b/src/main/res/drawable-nodpi/jam.png differ
diff --git a/src/main/res/drawable-nodpi/jap.png b/src/main/res/drawable-nodpi/jap.png
new file mode 100644
index 00000000..9d62511e
Binary files /dev/null and b/src/main/res/drawable-nodpi/jap.png differ
diff --git a/src/main/res/drawable-nodpi/jor.png b/src/main/res/drawable-nodpi/jor.png
new file mode 100644
index 00000000..5bb8ab22
Binary files /dev/null and b/src/main/res/drawable-nodpi/jor.png differ
diff --git a/src/main/res/drawable-nodpi/kaz.png b/src/main/res/drawable-nodpi/kaz.png
new file mode 100644
index 00000000..37899069
Binary files /dev/null and b/src/main/res/drawable-nodpi/kaz.png differ
diff --git a/src/main/res/drawable-nodpi/kor.png b/src/main/res/drawable-nodpi/kor.png
new file mode 100644
index 00000000..ed4241f6
Binary files /dev/null and b/src/main/res/drawable-nodpi/kor.png differ
diff --git a/src/main/res/drawable-nodpi/kuw.png b/src/main/res/drawable-nodpi/kuw.png
new file mode 100644
index 00000000..e905c39b
Binary files /dev/null and b/src/main/res/drawable-nodpi/kuw.png differ
diff --git a/src/main/res/drawable-nodpi/kyr.png b/src/main/res/drawable-nodpi/kyr.png
new file mode 100644
index 00000000..31b5435c
Binary files /dev/null and b/src/main/res/drawable-nodpi/kyr.png differ
diff --git a/src/main/res/drawable-nodpi/lao.png b/src/main/res/drawable-nodpi/lao.png
new file mode 100644
index 00000000..d9ec7fbe
Binary files /dev/null and b/src/main/res/drawable-nodpi/lao.png differ
diff --git a/src/main/res/drawable-nodpi/lat.png b/src/main/res/drawable-nodpi/lat.png
new file mode 100644
index 00000000..d79dff14
Binary files /dev/null and b/src/main/res/drawable-nodpi/lat.png differ
diff --git a/src/main/res/drawable-nodpi/leb.png b/src/main/res/drawable-nodpi/leb.png
new file mode 100644
index 00000000..300bd007
Binary files /dev/null and b/src/main/res/drawable-nodpi/leb.png differ
diff --git a/src/main/res/drawable-nodpi/lib.png b/src/main/res/drawable-nodpi/lib.png
new file mode 100644
index 00000000..a7e0ef8a
Binary files /dev/null and b/src/main/res/drawable-nodpi/lib.png differ
diff --git a/src/main/res/drawable-nodpi/lie.png b/src/main/res/drawable-nodpi/lie.png
new file mode 100644
index 00000000..b7a8afbd
Binary files /dev/null and b/src/main/res/drawable-nodpi/lie.png differ
diff --git a/src/main/res/drawable-nodpi/lit.png b/src/main/res/drawable-nodpi/lit.png
new file mode 100644
index 00000000..de10c6d2
Binary files /dev/null and b/src/main/res/drawable-nodpi/lit.png differ
diff --git a/src/main/res/drawable-nodpi/lux.png b/src/main/res/drawable-nodpi/lux.png
new file mode 100644
index 00000000..13228518
Binary files /dev/null and b/src/main/res/drawable-nodpi/lux.png differ
diff --git a/src/main/res/drawable-nodpi/mac.png b/src/main/res/drawable-nodpi/mac.png
new file mode 100644
index 00000000..db45de8b
Binary files /dev/null and b/src/main/res/drawable-nodpi/mac.png differ
diff --git a/src/main/res/drawable-nodpi/mal.png b/src/main/res/drawable-nodpi/mal.png
new file mode 100644
index 00000000..3fad4410
Binary files /dev/null and b/src/main/res/drawable-nodpi/mal.png differ
diff --git a/src/main/res/drawable-nodpi/mco.png b/src/main/res/drawable-nodpi/mco.png
new file mode 100644
index 00000000..c473b55d
Binary files /dev/null and b/src/main/res/drawable-nodpi/mco.png differ
diff --git a/src/main/res/drawable-nodpi/mda.png b/src/main/res/drawable-nodpi/mda.png
new file mode 100644
index 00000000..1edfc892
Binary files /dev/null and b/src/main/res/drawable-nodpi/mda.png differ
diff --git a/src/main/res/drawable-nodpi/mex.png b/src/main/res/drawable-nodpi/mex.png
new file mode 100644
index 00000000..4872e99f
Binary files /dev/null and b/src/main/res/drawable-nodpi/mex.png differ
diff --git a/src/main/res/drawable-nodpi/miq.png b/src/main/res/drawable-nodpi/miq.png
new file mode 100644
index 00000000..06570ca4
Binary files /dev/null and b/src/main/res/drawable-nodpi/miq.png differ
diff --git a/src/main/res/drawable-nodpi/mld.png b/src/main/res/drawable-nodpi/mld.png
new file mode 100644
index 00000000..7f004fc7
Binary files /dev/null and b/src/main/res/drawable-nodpi/mld.png differ
diff --git a/src/main/res/drawable-nodpi/mly.png b/src/main/res/drawable-nodpi/mly.png
new file mode 100644
index 00000000..f9ea8b2f
Binary files /dev/null and b/src/main/res/drawable-nodpi/mly.png differ
diff --git a/src/main/res/drawable-nodpi/mna.png b/src/main/res/drawable-nodpi/mna.png
new file mode 100644
index 00000000..a59c3233
Binary files /dev/null and b/src/main/res/drawable-nodpi/mna.png differ
diff --git a/src/main/res/drawable-nodpi/mnt.png b/src/main/res/drawable-nodpi/mnt.png
new file mode 100644
index 00000000..87f9bcf8
Binary files /dev/null and b/src/main/res/drawable-nodpi/mnt.png differ
diff --git a/src/main/res/drawable-nodpi/mon.png b/src/main/res/drawable-nodpi/mon.png
new file mode 100644
index 00000000..2fd1ae71
Binary files /dev/null and b/src/main/res/drawable-nodpi/mon.png differ
diff --git a/src/main/res/drawable-nodpi/mor.png b/src/main/res/drawable-nodpi/mor.png
new file mode 100644
index 00000000..dd18c3da
Binary files /dev/null and b/src/main/res/drawable-nodpi/mor.png differ
diff --git a/src/main/res/drawable-nodpi/ned.png b/src/main/res/drawable-nodpi/ned.png
new file mode 100644
index 00000000..c057a4b6
Binary files /dev/null and b/src/main/res/drawable-nodpi/ned.png differ
diff --git a/src/main/res/drawable-nodpi/nep.png b/src/main/res/drawable-nodpi/nep.png
new file mode 100644
index 00000000..df7ee60d
Binary files /dev/null and b/src/main/res/drawable-nodpi/nep.png differ
diff --git a/src/main/res/drawable-nodpi/nic.png b/src/main/res/drawable-nodpi/nic.png
new file mode 100644
index 00000000..b5092259
Binary files /dev/null and b/src/main/res/drawable-nodpi/nic.png differ
diff --git a/src/main/res/drawable-nodpi/nig.png b/src/main/res/drawable-nodpi/nig.png
new file mode 100644
index 00000000..bba41ff8
Binary files /dev/null and b/src/main/res/drawable-nodpi/nig.png differ
diff --git a/src/main/res/drawable-nodpi/nor.png b/src/main/res/drawable-nodpi/nor.png
new file mode 100644
index 00000000..5812bcb4
Binary files /dev/null and b/src/main/res/drawable-nodpi/nor.png differ
diff --git a/src/main/res/drawable-nodpi/nz.png b/src/main/res/drawable-nodpi/nz.png
new file mode 100644
index 00000000..b4a096e7
Binary files /dev/null and b/src/main/res/drawable-nodpi/nz.png differ
diff --git a/src/main/res/drawable-nodpi/omn.png b/src/main/res/drawable-nodpi/omn.png
new file mode 100644
index 00000000..c9eb8c6f
Binary files /dev/null and b/src/main/res/drawable-nodpi/omn.png differ
diff --git a/src/main/res/drawable-nodpi/pak.png b/src/main/res/drawable-nodpi/pak.png
new file mode 100644
index 00000000..cd5f87b5
Binary files /dev/null and b/src/main/res/drawable-nodpi/pak.png differ
diff --git a/src/main/res/drawable-nodpi/pan.png b/src/main/res/drawable-nodpi/pan.png
new file mode 100644
index 00000000..2ad76338
Binary files /dev/null and b/src/main/res/drawable-nodpi/pan.png differ
diff --git a/src/main/res/drawable-nodpi/pap.png b/src/main/res/drawable-nodpi/pap.png
new file mode 100644
index 00000000..85eb3163
Binary files /dev/null and b/src/main/res/drawable-nodpi/pap.png differ
diff --git a/src/main/res/drawable-nodpi/par.png b/src/main/res/drawable-nodpi/par.png
new file mode 100644
index 00000000..f9c955e4
Binary files /dev/null and b/src/main/res/drawable-nodpi/par.png differ
diff --git a/src/main/res/drawable-nodpi/per.png b/src/main/res/drawable-nodpi/per.png
new file mode 100644
index 00000000..e8269e6b
Binary files /dev/null and b/src/main/res/drawable-nodpi/per.png differ
diff --git a/src/main/res/drawable-nodpi/phi.png b/src/main/res/drawable-nodpi/phi.png
new file mode 100644
index 00000000..92c88363
Binary files /dev/null and b/src/main/res/drawable-nodpi/phi.png differ
diff --git a/src/main/res/drawable-nodpi/pol.png b/src/main/res/drawable-nodpi/pol.png
new file mode 100644
index 00000000..f2fc06c5
Binary files /dev/null and b/src/main/res/drawable-nodpi/pol.png differ
diff --git a/src/main/res/drawable-nodpi/por.png b/src/main/res/drawable-nodpi/por.png
new file mode 100644
index 00000000..ca3a57a9
Binary files /dev/null and b/src/main/res/drawable-nodpi/por.png differ
diff --git a/src/main/res/drawable-nodpi/prk.png b/src/main/res/drawable-nodpi/prk.png
new file mode 100644
index 00000000..831e215e
Binary files /dev/null and b/src/main/res/drawable-nodpi/prk.png differ
diff --git a/src/main/res/drawable-nodpi/qat.png b/src/main/res/drawable-nodpi/qat.png
new file mode 100644
index 00000000..703c38b2
Binary files /dev/null and b/src/main/res/drawable-nodpi/qat.png differ
diff --git a/src/main/res/drawable-nodpi/rom.png b/src/main/res/drawable-nodpi/rom.png
new file mode 100644
index 00000000..8775c935
Binary files /dev/null and b/src/main/res/drawable-nodpi/rom.png differ
diff --git a/src/main/res/drawable-nodpi/rus.png b/src/main/res/drawable-nodpi/rus.png
new file mode 100644
index 00000000..b1291206
Binary files /dev/null and b/src/main/res/drawable-nodpi/rus.png differ
diff --git a/src/main/res/drawable-nodpi/sal.png b/src/main/res/drawable-nodpi/sal.png
new file mode 100644
index 00000000..2b041420
Binary files /dev/null and b/src/main/res/drawable-nodpi/sal.png differ
diff --git a/src/main/res/drawable-nodpi/sar.png b/src/main/res/drawable-nodpi/sar.png
new file mode 100644
index 00000000..2e71ddd5
Binary files /dev/null and b/src/main/res/drawable-nodpi/sar.png differ
diff --git a/src/main/res/drawable-nodpi/sin.png b/src/main/res/drawable-nodpi/sin.png
new file mode 100644
index 00000000..03d7458f
Binary files /dev/null and b/src/main/res/drawable-nodpi/sin.png differ
diff --git a/src/main/res/drawable-nodpi/slo.png b/src/main/res/drawable-nodpi/slo.png
new file mode 100644
index 00000000..02cd892d
Binary files /dev/null and b/src/main/res/drawable-nodpi/slo.png differ
diff --git a/src/main/res/drawable-nodpi/sma.png b/src/main/res/drawable-nodpi/sma.png
new file mode 100644
index 00000000..11729e67
Binary files /dev/null and b/src/main/res/drawable-nodpi/sma.png differ
diff --git a/src/main/res/drawable-nodpi/srb.png b/src/main/res/drawable-nodpi/srb.png
new file mode 100644
index 00000000..75834130
Binary files /dev/null and b/src/main/res/drawable-nodpi/srb.png differ
diff --git a/src/main/res/drawable-nodpi/sur.png b/src/main/res/drawable-nodpi/sur.png
new file mode 100644
index 00000000..db84bbd6
Binary files /dev/null and b/src/main/res/drawable-nodpi/sur.png differ
diff --git a/src/main/res/drawable-nodpi/svk.png b/src/main/res/drawable-nodpi/svk.png
new file mode 100644
index 00000000..a67d1be9
Binary files /dev/null and b/src/main/res/drawable-nodpi/svk.png differ
diff --git a/src/main/res/drawable-nodpi/swe.png b/src/main/res/drawable-nodpi/swe.png
new file mode 100644
index 00000000..02d667b7
Binary files /dev/null and b/src/main/res/drawable-nodpi/swe.png differ
diff --git a/src/main/res/drawable-nodpi/swi.png b/src/main/res/drawable-nodpi/swi.png
new file mode 100644
index 00000000..0820cacf
Binary files /dev/null and b/src/main/res/drawable-nodpi/swi.png differ
diff --git a/src/main/res/drawable-nodpi/syr.png b/src/main/res/drawable-nodpi/syr.png
new file mode 100644
index 00000000..fa6d0ee0
Binary files /dev/null and b/src/main/res/drawable-nodpi/syr.png differ
diff --git a/src/main/res/drawable-nodpi/tha.png b/src/main/res/drawable-nodpi/tha.png
new file mode 100644
index 00000000..969ee5da
Binary files /dev/null and b/src/main/res/drawable-nodpi/tha.png differ
diff --git a/src/main/res/drawable-nodpi/tjk.png b/src/main/res/drawable-nodpi/tjk.png
new file mode 100644
index 00000000..41af7288
Binary files /dev/null and b/src/main/res/drawable-nodpi/tjk.png differ
diff --git a/src/main/res/drawable-nodpi/tkm.png b/src/main/res/drawable-nodpi/tkm.png
new file mode 100644
index 00000000..43084817
Binary files /dev/null and b/src/main/res/drawable-nodpi/tkm.png differ
diff --git a/src/main/res/drawable-nodpi/tun.png b/src/main/res/drawable-nodpi/tun.png
new file mode 100644
index 00000000..1f21d35d
Binary files /dev/null and b/src/main/res/drawable-nodpi/tun.png differ
diff --git a/src/main/res/drawable-nodpi/tur.png b/src/main/res/drawable-nodpi/tur.png
new file mode 100644
index 00000000..5f4c4d89
Binary files /dev/null and b/src/main/res/drawable-nodpi/tur.png differ
diff --git a/src/main/res/drawable-nodpi/twn.png b/src/main/res/drawable-nodpi/twn.png
new file mode 100644
index 00000000..09ca3687
Binary files /dev/null and b/src/main/res/drawable-nodpi/twn.png differ
diff --git a/src/main/res/drawable-nodpi/uae.png b/src/main/res/drawable-nodpi/uae.png
new file mode 100644
index 00000000..f9e73ee1
Binary files /dev/null and b/src/main/res/drawable-nodpi/uae.png differ
diff --git a/src/main/res/drawable-nodpi/uk.png b/src/main/res/drawable-nodpi/uk.png
new file mode 100644
index 00000000..4a6a762c
Binary files /dev/null and b/src/main/res/drawable-nodpi/uk.png differ
diff --git a/src/main/res/drawable-nodpi/ukr.png b/src/main/res/drawable-nodpi/ukr.png
new file mode 100644
index 00000000..22f0ccc2
Binary files /dev/null and b/src/main/res/drawable-nodpi/ukr.png differ
diff --git a/src/main/res/drawable-nodpi/unk.png b/src/main/res/drawable-nodpi/unk.png
new file mode 100644
index 00000000..e7efd949
Binary files /dev/null and b/src/main/res/drawable-nodpi/unk.png differ
diff --git a/src/main/res/drawable-nodpi/uru.png b/src/main/res/drawable-nodpi/uru.png
new file mode 100644
index 00000000..a4e637a2
Binary files /dev/null and b/src/main/res/drawable-nodpi/uru.png differ
diff --git a/src/main/res/drawable-nodpi/usa.png b/src/main/res/drawable-nodpi/usa.png
new file mode 100644
index 00000000..10f433df
Binary files /dev/null and b/src/main/res/drawable-nodpi/usa.png differ
diff --git a/src/main/res/drawable-nodpi/uzb.png b/src/main/res/drawable-nodpi/uzb.png
new file mode 100644
index 00000000..c9363259
Binary files /dev/null and b/src/main/res/drawable-nodpi/uzb.png differ
diff --git a/src/main/res/drawable-nodpi/ven.png b/src/main/res/drawable-nodpi/ven.png
new file mode 100644
index 00000000..0a9232d0
Binary files /dev/null and b/src/main/res/drawable-nodpi/ven.png differ
diff --git a/src/main/res/drawable-nodpi/vie.png b/src/main/res/drawable-nodpi/vie.png
new file mode 100644
index 00000000..1256e365
Binary files /dev/null and b/src/main/res/drawable-nodpi/vie.png differ
diff --git a/src/main/res/drawable-nodpi/yem.png b/src/main/res/drawable-nodpi/yem.png
new file mode 100644
index 00000000..0b23f0ad
Binary files /dev/null and b/src/main/res/drawable-nodpi/yem.png differ
diff --git a/src/main/res/drawable-nodpi/za.png b/src/main/res/drawable-nodpi/za.png
new file mode 100644
index 00000000..dd6b8c3b
Binary files /dev/null and b/src/main/res/drawable-nodpi/za.png differ
diff --git a/src/main/res/layout/level_row.xml b/src/main/res/layout/level_row.xml
index 7c2e1349..08870523 100644
--- a/src/main/res/layout/level_row.xml
+++ b/src/main/res/layout/level_row.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="32dp"
+    android:layout_height="50dp"
+    android:paddingBottom="2dp"
+    android:paddingTop="2dp"
     android:orientation="horizontal" >
 
-    <TextView
+    <ImageView
         android:id="@+id/level_row_country"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/src/main/res/layout/scores.xml b/src/main/res/layout/scores.xml
index d70ded5e..9fdc0030 100644
--- a/src/main/res/layout/scores.xml
+++ b/src/main/res/layout/scores.xml
@@ -12,7 +12,7 @@
         android:theme="@style/Theme.AppCompat.NoActionBar">
     </android.support.design.widget.TabLayout>
 
-    <android.support.v4.view.ViewPager
+    <org.distorted.magic.RubikScoresViewPager
         android:id="@+id/viewpager"
         android:layout_width="match_parent"
         android:layout_height="0dp"