From 6770b8251e19dad48d0f6099def5e40b9fdd3cac Mon Sep 17 00:00:00 2001
From: omarb1989 <omarbaghdadi@yahoo.fr>
Date: Wed, 21 Jul 2021 20:35:21 +0100
Subject: [PATCH 01/28] Update Library to Android Level 30

---
 .idea/jarRepositories.xml                     | 40 +++++++++++++++++++
 .idea/runConfigurations.xml                   |  1 +
 app/build.gradle                              | 14 +++----
 .../ExampleInstrumentedTest.java              |  6 +--
 .../timetableviewdemo/EditActivity.java       |  2 +-
 .../timetableviewdemo/MainActivity.java       |  4 +-
 gradle.properties                             |  2 +
 timetableview/build.gradle                    | 12 +++---
 .../ExampleInstrumentedTest.java              |  6 +--
 .../tlaabs/timetableview/TimetableView.java   |  6 +--
 10 files changed, 67 insertions(+), 26 deletions(-)
 create mode 100644 .idea/jarRepositories.xml

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..d5518c1
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="C:\Users\Omar_User\Android\sdk\extras\android\m2repository" />
+      <option name="name" value="C:\Users\Omar_User\Android\sdk\extras\android\m2repository" />
+      <option name="url" value="file:/$USER_HOME$/Android/sdk/extras/android/m2repository" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="C:\Users\Omar_User\Android\sdk\extras\google\m2repository" />
+      <option name="name" value="C:\Users\Omar_User\Android\sdk\extras\google\m2repository" />
+      <option name="url" value="file:/$USER_HOME$/Android/sdk/extras/google/m2repository" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="C:\Users\Omar_User\Android\sdk\extras\m2repository" />
+      <option name="name" value="C:\Users\Omar_User\Android\sdk\extras\m2repository" />
+      <option name="url" value="file:/$USER_HOME$/Android/sdk/extras/m2repository" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
index 7f68460..e497da9 100644
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -3,6 +3,7 @@
   <component name="RunConfigurationProducerService">
     <option name="ignoredProducers">
       <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
