Skip to content

Commit

Permalink
Merge pull request #120 from magicmychal/develop
Browse files Browse the repository at this point in the history 
v1.3
  • Loading branch information
magicmychal committed Dec 30, 2015
2 parents 4c75825 + 25aacbc commit 3445134
Show file tree
Hide file tree
Showing 1,726 changed files with 59,565 additions and 507 deletions.
6 changes: 6 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,9 @@
sc.iml
app/app.iml
Fiszki.iml
/app/build
!/app/build/outputs/apk/




8 changes: 7 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<h3>New way to learn languages!</h3>
<p>New way to learn words!
Do you have Portuguese or French exam? Learn these words ASAP with Fiszki application for Android.
First, add list of words you need to learn. Then i'll show up notification every 15 minutes with exercise to translate, one of words you type, to translate.
First, add list of words you need to learn. Then it will show up notification every 15 minutes with exercise to translate one of words you have entered.
Thanks to our algorithm notification will show you words with less probability that you know that word.
If you need to study faster, use our 'Learning Mode' wich allows you to translate every single word.</p>

Expand All @@ -16,6 +16,12 @@ Dzięki aplikacji Fiszki nie trzeba spędzać ani 5 minut na naukę, ponieważ u
Daje to świetne rezultaty i nie zajmuje czasu!
Wszystko co musisz zrobić, to wpisać słowa, których chcesz się nauczyć</p>

Funkcje w wersji <a href="http://d-h.st/xl0u">v1.3</a>:
<ul><li>Edycja wprowadzonych słówek</li>
<li>Usuwanie pojedynczych słówek</li>
<li>Nowy tryb - "Sprawdź się!" wraz ze statystykami poprawności odpowiedzi</li>
<li>Poprawka błędów i małe usprawnienia</li></ul>

Funkcje w wersji <a href="http://d-h.st/pfRl">v1.2</a>:
<ul><li>Wprowadzenie algorytmu ułatwiającego naukę</li>
<li>Nowy wygląd ustawień</li>
Expand Down
1 change: 0 additions & 1 deletion app/.gitignore
View file

This file was deleted.

