joel/privacy-friendly-sudoku-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Minor String changes and welcome screen now links to the help page.

Browse source
This commit is contained in:
Christopher Beckmann 2016-10-18 14:27:23 +02:00
parent 5b055c7e08
commit 44833dd8c0
8 changed files with 29 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/app.iml
View file

@ -66,14 +66,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@ -82,6 +74,14 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />

9
app/src/main/java/org/secuso/privacyfriendlysudoku/ui/MainActivity.java
View file

@ -428,7 +428,14 @@ public class MainActivity extends BaseActivity implements NavigationView.OnNavig
builder.setView(i.inflate(R.layout.welcome_dialog, null));
builder.setIcon(R.mipmap.ic_launcher_nopfa);
builder.setTitle(getActivity().getString(R.string.app_name_long));
builder.setPositiveButton(getActivity().getString(R.string.win_button_text), null);
builder.setPositiveButton(getActivity().getString(R.string.okay), null);
builder.setNegativeButton(getActivity().getString(R.string.view_help), new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
Intent intent = new Intent(getActivity(),HelpActivity.class);
startActivity(intent);
}
});
return builder.create();
}

2
app/src/main/res/values-de/strings.xml
View file

@ -87,5 +87,7 @@
<string name="field_select_description">Wische oder drücke auf die Pfeile auf der linken und rechten Seite um den Spielmodus zu ändern.</string>
<string name="difficulty_description_headline">Schwierigkeitsstufe:</string>
<string name="difficulty_description">Drücke oder wische über die Sterne um den Schwierigkeitsgrad zu ändern.</string>
<string name="view_help">Siehe Hilfe</string>
<string name="okay">Okay</string>
</resources>

2
app/src/main/res/values-es/strings.xml
View file

@ -80,4 +80,6 @@
<string name="pref_timer_reset_summary">El tiempo se resetea tambien, cuando el tablero se resetea.</string>
<string name="welcome">Bienvenido a Privacy Friendly Sudoku.</string>
<string name="about_author_contributors">" "</string>
<string name="okay">Ok</string>
<string name="view_help">Ayuda</string>
</resources>

2
app/src/main/res/values-fr/strings.xml
View file

@ -80,4 +80,6 @@
<string name="pref_timer_reset_summary">Aussi réinitialiser le minuteur en réinitialisant le jeux en cours.</string>
<string name="welcome">Bienvenue à Privacy Friendly Sudoku.</string>
<string name="about_author_contributors">" "</string>
<string name="okay">Ok</string>
<string name="view_help">Aide</string>
</resources>

2
app/src/main/res/values-ru/strings.xml
View file

@ -80,4 +80,6 @@
<string name="pref_timer_reset_summary">Сброс таймера при сбросе доски.</string>
<string name="welcome">Добро пожаловать в Privacy Friendly Sudoku.</string>
<string name="about_author_contributors">" "</string>
<string name="okay">Ok</string>
<string name="view_help">Помощь</string>
</resources>

2
app/src/main/res/values-zh/strings.xml
View file

@ -80,5 +80,7 @@
<string name="pref_timer_reset_summary">定时复位如果重置领域</string>
<string name="welcome">欢迎</string>
<string name="about_author_contributors">" "</string>
<string name="okay">Ok</string>
<string name="view_help">帮助</string>
</resources>

4
app/src/main/res/values/strings.xml
View file

@ -57,7 +57,7 @@
<!-- ###ABOUT### -->
<string name="app_name_long" translatable="false">Privacy Friendly Sudoku</string>
<string name="version_number" translatable="false">v2.0</string>
<string name="version_number" translatable="false">2.0</string>
<string name="about_author">Author:</string>
<string name="about_author_names" translatable="false">Christopher Beckmann, Timm Lippert</string>
<string name="about_author_contributors">and contributors.</string>
@ -138,4 +138,6 @@
<string name="help_privacyInfo">Privacy Info</string>
<string name="help_permissions">Permissions</string>
<string name="help_permissions_summary">Privacy Friendly Sudoku does not use any permissions.</string>
<string name="okay">Okay</string>
<string name="view_help">View Help</string>
</resources>