Merge pull request #20 from zeoflow/env/updated-environment

Updated environment

Author: teogor

.idea/codeStyles/Project.xml

@@ -3,14 +3,15 @@ plugins {
 }
 
 android {
-    compileSdk 31
+    namespace 'com.zeoflow.depot'
+    compileSdk 32
 
     defaultConfig {
         applicationId "com.zeoflow.depot"
         minSdk 21
-        targetSdk 31
-        versionCode 3
-        versionName "1.0.2"
+        targetSdk 32
+        versionCode 5
+        versionName "1.0.5"
     }
 
     buildTypes {
@@ -20,8 +21,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
 }
 
@@ -35,12 +36,9 @@ dependencies {
     implementation project(':dispatcher-runtime')
     annotationProcessor project(':dispatcher-compiler')
 
-    implementation("com.zeoflow:startup:1.0.0")
-    implementation('com.zeoflow:flow-kit:1.6.2') {
-        exclude group: 'com.zeoflow', module: 'material-elements'
-    }
+    implementation('com.zeoflow:startup:1.0.1')
 
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'com.google.android.material:material:1.5.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    implementation 'androidx.appcompat:appcompat:1.4.2'
+    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 }

.idea/codeStyles/codeStyleConfig.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.zeoflow.depot">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"

app/build.gradle

@@ -18,25 +18,23 @@
 
 import android.os.Bundle;
 
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.zeoflow.depot.adapter.WordListAdapter;
-import com.zeoflow.depot.db.WordDao_Model;
 import com.zeoflow.depot.db.Word;
-import com.zeoflow.app.Activity;
+import com.zeoflow.depot.db.WordDao_Model;
 
 import java.util.Random;
 
-public class MainActivity extends Activity
-{
+public class MainActivity extends AppCompatActivity {
 
     private WordDao_Model mWordViewModel;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState)
-    {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 

app/src/main/AndroidManifest.xml

@@ -16,7 +16,6 @@
  * limitations under the License.
  */
 
-import android.util.Log;
 import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
@@ -27,40 +26,33 @@
 
 import org.jetbrains.annotations.NotNull;
 
-public class WordListAdapter extends ListAdapter<Word, WordViewHolder>
-{
+public class WordListAdapter extends ListAdapter<Word, WordViewHolder> {
 
-    public WordListAdapter(@NonNull DiffUtil.ItemCallback<Word> diffCallback)
-    {
+    public WordListAdapter(@NonNull DiffUtil.ItemCallback<Word> diffCallback) {
         super(diffCallback);
     }
 
     @NotNull
     @Override
-    public WordViewHolder onCreateViewHolder(@NotNull ViewGroup parent, int viewType)
-    {
+    public WordViewHolder onCreateViewHolder(@NotNull ViewGroup parent, int viewType) {
         return WordViewHolder.create(parent);
     }
 
     @Override
-    public void onBindViewHolder(WordViewHolder holder, int position)
-    {
+    public void onBindViewHolder(WordViewHolder holder, int position) {
         Word current = getItem(position);
         holder.bind(current.getWord());
     }
 
-    public static class WordDiff extends DiffUtil.ItemCallback<Word>
-    {
+    public static class WordDiff extends DiffUtil.ItemCallback<Word> {
 
         @Override
-        public boolean areItemsTheSame(@NonNull Word oldItem, @NonNull Word newItem)
-        {
+        public boolean areItemsTheSame(@NonNull Word oldItem, @NonNull Word newItem) {
             return oldItem == newItem;
         }
 
         @Override
-        public boolean areContentsTheSame(@NonNull Word oldItem, @NonNull Word newItem)
-        {
+        public boolean areContentsTheSame(@NonNull Word oldItem, @NonNull Word newItem) {
             return oldItem.getWord().equals(newItem.getWord());
         }
 

app/src/main/java/com/zeoflow/depot/MainActivity.java

@@ -25,24 +25,22 @@
 
 import com.zeoflow.depot.R;
 
-class WordViewHolder extends RecyclerView.ViewHolder
-{
+class WordViewHolder extends RecyclerView.ViewHolder {
 
     private final TextView wordItemView;
 
-    private WordViewHolder(View itemView)
-    {
+    private WordViewHolder(View itemView) {
         super(itemView);
         wordItemView = itemView.findViewById(R.id.textView);
     }
-    static WordViewHolder create(ViewGroup parent)
-    {
+
+    static WordViewHolder create(ViewGroup parent) {
         View view = LayoutInflater.from(parent.getContext())
                 .inflate(R.layout.recyclerview_item, parent, false);
         return new WordViewHolder(view);
     }
-    public void bind(String text)
-    {
+
+    public void bind(String text) {
         wordItemView.setText(text);
     }
 

app/src/main/java/com/zeoflow/depot/adapter/WordListAdapter.java

@@ -22,8 +22,6 @@
 import com.zeoflow.depot.Entity;
 import com.zeoflow.depot.PrimaryKey;
 
-import org.junit.Ignore;
-
 import java.util.Date;
 
 /**
@@ -38,8 +36,7 @@
  */
 
 @Entity(tableName = "user_table")
-public class User
-{
+public class User {
 
     @PrimaryKey
     @NonNull
@@ -54,15 +51,13 @@ public User(@NonNull String mWord, Date date) {
     }
 
     @com.zeoflow.depot.Ignore
-    public User(@NonNull String word)
-    {
+    public User(@NonNull String word) {
         this.mWord = word;
         this.date = new Date();
     }
 
     @NonNull
-    public String getWord()
-    {
+    public String getWord() {
         return this.mWord;
     }
 

app/src/main/java/com/zeoflow/depot/adapter/WordViewHolder.java

@@ -36,8 +36,7 @@
  */
 
 @Dao
-public interface UserDao
-{
+public interface UserDao {
     // LiveData is a data holder class that can be observed within a given lifecycle.
     // Always holds/caches latest version of data. Notifies its active observers when the
     // data has changed. Since we are getting all the contents of the database,

app/src/main/java/com/zeoflow/depot/db/User.java

@@ -36,8 +36,7 @@
  */
 
 @Entity(tableName = "word_table")
-public class Word
-{
+public class Word {
 
     @PrimaryKey
     @NonNull
@@ -52,15 +51,13 @@ public Word(@NonNull String mWord, Date date_s) {
     }
 
     @com.zeoflow.depot.Ignore
-    public Word(@NonNull String word)
-    {
+    public Word(@NonNull String word) {
         this.mWord = word;
         this.date_s = new Date();
     }
 
     @NonNull
-    public String getWord()
-    {
+    public String getWord() {
         return this.mWord;
     }