11 changes: 6 additions & 5 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ android {
minSdkVersion 15
targetSdkVersion 23
versionCode 1
versionName "1.2"
versionName "1.3"
}
buildTypes {
release {
Expand All @@ -20,8 +20,9 @@ android {
}

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.android.support:appcompat-v7:23.1.1'
compile 'com.android.support:support-v4:23.1.1'
compile 'com.android.support:design:23.1.1'
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:23.0.1'
compile 'com.android.support:support-v4:23.0.1'
compile 'com.android.support:design:23.0.1'
compile 'com.google.android.gms:play-services-appindexing:8.1.0'
}
Binary file added app/build/outputs/apk/app-debug-unaligned.apk
View file
Binary file not shown.
Binary file added app/build/outputs/apk/app-debug.apk
View file
Binary file not shown.
140 changes: 140 additions & 0 deletions app/build/outputs/logs/manifest-merger-debug-report.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
-- Merging decision tree log ---
manifest
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:2:1-61:12
xmlns:android
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:2:11-69
package
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:3:5-27
INJECTED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml
INJECTED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml
android:versionName
INJECTED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml
INJECTED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml
android:versionCode
INJECTED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml
INJECTED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml
uses-permission#android.permission.VIBRATE
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:5:5-66
android:name
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:5:22-63
application
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:7:5-59:19
MERGED from [com.android.support:appcompat-v7:23.0.1] D:\RST\Fiszki\app\build\intermediates\exploded-aar\com.android.support\appcompat-v7\23.0.1\AndroidManifest.xml:22:5-20
MERGED from [com.android.support:support-v4:23.0.1] D:\RST\Fiszki\app\build\intermediates\exploded-aar\com.android.support\support-v4\23.0.1\AndroidManifest.xml:22:5-20
MERGED from [com.android.support:support-v4:23.0.1] D:\RST\Fiszki\app\build\intermediates\exploded-aar\com.android.support\support-v4\23.0.1\AndroidManifest.xml:22:5-20
MERGED from [com.android.support:design:23.0.1] D:\RST\Fiszki\app\build\intermediates\exploded-aar\com.android.support\design\23.0.1\AndroidManifest.xml:22:5-20
MERGED from [com.android.support:support-v4:23.0.1] D:\RST\Fiszki\app\build\intermediates\exploded-aar\com.android.support\support-v4\23.0.1\AndroidManifest.xml:22:5-20
MERGED from [com.android.support:appcompat-v7:23.0.1] D:\RST\Fiszki\app\build\intermediates\exploded-aar\com.android.support\appcompat-v7\23.0.1\AndroidManifest.xml:22:5-20
MERGED from [com.android.support:support-v4:23.0.1] D:\RST\Fiszki\app\build\intermediates\exploded-aar\com.android.support\support-v4\23.0.1\AndroidManifest.xml:22:5-20
MERGED from [com.google.android.gms:play-services-appindexing:8.1.0] D:\RST\Fiszki\app\build\intermediates\exploded-aar\com.google.android.gms\play-services-appindexing\8.1.0\AndroidManifest.xml:19:5-20
MERGED from [com.google.android.gms:play-services-basement:8.1.0] D:\RST\Fiszki\app\build\intermediates\exploded-aar\com.google.android.gms\play-services-basement\8.1.0\AndroidManifest.xml:20:5-24:19
MERGED from [com.android.support:support-v4:23.0.1] D:\RST\Fiszki\app\build\intermediates\exploded-aar\com.android.support\support-v4\23.0.1\AndroidManifest.xml:22:5-20
android:screenOrientation
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:11:9-45
android:label
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:10:9-41
android:allowBackup
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:8:9-35
android:icon
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:9:9-43
android:theme
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:12:9-40
activity#eu.qm.fiszki.activity.AddWordActivity
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:13:9-16:52
android:screenOrientation
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:16:13-49
android:label
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:15:13-55
android:name
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:14:13-53
activity#eu.qm.fiszki.activity.CheckActivity
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:17:9-21:52
android:screenOrientation
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:21:13-49
android:label
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:19:13-57
android:name
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:18:13-51
android:launchMode
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:20:13-48
receiver#eu.qm.fiszki.AlarmReceiver
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:23:9-29:20
android:exported
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:25:13-37
android:name
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:24:13-42
intent-filter#android.intent.action.BOOT_COMPLETED
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:26:13-28:29
action#android.intent.action.BOOT_COMPLETED
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:27:17-79
android:name
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:27:25-76
activity#eu.qm.fiszki.activity.ExamModeActivity
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:31:9-34:52
android:screenOrientation
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:34:13-49
android:label
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:33:13-52
android:name
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:32:13-54
activity#eu.qm.fiszki.activity.MainActivity
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:35:9-45:20
android:screenOrientation
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:38:13-49
android:label
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:37:13-45
android:theme
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:39:13-56
android:name
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:36:13-50
intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:40:13-44:29
action#android.intent.action.MAIN
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:41:17-69
android:name
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:41:25-66
category#android.intent.category.LAUNCHER
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:43:17-77
android:name
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:43:27-74
activity#eu.qm.fiszki.activity.SettingsActivity
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:46:9-49:52
android:screenOrientation
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:49:13-49
android:label
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:48:13-51
android:name
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:47:13-54
meta-data#com.google.android.gms.version
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:51:9-53:69
MERGED from [com.google.android.gms:play-services-basement:8.1.0] D:\RST\Fiszki\app\build\intermediates\exploded-aar\com.google.android.gms\play-services-basement\8.1.0\AndroidManifest.xml:21:9-23:69
android:name
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:52:13-58
android:value
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:53:13-66
activity#eu.qm.fiszki.activity.LearningModeActivity
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:55:9-58:52
android:screenOrientation
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:58:13-49
android:label
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:57:13-56
android:name
ADDED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml:56:13-58
uses-sdk
INJECTED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml reason: use-sdk injection requested
MERGED from [com.android.support:appcompat-v7:23.0.1] D:\RST\Fiszki\app\build\intermediates\exploded-aar\com.android.support\appcompat-v7\23.0.1\AndroidManifest.xml:20:5-43
MERGED from [com.android.support:support-v4:23.0.1] D:\RST\Fiszki\app\build\intermediates\exploded-aar\com.android.support\support-v4\23.0.1\AndroidManifest.xml:20:5-43
MERGED from [com.android.support:support-v4:23.0.1] D:\RST\Fiszki\app\build\intermediates\exploded-aar\com.android.support\support-v4\23.0.1\AndroidManifest.xml:20:5-43
MERGED from [com.android.support:design:23.0.1] D:\RST\Fiszki\app\build\intermediates\exploded-aar\com.android.support\design\23.0.1\AndroidManifest.xml:20:5-43
MERGED from [com.android.support:support-v4:23.0.1] D:\RST\Fiszki\app\build\intermediates\exploded-aar\com.android.support\support-v4\23.0.1\AndroidManifest.xml:20:5-43
MERGED from [com.android.support:appcompat-v7:23.0.1] D:\RST\Fiszki\app\build\intermediates\exploded-aar\com.android.support\appcompat-v7\23.0.1\AndroidManifest.xml:20:5-43
MERGED from [com.android.support:support-v4:23.0.1] D:\RST\Fiszki\app\build\intermediates\exploded-aar\com.android.support\support-v4\23.0.1\AndroidManifest.xml:20:5-43
MERGED from [com.google.android.gms:play-services-appindexing:8.1.0] D:\RST\Fiszki\app\build\intermediates\exploded-aar\com.google.android.gms\play-services-appindexing\8.1.0\AndroidManifest.xml:18:5-42
MERGED from [com.google.android.gms:play-services-basement:8.1.0] D:\RST\Fiszki\app\build\intermediates\exploded-aar\com.google.android.gms\play-services-basement\8.1.0\AndroidManifest.xml:18:5-42
MERGED from [com.android.support:support-v4:23.0.1] D:\RST\Fiszki\app\build\intermediates\exploded-aar\com.android.support\support-v4\23.0.1\AndroidManifest.xml:20:5-43
android:targetSdkVersion
INJECTED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml
INJECTED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml
android:minSdkVersion
INJECTED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml
INJECTED from D:\RST\Fiszki\app\src\main\AndroidManifest.xml
23 changes: 17 additions & 6 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,21 @@
android:screenOrientation="portrait" />
<activity
android:name=".activity.CheckActivity"
android:label="@string/title_activity_check"
android:label="@string/check_activity_title"
android:launchMode="singleInstance"
android:screenOrientation="portrait" />

<receiver android:name=".AlarmReceiver"
<receiver
android:name=".AlarmReceiver"
android:exported="false">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />
</intent-filter>
</receiver>

<activity
android:name=".activity.LearningModeActivity"
android:label="@string/title_activity_learning_mode"
android:name=".activity.ExamModeActivity"
android:label="@string/exam_mode_title"
android:screenOrientation="portrait" />
<activity
android:name=".activity.MainActivity"
Expand All @@ -43,8 +45,17 @@
</activity>
<activity
android:name=".activity.SettingsActivity"
android:label="@string/title_activity_sett"
android:screenOrientation="portrait"></activity>
android:label="@string/settings_title"
android:screenOrientation="portrait" />

<meta-data
android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version" />

<activity
android:name=".activity.LearningModeActivity"
android:label="@string/learning_mode_title"
android:screenOrientation="portrait" />
</application>

</manifest>
37 changes: 25 additions & 12 deletions app/src/main/java/eu/qm/fiszki/Alert.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
import android.content.Intent;
import android.text.Html;

import eu.qm.fiszki.activity.LearningModeActivity;
import eu.qm.fiszki.activity.MainActivity;

public class Alert {
Expand All @@ -32,9 +31,8 @@ public void onClick(DialogInterface dialog, int which) {
alertDialog.show();
}

public void fail(final Context context, String orginalWord, String message, String messeageAgain,
String title,
String nameButton) {
public void fail(final Context context, String orginalWord, String message,
String messeageAgain,String title,String nameButton) {
AlertDialog alertDialog;
alertDialog = new AlertDialog.Builder(context).create();
alertDialog.setTitle(title);
Expand Down Expand Up @@ -72,16 +70,13 @@ public void learningModePass(final Context context, String message, String title
alertDialog.setButton(nameButton, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
Intent intent = new Intent(context, LearningModeActivity.class);
context.startActivity(intent);
((Activity) context).finish();

}
});
alertDialog.show();
}
public void learningModeFail(final Context context, String orginalWord, String message, String title,
String nameButton) {
public void learningModeFail(final Context context, String orginalWord, String message,
String title, String nameButton) {
AlertDialog alertDialog;
alertDialog = new AlertDialog.Builder(context).create();
alertDialog.setTitle(title);
Expand All @@ -90,9 +85,7 @@ public void learningModeFail(final Context context, String orginalWord, String m
alertDialog.setButton(nameButton, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
Intent intent = new Intent(context, LearningModeActivity.class);
context.startActivity(intent);
((Activity) context).finish();

}
});
alertDialog.show();
Expand All @@ -113,5 +106,25 @@ public void onClick(DialogInterface dialog, int which) {
});
alertDialog.show();
}
public void deleteRecord(final Context context,String message, String title,String nameButton,
String nameButton2) {
final AlertDialog alertDialog;
alertDialog = new AlertDialog.Builder(context).create();
alertDialog.setTitle(title);
alertDialog.setCancelable(false);
alertDialog.setMessage(Html.fromHtml(message));
alertDialog.setButton(nameButton, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {

}
});
alertDialog.setButton2(nameButton2, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
alertDialog.dismiss();
}
});
alertDialog.show();
}
}
Loading

0 comments on commit 3445134

Please sign in to comment.