Add help activity

Julien LepillerSat Jun 06 19:35:15+0200 2020

8a01bfe

Add help activity

CHANGELOG.md

11 
Changelog
22 
=========
33 
4+
Changes Since 0.2.3
5+
-------------------
6+
7+
### Features
8+
9+
* Add a Help screen.
10+
11+
### Translations
12+
13+
* Update fr translation.
14+
415 
Changes In 0.2.3
516 
----------------
617 
app/src/main/AndroidManifest.xml
3535 
                android:name="android.support.PARENT_ACTIVITY"
3636 
                android:value=".MainActivity" />
3737 
        </activity>
38+
        <activity android:name=".HelpActivity"
39+
            android:parentActivityName=".MainActivity"
40+
            android:label="@string/title_activity_help"
41+
            tools:ignore="UnusedAttribute">
42+
            <meta-data
43+
                android:name="android.support.PARENT_ACTIVITY"
44+
                android:value=".MainActivity" />
45+
        </activity>
3846 
        <activity
3947 
            android:name=".DictionaryActivity"
4048 
            android:label="@string/title_activity_dictionary"
…
5664 
        </activity>
5765 
    </application>
5866 
59-
</manifest>
59>
600>
\ No newline at end of file
67+
</manifest>
app/src/main/java/eu/lepiller/nani/HelpActivity.java unknown status 1
1+
package eu.lepiller.nani;
2+
3+
import androidx.appcompat.app.AppCompatActivity;
4+
5+
import android.os.Bundle;
6+
7+
public class HelpActivity extends AppCompatActivity {
8+
9+
    @Override
10+
    protected void onCreate(Bundle savedInstanceState) {
11+
        super.onCreate(savedInstanceState);
12+
        setContentView(R.layout.activity_help);
13+
    }
14+
}
app/src/main/java/eu/lepiller/nani/MainActivity.java
295295 
        // as you specify a parent activity in AndroidManifest.xml.
296296 
        int id = item.getItemId();
297297 
298-
        //noinspection SimplifiableIfStatement
299298 
        if (id == R.id.action_settings) {
300299 
            Intent intent = new Intent(this, SettingsActivity.class);
301300 
            startActivity(intent);
…
308307 
            Intent intent = new Intent(this, AboutActivity.class);
309308 
            startActivity(intent);
310309 
            return true;
310+
        } else if (id == R.id.action_help) {
311+
            Intent intent = new Intent(this, HelpActivity.class);
312+
            startActivity(intent);
313+
            return true;
311314 
        }
312315 
313316 
        return super.onOptionsItemSelected(item);
app/src/main/res/layout/activity_help.xml unknown status 1
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
3+
    xmlns:tools="http://schemas.android.com/tools"
4+
    android:layout_width="match_parent"
5+
    android:layout_height="match_parent"
6+
    tools:context=".HelpActivity">
7+
8+
</ScrollView>
8<
09<
\ No newline at end of file
app/src/main/res/menu/menu_main.xml
1010 
        android:title="@string/action_settings"
1111 
        app:showAsAction="never" />
1212 
    <item
13+
        android:id="@+id/action_help"
14+
        android:title="@string/action_help" />
15+
    <item
1316 
        android:id="@+id/action_about"
1417 
        android:title="@string/action_about" />
1518 
</menu>
app/src/main/res/values-fr/strings.xml
11 
<resources>
22 
    <string name="action_settings">Param??tres</string>
33 
    <string name="action_dictionaries">G??rer les dictionnaires</string>
4+
    <string name="action_help">Aide</string>
45 
    <string name="action_about">?? propos</string>
56 
67 
    <string name="search_hint">Rechercher un mot en japonais, par kanji, par signification, ???</string>
…
89 
    <string name="title_activity_about">?? propos</string>
910 
    <string name="title_activity_dictionary">Dictionnaires</string>
1011 
    <string name="title_activity_dictionary_download">T??l??chargement</string>
12+
    <string name="title_activity_help">Aide</string>
1113 
    <string name="no_search">Recherche vide</string>
1214 
    <string name="no_dic">Vous n???avez pas encore t??l??charg?? de dictionnaire utilisable avec cette
1315 
        fonctionnalit?? de recherche. T??l??chargez un dictionnaire.
app/src/main/res/values/strings.xml
22 
    <string name="app_name" translatable="false">Nani?</string>
33 
    <string name="action_settings">Settings</string>
44 
    <string name="action_dictionaries">Manage Dictionaries</string>
5+
    <string name="action_help">Help</string>
56 
    <string name="action_about">About</string>
67 
78 
    <string name="search_hint">Search japanese word, kanji, meaning, ???</string>
…
910 
    <string name="title_activity_about">About</string>
1011 
    <string name="title_activity_dictionary">Dictionaries</string>
1112 
    <string name="title_activity_dictionary_download">Download</string>
13+
    <string name="title_activity_help">Help</string>
1214 
    <string name="no_search">No search term</string>
1315 
    <string name="no_dic">You haven\'t downloaded any dictionary usable with this search function. Please select a dictionary.</string>
1416 
    <string name="incompatible_format">Dictionary %s is not compatible with this version of the application. Either update the dictionary or the app.</string>