a bit of refactor

ai-null · Mar 11, 2021 · 9a37ab2 · 9a37ab2
1 parent 8215cca
commit 9a37ab2
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 47 deletions.
diff --git a/app/src/main/java/com/ainul/oprek/adapter/ListItemAdapter.kt b/app/src/main/java/com/ainul/oprek/adapter/ListItemAdapter.kt
@@ -24,10 +24,7 @@ class ListItemAdapter(private val clickListener: ListItemListener) :
     ListAdapter<Project, ListItemAdapter.ListItemViewHolder>(ProjectDiffUtil()) {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ListItemViewHolder {
-        val layoutInflater = LayoutInflater.from(parent.context)
-        val holder = ListItemBinding.inflate(layoutInflater, parent, false)
-
-        return ListItemViewHolder(holder)
+        return ListItemViewHolder.from(parent)
     }
 
     override fun onBindViewHolder(holder: ListItemViewHolder, position: Int) {
@@ -44,5 +41,14 @@ class ListItemAdapter(private val clickListener: ListItemListener) :
             binding.project = data
             binding.executePendingBindings()
         }
+
+        companion object {
+            fun from (parent: ViewGroup): ListItemViewHolder {
+                val layoutInflater = LayoutInflater.from(parent.context)
+                val holder = ListItemBinding.inflate(layoutInflater, parent, false)
+
+                return ListItemViewHolder(holder)
+            }
+        }
     }
 }
diff --git a/app/src/main/java/com/ainul/oprek/util/Constants.kt b/app/src/main/java/com/ainul/oprek/util/Constants.kt
@@ -7,6 +7,8 @@ object Constants {
         CANCEL(-1);
     }
 
+    const val MASTER_KEY = "oprek-master-key"
+
     // Screen navigation request code
     const val REQUEST_CODE_UPDATE_PROJECT = 1
     const val REQUEST_CODE_CHOOSE_IMAGE = 2

diff --git a/app/src/main/java/com/ainul/oprek/util/EncryptManager.kt b/app/src/main/java/com/ainul/oprek/util/EncryptManager.kt
@@ -14,7 +14,7 @@ import androidx.security.crypto.MasterKey
 class EncryptManager(context: Context) {
 
     // this will be our private key for the app, also with the schema to encrypt
-    private val masterKey = MasterKey.Builder(context, "oprek-master-key")
+    private val masterKey = MasterKey.Builder(context, Constants.MASTER_KEY)
         .setKeyScheme(MasterKey.KeyScheme.AES256_GCM)
         .build()
 

diff --git a/app/src/main/res/layout/activity_detail_user.xml b/app/src/main/res/layout/activity_detail_user.xml
diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_profile.xml
@@ -71,6 +71,7 @@
 
                 <androidx.cardview.widget.CardView
                     android:layout_width="match_parent"
+                    android:layout_marginBottom="@dimen/medium_margin"
                     android:layout_height="wrap_content">
 
                     <LinearLayout
@@ -189,32 +190,6 @@
                         </LinearLayout>
                     </LinearLayout>
                 </androidx.cardview.widget.CardView>
-
-                <androidx.cardview.widget.CardView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/medium_margin"
-                    android:layout_marginBottom="@dimen/medium_margin">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="@color/colorWhite"
-                        android:orientation="vertical">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="@dimen/medium_margin"
-                            android:layout_marginTop="@dimen/medium_margin"
-                            android:layout_marginBottom="@dimen/margin"
-                            android:text="Statistics"
-                            android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-                            android:textStyle="bold" />
-
-
-                    </LinearLayout>
-                </androidx.cardview.widget.CardView>
             </LinearLayout>
         </androidx.core.widget.NestedScrollView>
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -155,4 +155,5 @@
 
     <string name="dialog_alert_message">%s name can\'t be empty!</string>
     <string name="history">History</string>
+    <string name="statistics">Statistics</string>
 </resources>