Show the size of remote dictionaries

This is an important information that users might want to know before
clicking download.

Author: Julow

res/layout/dictionaries_activity.xml

@@ -2,6 +2,6 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="true" android:fitsSystemWindows="true">
   <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical">
     <TextView style="@style/paragraph" android:text="@string/dictionaries_from_internet"/>
-    <juloo.keyboard2.dict.DictionaryListView style="@style/dictionaryListView"/>
+    <juloo.keyboard2.dict.DictionaryListView style="@style/dictionary_list_view"/>
   </LinearLayout>
 </ScrollView>

res/layout/dictionary_download_item.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/dictionaryDownloadItem">
-  <TextView android:id="@+id/dictionary_download_locale" style="@style/dictionaryDownloadText"/>
-  <View android:id="@+id/dictionary_download_button" style="@style/dictionaryDownloadButton"/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" style="@style/dictionary_download_item">
+  <TextView android:id="@+id/dictionary_download_locale" style="@style/dictionary_download_locale"/>
+  <TextView android:id="@+id/dictionary_download_size" style="@style/dictionary_download_size"/>
+  <View android:id="@+id/dictionary_download_button" style="@style/dictionary_download_button" android:background="@drawable/ic_download"/>
 </LinearLayout>

res/values/styles.xml

@@ -93,28 +93,37 @@
     <item name="android:orientation">horizontal</item>
   </style>
   <!-- Dictionaries activity -->
-  <style name="dictionaryListView">
+  <style name="dictionary_list_view">
     <item name="android:layout_width">fill_parent</item>
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_marginVertical">24dp</item>
   </style>
-  <style name="dictionaryDownloadItem">
+  <style name="dictionary_download_item">
     <item name="android:orientation">horizontal</item>
     <item name="android:layout_width">fill_parent</item>
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_marginVertical">8dp</item>
-    <item name="android:layout_gravity">center_vertical</item>
+    <item name="android:gravity">center</item>
+    <item name="android:paddingHorizontal">48dp</item>
   </style>
-  <style name="dictionaryDownloadText">
+  <style name="dictionary_download_locale">
     <item name="android:layout_weight">1</item>
     <item name="android:layout_width">fill_parent</item>
     <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_marginHorizontal">48dp</item>
+    <item name="android:textSize">16sp</item>
+  </style>
+  <style name="dictionary_download_size">
+    <item name="android:layout_weight">0</item>
+    <item name="android:layout_width">wrap_content</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:layout_marginRight">8dp</item>
+    <item name="android:textSize">12sp</item>
   </style>
-  <style name="dictionaryDownloadButton">
+  <style name="dictionary_download_button">
     <item name="android:layout_width">24dp</item>
     <item name="android:layout_height">24dp</item>
-    <item name="android:layout_marginHorizontal">48dp</item>
+    <item name="android:backgroundTint">@android:color/primary_text_dark</item>
+    <item name="android:backgroundTintMode">src_in</item>
   </style>
   <style name="appTheme" parent="@android:style/Theme.DeviceDefault.DayNight"/>
   <style name="settingsTheme" parent="appTheme">

srcs/juloo.keyboard2/dict/DictionaryListView.java

@@ -10,6 +10,7 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLConnection;
+import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -120,8 +121,11 @@ public DictView(Context ctx, SupportedDictionaries d, DownloadBtnListener on_cli
     {
       view = View.inflate(ctx, R.layout.dictionary_download_item, null);
       desc = d;
+      float size_mb = d.size / 1048576.f;
       ((TextView)view.findViewById(R.id.dictionary_download_locale))
         .setText(ctx.getString(d.name_resource));
+      ((TextView)view.findViewById(R.id.dictionary_download_size))
+        .setText(NumberFormat.getInstance().format(size_mb) + "MB");
       download_button = view.findViewById(R.id.dictionary_download_button);
       download_button.setOnClickListener(on_click);
     }

srcs/juloo.keyboard2/dict/SupportedDictionaries.java

@@ -6,15 +6,16 @@ public enum SupportedDictionaries
 {
   /** Enumeration of the supported dictionaries. */
 
-  FR("fr", R.string.dict_name_fr);
+  FR("fr", R.string.dict_name_fr, 1168721);
 
   /** Associated information. */
 
   public final String locale; /** Locale that matches this dictionary. */
   public final int name_resource; /** Display name. */
+  public final int size; /** Size in bytes of the dictionary file. */
 
-  SupportedDictionaries(String l, int r)
-  { locale = l; name_resource = r; }
+  SupportedDictionaries(String l, int r, int s)
+  { locale = l; name_resource = r; size = s; }
 
   /** Name used in preferences, URLs and file names. */
   public String internal_name() { return locale; }