Merge pull request #95 from magicmychal/develop

Fiszki v1.2
rstnewbies · Dec 14, 2015 · 4c75825 · 4c75825
2 parents 9042274 + 7918b7f
commit 4c75825
Show file tree

Hide file tree

Showing 55 changed files with 906 additions and 375 deletions.
diff --git a/.floo b/.floo
@@ -0,0 +1,3 @@
+{
+    "url": "https://floobits.com/mBoiler/RSTNEWBIEFISZKI"
+}
diff --git a/.flooignore b/.flooignore
@@ -0,0 +1,6 @@
+extern
+node_modules
+tmp
+vendor
+.idea/workspace.xml
+.idea/misc.xml
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,5 @@
 /.idea
 /app/app.iml
 sc.iml
+app/app.iml
+Fiszki.iml
diff --git a/README.md b/README.md
@@ -1,10 +1,32 @@
 <h1>Fiszki</h1>
+<h2>English:</h2>
+<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.
+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>
+
+
+
+<h2>Polski:</h2>
 <h3>Ucz się słówek szybciej niż kiedykolwiek!</h3>
 <p>Aplikacja fiszki powstała z myślą o każdej osobie, która chce w krótkim okresie czasu nauczyć się słów w języku obcym.
 Dzięki aplikacji Fiszki nie trzeba spędzać ani 5 minut na naukę, ponieważ uczysz sie przez chwilę co 15 minut.
 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/pfRl">v1.2</a>:
+<ul><li>Wprowadzenie algorytmu ułatwiającego naukę</li>
+<li>Nowy wygląd ustawień</li>
+<li>Poprawki błędów</li>
+<li>Dodawanie słówka enterem</li>
+<li>Usuwanie całej bazy słowek</li>
+</ul>
+
+Funckje w wersji <a href="http://d-h.st/kjhc">v1.1.1</a>:
+<ul><li>Poprawiono poważny błąd z nagłym zatrzymaniem aplikacji</li></ul>
+
 Funkcje w wersji v1.1:
 <ul><li>Zmiana algorytmu wybierania słówek z bazy danych</li>
 <li>Dodano "Tryb nauki"</li>

