Add up navigation support
CHANGELOG.md
| 19 | 19 | * Fix white on white text display on some older devices. | |
| 20 | 20 | * Fix alignment in dictionary list. | |
| 21 | 21 | * Small alignment and size fixes in dictionary download screen. | |
| 22 | + | * Add back button to action bars to better navigate between screens. | |
| 22 | 23 | ||
| 23 | 24 | ### Features | |
| 24 | 25 | ||
… | |||
| 26 | 27 | merged (eg. if you have two dictionaries for two different languages, you | |
| 27 | 28 | will see the meanings for both languages in the same entry). | |
| 28 | 29 | ||
| 30 | + | ### Translations | |
| 31 | + | ||
| 32 | + | * Update fr translation | |
| 33 | + | ||
| 29 | 34 | Changes In 0.2.2.1 | |
| 30 | 35 | ------------------ | |
| 31 | 36 | ||
app/src/main/AndroidManifest.xml
| 1 | 1 | <?xml version="1.0" encoding="utf-8"?> | |
| 2 | 2 | <manifest xmlns:android="http://schemas.android.com/apk/res/android" | |
| 3 | + | xmlns:tools="http://schemas.android.com/tools" | |
| 3 | 4 | package="eu.lepiller.nani"> | |
| 4 | 5 | ||
| 5 | 6 | <uses-permission android:name="android.permission.INTERNET" /> | |
… | |||
| 11 | 12 | android:roundIcon="@mipmap/ic_launcher_round" | |
| 12 | 13 | android:supportsRtl="true" | |
| 13 | 14 | android:theme="@style/AppTheme"> | |
| 14 | - | <activity android:name=".SettingsActivity"></activity> | |
| 15 | - | <activity android:name=".DictionaryDownloadActivity" /> | |
| 16 | - | <activity android:name=".AboutActivity" /> | |
| 15 | + | <activity android:name=".SettingsActivity" | |
| 16 | + | android:parentActivityName=".MainActivity" | |
| 17 | + | tools:ignore="UnusedAttribute"> | |
| 18 | + | <meta-data | |
| 19 | + | android:name="android.support.PARENT_ACTIVITY" | |
| 20 | + | android:value=".MainActivity" /> | |
| 21 | + | </activity> | |
| 22 | + | <activity android:name=".DictionaryDownloadActivity" | |
| 23 | + | android:label="@string/title_activity_dictionary_download" | |
| 24 | + | android:parentActivityName=".DictionaryActivity" | |
| 25 | + | tools:ignore="UnusedAttribute"> | |
| 26 | + | <meta-data | |
| 27 | + | android:name="android.support.PARENT_ACTIVITY" | |
| 28 | + | android:value=".DictionaryActivity" /> | |
| 29 | + | </activity> | |
| 30 | + | <activity android:name=".AboutActivity" | |
| 31 | + | android:parentActivityName=".MainActivity" | |
| 32 | + | android:label="@string/title_activity_about" | |
| 33 | + | tools:ignore="UnusedAttribute"> | |
| 34 | + | <meta-data | |
| 35 | + | android:name="android.support.PARENT_ACTIVITY" | |
| 36 | + | android:value=".MainActivity" /> | |
| 37 | + | </activity> | |
| 17 | 38 | <activity | |
| 18 | 39 | android:name=".DictionaryActivity" | |
| 19 | 40 | android:label="@string/title_activity_dictionary" | |
| 20 | - | android:theme="@style/AppTheme.NoActionBar" /> | |
| 41 | + | android:parentActivityName=".MainActivity" | |
| 42 | + | tools:ignore="UnusedAttribute"> | |
| 43 | + | <meta-data | |
| 44 | + | android:name="android.support.PARENT_ACTIVITY" | |
| 45 | + | android:value=".MainActivity" /> | |
| 46 | + | </activity> | |
| 21 | 47 | <activity | |
| 22 | 48 | android:name=".MainActivity" | |
| 23 | 49 | android:label="@string/app_name" | |
app/src/main/java/eu/lepiller/nani/DictionaryDownloadActivity.java
| 80 | 80 | setContentView(R.layout.activity_dictionary_download); | |
| 81 | 81 | Bundle extras = getIntent().getExtras(); | |
| 82 | 82 | ||
| 83 | + | getSupportActionBar().setDisplayHomeAsUpEnabled(true); | |
| 84 | + | ||
| 83 | 85 | // TODO: this will open the first dictionary on error, we probably want to display a proper | |
| 84 | 86 | // error instead. | |
| 85 | 87 | int position = 0; |
app/src/main/res/values-fr/strings.xml
| 5 | 5 | ||
| 6 | 6 | <string name="search_hint">Rechercher un mot en japonais, par kanji, par signification, ???</string> | |
| 7 | 7 | <string name="search_button">Rechercher</string> | |
| 8 | + | <string name="title_activity_about">?? propos</string> | |
| 8 | 9 | <string name="title_activity_dictionary">Dictionnaires</string> | |
| 10 | + | <string name="title_activity_dictionary_download">T??l??chargement</string> | |
| 9 | 11 | <string name="no_search">Recherche vide</string> | |
| 10 | 12 | <string name="no_dic">Vous n???avez pas encore t??l??charg?? de dictionnaire utilisable avec cette | |
| 11 | 13 | fonctionnalit?? de recherche. T??l??chargez un dictionnaire. |
app/src/main/res/values/strings.xml
| 6 | 6 | ||
| 7 | 7 | <string name="search_hint">Search japanese word, kanji, meaning, ???</string> | |
| 8 | 8 | <string name="search_button">Search</string> | |
| 9 | + | <string name="title_activity_about">About</string> | |
| 9 | 10 | <string name="title_activity_dictionary">Dictionaries</string> | |
| 11 | + | <string name="title_activity_dictionary_download">Download</string> | |
| 10 | 12 | <string name="no_search">No search term</string> | |
| 11 | 13 | <string name="no_dic">You haven\'t downloaded any dictionary usable with this search function. Please select a dictionary.</string> | |
| 12 | 14 | <string name="incompatible_format">Dictionary %s is not compatible with this version of the application. Either update the dictionary or the app.</string> |