Merge pull request #59 from 0xpr03/dev

Merge dev branch with removed travis CI

Author: 0xpr03

.github/workflows/gradle.yml

@@ -0,0 +1,27 @@
+# This workflow will build a Java project with Gradle
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
+
+name: Java CI with Gradle
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 11
+      uses: actions/setup-java@v2
+      with:
+        java-version: '11'
+        distribution: 'adopt'
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Build with Gradle
+      run: ./gradlew build

.idea/compiler.xml

@@ -1,23 +1,24 @@
 # VocableTrainer-Android [![Build Status](https://travis-ci.com/0xpr03/VocableTrainer-Android.svg?branch=master)](https://travis-ci.com/0xpr03/VocableTrainer-Android)
-VocableTrainer-Android is a word/vocable training software for the android platform.
+VocableTrainer-Android is a word and vocable training software for the android platform.
 It provides traning with different modes, sessions and multiple word lists.
 
 <a href="https://f-droid.org/repository/browse/?fdid=vocabletrainer.heinecke.aron.vocabletrainer" target="_blank">
 <img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="80"/></a>
-  
-~~There's also a [PC version](https://github.com/0xpr03/VocableTrainer) (less active developed)~~
 
 ## Features
 - [X] N:N word support (multiple meanings)
 - [X] "Additional" Column shown after solving (irregular verbs etc)
 - [X] A<->B Random training over multiple lists
 - [X] Stop/Continue training sessions at any time