diff --git a/app/app.iml b/app/app.iml
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion 'Google Inc.:Google APIs:23'
+    buildToolsVersion '23.0.2'
 
     defaultConfig {
         applicationId "eu.qm.fiszki"
         minSdkVersion 15
         targetSdkVersion 23
         versionCode 1
-        versionName "1.0"
+        versionName "1.2"
     }
     buildTypes {
         release {
@@ -20,8 +20,8 @@ android {
 }
 
 dependencies {
-    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 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'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="eu.qm.fiszki" >
+    package="eu.qm.fiszki">
 
     <uses-permission android:name="android.permission.VIBRATE" />
 
@@ -9,45 +9,42 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:screenOrientation="portrait"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/AppTheme">
         <activity
             android:name=".activity.AddWordActivity"
             android:label="@string/add_new_word_title"
-            android:screenOrientation="portrait" >
-        </activity>
+            android:screenOrientation="portrait" />
         <activity
             android:name=".activity.CheckActivity"
             android:label="@string/title_activity_check"
             android:launchMode="singleInstance"
-            android:screenOrientation="portrait" >
-        </activity>
+            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.SettingsActivity"
-            android:label="@string/title_settings"
-            android:parentActivityName=".activity.MainActivity"
-            android:screenOrientation="portrait" >
-        </activity>
         <activity
             android:name=".activity.LearningModeActivity"
-            android:label="@string/title_activity_learning_mode" >
-        </activity>
+            android:label="@string/title_activity_learning_mode"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".activity.MainActivity"
             android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar" >
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
-              <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".activity.SettingsActivity"
+            android:label="@string/title_activity_sett"
+            android:screenOrientation="portrait"></activity>
     </application>
 
 </manifest>
diff --git a/app/src/main/java/eu/qm/fiszki/AlarmReceiver.java b/app/src/main/java/eu/qm/fiszki/AlarmReceiver.java
@@ -15,16 +15,18 @@
 import eu.qm.fiszki.activity.CheckActivity;
 import eu.qm.fiszki.activity.SettingsActivity;
 
+import static android.app.AlarmManager.RTC_WAKEUP;
+
 public class AlarmReceiver extends BroadcastReceiver {
-    SettingsActivity settings = new SettingsActivity();
+
 
     @Override
     public void onReceive(Context context, Intent intent) {
 
-        long[] vibrate = {0, 200, 100, 200};
+        long[] vibrate = new long[] {0,100,0,100};
         Bitmap icon = BitmapFactory.decodeResource(context.getResources(), R.mipmap.ic_launcher);
-        PendingIntent pi = PendingIntent.getActivity(context, 100, new Intent(context,
-                CheckActivity.class), 0);
+        PendingIntent pi = PendingIntent.getActivity(context, 69, new Intent(context,
+                CheckActivity.class), PendingIntent.FLAG_UPDATE_CURRENT);
         Uri sound = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
         NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(context);
         mBuilder.setLargeIcon(icon);
@@ -43,7 +45,8 @@ public void onReceive(Context context, Intent intent) {
     }
 
     public void start(AlarmManager manager, Context context, PendingIntent pendingIntent, int sec) {
-        manager.setRepeating(AlarmManager.RTC_WAKEUP, System.currentTimeMillis(), 1000 * 60 * sec, pendingIntent);
+        long time = (1000*60*sec);
+        manager.setRepeating(AlarmManager.RTC_WAKEUP,System.currentTimeMillis()+time, time , pendingIntent);
     }
 
     public void close(AlarmManager manager, Context context, PendingIntent pendingIntent) {

diff --git a/app/src/main/java/eu/qm/fiszki/Alert.java b/app/src/main/java/eu/qm/fiszki/Alert.java
@@ -17,6 +17,7 @@ public void pass(final Context context, String message, String title,
         alertDialog = new AlertDialog.Builder(context).create();
         alertDialog.setTitle(title);
         alertDialog.setMessage(message);
+        alertDialog.setCancelable(false);
         alertDialog.setButton(nameButton, new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
@@ -38,7 +39,8 @@ public void fail(final Context context, String orginalWord, String message, Stri
         alertDialog = new AlertDialog.Builder(context).create();
         alertDialog.setTitle(title);
         alertDialog.setMessage(Html.fromHtml(message + " " + "<b>" + orginalWord + "</b>" + ". " +
-                                                                        "\n" + messeageAgain));
+                "\n" + messeageAgain));
+        alertDialog.setCancelable(false);
         alertDialog.setButton(nameButton, new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
@@ -56,51 +58,55 @@ public void buildAlert(String title, String message, String buttonText, Activity
                 .setPositiveButton(buttonText, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
+                        dialog.dismiss();
                     }
                 }).create().show();
     }
-
-    public void addFirstWord(String title, String message, String nameButton, final Context context) {
-        AlertDialog alertDialog;
+    public void learningModePass(final Context context, String message, String title,
+                                 String nameButton) {
+        final AlertDialog alertDialog;
         alertDialog = new AlertDialog.Builder(context).create();
         alertDialog.setTitle(title);
         alertDialog.setMessage(message);
+        alertDialog.setCancelable(false);
         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 learningModePass(final Context context, String message, String title,
-                     String nameButton) {
-        final AlertDialog alertDialog;
+    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);
-        alertDialog.setMessage(message);
+        alertDialog.setCancelable(false);
+        alertDialog.setMessage(Html.fromHtml(message + " " + "<b>" + orginalWord + "</b>"));
         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 emptyBase(final Context context,String message, String title,String nameButton){
         AlertDialog alertDialog;
         alertDialog = new AlertDialog.Builder(context).create();
         alertDialog.setTitle(title);
-        alertDialog.setMessage(Html.fromHtml(message + " " + "<b>" + orginalWord + "</b>"));
+        alertDialog.setCancelable(false);
+        alertDialog.setMessage(Html.fromHtml(message));
         alertDialog.setButton(nameButton, new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
-                Intent intent = new Intent(context, LearningModeActivity.class);
+                Intent intent = new Intent(context, MainActivity.class);
                 context.startActivity(intent);
                 ((Activity) context).finish();
             }