nani/app

Julien LepillerSun Apr 26 21:55:46+0200 2020

5ff162a

Add radical selection to main app view

app/src/main/java/eu/lepiller/nani/MainActivity.java

 import se.fekete.furiganatextview.furiganaview.FuriganaTextView;
 public class MainActivity extends AppCompatActivity implements OnTaskCompleted<SearchResult> {
     private LinearLayout result_view;
     private LinearLayout result_view, result_layout;
     private Button search_button;
     private TextView feedback_text;
     private EditText search_form;
     private static ArrayList<Result> savedResults;
     private RadicalSelectorView radical_selector;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         search_button = findViewById(R.id.search_button);
         result_view = findViewById(R.id.results_view);
         result_layout = findViewById(R.id.result_layout);
         feedback_text = findViewById(R.id.feedback);
         search_form = findViewById(R.id.search_form);
         radical_selector = findViewById(R.id.radical_selector);
         Button radical_button = findViewById(R.id.radical_button);
         try {
             radical_selector.setDictionary(DictionaryFactory.getRadicalDictionary(getApplicationContext()));
         } catch (NoDictionaryException e) {
             e.printStackTrace();
         }
         search_button.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 radical_selector.setVisibility(View.INVISIBLE);
                 result_layout.setVisibility(View.VISIBLE);
                 String text = search_form.getText().toString();
                 if (text.isEmpty()) {
                     Snackbar.make(findViewById(R.id.search_form), getString(R.string.no_search), Snackbar.LENGTH_LONG).show();
             }
         });
         radical_button.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 try {
                     DictionaryFactory.getRadicalDictionary(getApplicationContext());
                     radical_selector.setVisibility(View.VISIBLE);
                     result_layout.setVisibility(View.INVISIBLE);
                 } catch (NoDictionaryException e) {
                     Snackbar.make(findViewById(R.id.search_form), getString(R.string.no_radical_dict), Snackbar.LENGTH_LONG).show();
                 }
             }
         });
         radical_selector.setOnCloseEventListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 radical_selector.setVisibility(View.INVISIBLE);
                 result_layout.setVisibility(View.VISIBLE);
             }
         });
         radical_selector.setOnClickEventListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 String k = ((Button)v).getText().toString();
                 search_form.append(k);
             }
         });
         if(savedResults != null) {
             showResults(savedResults);
         }
             }
             if(searchResult == null || searchResult.size() == 0) {
             if(searchResult.size() == 0) {
                 MojiConverter converter = new MojiConverter();
                 try {
                     searchResult = DictionaryFactory.search(converter.convertRomajiToHiragana(text));

app/src/main/java/eu/lepiller/nani/RadicalSelectorView.java

 package eu.lepiller.nani;
 public class RadicalSelectorView {
 import android.content.Context;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.TableLayout;
 import android.widget.TableRow;
 import android.widget.TextView;
 import android.widget.ToggleButton;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import eu.lepiller.nani.dictionary.IncompatibleFormatException;
 import eu.lepiller.nani.dictionary.RadicalDict;
 public class RadicalSelectorView extends LinearLayout {
     private Button close_button;
     private LinearLayout kanji_row1, kanji_row2;
     private TableLayout radical_table;
     private List<String> selected = new ArrayList<>();
     View.OnClickListener kanjiSelectionListener;
     RadicalDict dictionary;
     public RadicalSelectorView(Context context) {
         this(context, null, 0);
     }
     public RadicalSelectorView(Context context, AttributeSet attrs) {
         this(context, attrs, 0);
     }
     public RadicalSelectorView(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
         LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         inflater.inflate(R.layout.content_radicals, this);
         this.setOrientation(VERTICAL);
     }
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
         close_button = findViewById(R.id.close_button);
         kanji_row1 = findViewById(R.id.kanji_row1);
         kanji_row2 = findViewById(R.id.kanji_row2);
         radical_table = findViewById(R.id.radical_table);
     }
     public void setDictionary(RadicalDict dict) {
         dictionary = dict;
         try {
             Map<Integer, List<String>> radicals = dict.getAllRadicals();
             for(int stroke: radicals.keySet()) {
                 TableRow row = new TableRow(getContext());
                 TextView strokeView = new TextView(getContext());
                 strokeView.setText(Integer.toString(stroke));
                 row.addView(strokeView);
                 List<String> lst = radicals.get(stroke);
                 for(final String radical: lst) {
                     ToggleButton radicalButton = new ToggleButton(getContext());
                     radicalButton.setTextOff(radical);
                     radicalButton.setTextOn(radical);
                     radicalButton.setText(radical);
                     radicalButton.setOnClickListener(new OnClickListener() {
                         @Override
                         public void onClick(View v) {
                             boolean checked = ((ToggleButton) v).isChecked();
                             if(checked) {
                                 selected.add(radical);
                             } else {
                                 selected.remove(radical);
                             }
                             updateSelection();
                             updateRadicals();
                         }
                     });
                     row.addView(radicalButton);
                 }
                 radical_table.addView(row);
             }
         } catch(IncompatibleFormatException e) {
             e.printStackTrace();
         }
     }
     public void setOnCloseEventListener(View.OnClickListener listener) {
         close_button.setOnClickListener(listener);
     }
     public void setOnClickEventListener(View.OnClickListener listener) {
         kanjiSelectionListener = listener;
     }
     public void updateSelection() {
         try {
             Map<Integer, List<String>> kanji = dictionary.match(selected);
             LinearLayout row = kanji_row1;
             kanji_row1.removeAllViews();
             kanji_row2.removeAllViews();
             if(kanji == null)
                 return;
             int total = 0;
             int number = 0;
             for (int stroke : kanji.keySet()) {
                 total += kanji.get(stroke).size();
             }
             for (int stroke : kanji.keySet()) {
                 TextView strokeView = new TextView(getContext());
                 strokeView.setText(Integer.toString(stroke));
                 row.addView(strokeView);
                 for (String k : kanji.get(stroke)) {
                     number++;
                     Button kanji_button = new Button(getContext());
                     kanji_button.setText(k);
                     kanji_button.setOnClickListener(kanjiSelectionListener);
                     row.addView(kanji_button);
                     if (number > total / 2)
                         row = kanji_row2;
                 }
             }
         } catch (IncompatibleFormatException e) {
             e.printStackTrace();
         }
     }
     private void updateRadicals() {
         try {
             Set<String> available = dictionary.availableRadicals(selected);
             Log.v("SELECTOR", Integer.toString(radical_table.getChildCount()));
             for(int row = 0; row < radical_table.getChildCount(); row++) {
                 TableRow r = (TableRow) radical_table.getChildAt(row);
                 for(int col = 0; col < r.getChildCount(); col++) {
                     View child = r.getChildAt(col);
                     if(child instanceof ToggleButton) {
                         child.setEnabled(available == null || available.contains(((ToggleButton) child).getText().toString()));
                     }
                 }
             }
         } catch(IncompatibleFormatException e) {
             e.printStackTrace();
         }
     }
 }

app/src/main/java/eu/lepiller/nani/dictionary/DictionaryFactory.java

         return dictionaries;
     }
     public static RadicalDict getRadicalDictionary(Context context) throws NoDictionaryException {
         if(instance == null)
             instance = new DictionaryFactory(context);
         for(Dictionary d: dictionaries) {
             if(d.isDownloaded() && d instanceof RadicalDict) {
                 return (RadicalDict) d;
             }
         }
         throw new NoDictionaryException();
     }
 }

app/src/main/java/eu/lepiller/nani/dictionary/RadicalDict.java

 package eu.lepiller.nani.dictionary;
 import android.util.Log;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 public class RadicalDict extends FileDictionary {
     private final Map<String, Integer> strokeCount = new HashMap<>();
     private final Map<String, Integer> radicalStrokeCount = new HashMap<>();
     private final Map<String, String[]> radicals = new HashMap<>();
     private final Map<String, List<String>> radicals = new HashMap<>();
     final private static String TAG = "RADK";
         radicalStrokeCount.clear();
         radicals.clear();
     }
     private long fillStrokeCount(RandomAccessFile file) throws IOException{
     private void fillStrokeCount(RandomAccessFile file) throws IOException{
         int size = file.readShort();
         for(int i=0; i<size; i++) {
             String radical = getString(file);
             String kanji = getString(file);
             int stroke = file.readByte();
             strokeCount.put(radical, stroke);
             strokeCount.put(kanji, stroke);
         }
         return file.getFilePointer();
     }
     private long fillRadicalStrokeCount(RandomAccessFile file) throws IOException {
     private void fillRadicalStrokeCount(RandomAccessFile file) throws IOException {
         int size = file.readShort();
         for(int i=0; i<size; i++) {
             String radical = getString(file);
             radicalStrokeCount.put(radical, stroke);
         }
         return file.getFilePointer();
     }
     private long fillRadicals(RandomAccessFile file) throws IOException {
     private void fillRadicals(RandomAccessFile file) throws IOException {
         int size = file.readShort();
         for(int i=0; i<size; i++) {
             String radical = getString(file);
             String kanji = getString(file);
             List<String> lst = new ArrayList<>();
             for(String s: kanji.split("")) {
                 if(s.compareTo("") != 0) {
                     lst.add(s);
                 }
             }
             radicals.put(radical, kanji.split(""));
             radicals.put(radical, lst);
         }
         return file.getFilePointer();
     }
     private void fillTables() throws IncompatibleFormatException {
         super(name, description, fullDescription, cacheDir, url);
     }
     private boolean contains(String[] lst, String s) {
     private boolean contains(List<String> lst, String s) {
         if(lst==null)
             return false;
         for(String p: lst) {
         fillTables();
         Map<Integer, List<String>> result = null;
         for(String r: rad) {
             String[] possibilities = radicals.get(r);
             List<String> possibilities = radicals.get(r);
             if(possibilities == null)
                 continue;
             if(result == null) {
                     int stroke = 0;
                     if(strokes != null)
                         stroke = strokes;
                     Log.d(TAG, Integer.toString(stroke));
                     List <String> lst = result.get(stroke);
                     if(lst == null) {
                         lst = new ArrayList<>();
                 }
             } else {
                 for(List<String> kanjiList: result.values()) {
                     for(String kanji: kanjiList) {
                     List<String> lst = new ArrayList<>(kanjiList);
                     for(String kanji: lst) {
                         if(! contains(possibilities, kanji))
                             kanjiList.remove(kanji);
                     }
                 }
             }
         }
         if(result != null) {
             Set<Integer> strokes = new HashSet<>(result.keySet());
             for (int stroke : strokes) {
                 List<String> kanji = result.get(stroke);
                 if (kanji == null || kanji.size() == 0) {
                     result.remove(stroke);
                 }
             }
         }
         return result;
     }
         Set<String> result = new HashSet<>();
         Map<Integer, List<String>> kanjiList = match(rad);
         for(Map.Entry<String, String[]> e: radicals.entrySet()) {
         for(Map.Entry<String, List<String>> e: radicals.entrySet()) {
             String radical = e.getKey();
             String[] possibilities = e.getValue();
             List<String> possibilities = e.getValue();
             boolean possible = false;
             for(List<String> kanjiGroup: kanjiList.values()) {
                 if(possible)

app/src/main/res/layout/content_main.xml

             android:layout_marginTop="32dp"
             android:layout_weight="1"
             android:ems="10"
             android:importantForAutofill="no"
             android:hint="@string/search_hint"
             android:importantForAutofill="no"
             android:inputType="text" />
         <Button
     </LinearLayout>
     <TextView
         android:id="@+id/feedback"
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
         android:layout_height="match_parent">
     <ScrollView
         android:layout_weight="1"
         android:layout_width="match_parent"
         android:layout_height="0dp">
         <LinearLayout
             android:orientation="vertical"
             android:id="@+id/results_view"
             android:id="@+id/result_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
             android:layout_marginBottom="8dp" />
     </ScrollView>
             android:layout_height="match_parent"
             android:orientation="vertical">
             <TextView
                 android:id="@+id/feedback"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
             <ScrollView
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_weight="1">
                 <LinearLayout
                     android:id="@+id/results_view"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dp"
                     android:layout_marginBottom="8dp"
                     android:orientation="vertical" />
             </ScrollView>
             <LinearLayout
                 android:id="@+id/bottom_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
                 <Space
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1" />
                 <Button
                     android:id="@+id/radical_button"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="???" />
             </LinearLayout>
         </LinearLayout>
         <eu.lepiller.nani.RadicalSelectorView
             android:id="@+id/radical_selector"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:visibility="invisible" />
     </FrameLayout>
 </LinearLayout>
 \ No newline at end of file

app/src/main/res/layout/content_radicals.xml

     android:layout_height="match_parent"
     android:orientation="vertical">
     <ScrollView
     <HorizontalScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
         <TableLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical" >
             <TableRow
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" >
         <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:orientation="vertical">
             <LinearLayout
                 android:id="@+id/kanji_row1"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:orientation="horizontal"></LinearLayout>
                 <TextView
                     android:id="@+id/textView16"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="TextView" />
             </TableRow>
             <TableRow
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" >
                 <TextView
                     android:id="@+id/textView17"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="TextView" />
             </TableRow>
         </TableLayout>
     </ScrollView>
             <LinearLayout
                 android:id="@+id/kanji_row2"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:orientation="horizontal"></LinearLayout>
         </LinearLayout>
     </HorizontalScrollView>
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent">
         android:layout_height="wrap_content"
         android:layout_weight="1">
         <TableLayout
         <HorizontalScrollView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical" >
             android:layout_height="wrap_content">
             <TableRow
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" >
             <TableLayout
                 android:id="@+id/radical_table"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
                 <TextView
                     android:id="@+id/textView18"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="1" />
             </TableLayout>
                 <ToggleButton
                     android:id="@+id/toggleButton"
                     android:layout_width="45dp"
                     android:layout_height="wrap_content"
                     android:checked="false"
                     android:enabled="true"
                     android:text="??????"
                     android:textOff="???"
                     android:textOn="??????" />
             </TableRow>
         </HorizontalScrollView>
     </ScrollView>
             <TableRow
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" >
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
             </TableRow>
         </TableLayout>
     </ScrollView>
         <Space
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1" />
         <Button
             android:id="@+id/close_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/close" />
     </LinearLayout>
 </merge>
 \ No newline at end of file

app/src/main/res/values/strings.xml

     <string name="no_search">No search term</string>
     <string name="no_dic">You haven\'t downloaded any dictionary usable with this search function. Please select a dictionary.</string>
     <string name="incompatible_format">Dictionary %s is not compatible with this version of the application. Either update the dictionary or the app.</string>
     <string name="no_radical_dict">Dictionary for radical selection is not downloaded yet. Please select one from the dictionary list.</string>
     <string name="download">Download</string>
     <string name="remove">Remove</string>
     <string name="icon_description">Icon</string>
     <string name="kanji_description">Writing</string>
     <string name="close">close</string>
     <string name="dictionary_size">Actual size: %dMB</string>
     <string name="feedback_no_result">No result</string>