-- [X] Classic Mode, type in & verify
-- [X] Quick Mode, no typing
-- [X] Set repeat-amount of words in training
-- [X] Export/Import of lists to/from CSV files
-- [X] configurable CSV format
-- [ ] Usage statistics
+- [X] Classic Mode: type in and verify
+- [X] Quick Mode: no typing
+- [X] Adjustable amount of word repetition in training
+- [X] Export/Import of lists to/from CSV files with highly configurable CSV format
+
+## Features planned
+- [ ] Usage statistics for repetiton of worst vocables
+- [ ] Import/Export of [KVTML](https://edu.kde.org/contrib/kvtml.php) files
+- [ ] Fast list editing from the PC (requires online account)
 
 ## Bugs, Contribution etc
 Feel free to open an Issue for ideas, bugs, localisation or feature requests. Or even better a PR.
@@ -29,17 +30,19 @@ Feel free to open an Issue for ideas, bugs, localisation or feature requests. Or
   These are used only to take part in an opt-in android-api-version survey.  
 - What about a localisation for X ?  
   I would appreciate a PR for localizations.
-- What is this first `1.0` version before `0.1` about ?  
-  Default values weren't changed. It is therefore "0.0"
+- Playstore version  
+  Google wants money for publishing a free app, so if you want to see a playstore release, you can donate for that.
 - The latest release is not on f-droid.  
   Please wait for f-droids build process to catch up.
-- Playstore version  
-  Google wants money for publishing a free app, as this project is done in my spare time I would have to pay for this by myself. (Side note: As I haven't started this project for myself & don't have a real use case I wouldn't even profit from a playstore version.)
+- What is this first `1.0` version before `0.1` about ?  
+  Default values weren't changed. It is therefore "0.0"
 
 ## Distribution
 
 Please always link to the f-droid repository, I won't give any support for unofficial builds.
-You are not allowed to distribute this application on your own. (Repository, Hosting,..)  
+
+You are not allowed to distribute this application under this name by yourself until 4 years after the last release.
+
 
 ## License
 

.idea/gradle.xml

@@ -1,14 +1,15 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 30
+    buildToolsVersion '29.0.2'
     defaultConfig {
         applicationId "vocabletrainer.heinecke.aron.vocabletrainer"
         minSdkVersion 19
-        targetSdkVersion 28
-        versionCode 20
-        versionName "0.7.2"
+        targetSdkVersion 30
+        versionCode 21
+        versionName "0.7.3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
 
@@ -35,22 +36,25 @@ android {
 }
 
 dependencies {
-    def lifecycle_version = '2.0.0-beta01'
-    def androidSupportVersion = '1.0.0-beta01'
-
-    implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-viewmodel:$lifecycle_version"
-    implementation "androidx.legacy:legacy-support-v4:$androidSupportVersion"
-    implementation "androidx.recyclerview:recyclerview:$androidSupportVersion"
+    implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
+    implementation "androidx.lifecycle:lifecycle-viewmodel:2.3.1"
+    implementation "androidx.legacy:legacy-support-v4:1.0.0"
+    implementation "androidx.recyclerview:recyclerview:1.2.0"
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0-alpha4', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    implementation "androidx.appcompat:appcompat:$androidSupportVersion"
-    implementation "androidx.legacy:legacy-preference-v14:$androidSupportVersion"
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation "com.google.android.material:material:$androidSupportVersion"
+    implementation "androidx.appcompat:appcompat:1.2.0"
+    implementation "androidx.legacy:legacy-preference-v14:1.0.0"
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation "com.google.android.material:material:1.3.0"
     testImplementation 'junit:junit:4.12'
 
-    implementation "info.guardianproject.netcipher:netcipher:2.0.0-alpha1"
+    implementation "info.guardianproject.netcipher:netcipher:2.1.0"
+    implementation "androidx.core:core-ktx:+"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+}
+repositories {
+    mavenCentral()
 }

.idea/misc.xml

@@ -1,5 +1,6 @@
 package vocabletrainer.heinecke.aron.vocabletrainer.activity;
 
+import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
@@ -13,6 +14,7 @@
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.ListView;
 import android.widget.Toast;
 
@@ -238,12 +240,15 @@ public boolean onOptionsItemSelected(MenuItem item) {
     private void saveEdit() {
         ArrayList<VEntry> lst = new ArrayList<>(1);
         lst.add(editorEntry);
-
-        if (!editorEntry.isExisting()) {
+        boolean isExisting = editorEntry.isExisting();
+        if (!isExisting) {
             adapter.addEntryUnrendered(editorEntry);
         }
         db.upsertEntries(lst);
         adapter.notifyDataSetChanged();
+        if(!isExisting) {
+            addEntry();
+        }
     }
 
     /**
@@ -266,7 +271,7 @@ private void initListView() {
 
         listView.setAdapter(adapter);
 
-        listView.setOnItemClickListener((parent, view, pos, id) -> showEntryEditDialog((VEntry) adapter.getItem(pos), pos));
+        listView.setOnItemClickListener((parent, view, pos, id) -> showEntryEditDialog((VEntry) adapter.getItem(pos), pos,false));
 
         listView.setOnItemLongClickListener((arg0, arg1, pos, id) -> {
             showEntryDeleteDialog((VEntry) adapter.getItem(pos), pos);
@@ -291,7 +296,7 @@ public void addEntry() {
     private void showEntryDeleteDialog(final VEntry entry, final int position) {
         if (entry.getId() == ID_RESERVED_SKIP)
             return;
-        AlertDialog.Builder delDiag = new AlertDialog.Builder(this);
+        AlertDialog.Builder delDiag = new AlertDialog.Builder(this,R.style.CustomDialog);
 
         delDiag.setTitle(R.string.Editor_Diag_delete_Title);
         delDiag.setMessage(String.format(getString(R.string.Editor_Diag_delete_MSG_part) + "\n %s %s %s", entry.getAString(), entry.getBString(), entry.getTip()));
@@ -339,7 +344,7 @@ public void onDismissed(Snackbar transientBottomBar, int event) {
      * @param entry
      */
     private void showEntryEditDialog(final VEntry entry) {
-        showEntryEditDialog(entry,MIN_ID_TRESHOLD-1);
+        showEntryEditDialog(entry,MIN_ID_TRESHOLD-1, true);
     }
 
     /**
@@ -348,12 +353,12 @@ private void showEntryEditDialog(final VEntry entry) {
      * @param entry VEntry to edit/create
      * @param position edit position in list, if existing
      */
-    private synchronized void showEntryEditDialog(final VEntry entry, final int position) {
+    private synchronized void showEntryEditDialog(final VEntry entry, final int position, final boolean forceDialog) {
         if (entry.getId() == ID_RESERVED_SKIP) {
             showTableInfoDialog();
             return;
         }
-        if(editorDialog != null && editorDialog.isAdded()) {
+        if(!forceDialog && editorDialog != null && editorDialog.isAdded()) {
             return;
         }
 
@@ -371,11 +376,11 @@ private synchronized void showEntryEditDialog(final VEntry entry, final int posi
     private void setEditorDialogActions(){
         editorDialog.setOkAction(e -> {
             saveEdit();
-            Log.d(TAG,"edited");
             return null;
         });
         editorDialog.setCancelAction(e -> {
-            Log.d(TAG,"canceled");
+            InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+            inputMethodManager.toggleSoftInput(0, 0);
             return null;
         });
     }