diff --git a/app/build.gradle b/app/build.gradle
index 39d1c5c..ab986ff 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,14 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
     defaultConfig {
         applicationId "com.github.tlaabs.timetableviewdemo"
         minSdkVersion 19
-        targetSdkVersion 28
+        targetSdkVersion 30
         versionCode 4
         versionName "1.0.3-fx1"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     buildTypes {
         release {
@@ -20,11 +20,11 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
 
     implementation project(':timetableview')
 }
diff --git a/app/src/androidTest/java/com/github/tlaabs/timetableviewdemo/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/github/tlaabs/timetableviewdemo/ExampleInstrumentedTest.java
index d59d9ae..f982d66 100644
--- a/app/src/androidTest/java/com/github/tlaabs/timetableviewdemo/ExampleInstrumentedTest.java
+++ b/app/src/androidTest/java/com/github/tlaabs/timetableviewdemo/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package com.github.tlaabs.timetableviewdemo;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -19,7 +19,7 @@ public class ExampleInstrumentedTest {
     @Test
     public void useAppContext() {
         // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
 
         assertEquals("com.github.devsim.timetableviewdemo", appContext.getPackageName());
     }
diff --git a/app/src/main/java/com/github/tlaabs/timetableviewdemo/EditActivity.java b/app/src/main/java/com/github/tlaabs/timetableviewdemo/EditActivity.java
index f98b153..4d04fe1 100644
--- a/app/src/main/java/com/github/tlaabs/timetableviewdemo/EditActivity.java
+++ b/app/src/main/java/com/github/tlaabs/timetableviewdemo/EditActivity.java
@@ -3,7 +3,7 @@
 import android.app.TimePickerDialog;
 import android.content.Context;
 import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.AdapterView;
diff --git a/app/src/main/java/com/github/tlaabs/timetableviewdemo/MainActivity.java b/app/src/main/java/com/github/tlaabs/timetableviewdemo/MainActivity.java
index 75cce12..2e9b966 100644
--- a/app/src/main/java/com/github/tlaabs/timetableviewdemo/MainActivity.java
+++ b/app/src/main/java/com/github/tlaabs/timetableviewdemo/MainActivity.java
@@ -4,8 +4,8 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
diff --git a/gradle.properties b/gradle.properties
index 82618ce..d546dea 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,6 +6,8 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
diff --git a/timetableview/build.gradle b/timetableview/build.gradle
index eb6f9e6..34be47e 100644
--- a/timetableview/build.gradle
+++ b/timetableview/build.gradle
@@ -1,15 +1,15 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
 
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 28
+        targetSdkVersion 30
         versionCode 3
         versionName "1.0.3"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 
     }
 
@@ -25,10 +25,10 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
 
     implementation 'com.google.code.gson:gson:2.8.5'
 }
diff --git a/timetableview/src/androidTest/java/com/github/tlaabs/timetableview/ExampleInstrumentedTest.java b/timetableview/src/androidTest/java/com/github/tlaabs/timetableview/ExampleInstrumentedTest.java
index 60498f1..24824f3 100644
--- a/timetableview/src/androidTest/java/com/github/tlaabs/timetableview/ExampleInstrumentedTest.java
+++ b/timetableview/src/androidTest/java/com/github/tlaabs/timetableview/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package com.github.tlaabs.timetableview;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -19,7 +19,7 @@ public class ExampleInstrumentedTest {
     @Test
     public void useAppContext() {
         // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
 
         assertEquals("com.github.devsim.timetableview.test", appContext.getPackageName());
     }
diff --git a/timetableview/src/main/java/com/github/tlaabs/timetableview/TimetableView.java b/timetableview/src/main/java/com/github/tlaabs/timetableview/TimetableView.java
index 8f1644f..51c444a 100644
--- a/timetableview/src/main/java/com/github/tlaabs/timetableview/TimetableView.java
+++ b/timetableview/src/main/java/com/github/tlaabs/timetableview/TimetableView.java
@@ -1,6 +1,5 @@
 package com.github.tlaabs.timetableview;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
@@ -8,9 +7,8 @@
 import android.graphics.Point;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
-import android.support.v7.content.res.AppCompatResources;
+import androidx.appcompat.app.AppCompatActivity;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.util.TypedValue;
 import android.view.Display;
 import android.view.Gravity;
@@ -330,7 +328,7 @@ private RelativeLayout.LayoutParams createStickerParam(Schedule schedule) {
     }
 
     private int calCellWidth(){
-        Display display = ((Activity) context).getWindowManager().getDefaultDisplay();
+        Display display = ((AppCompatActivity) context).getWindowManager().getDefaultDisplay();
         Point size = new Point();
         display.getSize(size);
         int cell_w = (size.x-getPaddingLeft() - getPaddingRight()- sideCellWidth) / (columnCount - 1);

From a8a1ced22b29311a9daf2931a5744fdc18fee284 Mon Sep 17 00:00:00 2001
From: omarb1989 <omarbaghdadi@yahoo.fr>
Date: Sat, 31 Jul 2021 11:38:34 +0100
Subject: [PATCH 02/28] add LongClick on Sticker

This adds Long Click listener to sticker.
---
 .../timetableviewdemo/MainActivity.java       | 72 +++++++++++--------
 .../tlaabs/timetableview/TimetableView.java   | 18 +++++
 .../src/main/res/layout/table_header.xml      |  1 +
 .../src/main/res/layout/view_timetable.xml    | 18 ++---
 4 files changed, 71 insertions(+), 38 deletions(-)

diff --git a/app/src/main/java/com/github/tlaabs/timetableviewdemo/MainActivity.java b/app/src/main/java/com/github/tlaabs/timetableviewdemo/MainActivity.java
index 2e9b966..fd25192 100644
--- a/app/src/main/java/com/github/tlaabs/timetableviewdemo/MainActivity.java
+++ b/app/src/main/java/com/github/tlaabs/timetableviewdemo/MainActivity.java
@@ -3,14 +3,15 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.view.View;
 import android.widget.Button;
 import android.widget.Toast;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
 import com.github.tlaabs.timetableview.Schedule;
 import com.github.tlaabs.timetableview.TimetableView;
 
@@ -27,15 +28,23 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
     private Button loadBtn;
 
     private TimetableView timetable;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
         init();
+        timetable.setOnStickerSelectEventListener(new TimetableView.OnStickerSelectedLongClickListener() {
+            @Override
+            public void OnStickerSelectedLongClick(int idx, ArrayList<Schedule> schedules) {
+                //Toast.makeText(context, "LongClick idx = " + idx, Toast.LENGTH_SHORT).show();
+            }
+        });
+
     }
 
-    private void init(){
+    private void init() {
         this.context = this;
         addBtn = findViewById(R.id.add_btn);
         clearBtn = findViewById(R.id.clear_btn);
@@ -47,7 +56,7 @@ private void init(){
         initView();
     }
 
-    private void initView(){
+    private void initView() {
         addBtn.setOnClickListener(this);
         clearBtn.setOnClickListener(this);
         saveBtn.setOnClickListener(this);
@@ -56,22 +65,23 @@ private void initView(){
         timetable.setOnStickerSelectEventListener(new TimetableView.OnStickerSelectedListener() {
             @Override
             public void OnStickerSelected(int idx, ArrayList<Schedule> schedules) {
+                //Toast.makeText(context, "idx = " + idx, Toast.LENGTH_SHORT).show();
                 Intent i = new Intent(context, EditActivity.class);
-                i.putExtra("mode",REQUEST_EDIT);
+                i.putExtra("mode", REQUEST_EDIT);
                 i.putExtra("idx", idx);
                 i.putExtra("schedules", schedules);
-                startActivityForResult(i,REQUEST_EDIT);
+                startActivityForResult(i, REQUEST_EDIT);
             }
         });
     }
 
     @Override
     public void onClick(View v) {
-        switch (v.getId()){
+        switch (v.getId()) {
             case R.id.add_btn:
-                Intent i = new Intent(this,EditActivity.class);
-                i.putExtra("mode",REQUEST_ADD);
-                startActivityForResult(i,REQUEST_ADD);
+                Intent i = new Intent(this, EditActivity.class);
+                i.putExtra("mode", REQUEST_ADD);
+                startActivityForResult(i, REQUEST_ADD);
                 break;
             case R.id.clear_btn:
                 timetable.removeAll();
@@ -87,45 +97,49 @@ public void onClick(View v) {
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
-        switch (requestCode){
+        switch (requestCode) {
             case REQUEST_ADD:
-                if(resultCode == EditActivity.RESULT_OK_ADD){
-                    ArrayList<Schedule> item = (ArrayList<Schedule>)data.getSerializableExtra("schedules");
+                if (resultCode == EditActivity.RESULT_OK_ADD) {
+                    ArrayList<Schedule> item = (ArrayList<Schedule>) data.getSerializableExtra("schedules");
                     timetable.add(item);
                 }
                 break;
             case REQUEST_EDIT:
                 /** Edit -> Submit */
-                if(resultCode == EditActivity.RESULT_OK_EDIT){
-                    int idx = data.getIntExtra("idx",-1);
-                    ArrayList<Schedule> item = (ArrayList<Schedule>)data.getSerializableExtra("schedules");
-                    timetable.edit(idx,item);
+                if (resultCode == EditActivity.RESULT_OK_EDIT) {
+                    int idx = data.getIntExtra("idx", -1);
+                    ArrayList<Schedule> item = (ArrayList<Schedule>) data.getSerializableExtra("schedules");
+                    timetable.edit(idx, item);
                 }
                 /** Edit -> Delete */
-                else if(resultCode == EditActivity.RESULT_OK_DELETE){
-                    int idx = data.getIntExtra("idx",-1);
+                else if (resultCode == EditActivity.RESULT_OK_DELETE) {
+                    int idx = data.getIntExtra("idx", -1);
                     timetable.remove(idx);
                 }
                 break;
         }
     }
 
-    /** save timetableView's data to SharedPreferences in json format */
-    private void saveByPreference(String data){
+    /**
+     * save timetableView's data to SharedPreferences in json format
+     */
+    private void saveByPreference(String data) {
         SharedPreferences mPref = PreferenceManager.getDefaultSharedPreferences(this);
         SharedPreferences.Editor editor = mPref.edit();
-        editor.putString("timetable_demo",data);
+        editor.putString("timetable_demo", data);
         editor.commit();
-        Toast.makeText(this,"saved!",Toast.LENGTH_SHORT).show();
+        Toast.makeText(this, "saved!", Toast.LENGTH_SHORT).show();
     }
 
-    /** get json data from SharedPreferences and then restore the timetable */
-    private void loadSavedData(){
+    /**
+     * get json data from SharedPreferences and then restore the timetable
+     */
+    private void loadSavedData() {
         timetable.removeAll();
         SharedPreferences mPref = PreferenceManager.getDefaultSharedPreferences(this);
-        String savedData = mPref.getString("timetable_demo","");
-        if(savedData == null && savedData.equals("")) return;
+        String savedData = mPref.getString("timetable_demo", "");
+        if (savedData == null && savedData.equals("")) return;
         timetable.load(savedData);
-        Toast.makeText(this,"loaded!",Toast.LENGTH_SHORT).show();
+        Toast.makeText(this, "loaded!", Toast.LENGTH_SHORT).show();
     }
 }
diff --git a/timetableview/src/main/java/com/github/tlaabs/timetableview/TimetableView.java b/timetableview/src/main/java/com/github/tlaabs/timetableview/TimetableView.java
index 51c444a..74752db 100644
--- a/timetableview/src/main/java/com/github/tlaabs/timetableview/TimetableView.java
+++ b/timetableview/src/main/java/com/github/tlaabs/timetableview/TimetableView.java
@@ -57,6 +57,7 @@ public class TimetableView extends LinearLayout {
     private int stickerCount = -1;
 
     private OnStickerSelectedListener stickerSelectedListener = null;
+    private OnStickerSelectedLongClickListener stickerSelectedLongClickListener = null;
 
     private HighlightMode highlightMode = HighlightMode.COLOR;
     private int headerHighlightImageSize;
@@ -107,12 +108,17 @@ private void init() {
         tableHeader = view.findViewById(R.id.table_header);
         tableBox = view.findViewById(R.id.table_box);
 
+
         createTable();
     }
 
     public void setOnStickerSelectEventListener(OnStickerSelectedListener listener) {
         stickerSelectedListener = listener;
     }
+    public void setOnStickerSelectEventListener(OnStickerSelectedLongClickListener listener) {
+        stickerSelectedLongClickListener = listener;
+    }
+
 
     /**
      * date : 2019-02-08
@@ -168,6 +174,15 @@ public void onClick(View v) {
                         stickerSelectedListener.OnStickerSelected(count, schedules);
                 }
             });
+            tv.setOnLongClickListener(new OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View v) {
+                    if(stickerSelectedLongClickListener != null)
+                        stickerSelectedLongClickListener.OnStickerSelectedLongClick(count, schedules);
+                    return true;
+                }
+            });
+
 
             sticker.addTextView(tv);
             sticker.addSchedule(schedule);
@@ -387,6 +402,9 @@ private void onCreateByBuilder(Builder builder) {
     public interface OnStickerSelectedListener {
         void OnStickerSelected(int idx, ArrayList<Schedule> schedules);
     }
+    public interface OnStickerSelectedLongClickListener {
+        void OnStickerSelectedLongClick(int idx, ArrayList<Schedule> schedules);
+    }
 
     static class Builder {
         private Context context;
diff --git a/timetableview/src/main/res/layout/table_header.xml b/timetableview/src/main/res/layout/table_header.xml
index faf08c4..a300977 100644
--- a/timetableview/src/main/res/layout/table_header.xml
+++ b/timetableview/src/main/res/layout/table_header.xml
@@ -2,6 +2,7 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
     <TableLayout
         android:id="@+id/table_header"
+
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         >
diff --git a/timetableview/src/main/res/layout/view_timetable.xml b/timetableview/src/main/res/layout/view_timetable.xml
index a7ec1a4..21abab4 100644
--- a/timetableview/src/main/res/layout/view_timetable.xml
+++ b/timetableview/src/main/res/layout/view_timetable.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    >
-    <include layout="@layout/table_header"/>
+    android:orientation="vertical">
+
+    <include layout="@layout/table_header" />
 
     <ScrollView
         android:layout_width="match_parent"
+
         android:layout_height="0dp"
-        android:layout_weight="1"
-        >
+        android:layout_weight="1">
 
         <RelativeLayout
             android:id="@+id/sticker_box"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:background="#DF2541">
 
-            <include layout="@layout/inner_table"/>
+            <include layout="@layout/inner_table" />
 
         </RelativeLayout>
     </ScrollView>

From a00a3573b0ad701416a0f6fb10f5aa29736a471e Mon Sep 17 00:00:00 2001
From: omarb1989 <omarbaghdadi@yahoo.fr>
Date: Mon, 2 Aug 2021 08:54:04 +0100
Subject: [PATCH 03/28] change package name

this changes package name from com.tlaabs to com.omarb1989
---
 README.md                                              | 10 +++++-----
 app/build.gradle                                       |  2 +-
 .../timetableviewdemo/ExampleInstrumentedTest.java     |  2 +-
 app/src/main/AndroidManifest.xml                       |  6 +++---
 .../timetableviewdemo/EditActivity.java                |  6 +++---
 .../timetableviewdemo/MainActivity.java                |  6 +++---
 app/src/main/res/layout/activity_main.xml              |  2 +-
 .../timetableviewdemo/ExampleUnitTest.java             |  2 +-
 timetableview/build.gradle                             |  2 +-
 .../timetableview/ExampleInstrumentedTest.java         |  2 +-
 timetableview/src/main/AndroidManifest.xml             |  2 +-
 .../timetableview/HighlightMode.java                   |  2 +-
 .../timetableview/SaveManager.java                     |  4 +---
 .../{tlaabs => omarb1989}/timetableview/Schedule.java  |  2 +-
 .../{tlaabs => omarb1989}/timetableview/Sticker.java   |  2 +-
 .../{tlaabs => omarb1989}/timetableview/Time.java      |  2 +-
 .../timetableview/TimetableView.java                   |  2 +-
 .../timetableview/ExampleUnitTest.java                 |  2 +-
 18 files changed, 28 insertions(+), 30 deletions(-)
 rename app/src/androidTest/java/com/github/{tlaabs => omarb1989}/timetableviewdemo/ExampleInstrumentedTest.java (93%)
 rename app/src/main/java/com/github/{tlaabs => omarb1989}/timetableviewdemo/EditActivity.java (97%)
 rename app/src/main/java/com/github/{tlaabs => omarb1989}/timetableviewdemo/MainActivity.java (96%)
 rename app/src/test/java/com/github/{tlaabs => omarb1989}/timetableviewdemo/ExampleUnitTest.java (87%)
 rename timetableview/src/androidTest/java/com/github/{tlaabs => omarb1989}/timetableview/ExampleInstrumentedTest.java (94%)
 rename timetableview/src/main/java/com/github/{tlaabs => omarb1989}/timetableview/HighlightMode.java (54%)
 rename timetableview/src/main/java/com/github/{tlaabs => omarb1989}/timetableview/SaveManager.java (98%)
 rename timetableview/src/main/java/com/github/{tlaabs => omarb1989}/timetableview/Schedule.java (97%)
 rename timetableview/src/main/java/com/github/{tlaabs => omarb1989}/timetableview/Sticker.java (93%)
 rename timetableview/src/main/java/com/github/{tlaabs => omarb1989}/timetableview/Time.java (92%)
 rename timetableview/src/main/java/com/github/{tlaabs => omarb1989}/timetableview/TimetableView.java (99%)
 rename timetableview/src/test/java/com/github/{tlaabs => omarb1989}/timetableview/ExampleUnitTest.java (88%)

diff --git a/README.md b/README.md
index 40bdc1f..37a52ab 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ allprojects {
 Add the dependency
 ```gradle
 dependencies {
-	implementation 'com.github.tlaabs:TimetableView:1.0.3-fx1'
+	implementation 'omarb1989:TimetableView:1.0.3-fx1'
 }
 ```
 
@@ -36,7 +36,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto"
 
 ### TimetableView in layout
 ```xml
-<com.github.tlaabs.timetableview.TimetableView
+<omarb1989.timetableview.TimetableView
         android:id="@+id/timetable"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -73,7 +73,7 @@ First, write a string-array as below on values/strings.xml.
 ```
 Then, apply that to timetable attribute.
 ```xml
-<com.github.tlaabs.timetableview.TimetableView
+<omarb1989.timetableview.TimetableView
     android:id="@+id/timetable"
     android:layout_width="match_parent"
     android:layout_height="0dp"
@@ -123,7 +123,7 @@ timetable.removeAll(); // remove all items
 ### Highlight header
 **1.Color type(Default)**
 ```xml
-<com.github.tlaabs.timetableview.TimetableView
+<omarb1989.timetableview.TimetableView
     android:id="@+id/timetable"
     android:layout_width="match_parent"
     android:layout_height="0dp"
@@ -132,7 +132,7 @@ timetable.removeAll(); // remove all items
 ```
 **2.Image type**
 ```xml
-<com.github.tlaabs.timetableview.TimetableView
+<omarb1989.timetableview.TimetableView
     android:id="@+id/timetable"
     android:layout_width="match_parent"
     android:layout_height="0dp"
diff --git a/app/build.gradle b/app/build.gradle
index ab986ff..1667e71 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
 android {
     compileSdkVersion 30
     defaultConfig {
-        applicationId "com.github.tlaabs.timetableviewdemo"
+        applicationId "com.github.omarb1989.timetableviewdemo"
         minSdkVersion 19
         targetSdkVersion 30
         versionCode 4
diff --git a/app/src/androidTest/java/com/github/tlaabs/timetableviewdemo/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/github/omarb1989/timetableviewdemo/ExampleInstrumentedTest.java
similarity index 93%
rename from app/src/androidTest/java/com/github/tlaabs/timetableviewdemo/ExampleInstrumentedTest.java
rename to app/src/androidTest/java/com/github/omarb1989/timetableviewdemo/ExampleInstrumentedTest.java
index f982d66..6ebf481 100644
--- a/app/src/androidTest/java/com/github/tlaabs/timetableviewdemo/ExampleInstrumentedTest.java
+++ b/app/src/androidTest/java/com/github/omarb1989/timetableviewdemo/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package com.github.tlaabs.timetableviewdemo;
+package com.github.omarb1989.timetableviewdemo;
 
 import android.content.Context;
 import androidx.test.platform.app.InstrumentationRegistry;
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0adfe8d..ea0ff70 100644
--- 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="com.github.tlaabs.timetableviewdemo">
+    package="com.github.omarb1989.timetableviewdemo">
 
     <application
         android:allowBackup="true"
@@ -9,14 +9,14 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name="com.github.tlaabs.timetableviewdemo.MainActivity">
+        <activity android:name="com.github.omarb1989.timetableviewdemo.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="com.github.tlaabs.timetableviewdemo.EditActivity"></activity>
+        <activity android:name="com.github.omarb1989.timetableviewdemo.EditActivity"></activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/github/tlaabs/timetableviewdemo/EditActivity.java b/app/src/main/java/com/github/omarb1989/timetableviewdemo/EditActivity.java
similarity index 97%
rename from app/src/main/java/com/github/tlaabs/timetableviewdemo/EditActivity.java
rename to app/src/main/java/com/github/omarb1989/timetableviewdemo/EditActivity.java
index 4d04fe1..ec64517 100644
--- a/app/src/main/java/com/github/tlaabs/timetableviewdemo/EditActivity.java
+++ b/app/src/main/java/com/github/omarb1989/timetableviewdemo/EditActivity.java
@@ -1,4 +1,4 @@
-package com.github.tlaabs.timetableviewdemo;
+package com.github.omarb1989.timetableviewdemo;
 
 import android.app.TimePickerDialog;
 import android.content.Context;
@@ -13,8 +13,8 @@
 import android.widget.TextView;
 import android.widget.TimePicker;
 
-import com.github.tlaabs.timetableview.Schedule;
-import com.github.tlaabs.timetableview.Time;
+import com.github.omarb1989.timetableview.Schedule;
+import com.github.omarb1989.timetableview.Time;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/java/com/github/tlaabs/timetableviewdemo/MainActivity.java b/app/src/main/java/com/github/omarb1989/timetableviewdemo/MainActivity.java
similarity index 96%
rename from app/src/main/java/com/github/tlaabs/timetableviewdemo/MainActivity.java
rename to app/src/main/java/com/github/omarb1989/timetableviewdemo/MainActivity.java
index fd25192..2307806 100644
--- a/app/src/main/java/com/github/tlaabs/timetableviewdemo/MainActivity.java
+++ b/app/src/main/java/com/github/omarb1989/timetableviewdemo/MainActivity.java
@@ -1,4 +1,4 @@
-package com.github.tlaabs.timetableviewdemo;
+package com.github.omarb1989.timetableviewdemo;
 
 import android.content.Context;
 import android.content.Intent;
@@ -12,8 +12,8 @@
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
-import com.github.tlaabs.timetableview.Schedule;
-import com.github.tlaabs.timetableview.TimetableView;
+import com.github.omarb1989.timetableview.Schedule;
+import com.github.omarb1989.timetableview.TimetableView;
 
 import java.util.ArrayList;
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index aeafffd..327b1e1 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -41,7 +41,7 @@
 
     </LinearLayout>
 
-    <com.github.tlaabs.timetableview.TimetableView
+    <com.github.omarb1989.timetableview.TimetableView
         android:id="@+id/timetable"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/test/java/com/github/tlaabs/timetableviewdemo/ExampleUnitTest.java b/app/src/test/java/com/github/omarb1989/timetableviewdemo/ExampleUnitTest.java
similarity index 87%
rename from app/src/test/java/com/github/tlaabs/timetableviewdemo/ExampleUnitTest.java
rename to app/src/test/java/com/github/omarb1989/timetableviewdemo/ExampleUnitTest.java
index 0eae514..ff041b6 100644
--- a/app/src/test/java/com/github/tlaabs/timetableviewdemo/ExampleUnitTest.java
+++ b/app/src/test/java/com/github/omarb1989/timetableviewdemo/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package com.github.tlaabs.timetableviewdemo;
+package com.github.omarb1989.timetableviewdemo;
 
 import org.junit.Test;
 
diff --git a/timetableview/build.gradle b/timetableview/build.gradle
index 34be47e..c373c11 100644
--- a/timetableview/build.gradle
+++ b/timetableview/build.gradle
@@ -33,4 +33,4 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.8.5'
 }
 apply plugin: 'com.github.dcendents.android-maven'
-group='com.github.tlaabs'
\ No newline at end of file
+group='com.github.omarb1989'
\ No newline at end of file
diff --git a/timetableview/src/androidTest/java/com/github/tlaabs/timetableview/ExampleInstrumentedTest.java b/timetableview/src/androidTest/java/com/github/omarb1989/timetableview/ExampleInstrumentedTest.java
similarity index 94%
rename from timetableview/src/androidTest/java/com/github/tlaabs/timetableview/ExampleInstrumentedTest.java
rename to timetableview/src/androidTest/java/com/github/omarb1989/timetableview/ExampleInstrumentedTest.java
index 24824f3..226c2e2 100644
--- a/timetableview/src/androidTest/java/com/github/tlaabs/timetableview/ExampleInstrumentedTest.java
+++ b/timetableview/src/androidTest/java/com/github/omarb1989/timetableview/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package com.github.tlaabs.timetableview;
+package com.github.omarb1989.timetableview;
 
 import android.content.Context;
 import androidx.test.platform.app.InstrumentationRegistry;
diff --git a/timetableview/src/main/AndroidManifest.xml b/timetableview/src/main/AndroidManifest.xml
index 908ce02..65f8816 100644
--- a/timetableview/src/main/AndroidManifest.xml
+++ b/timetableview/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.github.tlaabs.timetableview" />
+    package="com.github.omarb1989.timetableview" />
diff --git a/timetableview/src/main/java/com/github/tlaabs/timetableview/HighlightMode.java b/timetableview/src/main/java/com/github/omarb1989/timetableview/HighlightMode.java
similarity index 54%
rename from timetableview/src/main/java/com/github/tlaabs/timetableview/HighlightMode.java
rename to timetableview/src/main/java/com/github/omarb1989/timetableview/HighlightMode.java
index dfa98a2..31b92de 100644
--- a/timetableview/src/main/java/com/github/tlaabs/timetableview/HighlightMode.java
+++ b/timetableview/src/main/java/com/github/omarb1989/timetableview/HighlightMode.java
@@ -1,4 +1,4 @@
-package com.github.tlaabs.timetableview;
+package com.github.omarb1989.timetableview;
 
 public enum HighlightMode {
     COLOR,
diff --git a/timetableview/src/main/java/com/github/tlaabs/timetableview/SaveManager.java b/timetableview/src/main/java/com/github/omarb1989/timetableview/SaveManager.java
similarity index 98%
rename from timetableview/src/main/java/com/github/tlaabs/timetableview/SaveManager.java
rename to timetableview/src/main/java/com/github/omarb1989/timetableview/SaveManager.java
index de62c9a..b0a3c89 100644
--- a/timetableview/src/main/java/com/github/tlaabs/timetableview/SaveManager.java
+++ b/timetableview/src/main/java/com/github/omarb1989/timetableview/SaveManager.java
@@ -1,6 +1,4 @@
-package com.github.tlaabs.timetableview;
-
-import android.util.Log;
+package com.github.omarb1989.timetableview;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
diff --git a/timetableview/src/main/java/com/github/tlaabs/timetableview/Schedule.java b/timetableview/src/main/java/com/github/omarb1989/timetableview/Schedule.java
similarity index 97%
rename from timetableview/src/main/java/com/github/tlaabs/timetableview/Schedule.java
rename to timetableview/src/main/java/com/github/omarb1989/timetableview/Schedule.java
index 64c7815..bb99dd4 100644
--- a/timetableview/src/main/java/com/github/tlaabs/timetableview/Schedule.java
+++ b/timetableview/src/main/java/com/github/omarb1989/timetableview/Schedule.java
@@ -1,4 +1,4 @@
-package com.github.tlaabs.timetableview;
+package com.github.omarb1989.timetableview;
 
 import java.io.Serializable;
 
diff --git a/timetableview/src/main/java/com/github/tlaabs/timetableview/Sticker.java b/timetableview/src/main/java/com/github/omarb1989/timetableview/Sticker.java
similarity index 93%
rename from timetableview/src/main/java/com/github/tlaabs/timetableview/Sticker.java
rename to timetableview/src/main/java/com/github/omarb1989/timetableview/Sticker.java
index 6a32e39..17382b1 100644
--- a/timetableview/src/main/java/com/github/tlaabs/timetableview/Sticker.java
+++ b/timetableview/src/main/java/com/github/omarb1989/timetableview/Sticker.java
@@ -1,4 +1,4 @@
-package com.github.tlaabs.timetableview;
+package com.github.omarb1989.timetableview;
 
 import android.widget.TextView;
 
diff --git a/timetableview/src/main/java/com/github/tlaabs/timetableview/Time.java b/timetableview/src/main/java/com/github/omarb1989/timetableview/Time.java
similarity index 92%
rename from timetableview/src/main/java/com/github/tlaabs/timetableview/Time.java
rename to timetableview/src/main/java/com/github/omarb1989/timetableview/Time.java
index e9272e1..6f213d4 100644
--- a/timetableview/src/main/java/com/github/tlaabs/timetableview/Time.java
+++ b/timetableview/src/main/java/com/github/omarb1989/timetableview/Time.java
@@ -1,4 +1,4 @@
-package com.github.tlaabs.timetableview;
+package com.github.omarb1989.timetableview;
 
 import java.io.Serializable;
 
diff --git a/timetableview/src/main/java/com/github/tlaabs/timetableview/TimetableView.java b/timetableview/src/main/java/com/github/omarb1989/timetableview/TimetableView.java
similarity index 99%
rename from timetableview/src/main/java/com/github/tlaabs/timetableview/TimetableView.java
rename to timetableview/src/main/java/com/github/omarb1989/timetableview/TimetableView.java
index 74752db..0d231ca 100644
--- a/timetableview/src/main/java/com/github/tlaabs/timetableview/TimetableView.java
+++ b/timetableview/src/main/java/com/github/omarb1989/timetableview/TimetableView.java
@@ -1,4 +1,4 @@
-package com.github.tlaabs.timetableview;
+package com.github.omarb1989.timetableview;
 
 import android.content.Context;
 import android.content.res.Resources;
diff --git a/timetableview/src/test/java/com/github/tlaabs/timetableview/ExampleUnitTest.java b/timetableview/src/test/java/com/github/omarb1989/timetableview/ExampleUnitTest.java
similarity index 88%
rename from timetableview/src/test/java/com/github/tlaabs/timetableview/ExampleUnitTest.java
rename to timetableview/src/test/java/com/github/omarb1989/timetableview/ExampleUnitTest.java
index f3b41e4..2b3559c 100644
--- a/timetableview/src/test/java/com/github/tlaabs/timetableview/ExampleUnitTest.java
+++ b/timetableview/src/test/java/com/github/omarb1989/timetableview/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package com.github.tlaabs.timetableview;
+package com.github.omarb1989.timetableview;
 
 import org.junit.Test;
 

From eb35b93dcbf18bb5366a4b7929f20f4c79598673 Mon Sep 17 00:00:00 2001
From: omarb1989 <omarbaghdadi@yahoo.fr>
Date: Mon, 2 Aug 2021 08:58:19 +0100
Subject: [PATCH 04/28] change App version

this changes App version from 1.0.3-fx1 to 1.0.3-fx2
---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1667e71..7242917 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "com.github.omarb1989.timetableviewdemo"
         minSdkVersion 19
         targetSdkVersion 30
-        versionCode 4
-        versionName "1.0.3-fx1"
+        versionCode 5
+        versionName "1.0.3-fx2"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     buildTypes {

From 53004359d486115be4f5e7b0309c832f3233d5d9 Mon Sep 17 00:00:00 2001
From: omarb1989 <omarbaghdadi@yahoo.fr>
Date: Mon, 2 Aug 2021 09:18:00 +0100
Subject: [PATCH 05/28] change App version

this changes App version from 1.0.3-fx2 to 1.0.3-fx3
---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7242917..83e462d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,7 +7,7 @@ android {
         minSdkVersion 19
         targetSdkVersion 30
         versionCode 5
-        versionName "1.0.3-fx2"
+        versionName "1.0.3-fx3"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     buildTypes {

From aea1c983b70f1827eecac0a74fe90bbdaa1632e2 Mon Sep 17 00:00:00 2001
From: omarb1989 <omarbaghdadi@yahoo.fr>
Date: Mon, 2 Aug 2021 11:13:56 +0100
Subject: [PATCH 06/28] Update README.md

---
 README.md | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 37a52ab..0e64123 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # TimetableView
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
 [![API](https://img.shields.io/badge/API-19%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=19)
-[![](https://jitpack.io/v/tlaabs/TimetableView.svg)](https://jitpack.io/#tlaabs/TimetableView)
+[![](https://jitpack.io/v/omarb1989/TimetableView.svg)](https://jitpack.io/#omarb1989/TimetableView)
 
 Android Library that creates simple time table.
 
@@ -23,7 +23,7 @@ allprojects {
 Add the dependency
 ```gradle
 dependencies {
-	implementation 'omarb1989:TimetableView:1.0.3-fx1'
+	implementation 'omarb1989:TimetableView:1.0.3-fx3'
 }
 ```
 
@@ -93,7 +93,18 @@ timetable.setOnStickerSelectEventListener(new TimetableView.OnStickerSelectedLis
     }
 });
 ```
+### OnStickerSelectedLongClickListener
+OnStickerSelectedLongClickListener is invoked when Long clicked by user.
 
+idx is used to edit or delete. 
+```java
+timetable.setOnStickerSelectEventListener(new TimetableView.OnStickerSelectedLongClickListener() {
+            @Override
+            public void OnStickerSelectedLongClick(int idx, ArrayList<Schedule> schedules) {
+                
+            }
+        });
+```
 ### Add schdule
 ```java
 ArrayList<Schedule> schedules = new ArrayList<Schedule>();
@@ -155,7 +166,7 @@ timetable.load(json); // restore
 
 # License
 ```xml
-Copyright 2019 tlaabs
+Copyright 2019 tlaabs, forked and updated by omarb1989
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

From 75f5c8baba9fec1fd1dcaab5cd523c1b1defddfa Mon Sep 17 00:00:00 2001
From: omarb1989 <omarbaghdadi@yahoo.fr>
Date: Tue, 3 Aug 2021 22:01:36 +0100
Subject: [PATCH 07/28] apply a default timetable colors

---
 .../github/omarb1989/timetableviewdemo/MainActivity.java    | 2 ++
 .../com/github/omarb1989/timetableview/TimetableView.java   | 2 +-
 timetableview/src/main/res/layout/table_header.xml          | 5 ++---
 timetableview/src/main/res/layout/view_timetable.xml        | 3 +--
 timetableview/src/main/res/values/colors.xml                | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/github/omarb1989/timetableviewdemo/MainActivity.java b/app/src/main/java/com/github/omarb1989/timetableviewdemo/MainActivity.java
index 2307806..f9329a1 100644
--- a/app/src/main/java/com/github/omarb1989/timetableviewdemo/MainActivity.java
+++ b/app/src/main/java/com/github/omarb1989/timetableviewdemo/MainActivity.java
@@ -11,6 +11,7 @@
 
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.res.ResourcesCompat;
 
 import com.github.omarb1989.timetableview.Schedule;
 import com.github.omarb1989.timetableview.TimetableView;
@@ -41,6 +42,7 @@ public void OnStickerSelectedLongClick(int idx, ArrayList<Schedule> schedules) {
                 //Toast.makeText(context, "LongClick idx = " + idx, Toast.LENGTH_SHORT).show();
             }
         });
+       // timetable.setBackgroundColor(ResourcesCompat.getColor(getResources(),R.color.default_sticker_font_color));
 
     }
 
diff --git a/timetableview/src/main/java/com/github/omarb1989/timetableview/TimetableView.java b/timetableview/src/main/java/com/github/omarb1989/timetableview/TimetableView.java
index 0d231ca..03223cd 100644
--- a/timetableview/src/main/java/com/github/omarb1989/timetableview/TimetableView.java
+++ b/timetableview/src/main/java/com/github/omarb1989/timetableview/TimetableView.java
@@ -296,7 +296,7 @@ private void createTable() {
                     tv.setText(getHeaderTime(i));
                     tv.setTextColor(getResources().getColor(R.color.colorHeaderText));
                     tv.setTextSize(TypedValue.COMPLEX_UNIT_DIP, DEFAULT_SIDE_HEADER_FONT_SIZE_DP);
-                    tv.setBackgroundColor(getResources().getColor(R.color.colorHeader));
+                    tv.setBackgroundColor(getResources().getColor(R.color.colorSideHeader));
                     tv.setGravity(Gravity.TOP | Gravity.CENTER_HORIZONTAL);
                     tv.setLayoutParams(createTableRowParam(sideCellWidth, cellHeight));
                 } else {
diff --git a/timetableview/src/main/res/layout/table_header.xml b/timetableview/src/main/res/layout/table_header.xml
index a300977..d282a87 100644
--- a/timetableview/src/main/res/layout/table_header.xml
+++ b/timetableview/src/main/res/layout/table_header.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
+
     <TableLayout
         android:id="@+id/table_header"
-
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        >
-    </TableLayout>
+         />
 </merge>
\ No newline at end of file
diff --git a/timetableview/src/main/res/layout/view_timetable.xml b/timetableview/src/main/res/layout/view_timetable.xml
index 21abab4..1254e9c 100644
--- a/timetableview/src/main/res/layout/view_timetable.xml
+++ b/timetableview/src/main/res/layout/view_timetable.xml
@@ -15,8 +15,7 @@
         <RelativeLayout
             android:id="@+id/sticker_box"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="#DF2541">
+            android:layout_height="wrap_content">
 
             <include layout="@layout/inner_table" />
 
diff --git a/timetableview/src/main/res/values/colors.xml b/timetableview/src/main/res/values/colors.xml
index 19c69f5..c1543e9 100644
--- a/timetableview/src/main/res/values/colors.xml
+++ b/timetableview/src/main/res/values/colors.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorHeader">#fcfcfc</color>
-    <color name="colorHeaderText">#7d7d7d</color>
-    <color name="colorTableItem">#efefef</color>
+    <color name="colorSideHeader">#ffffff</color>
+    <color name="colorHeaderText">#D9000000</color>
+    <color name="colorTableItem">#F5F5F5</color>
 
     <string-array name="default_sticker_color">
         <item>#f08676</item>

From 32ec9ce3adf67cf85f7f0898e4170b10f875f7ff Mon Sep 17 00:00:00 2001
From: omarb1989 <omarbaghdadi@yahoo.fr>
Date: Wed, 4 Aug 2021 19:00:27 +0100
Subject: [PATCH 08/28] Add more TimetableView attributes to support Material
 Design

this adds 4 color attributes for TimetableView customization:
- color_surface
- color_borders
- side_color_text
- color side
and  you can also set these attributes programmatically.
---
 app/src/main/res/layout/activity_main.xml     |   1 +
 .../timetableview/TimetableView.java          | 102 ++++++++++++++----
 .../src/main/res/drawable/item_border.xml     |   4 +-
 .../src/main/res/values/attrs_timetable.xml   |  28 ++---
 timetableview/src/main/res/values/colors.xml  |  10 +-
 5 files changed, 103 insertions(+), 42 deletions(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 327b1e1..ff24b1d 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -50,4 +50,5 @@
         app:header_highlight_type="image"
         app:header_title="@array/header_title" />
 
+
 </LinearLayout>
\ No newline at end of file
diff --git a/timetableview/src/main/java/com/github/omarb1989/timetableview/TimetableView.java b/timetableview/src/main/java/com/github/omarb1989/timetableview/TimetableView.java
index 03223cd..51f424a 100644
--- a/timetableview/src/main/java/com/github/omarb1989/timetableview/TimetableView.java
+++ b/timetableview/src/main/java/com/github/omarb1989/timetableview/TimetableView.java
@@ -6,9 +6,12 @@
 import android.graphics.Color;
 import android.graphics.Point;
 import android.graphics.Typeface;
+import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
-import androidx.appcompat.app.AppCompatActivity;
+import android.graphics.drawable.GradientDrawable;
+import android.graphics.drawable.ShapeDrawable;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.util.TypedValue;
 import android.view.Display;
 import android.view.Gravity;
@@ -21,6 +24,9 @@
 import android.widget.TableRow;
 import android.widget.TextView;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.content.res.ResourcesCompat;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -46,6 +52,10 @@ public class TimetableView extends LinearLayout {
     private String[] stickerColors;
     private int startTime;
     private int headerHighlightColor;
+    private int colorSurface;
+    private int colorBorders;
+    private int sideColorText;
+    private int sideColor;
 
     private RelativeLayout stickerBox;
     TableLayout tableHeader;
@@ -91,11 +101,15 @@ private void getAttrs(AttributeSet attrs) {
         stickerColors = a.getResources().getStringArray(colorsId);
         startTime = a.getInt(R.styleable.TimetableView_start_time, DEFAULT_START_TIME);
         headerHighlightColor = a.getColor(R.styleable.TimetableView_header_highlight_color, getResources().getColor(R.color.default_header_highlight_color));
-        int highlightTypeValue = a.getInteger(R.styleable.TimetableView_header_highlight_type,0);
-        if(highlightTypeValue == 0) highlightMode = HighlightMode.COLOR;
-        else if(highlightTypeValue == 1) highlightMode = HighlightMode.IMAGE;
+        int highlightTypeValue = a.getInteger(R.styleable.TimetableView_header_highlight_type, 0);
+        if (highlightTypeValue == 0) highlightMode = HighlightMode.COLOR;
+        else if (highlightTypeValue == 1) highlightMode = HighlightMode.IMAGE;
         headerHighlightImageSize = a.getDimensionPixelSize(R.styleable.TimetableView_header_highlight_image_size, dp2Px(24));
         headerHighlightImage = a.getDrawable(R.styleable.TimetableView_header_highlight_image);
+        colorSurface = a.getColor(R.styleable.TimetableView_color_surface, getResources().getColor(R.color.default_color_surface));
+        colorBorders = a.getColor(R.styleable.TimetableView_color_borders, getResources().getColor(R.color.colorBorders));
+        sideColorText = a.getColor(R.styleable.TimetableView_side_color_text, getResources().getColor(R.color.default_color_side_text));
+        sideColor = a.getColor(R.styleable.TimetableView_color_side, getResources().getColor(R.color.colorSideHeader));
         a.recycle();
     }
 
@@ -115,6 +129,7 @@ private void init() {
     public void setOnStickerSelectEventListener(OnStickerSelectedListener listener) {
         stickerSelectedListener = listener;
     }
+
     public void setOnStickerSelectEventListener(OnStickerSelectedLongClickListener listener) {
         stickerSelectedLongClickListener = listener;
     }
@@ -170,14 +185,14 @@ private void add(final ArrayList<Schedule> schedules, int specIdx) {
             tv.setOnClickListener(new OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    if(stickerSelectedListener != null)
+                    if (stickerSelectedListener != null)
                         stickerSelectedListener.OnStickerSelected(count, schedules);
                 }
             });
             tv.setOnLongClickListener(new OnLongClickListener() {
                 @Override
                 public boolean onLongClick(View v) {
-                    if(stickerSelectedLongClickListener != null)
+                    if (stickerSelectedLongClickListener != null)
                         stickerSelectedLongClickListener.OnStickerSelectedLongClick(count, schedules);
                     return true;
                 }
@@ -234,30 +249,29 @@ public void remove(int idx) {
     }
 
     public void setHeaderHighlight(int idx) {
-        if(idx < 0)return;
+        if (idx < 0) return;
         TableRow row = (TableRow) tableHeader.getChildAt(0);
         View element = row.getChildAt(idx);
-        if(highlightMode == HighlightMode.COLOR) {
-            TextView tx = (TextView)element;
+        if (highlightMode == HighlightMode.COLOR) {
+            TextView tx = (TextView) element;
             tx.setTextColor(Color.parseColor("#FFFFFF"));
             tx.setBackgroundColor(headerHighlightColor);
             tx.setTypeface(null, Typeface.BOLD);
             tx.setTextSize(TypedValue.COMPLEX_UNIT_DIP, DEFAULT_HEADER_HIGHLIGHT_FONT_SIZE_DP);
-        }
-        else if(highlightMode == HighlightMode.IMAGE){
+        } else if (highlightMode == HighlightMode.IMAGE) {
             RelativeLayout outer = new RelativeLayout(context);
             outer.setLayoutParams(createTableRowParam(cellHeight));
             ImageView iv = new ImageView(context);
-            RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(headerHighlightImageSize,headerHighlightImageSize);
-            params.addRule(RelativeLayout.CENTER_IN_PARENT,RelativeLayout.TRUE);
+            RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(headerHighlightImageSize, headerHighlightImageSize);
+            params.addRule(RelativeLayout.CENTER_IN_PARENT, RelativeLayout.TRUE);
             iv.setLayoutParams(params);
             iv.setScaleType(ImageView.ScaleType.CENTER_CROP);
 
             row.removeViewAt(idx);
             outer.addView(iv);
-            row.addView(outer,idx);
+            row.addView(outer, idx);
 
-            if(headerHighlightImage != null) {
+            if (headerHighlightImage != null) {
                 iv.setImageDrawable(headerHighlightImage);
             }
 
@@ -292,16 +306,29 @@ private void createTable() {
             for (int k = 0; k < columnCount; k++) {
                 TextView tv = new TextView(context);
                 tv.setLayoutParams(createTableRowParam(cellHeight));
+                tv.setTextColor(sideColorText);
                 if (k == 0) {
                     tv.setText(getHeaderTime(i));
-                    tv.setTextColor(getResources().getColor(R.color.colorHeaderText));
                     tv.setTextSize(TypedValue.COMPLEX_UNIT_DIP, DEFAULT_SIDE_HEADER_FONT_SIZE_DP);
-                    tv.setBackgroundColor(getResources().getColor(R.color.colorSideHeader));
+                    tv.setBackgroundColor(sideColor);
                     tv.setGravity(Gravity.TOP | Gravity.CENTER_HORIZONTAL);
                     tv.setLayoutParams(createTableRowParam(sideCellWidth, cellHeight));
                 } else {
                     tv.setText("");
-                    tv.setBackground(getResources().getDrawable(R.drawable.item_border));
+                    /* ------------set shape color and Stroke of item_border.xml ---------- */
+                    Resources res = getResources();
+                    Log.i("createTable", "color surface: " + String.valueOf(colorSurface));
+                    tv.setBackground(ResourcesCompat.getDrawable(res, R.drawable.item_border, null));
+                    Drawable background = tv.getBackground();
+                    if (background instanceof ShapeDrawable) {
+                        ((ShapeDrawable) background).getPaint().setColor(colorSurface);
+                    } else if (background instanceof GradientDrawable) {
+                        ((GradientDrawable) background).setColor(colorSurface);
+                        ((GradientDrawable) background).setStroke(2,colorBorders);
+                    } else if (background instanceof ColorDrawable) {
+                        ((ColorDrawable) background).setColor(colorSurface);
+                    }
+                    /* --------------------- Finish set ----------------------- */
                     tv.setGravity(Gravity.RIGHT);
                 }
                 tableRow.addView(tv);
@@ -321,7 +348,7 @@ private void createTableHeader() {
             } else {
                 tv.setLayoutParams(createTableRowParam(cellHeight));
             }
-            tv.setTextColor(getResources().getColor(R.color.colorHeaderText));
+            tv.setTextColor(getResources().getColor(R.color.default_color_side_header_text));
             tv.setTextSize(TypedValue.COMPLEX_UNIT_DIP, DEFAULT_HEADER_FONT_SIZE_DP);
             tv.setText(headerTitle[i]);
             tv.setGravity(Gravity.CENTER);
@@ -342,11 +369,11 @@ private RelativeLayout.LayoutParams createStickerParam(Schedule schedule) {
         return param;
     }
 
-    private int calCellWidth(){
+    private int calCellWidth() {
         Display display = ((AppCompatActivity) context).getWindowManager().getDefaultDisplay();
         Point size = new Point();
         display.getSize(size);
-        int cell_w = (size.x-getPaddingLeft() - getPaddingRight()- sideCellWidth) / (columnCount - 1);
+        int cell_w = (size.x - getPaddingLeft() - getPaddingRight() - sideCellWidth) / (columnCount - 1);
         return cell_w;
     }
 
@@ -394,7 +421,10 @@ private void onCreateByBuilder(Builder builder) {
         this.stickerColors = builder.stickerColors;
         this.startTime = builder.startTime;
         this.headerHighlightColor = builder.headerHighlightColor;
-
+        this.colorSurface = builder.colorSurface;
+        this.colorBorders = builder.colorBorders;
+        this.sideColorText = builder.sideColorText;
+        this.sideColor = builder.sideColor;
         init();
     }
 
@@ -402,6 +432,7 @@ private void onCreateByBuilder(Builder builder) {
     public interface OnStickerSelectedListener {
         void OnStickerSelected(int idx, ArrayList<Schedule> schedules);
     }
+
     public interface OnStickerSelectedLongClickListener {
         void OnStickerSelectedLongClick(int idx, ArrayList<Schedule> schedules);
     }
@@ -416,6 +447,10 @@ static class Builder {
         private String[] stickerColors;
         private int startTime;
         private int headerHighlightColor;
+        private int colorSurface;
+        private int colorBorders;
+        private int sideColorText;
+        private int sideColor;
 
         public Builder(Context context) {
             this.context = context;
@@ -427,6 +462,10 @@ public Builder(Context context) {
             stickerColors = context.getResources().getStringArray(R.array.default_sticker_color);
             startTime = DEFAULT_START_TIME;
             headerHighlightColor = context.getResources().getColor(R.color.default_header_highlight_color);
+            colorSurface = context.getResources().getColor(R.color.default_color_surface);
+            colorBorders = context.getResources().getColor(R.color.colorBorders);
+            sideColorText = context.getResources().getColor(R.color.default_color_side_text);
+            sideColor =  context.getResources().getColor(R.color.colorSideHeader);
         }
 
         public Builder setRowCount(int n) {
@@ -469,6 +508,25 @@ public Builder setHeaderHighlightColor(int c) {
             return this;
         }
 
+        public Builder setColorSurface(int c) {
+            this.colorSurface = c;
+            return this;
+        }
+
+        public Builder setColorBorders(int c) {
+            this.colorBorders = c;
+            return this;
+        }
+
+        public Builder setColorText(int c) {
+            this.sideColorText = c;
+            return this;
+        }
+        public Builder setSideColorText(int c) {
+            this.sideColor = c;
+            return this;
+        }
+
         public TimetableView build() {
             TimetableView timetableView = new TimetableView(context);
             timetableView.onCreateByBuilder(this);
diff --git a/timetableview/src/main/res/drawable/item_border.xml b/timetableview/src/main/res/drawable/item_border.xml
index de89ee8..c7a9ca4 100644
--- a/timetableview/src/main/res/drawable/item_border.xml
+++ b/timetableview/src/main/res/drawable/item_border.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#ffffff" />
+    <solid android:color="@color/default_color_surface" />
     <stroke
         android:width="2px"
-        android:color="@color/colorTableItem" />
+        android:color="@color/colorBorders" />
 </shape>
\ No newline at end of file
diff --git a/timetableview/src/main/res/values/attrs_timetable.xml b/timetableview/src/main/res/values/attrs_timetable.xml
index 9260988..a51b32a 100644
--- a/timetableview/src/main/res/values/attrs_timetable.xml
+++ b/timetableview/src/main/res/values/attrs_timetable.xml
@@ -1,19 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <declare-styleable name="TimetableView">
-        <attr name="row_count" format="integer"/>
-        <attr name="column_count" format="integer"/>
-        <attr name="cell_height" format="dimension"/>
-        <attr name="side_cell_width" format="dimension"/>
-        <attr name="header_title" format="reference"/>
-        <attr name="sticker_colors" format="reference"/>
-        <attr name="start_time" format="integer"/>
-        <attr name="header_highlight_color" format="color"/>
+        <attr name="row_count" format="integer" />
+        <attr name="column_count" format="integer" />
+        <attr name="cell_height" format="dimension" />
+        <attr name="side_cell_width" format="dimension" />
+        <attr name="header_title" format="reference" />
+        <attr name="sticker_colors" format="reference" />
+        <attr name="start_time" format="integer" />
+        <attr name="header_highlight_color" format="color" />
+        <attr name="color_surface" format="color" />
+        <attr name="color_borders" format="color" />
+        <attr name="side_color_text" format="color" />
+        <attr name="color_side" format="color" />
         <attr name="header_highlight_type" format="enum">
-            <enum name="color" value="0"/>
-            <enum name="image" value="1"/>
+            <enum name="color" value="0" />
+            <enum name="image" value="1" />
         </attr>
-        <attr name="header_highlight_image_size" format="dimension"/>
-        <attr name="header_highlight_image" format="reference"/>
+        <attr name="header_highlight_image_size" format="dimension" />
+        <attr name="header_highlight_image" format="reference" />
     </declare-styleable>
 </resources>
\ No newline at end of file
diff --git a/timetableview/src/main/res/values/colors.xml b/timetableview/src/main/res/values/colors.xml
index c1543e9..4d0b4e1 100644
--- a/timetableview/src/main/res/values/colors.xml
+++ b/timetableview/src/main/res/values/colors.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="colorSideHeader">#ffffff</color>
-    <color name="colorHeaderText">#D9000000</color>
-    <color name="colorTableItem">#F5F5F5</color>
+    <color name="default_color_side_header_text">#D9000000</color>
+    <color name="default_color_side_text">@color/default_color_side_header_text</color>
+    <color name="colorBorders">#F5F5F5</color>
 
     <string-array name="default_sticker_color">
         <item>#f08676</item>
@@ -16,9 +17,6 @@
         <item>#d397ed</item>
     </string-array>
 
-    <color name="default_side_header_font_color">#7d7d7d</color>
-    <color name="default_header_font_color">#7d7d7d</color>
-    <color name="default_header_highlight_font_color">#ffffff</color>
     <color name="default_header_highlight_color">#74a4f3</color>
-    <color name="default_sticker_font_color">#ffffff</color>
+    <color name="default_color_surface">#ffffff</color>
 </resources>

From 9b021e6ea63368637cbffe4120691ada36b990ca Mon Sep 17 00:00:00 2001
From: omarb1989 <omarbaghdadi@yahoo.fr>
Date: Wed, 4 Aug 2021 19:04:32 +0100
Subject: [PATCH 09/28] set right version to release 1.0.4

---
 app/build.gradle           | 4 ++--
 timetableview/build.gradle | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 83e462d..c5bba9f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "com.github.omarb1989.timetableviewdemo"
         minSdkVersion 19
         targetSdkVersion 30
-        versionCode 5
-        versionName "1.0.3-fx3"
+        versionCode 6
+        versionName "1.0.4"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
     buildTypes {
diff --git a/timetableview/build.gradle b/timetableview/build.gradle
index c373c11..3e69bcf 100644
--- a/timetableview/build.gradle
+++ b/timetableview/build.gradle
@@ -6,8 +6,8 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 30
-        versionCode 3
-        versionName "1.0.3"
+        versionCode 6
+        versionName "1.0.4"
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 

From eb787487b9b72f53283a9beff9f6c53db0d0d477 Mon Sep 17 00:00:00 2001
From: omarb1989 <omarbaghdadi@yahoo.fr>
Date: Wed, 4 Aug 2021 19:21:19 +0100
Subject: [PATCH 10/28] Update README.md

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 0e64123..060d809 100644
--- a/README.md
+++ b/README.md
@@ -57,6 +57,10 @@ app:header_highlight_color="@color/highlight" // sets header highlight color (de
 app:header_highlight_image="@drawable/ic_kitty" // set header highlight image src
 app:header_highlight_image_size="36dp" // set header highlight image width,height(square)
 app:header_highlight_type="image" // set header highlight type - color/image (default : color)
+app:color_surface="#ffffff" // set default color of table boxes
+app:color_borders="#F3F3F3" // set color for the table borders
+app:side_color_text="#000000" //set color text of the first column of hours
+app:color_side="#F48FB1" // set color of the first column of hours
 ```
 
 ### Change header title

From 77dcae51d54ba0957fb9139950a80a251123a8d0 Mon Sep 17 00:00:00 2001
From: omarb1989 <omarbaghdadi@yahoo.fr>
Date: Wed, 4 Aug 2021 19:39:35 +0100
Subject: [PATCH 11/28] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 060d809..2d2ee38 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ allprojects {
 Add the dependency
 ```gradle
 dependencies {
-	implementation 'omarb1989:TimetableView:1.0.3-fx3'
+	implementation 'omarb1989:TimetableView:1.0.4'
 }
 ```
 

From de4c584f3d222f2fd012f46c040e729cf20c8c49 Mon Sep 17 00:00:00 2001
From: omarb1989 <omarbaghdadi@yahoo.fr>
Date: Wed, 4 Aug 2021 21:31:57 +0100
Subject: [PATCH 12/28] add attribute 'color_side_header_text'

---
 app/src/main/res/layout/activity_main.xml             |  7 ++++++-
 .../github/omarb1989/timetableview/TimetableView.java | 11 ++++++++++-
 timetableview/src/main/res/values/attrs_timetable.xml |  1 +
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index ff24b1d..86fe22f 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -48,7 +48,12 @@
         app:header_highlight_image="@drawable/ic_kitty"
         app:header_highlight_image_size="36dp"
         app:header_highlight_type="image"
-        app:header_title="@array/header_title" />
+        app:header_title="@array/header_title"
+        app:color_surface="#ffffff"
+        app:color_borders="#F3F3F3"
+        app:side_color_text="#000000"
+        app:color_side_header_text="#FFE082"
+        app:color_side="#F48FB1"/>
 
 
 </LinearLayout>
\ No newline at end of file
diff --git a/timetableview/src/main/java/com/github/omarb1989/timetableview/TimetableView.java b/timetableview/src/main/java/com/github/omarb1989/timetableview/TimetableView.java
index 51f424a..8e050a3 100644
--- a/timetableview/src/main/java/com/github/omarb1989/timetableview/TimetableView.java
+++ b/timetableview/src/main/java/com/github/omarb1989/timetableview/TimetableView.java
@@ -56,6 +56,7 @@ public class TimetableView extends LinearLayout {
     private int colorBorders;
     private int sideColorText;
     private int sideColor;
+    private int sideAndHeaderTextColor;
 
     private RelativeLayout stickerBox;
     TableLayout tableHeader;
@@ -110,6 +111,7 @@ private void getAttrs(AttributeSet attrs) {
         colorBorders = a.getColor(R.styleable.TimetableView_color_borders, getResources().getColor(R.color.colorBorders));
         sideColorText = a.getColor(R.styleable.TimetableView_side_color_text, getResources().getColor(R.color.default_color_side_text));
         sideColor = a.getColor(R.styleable.TimetableView_color_side, getResources().getColor(R.color.colorSideHeader));
+        sideAndHeaderTextColor = a.getColor(R.styleable.TimetableView_color_side_header_text, getResources().getColor(R.color.default_color_side_header_text));
         a.recycle();
     }
 
@@ -348,7 +350,7 @@ private void createTableHeader() {
             } else {
                 tv.setLayoutParams(createTableRowParam(cellHeight));
             }
-            tv.setTextColor(getResources().getColor(R.color.default_color_side_header_text));
+            tv.setTextColor(sideAndHeaderTextColor);
             tv.setTextSize(TypedValue.COMPLEX_UNIT_DIP, DEFAULT_HEADER_FONT_SIZE_DP);
             tv.setText(headerTitle[i]);
             tv.setGravity(Gravity.CENTER);
@@ -425,6 +427,7 @@ private void onCreateByBuilder(Builder builder) {
         this.colorBorders = builder.colorBorders;
         this.sideColorText = builder.sideColorText;
         this.sideColor = builder.sideColor;
+        this.sideAndHeaderTextColor = builder.sideAndHeaderTextColor;
         init();
     }
 
@@ -451,6 +454,7 @@ static class Builder {
         private int colorBorders;
         private int sideColorText;
         private int sideColor;
+        private int sideAndHeaderTextColor;
 
         public Builder(Context context) {
             this.context = context;
@@ -466,6 +470,7 @@ public Builder(Context context) {
             colorBorders = context.getResources().getColor(R.color.colorBorders);
             sideColorText = context.getResources().getColor(R.color.default_color_side_text);
             sideColor =  context.getResources().getColor(R.color.colorSideHeader);
+            sideAndHeaderTextColor = context.getResources().getColor(R.color.default_color_side_header_text);
         }
 
         public Builder setRowCount(int n) {
@@ -526,6 +531,10 @@ public Builder setSideColorText(int c) {
             this.sideColor = c;
             return this;
         }
+        public Builder setSideAndHeaderTextColor(int c) {
+            this.sideAndHeaderTextColor = c;
+            return this;
+        }
 
         public TimetableView build() {
             TimetableView timetableView = new TimetableView(context);
diff --git a/timetableview/src/main/res/values/attrs_timetable.xml b/timetableview/src/main/res/values/attrs_timetable.xml
index a51b32a..2028637 100644
--- a/timetableview/src/main/res/values/attrs_timetable.xml
+++ b/timetableview/src/main/res/values/attrs_timetable.xml
@@ -13,6 +13,7 @@
         <attr name="color_borders" format="color" />
         <attr name="side_color_text" format="color" />
         <attr name="color_side" format="color" />
+        <attr name="color_side_header_text" format="color" />
         <attr name="header_highlight_type" format="enum">
             <enum name="color" value="0" />
             <enum name="image" value="1" />

From b3cc37900889b9b923e15657c2e1d1a0f02bcc4d Mon Sep 17 00:00:00 2001
From: omarb1989 <omarbaghdadi@yahoo.fr>
Date: Wed, 4 Aug 2021 21:39:53 +0100
Subject: [PATCH 13/28] Update README.md

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2d2ee38..d6887e1 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ allprojects {
 Add the dependency
 ```gradle
 dependencies {
-	implementation 'omarb1989:TimetableView:1.0.4'
+	implementation 'omarb1989:TimetableView:1.0.4-fx1'
 }
 ```
 
@@ -61,6 +61,7 @@ app:color_surface="#ffffff" // set default color of table boxes
 app:color_borders="#F3F3F3" // set color for the table borders
 app:side_color_text="#000000" //set color text of the first column of hours
 app:color_side="#F48FB1" // set color of the first column of hours
+app:color_side_header_text="#FFE082" // set color text of the header and the first column of hours
 ```
 
 ### Change header title

From 732da9c4cb0b735f54b7a09e45de68421625188b Mon Sep 17 00:00:00 2001
From: omarb1989 <omarbaghdadi@yahoo.fr>
Date: Wed, 4 Aug 2021 21:46:29 +0100
Subject: [PATCH 14/28] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d6887e1..9ac6c30 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ allprojects {
 Add the dependency
 ```gradle
 dependencies {
-	implementation 'omarb1989:TimetableView:1.0.4-fx1'
+	implementation 'omarb1989:TimetableView:1.0.4'
 }
 ```
 

From 9840ffde5ca66556e592c78d2040a623cfbe3416 Mon Sep 17 00:00:00 2001
From: omarb1989 <omarbaghdadi@yahoo.fr>
Date: Wed, 4 Aug 2021 21:46:56 +0100
Subject: [PATCH 15/28] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9ac6c30..d6887e1 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ allprojects {
 Add the dependency
 ```gradle
 dependencies {
-	implementation 'omarb1989:TimetableView:1.0.4'
+	implementation 'omarb1989:TimetableView:1.0.4-fx1'
 }
 ```
 

From 8246a50578c1e78d0c6f138782a15f91eb7fb2f2 Mon Sep 17 00:00:00 2001
From: omarb1989 <omarbaghdadi@yahoo.fr>
Date: Wed, 4 Aug 2021 22:46:53 +0100
Subject: [PATCH 16/28] add attribute 'border_width'

adds borderWith attribute to choose:
-noWidth, Light, Normal, Thick, Extra_Thick
changes default start time to 8:00 AM instead of 9:00AM
---
 app/src/main/res/layout/activity_main.xml          |  1 +
 timetableview/build.gradle                         |  4 ++--
 .../omarb1989/timetableview/BorderWidth.java       |  5 +++++
 .../omarb1989/timetableview/TimetableView.java     | 14 ++++++++++++--
 .../src/main/res/values/attrs_timetable.xml        |  7 +++++++
 5 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 timetableview/src/main/java/com/github/omarb1989/timetableview/BorderWidth.java

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 86fe22f..ffbeac1 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -53,6 +53,7 @@
         app:color_borders="#F3F3F3"
         app:side_color_text="#000000"
         app:color_side_header_text="#FFE082"
+        app:border_width="light"
         app:color_side="#F48FB1"/>
 
 
diff --git a/timetableview/build.gradle b/timetableview/build.gradle
index 3e69bcf..8f2e299 100644
--- a/timetableview/build.gradle
+++ b/timetableview/build.gradle
@@ -6,8 +6,8 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 30
-        versionCode 6
-        versionName "1.0.4"
+        versionCode 8
+        versionName "1.0.4-fx2"
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 
diff --git a/timetableview/src/main/java/com/github/omarb1989/timetableview/BorderWidth.java b/timetableview/src/main/java/com/github/omarb1989/timetableview/BorderWidth.java
new file mode 100644
index 0000000..becfe28
--- /dev/null
+++ b/timetableview/src/main/java/com/github/omarb1989/timetableview/BorderWidth.java
@@ -0,0 +1,5 @@
+package com.github.omarb1989.timetableview;
+
+public enum BorderWidth {
+    NO_WIDTH,LIGHT,NORMAL,THICK,EXTRA_THICK
+}
diff --git a/timetableview/src/main/java/com/github/omarb1989/timetableview/TimetableView.java b/timetableview/src/main/java/com/github/omarb1989/timetableview/TimetableView.java
index 8e050a3..2b7ee65 100644
--- a/timetableview/src/main/java/com/github/omarb1989/timetableview/TimetableView.java
+++ b/timetableview/src/main/java/com/github/omarb1989/timetableview/TimetableView.java
@@ -36,7 +36,7 @@ public class TimetableView extends LinearLayout {
     private static final int DEFAULT_COLUMN_COUNT = 6;
     private static final int DEFAULT_CELL_HEIGHT_DP = 50;
     private static final int DEFAULT_SIDE_CELL_WIDTH_DP = 30;
-    private static final int DEFAULT_START_TIME = 9;
+    private static final int DEFAULT_START_TIME = 8;
 
     private static final int DEFAULT_SIDE_HEADER_FONT_SIZE_DP = 13;
     private static final int DEFAULT_HEADER_FONT_SIZE_DP = 15;
@@ -57,6 +57,7 @@ public class TimetableView extends LinearLayout {
     private int sideColorText;
     private int sideColor;
     private int sideAndHeaderTextColor;
+    private int borderWidth;
 
     private RelativeLayout stickerBox;
     TableLayout tableHeader;
@@ -112,6 +113,7 @@ private void getAttrs(AttributeSet attrs) {
         sideColorText = a.getColor(R.styleable.TimetableView_side_color_text, getResources().getColor(R.color.default_color_side_text));
         sideColor = a.getColor(R.styleable.TimetableView_color_side, getResources().getColor(R.color.colorSideHeader));
         sideAndHeaderTextColor = a.getColor(R.styleable.TimetableView_color_side_header_text, getResources().getColor(R.color.default_color_side_header_text));
+        borderWidth = a.getInt(R.styleable.TimetableView_border_width, BorderWidth.NORMAL.ordinal());
         a.recycle();
     }
 
@@ -326,7 +328,7 @@ private void createTable() {
                         ((ShapeDrawable) background).getPaint().setColor(colorSurface);
                     } else if (background instanceof GradientDrawable) {
                         ((GradientDrawable) background).setColor(colorSurface);
-                        ((GradientDrawable) background).setStroke(2,colorBorders);
+                        ((GradientDrawable) background).setStroke(borderWidth,colorBorders);
                     } else if (background instanceof ColorDrawable) {
                         ((ColorDrawable) background).setColor(colorSurface);
                     }
@@ -428,6 +430,8 @@ private void onCreateByBuilder(Builder builder) {
         this.sideColorText = builder.sideColorText;
         this.sideColor = builder.sideColor;
         this.sideAndHeaderTextColor = builder.sideAndHeaderTextColor;
+        this.borderWidth = builder.borderWidth;
+
         init();
     }
 
@@ -455,6 +459,7 @@ static class Builder {
         private int sideColorText;
         private int sideColor;
         private int sideAndHeaderTextColor;
+        private int borderWidth;
 
         public Builder(Context context) {
             this.context = context;
@@ -471,6 +476,7 @@ public Builder(Context context) {
             sideColorText = context.getResources().getColor(R.color.default_color_side_text);
             sideColor =  context.getResources().getColor(R.color.colorSideHeader);
             sideAndHeaderTextColor = context.getResources().getColor(R.color.default_color_side_header_text);
+            borderWidth = BorderWidth.NORMAL.ordinal();
         }
 
         public Builder setRowCount(int n) {
@@ -535,6 +541,10 @@ public Builder setSideAndHeaderTextColor(int c) {
             this.sideAndHeaderTextColor = c;
             return this;
         }
+        public Builder setBorderWidth(int b) {
+            this.borderWidth = b;
+            return this;
+        }
 
         public TimetableView build() {
             TimetableView timetableView = new TimetableView(context);
diff --git a/timetableview/src/main/res/values/attrs_timetable.xml b/timetableview/src/main/res/values/attrs_timetable.xml
index 2028637..192d93e 100644
--- a/timetableview/src/main/res/values/attrs_timetable.xml
+++ b/timetableview/src/main/res/values/attrs_timetable.xml
@@ -14,6 +14,13 @@
         <attr name="side_color_text" format="color" />
         <attr name="color_side" format="color" />
         <attr name="color_side_header_text" format="color" />
+        <attr name="border_width" format="enum">
+            <enum name="noWidth" value="0" />
+            <enum name="light" value="1" />
+            <enum name="normal" value="2" />
+            <enum name="thick" value="3" />
+            <enum name="extra_thick" value="4" />
+        </attr>
         <attr name="header_highlight_type" format="enum">
             <enum name="color" value="0" />
             <enum name="image" value="1" />

From fb4254c50ca8027f046998cd8848780577e6610b Mon Sep 17 00:00:00 2001
From: omarb1989 <omarbaghdadi@yahoo.fr>
Date: Wed, 4 Aug 2021 22:52:52 +0100
Subject: [PATCH 17/28] Update README.md

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d6887e1..a0277d3 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ allprojects {
 Add the dependency
 ```gradle
 dependencies {
-	implementation 'omarb1989:TimetableView:1.0.4-fx1'
+	implementation 'omarb1989:TimetableView:1.0.4-fx2'
 }
 ```
 
@@ -62,6 +62,7 @@ app:color_borders="#F3F3F3" // set color for the table borders
 app:side_color_text="#000000" //set color text of the first column of hours
 app:color_side="#F48FB1" // set color of the first column of hours
 app:color_side_header_text="#FFE082" // set color text of the header and the first column of hours
+app:border_width="light" // set table border width: noWidth, light, normal, thick, extra thick
 ```
 
 ### Change header title

From f172cd09132db45b7e2517a0917b5268b94d4b92 Mon Sep 17 00:00:00 2001
From: omarb1989 <omarbaghdadi@yahoo.fr>
Date: Thu, 5 Aug 2021 09:21:50 +0100
Subject: [PATCH 18/28] add Labels 'AM' and 'PM' to table timeline

---
 app/src/main/res/layout/activity_main.xml         | 15 ++++++++-------
 .../omarb1989/timetableview/TimetableView.java    | 13 ++++++++++---
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index ffbeac1..a5d8ab8 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -48,13 +48,14 @@
         app:header_highlight_image="@drawable/ic_kitty"
         app:header_highlight_image_size="36dp"
         app:header_highlight_type="image"
-        app:header_title="@array/header_title"
-        app:color_surface="#ffffff"
-        app:color_borders="#F3F3F3"
-        app:side_color_text="#000000"
-        app:color_side_header_text="#FFE082"
-        app:border_width="light"
-        app:color_side="#F48FB1"/>
+        app:header_title="@array/header_title"/>
+<!--        app:color_surface="#ffffff"-->
+<!--        app:color_borders="#F3F3F3"-->
+<!--        app:side_color_text="#000000"-->
+<!--        app:color_side_header_text="#FFE082"-->
+<!--        app:border_width="light"-->
+<!--        app:color_side="#F48FB1"/>-->
+
 
 
 </LinearLayout>
\ No newline at end of file
diff --git a/timetableview/src/main/java/com/github/omarb1989/timetableview/TimetableView.java b/timetableview/src/main/java/com/github/omarb1989/timetableview/TimetableView.java
index 2b7ee65..8bdd5a8 100644
--- a/timetableview/src/main/java/com/github/omarb1989/timetableview/TimetableView.java
+++ b/timetableview/src/main/java/com/github/omarb1989/timetableview/TimetableView.java
@@ -328,7 +328,7 @@ private void createTable() {
                         ((ShapeDrawable) background).getPaint().setColor(colorSurface);
                     } else if (background instanceof GradientDrawable) {
                         ((GradientDrawable) background).setColor(colorSurface);
-                        ((GradientDrawable) background).setStroke(borderWidth,colorBorders);
+                        ((GradientDrawable) background).setStroke(borderWidth, colorBorders);
                     } else if (background instanceof ColorDrawable) {
                         ((ColorDrawable) background).setColor(colorSurface);
                     }
@@ -409,7 +409,11 @@ private TableRow.LayoutParams createTableRowParam(int w_px, int h_px) {
     private String getHeaderTime(int i) {
         int p = (startTime + i) % 24;
         int res = p <= 12 ? p : p - 12;
-        return res + "";
+        if ((res >= 8) && (res < 12)) {
+            return res + "\nAM";
+        } else if (((res >= 1) && (res <= 7))||(res == 12)) {
+            return res + "\nPM";
+        } else return res + " outOfBoundTime";
     }
 
     static private int dp2Px(int dp) {
@@ -474,7 +478,7 @@ public Builder(Context context) {
             colorSurface = context.getResources().getColor(R.color.default_color_surface);
             colorBorders = context.getResources().getColor(R.color.colorBorders);
             sideColorText = context.getResources().getColor(R.color.default_color_side_text);
-            sideColor =  context.getResources().getColor(R.color.colorSideHeader);
+            sideColor = context.getResources().getColor(R.color.colorSideHeader);
             sideAndHeaderTextColor = context.getResources().getColor(R.color.default_color_side_header_text);
             borderWidth = BorderWidth.NORMAL.ordinal();
         }
@@ -533,14 +537,17 @@ public Builder setColorText(int c) {
             this.sideColorText = c;
             return this;
         }
+
         public Builder setSideColorText(int c) {
             this.sideColor = c;
             return this;
         }
+
         public Builder setSideAndHeaderTextColor(int c) {
             this.sideAndHeaderTextColor = c;
             return this;
         }
+
         public Builder setBorderWidth(int b) {
             this.borderWidth = b;
             return this;

From 41b297c29a01d33932a7971487c20d8f1925eb91 Mon Sep 17 00:00:00 2001
From: omarb1989 <omarbaghdadi@yahoo.fr>
Date: Thu, 5 Aug 2021 09:32:19 +0100
Subject: [PATCH 19/28] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a0277d3..b8f25e1 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ allprojects {
 Add the dependency
 ```gradle
 dependencies {
-	implementation 'omarb1989:TimetableView:1.0.4-fx2'
+	implementation 'omarb1989:TimetableView:1.0.4-fx3'
 }
 ```
 

From d220a416e6142e6b214f34758596812b73a89a41 Mon Sep 17 00:00:00 2001
From: omarb1989 <omarbaghdadi@yahoo.fr>
Date: Thu, 5 Aug 2021 09:52:44 +0100
Subject: [PATCH 20/28] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index b8f25e1..695ec37 100644
--- a/README.md
+++ b/README.md
@@ -6,8 +6,8 @@
 Android Library that creates simple time table.
 
 
-![img0](https://postfiles.pstatic.net/MjAxOTAxMjdfMTUz/MDAxNTQ4NTcyNTU5NTk4.M9hWyDvljjkoBDW-naLrTRqRAXUM8WRUyZXptTLKbs8g.b0FN12d8Cmxp5OWZqlQcusL_mJYNKgx6a_XLe_1ALOog.JPEG.tlaabs/Screenshot_Air.jpg?type=w773)
-![img1](https://user-images.githubusercontent.com/8165219/62833150-b88d3180-bc74-11e9-9b20-02a0ad03e778.jpg) 
+![img0](https://www.mediafire.com/file/fwngadc5cpuzga2/light.png/)
+![img1](https://www.mediafire.com/file/obn37jacczimzl1/dark.png/) 
 
 
 ## How to import

From 77ce907aa06344f9c150ecba88f6a48e68b04639 Mon Sep 17 00:00:00 2001
From: omarb1989 <omarbaghdadi@yahoo.fr>
Date: Thu, 5 Aug 2021 09:54:15 +0100
Subject: [PATCH 21/28] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 695ec37..1e8721b 100644
--- a/README.md
+++ b/README.md
@@ -6,8 +6,8 @@
 Android Library that creates simple time table.
 
 
-![img0](https://www.mediafire.com/file/fwngadc5cpuzga2/light.png/)
-![img1](https://www.mediafire.com/file/obn37jacczimzl1/dark.png/) 
+![img0](https://www.mediafire.com/view/obn37jacczimzl1/dark.png/file)
+![img1](https://www.mediafire.com/view/fwngadc5cpuzga2/light.png/file) 
 
 
 ## How to import

From a39f320cb692544d260958e74dc1ae731b0f6f93 Mon Sep 17 00:00:00 2001
From: omarb1989 <omarbaghdadi@yahoo.fr>
Date: Thu, 5 Aug 2021 10:05:15 +0100
Subject: [PATCH 22/28] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 1e8721b..cd7964f 100644
--- a/README.md
+++ b/README.md
@@ -5,9 +5,9 @@
 
 Android Library that creates simple time table.
 
+![dark](https://user-images.githubusercontent.com/9026030/128323499-f8562b86-8f18-4cc3-a6b5-3165b03ad88b.jpg)
+![light](https://user-images.githubusercontent.com/9026030/128323528-678ceab1-4dd8-40e1-a09b-e66b98ed0343.jpg)
 
-![img0](https://www.mediafire.com/view/obn37jacczimzl1/dark.png/file)
-![img1](https://www.mediafire.com/view/fwngadc5cpuzga2/light.png/file) 
 
 
 ## How to import

From 595048ec1f50117015c50954ac8611a0a4ccbea7 Mon Sep 17 00:00:00 2001
From: omarb1989 <omarbaghdadi@yahoo.fr>
Date: Tue, 24 Aug 2021 22:14:02 +0100
Subject: [PATCH 23/28] from fx2 to fx3 and update android Studio to ArcticFox

update android Studio to ArcticFox adds some config files to .idea folder
---
 .idea/runConfigurations.xml | 13 -------------
 timetableview/build.gradle  |  4 ++--
 2 files changed, 2 insertions(+), 15 deletions(-)
 delete mode 100644 .idea/runConfigurations.xml

diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index e497da9..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/timetableview/build.gradle b/timetableview/build.gradle
index 8f2e299..ff2a51a 100644
--- a/timetableview/build.gradle
+++ b/timetableview/build.gradle
@@ -6,8 +6,8 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 30
-        versionCode 8
-        versionName "1.0.4-fx2"
+        versionCode 9
+        versionName "1.0.4-fx3"
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 

From 11b720793a67b07012327766c62adcfd2be2654e Mon Sep 17 00:00:00 2001
From: omarb1989 <omarbaghdadi@yahoo.fr>
Date: Tue, 24 Aug 2021 22:39:45 +0100
Subject: [PATCH 24/28] add id to Schedule model class

adds field _id to Schedule model class to identify schedules upon adding, editing and removing
---
 .../java/com/github/omarb1989/timetableview/Schedule.java  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/timetableview/src/main/java/com/github/omarb1989/timetableview/Schedule.java b/timetableview/src/main/java/com/github/omarb1989/timetableview/Schedule.java
index bb99dd4..830e2bd 100644
--- a/timetableview/src/main/java/com/github/omarb1989/timetableview/Schedule.java
+++ b/timetableview/src/main/java/com/github/omarb1989/timetableview/Schedule.java
@@ -1,6 +1,7 @@
 package com.github.omarb1989.timetableview;
 
 import java.io.Serializable;
+import java.util.UUID;
 
 public class Schedule implements Serializable {
     static final int MON = 0;
@@ -11,6 +12,8 @@ public class Schedule implements Serializable {
     static final int SAT = 5;
     static final int SUN = 6;
 
+
+    int _id;
     String classTitle="";
     String classPlace="";
     String professorName="";
@@ -21,6 +24,10 @@ public class Schedule implements Serializable {
     public Schedule() {
         this.startTime = new Time();
         this.endTime = new Time();
+        _id = (int)System.currentTimeMillis();
+    }
+    public int get_id() {
+        return _id;
     }
 
     public String getProfessorName() {

From ca36d56c2d9eb97fcbb080866fd148617b1361bb Mon Sep 17 00:00:00 2001
From: omarb1989 <omarbaghdadi@yahoo.fr>
Date: Tue, 24 Aug 2021 23:01:58 +0100
Subject: [PATCH 25/28] Update README.md

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cd7964f..054e288 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ allprojects {
 Add the dependency
 ```gradle
 dependencies {
-	implementation 'omarb1989:TimetableView:1.0.4-fx3'
+	implementation 'omarb1989:TimetableView:1.0.4-fx4'
 }
 ```
 
@@ -120,9 +120,11 @@ schedule.setClassPlace("IT-601"); // sets place
 schedule.setProfessorName("Won Kim"); // sets professor
 schedule.setStartTime(new Time(10,0)); // sets the beginning of class time (hour,minute)
 schedule.setEndTime(new Time(13,30)); // sets the end of class time (hour,minute)
+int uniqueId = schedule.get_id();// you can use it later on wherever you get schedule object to identify it
 schedules.add(schedule);
 //.. add one or more schedules
 timetable.add(schedules);
+int UniqueId = 
 ```
 
 ### Edit schedule

From 0d0564e027373168c2a306faf64dd99e80ba00d1 Mon Sep 17 00:00:00 2001
From: omarb1989 <omarbaghdadi@yahoo.fr>
Date: Fri, 27 Aug 2021 16:55:11 +0100
Subject: [PATCH 26/28] BugHotFix: fix _id in Schedule model class

it fixes "_id" field in Schedule model class to, found bug on SaveManager that create new schedule and reassign fields one by one, so we included _id as well. so "_id" is saved and reloaded correctly
---
 .../omarb1989/timetableview/SaveManager.java       |  2 ++
 .../github/omarb1989/timetableview/Schedule.java   | 14 +++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/timetableview/src/main/java/com/github/omarb1989/timetableview/SaveManager.java b/timetableview/src/main/java/com/github/omarb1989/timetableview/SaveManager.java
index b0a3c89..05945d7 100644
--- a/timetableview/src/main/java/com/github/omarb1989/timetableview/SaveManager.java
+++ b/timetableview/src/main/java/com/github/omarb1989/timetableview/SaveManager.java
@@ -21,6 +21,7 @@ public static String saveSticker(HashMap<Integer, Sticker> stickers){
             ArrayList<Schedule> schedules = stickers.get(idx).getSchedules();
             for(Schedule schedule : schedules){
                 JsonObject obj3 = new JsonObject();
+                obj3.addProperty("_id",schedule._id);
                 obj3.addProperty("classTitle",schedule.classTitle);
                 obj3.addProperty("classPlace",schedule.classPlace);
                 obj3.addProperty("professorName",schedule.getProfessorName());
@@ -55,6 +56,7 @@ public static HashMap<Integer,Sticker> loadSticker(String json){
             for(int k = 0 ; k < arr2.size(); k++){
                 Schedule schedule = new Schedule();
                 JsonObject obj3 = (JsonObject)arr2.get(k);
+                schedule.set_id(obj3.get("_id").getAsInt());
                 schedule.setClassTitle(obj3.get("classTitle").getAsString());
                 schedule.setClassPlace(obj3.get("classPlace").getAsString());
                 schedule.setProfessorName(obj3.get("professorName").getAsString());
diff --git a/timetableview/src/main/java/com/github/omarb1989/timetableview/Schedule.java b/timetableview/src/main/java/com/github/omarb1989/timetableview/Schedule.java
index 830e2bd..e4cc168 100644
--- a/timetableview/src/main/java/com/github/omarb1989/timetableview/Schedule.java
+++ b/timetableview/src/main/java/com/github/omarb1989/timetableview/Schedule.java
@@ -1,7 +1,6 @@
 package com.github.omarb1989.timetableview;
 
 import java.io.Serializable;
-import java.util.UUID;
 
 public class Schedule implements Serializable {
     static final int MON = 0;
@@ -14,9 +13,9 @@ public class Schedule implements Serializable {
 
 
     int _id;
-    String classTitle="";
-    String classPlace="";
-    String professorName="";
+    String classTitle = "";
+    String classPlace = "";
+    String professorName = "";
     private int day = 0;
     private Time startTime;
     private Time endTime;
@@ -24,12 +23,17 @@ public class Schedule implements Serializable {
     public Schedule() {
         this.startTime = new Time();
         this.endTime = new Time();
-        _id = (int)System.currentTimeMillis();
+        _id = (int) System.currentTimeMillis();
     }
+
     public int get_id() {
         return _id;
     }
 
+    public void set_id(int _id) {
+        this._id = _id;
+    }
+
     public String getProfessorName() {
         return professorName;
     }

From 73911daab54b7c56eee6195822341e2582cd05fc Mon Sep 17 00:00:00 2001
From: omarb1989 <omarbaghdadi@yahoo.fr>
Date: Fri, 27 Aug 2021 16:55:11 +0100
Subject: [PATCH 27/28] BugHotFix: fix _id in Schedule model class

it fixes "_id" field in Schedule model class to, found bug on SaveManager that create new schedule and reassign fields one by one, so we included _id as well. so "_id" is saved and reloaded correctly
---
 timetableview/build.gradle                         |  4 ++--
 .../omarb1989/timetableview/SaveManager.java       |  2 ++
 .../github/omarb1989/timetableview/Schedule.java   | 14 +++++++++-----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/timetableview/build.gradle b/timetableview/build.gradle
index ff2a51a..36e30d1 100644
--- a/timetableview/build.gradle
+++ b/timetableview/build.gradle
@@ -6,8 +6,8 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 30
-        versionCode 9
-        versionName "1.0.4-fx3"
+        versionCode 11
+        versionName "1.0.4-fx5"
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
 
diff --git a/timetableview/src/main/java/com/github/omarb1989/timetableview/SaveManager.java b/timetableview/src/main/java/com/github/omarb1989/timetableview/SaveManager.java
index b0a3c89..05945d7 100644
--- a/timetableview/src/main/java/com/github/omarb1989/timetableview/SaveManager.java
+++ b/timetableview/src/main/java/com/github/omarb1989/timetableview/SaveManager.java
@@ -21,6 +21,7 @@ public static String saveSticker(HashMap<Integer, Sticker> stickers){
             ArrayList<Schedule> schedules = stickers.get(idx).getSchedules();
             for(Schedule schedule : schedules){
                 JsonObject obj3 = new JsonObject();
+                obj3.addProperty("_id",schedule._id);
                 obj3.addProperty("classTitle",schedule.classTitle);
                 obj3.addProperty("classPlace",schedule.classPlace);
                 obj3.addProperty("professorName",schedule.getProfessorName());
@@ -55,6 +56,7 @@ public static HashMap<Integer,Sticker> loadSticker(String json){
             for(int k = 0 ; k < arr2.size(); k++){
                 Schedule schedule = new Schedule();
                 JsonObject obj3 = (JsonObject)arr2.get(k);
+                schedule.set_id(obj3.get("_id").getAsInt());
                 schedule.setClassTitle(obj3.get("classTitle").getAsString());
                 schedule.setClassPlace(obj3.get("classPlace").getAsString());
                 schedule.setProfessorName(obj3.get("professorName").getAsString());
diff --git a/timetableview/src/main/java/com/github/omarb1989/timetableview/Schedule.java b/timetableview/src/main/java/com/github/omarb1989/timetableview/Schedule.java
index 830e2bd..e4cc168 100644
--- a/timetableview/src/main/java/com/github/omarb1989/timetableview/Schedule.java
+++ b/timetableview/src/main/java/com/github/omarb1989/timetableview/Schedule.java
@@ -1,7 +1,6 @@
 package com.github.omarb1989.timetableview;
 
 import java.io.Serializable;
-import java.util.UUID;
 
 public class Schedule implements Serializable {
     static final int MON = 0;
@@ -14,9 +13,9 @@ public class Schedule implements Serializable {
 
 
     int _id;
-    String classTitle="";
-    String classPlace="";
-    String professorName="";
+    String classTitle = "";
+    String classPlace = "";
+    String professorName = "";
     private int day = 0;
     private Time startTime;
     private Time endTime;
@@ -24,12 +23,17 @@ public class Schedule implements Serializable {
     public Schedule() {
         this.startTime = new Time();
         this.endTime = new Time();
-        _id = (int)System.currentTimeMillis();
+        _id = (int) System.currentTimeMillis();
     }
+
     public int get_id() {
         return _id;
     }
 
+    public void set_id(int _id) {
+        this._id = _id;
+    }
+
     public String getProfessorName() {
         return professorName;
     }

From ada0036008003a248161a8aa2d7fdb40c196eaa6 Mon Sep 17 00:00:00 2001
From: omarb1989 <omarbaghdadi@yahoo.fr>
Date: Fri, 27 Aug 2021 19:47:16 +0100
Subject: [PATCH 28/28] Update README.md

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 054e288..6b2c910 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ allprojects {
 Add the dependency
 ```gradle
 dependencies {
-	implementation 'omarb1989:TimetableView:1.0.4-fx4'
+	implementation 'omarb1989:TimetableView:1.0.4-fx5'
 }
 ```
 
@@ -124,7 +124,6 @@ int uniqueId = schedule.get_id();// you can use it later on wherever you get sch
 schedules.add(schedule);
 //.. add one or more schedules
 timetable.add(schedules);
-int UniqueId = 
 ```
 
 ### Edit schedule